1626 files changed, 119909 insertions, 24480 deletions

diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml
index 794b38c6c1..e0986c881a 100644
--- a/.github/workflows/build_cmake.yml
+++ b/.github/workflows/build_cmake.yml
@@ -9,7 +9,7 @@ on:
 env:
   QT_VERSION: 6.6.2
   MACOS_DEPLOYMENT_TARGET: 11.0
-  CLANG_VERSION: 17.0.1
+  CLANG_VERSION: 18.1.5
   ELFUTILS_VERSION: 0.175
   CMAKE_VERSION: 3.21.1
   NINJA_VERSION: 1.10.2
diff --git a/.luarc.json b/.luarc.json
new file mode 100644
index 0000000000..0d86a5b80c
--- /dev/null
+++ b/.luarc.json
@@ -0,0 +1,9 @@
+{
+    "workspace.library": [
+        "src/plugins/lua/meta"
+    ],
+    "hint.paramName": "Literal",
+    "hint.enable": true,
+    "hint.await": true,
+    "hint.arrayIndex": "Disable"
+}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b4d1cca51..9f0cbb088e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -78,8 +78,12 @@ find_package(Qt6
   REQUIRED
 )
 
-option(WITH_QMLDESIGNER "Build QmlDesigner" ${ENV_QTC_WITH_QMLDESIGNER})
-add_feature_info("Build QmlDesigner and related code" ${WITH_QMLDESIGNER} "")
+if (Qt6_VERSION VERSION_GREATER_EQUAL 6.5.4)
+    option(WITH_QMLDESIGNER "Build QmlDesigner" ${ENV_QTC_WITH_QMLDESIGNER})
+else()
+    option(WITH_QMLDESIGNER "Build QmlDesigner" OFF)
+endif()
+add_feature_info("Build QmlDesigner and related code (only if Qt is 6.5.4 or newer)" ${WITH_QMLDESIGNER} "")
 
 # hack for Qbs which still supports Qt5 and Qt6
 if (TARGET Qt6::Core5CompatPrivate)
@@ -166,7 +170,9 @@ endif()
 
 add_subdirectory(src)
 add_subdirectory(share)
-add_subdirectory(dist)
+if (NOT BUILD_DESIGNSTUDIO)
+    add_subdirectory(dist)
+endif()
 
 if (WITH_TESTS)
   add_subdirectory(tests)
diff --git a/README.md b/README.md
index 9f4b6f1457..7feacabd33 100644
--- a/README.md
+++ b/README.md
@@ -38,12 +38,12 @@ https://doc.qt.io/qtcreator-extending/coding-style.html
 
 Prerequisites:
 
-* Qt 6.2 or later. The Qt version that you use to build Qt Creator defines the
+* Qt 6.4.3 or later. The Qt version that you use to build Qt Creator defines the
   minimum platform versions that the result supports
-  (Windows 10, RHEL/CentOS 8.4, Ubuntu 20.04, macOS 10.15 for Qt 6.2).
+  (Windows 10, RHEL/CentOS 8.4, Ubuntu 20.04, macOS 10.15 for Qt 6.4.3).
 * Qt WebEngine module for QtWebEngine based help viewer
 * On Windows:
-    * MinGW with GCC 9 or Visual Studio 2019 or later
+    * MinGW with GCC 11.2 or Visual Studio 2019 or later
     * Python 3.8 or later (optional, needed for the python enabled debug helper)
     * Debugging Tools for Windows (optional, for MSVC debugging support with CDB)
 * On Mac OS X: latest Xcode
@@ -107,6 +107,33 @@ get LLVM.
     cmake -DCMAKE_BUILD_TYPE=Debug -G Ninja "-DCMAKE_PREFIX_PATH=/path/to/Qt;/path/to/llvm" /path/to/qtcreator_sources
     cmake --build .
 
+#### Troubleshooting: libxcb plugin not found while using Qt libraries built locally from source
+
+Ensure all prerequisites for building Qt are installed:
+https://doc.qt.io/qt-6/linux.html
+https://doc.qt.io/qt-6/linux-requirements.html
+
+If they were installed before building Qt and xcb plugin is missing try reinstall them with
+
+```sh
+    sudo apt-get --reinstall <package_name>
+```
+
+Reset building configuration for Qt libraries at '/path/to/qt_sources'
+
+```sh
+    cmake --build . --target=clean
+```
+
+and remove CMakeCache.txt
+
+```sh
+    rm CMakeCache.txt
+```
+
+Try building Qt source again.
+
+
 ### Windows
 
 These instructions assume that Ninja is installed and in the `PATH`, Qt Creator
diff --git a/cmake/QtCreatorAPI.cmake b/cmake/QtCreatorAPI.cmake
index c53b479982..786e2d8553 100644
--- a/cmake/QtCreatorAPI.cmake
+++ b/cmake/QtCreatorAPI.cmake
@@ -1119,3 +1119,27 @@ function(qtc_add_public_header header)
     COMPONENT Devel EXCLUDE_FROM_ALL
   )
 endfunction()
+
+function (add_qtc_lua_plugin name)
+  cmake_parse_arguments(_arg "EXCLUDE_FROM_INSTALL" "" "SOURCES" ${ARGN})
+
+  if (${_arg_UNPARSED_ARGUMENTS})
+    message(FATAL_ERROR "add_qtc_lua_plugin had unparsed arguments!")
+  endif()
+
+  qtc_copy_to_builddir(${name}
+    FILES ${_arg_SOURCES}
+    DESTINATION ${IDE_PLUGIN_PATH}/lua-plugins
+  )
+
+  if (NOT _arg_EXCLUDE_FROM_INSTALL)
+    foreach(SOURCE ${_arg_SOURCES})
+      get_filename_component(SOURCE_DIR "${SOURCE}" DIRECTORY)
+
+      install(
+        FILES ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE}
+        DESTINATION ${IDE_PLUGIN_PATH}/lua-plugins/${SOURCE_DIR}
+      )
+    endforeach()
+  endif()
+endfunction()
diff --git a/cmake/QtCreatorAPIInternal.cmake b/cmake/QtCreatorAPIInternal.cmake
index 08167535e3..0cd3602d54 100644
--- a/cmake/QtCreatorAPIInternal.cmake
+++ b/cmake/QtCreatorAPIInternal.cmake
@@ -338,12 +338,18 @@ function(add_qtc_depends target_name)
   foreach(obj_lib IN LISTS object_lib_depends)
     target_compile_options(${target_name} PRIVATE $<TARGET_PROPERTY:${obj_lib},INTERFACE_COMPILE_OPTIONS>)
     target_compile_definitions(${target_name} PRIVATE $<TARGET_PROPERTY:${obj_lib},INTERFACE_COMPILE_DEFINITIONS>)
-    target_include_directories(${target_name} PRIVATE $<TARGET_PROPERTY:${obj_lib},INTERFACE_INCLUDE_DIRECTORIES>)
+    if (obj_lib MATCHES "Qt::.*|GoogleTest")
+      set(system_include "SYSTEM")
+    endif()
+    target_include_directories(${target_name} ${system_include} PRIVATE $<TARGET_PROPERTY:${obj_lib},INTERFACE_INCLUDE_DIRECTORIES>)
   endforeach()
   foreach(obj_lib IN LISTS object_public_depends)
     target_compile_options(${target_name} PUBLIC $<TARGET_PROPERTY:${obj_lib},INTERFACE_COMPILE_OPTIONS>)
     target_compile_definitions(${target_name} PUBLIC $<TARGET_PROPERTY:${obj_lib},INTERFACE_COMPILE_DEFINITIONS>)
-    target_include_directories(${target_name} PUBLIC $<TARGET_PROPERTY:${obj_lib},INTERFACE_INCLUDE_DIRECTORIES>)
+    if (obj_lib MATCHES "Qt::.*|GoogleTest")
+      set(system_include "SYSTEM")
+    endif()
+    target_include_directories(${target_name} ${system_include} PUBLIC $<TARGET_PROPERTY:${obj_lib},INTERFACE_INCLUDE_DIRECTORIES>)
   endforeach()
 endfunction()
 
diff --git a/coin/instructions/build.yaml b/coin/instructions/build.yaml
index 1972965b51..5434885e1c 100644
--- a/coin/instructions/build.yaml
+++ b/coin/instructions/build.yaml
@@ -16,7 +16,7 @@ instructions:
         maxTimeBetweenOutput: 360
         userMessageOnFailure: "Failed to extract elfutils package, check logs."
       - type: ExecuteCommand
-        command: "curl --fail -L --retry 5 --retry-delay 5 -o {{.AgentWorkingDir}}/build/qt_temp/libclang.7z {{.Env.LLVM_BASE_URL}}-linux-Rhel8.4-gcc10.3-x86_64.7z"
+        command: "curl --fail -L --retry 5 --retry-delay 5 -o {{.AgentWorkingDir}}/build/qt_temp/libclang.7z {{.Env.LLVM_BASE_URL}}-linux-Rhel8.6-gcc10.3-x86_64.7z"
         maxTimeInSeconds: 3600
         maxTimeBetweenOutput: 360
         userMessageOnFailure: "Failed to download LLVM package, check logs."
diff --git a/coin/instructions/common_environment.yaml b/coin/instructions/common_environment.yaml
index e2d1190118..5b4f8ad02b 100644
--- a/coin/instructions/common_environment.yaml
+++ b/coin/instructions/common_environment.yaml
@@ -7,7 +7,7 @@ instructions:
         variableValue: "RelWithDebInfo"
       - type: EnvironmentVariable
         variableName: LLVM_BASE_URL
-        variableValue: https://ci-files02-hki.ci.qt.io/packages/jenkins/qtcreator_libclang/libclang-release_17.0.1-based
+        variableValue: https://ci-files02-hki.ci.qt.io/packages/jenkins/qtcreator_libclang/libclang-release_18.1.5-based
       - type: EnvironmentVariable
         variableName: QTC_QT_BASE_URL
         variableValue: "https://ci-files02-hki.ci.qt.io/packages/jenkins/archive/qt/6.6/6.6.2-released/Qt"
diff --git a/dist/changelog/changes-13.0.0.md b/dist/changelog/changes-13.0.0.md
index 4c78d386e6..28b5f6acd6 100644
--- a/dist/changelog/changes-13.0.0.md
+++ b/dist/changelog/changes-13.0.0.md
@@ -329,6 +329,7 @@ Credits for these changes go to:
 Aaron McCarthy  
 Aleksei German  
 Alessandro Portale  
+Alexandre Laurent  
 Alexey Edelev  
 Ali Kianian  
 Amr Essam  
@@ -337,6 +338,7 @@ André Pönitz
 Andreas Loth  
 Artem Sokolovskii  
 Assam Boudjelthia  
+Aurele Faure  
 Brook Cronin  
 Burak Hancerli  
 Christian Kandeler  
@@ -378,6 +380,7 @@ Serg Kryvonos
 Shrief Gabr  
 Sivert Krøvel  
 Tasuku Suzuki  
+Thiago Macieira  
 Thomas Hartmann  
 Tim Jenßen  
 Vikas Pachdha  
diff --git a/dist/changelog/changes-13.0.1.md b/dist/changelog/changes-13.0.1.md
new file mode 100644
index 0000000000..d13fa8475e
--- /dev/null
+++ b/dist/changelog/changes-13.0.1.md
@@ -0,0 +1,131 @@
+Qt Creator 13.0.1
+=================
+
+Qt Creator version 13.0.1 contains bug fixes.
+
+The most important changes are listed in this document. For a complete list of
+changes, see the Git log for the Qt Creator sources that you can check out from
+the public Git repository. For example:
+
+    git clone git://code.qt.io/qt-creator/qt-creator.git
+    git log --cherry-pick --pretty=oneline origin/v13.0.0..v13.0.1
+
+General
+-------
+
+* Fixed a crash when hiding tool tips
+  ([QTCREATORBUG-30738](https://bugreports.qt.io/browse/QTCREATORBUG-30738))
+
+Help
+----
+
+* Examples Browser
+    * Fixed that two columns were shown for the wrong category
+      ([QTCREATORBUG-30634](https://bugreports.qt.io/browse/QTCREATORBUG-30634))
+    * Fixed that the clear button was missing after typing in the filter input
+
+* Fixed links to QML properties
+  ([QTCREATORBUG-30625](https://bugreports.qt.io/browse/QTCREATORBUG-30625))
+
+Editing
+-------
+
+* Fixed that backspace could delete more than one whitespace in the middle of a line
+  ([QTCREATORBUG-30725](https://bugreports.qt.io/browse/QTCREATORBUG-30725))
+
+### C++
+
+* Fixed that completion was shown for number literals
+  ([QTCREATORBUG-30607](https://bugreports.qt.io/browse/QTCREATORBUG-30607))
+* Fixed that Flex and Bison files were opened in the C++ editor
+  ([QTCREATORBUG-30686](https://bugreports.qt.io/browse/QTCREATORBUG-30686))
+
+### QML
+
+* Fixed a crash when creating a `Qt Quick Application` when the QML language server is enabled
+  ([QTCREATORBUG-30739](https://bugreports.qt.io/browse/QTCREATORBUG-30739))
+
+### Models
+
+* Fixed a crash when selecting elements
+  ([QTCREATORBUG-30413](https://bugreports.qt.io/browse/QTCREATORBUG-30413))
+
+Projects
+--------
+
+* Fixed that the text editor for environment changes showed a blinking cursor even when not focused
+  ([QTCREATORBUG-30640](https://bugreports.qt.io/browse/QTCREATORBUG-30640))
+* Fixed that the option `Start build processes with low priority` did not persist
+  ([QTCREATORBUG-30696](https://bugreports.qt.io/browse/QTCREATORBUG-30696))
+
+### CMake
+
+* Fixed that `Add build library search path to PATH` missed paths to libraries that were built by
+  the project
+  ([QTCREATORBUG-30644](https://bugreports.qt.io/browse/QTCREATORBUG-30644))
+* Fixed the handling of `source_group`
+  ([QTCREATORBUG-30602](https://bugreports.qt.io/browse/QTCREATORBUG-30602),
+   [QTCREATORBUG-30620](https://bugreports.qt.io/browse/QTCREATORBUG-30620))
+* Fixed that renaming files did not adapt `set_source_file_properties` calls
+  ([QTCREATORBUG-30174](https://bugreports.qt.io/browse/QTCREATORBUG-30174))
+* Fixed a crash when combining presets
+  ([QTCREATORBUG-30755](https://bugreports.qt.io/browse/QTCREATORBUG-30755))
+
+Debugging
+---------
+
+* Fixed a crash when enabling QML debugging
+  ([QTCREATORBUG-30706](https://bugreports.qt.io/browse/QTCREATORBUG-30706))
+* LLDB
+    * Fixed that `Additional Attach Commands` were not used
+
+Analyzer
+--------
+
+### Clang
+
+* Fixed the documentation link for `clang-tidy` checks
+  ([QTCREATORBUG-30658](https://bugreports.qt.io/browse/QTCREATORBUG-30658))
+
+Terminal
+--------
+
+* Fixed the `TERM` environment variable, which broke the functioning of certain command line tools
+  ([QTCREATORBUG-30737](https://bugreports.qt.io/browse/QTCREATORBUG-30737))
+
+Platforms
+---------
+
+### Android
+
+* Updated the command line tools that are installed with `Set Up SDK`
+* Fixed that Qt ABI detection was wrong directly after `Set Up SDK`
+  ([QTCREATORBUG-30568](https://bugreports.qt.io/browse/QTCREATORBUG-30568))
+
+### iOS
+
+* Fixed a crash when starting multiple applications in Simulators
+  ([QTCREATORBUG-30666](https://bugreports.qt.io/browse/QTCREATORBUG-30666))
+
+### Remote Linux
+
+* Fixed that deployment could block Qt Creator until finished
+* Fixed that it was not possible to change the device name
+  ([QTCREATORBUG-30622](https://bugreports.qt.io/browse/QTCREATORBUG-30622))
+
+Credits for these changes go to:
+--------------------------------
+Ahmad Samir  
+Alessandro Portale  
+BogDan Vatra  
+Christian Kandeler  
+Christian Stenger  
+Cristian Adam  
+David Faure  
+David Schulz  
+Eike Ziller  
+Jaroslaw Kobus  
+Jussi Witick  
+Leena Miettinen  
+Marcus Tillmanns  
+Robert Löhning  
diff --git a/dist/changelog/template.md b/dist/changelog/template.md
new file mode 100644
index 0000000000..9fe0d1f1f7
--- /dev/null
+++ b/dist/changelog/template.md
@@ -0,0 +1,125 @@
+Qt Creator 13
+=============
+
+Qt Creator version 13 contains bug fixes and new features.
+
+The most important changes are listed in this document. For a complete list of
+changes, see the Git log for the Qt Creator sources that you can check out from
+the public Git repository. For example:
+
+    git clone git://code.qt.io/qt-creator/qt-creator.git
+    git log --cherry-pick --pretty=oneline origin/12.0..v13.0.0
+
+New plugins
+-----------
+
+General
+-------
+
+Help
+----
+
+Editing
+-------
+
+### C++
+
+### QML
+
+### Python
+
+### Language Server Protocol
+
+### Widget Designer
+
+### Copilot
+
+### Compiler Explorer
+
+### TODO
+
+### Markdown
+
+### Images
+
+### Models
+
+### Binary Files
+
+Projects
+--------
+
+### CMake
+
+### qmake
+
+### Qbs
+
+### Python
+
+### vcpkg
+
+### Qt Safe Renderer
+
+Debugging
+---------
+
+### C++
+
+### QML
+
+### Debug Adapter Protocol
+
+Analyzer
+--------
+
+### Clang
+
+### Axivion
+
+### CTF Visualizer
+
+Terminal
+--------
+
+Version Control Systems
+-----------------------
+
+### Git
+
+### CVS
+
+Test Integration
+----------------
+
+### Qt Test
+
+### Catch2
+
+### CTest
+
+Platforms
+---------
+
+### Windows
+
+### Linux
+
+### macOS
+
+### Android
+
+### iOS
+
+### Remote Linux
+
+### Docker
+
+### Boot to Qt
+
+### MCU
+
+### QNX
+
+Credits for these changes go to:
+--------------------------------
diff --git a/doc/qtcreator/config/style/qt5-sidebar.html b/doc/qtcreator/config/style/qt5-sidebar.html
index 509808af11..577bd5de42 100644
--- a/doc/qtcreator/config/style/qt5-sidebar.html
+++ b/doc/qtcreator/config/style/qt5-sidebar.html
@@ -13,12 +13,9 @@
             <li><a href="creator-getting-started.html">Getting Started</a></li>
             <li><a href="creator-project-creating.html">Creating Projects</a></li>
             <li><a href="creator-configuring-projects.html">Configuring Projects</a></li>
-            <li><a href="creator-live-preview.html">Validating with Target Hardware</a></li>
             <li><a href="creator-connecting-mobile.html">Connecting Devices</a></li>
-            <li><a href="creator-deployment.html">Deploying to Devices</a></li>
             <li><a href="creator-debugging.html">Debugging</a></li>
             <li><a href="creator-analyze-mode.html">Analyzing Code</a></li>
-            <li><a href="creator-squish.html">Using Squish</a></li>
         </ul>
     </div>
 </div>
@@ -51,6 +48,7 @@
         <li><a href="creator-how-tos.html#create-models-and-diagrams">Create Models and Diagrams</a></li>
         <li><a href="creator-how-tos.html#debug">Debug</a></li>
         <li><a href="creator-how-tos.html#design-uis">Design UIs</a></li>
+        <li><a href="creator-how-tos.html#develop-for-devices">Develop for Devices</a></li>
         <li><a href="creator-how-tos.html#edit-code">Edit Code</a></li>
         <li><a href="creator-how-tos.html#manage-kits">Manage Kits</a></li>
         <li><a href="creator-how-tos.html#manage-projects">Manage Projects</a></li>
@@ -74,12 +72,15 @@
         <li><a href="creator-keyboard-shortcuts.html">Keyboard Shortcuts</a></li>
         <li><a href="creator-known-issues.html">Known Issues</a></li>
         <li><a href="technical-support.html">Technical Support</a></li>
+        <li><a href="creator-version-control.html">Version Control Systems</a></li>
+        <li><a href="creator-reference.html#analyzers">Analyzers</a></li>
         <li><a href="creator-reference.html#build-systems">Build Systems</a></li>
-        <li><a href="creator-reference.html#Editors">Editors</a></li>
+        <li><a href="creator-reference.html#debuggers">Debuggers</a></li>
+        <li><a href="creator-reference.html#devices">Devices</a></li>
+        <li><a href="creator-reference.html#editors">Editors</a></li>
         <li><a href="creator-reference.html#platforms">Platforms</a></li>
         <li><a href="creator-reference.html#preferences">Preferences</a></li>
         <li><a href="creator-reference.html#ui-design">UI Design</a></li>
-        <li><a href="creator-version-control.html">Version Control Systems</a></li>
         <li><a href="creator-reference.html#views">Views</a></li>
         <li><a href="creator-reference.html">See All</a></li>
     </ul>
diff --git a/doc/qtcreator/images/qtcreator-custom-wizard.png b/doc/qtcreator/images/qtcreator-custom-wizard.png
deleted file mode 100644
index 73d3b417b8..0000000000
--- a/doc/qtcreator/images/qtcreator-custom-wizard.png
+++ /dev/null
diff --git a/doc/qtcreator/images/qtcreator-custom-wizard.webp b/doc/qtcreator/images/qtcreator-custom-wizard.webp
new file mode 100644
index 0000000000..6e0f5ddc71
--- /dev/null
+++ b/doc/qtcreator/images/qtcreator-custom-wizard.webp
diff --git a/doc/qtcreator/images/qtcreator-debugger-threads.webp b/doc/qtcreator/images/qtcreator-debugger-threads.webp
index 1a84d6ae2b..155c178155 100644
--- a/doc/qtcreator/images/qtcreator-debugger-threads.webp
+++ b/doc/qtcreator/images/qtcreator-debugger-threads.webp
diff --git a/doc/qtcreator/images/qtcreator-editor-open-files.webp b/doc/qtcreator/images/qtcreator-editor-open-files.webp
index 3ec7e58ae9..f01cf7c52d 100644
--- a/doc/qtcreator/images/qtcreator-editor-open-files.webp
+++ b/doc/qtcreator/images/qtcreator-editor-open-files.webp
diff --git a/doc/qtcreator/images/qtcreator-editor-symbols.webp b/doc/qtcreator/images/qtcreator-editor-symbols.webp
index 70bcc2b442..a42455aab8 100644
--- a/doc/qtcreator/images/qtcreator-editor-symbols.webp
+++ b/doc/qtcreator/images/qtcreator-editor-symbols.webp
diff --git a/doc/qtcreator/images/qtcreator-filesystem-view-design.png b/doc/qtcreator/images/qtcreator-filesystem-view-design.png
deleted file mode 100644
index da8766a9c2..0000000000
--- a/doc/qtcreator/images/qtcreator-filesystem-view-design.png
+++ /dev/null
diff --git a/doc/qtcreator/images/qtcreator-filesystem-view-design.webp b/doc/qtcreator/images/qtcreator-filesystem-view-design.webp
new file mode 100644
index 0000000000..9d5995e416
--- /dev/null
+++ b/doc/qtcreator/images/qtcreator-filesystem-view-design.webp
diff --git a/doc/qtcreator/images/qtcreator-filesystem-view.webp b/doc/qtcreator/images/qtcreator-filesystem-view.webp
index 957a0e4b1b..f16a8060c4 100644
--- a/doc/qtcreator/images/qtcreator-filesystem-view.webp
+++ b/doc/qtcreator/images/qtcreator-filesystem-view.webp
diff --git a/doc/qtcreator/images/qtcreator-heob-in-terminal.webp b/doc/qtcreator/images/qtcreator-heob-in-terminal.webp
new file mode 100644
index 0000000000..f36ac70144
--- /dev/null
+++ b/doc/qtcreator/images/qtcreator-heob-in-terminal.webp
diff --git a/doc/qtcreator/images/qtcreator-heob.png b/doc/qtcreator/images/qtcreator-heob.png
deleted file mode 100644
index c3b75ec847..0000000000
--- a/doc/qtcreator/images/qtcreator-heob.png
+++ /dev/null
diff --git a/doc/qtcreator/images/qtcreator-ios-preferences.png b/doc/qtcreator/images/qtcreator-ios-preferences.png
deleted file mode 100644
index 935a528d6c..0000000000
--- a/doc/qtcreator/images/qtcreator-ios-preferences.png
+++ /dev/null
diff --git a/doc/qtcreator/images/qtcreator-kit-selector-devices.webp b/doc/qtcreator/images/qtcreator-kit-selector-devices.webp
new file mode 100644
index 0000000000..7cb2b74e82
--- /dev/null
+++ b/doc/qtcreator/images/qtcreator-kit-selector-devices.webp
diff --git a/doc/qtcreator/images/qtcreator-live-preview-kit.png b/doc/qtcreator/images/qtcreator-live-preview-kit.png
deleted file mode 100644
index f76099ab82..0000000000
--- a/doc/qtcreator/images/qtcreator-live-preview-kit.png
+++ /dev/null
diff --git a/doc/qtcreator/images/qtcreator-mcu-kit.png b/doc/qtcreator/images/qtcreator-mcu-kit.png
deleted file mode 100644
index c218ad647e..0000000000
--- a/doc/qtcreator/images/qtcreator-mcu-kit.png
+++ /dev/null
diff --git a/doc/qtcreator/images/qtcreator-mcu-new-project.webp b/doc/qtcreator/images/qtcreator-mcu-new-project.webp
new file mode 100644
index 0000000000..270907c08b
--- /dev/null
+++ b/doc/qtcreator/images/qtcreator-mcu-new-project.webp
diff --git a/doc/qtcreator/images/qtcreator-mcu-options.png b/doc/qtcreator/images/qtcreator-mcu-options.png
deleted file mode 100644
index a7234466e4..0000000000
--- a/doc/qtcreator/images/qtcreator-mcu-options.png
+++ /dev/null
diff --git a/doc/qtcreator/images/qtcreator-new-project.webp b/doc/qtcreator/images/qtcreator-new-project.webp
index 1c0570b8b6..d073622419 100644
--- a/doc/qtcreator/images/qtcreator-new-project.webp
+++ b/doc/qtcreator/images/qtcreator-new-project.webp
diff --git a/doc/qtcreator/images/qtcreator-options-android-main.png b/doc/qtcreator/images/qtcreator-options-android-main.png
deleted file mode 100644
index 5ecea57d99..0000000000
--- a/doc/qtcreator/images/qtcreator-options-android-main.png
+++ /dev/null
diff --git a/doc/qtcreator/images/qtcreator-options-android-sdk-tools.png b/doc/qtcreator/images/qtcreator-options-android-sdk-tools.png
deleted file mode 100644
index f3057ce0bc..0000000000
--- a/doc/qtcreator/images/qtcreator-options-android-sdk-tools.png
+++ /dev/null
diff --git a/doc/qtcreator/images/qtcreator-preferences-android.webp b/doc/qtcreator/images/qtcreator-preferences-android.webp
new file mode 100644
index 0000000000..3c6e909df2
--- /dev/null
+++ b/doc/qtcreator/images/qtcreator-preferences-android.webp
diff --git a/doc/qtcreator/images/qtcreator-preferences-build-run-general.webp b/doc/qtcreator/images/qtcreator-preferences-build-run-general.webp
index c763689496..4826e22fc6 100644
--- a/doc/qtcreator/images/qtcreator-preferences-build-run-general.webp
+++ b/doc/qtcreator/images/qtcreator-preferences-build-run-general.webp
diff --git a/doc/qtcreator/images/qtcreator-preferences-debugger-gdb.webp b/doc/qtcreator/images/qtcreator-preferences-debugger-gdb.webp
index 9ac81bce22..c3c4798c55 100644
--- a/doc/qtcreator/images/qtcreator-preferences-debugger-gdb.webp
+++ b/doc/qtcreator/images/qtcreator-preferences-debugger-gdb.webp
diff --git a/doc/qtcreator/images/qtcreator-preferences-kits-mcu.webp b/doc/qtcreator/images/qtcreator-preferences-kits-mcu.webp
new file mode 100644
index 0000000000..cf61f131ec
--- /dev/null
+++ b/doc/qtcreator/images/qtcreator-preferences-kits-mcu.webp
diff --git a/doc/qtcreator/images/qtcreator-preferences-mcu.webp b/doc/qtcreator/images/qtcreator-preferences-mcu.webp
new file mode 100644
index 0000000000..83d6fd17e0
--- /dev/null
+++ b/doc/qtcreator/images/qtcreator-preferences-mcu.webp
diff --git a/doc/qtcreator/images/qtcreator-qml-performance-monitor.png b/doc/qtcreator/images/qtcreator-qml-performance-monitor.png
deleted file mode 100644
index 2f256ce3d6..0000000000
--- a/doc/qtcreator/images/qtcreator-qml-performance-monitor.png
+++ /dev/null
diff --git a/doc/qtcreator/images/qtcreator-qml-profiler-toolbar.webp b/doc/qtcreator/images/qtcreator-qml-profiler-toolbar.webp
new file mode 100644
index 0000000000..b0b7ba4d7c
--- /dev/null
+++ b/doc/qtcreator/images/qtcreator-qml-profiler-toolbar.webp
diff --git a/doc/qtcreator/images/qtcreator-qml-profiler.webp b/doc/qtcreator/images/qtcreator-qml-profiler.webp
new file mode 100644
index 0000000000..281c7c94e6
--- /dev/null
+++ b/doc/qtcreator/images/qtcreator-qml-profiler.webp
diff --git a/doc/qtcreator/images/qtcreator-scxml-editor.webp b/doc/qtcreator/images/qtcreator-scxml-editor.webp
index d57a50dfb7..f78f7ff3d3 100644
--- a/doc/qtcreator/images/qtcreator-scxml-editor.webp
+++ b/doc/qtcreator/images/qtcreator-scxml-editor.webp
diff --git a/doc/qtcreator/images/qtcreator-sidebar.png b/doc/qtcreator/images/qtcreator-sidebar.png
deleted file mode 100644
index 47d4e5e1f8..0000000000
--- a/doc/qtcreator/images/qtcreator-sidebar.png
+++ /dev/null
diff --git a/doc/qtcreator/images/qtcreator-sidebar.webp b/doc/qtcreator/images/qtcreator-sidebar.webp
new file mode 100644
index 0000000000..fdf8640025
--- /dev/null
+++ b/doc/qtcreator/images/qtcreator-sidebar.webp
diff --git a/doc/qtcreator/images/qtcreator-toggle-progress-bar.webp b/doc/qtcreator/images/qtcreator-toggle-progress-bar.webp
index c8438ae002..d4170d4bc1 100644
--- a/doc/qtcreator/images/qtcreator-toggle-progress-bar.webp
+++ b/doc/qtcreator/images/qtcreator-toggle-progress-bar.webp
diff --git a/doc/qtcreator/images/qtcreator-valgrind-memcheck.png b/doc/qtcreator/images/qtcreator-valgrind-memcheck.png
deleted file mode 100644
index 8131846ef5..0000000000
--- a/doc/qtcreator/images/qtcreator-valgrind-memcheck.png
+++ /dev/null
diff --git a/doc/qtcreator/images/qtcreator-valgrind-memcheck.webp b/doc/qtcreator/images/qtcreator-valgrind-memcheck.webp
new file mode 100644
index 0000000000..c60fdbb72d
--- /dev/null
+++ b/doc/qtcreator/images/qtcreator-valgrind-memcheck.webp
diff --git a/doc/qtcreator/images/qtcreator-welcome-open-projects.webp b/doc/qtcreator/images/qtcreator-welcome-open-projects.webp
index 5281669b40..05af411f2d 100644
--- a/doc/qtcreator/images/qtcreator-welcome-open-projects.webp
+++ b/doc/qtcreator/images/qtcreator-welcome-open-projects.webp
diff --git a/doc/qtcreator/images/qtcreator-welcome-session.png b/doc/qtcreator/images/qtcreator-welcome-session.png
deleted file mode 100644
index 669ec91423..0000000000
--- a/doc/qtcreator/images/qtcreator-welcome-session.png
+++ /dev/null
diff --git a/doc/qtcreator/images/qtcreator-welcome-session.webp b/doc/qtcreator/images/qtcreator-welcome-session.webp
new file mode 100644
index 0000000000..7a67042f1c
--- /dev/null
+++ b/doc/qtcreator/images/qtcreator-welcome-session.webp
diff --git a/doc/qtcreator/images/qtquick-example-setting-breakpoint1.png b/doc/qtcreator/images/qtquick-example-setting-breakpoint1.png
deleted file mode 100644
index 67da2556c7..0000000000
--- a/doc/qtcreator/images/qtquick-example-setting-breakpoint1.png
+++ /dev/null
diff --git a/doc/qtcreator/images/qtquick-example-setting-breakpoint1.webp b/doc/qtcreator/images/qtquick-example-setting-breakpoint1.webp
new file mode 100644
index 0000000000..0962179a6e
--- /dev/null
+++ b/doc/qtcreator/images/qtquick-example-setting-breakpoint1.webp
diff --git a/doc/qtcreator/images/qtquick-example-setting-breakpoint2.png b/doc/qtcreator/images/qtquick-example-setting-breakpoint2.png
deleted file mode 100644
index 788cacaf65..0000000000
--- a/doc/qtcreator/images/qtquick-example-setting-breakpoint2.png
+++ /dev/null
diff --git a/doc/qtcreator/images/qtquick-example-setting-breakpoint2.webp b/doc/qtcreator/images/qtquick-example-setting-breakpoint2.webp
new file mode 100644
index 0000000000..ab4b1c3cdf
--- /dev/null
+++ b/doc/qtcreator/images/qtquick-example-setting-breakpoint2.webp
diff --git a/doc/qtcreator/images/qtquick-example-setting-breakpoint3.png b/doc/qtcreator/images/qtquick-example-setting-breakpoint3.png
deleted file mode 100644
index 5d197ff92c..0000000000
--- a/doc/qtcreator/images/qtquick-example-setting-breakpoint3.png
+++ /dev/null
diff --git a/doc/qtcreator/images/qtquick-example-setting-breakpoint3.webp b/doc/qtcreator/images/qtquick-example-setting-breakpoint3.webp
new file mode 100644
index 0000000000..dfee8bc7cc
--- /dev/null
+++ b/doc/qtcreator/images/qtquick-example-setting-breakpoint3.webp
diff --git a/doc/qtcreator/images/qtquick-example-stack.png b/doc/qtcreator/images/qtquick-example-stack.png
deleted file mode 100644
index 943b0af3d7..0000000000
--- a/doc/qtcreator/images/qtquick-example-stack.png
+++ /dev/null
diff --git a/doc/qtcreator/images/qtquick-example-stack.webp b/doc/qtcreator/images/qtquick-example-stack.webp
new file mode 100644
index 0000000000..2bf986d004
--- /dev/null
+++ b/doc/qtcreator/images/qtquick-example-stack.webp
diff --git a/doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc b/doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc
index 77bc417d03..1c6ba73efc 100644
--- a/doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc
+++ b/doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc
@@ -1,4 +1,4 @@
-// Copyright (C) 2022 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 // **********************************************************************
@@ -8,136 +8,151 @@
 // **********************************************************************
 
 /*!
-    \previouspage creator-heob.html
-    \page creator-cpu-usage-analyzer.html
-    \nextpage creator-cppcheck.html
-
-    \title Analyzing CPU Usage
-
-    \QC is integrated with the Linux Perf tool that can be
-    used to analyze the CPU and memory usage of an application on embedded
-    devices and, to a limited extent, on Linux desktop platforms. The
-    Performance Analyzer uses the Perf tool bundled with the Linux kernel to
-    take periodic snapshots of the call chain of an application and visualizes
-    them in a timeline view or as a flame graph.
-
-    \section1 Using the Performance Analyzer
+    \page creator-how-to-analyze-cpu-usage.html
+    \previouspage creator-how-tos.html
 
-    The Performance Analyzer usually needs to be able to locate debug symbols for
-    the binaries involved.
+    \ingroup creator-how-to-analyze
 
-    Profile builds produce optimized binaries with separate debug symbols and
-    should generally be used for profiling.
+    \title Analyze CPU usage
 
-    To manually set up a build configuration that generates separate debug
-    symbols, edit the project build settings:
+    With Perf, you can analyze the CPU and memory usage of an application
+    on Linux desktop and embedded devices. \l{Performance Analyzer} uses the
+    Perf tool bundled with the Linux kernel to take periodic snapshots of
+    the call chain of an application and visualizes them in a timeline view
+    or as a flame graph.
 
-    \list 1
-        \li To generate debug symbols also for applications compiled in release
-            mode, select \uicontrol {Projects}, and then select
-            \uicontrol Enable in the \uicontrol {Separate debug info} field.
-
-        \li Select \uicontrol Yes to recompile the project.
+    Usually, Performance Analyzer needs debug symbols for the profiled
+    binaries. Profile builds produce optimized binaries with separate debug
+    symbols, so use them for profiling.
 
-    \endlist
+    \section1 Collect data
 
-    You can start the Performance Analyzer in the following ways:
+    Start Performance Analyzer in the following ways to collect data:
 
     \list
-        \li Select \uicontrol Analyze > \uicontrol {Performance Analyzer} to
+        \li Go to \uicontrol Analyze > \uicontrol {Performance Analyzer} to
             profile the current application.
 
-        \li Select the
-            \inlineimage icons/qtcreator-analyze-start-button.png
-            (\uicontrol Start) button to start the application from the
+        \li Select \inlineimage icons/qtcreator-analyze-start-button.png
+            (\uicontrol Start) to start the application from the
             \uicontrol {Performance Analyzer}.
 
-            \inlineimage qtcreator-performance-analyzer-toolbar.png "Performance Analyzer toolbar"
+            \image qtcreator-performance-analyzer-toolbar.png {Performance Analyzer toolbar}
 
     \endlist
 
-    \note If data collection does not start automatically, select the
+    \note If data collection does not start automatically, select
     \inlineimage icons/recordfill.png
-    (\uicontrol {Collect profile data}) button.
+    (\uicontrol {Collect profile data}).
 
     When you start analyzing an application, the application is launched, and
-    the Performance Analyzer immediately begins to collect data. This is indicated
-    by the time running in the \uicontrol Recorded field. However, as the data
+    Performance Analyzer immediately begins to collect data. This is indicated
+    by the time running in \uicontrol Recorded. However, as the data
     is passed through the Perf tool and an extra helper program bundled with
     \QC, and both buffer and process it on the fly, data may arrive in \QC
-    several seconds after it was generated. An estimate for this delay is given
-    in the \uicontrol {Processing delay} field.
+    several seconds after it was generated. \uicontrol {Processing delay} shows
+    an estimate of the delay.
 
-    Data is collected until you select the
-    \uicontrol {Stop collecting profile data} button or terminate the
-    application.
+    Data is collected until you select \inlineimage icons/recordfill.png
+    (\uicontrol {Stop collecting profile data}) or close the application.
 
-    Select the \uicontrol {Stop collecting profile data} button to disable the
+    Select \uicontrol {Stop collecting profile data} to turn off the
     automatic start of the data collection when an application is launched.
-    Profile data will still be generated, but \QC will discard it until you
+    Profile data is still generated, but \QC discards it until you
     select the button again.
 
-    \section1 Profiling Memory Usage on Devices
+    \section1 Profile memory usage on devices
 
-    To create trace points for profiling memory usage on a target device, select
-    \uicontrol Analyze > \uicontrol {Performance Analyzer Options} >
-    \uicontrol {Create Memory Trace Points} or select
-    \inlineimage icons/create-tracepoint.png
-    on the \uicontrol {Performance Analyzer} toolbar.
+    To create trace points for profiling memory usage on a target device:
 
-    In the \uicontrol {Create Memory Trace Points} dialog, you can modify the
+    \list
+        \li Go to \uicontrol Analyze > \uicontrol {Performance Analyzer Options}
+            > \uicontrol {Create Memory Trace Points}.
+        \li Select \inlineimage icons/create-tracepoint.png
+            on the \uicontrol {Performance Analyzer} toolbar.
+    \endlist
+
+    In the \uicontrol {Create Memory Trace Points} dialog, modify the
     script to run.
 
-    \image qtcreator-performance-analyzer-create-memory-trace-points.png "Create Memory Trace Points dialog"
+    \image qtcreator-performance-analyzer-create-memory-trace-points.png {Create Memory Trace Points dialog}
 
     If you need root privileges to run scripts as root, select the privileges to
-    use in the \uicontrol {Elevate privileges using} field.
+    use in \uicontrol {Elevate privileges using}.
 
     Select \uicontrol OK to run the script.
 
     To add events for the trace points, see \l{Choosing Event Types}.
 
-    You can record a memory trace to view usage graphs in the samples rows of
+    Record a memory trace to view usage graphs in the samples rows of
     the timeline and to view memory allocations, peaks, and releases in the
     flame graph.
 
-    \section1 Specifying Performance Analyzer Settings
+    \section1 Generate separate debug info for qmake projects
+
+    To manually set up a build configuration that generates debug symbols also
+    for applications compiled for release, edit the build settings of a qmake
+    project:
+
+    \list 1
+        \li Go to \uicontrol {Projects} > \uicontrol {Build Settings}.
+        \li In \uicontrol {Separate debug info}, select \uicontrol Enable.
+        \li Select \uicontrol Yes to recompile the project.
+    \endlist
+
+    \sa {Analyze}{How To: Analyze}, {Analyzers}, {Performance Analyzer},
+    {Analyzing Code}
+*/
+
+/*!
+    \page creator-cpu-usage-analyzer.html
+    \previouspage creator-reference.html
+
+    \ingroup creator-reference-analyzer
+
+    \title Performance Analyzer
+
+    \brief Analyze the CPU and memory usage of an application on Linux desktop
+    and embedded devices.
+
+    To set global preferences for Performance Analyzer, go to \preferences >
+    \uicontrol Analyzer > \uicontrol {CPU Usage}.
+
+    To set preferences for a particular run configuration, go to
+    \uicontrol Projects > \uicontrol Run, and then select \uicontrol Details
+    next to \uicontrol {Performance Analyzer Settings}.
 
-    To specify global settings for the Performance Analyzer, select
-    \preferences > \uicontrol Analyzer >
-    \uicontrol {CPU Usage}. For each run configuration, you can also
-    use specialized settings. Select \uicontrol Projects > \uicontrol Run, and
-    then select \uicontrol Details next to
-    \uicontrol {Performance Analyzer Settings}.
+    \image qtcreator-performance-analyzer-settings.png {Performance Analyzer Settings}
 
-    \image qtcreator-performance-analyzer-settings.png
+    To edit the settings for the current run configuration, select the
+    drop down menu next to \inlineimage icons/recordfill.png on the
+    Performance Analyzer toolbar.
 
-    To edit the settings for the current run configuration, you can also select
-    the dropdown menu next to the \uicontrol {Collect profile data} button.
+    \image qtcreator-performance-analyzer-toolbar.png {Performance Analyzer toolbar}
 
-    \section2 Choosing Event Types
+    \section1 Choosing Event Types
 
-    In the \uicontrol Events table, you can specify which events should trigger
-    the Performance Analyzer to take a sample. The most common way of analyzing
+    The events table lists the events that trigger Performance Analyzer to take
+    a sample. The most common way of analyzing
     CPU usage involves periodic sampling, driven by hardware performance
     counters that react to the number of instructions or CPU cycles executed.
-    Alternatively, a software counter that uses the CPU clock can be chosen.
+    You can also select a software counter that uses the CPU clock.
 
     Select \uicontrol {Add Event} to add events to the table.
-    In the \uicontrol {Event Type} column, you can choose the general type of
+    In \uicontrol {Event Type}, select the general type of
     event to be sampled, most commonly \uicontrol {hardware} or
-    \uicontrol {software}. In the \uicontrol {Counter} column, you can choose
-    which specific counter should be used for the sampling. For example,
+    \uicontrol {software}. In \uicontrol {Counter}, select the counter
+    for the sampling. For example,
     \uicontrol {instructions} in the \uicontrol {hardware} group or
     \uicontrol {cpu-clock} in the \uicontrol {software} group.
 
     More specialized sampling, for example by cache misses or cache hits, is
-    possible. However, support for it depends on specific features of the CPU
-    involved. For those specialized events, you can give more detailed sampling
-    instructions in the \uicontrol {Operation} and \uicontrol {Result} columns.
-    For example, you can choose a \uicontrol {cache} event for
+    possible. However, support for it depends on specific features of the CPU.
+    For those specialized events, give more detailed sampling
+    instructions in \uicontrol {Operation} and \uicontrol {Result}.
+    For example, select a \uicontrol {cache} event for
     \uicontrol {L1-dcache} on the \uicontrol {load} operation with a result
-    of \uicontrol {misses}. That would sample L1-dcache misses on reading.
+    of \uicontrol {misses} to sample L1-dcache misses on reading.
 
     Select \uicontrol {Remove Event} to remove the selected event from the
     table.
@@ -145,29 +160,28 @@
     Select \uicontrol {Use Trace Points} to replace the current selection of
     events with trace points defined on the target device and set the
     \uicontrol {Sample mode} to \uicontrol {event count} and the
-    \uicontrol {Sample period} to \c {1}. If the trace points on the target
-    were defined using the \uicontrol {Create Trace Points} option, the
-    Performance Analyzer will automatically use them to profile memory usage.
+    \uicontrol {Sample period} to \c {1}. If \uicontrol {Create Trace Points}
+    defines the trace points on the target, Performance Analyzer automatically
+    uses them to profile memory usage.
 
-    Select \uicontrol {Reset} to revert the selection of events, as well as the
+    Select \uicontrol {Reset} to revert the selection of events, as well as
     \uicontrol {Sample mode} and \uicontrol {Sample period} to the default
     values.
 
-    \section2 Choosing a Sampling Mode and Period
+    \section1 Choosing a Sampling Mode and Period
 
-    In the \uicontrol {Sample mode} and \uicontrol {Sample period} fields, you
-    can specify how samples are triggered:
+    In \uicontrol {Sample mode} and \uicontrol {Sample period}, specify how
+    samples are triggered:
 
     \list
 
         \li Sampling by \uicontrol {event count} instructs the kernel to take
             a sample every \c n times one of the chosen events has occurred,
-            where \c n is specified in the \uicontrol {Sample period} field.
+            where \c n is set in \uicontrol {Sample period}.
 
         \li Sampling by \uicontrol {frequency (Hz)} instructs the kernel to try and
             take a sample \c n times per second, by automatically adjusting the
-            sampling period. Specify \c n in the \uicontrol {Sample period}
-            field.
+            sampling period. Set \c n in \uicontrol {Sample period}.
 
     \endlist
 
@@ -178,15 +192,15 @@
     There may be a significant difference between the sampling period you
     request and the actual result.
 
-    In general, if you configure the Performance Analyzer to collect more data
+    In general, if you configure Performance Analyzer to collect more data
     than it can transmit over the connection between the target and the host
     device, the application may get blocked while Perf is trying to send the
     data, and the processing delay may grow excessively. You should then change
-    the \uicontrol {Sample period} or the \uicontrol {Stack snapshot size}.
+    the value of \uicontrol {Sample period} or \uicontrol {Stack snapshot size}.
 
-    \section2 Selecting Call Graph Mode
+    \section1 Selecting Call Graph Mode
 
-    In the \uicontrol {Call graph mode} field, you can specify how the
+    In \uicontrol {Call graph mode}, you can specify how
     Performance Analyzer recovers call chains from your application:
 
     \list
@@ -210,32 +224,32 @@
     Qt and most system libraries are compiled without frame pointers by
     default, so the frame pointer mode is only useful with customized systems.
 
-    \section2 Setting Stack Snapshot Size
+    \section1 Setting Stack Snapshot Size
 
-    The Performance Analyzer will analyze and \e unwind the stack snapshots
-    generated by Perf in dwarf mode. Set the size of the stack snapshots in the
-    \uicontrol {Stack snapshot size} field. Large stack snapshots result in a
+    Performance Analyzer analyzes and \e unwinds the stack snapshots
+    generated by Perf in dwarf mode. Set the size of the stack snapshots in
+    \uicontrol {Stack snapshot size}. Large stack snapshots result in a
     larger volume of data to be transferred and processed. Small stack
     snapshots may fail to capture call chains of highly recursive applications
     or other intense stack usage.
 
-    \section2 Adding Command-Line Options for Perf
+    \section1 Adding Command-Line Options for Perf
 
-    You can specify additional command-line options to be passed to Perf when
-    recording data in the \uicontrol {Additional arguments} field. You may want
-    to specify \c{--no-delay} or \c{--no-buffering} to reduce the processing
+    Set additional command-line options to pass to Perf when
+    recording data in \uicontrol {Additional arguments}. Set \c{--no-delay}
+    or \c{--no-buffering} to reduce the processing
     delay. However, those options are not supported by all versions of Perf and
     Perf may not start if an unsupported option is given.
 
-    \section2 Resolving Names for JIT-compiled JavaScript Functions
+    \section1 Resolving Names for JIT-compiled JavaScript Functions
 
     Since version 5.6.0, Qt can generate perf.map files with information about
-    JavaScript functions. The Performance Analyzer will read them and show the
+    JavaScript functions. Performance Analyzer will read them and show the
     function names in the \uicontrol Timeline, \uicontrol Statistics, and
     \uicontrol {Flame Graph} views. This only works if the process being
     profiled is running on the host computer, not on the target device. To
     switch on the generation of perf.map files, add the environment variable
-    \c QV4_PROFILE_WRITE_PERF_MAP to the \uicontrol {Run Environment} and set
+    \c QV4_PROFILE_WRITE_PERF_MAP to \uicontrol {Run Environment} and set
     its value to \c 1.
 
     \section1 Analyzing Collected Data
@@ -243,36 +257,35 @@
     The \uicontrol Timeline view displays a graphical representation of CPU
     usage per thread and a condensed view of all recorded events.
 
-    \image qtcreator-performance-analyzer-timeline.png "Performance Analyzer"
+    \image qtcreator-performance-analyzer-timeline.png {Performance Analyzer}
 
     Each category in the timeline describes a thread in the application. Move
     the cursor on an event (5) on a row to see how long it takes and which
     function in the source it represents. To display the information only when
-    an event is selected, disable the
-    \uicontrol {View Event Information on Mouseover} button (4).
+    an event is selected, turn off
+     \uicontrol {View Event Information on Mouseover} (4).
 
     The outline (9) summarizes the period for which data was collected. Drag
     the zoom range (7) or click the outline to move on the outline. You can
-    also move between events by selecting the
-    \uicontrol {Jump to Previous Event} and \uicontrol {Jump to Next Event}
-    buttons (1).
+    also move between events by selecting \uicontrol {Jump to Previous Event}
+    and \uicontrol {Jump to Next Event} (1).
 
-    Select the \uicontrol {Show Zoom Slider} button (2) to open a slider that
-    you can use to set the zoom level. You can also drag the zoom handles (8).
+    Select \uicontrol {Show Zoom Slider} button (2) to open a slider that
+    sets the zoom level. You can also drag the zoom handles (8).
     To reset the default zoom level, right-click the timeline to open the
     context menu, and select \uicontrol {Reset Zoom}.
 
     \section2 Selecting Event Ranges
 
-    You can select an event range (6) to view the time it represents or to zoom
-    into a specific region of the trace. Select the \uicontrol {Select Range}
-    button (3) to activate the selection tool. Then click in the timeline to
+    Select an event range (6) to view the time it represents or to zoom
+    into a specific region of the trace. Select \uicontrol {Select Range}
+    (3) to activate the selection tool. Then click in the timeline to
     specify the beginning of the event range. Drag the selection handle to
     define the end of the range.
 
-    You can use event ranges also to measure delays between two subsequent
+    Use event ranges also to measure delays between two subsequent
     events. Place a range between the end of the first event and the beginning
-    of the second event. The \uicontrol Duration field displays the delay
+    of the second event. \uicontrol Duration shows the delay
     between the events in milliseconds.
 
     To zoom into an event range, double-click it.
@@ -294,10 +307,10 @@
     events to move the cursor in the code editor to the part of the code the
     event is associated with.
 
-    As the Perf tool only collects periodic samples, the Performance Analyzer
+    As the Perf tool only collects periodic samples, Performance Analyzer
     cannot determine the exact time when a function was called or when it
     returned. You can, however, see exactly when a sample was taken in the
-    second row of each thread. The Performance Analyzer assumes that if the same
+    second row of each thread. Performance Analyzer assumes that if the same
     function is present at the same place in the call chain in multiple
     consecutive samples, then this represents a single call to the respective
     function. This is, of course, a simplification. Also, there may be other
@@ -369,7 +382,7 @@
     taken for a certain function, relative to the same aspect of all samples
     together. The nesting shows which functions were called by which other ones.
 
-    The \uicontrol {Visualize} button lets you choose what aspect to show in the
+    The \uicontrol {Visualize} button lets you select what aspect to show in the
     \uicontrol {Flame Graph}.
 
     \list
@@ -396,7 +409,7 @@
     \uicontrol {Releases} modes will only show any data if samples from memory
     trace points have been recorded.
 
-    \section2 Interaction between the views
+    \section2 Interaction between the Views
 
     When you select a stack frame in either of the \uicontrol {Timeline},
     \uicontrol {Flame Graph}, or \uicontrol {Statistics} views, information
@@ -415,7 +428,7 @@
 
     \image qtcreator-cpu-usage-analyzer-load-perf-trace.png
 
-    The Performance Analyzer needs to know the context in which the
+    Performance Analyzer needs to know the context in which the
     data was recorded to find the debug symbols. Therefore, you have to specify
     the kit that the application was built with and the folder where the
     application executable is located.
@@ -423,15 +436,15 @@
     The Perf data files are generated by calling \c {perf record}. Make sure to
     generate call graphs when recording data by starting Perf with the
     \c {--call-graph} option. Also check that the necessary debug symbols are
-    available to the Performance Analyzer, either at a standard location
+    available to Performance Analyzer, either at a standard location
     (\c /usr/lib/debug or next to the binaries), or as part of the Qt package
     you are using.
 
-    The Performance Analyzer can read Perf data files generated in either frame
+    Performance Analyzer can read Perf data files generated in either frame
     pointer or dwarf mode. However, to generate the files correctly, numerous
     preconditions have to be met. All system images for the
-    \l{https://doc.qt.io/Boot2Qt/qtdc-supported-platforms.html}
-    {Boot2Qt:Supported Target Devices and Development Hosts} are correctly set
+    \l{Support Levels for Target Hardware}{supported embedded platforms}
+    are correctly set
     up for profiling in the dwarf mode. For other devices, check whether Perf
     can read back its own data in a sensible way by checking the output of
     \c {perf report} or \c {perf script} for the recorded Perf data files.
@@ -443,15 +456,15 @@
     \uicontrol {Performance Analyzer Options}. This format is self-contained, and
     therefore loading it does not require you to specify the recording
     environment. You can transfer such trace files to a different computer
-    without any tool chain or debug symbols and analyze them there.
+    without any toolchain or debug symbols and analyze them there.
 
     \section1 Troubleshooting
 
-    The Performance Analyzer might fail to record data for the following reasons:
+    Performance Analyzer might fail to record data for the following reasons:
 
     \list
         \li Perf events may be globally disabled on your system.
-            The preconfigured \l Boot2Qt images come with perf events enabled.
+            The preconfigured \l Boot2Qt images come with Perf events enabled.
             For a custom configuration you need to make sure that the file
             \c {/proc/sys/kernel/perf_event_paranoid} contains a value smaller
             than \c {2}. For maximum flexibility in recording traces you can
@@ -471,16 +484,16 @@
             the values of the \uicontrol {Stack snapshot size} or
             \uicontrol {Sample period} settings.
         \li Perf may be buffering the data forever, never sending it. Add
-            \c {--no-delay} or \c {--no-buffering} to the
-            \uicontrol {Additional arguments} field.
+            \c {--no-delay} or \c {--no-buffering} to
+            \uicontrol {Additional arguments}.
         \li Some versions of Perf will not start recording unless given a
-            certain minimum sampling frequency. Try with a
-            \uicontrol {Sample period} value of 1000.
+            certain minimum sampling frequency. Try setting
+            \uicontrol {Sample period} to 1000.
         \li On some devices, in particular various i.MX6 Boards, the hardware
             performance counters are dysfunctional and the Linux kernel may
             randomly fail to record data after some time. Perf can use different
             types of events to trigger samples. You can get a list of available
-            event types by running \c {perf list} on the device and then choose
+            event types by running \c {perf list} on the device and then select
             the respective event types in the settings. The choice of event type
             affects the performance and stability of the sampling. The
             \c {cpu-clock} \c {software} event is a safe but relatively slow
@@ -489,8 +502,7 @@
             reboot the device. The kernel may have disabled important parts of
             the performance counters system.
         \li Perf might not be installed. The way to install it depends on your
-            Linux distribution. For example, you might try the following
-            commands:
+            Linux distribution. For example, try the following commands:
 
             \list
                 \li On Ubuntu 22.04:
@@ -506,5 +518,5 @@
     The \l {Application Output} view shows some information even if the
     Performance Analyzer displays error messages.
 
-    \sa {Profiling Function Execution}
+    \sa {Analyze}{How To: Analyze}, {Analyzers}, {Analyzing Code}
 */
diff --git a/doc/qtcreator/src/analyze/creator-analyze.qdoc b/doc/qtcreator/src/analyze/creator-analyze.qdoc
index f57d97b8c0..e2333cee77 100644
--- a/doc/qtcreator/src/analyze/creator-analyze.qdoc
+++ b/doc/qtcreator/src/analyze/creator-analyze.qdoc
@@ -1,4 +1,4 @@
-// Copyright (C) 2023 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 // **********************************************************************
@@ -17,70 +17,139 @@
     To use a code analysis tool, select it in the \uicontrol {Analyze Menu} or
     in the pull-down menu of the \inlineimage icons/qtcreator-debug-button.png
     (\uicontrol {Start Debugging of Startup Project}) button.
-    When you are in the \uicontrol Debug mode, you can switch between tools by
-    selecting them in the menu on the debugger toolbar.
+    In the \uicontrol Debug mode, switch between tools by selecting them in the
+    menu on the debugger toolbar.
 
-    You can drag and drop the views in the \uicontrol Debug mode to new
+    \image qtcreator-performance-analyzer-toolbar.png {Performance Analyzer in Debug mode}
+
+    Drag the views in the \uicontrol Debug mode to new
     positions on the screen. The size and position of views are saved for future
     sessions. Select \uicontrol View > \uicontrol Views >
     \uicontrol {Reset to Default Layout} to reset the views to their original
     sizes and positions.
 
-    You can use the following code analysis tools in the \uicontrol Debug
-    mode:
+    \section1 Improving QML Performance
+
+    \QC comes with the \l{Profiling QML Applications}{QML Profiler} for
+    inspecting binding evaluations and signal handling when running QML code.
+    This is useful for identifying potential bottlenecks, especially in the
+    evaluation of bindings.
+
+    \section1 Finding Issues in QML Code
+
+    Run \l{JavaScript and QML Checks}{static checks} on the QML and JavaScript
+    code in your project to find common problems, similarly to using
+    \l{http://www.jslint.com}{JSLint}.
+
+    \section1 Finding Issues in C++ Code with Clang Tools
+
+    \QC comes with the following Clang tools for finding problems in C, C++, and
+    Objective-C source code by using static analysis:
 
     \list
+        \li \l{https://clang.llvm.org/extra/clang-tidy/}{Clang-Tidy}, which
+            has diagnostics and fixes for typical programming errors,
+            such as style violations or interface misuse.
+        \li \l{https://github.com/KDE/clazy/blob/master/README.md}{Clazy}, which
+            helps Clang understand Qt semantics. It displays Qt-related compiler
+            warnings, ranging from unnecessary memory allocation to misuse of
+            API and has refactoring actions for fixing some of the issues.
+    \endlist
 
-        \li \l{Profiling QML Applications}{QML Profiler}
+    \section1 Finding Issues in C++ Code with Cppcheck
 
-            Inspect binding evaluations, signal handling, and
-            painting operations when running QML code. This is useful for
-            identifying potential bottlenecks, especially in the evaluation
-            of bindings.
+    Install the \l{http://cppcheck.sourceforge.net/}{Cppcheck} static analysis
+    tool to detect undefined behavior and dangerous coding constructs in
+    C++ code. Cppcheck analyzes the source code without actually running the
+    application.
 
-        \li \l{Checking Code Coverage}{Coco}
+    \section1 Checking Code Coverage
 
-            Analyze the way an application runs as part of a test suite, for
-            example, and use the results to make the tests more efficient and
-            complete.
+    Install the \l{https://doc.qt.io/coco/}{Coco} code coverage toolchain for
+    Tcl, QML, C# and C/C++ programs on \macOS, Linux, or Windows to analyze the
+    way an application runs as part of a test suite, for example. Use the
+    results to make the tests more efficient and complete.
 
-        \li \l{Prevent code erosion}{Axivion}
+    You can:
 
-            Do static code analysis and architecture analysis to detect and
-            eliminate unnecessary complexity of code.
+    \list
+        \li Find untested code sections.
+        \li Find redundant tests which can then be eliminated. Coco can
+            identify portions of the source code that are covered by a test. It
+            can detect whether a new test covers lines in the source code that
+            the existing tests do not cover.
+        \li Find dead code by displaying code that is never executed.
+        \li Calculate the optimum test execution order so as to maximize
+            test coverage for each run. This is particularly useful for manual
+            testing.
+        \li Analyze two separate versions of an application and compare the
+            differences. This makes it possible to see which tests are affected
+            by source code modifications and also to get some measure of the
+            test coverage of a patch or hot fix.
+        \li Measure the execution time of applications and tests.
+    \endlist
 
-        \li \l{Using Valgrind Code Analysis Tools}{Valgrind Code Analysis Tools}
+    \section1 Preventing Code Erosion
 
-            Detect problems in memory management by using the Memcheck
-            tool and find cache misses in the code by using the Callgrind tool.
+    Install \l{https://www.axivion.com/en/products/axivion-suite/}{Axivion Suite}
+    to protect software from erosion. With static code analysis,
+    architecture analysis, and code-smells-detection, you can:
 
-        \li \l{Clang Tools}
+    \list
+        \li Check the source code for potential runtime errors.
+        \li Use metrics to generate quantitative information about the
+            internal quality of the source code.
+        \li Run style checks to achieve compliance with coding guidelines.
+        \li Detect both duplicates and similar pieces of code in the source code.
+        \li Recognize cyclical dependencies at different levels.
+        \li Detect unreachable code.
+    \endlist
 
-            Detect problems in C, C++, and Objective-C programs by
-            using Clang-Tidy and Clazy.
+    \section1 Profiling with Valgrind Tools
 
-        \li \l{Detecting Memory Leaks with Heob}{Heob}
+    Install Memcheck and Callgrind from \l{Valgrind's Tool Suite} to detect
+    memory leaks and profile function execution.
 
-            Use the Heob heap observer on Windows to detect buffer
-            overruns and memory leaks.
+    You can run the Valgrind tools either \e locally on the development host or
+    \e remotely on another host. You can use them to analyze both applications
+    for which you set up a project in \QC and applications for which you do not
+    have a project.
 
-        \li \l{Analyzing CPU Usage}{Performance Analyzer}
+    Valgrind tools are supported locally only on Linux and \macos. However,
+    according to Valgrind.org, support on \macos 10.8 and 10.9 is experimental and
+    mostly broken. You can run the tools on a remote Linux machine or device
+    from any development host.
 
-            Analyze the CPU usage of embedded applications and Linux
-            desktop applications with the Performance Analyzer that integrates
-            the Linux Perf tool.
+    To run the Valgrind tools to analyze an application for which you have a
+    project, open the project in \QC and select the kit to run the project. The
+    kit specifies whether the Valgrind tools are run locally or remotely.
 
-        \li \l{Analyzing Code with Cppcheck}{Cppcheck}
+    For more information about analyzing applications for which you do not have
+    a project, see \l{Run Valgrind tools on external applications}.
 
-            Use the experimental Cppcheck plugin to detect undefined
-            behavior and dangerous coding constructs.
+    To set preferences for the Valgrind tools, select \preferences >
+    \uicontrol Analyzer. You can override the general
+    settings for each project in the \uicontrol {Run Settings} for the project.
 
-        \li \l{Visualizing Chrome Trace Events}{Chrome Trace Format Visualizer}
+    \section1 Detecting Memory Leaks with Heob
 
-            Use the Chrome Trace Format (CTF) Visualizer to view
-            Chrome trace events. This is especially useful when viewing
-            large trace files that are difficult to visualize using the
-            built-in trace-viewer (\c{chrome://tracing}).
-    \endlist
+    On Windows, install the \l{https://github.com/ssbssa/heob}{Heob}
+    heap observer to detect buffer overruns and memory leaks.
+
+    \section1 Analyzing CPU Usage
+
+    On Linux, use Perf to analyze the CPU and memory usage of an application
+    on Linux desktop and embedded devices.
+
+    \l{Performance Analyzer} uses the Perf tool bundled with the Linux kernel to
+    take periodic snapshots of the call chain of an application and visualizes
+    them in a timeline view or as a flame graph.
+
+    \section1 Visualizing Chrome Trace Events
+
+    Use the \l{Chrome Trace Format Visualizer} to view Chrome trace events. This
+    is especially useful when viewing large trace files that are difficult to
+    visualize using the built-in trace-viewer (\c{chrome://tracing}).
 
+    \sa {Analyze}{How To: Analyze}, {Analyzers}
 */
diff --git a/doc/qtcreator/src/analyze/creator-axivion.qdoc b/doc/qtcreator/src/analyze/creator-axivion.qdoc
index ddfbcdf288..9a827f7bb4 100644
--- a/doc/qtcreator/src/analyze/creator-axivion.qdoc
+++ b/doc/qtcreator/src/analyze/creator-axivion.qdoc
@@ -9,20 +9,6 @@
 
     \title Prevent code erosion
 
-    \l{https://www.axivion.com/en/products/axivion-suite/}{Axivion Suite} is
-    a tool suite for protecting software from erosion. With static code analysis,
-    architecture analysis, and code-smells-detection, you can:
-
-    \list
-        \li Check the source code for potential runtime errors.
-        \li Use metrics to generate quantitative information about the
-            internal quality of the source code.
-        \li Run style checks to achieve compliance with coding guidelines.
-        \li Detect both duplicates and similar pieces of code in the source code.
-        \li Recognize cyclical dependencies at different levels.
-        \li Detect unreachable code.
-    \endlist
-
     Connect to an Axivion dashboard server from \QC to view results of code
     analysis.
 
@@ -132,8 +118,9 @@
     select the link in the details or in the \uicontrol {Right Path}
     or \uicontrol {Target Path} column.
 
-    \sa {Enable and disable plugins}, {Link projects to Axivion dashboards},
-    {Axivion}
+    \sa {Enable and disable plugins}, {Analyze}{How To: Analyze},
+    {Link projects to Axivion dashboards}, {Analyzers}, {Axivion},
+    {Analyzing Code}
 */
 
 /*!
diff --git a/doc/qtcreator/src/analyze/creator-clang-static-analyzer.qdoc b/doc/qtcreator/src/analyze/creator-clang-static-analyzer.qdoc
index b1b1cd9a8f..be7eda671d 100644
--- a/doc/qtcreator/src/analyze/creator-clang-static-analyzer.qdoc
+++ b/doc/qtcreator/src/analyze/creator-clang-static-analyzer.qdoc
@@ -15,22 +15,6 @@
 
     \title Analyze code with Clang-Tidy and Clazy
 
-    \QC comes with the following Clang tools for finding problems in C, C++, and
-    Objective-C source code by using static analysis:
-
-    \list
-
-        \li \l{https://clang.llvm.org/extra/clang-tidy/}{Clang-Tidy}, which
-            has diagnostics and fixes for typical programming errors,
-            such as style violations or interface misuse.
-
-        \li \l{https://github.com/KDE/clazy/blob/master/README.md}{Clazy}, which
-            helps Clang understand Qt semantics. It displays Qt related compiler
-            warnings, ranging from unnecessary memory allocation to misuse of
-            API and has refactoring actions for fixing some of the issues.
-
-    \endlist
-
     \note The Clang static analyzer checks are a part of Clang-Tidy. To use
     the checks, you must create a custom configuration for the Clang tools and
     enable them for Clang-Tidy.
@@ -106,7 +90,8 @@
     to load diagnostics from \l{https://yaml.org/}{YAML} files that you exported
     using the \c {-export fixes} option.
 
-    \sa {Configure Clang Diagnostics}, {Speficy Clang tools settings},
+    \sa {Check code syntax}, {Configure Clang Diagnostics},
+    {Analyze}{How To: Analyze}, {Specify Clang tools settings}, {Analyzers},
     {Clang Tools}
 */
 
@@ -116,7 +101,7 @@
 
     \ingroup creator-how-to-projects-configure
 
-    \title Speficy Clang tools settings
+    \title Specify Clang tools settings
 
     To set Clang-Tidy and Clazy checks to run for the current project:
 
@@ -189,7 +174,7 @@
     \endlist
 
     \sa {Configure Clang diagnostics}, {Analyze code with Clang-Tidy and Clazy},
-    {Speficy Clang tools settings}
+    {Specify Clang tools settings}
 */
 
 /*!
@@ -311,5 +296,5 @@
     file into the \uicontrol {Edit Checks as String} field, select additional
     checks, and copy-paste the contents of the field to the .clang-tidy file.
 
-    \sa {Analyze code with Clang-Tidy and Clazy}, {Speficy Clang tools settings}, {Clang Tools}
+    \sa {Analyze code with Clang-Tidy and Clazy}, {Specify Clang tools settings}, {Clang Tools}
 */
diff --git a/doc/qtcreator/src/analyze/creator-coco.qdoc b/doc/qtcreator/src/analyze/creator-coco.qdoc
index 341db9fc09..4b1337e123 100644
--- a/doc/qtcreator/src/analyze/creator-coco.qdoc
+++ b/doc/qtcreator/src/analyze/creator-coco.qdoc
@@ -2,72 +2,46 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \previouspage creator-qml-performance-monitor.html
     \page creator-coco.html
-    \nextpage creator-axivion.html
+    \previouspage creator-how-tos.html
 
-    \title Checking Code Coverage
+    \ingroup creator-how-to-analyze
 
-    \l{https://doc.qt.io/coco/}{Coco} is a complete code coverage tool chain for
-    Tcl, QML, C# and C/C++ programs, which runs on \macOS, Linux, and Windows.
+    \title Check code coverage
 
-    Coco analyzes the way an application runs, as part of a test suite,
-    for example. The results enable you to make the tests more efficient and
-    complete.
-
-    You can:
-
-    \list
-        \li Find untested code sections.
-        \li Find redundant tests which can then be eliminated. Coco can
-            identify portions of the source code that are covered by a test. It
-            can detect whether a new test covers lines in the source code that
-            the existing tests do not cover.
-        \li Find dead code by displaying code that is never executed.
-        \li Calculate the optimum test execution order so as to maximize
-            test coverage for each run. This is particularly useful for manual
-            testing.
-        \li Analyze two separate versions of an application and compare the
-            differences. This makes it possible to see which tests are affected
-            by source code modifications and also to get some measure of the
-            test coverage of a patch or hot fix.
-        \li Measure the execution time of applications and tests.
-    \endlist
-
-    The experimental Coco plugin integrates Coco CoverageBrowser into \QC.
-    It enables you to analyze the test coverage by loading an instrumentation
-    database (a .csmes file), which was generated by Coco CoverageScanner.
-    It is currently supported only on Windows, with Coco version 6.0,
-    or later.
+    With Coco CoverageBrowser, you can analyze the test coverage by loading an
+    instrumentation database (a .csmes file), which was generated by Coco
+    CoverageScanner. The experimental Coco plugin is currently supported only on
+    Windows, with Coco version 6.0, or later.
 
     To use the plugin, you must download and install Coco.
 
     \note Enable the Coco plugin to use it.
 
-    \section1 Configuring Coco
+    \section1 Configure Coco
 
     \list 1
-        \li Select \uicontrol Analyze > \uicontrol {Squish Coco}.
-            \image qtcreator-coco.png "Coco CoverageBrowser and CSMes file"
+        \li Go to \uicontrol Analyze > \uicontrol {Squish Coco}.
+            \image qtcreator-coco.png {Coco CoverageBrowser and CSMes file}
         \li In \uicontrol {CoverageBrowser}, enter the path to the Coco
             coverage browser to use for analyzing a .csmes file.
         \li In \uicontrol CSMes, select the instrumentation database to load.
         \li Select \uicontrol Open to start CoverageBrowser.
-        \li In CoverageBrowser, select \uicontrol File >
+        \li In CoverageBrowser, go to \uicontrol File >
             \uicontrol {Load Execution Report} and select the .csexe for the
             coverage scan.
-            \image coco-coveragebrowser-load-execution-report.png "Load Execution Report dialog"
-        \li If you want to reuse the execution report, deselect the
-            \uicontrol {Delete execution report after loading} check box.
+            \image coco-coveragebrowser-load-execution-report.png {Load Execution Report dialog}
+        \li To keep the execution report, clear
+            \uicontrol {Delete execution report after loading}.
     \endlist
 
-    Open the analyzed files in \QC. The results of the analysis are displayed
+    Open the analyzed files in \QC. You can see the results of the analysis
     after the code in \uicontrol Edit mode. You can change the fonts and colors
     used for different types of results.
 
     \section1 Changing Fonts and Colors
 
-    To change the default fonts and colors, select \preferences >
+    To change the default fonts and colors, go to \preferences >
     \uicontrol {Text Editor} > \uicontrol {Font & Colors}.
     Create your own color scheme and select new fonts and colors for the
     following results:
@@ -85,5 +59,6 @@
         \li Implicit Manual Coverage Validation
     \endlist
 
-    \sa {Enable and disable plugins}, {Font & Colors}
+    \sa {Enable and disable plugins}, {Analyze}{How To: Analyze}, {Analyzers},
+    {Font & Colors}, {Analyzing Code}
 */
diff --git a/doc/qtcreator/src/analyze/creator-cppcheck.qdoc b/doc/qtcreator/src/analyze/creator-cppcheck.qdoc
index e3cc393d70..6f34cd5180 100644
--- a/doc/qtcreator/src/analyze/creator-cppcheck.qdoc
+++ b/doc/qtcreator/src/analyze/creator-cppcheck.qdoc
@@ -1,58 +1,51 @@
-// Copyright (C) 2020 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \previouspage creator-cpu-usage-analyzer.html
     \page creator-cppcheck.html
-    \nextpage creator-ctf-visualizer.html
+    \previouspage creator-how-tos.html
 
-    \title Analyzing Code with Cppcheck
+    \ingroup creator-how-to-analyze
 
-    \l{http://cppcheck.sourceforge.net/}{Cppcheck} is a static analysis tool
-    that detects errors in C++ code. Static analysis is performed on the source
-    code without actually executing the application.
+    \title Detect errors in C++ code with Cppcheck
 
-    The experimental Cppcheck Diagnostics plugin integrates diagnostics
-    that are generated by the Cppcheck tool into the C++ editor.
-
-    \note Enable the Cppcheck plugin to use it.
+    Enable the experimental Cppcheck plugin to view diagnostics that are
+    generated by the Cppcheck tool in the C++ editor.
 
     Cppcheck is automatically run on open files. To select the files to
-    check in the currently active project, select \uicontrol Analyze >
+    check in the currently active project, go to \uicontrol Analyze >
     \uicontrol Cppcheck.
 
-
-    \section1 Running Cppcheck on Selected Files
+    \section1 Analyze selected files
 
     \list 1
-        \li Select \uicontrol Analyze > \uicontrol Cppcheck.
-            \image qtcreator-cppcheck-run-configuration.png "Cppcheck run configuration"
-        \li In the \uicontrol Binary field, enter the path to the Cppcheck
-            executable file.
-        \li In the \uicontrol Checks group, select the checks to perform.
+        \li Go to \uicontrol Analyze > \uicontrol Cppcheck.
+            \image qtcreator-cppcheck-run-configuration.png {Cppcheck run configuration}
+        \li In uicontrol Binary, enter the path to the Cppcheck executable file.
+        \li In \uicontrol Checks, select the checks to perform.
             \note By default, Cppcheck uses multiple threads to perform checks.
-            Selecting the \uicontrol {Unused functions} option disables the
-            default behavior.
-        \li In the \uicontrol {Custom arguments} field, enter additional
+            Select \uicontrol {Unused functions} to turn off the default
+            behavior.
+        \li In \uicontrol {Custom arguments}, enter additional
             arguments for running Cppcheck. The arguments might be shadowed
             by automatically generated ones. To avoid possible conflicts in
-            configuration, select the \uicontrol {Show raw output} check box
-            to see the final arguments.
-        \li In the \uicontrol {Ignored file patterns} field, enter a filter
+            configuration, select \uicontrol {Show raw output} and check the
+            final arguments.
+        \li In \uicontrol {Ignored file patterns}, enter a filter
             for ignoring files that match the pattern (wildcard). You can enter
             multiple patterns separated by commas. Even though Cppcheck is not
             run on files that match the patterns, they might be
             implicitly checked if other files include them.
-        \li Select the \uicontrol {Inconclusive errors} check box to also
-            mark possible false positives.
-        \li Select the \uicontrol {Check all define combinations} check box to
-            check all define combinations. Enabling this option can significantly
+        \li Select \uicontrol {Inconclusive errors} to also mark possible false
+            positives.
+        \li Select \uicontrol {Check all define combinations} to
+            check all define combinations. This can significantly
             slow down analysis, but might help to find more issues.
-        \li Select the \uicontrol {Add include paths} check box to pass the
-            current project's include paths to Cppcheck. Enabling this option
+        \li Select \uicontrol {Add include paths} to pass the
+            current project's include paths to Cppcheck. This
             slows down checks on big projects, but can help Cppcheck to find
             missing includes.
-        \li Select the \uicontrol {Calculate additional arguments} check box to
+        \li Select \uicontrol {Calculate additional arguments} to
             calculate additional arguments based on current project's settings
             (such as the language used and standard version) and pass them to
             Cppcheck.
@@ -64,8 +57,9 @@
     marks or annotations.
 
     To specify the settings above for the automatically run checks,
-    select \preferences > \uicontrol Analyzer
+    go to \preferences > \uicontrol Analyzer
     > \uicontrol Cppcheck.
 
-    \sa {Enable and disable plugins}
+    \sa {Enable and disable plugins}, {Analyze}{How To: Analyze},
+    {Analyzing Code}, {Analyzers}
 */
diff --git a/doc/qtcreator/src/analyze/creator-ctf-visualizer.qdoc b/doc/qtcreator/src/analyze/creator-ctf-visualizer.qdoc
index a2bf118f3f..16031b8f6a 100644
--- a/doc/qtcreator/src/analyze/creator-ctf-visualizer.qdoc
+++ b/doc/qtcreator/src/analyze/creator-ctf-visualizer.qdoc
@@ -8,11 +8,14 @@
 // **********************************************************************
 
 /*!
-    \previouspage creator-cppcheck.html
     \page creator-ctf-visualizer.html
-    \nextpage creator-autotest.html
+    \previouspage creator-reference.html
 
-    \title Visualizing Chrome Trace Events
+    \ingroup creator-reference-analyzer
+
+    \title Chrome Trace Format Visualizer
+
+    \brief Visualize Chrome trace events generated in Chrome Trace Format (CTF).
 
     You can use \e {full stack tracing} to trace from the top level QML or
     JavaScript down to the C++ and all the way to the kernel space. This
@@ -218,4 +221,6 @@
     \code
     ctf2ctf -o trace.json path/to/lttng trace/
     \endcode
+
+    \sa {Analyze}{How To: Analyze}, {Analyzers}, {Analyzing Code}
 */
diff --git a/doc/qtcreator/src/analyze/creator-heob.qdoc b/doc/qtcreator/src/analyze/creator-heob.qdoc
index 449d3cc86a..45f2b269ed 100644
--- a/doc/qtcreator/src/analyze/creator-heob.qdoc
+++ b/doc/qtcreator/src/analyze/creator-heob.qdoc
@@ -1,4 +1,4 @@
-// Copyright (C) 2020 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 // **********************************************************************
@@ -8,17 +8,15 @@
 // **********************************************************************
 
 /*!
+    \page creator-how-to-use-heob.html
     \previouspage creator-clang-tools.html
-    \page creator-heob.html
-    \nextpage creator-cpu-usage-analyzer.html
 
-    \title Detecting Memory Leaks with Heob
+    \ingroup creator-how-to-analyze
 
-    \QC integrates the \l{https://github.com/ssbssa/heob}{Heob} heap observer
-    for detecting buffer overruns and memory leaks. You must download and
-    install Heob to run it from \QC.
+    \title Detect memory leaks with Heob
 
-    \image qtcreator-heob-settings.png
+    On Windows, use the Heob heap observer to detect buffer overruns and memory
+    leaks.
 
     To run Heob on the currently open project:
 
@@ -26,35 +24,48 @@
 
         \li Select \uicontrol Analyze > \uicontrol Heob.
 
+            \image qtcreator-heob-settings.png {Heob settings}
+
         \li Select the Heob settings profile to use, or select \uicontrol New
             to create a new profile.
 
-        \li In the \uicontrol {Heob path} field, enter the path to the Heob
+        \li In \uicontrol {Heob path}, enter the path to the Heob
             executable.
 
-        \li Specify additional settings for running the checks. For more
-            information about the available options, see
-            \l{Specifying Heob Settings}.
+        \li Specify \l{Heob}{settings} for running the checks.
 
         \li Select \uicontrol OK to run Heob.
 
     \endlist
 
-    \QC runs the application, and then it runs Heob in a console window.
+    \QC runs the application, and then it runs Heob in a terminal.
 
-    \image qtcreator-heob.png
+    \image qtcreator-heob-in-terminal.webp {Heob running in a terminal}
 
     Heob raises an access violation on buffer overruns and records stack traces
-    of the offending instruction and buffer allocation. The results are
-    displayed when Heob exits normally.
+    of the offending instruction and buffer allocation. You can see the results
+    in the \uicontrol Memcheck view after Heob exits normally.
+
+    \image qtcreator-heob-output.png {Results from Heob in the Memcheck view}
 
-    \image qtcreator-heob-output.png
+    \sa {Analyze}{How To: Analyze}, {Analyzers}, {Heob}, {Analyzing Code}
+*/
 
-    \section1 Specifying Heob Settings
+/*!
+    \page creator-heob.html
+    \previouspage creator-reference.html
 
-    To specify settings for Heob, select \uicontrol Analyze > \uicontrol Heob.
+    \ingroup creator-reference-analyzer
 
-    In the \uicontrol {Extra arguments} field, enter additional arguments for
+    \title Heob
+
+    \brief Detect memory leaks with Heob.
+
+    To specify settings for Heob, go to \uicontrol Analyze > \uicontrol Heob.
+
+    \image qtcreator-heob-settings.png {Heob settings}
+
+    In \uicontrol {Extra arguments}, enter additional arguments for
     running Heob. To list the available arguments in the Heob console, enter
     \c -H in this field and press \key Enter.
 
@@ -63,19 +74,19 @@
     leaks visually in the file and the \c -L1024 option to record leak contents
     up to 1024 bytes in the file. For example, \c {-oleaks.html -g2 -L1024}
 
-    To save the settings profile, select \uicontrol Save.
+    To save your changes as default settings, select
+    \inlineimage icons/savefile.png.
 
     To remove a customized settings profile, select the profile, and then
     select \uicontrol Delete.
 
     The following sections describe the available options in more detail.
 
-    \section2 Recording Results
+    \section1 Recording Results
 
     The results of the checks are displayed in the \uicontrol Memcheck view and
-    recorded in a file. You can specify the file name in the
-    \uicontrol {XML output file} field. Heob creates the file in the project
-    directory.
+    recorded in a file. Specify the file name in \uicontrol {XML output file}.
+    Heob creates the file in the project directory.
 
     You can use the process identifier (PID) as a variable in the file name.
     For example,  \c leaks-%p.xml. This injects Heob into the child processes,
@@ -87,9 +98,9 @@
     If you use variables, \QC cannot open the file automatically, but you can
     open it from the project directory.
 
-    \section2 Handling Exceptions
+    \section1 Handling Exceptions
 
-    In the \uicontrol {Handle exceptions} list, select \uicontrol Off to use the
+    In \uicontrol {Handle exceptions}, select \uicontrol Off to use the
     standard exception handler and have the debugger automatically attached if
     the application crashes. This works only if you register \QC is as a
     post-mortem debugger by selecting \preferences >
@@ -105,7 +116,7 @@
     crash is displayed. Therefore, this option is mostly useful when using Heob
     on the console or running it for child processes, as well.
 
-    \section2 Raising Exceptions on Errors
+    \section1 Raising Exceptions on Errors
 
     Select the \uicontrol {Raise breakpoint exception on error} check
     box to display errors when the application runs.
@@ -119,9 +130,9 @@
     This is mostly useful when used with the \uicontrol {Run with debugger}
     option, which runs Heob under the debugger.
 
-    \section2 Protecting Pages
+    \section1 Protecting Pages
 
-    In the \uicontrol {Page protection} list, select \uicontrol Off to use
+    In \uicontrol {Page protection}, select \uicontrol Off to use
     standard memory allocation functions and enable only memory leak detection.
 
     Select \uicontrol After to place a protected page at the end of each
@@ -135,9 +146,9 @@
     useful for \e use-after-free and \e double-free detection. However, the
     available memory address space can run out fast for 32-bit programs.
 
-    \section2 Handling Leak Data
+    \section1 Handling Leak Data
 
-    In the \uicontrol {Leak details} list, determine how to handle the
+    In \uicontrol {Leak details}, determine how to handle the
     collected leak data when the process exits. Selecting \uicontrol None means
     that no leak data is collected. If you activate leak type detection, Heob
     might need more time to collect the data when the process exits.
@@ -163,10 +174,10 @@
     block. Select \uicontrol {Detect Leak Types (Show Reachable)} to also
     record the reachable blocks in the results file.
 
-    In the \uicontrol {Minimum leak size} list, select the size of
+    In \uicontrol {Minimum leak size}, select the size of
     leaks to detect in bytes.
 
-    In the \uicontrol {Control leak recording} list, select \uicontrol Off to
+    In \uicontrol {Control leak recording}, select \uicontrol Off to
     record all leaks. You cannot change leak recording while it is running.
 
     To start Heob without starting leak recording, select
@@ -177,4 +188,7 @@
 
     To start leak recording when Heob starts and still have the option to
     control the recording, select \uicontrol {On (Start Enabled)}.
+
+    \sa {Detect memory leaks with Heob}, {Analyze}{How To: Analyze}, {Analyzers},
+     {Analyzing Code}
 */
diff --git a/doc/qtcreator/src/analyze/creator-valgrind-overview.qdoc b/doc/qtcreator/src/analyze/creator-valgrind-overview.qdoc
deleted file mode 100644
index 61aca06cfd..0000000000
--- a/doc/qtcreator/src/analyze/creator-valgrind-overview.qdoc
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (C) 2018 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
-
-// **********************************************************************
-// NOTE: the sections are not ordered by their logical order to avoid
-// reshuffling the file each time the index order changes (i.e., often).
-// Run the fixnavi.pl script to adjust the links to the index order.
-// **********************************************************************
-
-/*!
-    \previouspage creator-axivion.html
-    \page creator-valgrind-overview.html
-    \nextpage creator-analyzer.html
-
-    \title Using Valgrind Code Analysis Tools
-
-    \QC integrates \l{http://valgrind.org/info/tools.html}{Valgrind code
-    analysis tools} for detecting memory leaks and
-    profiling function execution. You must download and install them separately
-    to use them from \QC.
-
-    You can run the Valgrind tools either \e locally on the development host or
-    \e remotely on another host. You can use them to analyze both applications
-    for which you set up a project in \QC and applications for which you do not
-    have a project.
-
-    Valgrind tools are supported locally only on Linux and \macos. However,
-    according to Valgrind.org, support on \macos 10.8 and 10.9 is experimental and
-    mostly broken. You can run the tools on a remote Linux machine or device
-    from any development host.
-
-    To run the Valgrind tools to analyze an application for which you have a
-    project, open the project in \QC and select the kit to run the project. The
-    kit specifies whether the Valgrind tools are run locally or remotely.
-
-    For more information about analyzing applications for which you do not have
-    a project, see \l{Running Valgrind Tools on External Applications}.
-
-    To set preferences for the Valgrind tools, select \preferences >
-    \uicontrol Analyzer. You can override the general
-    settings for each project in the \uicontrol {Run Settings} for the project.
-
-    The following sections describe how to use the Valgrind tools:
-
-    \list
-
-        \li \l{Detecting Memory Leaks with Memcheck}
-
-        \li \l{Profiling Function Execution}
-
-    \endlist
-
-    \sa {Specify Valgrind settings for a project}
-*/
diff --git a/doc/qtcreator/src/analyze/creator-valgrind.qdoc b/doc/qtcreator/src/analyze/creator-valgrind.qdoc
index 47d4b8c1d6..d044e58119 100644
--- a/doc/qtcreator/src/analyze/creator-valgrind.qdoc
+++ b/doc/qtcreator/src/analyze/creator-valgrind.qdoc
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 // **********************************************************************
@@ -8,92 +8,116 @@
 // **********************************************************************
 
 /*!
-    \previouspage creator-valgrind-overview.html
-    \page creator-analyzer.html
-    \nextpage creator-cache-profiler.html
+    \page creator-how-to-memcheck.html
+    \previouspage creator-how-tos.html
 
-    \title Detecting Memory Leaks with Memcheck
+    \ingroup creator-how-to-analyze
 
-    You can use the Memcheck tool included in the Valgrind tool suite to detect
-    problems that are related to memory management in applications. You can use
+    \title Detect memory leaks with Memcheck
+
+    With the Memcheck tool in \l{Valgrind's Tool Suite}, you can detect
+    problems that are related to memory management in applications. Use
     the tool together with the GDB debugger. When a problem is detected, the
     application is interrupted and you can debug it.
 
     \note You can install and run Memcheck locally on Linux. You can run
-    it on a remote host or device from any development machine. On Windows,
+    it on a remote host or device from any computer. On Windows,
     you can use the \l{Detecting Memory Leaks with Heob}{Heob} heap observer to
     receive similar results.
 
     After you download and install Valgrind tools, you can use Memcheck from
     \QC.
 
-    To analyze applications:
+    To detect memory leaks in applications:
 
     \list 1
 
-        \li In the \uicontrol Projects mode, select a debug build configuration.
+        \li Go to the \uicontrol Projects mode, and select a debug build
+            configuration.
 
-        \li Select \uicontrol Debug to open the \uicontrol Debug mode, and then
-            select \uicontrol Memcheck on the toolbar.
+        \li In the mode selector, select \uicontrol Debug > \uicontrol Memcheck.
 
-        \li Select the
-            \inlineimage icons/qtcreator-analyze-start-button.png "Start button"
-            button to start the application.
+            \image qtcreator-valgrind-memcheck.webp {Memcheck view}
+
+        \li Select \inlineimage icons/qtcreator-analyze-start-button.png
+            to start the application.
 
         \li Use the application to analyze it.
 
-        \li Select the \inlineimage icons/stop_small.png "Stop button"
-            button to view the results of the analysis in the
-            \uicontrol {Analysis} view.
+        \li Select \inlineimage icons/stop_small.png to view the results of the
+            analysis in \uicontrol {Memory Issues}.
+
+    \endlist
+
+    \section1 View memory issues
 
+    While the application is running, Memcheck does the following:
+
+    \list
+        \li Checks all reads and writes of memory.
+        \li Intercepts calls that allocate or free memory or create or
+            delete memory blocks.
     \endlist
 
-    While the application is running, Memcheck checks all reads and writes of
-    memory and intercepts calls that allocate or free memory or create or
-    delete memory blocks. The results are displayed when you stop Memcheck.
-    Click a line to view where a memory leak
-    occurred and a stack trace that shows what caused it.
+    You can see the results when you stop Memcheck.
 
-    As an alternative to collecting data, you can select \inlineimage icons/open.png
+    Select a line to see the place where a memory leak occurred and a stack trace
+    that shows what caused it.
+
+    As an alternative to collecting data, select \inlineimage icons/open.png
     to load an external log file in XML format into the \uicontrol Memcheck
     view.
 
-    \image qtcreator-valgrind-memcheck.png "Memcheck view"
-
     Move the mouse on a row to view more information about the function.
 
     To move between rows, select \inlineimage icons/prev.png
-    or \inlineimage icons/next.png
-    .
+    or \inlineimage icons/next.png.
 
-    To filter the results, select \inlineimage icons/filtericon.png
-    , and then select the types of issues to display in the view. You
+    To filter the results, select \inlineimage icons/filtericon.png, and
+    then select the types of issues to display in the view. You
     can view and hide definite and possible memory leaks, uninitialized
     values, invalid calls to \c free(), and external errors.
 
     For more information about using Memcheck, see
-    \l{http://valgrind.org/docs/manual/quick-start.html#quick-start.mcrun}
-    {Interpreting Memcheck's Output} in the Valgrind documentation.
+    \l{Interpreting Memcheck's Output} in the Valgrind documentation.
+
+    \sa {Analyze}{How To: Analyze}, {Profile function execution},
+    {Run Valgrind tools on external applications},
+    {Specify Valgrind settings for a project}, {Analyzers}, {Valgrind Callgrind},
+    {Valgrind Memcheck}, {Analyzing Code}
+*/
+
+/*!
+    \page creator-preferences-memcheck.html
+    \previouspage creator-reference.html
 
-    \section1 Selecting Options for Memory Analysis
+    \ingroup creator-reference-preferences-analyzer
 
-    You can specify analyzer settings either globally for all projects or
-    separately for each project in the \l{Specifying Run Settings}{run settings}
-    of the project.
+    \title Valgrind Memcheck
 
-    To specify global settings for Valgrind, select \preferences >
-    \uicontrol Analyzer. The \uicontrol {Memcheck Memory Analysis Options}
-    group has Memcheck options.
+    \brief Set preferences for Valgrind Memcheck.
+
+    Set \l{Valgrind's Tool Suite}{Valgrind} preferences either globally for all
+    projects or separately for each project in the \l{Specifying Run Settings}
+    {run settings} of the project.
+
+    To set global preferences for Valgrind, select \preferences >
+    \uicontrol Analyzer. Set Memcheck preferences in
+    \uicontrol {Memcheck Memory Analysis Options}.
+
+    \image qtcreator-valgrind-memcheck-options.png {Memory Analysis options}
 
     In \uicontrol {Extra Memcheck arguments}, specify additional arguments
     for launching the executable.
 
+    \section1 Setting Stack Trace Length
+
     Stack traces can get quite large and confusing, and therefore, reading them
     from the bottom up can help. If the stack trace is not big enough or it is
     too big, select \preferences > \uicontrol Analyzer and define the length of
     the stack trace in the \uicontrol {Backtrace frame count} field.
 
-    \image qtcreator-valgrind-memcheck-options.png "Memory Analysis options"
+    \section1 Tracking Origins of Uninitialized Memory
 
     Memcheck also reports uses of uninitialised values, most commonly with the
     message \uicontrol {Conditional jump or move depends on uninitialised value(s).}
@@ -101,12 +125,14 @@
     uninitialized memory} check box is selected by default. You can deselect it
     to make Memcheck run faster.
 
+    \section1 Viewing a Summary
+
     Memcheck searches for memory leaks when the client application finishes. To
     view the amount of leaks that occurred, select \uicontrol {Summary Only} in the
     \uicontrol {Check for leaks on finish} field. To also view details of each leak,
     select \uicontrol Full.
 
-    \section2 Showing Reachable and Indirectly Lost Blocks
+    \section1 Showing Reachable and Indirectly Lost Blocks
 
     \e Reachable blocks are blocks that are pointed at by a pointer or chain
     of pointers and that might have been freed before the application exited.
@@ -118,7 +144,7 @@
     To have them reported, select the \uicontrol {Show reachable and indirectly lost
     blocks}.
 
-    \section2 Suppressing Errors
+    \section1 Suppressing Errors
 
     Memcheck detects numerous problems in the system libraries, such as the C
     library, which come pre-installed with your OS. As you cannot easily fix
@@ -127,37 +153,40 @@
     when the system is built.
 
     You can write your own suppression files if parts of your project have
-    errors you cannot fix and you do not want to be reminded of them. Click
+    errors you cannot fix and you do not want to be reminded of them. Select
     \uicontrol Add in the \uicontrol {MemCheck Memory Analysis} dialog to add
     the suppression files.
+
     For more information about writing suppression files, see
-    \l{http://valgrind.org/docs/manual/manual-core.html#manual-core.suppress}
-    {Suppressing Errors} in the Valgrind documentation.
+    \l{Suppressing Errors} in the Valgrind documentation.
 
+    \sa {Detect memory leaks with Memcheck}, {Profile function execution},
+    {Run Valgrind tools on external applications},
+    {Specify Valgrind settings for a project}, {Valgrind Callgrind}
 */
 
 /*!
-    \previouspage creator-analyzer.html
     \page creator-cache-profiler.html
-    \nextpage creator-running-valgrind-remotely.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-analyze
 
-    \title Profiling Function Execution
+    \title Profile function execution
 
-    You can use the Callgrind tool included in the
-    \l{http://valgrind.org/info/tools.html}{Valgrind tool suite} to detect
-    problems that are related to executing functions. In addition, you
-    can load the data files generated by Callgrind into the
-    \l{https://kcachegrind.github.io/html/Home.html}{KCachegrind}
-    profile data visualization tool for browsing the performance results.
+    With the Callgrind tool in \l{Valgrind's Tool Suite}, you can detect problems
+    that are related to executing functions. Load the data files generated by
+    Callgrind into the \l{https://kcachegrind.github.io/html/Home.html}
+    {KCachegrind} profile data visualization tool to browse the performance
+    results.
 
     After you download and install Valgrind tools and KCachegrind, you can use
     Callgrind and KCachegrind from \QC.
 
     \note You can install and run Callgrind and KCachegrind locally on Linux.
     You can run Callgrind on a remote Linux machine or device from any
-    development machine.
+    computer.
 
-    \section1 Building Apps for Profiling
+    \section1 Build apps for profiling
 
     Callgrind records the call history of functions that are executed when the
     application is run. It collects the number of instructions that are
@@ -181,28 +210,26 @@
     options for GCC are: \c{-g -O2}. It is
     advisable to use such a setup for Callgrind profiling.
 
-    \section1 Collecting Data
+    \section1 Collect data
 
     To analyze applications:
 
     \list 1
 
-        \li In the \uicontrol Projects mode, select a release build configuration.
+        \li Go to the \uicontrol Projects mode, and select a release build
+            configuration.
 
-        \li Select \uicontrol Debug to open the \uicontrol Debug mode, and then
-            select \uicontrol Callgrind on the toolbar.
+        \li In the mode selector, select \uicontrol Debug > \uicontrol Callgrind.
 
-            \image qtcreator-valgrind-callgrind-toolbar.png "Callgrind view toolbar"
+            \image qtcreator-valgrind-callgrind-toolbar.png {Callgrind view toolbar}
 
-        \li Select the
-            \inlineimage icons/qtcreator-analyze-start-button.png "Start button"
-            button to start the application.
+        \li Select \inlineimage icons/qtcreator-analyze-start-button.png
+            to start the application.
 
         \li Use the application to analyze it.
 
-        \li Select the \inlineimage icons/stop_small.png "Stop button"
-            button to view the results of the analysis in the
-            \uicontrol Functions view.
+        \li Select \inlineimage icons/stop_small.png to view the results of the
+            analysis in the \uicontrol Functions view.
 
     \endlist
 
@@ -220,7 +247,7 @@
     to view the data in KCachegrind. \QC launches KCachegrind
     and loads the data into it for visualization.
 
-    \section1 Viewing Collected Data
+    \section1 View collected data
 
     The results of the analysis are displayed in the \uicontrol Callgrind views.
     You can detach views and move them around. To revert the changes, select
@@ -261,17 +288,31 @@
     To remove template parameter lists when displaying function names, select
     \uicontrol <>.
 
-    \section1 Selecting Profiling Options
+    \sa {Detect memory leaks with Memcheck}, {Profile function execution},
+    {Run Valgrind tools on external applications},
+    {Specify Valgrind settings for a project}, {Valgrind Callgrind},
+    {Valgrind Memcheck}
+*/
+
+/*!
+    \page creator-preferences-callgrind.html
+    \previouspage creator-reference.html
+
+    \ingroup creator-reference-preferences-analyzer
 
-    You can specify analyzer settings either globally for all projects or
-    separately for each project in the \l{Specifying Run Settings}{run settings}
-    of the project.
+    \title Valgrind Callgrind
 
-    To specify global settings for Valgrind, select \preferences >
-    \uicontrol Analyzer. The \uicontrol {Callgrind Profiling Options}
-    group has Callgrind options.
+    \brief Set preferences for Valgrind Callgrind.
 
-    \image qtcreator-valgrind-callgrind-options.png "Valgrind options"
+    Set \l{Valgrind's Tool Suite}{Valgrind} preferences either globally for all
+    projects or separately for each project in the \l{Specifying Run Settings}
+    {run settings} of the project.
+
+    To set global preferences for Valgrind, select \preferences >
+    \uicontrol Analyzer. Set Callgrind preferences in
+    \uicontrol {Callgrind Profiling Options}.
+
+    \image qtcreator-valgrind-callgrind-options.png {Callgrind Profiling Options}
 
     In the \uicontrol {KCachegrind executable} field, enter the path to the
     KCachegrind executable to launch.
@@ -292,7 +333,7 @@
     global bus events of the event type \c Ge that are executed,
     select \uicontrol {Collect global bus events}.
 
-    \section2 Enabling Full Cache Simulation
+    \section1 Enabling Full Cache Simulation
 
     By default, only instruction read accesses (Ir) are counted. To fully
     simulate the cache, select the \uicontrol {Enable cache simulation} check box.
@@ -308,7 +349,7 @@
 
     \endlist
 
-    \section2 Enabling Branch Prediction Simulation
+    \section1 Enabling Branch Prediction Simulation
 
     To enable the following additional event counters, select the
     \uicontrol {Enable branch prediction simulation} check box:
@@ -323,32 +364,39 @@
 
     \endlist
 
-    \sa {Analyzing CPU Usage}, {Detach views}
+    \sa {Analyzing CPU Usage}, {Detect memory leaks with Memcheck},
+    {Detach views}, {Run Valgrind tools on external applications},
+    {Specify Valgrind settings for a project},
+    {Valgrind Memcheck}
 */
 
 /*!
-    \previouspage creator-cache-profiler.html
     \page creator-running-valgrind-remotely.html
-    \nextpage creator-clang-tools.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-analyze
 
-    \title Running Valgrind Tools on External Applications
+    \title Run Valgrind tools on external applications
 
-    \QC integrates Valgrind code analysis tools for detecting memory
-    leaks and profiling function execution.
+    With \l{Valgrind's Tool Suite}, you can detect memory leaks and profile
+    function execution.
 
     To run the Valgrind tools to analyze external applications for which
     you do not have a \QC project:
 
     \list 1
 
-        \li Select \uicontrol Analyze > \uicontrol {Valgrind Memory Analyzer (External
+        \li Go to \uicontrol Analyze > \uicontrol {Valgrind Memory Analyzer (External
             Application)} or \uicontrol {Valgrind Function Profiler (External Application)}.
 
-            \image qtcreator-valgrind-remote-settings.png "Start Remote Analysis dialog"
+            \image qtcreator-valgrind-remote-settings.png {Start Remote Analysis dialog}
 
-        \li Specify the application to run and analyze, and the \l{glossary-buildandrun-kit}{kit}
-            to use.
+        \li Select the application to run and analyze, as well as the
+            \l{glossary-buildandrun-kit}{kit} to use.
 
     \endlist
 
+    \sa {Detect memory leaks with Memcheck}, {Profile function execution},
+    {Kits}, {Specify Valgrind settings for a project}, {Valgrind Callgrind},
+    {Valgrind Memcheck}
 */
diff --git a/doc/qtcreator/src/android/androiddev.qdoc b/doc/qtcreator/src/android/androiddev.qdoc
index c0fe2cedea..3b7a17a6d9 100644
--- a/doc/qtcreator/src/android/androiddev.qdoc
+++ b/doc/qtcreator/src/android/androiddev.qdoc
@@ -3,28 +3,30 @@
 
     /*!
     \page creator-developing-android.html
-    \previouspage creator-connecting-mobile.html
-    \nextpage creator-developing-baremetal.html
+    \previouspage creator-reference.html
 
-    \title Connecting Android Devices
+    \ingroup creator-reference-devices
 
-    You can connect Android devices to the development PC using USB cables to
-    build, run, debug, and analyze applications from \QC.
+    \title Developing for Android
 
-    To develop for Android, you must install a tool chain for building
-    applications for Android devices on the development PC. \QC can automatically
-    download and install the tool chain and create a suitable build and run
-    \l{glossary-buildandrun-kit}{kit} that has the tool chain and the Qt
-    version for Android for the device's architecture.
+    \brief Set up the toolchain for building applications for Android devices.
 
-    To enable helpful code editing features for Java, such as code completion,
+    Install a Qt version targeting Android and the Android SDK and NDK to develop
+    Qt applications for Android devices. To check the Android version supported
+    by each Qt version, see the \l {Qt for Android} documentation for the Qt
+    version.
+
+    To get helpful code editing features for Java, such as code completion,
     highlighting, function tooltips, and navigating in code, add a
     \l{Add a Java language server}{Java language server}.
 
     \QC integrates the Android Debug Bridge (\c adb) command-line tool for
     deploying applications to Android devices, running them, and reading their
     logs. The \c adb tool includes a client and server that run on
-    the development host and a daemon that runs on the emulator or device.
+    the computer and a daemon that runs on the Android emulator or device.
+
+    \note \QC only detects a device and connects to it after you
+    \l{Debug on Android Devices}{enable USB debugging on it}.
 
     The following video shows the whole process from installing Qt for Android
     to debugging an application on an Android device:
@@ -33,18 +35,30 @@
 
     \section1 Requirements
 
-    To use \QC to develop Qt applications for Android, you need
-    \l {Qt for Android} and a tool chain that \QC can automatically
-    download, install, and configure for you. For more information
-    about the requirements for developing with a particular Qt version,
-    see the documentation for that Qt version. The links in this manual
-    lead to the latest released Qt reference documentation.
+    To use \QC to develop Qt applications for Android, you need:
+
+    \list
+        \li \l {Qt for Android}
+        \li \l {Android Development Prerequisites}{Android tools} that \QC can
+            automatically download, install, and configure for you.
+    \endlist
+
+    \sa {Android}{How To: Develop for Android}
+*/
+
+/*!
+    \page creator-how-to-set-android-preferences.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-android
 
-    \section1 Specifying Android Device Settings
+    \title Set up Android development environment
 
     \QC offers to automatically install all the necessary packages and tools and
-    to set up your development environment by creating debuggers, tool chains,
-    and kits. You can use \QC to:
+    to set up your \l{Qt for Android} development environment by creating
+    debuggers, toolchains, and kits.
+
+    Use \QC to:
 
     \list
         \li Download and extract the Android SDK Command-line Tools.
@@ -55,12 +69,12 @@
     To set up the development environment for Android:
 
     \list 1
-        \li Select \preferences > \uicontrol Devices > \uicontrol Android.
-            \image qtcreator-options-android-main.png {Android preferences}
-        \li In the \uicontrol {JDK location} field, set the path to the JDK.
+        \li Go to \preferences > \uicontrol Devices > \uicontrol Android.
+            \image qtcreator-preferences-android.webp {Android preferences}
+        \li In \uicontrol {JDK location}, set the path to the JDK.
             \QC checks the JDK installation and reports errors.
 
-            By default, \QC tries to find a supported \l{AdoptOpenJDK} or
+            By default, \QC tries to find a supported \l{Adoptium OpenJDK} or
             \l{OpenJDK} installation. If it cannot find one, you must set the
             path manually. If you have not installed a supported JDK, select
             \inlineimage icons/online.png
@@ -68,46 +82,46 @@
 
             \note Use a 64-bit JDK because the 32-bit one might cause issues with
             \c cmdline-tools, and some packages might not appear in the list.
-        \li In the \uicontrol {Android SDK location} field, set the path to the
+        \li In \uicontrol {Android SDK location}, set the path to the
             folder to install the \l{Android SDK Command-line Tools}.
         \li Select \uicontrol {Set Up SDK} to automatically download and extract
             the Android SDK Command-line Tools to the selected path.
 
-            The SDK Manager checks that you have the necessary tools. If you need
-            more packages or updates, the SDK Manager offers to add or remove
+            SDK Manager checks that you have the necessary tools. If you need
+            more packages or updates, SDK Manager offers to add or remove
             the appropriate packages. Before taking action, it prompts you to
             accept the changes. In addition, it prompts you to accept Google
             licenses, as necessary.
-        \li The \uicontrol {Android NDK list} lists the installed NDK versions.
-            The SDK Manager installed the locked items. You can modify them only
+        \li \uicontrol {Android NDK list} lists the installed NDK versions.
+            SDK Manager installed the locked items. You can modify them only
             from the \uicontrol {Android SDK Manager} dialog. For more
-            information, see \l{Managing Android NDK Packages}.
-        \li Select the \uicontrol {Automatically create kits for Android tool chains}
-            check box to allow \QC to create the kits for you. \QC displays a
+            information, see \l{Manage Android NDK Packages}.
+        \li Select \uicontrol {Automatically create kits for Android tool chains}
+            to automatically create the necessary kits. \QC displays a
             warning if it cannot find a suitable Qt version.
-        \li Optionally, in the \uicontrol {Android OpenSSL Settings} group, set
+        \li Optionally, in \uicontrol {Android OpenSSL Settings} group, set
             the path to the prebuilt OpenSSL libraries.
 
-            For Qt applications that require OpenSSL support, you can
-            quickly add the \l {Android OpenSSL support} to your project.
-            For more information, see \l{Adding External Libraries}.
+            For Qt applications that require OpenSSL support, add
+            \l {Android OpenSSL support} to your project, as instructed in
+            \l{Adding External Libraries}.
         \li Select \uicontrol {Download OpenSSL} to download the OpenSSL
             repository to the selected path. If the automatic download fails,
             the download web page opens for manual download.
     \endlist
 
-    \section2 Manual Setup
+    \section1 Manual setup
 
     \note Use the latest Android SDK Command-Line Tools. \QC does not support
     Android SDK Tools version 25.2.5 or earlier because it cannot fully
     integrate them.
 
-    However, if the automatic setup does not meet your needs, you can download
+    If the automatic setup does not meet your needs, download
     and install Android SDK Command-line Tools, and then install or update the
     necessary NDKs, tools, and packages. For more information, see
     \l{Getting Started with Qt for Android}.
 
-    \section2 Viewing Android Tool Chain Settings
+    \section1 View Android toolchain settings
 
     A JSON configuration file defines the Android SDK Command-Line Tools download
     URL, the essential packages list, and the appropriate NDK for each Qt version.
@@ -137,29 +151,55 @@
     You can view the latest version of the configuration file that is up-to-date
     with the Android SDK and NDK changes, \l{sdk_definitions.json}, in Git.
 
-    \section2 Managing Android NDK Packages
+    \sa {Android}{How To: Develop for Android},
+    {Developing for Android}
+*/
+
+/*!
+    \page creator-how-to-manage-android-ndk.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-android
+
+    \title Manage Android NDK packages
 
-    To view the installed \l{Android NDK} versions, select \preferences >
+    To view the \l{Android NDK} versions that \QC installed, go to \preferences >
     \uicontrol Devices > \uicontrol Android.
 
-    \image qtcreator-options-android-sdk-tools.png {Android NDK and SDK checks}
+    \image qtcreator-preferences-android.webp {Android preferences}
 
-    The SDK Manager installed the locked items. You can modify them only
+    SDK Manager installed the locked items. You can modify them only
     in the \uicontrol {Android SDK Manager} dialog.
-    For more information, see \l{Managing Android SDK Packages}.
+    For more information, see \l{Manage Android SDK packages}.
 
-    To manually download NDKs, select \inlineimage icons/online.png
-    .
+    \section1 Download Android NDKs
+
+    To manually download NDKs, select \inlineimage icons/online.png.
+
+    \section1 Set default NDK
 
     To use the selected NDK version for all Qt versions by default, select
     \uicontrol {Make Default}.
 
+    \section1 Add NDK paths
+
     To add custom NDK paths manually to the global list of NDKs, select
-    \uicontrol Add. This creates custom tool chains and debuggers associated
-    to that NDK. However, you have to manually create a kit that uses the
-    custom NDK. For more information, see \l{Add kits}.
+    \uicontrol Add. This creates custom toolchains and debuggers associated
+    to that NDK.
+
+    You have to manually create a kit that uses the custom NDK.
+
+    \sa {Add kits}, {Android}{How To: Develop for Android},
+    {Developing for Android}
+*/
+
+/*!
+    \page creator-how-to-manage-android-sdk.html
+    \previouspage creator-how-tos.html
 
-    \section2 Managing Android SDK Packages
+    \ingroup creator-how-to-android
+
+    \title Manage Android SDK packages
 
     Since Android SDK Tools version 25.3.0, Android has only a command-line
     tool, \l {sdkmanager}, for SDK package management. To make SDK management
@@ -172,66 +212,108 @@
 
     \image qtcreator-android-sdk-manager.webp {Android SDK Manager}
 
-    You can show packages for the release channel you select in
-    \uicontrol {Show Packages} > \uicontrol Channel. Common channel IDs include
-    \uicontrol Stable, \uicontrol Beta, \uicontrol Dev, and \uicontrol Canary.
+    \section1 Show SDK packages
+
+    To show packages for a release channel in \uicontrol Package, select the
+    channel in \uicontrol {Show Packages} > \uicontrol Channel. Common channel
+    IDs include \uicontrol Stable, \uicontrol Beta, \uicontrol Dev, and
+    \uicontrol Canary.
+
     To show and update also obsolete packages, select
-    \uicontrol {Include obsolete}. To filter packages, select
-    \uicontrol Available, \uicontrol Installed, or \uicontrol All.
+    \uicontrol {Include obsolete}.
+
+    To filter packages, select \uicontrol Available, \uicontrol Installed, or
+    \uicontrol All.
+
+    \section1 Update SDK packages
+
+    To update the installed Android SDK packages:
 
-    To update the installed Android SDK packages, select
-    \uicontrol {Update Installed}. Select the packages to update, and then
-    select \uicontrol Apply.
+    \list 1
+        \li Select \uicontrol {Update Installed}.
+        \li Select the packages to update.
+        \li Select \uicontrol Apply.
+    \endlist
 
-    To specify advanced \c sdkmanager settings, select
-    \uicontrol {Advanced Options} and enter arguments in the
-    \uicontrol {SDK Manager arguments} field. \uicontrol {Available arguments}
-    lists the arguments with descriptions.
+    \section1 Set sdkmanager options
 
+    To set advanced \c sdkmanager options:
+
+    \list 1
+        \li Select \uicontrol {Advanced Options}.
+        \li In \uicontrol {SDK Manager arguments}, enter sdkmanager options from
+            \uicontrol {Available arguments}.
     \image qtcreator-android-sdk-manager-arguments.png {Android SDK Manager Arguments dialog}
+    \endlist
+
+    \sa {Android}{How To: Develop for Android}, {Developing for Android}
+*/
 
-    \section1 Managing Android Virtual Devices (AVD)
+/*!
+    \page creator-how-to-manage-avd.html
+    \previouspage creator-how-tos.html
 
-    To view the available AVDs, select \preferences > \uicontrol Devices.
-    You can add more AVDs.
+    \ingroup creator-how-to-android
+
+    \title Manage AVDs
+
+    To view and add Android Virtual Devices (AVD), go to \preferences >
+    \uicontrol Devices.
 
     \image qtcreator-android-avd-manager.webp {Android device in Devices}
 
-    You can see the status of the selected device in \uicontrol {Current state}.
+    Select an AVD in \uicontrol Device to see its status in
+    \uicontrol {Current state}.
+
     To update the status information, select \uicontrol Refresh.
 
-    To start an AVD, select \uicontrol {Start AVD}. Usually, you don't need to
-    start AVDs separately because \QC starts them when you
-    select them in the \l{Build for many platforms}{kit selector} to
-    \l{Deploying to Android}{deploy applications} to them.
+    \section1 Start AVDs
 
-    To remove an AVD from the list and the kit selector, select
-    \uicontrol {Erase AVD}.
+    To start an AVD, select \uicontrol {Start AVD}. Usually, \QC starts an AVD
+    when you select it in the \l{Build for many platforms}{kit selector} to
+    \l{Android Deploy Configuration}{deploy applications} to it.
+
+    \section1 Set prefrences for starting AVDs
 
-    To specify options for starting an AVD, select \uicontrol {AVD Arguments}.
+    To set preferences for starting an AVD, select \uicontrol {AVD Arguments}.
 
     \image qtcreator-android-avd-arguments.png {Startup options for AVDs}
 
-    Specify the options in \uicontrol {Emulator command-line startup options}.
+    Set the preferences in \uicontrol {Emulator command-line startup options}.
     For available options, see \l{Start the emulator from the command line}.
 
     \note The Android Emulator has a bug that prevents it from starting on some
-    systems. If an AVD does not start, you can try starting it manually by
-    running the following commands:
+    computers.
+
+    To start the emulator manually, enter:
 
     \badcode
     cd <ANDROID_SDK>/emulator
     ./emulator -avd <AVD_NAME>
     \endcode
 
-    \section2 Creating a New AVD
+    \section1 Remove AVDs
 
-    To create new virtual devices:
+    To remove an AVD from the list and the kit selector, select
+    \uicontrol {Erase AVD}.
+
+    \sa {Android}{How To: Develop for Android}, {Developing for Android}
+*/
+
+/*!
+    \page creator-how-to-create-avd.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-android
+
+    \title Create an Android Virtual Device (AVD)
+
+    To create a new Android Virtual Device (AVD):
 
     \list 1
-        \li Select \preferences > \uicontrol Devices >
-            \uicontrol Add > \uicontrol {Android Device} to open the
-            \uicontrol {Create New AVD} dialog.
+        \li Go to \preferences > \uicontrol Devices.
+        \li Select \uicontrol Add > \uicontrol {Android Device} >
+            \uicontrol {Start Wizard}.
             \image qtcreator-android-create-avd.png {Create New AVD dialog}
         \li Set the name, definition, architecture, target API level, and
             SD card size of the device.
@@ -241,14 +323,21 @@
     For more advanced options for creating a new AVD, use the command-line tool
     \l{avdmanager} or the Android Studio's native AVD Manager UI.
 
-    \section1 Debugging on Android Devices
+    \sa {Android}{How To: Develop for Android}, {Developing for Android}
+*/
+
+/*!
+    \page creator-how-to-debug-android.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-android
+
+    \title Debug on Android devices
 
     You enable debugging in different ways on different Android devices.
-    Look for \uicontrol {USB Debugging} under \uicontrol {Developer Options}. On
-    some devices, \uicontrol {Developer Options} is hidden and becomes visible
-    only when you tap the \uicontrol {Build number} field in \uicontrol Settings
-    > \uicontrol About several times. For more information, see
-    \l {Configure on-device developer options}.
+    Look for \uicontrol {USB Debugging} under \uicontrol {Developer Options}.
+    Tap \uicontrol {Build number} in \uicontrol Settings > \uicontrol About
+    several times to show \uicontrol {Developer Options}.
 
     Select a \l{glossary-build-config}{debug build configuration} to build
     the application for debugging.
@@ -260,4 +349,7 @@
     \badcode
     Ignoring second debugger -accepting and dropping.
     \endcode
+
+    \sa {Android}{How To: Develop for Android}, {Developing for Android},
+    {Configure on-device developer options}
 */
diff --git a/doc/qtcreator/src/android/creator-projects-settings-run-android.qdoc b/doc/qtcreator/src/android/creator-projects-settings-run-android.qdoc
index 8904f69785..8753e83864 100644
--- a/doc/qtcreator/src/android/creator-projects-settings-run-android.qdoc
+++ b/doc/qtcreator/src/android/creator-projects-settings-run-android.qdoc
@@ -17,7 +17,7 @@
 
     To run and debug an application on an Android device, you must create
     connections from the development host to the device, as instructed in
-    \l {Connecting Android Devices}.
+    \l {Developing for Android}.
 
     \section1 am Start Options
 
@@ -66,5 +66,5 @@
     \endcode
 
     \sa {Activate kits for a project}, {Configure projects for running},
-    {Connecting Android Devices}
+    {Android}{How To: Develop for Android}
 */
diff --git a/doc/qtcreator/src/android/deploying-android.qdoc b/doc/qtcreator/src/android/deploying-android.qdoc
index 2b3441290f..e1b83d5e04 100644
--- a/doc/qtcreator/src/android/deploying-android.qdoc
+++ b/doc/qtcreator/src/android/deploying-android.qdoc
@@ -2,11 +2,15 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
     /*!
-    \previouspage creator-deployment.html
     \page creator-deploying-android.html
-    \nextpage creator-deployment-b2qt.html
+    \previouspage creator-reference.html
 
-    \title Deploying to Android
+    \ingroup creator-reference-deploy-configurations
+
+    \title Android Deploy Configuration
+
+    \brief Create Application Packages (APK) or Android App Bundles (AAB) to
+    install and run on devices or to upload to the Google Play store.
 
     Android applications are packaged as ZIP files called Application Packages
     (APK) or Android App Bundles (AAB). You can install and run APK files on a
@@ -26,7 +30,7 @@
 
             All Qt versions do not support AABs. Qt 6.3.0 and later support
             multi-abi builds for applications that you build with CMake. For
-            more information, see \l{Qt for Android - Building User Projects}.
+            more information, see \l{Deploying an Application on Android}.
     \endlist
 
     \note Since \QC 4.12, Ministro is not supported.
@@ -204,7 +208,8 @@
 
     To add OpenSSL libraries, select \uicontrol {Include prebuilt OpenSSL libraries}
     in the \uicontrol {Additional Libraries} group. This will add the OpenSSL
-    include project defined in \l{Specifying Android Device Settings}{device settings}
+    include project defined in \l{Set up Android development environment}
+    {device settings}
     in \uicontrol {Android OpenSSL} group. This can be used for qmake and CMake
     projects.
 
@@ -492,5 +497,8 @@
     \c {android.permission.ACCESS_BACKGROUND_LOCATION} for \l{Qt Positioning}.
 
     To add a permission, select it from the list, and then click \uicontrol Add.
+
+    \sa {Build and Run}{How To: Build and Run},
+    {Android}{How To: Develop for Android}, {Android Run Settings}
 */
 
diff --git a/doc/qtcreator/src/appman/creator-appman-how-to-run.qdoc b/doc/qtcreator/src/appman/creator-appman-how-to-run.qdoc
index a6319a7f2a..4ca30c6f46 100644
--- a/doc/qtcreator/src/appman/creator-appman-how-to-run.qdoc
+++ b/doc/qtcreator/src/appman/creator-appman-how-to-run.qdoc
@@ -149,6 +149,6 @@
     in-process runtime as an individual process.
 
     \sa {Activate kits for a project}, {Connecting Boot2Qt Devices},
-    {Connecting Remote Linux Devices}, {Enable and disable plugins},
-    {Run on many platforms}, {Debugging}, {Profiling QML Applications}
+    {Remote Linux}{How To: Develop for remote Linux}, {Enable and disable plugins},
+    {Run on many platforms}, {Debugging}, {Debuggers}, {Debugger}, {Profiling QML Applications}
 */
diff --git a/doc/qtcreator/src/baremetal/creator-baremetal-dev.qdoc b/doc/qtcreator/src/baremetal/creator-baremetal-dev.qdoc
index 96fabb3624..3df5faba46 100644
--- a/doc/qtcreator/src/baremetal/creator-baremetal-dev.qdoc
+++ b/doc/qtcreator/src/baremetal/creator-baremetal-dev.qdoc
@@ -1,24 +1,31 @@
-// Copyright (C) 2020 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
     /*!
-    \previouspage creator-developing-android.html
     \page creator-developing-baremetal.html
-    \nextpage creator-developing-b2qt.html
+    \previouspage creator-reference.html
 
-    \title Connecting Bare Metal Devices
+    \ingroup creator-reference-devices
 
-    You can configure build and run kits to use Bare Metal tool chains installed
-    on the development host to build applications for Bare Metal devices. You
-    can connect the devices to the development host to run and debug
-    applications on them from \QC using GDB or a hardware debugger. This enables
-    you to debug on small devices that are not supported by the generic remote
-    Linux device plugin.
+    \title Developing for Bare Metal Devices
+
+    \brief Create kits to use Bare Metal toolchains installed on the computer
+    to build applications for and run and debug them on connected Bare Metal
+    devices.
+
+    Run and debug applications on small devices that are not supported
+    by the remote Linux device plugin by using GDB or a hardware debugger.
+
+    \note Enable the Bare Metal plugin to use it.
+
+    Install Bare Metal toolchains on the computer to build applications for
+    Bare Metal devices. Connect the devices to the computer to run and debug
+    applications on them.
 
     \note If you use qmake to build the project and the device does not have
     Qt libraries, you need a fake Qt installation.
 
-    The following tool chains are supported for building applications:
+    The following toolchains are supported for building applications:
 
     \list
         \li GCC: Microchip Technology (AVR, AVR32, PIC16, PIC32),
@@ -42,227 +49,284 @@
     the device preferences. You can specify the commands to execute when connecting
     using a particular debug server provider.
 
+    \section1 Debug Server Providers
+
     The following debug server providers are supported when using GDB:
 
     \list
-        \li \l EBlink
-        \li \l J-Link
-        \li \l OpenOCD
-        \li \l ST-Link
+        \li \l {Set up EBlink}{EBlink}
+        \li \l {Set up J-Link}{J-Link}
+        \li \l {Set up OpenOCD}{OpenOCD}
+        \li \l {Set up ST-Link}{ST-Link}
     \endlist
 
     ST-Link and J-Link debug server providers can be used together with
-    the \l {uVision IDE}.
-
-    \note Enable the Bare Metal plugin to use it.
-
-    \section1 Specifying Settings for Debug Server Providers
+    the \l {Set up the uVision IDE}{uVision IDE}.
 
     To create connections to bare metal devices using a debug server provider,
-    select \preferences > \uicontrol Devices > \uicontrol {Bare Metal} >
+    go to \preferences > \uicontrol Devices > \uicontrol {Bare Metal} and select
     \uicontrol Add.
 
     The available settings depend on the debug server provider.
 
-    \section2 EBlink
+    \sa {Enable and disable plugins}, {Bare Metal}{How To: Develop for Bare Metal}
+*/
+
+/*!
+    \page creator-how-to-eblink.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-bare-metal
+
+    \title Set up EBlink
 
     \l{https://github.com/EmBitz/EBlink}{EBlink} is an ARM Cortex-M debug tool
     that supports squirrel scripting, live variables, and hot-plugging.
 
     \image qtcreator-baremetal-eblink.webp {Bare metal device preferences for EBlink}
 
-    To specify settings for \EBlink:
+    To set preferences for \EBlink:
 
     \list 1
 
-        \include creator-baremetal-settings.qdocinc baremetal-common
+        \include creator-baremetal-settings.qdocinc {baremetal-common} {EBlink}
 
-        \li In the \uicontrol {Script file} field, enter the path
+        \li In \uicontrol {Script file}, enter the path
             to a device script file.
 
-        \li In the \uicontrol {Verbosity level} field, enter the level of
+        \li In \uicontrol {Verbosity level}, enter the level of
             verbose logging.
 
-        \li Select the \uicontrol {Connect under reset} check box to use
-            the ST-Link interface. Deselect the check box for hot-plugging.
+        \li Select \uicontrol {Connect under reset} to use
+            the ST-Link interface. Clear it for hot-plugging.
 
-        \li In the \uicontrol Type field, select the interface type.
+        \li In \uicontrol Type, select the interface type.
 
-        \li In the \uicontrol Speed field, enter the interface speed between
+        \li In \uicontrol Speed, enter the interface speed between
             120 and 8000 kilohertz (kHz).
 
-        \li Select the \uicontrol {Disable cache} check box to disable the
+        \li Select \uicontrol {Disable cache} to disable the
             \EBlink flash cache.
 
-        \li Select the \uicontrol {Auto shutdown} check box to automatically
+        \li Select \uicontrol {Auto shutdown} to automatically
             shut down the \EBlink server after disconnecting.
 
         \include creator-baremetal-settings.qdocinc baremetal-init-reset
 
     \endlist
 
-    \section2 J-Link
+    \sa {Bare Metal}{How To: Develop for Bare Metal},
+    {Developing for Bare Metal Devices}
+*/
+
+/*!
+    \page creator-how-to-jlink.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-bare-metal
+
+    \title Set up J-Link
 
     \l{https://www.segger.com/products/debug-probes/j-link/}{J-Link} is a line
     of debug probes by Segger.
 
-    \image qtcreator-baremetal-jlink.webp "Bare metal device preferences for J-Link"
+    \image qtcreator-baremetal-jlink.webp {Bare metal device preferences for J-Link}
 
-    To specify settings for J-Link debug probes:
+    To set preferences for J-Link debug probes:
 
     \list 1
 
-        \include creator-baremetal-settings.qdocinc baremetal-common
+        \include creator-baremetal-settings.qdocinc {baremetal-common} {J-Link}
 
-        \li In the \uicontrol {Host interface} field, select the connection
+        \li In \uicontrol {Host interface}, select the connection
             type, IP or USB, or use the default connection.
 
-        \li In the \uicontrol {Target interface} field, select the target
-            interface type.
+        \li In \uicontrol {Target interface}, select the target interface type.
 
-        \li In the \uicontrol Speed field, enter the interface speed in kHz.
+        \li In \uicontrol Speed, enter the interface speed in kHz.
 
-        \li In the \uicontrol Device field, select the device to connect to.
+        \li In \uicontrol Device, select the device to connect to.
 
-        \li In the \uicontrol {Additional arguments} field, enter
-            arguments for the commands.
+        \li In \uicontrol {Additional arguments}, enter arguments for the
+            commands.
 
         \include creator-baremetal-settings.qdocinc baremetal-init-reset
 
     \endlist
 
-    \section2 OpenOCD
+    \sa {Bare Metal}{How To: Develop for Bare Metal},
+    {Developing for Bare Metal Devices}
+*/
+
+/*!
+    \page creator-how-to-openocd.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-bare-metal
+
+    \title Set up OpenOCD
 
     \l{http://openocd.org}{OpenOCD} (Open On-Chip Debugger) is an on-chip debug
     solution for targets based on the ARM7 and ARM9 family with Embedded-ICE
     (JTAG) facility. It enables source level debugging with the GDB compiled
     for the ARM architecture.
 
-    \image qtcreator-baremetal-openocd.webp "Bare metal device preferences for OpenOCD"
+    \image qtcreator-baremetal-openocd.webp {Bare metal device preferences for OpenOCD}
 
-    To specify settings for \OpenOCD:
+    To set preferences for \OpenOCD:
 
     \list 1
 
-        \include creator-baremetal-settings.qdocinc baremetal-common
+        \include creator-baremetal-settings.qdocinc {baremetal-common} {OpenOCD}
 
-        \li In the \uicontrol {Root scripts directory} field, enter the
+        \li In \uicontrol {Root scripts directory}, enter the
             path to the directory that has configuration scripts.
 
-        \li In the \uicontrol {Configuration file} field, enter the path
+        \li In \uicontrol {Configuration file}, enter the path
             to the device configuration file.
 
-        \li In the \uicontrol {Additional arguments} field, enter
+        \li In \uicontrol {Additional arguments}, enter
             arguments for the commands.
 
         \include creator-baremetal-settings.qdocinc baremetal-init-reset
 
     \endlist
 
-    \section2 St-Link
+    \sa {Bare Metal}{How To: Develop for Bare Metal},
+    {Developing for Bare Metal Devices}
+*/
+
+/*!
+    \page creator-how-to-stlink.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-bare-metal
+
+    \title Set up St-Link
 
     \l{https://www.st.com/en/development-tools/stm32-programmers.html#products}
     {ST-LINK Utility} is used for programming STM32 microcontrollers.
 
-    \image qtcreator-baremetal-stlink.webp "Bare metal device preferences for St-Link"
+    \image qtcreator-baremetal-stlink.webp {Bare metal device preferences for St-Link}
 
-    To specify settings for St-Link:
+    To set preferences for St-Link:
 
     \list 1
 
-        \include creator-baremetal-settings.qdocinc baremetal-common
+        \include creator-baremetal-settings.qdocinc {baremetal-common} {St-Link}
 
-        \li In the \uicontrol {Verbosity level} field, enter the level of
+        \li In \uicontrol {Verbosity level}, enter the level of
             verbose logging.
 
-        \li Select the \uicontrol {Extended mode} check box to continue
+        \li Select \uicontrol {Extended mode} to continue
             listening for connection requests after the connection is closed.
 
-        \li Select the \uicontrol {Reset on connection} check box to
+        \li Select \uicontrol {Reset on connection} to
             reset the board when the connection is created.
 
-        \li In the \uicontrol Version field, select the transport
+        \li In \uicontrol Version, select the transport
             layer type supported by the device.
 
         \include creator-baremetal-settings.qdocinc baremetal-init-reset
 
     \endlist
 
-    \section2 uVision IDE
+    \sa {Bare Metal}{How To: Develop for Bare Metal},
+    {Developing for Bare Metal Devices}
+*/
+
+/*!
+    \page creator-how-to-uvision.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-bare-metal
+
+    \title Set up the uVision IDE
 
     \l{http://www.keil.com/support/man/docs/uv4/uv4_overview.htm}{uVision} is
-    an IDE for developing applications for embedded devices. Applications can
-    be debugged by using uVision Simulator or directly on hardware by using
+    an IDE for developing applications for embedded devices. To debug
+    applications, use uVision Simulator, or debug directly on hardware by using
     St-Link and J-Link.
 
-    You can view the current state of peripheral registers in the
-    \uicontrol {Peripheral Registers} view in Debug mode. The view
-    is hidden by default.
+    The \uicontrol {Peripheral Registers} view in Debug mode shows the current
+    state of peripheral registers. The view is hidden by default.
 
-    \section3 uVision Simulator
+    \section1 uVision Simulator
 
-    \image qtcreator-baremetal-uvision-simulator.png "Bare metal device preferences for uVision Simulator"
+    \image qtcreator-baremetal-uvision-simulator.png {Bare metal device preferences for uVision Simulator}
 
-    To specify settings for uVision Simulator:
+    To set preferences for uVision Simulator:
 
     \list 1
 
-        \include creator-baremetal-settings.qdocinc uvision-common
+        \include creator-baremetal-settings.qdocinc {uvision-common} {uVision Simulator}
 
-        \li Select the \uicontrol {Limit speed to real-time} check box to limit
+        \li Select \uicontrol {Limit speed to real-time} to limit
             the connection speed.
 
         \li Select \uicontrol Apply to add the debug server provider.
 
        \endlist
 
-    \section3 uVision St-Link or JLink Debugger
+    \section1 uVision St-Link or JLink Debugger
 
-    \image qtcreator-baremetal-uvision-st-link.png "Bare metal device preferences for uVision St-Link"
+    \image qtcreator-baremetal-uvision-st-link.png {Bare metal device preferences for uVision St-Link}
 
-    To specify settings for uVision St-Link or JLink Debugger:
+    To set preferences for uVision St-Link or JLink Debugger:
 
     \list 1
 
-        \include creator-baremetal-settings.qdocinc uvision-common
+        \include creator-baremetal-settings.qdocinc {uvision-common} {uVision St-Link or uVision JLink}
 
-        \li In the \uicontrol {Adapter options} field specify the adapter
+        \li In \uicontrol {Adapter options} specify the adapter
             interface type and speed in MHz.
 
         \li Select \uicontrol Apply to add the debug server provider.
 
     \endlist
 
-    \section1 Adding Bare Metal Devices
+    \sa {Bare Metal}{How To: Develop for Bare Metal},
+    {Developing for Bare Metal Devices}
+*/
+
+/*!
+    \page creator-how-to-add-bare-metal-devices.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-bare-metal
+
+    \title Add Bare Metal devices
 
-    \image qtcreator-baremetal-devices.png "Bare Metal device preferences"
+    Run and debug applications on small devices that are not supported
+    by the remote Linux device plugin by using GDB or a hardware debugger.
 
     To add a bare metal device:
 
         \list 1
 
-           \li Select \preferences > \uicontrol Devices
-                > \uicontrol Add > \uicontrol {Bare Metal Device} >
+           \li Go to \preferences > \uicontrol Devices.
+               \image qtcreator-baremetal-devices.png {Bare Metal device preferences}
+           \li Select \uicontrol Add > \uicontrol {Bare Metal Device} >
                 \uicontrol {Start Wizard}.
 
-           \li In the \uicontrol {Debug server provider} field, select a debug
+           \li In \uicontrol {Debug server provider}, select a debug
                server provider.
 
             \li Select \uicontrol Apply to add the device.
 
         \endlist
 
-    \section1 Building for and Running on Bare Metal Devices
+    \section1 Add the device to a kit
 
     To add a kit for building applications and running them on bare metal
-    devices, select \preferences > \uicontrol Kits
-    > \uicontrol Add. For more information, see \l{Add kits}.
+    devices, go to \preferences > \uicontrol Kits and select \uicontrol Add.
 
-    \image qtcreator-baremetal-kit.png "Kit preferences for Bare Metal"
+    \image qtcreator-baremetal-kit.png {Kit preferences for Bare Metal}
 
-    You can build applications for and run them on bare metal devices
-    in the same way as for and on the desktop. For more information, see
-    \l{Build for many platforms} and \l{Run on many platforms}.
+    Build applications for and run them on bare metal devices
+    in same way as for and on the desktop.
 
-    \sa {Enable and disable plugins}
+    \sa {Add kits}, {Build for many platforms},
+    {Bare Metal}{How To: Develop for Bare Metal}, {Run on many platforms},
+    {Developing for Bare Metal Devices}
 */
diff --git a/doc/qtcreator/src/baremetal/creator-baremetal-settings.qdocinc b/doc/qtcreator/src/baremetal/creator-baremetal-settings.qdocinc
index ea35fe9855..a6688da00b 100644
--- a/doc/qtcreator/src/baremetal/creator-baremetal-settings.qdocinc
+++ b/doc/qtcreator/src/baremetal/creator-baremetal-settings.qdocinc
@@ -1,16 +1,19 @@
-// Copyright (C) 2023 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 //! [baremetal-common]
 
-    \li In the \uicontrol Name field, enter a name for the connection.
-    \li In the \uicontrol {Startup mode} field, select the mode to start
+    \li Go to \preferences > \uicontrol Devices > \uicontrol {Bare Metal}.
+    \li Select \uicontrol Add.
+    \li Select \uicontrol {\1}.
+    \li In \uicontrol Name, enter a name for the connection.
+    \li In \uicontrol {Startup mode}, select the mode to start
         the debug server provider in.
-    \li In the \uicontrol {Peripheral description file} field, specify a path to
+    \li In \uicontrol {Peripheral description file}, specify a path to
         a file that describes the peripherals on the device.
-    \li In the \uicontrol Host field, select the host name and port number
+    \li In \uicontrol Host, select the host name and port number
         to connect to the debug server provider.
-    \li In the \uicontrol {Executable file} field, enter the path to the
+    \li In \uicontrol {Executable file}, enter the path to the
         debug server provider executable.
 
 //! [baremetal-common]
@@ -18,10 +21,10 @@
 
 //! [baremetal-init-reset]
 
-    \li In the \uicontrol {Init commands} field, enter the commands
-        to  execute when initializing the connection.
-    \li In the \uicontrol {Reset commands} field, enter the commands
-        to  execute when resetting the connection.
+    \li In \uicontrol {Init commands}, enter the commands
+        to execute when initializing the connection.
+    \li In \uicontrol {Reset commands}, enter the commands
+        to execute when resetting the connection.
     \li Select \uicontrol Apply to add the debug server provider.
 
 //! [baremetal-init-reset]
@@ -29,14 +32,16 @@
 
 //! [uvision-common]
 
-    \li In the \uicontrol Name field, enter a name for the connection.
-    \li In the \uicontrol Host field, select the host name and port
+    \li Go to \preferences > \uicontrol Devices > \uicontrol {Bare Metal}.
+    \li Select \uicontrol Add.
+    \li Select \uicontrol {\1}.
+    \li In \uicontrol Name, enter a name for the connection.
+    \li In \uicontrol Host, select the host name and port
         number to connect to the debug server provider.
-    \li In the \uicontrol {Tools file path} field, enter the path to
+    \li In \uicontrol {Tools file path}, enter the path to
         the Keil toolset configuration file.
-    \li In the \uicontrol {Target device} field, select the device to
-        debug.
-    \li In the \uicontrol {Target driver} field, select the driver for
+    \li In \uicontrol {Target device}, select the device to debug.
+    \li In \uicontrol {Target driver}, select the driver for
         connecting to the target device.
 
 //! [uvision-common]
diff --git a/doc/qtcreator/src/cmake/creator-how-to-debug-cmake-files.qdoc b/doc/qtcreator/src/cmake/creator-how-to-debug-cmake-files.qdoc
index ac3ffb12a9..538bd7cd9a 100644
--- a/doc/qtcreator/src/cmake/creator-how-to-debug-cmake-files.qdoc
+++ b/doc/qtcreator/src/cmake/creator-how-to-debug-cmake-files.qdoc
@@ -20,7 +20,7 @@
 
     \list 1
         \li In the \uicontrol Edit mode, set breakpoints in a CMake file.
-        \li Select \uicontrol Debug > \uicontrol {Start Debugging} >
+        \li Go to \uicontrol Debug > \uicontrol {Start Debugging} >
             \uicontrol {Start CMake Debugging}.
             \image qtcreator-debugger-cmake.webp {DAP CMake Preset view in the Debug mode}
     \endlist
@@ -28,6 +28,5 @@
     When the application stops at a breakpoint, you can examine data in the
     \uicontrol Debug mode views.
 
-    \sa {Debugging},{Examining Data},{Debug Mode Views},{Setting Breakpoints},
-    {CMake}
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}, {CMake}
 */
diff --git a/doc/qtcreator/src/cmake/creator-how-to-profile-cmake-code.qdoc b/doc/qtcreator/src/cmake/creator-how-to-profile-cmake-code.qdoc
index fc8cdd122c..a0f7b06c25 100644
--- a/doc/qtcreator/src/cmake/creator-how-to-profile-cmake-code.qdoc
+++ b/doc/qtcreator/src/cmake/creator-how-to-profile-cmake-code.qdoc
@@ -19,5 +19,5 @@
 
     \image qtcreator-cmake-profiler.webp {CMake profiling information in Chrome Trace Format Visualizer}
 
-    \sa {CMake}, {Visualizing Chrome Trace Events}
+    \sa {CMake}, {Chrome Trace Format Visualizer}
 */
diff --git a/doc/qtcreator/src/cmake/creator-projects-cmake.qdoc b/doc/qtcreator/src/cmake/creator-projects-cmake.qdoc
index 6c4b7d8ef0..1cc600123a 100644
--- a/doc/qtcreator/src/cmake/creator-projects-cmake.qdoc
+++ b/doc/qtcreator/src/cmake/creator-projects-cmake.qdoc
@@ -49,7 +49,7 @@
 
     \sa {Configure projects for building}, {Configure projects for running},
     {Build with CMake}{How To: Build with CMake}, {CMake Build Configuration},
-    {Debug CMake project files}, {Deploying to Remote Linux}, {Open projects},
+    {Debug CMake project files}, {Remote Linux Deploy Configuration}, {Open projects},
     {Use compilation databases}
 */
 
diff --git a/doc/qtcreator/src/debugger/creator-debug-views.qdoc b/doc/qtcreator/src/debugger/creator-debug-views.qdoc
index 149ac127a8..8880b64218 100644
--- a/doc/qtcreator/src/debugger/creator-debug-views.qdoc
+++ b/doc/qtcreator/src/debugger/creator-debug-views.qdoc
@@ -6,12 +6,17 @@
     \if defined(qtdesignstudio)
     \previouspage creator-debugging-qml.html
     \else
-    \previouspage creator-debug-mode.html
+    \previouspage creator-reference.html
     \endif
-    \nextpage creator-breakpoints-view.html
+
+    \ingroup creator-reference-debugger-views
+    \ingroup studio-debugger-views
 
     \title Viewing Call Stack Trace
 
+    \brief View the nested function calls leading to the current position as a
+    call stack trace.
+
     When the application being debugged is interrupted, \QC displays the nested
     function calls leading to the current position as a call stack trace. This
     stack trace is built up from call stack frames, each representing a
@@ -40,19 +45,27 @@
     from the stopped executable and prepends the frames to the C++ frames,
     should it find any. You can click a frame in the QML stack to open the QML
     file in the editor.
+
+    \if defined(qtcreator)
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
+    \endif
 */
 
 /*!
     \page creator-breakpoints-view.html
-    \previouspage creator-stack-view.html
     \if defined(qtdesignstudio)
-    \nextpage creator-locals-view.html
+    \previouspage creator-debugging-qml.html
     \else
-    \nextpage creator-threads-view.html
+    \previouspage creator-reference.html
     \endif
 
+    \ingroup creator-reference-debugger-views
+    \ingroup studio-debugger-views
+
     \title Setting Breakpoints
 
+    \brief Set breakpoints to interrupt the application.
+
     You can associate breakpoints with:
 
     \list
@@ -128,7 +141,27 @@
 
     \image qtcreator-debug-breakpoints.webp {Breakpoints view}
 
-    \section1 Adding Breakpoints
+    \if defined(qtdesignstudio)
+    For more information, see:
+
+    \generatelist studio-how-to-debug
+    \else
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
+    \endif
+*/
+
+/*!
+    \page creator-how-to-add-breakpoints.html
+    \if defined(qtdesignstudio)
+    \previouspage creator-breakpoints-view.html
+    \else
+    \previouspage creator-how-tos.html
+    \endif
+
+    \ingroup creator-how-to-debug
+    \ingroup studio-how-to-debug
+
+    \title Add breakpoints
 
     To add breakpoints:
 
@@ -139,7 +172,7 @@
             \list
 
                 \li In the code editor, click the left margin or press \key F9
-                    (\key F8 on \macos) on a particular line you want the
+                    (\key F8 on \macos) on a particular line where you want the
                     application to stop.
 
                 \li In the \uicontrol {Breakpoint Preset} view or the
@@ -152,13 +185,13 @@
                     \endlist
             \endlist
 
-        \li In the \uicontrol {Breakpoint type} field, select the location in the
+        \li In \uicontrol {Breakpoint type}, select the location in the
             application code where you want the application to stop.
 
             \image qtcreator-add-breakpoint.webp {Add Breakpoints} dialog
     \endlist
 
-    Deselect the \uicontrol Enabled check box to make the breakpoint temporarily
+    Clear \uicontrol Enabled to make the breakpoint temporarily
     inoperative as if you had deleted it, but keep the information about the
     breakpoint, so that you can enable it again later.
 
@@ -216,59 +249,37 @@
     \endtable
 
     \if defined(qtcreator)
-    \section1 Specifying Breakpoint Settings
-
-    You can specify settings for breakpoints in \preferences >
-    \uicontrol Debugger. For more information, see \l{Debugger Preferences}.
-
-    \image qtcreator-debugger-general-options.png {General tab in Debugger preferences}
-
-    To use a full absolute path in breakpoints, select the
-    \uicontrol {Set breakpoints using a full absolute path} check box.
-
-    GDB and CDB enable setting breakpoints on source lines for which no code
-    was generated. In such situations, the breakpoint is shifted to the next
-    source code line for which the code was actually generated. To reflect
-    such temporary changes by moving the breakpoint markers in the source code
-    editor, select \uicontrol GDB > \uicontrol {Adjust breakpoint locations}
-    or \uicontrol CDB > \uicontrol {Correct breakpoint location}.
-
-    When using GDB as backend, you can extend the ordinary GDB
-    breakpoint class by using Python. Select \uicontrol GDB >
-    \uicontrol {Use pseudo message tracepoints}.
-
-    When using CDB as backend, you can specify that the debugger should break on
-    specific events, such as C++ exceptions, thread creation or exit, loading or
-    unloading \l{Viewing Modules}{application modules}, or particular output.
-    Select the appropriate check boxes in the \uicontrol CDB >
-    \uicontrol {Break on} group. To disable first-chance break on access
-    violation exceptions, select the \uicontrol {Ignore first chance access
-    violations} check box. The second occurrence of an access violation will
-    break into the debugger.
-
-    You can automatically add breakpoints on some functions to catch error
-    and warning messages. For more information, see \l{Specifying CDB Settings}
-    and \l{Specifying GDB Settings}.
-
-    For more information on breakpoints, see
-    \l{http://sourceware.org/gdb/onlinedocs/gdb/Breakpoints.html#Breakpoints}
-    {Breakpoints, Watchpoints, and Catchpoints} in GDB documentation.
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
+    \endif
+*/
+
+/*!
+    \page creator-how-to-manage-breakpoints.html
+    \if defined(qtdesignstudio)
+    \previouspage creator-breakpoints-view.html
+    \else
+    \previouspage creator-how-tos.html
     \endif
 
-    \section1 Moving Breakpoints
+    \ingroup creator-how-to-debug
+    \ingroup studio-how-to-debug
+
+    \title Manage breakpoints
+
+    \section1 Move breakpoints
 
     To move a breakpoint:
 
     \list
-        \li Drag and drop a breakpoint marker to another line
+        \li Drag a breakpoint marker to another line
             in the text editor.
         \li In the \uicontrol {Breakpoint Preset} view or the
              \uicontrol Breakpoints view, select
              \uicontrol {Edit Selected Breakpoints}, and set the
-             line number in the \uicontrol {Line number} field.
+             line number in \uicontrol {Line number}.
     \endlist
 
-    \section1 Deleting Breakpoints
+    \section1 Delete breakpoints
 
     To delete breakpoints:
 
@@ -288,9 +299,9 @@
 
     \endlist
 
-    \section1 Enabling and Disabling Breakpoints
+    \section1 Turn breakpoints on and off
 
-    To temporarily disable a breakpoint without deleting it and losing associated
+    To temporarily turn off a breakpoint without deleting it and losing associated
     data like conditions and commands:
 
     \list
@@ -316,7 +327,23 @@
     Other than data breakpoints retain their enabled or disabled state when the
     debugged application is restarted.
 
-    \section1 Setting Data Breakpoints
+    \if defined(qtcreator)
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
+    \endif
+*/
+
+/*!
+    \page creator-how-to-set-data-breakpoints.html
+    \if defined(qtdesignstudio)
+    \previouspage creator-breakpoints-view.html
+    \else
+    \previouspage creator-how-tos.html
+    \endif
+
+    \ingroup creator-how-to-debug
+    \ingroup studio-how-to-debug
+
+    \title Set data breakpoints
 
     A \e {data breakpoint} stops the application when data is read or written at the
     specified address.
@@ -328,11 +355,10 @@
         \li In the \uicontrol {Breakpoint Preset} or \uicontrol Breakpoints
             view, select \uicontrol {Add Breakpoint} in the context menu.
 
-        \li In the \uicontrol {Breakpoint type} field, select
+        \li In \uicontrol {Breakpoint type}, select
             \uicontrol {Break on data access at fixed address}.
 
-        \li In the \uicontrol Address field, specify the address of the memory
-            block.
+        \li In \uicontrol Address, specify the address of the memory block.
 
         \li Select \uicontrol OK.
 
@@ -349,21 +375,25 @@
     it manually.
 
     \if defined(qtcreator)
-    \sa {Debug CMake project files}
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
     \endif
 */
 
 /*!
     \page creator-locals-view.html
     \if defined(qtdesignstudio)
-    \previouspage creator-breakpoints-view.html
+    \previouspage creator-debugging-qml.html
     \else
-    \previouspage creator-source-files-view.html
+    \previouspage creator-reference.html
     \endif
-    \nextpage creator-expressions-view.html
+
+    \ingroup creator-reference-debugger-views
+    \ingroup studio-debugger-views
 
     \title Local Variables and Function Parameters
 
+    \brief Inspect local variables and function parameters.
+
     The \uicontrol {Locals} view consists of the \uicontrol Locals pane and the
     \uicontrol {Return Value} pane (hidden when empty).
 
@@ -388,18 +418,18 @@
     //! [0]
     \list
         \li Add and remove expression evaluators
-        \li Change \l{Changing Value Display format}{value display format}
+        \li \l{Change value display format}
         \li Expand and collapse view contents
         \li Copy view contents or expression values to the clipboard
         \li Open view contents in an editor
         \li Open memory editor
         \li Set data breakpoints
-        \li Use \l{Using Debugging Helpers}{debugging helpers}
+        \li Use \l{Debugging Helpers}{debugging helpers}
         \li Show and hide tooltips in the view when debugging
         \li Dereference pointers automatically
         \li Sort members of classes and structs alphabetically
         \li Use dynamic object type for display
-        \li Set \l{Debugger Preferences}{debugger preferences}
+        \li Set debugger preferences
     \endlist
     //! [0]
     \endif
@@ -410,19 +440,27 @@
     objects will be displayed. Select \uicontrol {Use dynamic object type for
     display} in the context menu. Keep in mind that choosing the dynamic type
     might be slower.
+
+    \if defined(qtcreator)
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
+    \endif
 */
 
 /*!
     \page creator-expressions-view.html
-    \previouspage creator-locals-view.html
     \if defined(qtdesignstudio)
-    \nextpage creator-qml-debugging-example.html
+    \previouspage creator-debugging-qml.html
     \else
-    \nextpage creator-registers-view.html
+    \previouspage creator-reference.html
     \endif
 
+    \ingroup creator-reference-debugger-views
+    \ingroup studio-debugger-views
+
     \title Evaluating Expressions
 
+    \brief Compute values of arithmetic expressions or function calls.
+
     To compute values of arithmetic expressions or function calls, use
     expression evaluators in the \uicontrol Expressions view.
 
@@ -515,5 +553,7 @@
     appears uninitialized, its value is reported as
     \uicontrol {not in scope}. Not all uninitialized objects,
     however, can be recognized as such.
+
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
     \endif
 */
diff --git a/doc/qtcreator/src/debugger/creator-only/creator-debugger-example.qdoc b/doc/qtcreator/src/debugger/creator-only/creator-debugger-example.qdoc
index ccc9e82fd1..964bbaf5e1 100644
--- a/doc/qtcreator/src/debugger/creator-only/creator-debugger-example.qdoc
+++ b/doc/qtcreator/src/debugger/creator-only/creator-debugger-example.qdoc
@@ -95,5 +95,5 @@
     (\uicontrol {Step Into}), and \inlineimage icons/debugger_stepout_small.png
     (\uicontrol {Step Out}).
 
-    \sa {Creating a Qt Widget Based Application}, {Debugging}
+    \sa {Creating a Qt Widget Based Application}, {Debugging}, {Debuggers}, {Debugger}
 */
diff --git a/doc/qtcreator/src/debugger/creator-only/creator-debugger-settings.qdoc b/doc/qtcreator/src/debugger/creator-only/creator-debugger-settings.qdoc
index 4583460cb4..b3fef5c0e3 100644
--- a/doc/qtcreator/src/debugger/creator-only/creator-debugger-settings.qdoc
+++ b/doc/qtcreator/src/debugger/creator-only/creator-debugger-settings.qdoc
@@ -3,20 +3,22 @@
 
 /*!
     \page creator-debugger-preferences.html
-    \previouspage creator-remote-debugging.html
-    \nextpage creator-debugging-helpers.html
+    \previouspage creator-reference.html
 
-    \title Debugger Preferences
+    \ingroup creator-reference-preferences-debugger
 
-    To specify settings for managing debugger processes, select \preferences >
-    \uicontrol Debugger. In the \uicontrol General tab,you can specify settings
+    \title General
+
+    \brief Customize debug views and map source paths.
+
+    To specify settings for managing debugger processes, go to \preferences >
+    \uicontrol Debugger. In the \uicontrol General tab, you can specify settings
     that are common to all debuggers.
 
     \image qtcreator-debugger-general-options.png "Debugger General preferences"
 
-    You can customize the appearance and behavior of the debug views,
-    \l{Specifying Breakpoint Settings}{specify settings for breakpoints},
-    and map source paths to target paths.
+    You can customize the appearance and behavior of the debug views and
+    setting breakpoints, as well as map source paths to target paths.
 
     You can view debug output in the \l {Debugger Log} view.
     However, in some Linux distributions, such as Arch Linux, debug
@@ -26,7 +28,39 @@
     application, which effectively prevents storing debug output in
     system logs.
 
-    \section1 Mapping Source Paths
+    \section1 Breakpoints
+
+    To use a full absolute path in breakpoints, select the
+    \uicontrol {Set breakpoints using a full absolute path} check box.
+
+    GDB and CDB enable setting breakpoints on source lines for which no code
+    was generated. In such situations, the breakpoint is shifted to the next
+    source code line for which the code was actually generated. To reflect
+    such temporary changes by moving the breakpoint markers in the source code
+    editor, select \uicontrol GDB > \uicontrol {Adjust breakpoint locations}
+    or \uicontrol CDB > \uicontrol {Correct breakpoint location}.
+
+    When using GDB as backend, you can extend the ordinary GDB
+    breakpoint class by using Python. Select \uicontrol GDB >
+    \uicontrol {Use pseudo message tracepoints}.
+
+    When using CDB as backend, you can specify that the debugger should break on
+    specific events, such as C++ exceptions, thread creation or exit, loading or
+    unloading \l{Viewing Modules}{application modules}, or particular output.
+    Select the appropriate check boxes in the \uicontrol CDB >
+    \uicontrol {Break on} group. To disable first-chance break on access
+    violation exceptions, select the \uicontrol {Ignore first chance access
+    violations} check box. The second occurrence of an access violation will
+    break into the debugger.
+
+    You can automatically add breakpoints on some functions to catch error
+    and warning messages. For more information, see \l{CDB} and \l{GDB}.
+
+    For more information on breakpoints, see
+    \l{http://sourceware.org/gdb/onlinedocs/gdb/Breakpoints.html#Breakpoints}
+    {Breakpoints, Watchpoints, and Catchpoints} in GDB documentation.
+
+    \section1 Source Paths Mapping
 
     To enable the debugger to step into the code and display the source code
     when using a copy of the source tree at a location different from the one
@@ -48,52 +82,79 @@
             of the source tree on the local machine.
     \endlist
 
-    \section1 Specifying GDB Settings
-
-    To specify settings for managing the GDB process, select \preferences >
-    \uicontrol Debugger > \uicontrol GDB.
-
-    \image qtcreator-preferences-debugger-gdb.webp {GDB preferences}
-
-    To specify a timeout for terminating non-responsive GDB processes, set the
-    number of seconds to wait in the \uicontrol {GDB timeout} field. The default
-    value of 20 seconds should be sufficient for most applications, but if
-    loading big libraries or listing source files takes much longer than
-    that on slow machines, you should increase the value.
-
-    To compress several steps into one step for less noisy debugging when
-    stepping into code, select the \uicontrol {Skip known frames when stepping}
-    check box. For example, the atomic reference counting code is skipped, and
-    a single \e {Step Into} for a signal emission ends up directly in the slot
-    connected to it.
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
+*/
 
-    To display a message box as soon as your application receives a signal, such
-    as SIGSEGV, during debugging, select the \uicontrol {Show a message box when
-    receiving a signal} check box.
+/*!
+    \page creator-preferences-debugger-gdb.html
+    \previouspage creator-reference.html
 
-    GDB allows setting breakpoints on source lines for which no code was
-    generated. In such situations, the breakpoint is shifted to the next
-    source code line for which the code was actually generated. To reflect
-    such temporary changes by moving the breakpoint markers in the source
-    code editor, select the \uicontrol {Adjust breakpoint locations} check box.
+    \ingroup creator-reference-preferences-debugger
 
-    To specify whether the dynamic or the static type of objects will be
-    displayed, select the \uicontrol {Use dynamic object type for display}
-    check box. Keep in mind that choosing the dynamic type might be slower.
+    \title GDB
 
-    To allow reading the user's default .gdbinit file on debugger startup,
-    select the \uicontrol {Load .gdbinit file on startup} check box.
+    \brief Manage the GDB process.
 
-    To use the default GDB pretty printers installed in your system
-    or linked to the libraries your application uses, select the
-    \uicontrol {Load system GDB pretty printers} check box.
+    To specify settings for managing the GDB process, go to \preferences >
+    \uicontrol Debugger > \uicontrol GDB.
 
-    By default, GDB shows AT&T style disassembly. To switch to the Intel style,
-    select the \uicontrol {Use Intel style disassembly} check box.
+    \image qtcreator-preferences-debugger-gdb.webp {GDB preferences}
 
-    To have GDB automatically save a copy of its symbol index in a cache
-    on disk and retrieve it from there when loading the same binary in the
-    future, select the \uicontrol {Use automatic symbol cache} check box.
+    The following table summarizes the preferences.
+
+    \table
+    \header
+        \li Setting
+        \li Value
+    \row
+        \li \uicontrol {GDB timeout}
+        \li The timeout for terminating non-responsive GDB processes in seconds
+            The default value of 40 seconds should be sufficient for most
+            applications, but if loading big libraries or listing source files
+            takes much longer than that on slow machines, increase the value.
+    \row
+        \li \uicontrol {Skip known frames when stepping}
+        \li Compresses several steps into one step for less noisy debugging when
+            stepping into code. For example, the atomic reference counting code
+            is skipped, and a single \e {Step Into} for a signal emission ends up
+            directly in the slot connected to it.
+    \row
+        \li \uicontrol {Show a message box when receiving a signal}
+        \li Shows a message box as soon as your application receives a signal,
+            such as SIGSEGV, during debugging.
+    \row
+        \li \uicontrol {Adjust breakpoint locations}
+        \li GDB allows setting breakpoints on source lines for which no code was
+            generated. In such situations, the breakpoint is shifted to the next
+            source code line for which the code was actually generated. To reflect
+            such temporary changes by moving the breakpoint markers in the source
+            code editor, select this checkbox.
+    \row
+        \li \uicontrol {Use dynamic object type for display}
+        \li Whether the dynamic or the static type of objects will be
+            displayed. Choosing the dynamic type might make debugging slower.
+    \row
+        \li \uicontrol {Load .gdbinit file on startup}
+        \li Reads the user's default .gdbinit file on debugger startup.
+    \row
+        \li \uicontrol {Load system GDB pretty printers}
+        \li Uses the default GDB pretty printers installed on the computer
+            or linked to the libraries your application uses.
+    \row
+        \li \uicontrol {Use Intel style disassembly}
+        \li Switches from the default AT&T style disassembly to the Intel style.
+    \row
+        \li \uicontrol {Use automatic symbol cache}
+        \li Automatically saves a copy of the GDB symbol index in a cache on disk
+            and retrieves it from there when loading the same binary in the
+            future.
+    \row
+        \li \uicontrol {Use debug info daemon}
+        \li Tries to automatically retrieve debug information for system
+            packages.
+    \endtable
+
+    \section1 Executing Additional Commands
 
     To execute GDB commands after GDB has been started, but before the debugged
     application is started or attached, and before the debugging helpers are
@@ -111,85 +172,134 @@
     To execute arbitrary Python scripts, use
     \c {python execfile('/path/to/script.py')}.
 
-    \section2 Extended GDB Settings
+    \section1 Extended GDB Settings
 
     The settings in the \uicontrol Extended group give access to advanced
     or experimental functions of GDB.
     Enabling them may negatively impact your debugging experience, so use
     them with care.
 
-    To use asynchronous mode to control the inferior, select the
-    respective check box.
-
-    To add common paths to locations of debug information, such as
-    \c {/usr/src/debug}, when starting GDB, select the
-    \uicontrol {Use common locations for debug information} check box.
+    \table
+    \header
+        \li Setting
+        \li Value
+    \row
+        \li \uicontrol {Use asynchronous mode to control the inferior}
+        \li Execute commands in the background (asynchronous) mode.
+            GDB immediately opens a command prompt where you can issue
+            other commands while your program runs.
+    \row
+        \li \uicontrol {Use common locations for debug information}
+        \li Adds common paths to locations of debug information, such as
+            \c {/usr/src/debug}, when starting GDB.
+    \row
+        \li \uicontrol {Stop when qWarning() is called}
+        \li Adds a breakpoint on each \c qWarning() function.
+    \row
+        \li \uicontrol {Stop when qFatal() is called}
+        \li Adds a breakpoint on each \c qFatal() function.
+    \row
+        \li \uicontrol {Stop when abort() is called}
+        \li Adds a breakpoint on each \c abort() function.
+    \row
+        \li \uicontrol {Enable reverse debugging}
+        \li Enables stepping backwards. This feature is very slow and unstable
+            on the GDB side. It exhibits unpredictable behavior when steapping
+            backwards over system calls and is very likely to destroy your
+            debugging session.
+    \row
+        \li\uicontrol {Debug all child processes}
+        \li Keeps debugging all children after a fork.
+    \endtable
+
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
+*/
 
-    To stop when \c qWarning, \c qFatal, or \c abort is called, select the
-    respective check box.
+/*!
+    \page creator-preferences-debugger-cdb.html
+    \previouspage creator-reference.html
 
-    To enable stepping backwards, select the \uicontrol {Enable reverse
-    debugging} check box. This feature is very slow and unstable on the
-    GDB side. It exhibits unpredictable behavior when going backwards over
-    system calls and is very likely to destroy your debugging session.
+    \ingroup creator-reference-preferences-debugger
 
-    To keep debugging all children after a fork, select the
-    \uicontrol {Debug all child processes} check box.
+    \title CDB
 
-    \section1 Specifying CDB Settings
+    \brief Manage the CDB process.
 
-    To specify settings for managing the CDB process, select \preferences >
+    To specify settings for managing the CDB process, go to \preferences >
     \uicontrol Debugger > \uicontrol CDB.
 
     \image qtcreator-cdb-options.png "CDB preferences"
 
-    You can specify additional arguments for starting CDB in the
-    \uicontrol {Additional arguments} field.
-
-    If a console application does not start up properly in the configured
-    console and the subsequent attach fails, you can diagnose the issue by
-    using CDB's native console. Select the \uicontrol {Use CDB console}
-    check box to override the console set in the Windows system
-    environment variables. Note that the native console does not
-    prompt on application exit.
-
-    To automatically add a breakpoint on the \c CrtCbgReport() function,
-    select the \uicontrol {Stop when CrtCbgReport() is called} check box.
-    This catches runtime error messages caused by \c assert(), for example.
-
-    In the \uicontrol {Break on} group, specify whether the debugger should
-    break on C++ exceptions, on thread creation or exit, on loading or
-    unloading the specified \l{Viewing Modules}{application modules}, or on
-    the specified output.
-
-    To disable first-chance break on access violation exceptions, select the
-    \uicontrol {Ignore first chance access violations} check box.
-    The second occurrence of an access violation will break into the debugger.
+    The following table summarizes the preferences.
+
+    \table
+    \header
+        \li Setting
+        \li Value
+    \row
+        \li \uicontrol {Additional arguments}
+        \li Additional arguments for starting CDB.
+    \row
+        \li \uicontrol {Use CDB console}
+        \li If a console application does not start up properly in the configured
+            console and the subsequent attach fails, diagnose the issue by
+            using CDB's native console. Select this checkbox to override the
+            console set in the Windows system environment variables. Note that
+            the native console does not prompt on application exit.
+    \row
+        \li \uicontrol {Ignore first chance access violations}
+        \li Disables first-chance break on access violation exceptions.
+            The second occurrence of an access violation will break into the
+            debugger.
+    \row
+        \li \uicontrol {Stop when CrtDbgReport() is called}
+        \li Automatically adds a breakpoint on the \c CrtDbgReport() function to
+            catch runtime error messages caused by \c assert(), for example.
+    \row
+        \li \uicontrol {Correct breakpoint location}
+        \li CDB enables setting breakpoints in comments or on source lines for
+            which no code was generated. In such situations, the breakpoint is
+            shifted to the next source code line for which the code was actually
+            generated. To reflect such temporary changes by moving the breakpoint
+            markers in the source code editor, select this checkbox. For more
+            information, see \l{Setting Breakpoints}.
+    \row
+        \li \uicontrol {Use Python dumper}
+        \li Uses the abstraction layer of Python Dumper classes to create a
+            description of data items in the \uicontrol Locals and
+            \uicontrol Expressions views.
+            For more information, see \l{Debugging Helper Implementation}.
+    \row
+        \li \uicontrol {Break on}
+        \li Whether the debugger should break on C++ exceptions, on thread
+            creation or exit, on loading or unloading the specified
+            \l{Viewing Modules}{application modules}, or on the specified output.
+    \row
+        \li \uicontrol {Add Exceptions to Issues View}
+        \li Shows information about first-chance and second-chance exceptions
+            in \l Issues.
+    \endtable
+
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
+*/
 
-    CDB enables setting breakpoints in comments or on source lines for which
-    no code was generated. In such situations, the breakpoint is shifted to
-    the next source code line for which the code was actually generated. To
-    reflect such temporary changes by moving the breakpoint markers in the
-    source code editor, select the \uicontrol {Correct breakpoint location}
-    check box. For more information, see \l{Setting Breakpoints}.
+/*!
+    \page creator-preferences-debugger-cdb-paths.html
+    \previouspage creator-reference.html
 
-    To use the abstraction layer of Python Dumper classes to create a description
-    of data items in the \uicontrol Locals and \uicontrol Expressions
-    views, select the \uicontrol {Use Python dumper} check box.
-    For more information, see \l{Debugging Helper Implementation}.
+    \ingroup creator-reference-preferences-debugger
 
-    To display information about first-chance and second-chance exceptions
-    in \l Issues, select the check boxes
-    in the \uicontrol {Add Exceptions to Issues View} group.
+    \title CDB Paths
 
-    \section1 Setting CDB Paths on Windows
+    \brief Add the Microsoft Symbol Server to the symbol search path of the
+    debugger.
 
     To obtain debugging information for the operating system libraries for
     debugging Windows applications, add the Microsoft Symbol Server
     to the symbol search path of the debugger:
 
     \list 1
-        \li Select \preferences > \uicontrol Debugger > \uicontrol {CDB Paths}.
+        \li Go to \preferences > \uicontrol Debugger > \uicontrol {CDB Paths}.
             \image qtcreator-debugger-cdb-paths.png
         \li In the \uicontrol {Symbol Paths} group, select \uicontrol Insert.
         \li Select the directory where you want to store the cached information.
@@ -204,4 +314,6 @@
     To use the Source Server infrastructure for fetching missing source files
     directly from version control or the web, enter the following string in
     the \uicontrol {Source Paths} field: \c srv*.
+
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
 */
diff --git a/doc/qtcreator/src/debugger/creator-only/creator-debugger-setup.qdoc b/doc/qtcreator/src/debugger/creator-only/creator-debugger-setup.qdoc
index 66386d72c0..d2836a9c5f 100644
--- a/doc/qtcreator/src/debugger/creator-only/creator-debugger-setup.qdoc
+++ b/doc/qtcreator/src/debugger/creator-only/creator-debugger-setup.qdoc
@@ -9,61 +9,22 @@
 
 
 /*!
-    \previouspage creator-debugging.html
     \page creator-debugger-engines.html
-    \nextpage creator-debugger-operating-modes.html
+    \previouspage creator-reference.html
 
-    \title Setting Up Debugger
+    \ingroup creator-reference-debugger
 
-    The main debugger preferences are associated with the
-    \l{kits-tab}{kit} you build and run your project with. To
-    specify the debugger and compiler to use for each kit, select
-    \preferences > \uicontrol Kits.
+    \title Supported Native Debuggers
 
-    \image qtcreator-kits.png {Kits preferences}
-
-    You need to set up the debugger only if the automatic setup fails because
-    the native debugger is missing (for example, you must install the CDB
-    debugger on Windows yourself) or because \QC does not support the installed
-    version. For example, when your system does not have GDB
-    installed or the installed version is outdated, and you want to use a locally
-    installed replacement instead.
-
-    To change the debugger in an automatically detected kit, select
-    \preferences > \uicontrol Kits >
-    \uicontrol Clone to create a copy of the kit, and change the
-    parameters in the cloned kit. Make sure to enable the cloned kit
-    for your project.
-
-    If the debugger you want to use is not automatically detected, select
-    \preferences > \uicontrol Kits >
-    \uicontrol Debuggers > \uicontrol Add to add it.
-
-    \image qtcreator-preferences-kits-debuggers.webp {Debuggers tab in Kits preferences}
-
-    To use the debugging tools for Windows, you must install them.
-    Optionally, you can set up the Microsoft Symbol Server if you need
-    symbol information from Microsoft modules that is not found locally.
-    For more information, see \l{Setting CDB Paths on Windows}.
-
-    To use the Free Software Foundation (FSF) version of GDB on \macos, you
-    must sign it and modify your kit preferences.
-
-    This section describes the options you have for debugging C++ and Python code
-    and installing the supported native debuggers. It also
-    applies to code in other compiled languages such as C, FORTRAN, and Ada.
-
-    For more information about launching the debugger in different modes, see
-    \l{Debugger Operating Modes}.
-
-    \section1 Supported Native Debugger Versions
+    \brief Summary of supported debugger versions.
 
     \QC supports native debuggers for debugging compiled code.
     On most supported platforms, you can use the GNU Symbolic Debugger (GDB).
-    On Microsoft Windows, when using the Microsoft tool chain, you need the
+    On Microsoft Windows, when using the Microsoft toolchain, you need the
     Microsoft Console Debugger (CDB). On \macos and Linux, you can use the LLDB
-    debugger. On all supported platforms, you can use PDB to debug Python source
-    code.
+    debugger.
+
+    On all supported platforms, you can use PDB to debug Python source code.
 
     \note You need a debugger version built with Python scripting support.
 
@@ -85,7 +46,7 @@
         \row
             \li \macos
             \li GCC, Clang
-            \li LLDB, FSF GDB (experimental)
+            \li LLDB
         \row
             \li Windows/\MinGW
             \li GCC
@@ -96,7 +57,12 @@
             \li Debugging Tools for Windows/CDB
     \endtable
 
-    \section2 Supported GDB Versions
+    The debugger plugin automatically selects a suitable native debugger for
+    each \l{kits-tab}{kit} from the ones found on the computer. The automatic
+    setup fails if the native debugger is not installed on the computer or
+    if \QC does not support the installed version.
+
+    \section1 GDB Versions
 
     Use GDB 7.5, or later, with the Python scripting extension and Python version
     3.5, or later.
@@ -104,49 +70,6 @@
     For remote debugging using GDB and GDB server, the minimum supported version
     of GDB server on the target \l{glossary-device}{device} is 7.0.
 
-    \section2 Supported CDB Versions
-
-    \QC supports all versions of CDB targeting platforms that Qt supports.
-
-    \section2 Supported LLDB Versions
-
-    The LLDB native debugger has similar functionality to the GDB debugger. LLDB
-    is the default debugger in Xcode on \macos for C++ on the desktop.
-    LLDB is typically used with the Clang compiler (even though you can use it
-    with GCC, too).
-
-    On \macos you can use the LLDB version delivered with Xcode or build from source.
-    The minimum supported version is LLDB 320.4. You need a LLDB version built
-    with Python support.
-
-    On Linux, the minimum supported version is LLDB 3.8.
-
-    \section2 GDB Run Modes
-
-    The GDB native debugger used internally by the debugger plugin runs in
-    different modes to cope with the variety of supported platforms and
-    environments:
-
-    \list
-
-        \li Plain mode debugs locally started processes that do not need console input.
-
-        \li Terminal mode debugs locally started processes that need a console.
-
-        \li Attach mode debugs local processes started outside \QC.
-
-        \li Core mode debugs core files generated from crashes.
-
-        \li Remote mode interacts with the GDB server running on Linux.
-
-    \endlist
-
-    \section1 Installing Native Debuggers
-
-    The following sections describe installing native debuggers.
-
-    \section2 GDB
-
     On Windows, use the Python-enabled GDB version that is bundled
     with the Qt package or comes with recent versions of \MinGW. On
     most Linux distributions, the GDB builds shipped with the system
@@ -157,7 +80,9 @@
 
     Builds of GDB shipped with Xcode on \macos are no longer supported.
 
-    \section2 Debugging Tools for Windows
+    \section1 Debugging Tools for Windows
+
+    \QC supports all versions of CDB targeting platforms that Qt supports.
 
     To use the CDB debugger, install the \e {Debugging Tools for Windows} when
     you install \QC either by using \QOI (in \uicontrol Qt
@@ -180,12 +105,12 @@
     the required files in
     \c{"%ProgramFiles%\Debugging Tools for Windows"}.
 
-    \section2 Debugging Tools for \macos
+    \section1 Debugging Tools for \macos
 
     The Qt binary distribution has both debug and release
     variants of the libraries. However, you have to explicitly tell the
     runtime linker that you want to use the debug libraries even if
-    your application is compiled as debug, as release is the default
+    your application is compiled as \e debug because \e release is the default
     library.
 
     If you use a qmake based project in \QC, you can set a flag in
@@ -196,88 +121,32 @@
     For more detailed information about debugging on \macos,
     see: \l{http://developer.apple.com/library/mac/#technotes/tn2124/_index.html#//apple_ref/doc/uid/DTS10003391}
     {Mac OS X Debugging Magic}.
+    \section1 LLDB Versions
+
+    The LLDB native debugger has similar functionality to the GDB debugger. LLDB
+    is the default debugger in Xcode on \macos for C++ on the desktop.
+    LLDB is typically used with the Clang compiler (even though you can use it
+    with GCC, too).
 
-    \section2 LLDB
+    On \macos you can use the LLDB version delivered with Xcode or build from source.
+    The minimum supported version is LLDB 320.4. You need a LLDB version built
+    with Python support.
 
     We recommend using the LLDB version that is delivered with the latest Xcode.
 
-    \section2 PDB
+    On Linux, the minimum supported version is LLDB 3.8.
+
+    \section1 PDB Versions
 
     \l{https://docs.python.org/3/library/pdb.html}{PDB} is a source code debugger
     for Python applications. You can use it to debug projects that have a
     \l {Creating a Qt for Python Application with Qt Widgets}{.pyproject}
     configuration file.
 
-    You must install Python and set the interpreter to use in \uicontrol Projects
-    > \uicontrol Run:
+    Install Python and set the interpreter to use in \uicontrol Projects
+    > \uicontrol Run.
 
     \image qtcreator-run-settings-python.webp {Run settings for a Python project}
 
-    Start debugging the \c main.py file. If you encounter problems, check the
-    active build target in the kit selector.
-
-    \QC does not support mixed-mode debugging, but you can attach GDB to the
-    Python interpreter to debug the C++ implementation of the corresponding
-    Python code. For more information, see
-    \l{https://doc.qt.io/qtforpython-6/tutorials/debugging/qtcreator/qtcreator.html}
-    {Debugging PySide with Qt Creator (Linux)}.
-
-    \section1 Setting up FSF GDB for \macos
-
-    To use FSF GDB on \macos, you must sign it and add it to the \QC
-    \l{glossary-buildandrun-kit}{kits}.
-
-    \list 1
-
-        \li To create a key for signing FSF GDB, select
-            \uicontrol {Keychain Access} > \uicontrol {Certificate Assistant} >
-            \uicontrol {Create a Certificate}:
-
-        \list 1
-
-            \li In the \uicontrol Name field, input \uicontrol fsfgdb to
-                replace the existing content.
-
-            \li In the \uicontrol {Certificate Type} field, select
-                \uicontrol {Code Signing}.
-
-            \li Select the \uicontrol {Let me override defaults} check box.
-
-            \li Select \uicontrol Continue, and follow the instructions of the
-                wizard (use the default settings), until the
-                \uicontrol {Specify a Location For The Certificate} dialog
-                opens.
-
-            \li In the \uicontrol Keychain field, select \uicontrol System.
-
-            \li Select \uicontrol {Keychain Access} > \uicontrol System, and
-                locate the certificate.
-
-            \li Double click the certificate to view certificate information.
-
-            \li In the \uicontrol Trust section, select
-                \uicontrol {Always Trust} in the
-                \uicontrol {When using this certificate} field, and then close
-                the dialog.
-
-        \endlist
-
-        \li To sign the binary, enter the following command in the terminal:
-
-            \code
-            codesign -f -s "fsfgdb" $INSTALL_LOCATION/fsfgdb
-            \endcode
-
-        \li In \QC, select \uicontrol {\QC} > \uicontrol Preferences >
-            \uicontrol Kits > \uicontrol Add to
-            create a kit that uses FSF GDB.
-
-            \li In the \uicontrol Debugger field, specify the path to FSF GDB
-                (\c $HOME/gdb72/bin/fsfgdb, but with an explicit value for
-                \c $HOME).
-
-        \li To use the debugger, enable the kit in the \uicontrol {Build Settings}
-            of the project.
-
-    \endlist
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
 */
diff --git a/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc b/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc
index d3441ab063..eee91df904 100644
--- a/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc
+++ b/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc
@@ -26,94 +26,202 @@
         \li Debug Python source code - PDB.
     \endlist
 
-    The following sections describe how to set up, launch, and interact with the
-    debugger:
+    \section1 Setting Up the Debugger
 
-    \list
+    The debugger plugin automatically selects a suitable native debugger for
+    each \l{kits-tab}{kit} from the ones found on your system. You can select
+    another kit. To specify the debugger and compiler to use for each kit, go to
+    \preferences > \uicontrol Kits.
 
-        \li \l{Setting Up Debugger}
+    \image qtcreator-kits.png {Kits preferences}
 
-            The debugger plugin automatically selects a suitable
-            native debugger for each \l{glossary-buildandrun-kit}{kit} from the
-            ones found on your system. You can edit the kits to override this
-            choice.
+    You need to set up the debugger only if the automatic setup fails because
+    the native debugger is missing (for example, you must install the CDB
+    debugger on Windows yourself) or because \QC does not support the installed
+    version. For example, when your system does not have GDB
+    installed or the installed version is outdated, and you want to use a locally
+    installed replacement instead.
 
-        \li \l{Launching the Debugger}
+    To change the debugger in an automatically detected kit, go to
+    \preferences > \uicontrol Kits >
+    \uicontrol Clone to create a copy of the kit, and change the
+    parameters in the cloned kit. Make sure to enable the cloned kit
+    for your project.
 
-            To start an application from an open project under the control
-            of a debugger, select the \inlineimage icons/qtcreator-debug-button.png
-            (\uicontrol {Start Debugging of Startup Project}) button or press
-            \key F5. Other, less common start options are available in the
-            \uicontrol Debug > \uicontrol {Start Debugging} menu.
+    If the debugger you want to use is not automatically detected, go to
+    \preferences > \uicontrol Kits >
+    \uicontrol Debuggers > \uicontrol Add to add it.
 
-        \li \l{Debug Mode Views}
+    \image qtcreator-preferences-kits-debuggers.webp {Debuggers tab in Kits preferences}
 
-            Use the views in the \uicontrol Debug mode to inspect the
-            state of your application while debugging.
+    To use the debugging tools for Windows, you must install them.
+    Optionally, you can set up the Microsoft Symbol Server if you need
+    symbol information from Microsoft modules that is not found locally.
 
-        \li \l{Stopping Applications}
+    For more information, see \l{Supported Native Debuggers} and \l{CDB Paths}.
 
-            You can interrupt a running application before it terminates
-            or to find out why the application does not work correctly.
-            Set breakpoints to stop the application for examining and changing
-            variables, setting new breakpoints or removing old ones, and then
-            continue running the application.
+    \section1 Launching the Debugger
 
-        \li \l{Examining Data}
+    The debugger plugin can run the native debuggers in various operating modes
+    depending on where and how you start and run the debugged process. Some of
+    the modes are only available for a particular operating system or platform:
 
-            You can examine variable values and data structures in detail.
+    \list
+       \li \e{Start internal} to debug applications developed inside \QC, such as
+            a Qt Widgets-based application. This is the default start mode for
+            most projects, including all projects using a desktop Qt version and
+            plain C++ projects.
+       \li \e{Start external} to start and debug processes without a proper \QC
+            project setup, either locally or on a remote machine.
+       \li \e{Attach} to debug processes already started and running outside
+            \QC, either locally or on a remote machine.
+       \li \e{Core} to debug crashed processes on Unix.
+       \li \e{Post-mortem} to debug crashed processes on Windows.
+    \endlist
 
-        \li \l{Remote Debugging}
+    In general, \key F5 and the \uicontrol {Start Debugging of Startup Project}
+    button start the operating mode that fits the context. So, for a C++
+    application that uses the \MinGW toolchain targeting desktop Windows, the GDB
+    engine starts in \e {start internal} mode. For a QML application that uses C++
+    plugins, a \e mixed QML/C++ engine starts, with the C++ parts being
+    handled by GDB and GDB server remote debugging.
 
-            You can debug an application that runs on a remote target with the
-            necessary helper processes also running.
+    Change the run configuration parameters (such as
+    \uicontrol {Run in Terminal}) in the run settings of the project, or select
+    options from the \uicontrol Debug > \uicontrol {Start Debugging} menu to
+    select other modes of operation.
 
-        \li \l{Debugger Preferences}
+    \section2 GDB Run Modes
 
-            Specify preferences for managing debugger processes. You can specify
-            preferences that are common to all debuggers, or the native debugger
-            that you use, GDB or CDB.
+    The GDB native debugger used internally by the debugger plugin runs in
+    different modes to cope with the variety of supported platforms and
+    environments:
 
-        \li \l{Using Debugging Helpers}
+    \list
+        \li \e{Plain mode} debugs locally started processes that do not need
+            console input.
+        \li \e{Terminal mode} debugs locally started processes that need a
+            console.
+        \li \e{Attach mode} debugs local processes started outside \QC.
+        \li \e{Core mode} debugs core files generated from crashes.
+        \li \e{Remote mode} interacts with the GDB server running on Linux.
+    \endlist
 
-            \QC is able to show complex data types in a customized,
-            user-extensible manner. For this purpose, it takes advantage of
-            two technologies, collectively referred to as \e {debugging
-            helpers}.
+    \section1 Stopping Applications
 
-        \li \l{Debugging Qt Quick Projects}
+    You can interrupt a running application before it terminates
+    or to find out why the application does not work correctly.
+    Set breakpoints to stop the application for examining and changing
+    variables, setting new breakpoints or removing old ones, and then
+    continue running the application.
 
-            When debugging a Qt Quick application, you can inspect the state of
-            the application while debugging JavaScript functions. You can set
-            breakpoints, view call stack trace, and examine locals and
-            expressions. While the application is running, you can inspect QML
-            objects and user interfaces, as well as execute JavaScript
-            expressions.
+    Once the application starts running under the control of the debugger, it
+    behaves and performs as usual.
 
-        \li \l{Debugging a C++ Application}
+    To interrupt a running C++ application, go to \uicontrol Debug >
+    \uicontrol Interrupt. The debugger automatically interrupts
+    the application when it hits a \l {Setting Breakpoints}{breakpoint}.
 
-            Illustrates how to debug C++ applications in \QC.
+    Once the application stops, \QC:
 
-        \li \l{Debugging a Qt Quick Application}
+    \list
 
-            Illustrates how to debug Qt Quick applications in \QC.
+        \li Retrieves data representing the \l{Viewing Call Stack Trace}
+            {call stack} at the application's current position.
 
-        \li \l{Troubleshooting Debugger}
+        \li Retrieves the contents of \l{Local Variables and Function Parameters}
+            {local variables}.
+
+        \li Examines \l{Evaluating Expressions}{expressions}.
+
+        \li Updates the \l{Viewing and Editing Register State}{Registers},
+            \l{Viewing Modules}{Modules}, and \l{Viewing Disassembled Code}
+            {Disassembler} views if you are debugging C++ based applications.
 
-            If you encounter problems while debugging, check for possible
-            solutions to them.
     \endlist
 
-    \sa {Debug CMake project files}
-*/
+    You can examine and change variables, set or remove breakpoints, and then
+    continue running the application.
+
+    \section1 Examining Data
+
+    When the application stops, you can examine certain data in the debugger. The
+    availability of data depends on the compiler settings when compiling the
+    application and the exact location where the application stops.
+
+    Unexpected events are called \e exceptions and the debugger can stop
+    the application when they occur. Going to the location in the code where
+    the exception occurred helps you investigate the problem and find ways to
+    fix it.
+
+    If you have a variable that shows text, but the application does not display
+    it correctly, for example, your data might be incorrect or the code that sets
+    the display text might do something wrong. You can step through the code and
+    examine changes to the variable to find out where the error occurs.
+
+    The following video shows how to examine variable values:
+
+    \youtube EhJ1eV_6RH8
+
+    \section1 Remote Debugging
+
+    \QC makes remote debugging easy. In general, the remote debugging setup
+    consist of a probe running on the remote computer and a counterpart running
+    on the host. The probe is either integrated into the running
+    process (for example, for QML debugging) or runs a separate process
+    (for example, when using GDB server on embedded Linux). The host
+    side typically consists of \QC itself, often with the help of an external
+    process, such as GDB or CDB.
+
+    While this setup might look daunting, it is mostly invisible to the user of
+    \QC. To start debugging on a remote target with the necessary helper
+    processes running, activate the corresponding \l{Activate kits for a project}
+    {kit} in \uicontrol Projects > \uicontrol {Build & Run}, and then select a
+    function to start remote debugging in the \uicontrol Debug >
+    \uicontrol {Start Debugging} menu.
 
+    Special use cases, such as attaching to a running process on the target,
+    might still require manual setup. You can debug an application that runs on
+    a remote target with the necessary helper processes also running.
+
+    For more information, see \l{Debug remotely with GDB} and
+    \l{Debug remotely with CDB}.
+
+    \section1 Using Debugging Helpers
+
+    To show complex structures, such as \c QObjects or associative containers,
+    in a clear and concise manner, \QC uses Python scripts that are called
+    \l{Debugging Helpers}{debugging helpers}.
+
+    \QC ships with debugging helpers for more than 200 of the most popular Qt
+    classes, standard C++ containers, and smart pointers, covering the usual
+    needs of a C++ application developer out-of-the-box.
+
+    You can customize and add debugging helpers.
+
+    \section1 QML and Qt Quick
+
+    When debugging a Qt Quick application, you can inspect the state of
+    the application while debugging JavaScript functions. You can set
+    breakpoints, view call stack trace, and examine locals and
+    expressions. While the application is running, you can inspect QML
+    objects and user interfaces, as well as execute JavaScript
+    expressions.
+
+    For more information, see \l{Debugging Qt Quick Projects} and
+    \l{Debugging a Qt Quick Application}.
+
+    \sa {Debugging a C++ Application}, {Debug}{How To: Debug}, {Debuggers},
+    {Debugger}
+*/
 
 /*!
-    \previouspage creator-debugger-engines.html
-    \page creator-debugger-operating-modes.html
-    \nextpage creator-debug-mode.html
+    \page creator-how-to-start-debugging.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-debug
 
-    \title Launching the Debugger
+    \title Start debugging
 
     You can start an application from an open project under the control of a
     debugger in the following ways:
@@ -128,75 +236,46 @@
     \endlist
 
     \QC checks whether the compiled application is up-to-date, and rebuilds and
-    deploys it if you set the \uicontrol {Build before deploying} field to
-    build the whole project or the application to run and select the
-    \uicontrol {Always deploy before running} check box in \preferences >
+    deploys it if you set \uicontrol {Build before deploying} to
+    build the whole project or the application to run and select
+    \uicontrol {Always deploy before running} in \preferences >
     \uicontrol {Build & Run} > \uicontrol General. To debug the application
-    without deploying it, select \uicontrol Debug > \uicontrol {Start Debugging}
+    without deploying it, go to \uicontrol Debug > \uicontrol {Start Debugging}
     > \uicontrol {Start Debugging Without Deployment}.
 
     The debugger then takes over and starts the application with suitable
     parameters.
 
+    You can specify breakpoints before or after launching the debugger.
+    For more information, see \l{Setting Breakpoints}.
+
+    \section1 Execute GDB or CDB commands
+
     When using GDB or CDB as debug backend, you can specify additional commands
     to execute before and after the backend and debugged application are started or
     attached in \preferences > \uicontrol Debugger >
-    \uicontrol GDB and \uicontrol CDB. For more information, see
-    \l{Debugger Preferences}.
+    \l GDB and \l CDB.
 
     To let the debugger read the user's default .gdbinit file when it starts,
-    select the \uicontrol {Load .gdbinit file on startup} check box in
-    GDB settings. For more information, see \l{Specifying GDB Settings}.
+    select \uicontrol {Load .gdbinit file on startup} in GDB settings.
 
     \note Starting a C++ application under the control of the debugger can take
     a long time. Typically, in the range of several seconds to minutes if you use
     complex features.
 
+    \section1 Debug Python projects
+
     For \l {Creating a Qt for Python Application with Qt Widgets}{Python} projects,
     start debugging the \c main.py file. If you encounter problems, check the
     active build target in the \l{Build for many platforms}{kit selector}.
 
-    \section1 Debugger Operating Modes
-
-    The debugger plugin can run the native debuggers in various operating modes
-    depending on where and how you start and run the debugged process. Some of
-    the modes are only available for a particular operating system or platform.
-
-    In general, \key F5 and the \uicontrol {Start Debugging of Startup Project}
-    button start the operating mode that fits the context. So, for a C++
-    application that uses the \MinGW toolchain targeting desktop Windows, the GDB
-    engine starts in \e {start internal} mode. For a QML application that uses C++
-    plugins, a \e mixed QML/C++ engine starts, with the C++ parts being
-    handled by GDB and GDB server remote debugging.
-
-    Change the run configuration parameters (such as
-    \uicontrol {Run in Terminal}) in the run settings of the project, or select
-    options from the \uicontrol Debug > \uicontrol {Start Debugging} menu to
-    select other modes of operation.
-
-    The debugger can run in the following modes:
-
-    \list
-
-       \li \e{Start internal} to debug applications developed inside \QC, such as
-            a Qt Widgets-based application.
-
-       \li \e{Start external} to start and debug processes without a proper \QC
-            project setup, either locally or on a remote machine.
-
-       \li \e{Attach} to debug processes already started and running outside
-            \QC, either locally or on a remote machine.
-
-       \li \e{Core} to debug crashed processes on Unix.
-
-       \li \e{Post-mortem} to debug crashed processes on Windows.
-
-    \endlist
+    \QC does not support mixed-mode debugging, but you can attach GDB to the
+    Python interpreter to debug the C++ implementation of the corresponding
+    Python code. For more information, see
+    \l{https://doc.qt.io/qtforpython-6/tutorials/debugging/qtcreator/qtcreator.html}
+    {Debugging PySide with Qt Creator (Linux)}.
 
-    \section2 Start Internal
-
-    Start internal mode is the default start mode for most projects, including
-    all projects using a desktop Qt version and plain C++ projects.
+    \section1 Debug console applications
 
     If you need a console window to operate your application, for example
     because it accepts console input from the user, go to \uicontrol Projects >
@@ -205,46 +284,49 @@
 
     If a console application does not start up properly in the configured
     console and the subsequent attach fails, you can diagnose the issue by
-    using CDB's native console. Select \preferences >
+    using CDB's native console. Go to \preferences >
     \uicontrol Debugger > \uicontrol CDB > \uicontrol {Use CDB console} to
     override the console set in the Windows system environment variables.
     Note that the native console does not prompt on application exit.
 
-    To launch the debugger in start internal mode, click the
-    \uicontrol {Start Debugging} button for the active project.
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
+*/
 
-    You can specify breakpoints before or after launching the debugger.
-    For more information, see \l{Setting Breakpoints}.
+/*!
+    \page creator-how-to-debug-external-apps.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-debug
 
-    \section2 Start External
+    \title Start and debug an external application
 
-    You can debug any executable on your local or on a remote
-    machine without using a project. You specify a build and run kit that
+    To debug any executable on your local or on a remote
+    machine without using a project, specify a build and run kit that
     identifies the device to debug the application on.
 
-    While this mode does not strictly require a project to be open in \QC,
-    opening it makes setting breakpoints and stepping through the code easier.
+    While the \e{start external} debugger mode does not strictly require a
+    project to be open in \QC, opening it makes setting breakpoints and
+    stepping through the code easier.
 
     To start and debug an external application:
 
     \list 1
-        \li Select \uicontrol Debug > \uicontrol {Start Debugging} >
+        \li Go to \uicontrol Debug > \uicontrol {Start Debugging} >
             \uicontrol {Start and Debug External Application}.
         \image qtcreator-debugger-start-external.png
-        \li In the \uicontrol Kit field, select the build and run kit to
+        \li In \uicontrol Kit, select the build and run kit to
             use for building the project.
-        \li In the \uicontrol {Local executable} field, specify the path to the
+        \li In \uicontrol {Local executable}, specify the path to the
             application executable on the local machine.
-        \li In the \uicontrol {Command line arguments} field, specify command
+        \li In \uicontrol {Command line arguments}, specify command
             line arguments to be passed to the executable.
-        \li In the \uicontrol {Working directory} field, specify the working
+        \li In \uicontrol {Working directory}, specify the working
             directory. It defaults to the directory of the build result.
-        \li Select the \uicontrol{Run in terminal} check box for console
-            applications.
-        \li Select the \uicontrol {Break at "main"} check box to stop the
-            debugger at the main function.
-        \li Select the \uicontrol {Use target extended-remote to connect}
-            check box to create the connection in the
+        \li Select \uicontrol{Run in terminal} for console applications.
+        \li Select \uicontrol {Break at "main"} to stop the debugger at
+            the main function.
+        \li Select \uicontrol {Use target extended-remote to connect}
+            to create the connection in the
             \c {target extended-remote mode}. In this mode, when the debugged
             application exits or you detach from it, the debugger remains
             connected to the target. You can rerun the application, attach
@@ -252,29 +334,33 @@
             target. For example, GDB does not exit unless it was invoked using
             the \c {--once} option, but you can make it exit by using the
             \c {monitor exit} command.
-        \li In the \uicontrol {Override SysRoot} field, specify the path to
+        \li In \uicontrol {Override SysRoot}, specify the path to
             the \c sysroot to use instead of the default \c sysroot.
-        \li In the \uicontrol {Debug information} field, specify the location
+        \li In \uicontrol {Debug information}, specify the location
             for storing debug information. You cannot use an empty path.
-        \li In the \uicontrol Recent field, you can select a recent
+        \li In \uicontrol Recent, you can select a recent
             configuration to use.
     \endlist
 
-    \section2 Attach
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
+*/
+
+/*!
+    \page creator-how-to-attach-debugger-to-running-apps.html
+    \previouspage creator-how-tos.html
 
-    You can attach the debugger to applications that are already running or
-    instruct the debugger to attach to an application when it starts.
+    \ingroup creator-how-to-debug
 
-    \section3 Attaching to Running Applications
+    \title Attach the debugger to running applications
 
     To attach the debugger to an application already running on your local or on
     a remote machine:
 
     \list 1
-        \li Select \uicontrol Debug > \uicontrol {Start Debugging} >
+        \li Go to \uicontrol Debug > \uicontrol {Start Debugging} >
             \uicontrol {Attach to Running Application}.
             \image qtcreator-debugger-attach-to-running.png
-        \li In the \uicontrol Filter field, enter a string to filter processes
+        \li In \uicontrol Filter, enter a string to filter processes
             by their process ID or name.
         \li Select a process in the list, and then select
             \uicontrol {Attach to Process} to start debugging.
@@ -290,28 +376,46 @@
     You can specify breakpoints before or after attaching the debugger to the
     application. For more information, see \l{Setting Breakpoints}.
 
-    \section3 Attaching to Processes when They Start
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
+*/
+
+/*!
+    \page creator-how-to-attach-debugger-to-starting-processes.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-debug
+
+    \title Attach the debugger to starting processes
 
     To instruct the debugger to watch an application process and to attach
     to it when it starts:
 
     \list 1
-        \li Select \uicontrol Debug > \uicontrol {Start Debugging} >
+        \li Go to \uicontrol Debug > \uicontrol {Start Debugging} >
             \uicontrol {Attach to Unstarted Application}.
             \image qtcreator-debugger-attach-to-process-not-yet-started.png
-        \li In the \uicontrol Kit field, select the build and run kit to
+        \li In \uicontrol Kit, select the build and run kit to
             use for building the project.
-        \li In the \uicontrol Executable field, specify the path to the
+        \li In \uicontrol Executable, specify the path to the
             application executable.
-        \li Select the \uicontrol {Reopen dialog when application finishes}
-            check box to return to this dialog when the application is closed.
-        \li Select the \uicontrol {Continue on attach} check box to instruct
+        \li Select \uicontrol {Reopen dialog when application finishes}
+            to return to this dialog when the application is closed.
+        \li Select \uicontrol {Continue on attach} to instruct
             the debugger to keep the application running after attaching to it.
         \li Select \uicontrol {Start Watching} to wait for the application
             process to start.
     \endlist
 
-    \section2 Core
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
+*/
+
+/*!
+    \page creator-how-to-load-core-files-to-debugger.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-debug
+
+    \title Load core files to the debugger
 
     Use the core mode to inspect \e {core} files (crash dumps) that are
     generated from crashed processes on Linux and Unix systems if the system is
@@ -327,38 +431,46 @@
     To launch the debugger in the core mode:
 
     \list 1
-        \li Select \uicontrol Debug > \uicontrol {Start Debugging} >
+        \li Go to \uicontrol Debug > \uicontrol {Start Debugging} >
             \uicontrol {Load Core File}.
             \image qtcreator-debugger-load-core-file.png
-        \li In the \uicontrol Kit field, select a build and run kit that was
+        \li In \uicontrol Kit, select a build and run kit that was
             used for building the binary for which the core file was created.
             If the core file stems from a binary not built by \QC or a process
             not initiated by \QC, select a kit that matches the setup used as
-            closely as possible, in respect to the specified device, tool chain,
+            closely as possible, in respect to the specified device, toolchain,
             debugger, and sysroot.
-        \li In the \uicontrol {Core file} field, specify the core file to
-            inspect.
-        \li In the \uicontrol {Executable of symbol file} field, specify
+        \li In \uicontrol {Core file}, specify the core file to inspect.
+        \li In \uicontrol {Executable of symbol file}, specify
             a file that has debug information corresponding to the
             core file. Typically, this is the executable file or a \c {.debug}
             file if the debug information is stored separately from the
             executable.
-        \li In the \uicontrol {Override start script} field, specify a
+        \li In \uicontrol {Override start script}, specify a
             script file to run instead of the default start script.
-        \li In the \uicontrol {Override SysRoot} field, specify the path to
+        \li In \uicontrol {Override SysRoot}, specify the path to
             the \c sysroot to use instead of the default \c sysroot.
     \endlist
 
     Even though using a properly configured project that has the sources of the
     crashed application is not strictly necessary, it is helpful.
 
-    \section2 Post-Mortem
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}, {Kits}
+*/
+
+/*!
+    \page creator-how-to-debug-post-mortem.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-debug
+
+    \title Debug crashed processes on Windows
 
-    The post-mortem mode is available only on Windows, if you installed the
-    debugging tools for Windows.
+    The \e{post-mortem} debugger operating mode is available only on Windows,
+    if you installed the debugging tools for Windows.
 
     The \QC installation program asks you whether you want to register \QC as a
-    post-mortem debugger. To change the setting, select
+    post-mortem debugger. To change the setting, go to
     \preferences > \uicontrol Debugger >
     \uicontrol General > \uicontrol {Use \QC for post-mortem debugging}.
 
@@ -366,7 +478,16 @@
     crashes on Windows. Click the \uicontrol {Debug in \QC} button in the error
     message from the Windows operating system.
 
-    \section1 Starting the Debugger from the Command Line
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
+*/
+
+/*!
+    \page creator-how-to-start-debugger-from-cli.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-debug
+
+    \title Start debugging from the command line
 
     You can use the \QC debugger interface from the command line. To attach it
     to a running process, specify the process ID as a parameter for the
@@ -386,35 +507,17 @@
 
     \endlist
 
-    For more information, see \l{Command-Line Options}.
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger},
+    {Command-Line Options}
 */
 
 /*!
-    \page creator-remote-debugging.html
-    \previouspage creator-debugger-examining-data.html
-    \nextpage creator-debugger-preferences.html
+    \page creator-how-to-debug-remotely-gdb.html
+    \previouspage creator-how-tos.html
 
-    \title Remote Debugging
+    \ingroup creator-how-to-debug
 
-    \QC makes remote debugging easy.
-    In general, the remote debugging setup consist of a probe running on the
-    remote machine and a counterpart running on the host side. The probe is
-    either integrated into the running process (e.g. for QML debugging) or runs
-    a separate process (e.g. when using GDB server on embedded Linux). The host
-    side typically consists of \QC itself, often with the help of an external
-    process, such as GDB or CDB.
-
-    While this setup might look daunting, it is mostly invisible to the user of
-    \QC. To start debugging on a remote target with the necessary helper
-    processes running, select the corresponding
-    \l{glossary-buildandrun-kit}{kit} in \uicontrol Projects >
-    \uicontrol {Build & Run}, and then select a function to start remote
-    debugging in the \uicontrol Debug > \uicontrol {Start Debugging} menu.
-
-    Special use cases, such as attaching to a running process on the target,
-    might still require manual setup.
-
-    \section1 Using GDB
+    \title Debug remotely with GDB
 
     When debugging on a target supported by GDB server, a local GDB process
     talks to a GDB server running on the remote machine that controls the
@@ -437,25 +540,24 @@
 
     \list 1
 
-        \li Select \uicontrol Debug > \uicontrol {Start Debugging} >
+        \li Go to \uicontrol Debug > \uicontrol {Start Debugging} >
             \uicontrol {Attach to Running Debug Server}.
             \image qtcreator-debugger-attach-to-running-debug-server.png
-        \li In the \uicontrol Kit field, select the build and run kit to
+        \li In \uicontrol Kit, select the build and run kit to
             use for building the project.
-        \li In the \uicontrol {Server port} field, enter the name of the remote
+        \li In \uicontrol {Server port}, enter the name of the remote
             machine and the port number to use.
-        \li In the \uicontrol {Local executable} field, specify the path to the
+        \li In \uicontrol {Local executable}, specify the path to the
             application executable on the local machine.
-        \li In the \uicontrol {Command line arguments} field, specify command
+        \li In \uicontrol {Command line arguments}, specify command
             line arguments to be passed to the executable.
-        \li In the \uicontrol {Working directory} field, specify the working
+        \li In \uicontrol {Working directory}, specify the working
             directory. It defaults to the directory of the build result.
-        \li Select the \uicontrol{Run in terminal} check box for console
-            applications.
-        \li Select the \uicontrol {Break at "main"} check box to stop the
+        \li Select \uicontrol{Run in terminal} for console applications.
+        \li Select \uicontrol {Break at "main"} to stop the
             debugger at the main function.
-        \li Select the \uicontrol {Use target extended-remote to connect}
-            check box to create the connection in the
+        \li Select \uicontrol {Use target extended-remote to connect}
+            to create the connection in the
             \c {target extended-remote mode}. In this mode, when the debugged
             application exits or you detach from it, the debugger remains
             connected to the target. You can rerun the application, attach
@@ -463,34 +565,41 @@
             target. For example, GDB does not exit unless it was invoked using
             the \c {--once} option, but you can make it exit by using the
             \c {monitor exit} command.
-        \li In the \uicontrol {Override SysRoot} field, specify the path to
+        \li In \uicontrol {Override SysRoot}, specify the path to
             the \c sysroot to use instead of the default \c sysroot.
-        \li In the \uicontrol {Init commands} field, enter the commands
+        \li In \uicontrol {Init commands}, enter the commands
             to execute immediately after the connection to a target has
             been established.
-        \li In the \uicontrol {Reset commands} field, enter the commands
+        \li In \uicontrol {Reset commands}, enter the commands
             to execute when resetting the connection to a target.
-        \li In the \uicontrol {Debug information} field, specify the location
+        \li In \uicontrol {Debug information}, specify the location
             for storing debug information. You cannot use an empty path.
-        \li In the \uicontrol {Override server channel} field, specify a
+        \li In \uicontrol {Override server channel}, specify a
             communication channel to use, such as a serial line or custom port.
-        \li In the \uicontrol Recent field, you can select a recent
-            configuration to use.
+        \li In \uicontrol Recent, select a recent configuration to use.
         \li Select \uicontrol OK to start debugging.
 
     \endlist
 
-    By default, a non-responsive GDB process is terminated after 20 seconds.
-    To increase the timeout in the \uicontrol {GDB timeout} field, select
-    \preferences > \uicontrol Debugger >
-    \uicontrol GDB. For more information about settings that you can specify
-    to manage the GDB process, see \l{Specifying GDB Settings}.
+    By default, a non-responsive GDB process is terminated after 40 seconds.
+    To increase the timeout in \uicontrol {GDB timeout}, go to \preferences >
+    \uicontrol Debugger > \uicontrol GDB.
 
     For more information about connecting with \c {target extended-remote} mode
     in GDB, see \l{https://sourceware.org/gdb/onlinedocs/gdb/Connecting.html}
     {Debugging with GDB: Connecting to a Remote Target}.
 
-    \section1 Using CDB
+    \sa {Debug}{How To: Debug}, {GDB}, {Debugging},
+    {Debuggers}, {Debugger}, {Kits}
+*/
+
+/*!
+    \page creator-how-to-debug-remotely-cdb.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-debug
+
+    \title Debug remotely with CDB
 
     In remote mode, the local CDB process talks to a CDB process that runs on
     the remote machine. The process is started with special command-line options
@@ -555,23 +664,23 @@
 
     \endlist
 
-    To specify settings for managing the CDB process, select \preferences >
-    \uicontrol Debugger > \uicontrol CDB. For more information, see
-    \l{Specifying CDB Settings}.
+    To specify settings for managing the CDB process, go to \preferences >
+    \uicontrol Debugger > \uicontrol CDB.
+
+    \sa {Debug}{How To: Debug}, {CDB}, {Debugging}, {Debuggers}, {Debugger}
 */
 
 
 /*!
     \page creator-debug-mode.html
-    \if defined(qtdesignstudio)
-    \previouspage studio-debugging.html
-    \else
-    \previouspage creator-debugger-operating-modes.html
-    \endif
-    \nextpage creator-stack-view.html
+    \previouspage creator-reference.html
+
+    \ingroup creator-reference-debugger-views
 
     \title Debug Mode Views
 
+    \brief Inspect the state of your application while debugging.
+
     In the \uicontrol Debug mode, you can inspect the state of your
     application while debugging.
 
@@ -685,7 +794,7 @@
 
     During debugging, the mode shows the views that you usually need to
     debug C++ or QML applications. To show other views or to hide views,
-    select \uicontrol Views.
+    go to \uicontrol Views.
 
     You can drag the views in \QC to new positions on the screen. \QC saves the
     size and position of views as a perspective for future sessions. Select
@@ -714,70 +823,17 @@
             interrupted.
     \endlist
 
-    For more information, see \l{Debugger Preferences}.
-*/
-
-/*!
-    \page creator-debugger-stopping.html
-    \previouspage creator-disassembler-view.html
-    \nextpage creator-debugger-examining-data.html
-
-    \title Stopping Applications
-
-    Once the application starts running under the control of the debugger, it
-    behaves and performs as usual.
-
-    To interrupt a running C++ application, select \uicontrol Debug >
-    \uicontrol Interrupt. The debugger automatically interrupts
-    the application when it hits a \l {Setting Breakpoints}{breakpoint}.
-
-    Once the application stops, \QC:
-
-    \list
-
-        \li Retrieves data representing the \l{Viewing Call Stack Trace}
-            {call stack} at the application's current position.
-
-        \li Retrieves the contents of \l{Local Variables and Function Parameters}
-            {local variables}.
-
-        \li Examines \l{Evaluating Expressions}{expressions}.
-
-        \li Updates the \l{Viewing and Editing Register State}{Registers},
-            \l{Viewing Modules}{Modules}, and \l{Viewing Disassembled Code}
-            {Disassembler} views if you are debugging C++ based applications.
-
-    \endlist
-    You can \l{Examining Data}{Examine} and change variables, set or remove
-    breakpoints, and then continue running the application.
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger},
+    {Debugger Views}
 */
 
 /*!
     \page creator-debugger-examining-data.html
-    \previouspage creator-debugger-stopping.html
-    \nextpage creator-remote-debugging.html
-
-    \title Examining Data
-
-    When the application stops, you can examine certain data in the debugger. The
-    availability of data depends on the compiler settings when compiling the
-    application and the exact location where the application stops.
-
-    Unexpected events are called \e exceptions and the debugger can stop
-    the application when they occur. Going to the location in the code where
-    the exception occurred helps you investigate the problem and find ways to
-    fix it.
-
-    If you have a variable that shows text, but the application does not display
-    it correctly, for example, your data might be incorrect or the code that sets
-    the display text might do something wrong. You can step through the code and
-    examine changes to the variable to find out where the error occurs.
+    \previouspage creator-how-tos.html
 
-    The following video shows how to examine variable values:
-
-    \youtube EhJ1eV_6RH8
+    \ingroup creator-how-to-debug
 
-    \section1 Showing Tooltips for Simple Values
+    \title Show tooltips for simple values
 
     To display the value of a simple variable, hover the mouse pointer over its
     name in the code editor.
@@ -791,11 +847,21 @@
     select \uicontrol {Close Editor Tooltips} in the context menu in the
     \uicontrol Locals or \uicontrol Expressions view.
 
-    To disable tooltips for performance reasons, select \preferences >
+    To disable tooltips for performance reasons, go to \preferences >
     \uicontrol Debugger > \uicontrol General >
     \uicontrol {Use tooltips in main editor when debugging}.
 
-    \section1 Examining Complex Values in Debug Views
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger},
+    {Debugger Views}
+*/
+
+/*!
+    \page creator-how-to-examine-complex-values.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-debug
+
+    \title Examine complex values in Debug views
 
     \QC displays the raw information from the native debuggers in a clear and
     concise manner to simplify the debugging process without losing the power
@@ -826,7 +892,7 @@
 
     To show complex structures, such as \c QObjects or associative containers,
     in a clear and concise manner, \QC uses Python scripts that are called
-    \l{Using Debugging Helpers}{debugging helpers}.
+    \l{Debugging Helpers}{debugging helpers}.
 
     In addition to the generic IDE functionality of the
     \l {Viewing Call Stack Trace}{Stack}, \uicontrol {Locals},
@@ -839,10 +905,21 @@
     classes in a useful way.
 
     To change the number of array elements that are
-    requested when expanding entries, select \preferences > \uicontrol {Debugger}
+    requested when expanding entries, go to \preferences > \uicontrol {Debugging}
     > \uicontrol {Locals & Expressions} > \uicontrol {Default array size}.
 
-    \section1 Stepping Through Code
+
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger},
+    {Debugger Views}
+*/
+
+/*!
+    \page creator-how-to-step-through-code.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-debug
+
+    \title Step through code
 
     The following table summarizes the functions that you can use to step through
     the code and examine the changes in variables.
@@ -900,17 +977,17 @@
                 stopped.
     \endtable
 
-    \section2 Compressing Steps in GDB
+    \section1 Compress steps in GDB
 
     When using GDB as the debugging backend, you can compress several steps
     into one step for less noisy debugging. For more information, see
-    \l{Specifying GDB Settings}.
+    \l{GDB}.
 
     The extended GDB settings have the option to step backwards in code,
     but this option should be used with care, as it is slow and unstable on the
-    GDB side. For more information, see \l{Specifying GDB Settings}.
+    GDB side. For more information, see \l{GDB}.
 
-    \section2 Stepping into Frameworks in \macos
+    \section1 Step into Frameworks in \macos
 
     In \macos, external libraries are usually built into so-called Frameworks,
     which may have both release and debug versions of the library. When you
@@ -919,7 +996,17 @@
     \uicontrol {Use debug versions of Frameworks} option in the project run
     settings.
 
-    \section1 Inspecting Basic Qt Objects
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger},
+    {Debugger Views}
+*/
+
+/*!
+    \page creator-how-to-inspect-basic-qt-objects.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-debug
+
+    \title Inspect basic Qt objects
 
     The most powerful feature of the debugger is that the \uicontrol {Locals}
     and \uicontrol {Expressions} views show the data that belongs to
@@ -931,16 +1018,16 @@
     displays the contents of a QHash or QMap in an orderly manner. Also, the
     debugger shows access data for QFileInfo and the \e real contents of QVariant.
 
-    \section2 Changing Value Display format
+    \section1 Change value display format
 
     In the \uicontrol {Locals} or the \uicontrol {Expressions} view, select
     \uicontrol {Change Value Display Format} in the context menu to change the
     value display format. The available options depend on the type of the
-    current items, and are provided by the debugging helpers.
+    current items, and are provided by \l{Debugging Helpers}{debugging helpers}.
 
-    To force a plain C-like display of structures, select \preferences >
-    \uicontrol Debugger > \uicontrol {Locals & Expressions}, and then deselect the
-    \uicontrol {Use Debugging Helpers} check box. This still uses the
+    To force a plain C-like display of structures, go to \preferences >
+    \uicontrol Debugger > \uicontrol {Locals & Expressions}, and then clear
+    \uicontrol {Use Debugging Helpers}. This still uses the
     Python scripts, but generates more basic output. To force the plain display
     for a single object or for all objects of a given type, select
     \uicontrol {Change Value Display Format} > \uicontrol Raw in the context
@@ -961,7 +1048,7 @@
     instead of a single line item in the view. For QPixmap, you can see
     the pixmap being created pixel-by-pixel when stepping through the code.
 
-    \section2 Changing Variable Values
+    \section1 Change variable values
 
     You can use the \uicontrol {Locals} and \uicontrol {Expressions} view to change
     the contents of variables of simple data types, for example, \c int, \c float,
@@ -975,11 +1062,11 @@
     applies the changes only if the new content fits into the old memory and if
     the debugger supports changing values.
 
-    \section2 Signal-Slot Connections
+    \section1 Signal-slot connections
 
     If an instance of a class is derived from QObject, you can find all other
     objects connected to this object's slots with Qt's signals and slots
-    mechanism. Select \preferences > \uicontrol {Debugger} >
+    mechanism. Go to \preferences > \uicontrol {Debugging} >
     \uicontrol {Locals & Expressions} > \uicontrol {Use Debugging Helpers}.
 
     \image qtcreator-debugging-helper-options.webp {Locals & Expressions preferences}
@@ -988,7 +1075,7 @@
     in the \e slots subitem. The view shows the objects connected to this slot
     as children of the slot. Similarly, you can show the children of signals.
 
-    \section2 Low-level Data
+    \section1 Low-level data
 
     If you cannot debug Qt objects because their data is corrupted, you can
     switch off the debugging helpers to make low-level structures visible.
@@ -998,7 +1085,7 @@
     \uicontrol Debugger > \uicontrol {Locals & Expressions}.
 
     \omit
-    \section2 Creating Snapshots
+    \section1 Create snapshots
 
     A snapshot has the complete state of the debugged application at a time,
     including the full memory contents.
@@ -1015,15 +1102,20 @@
     \l{https://sourceware.org/gdb/onlinedocs/gdb/Core-File-Generation.html}.
 
     \endomit
+
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
 */
 
 /*!
     \page creator-threads-view.html
-    \previouspage creator-breakpoints-view.html
-    \nextpage creator-modules-view.html
+    \previouspage creator-debug-mode.html
+
+    \ingroup creator-reference-debugger-views
 
     \title Viewing Threads
 
+    \brief View the threads currently active in a multi-threaded application.
+
     An application can have more than one thread of execution that share one
     address space, which means that they can examine and change the same
     variables. However, each thread has its own registers, execution stack,
@@ -1042,15 +1134,20 @@
 
     The \l {Viewing Call Stack Trace}{Stack} view adjusts its contents
     accordingly.
+
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
 */
 
 /*!
     \page creator-modules-view.html
-    \previouspage creator-threads-view.html
-    \nextpage creator-source-files-view.html
+    \previouspage creator-debug-mode.html
+
+    \ingroup creator-reference-debugger-views
 
     \title Viewing Modules
 
+    \brief View information about the modules included in a debugged application.
+
     The \uicontrol Modules view displays information that the debugger plugin
     has about modules included in the application that is being debugged.
 
@@ -1088,7 +1185,7 @@
 
         \li Show sections in modules
 
-        \li Set \l{Debugger Preferences}{debugger preferences}
+        \li Set \l{Debugger}{debugger preferences}
 
     \endlist
 
@@ -1099,21 +1196,26 @@
 
     When using CDB as debug backend, you can specify that the debugger should
     break when application modules are loaded or unloaded. To enable breaking
-    for the specified modules, select \preferences > \uicontrol Debugger >
+    for the specified modules, go to \preferences > \uicontrol Debugger >
     \uicontrol CDB.
 
     \image qtcreator-cdb-options.png {CDB tab in Debugger preferences}
 
-    For more information, see \l{Specifying CDB Settings}.
+    For more information, see \l{CDB}.
+
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
 */
 
 /*!
     \page creator-source-files-view.html
-    \previouspage creator-modules-view.html
-    \nextpage creator-locals-view.html
+    \previouspage creator-debug-mode.html
+
+    \ingroup creator-reference-debugger-views
 
     \title Viewing Source Files
 
+    \brief View source files included in a debugged project.
+
     The \uicontrol {Source Files} view lists all the source files included in
     the project. If you cannot step into an instruction, you can check whether
     the source file is actually part of the project, or whether it was compiled
@@ -1126,7 +1228,7 @@
     \list
         \li Reload data
         \li Open the selected file
-        \li Set \l{Debugger Preferences}{debugger preferences}
+        \li Set \l{Debugger}{debugger preferences}
     \endlist
 
     By default, the \uicontrol {Source Files} view is hidden. To show it, select
@@ -1137,20 +1239,26 @@
     To enable the debugger to step into the code and display the source code
     when using a copy of the source tree at a location different from the one
     at which the libraries were built, you can map source paths to target
-    paths in \preferences > \uicontrol Debugger > \uicontrol General:
+    paths in \preferences > \uicontrol Debugger > \uicontrol General.
 
     \image qtcreator-debugger-general-options.png {General tab in Debugger preferences}
 
-    For more information, see \l{Mapping Source Paths}.
+    For more information, see \l{Source Paths Mapping}.
+
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
 */
 
 /*!
     \page creator-registers-view.html
-    \previouspage creator-expressions-view.html
-    \nextpage creator-peripheral-registers-view.html
+    \previouspage creator-debug-mode.html
+
+    \ingroup creator-reference-debugger-views
 
     \title Viewing and Editing Register State
 
+    \brief View the current state of general-purpose and special-purpose CPU
+    registers.
+
     \e {Machine code} consists of machine language instructions that make the CPU
     perform tasks, such as load or store, on units of data in the CPU's registers
     or memory.
@@ -1177,7 +1285,7 @@
         \li Open \l {Examining Memory}{Memory Editor} at the selected value.
         \li Open the \l {Viewing Disassembled Code}{Disassembler} view.
         \li Display a value in hexadecimal, decimal, octal, or binary format.
-        \li Set \l{Debugger Preferences}{debugger preferences}.
+        \li Set \l{Debugger}{debugger preferences}.
     \endlist
 
     By default, the \uicontrol Registers view is hidden. To show it, select it in
@@ -1203,15 +1311,21 @@
         \li Set a data breakpoint on the selection.
         \li Jump to the selected address in the current data view or a new one.
     \endlist
+
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
 */
 
 /*!
     \page creator-peripheral-registers-view.html
-    \previouspage creator-registers-view.html
-    \nextpage creator-debugger-log-view.html
+    \previouspage creator-debug-mode.html
+
+    \ingroup creator-reference-debugger-views
 
     \title Peripheral Registers
 
+    \brief View the current state of peripheral devices, such as a mouse,
+    keyboard, display, printer, or USB drive.
+
     The \uicontrol {Peripheral Registers} view displays the current state of
     peripheral devices, such as a mouse, keyboard, display, printer, or USB
     drive. Applications write registers to send information to the device and
@@ -1231,28 +1345,33 @@
 
     \list
         \li View register groups.
-        \li Set \l{Debugger Preferences}{debugger preferences}.
+        \li Set \l{Debugger}{debugger preferences}.
     \endlist
 
     By default, the \uicontrol {Peripheral Registers} view is hidden. To show it,
     select it in \uicontrol Views on the debugger toolbar.
+
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
 */
 
 /*!
     \page creator-debugger-log-view.html
-    \previouspage creator-peripheral-registers-view.html
-    \nextpage creator-disassembler-view.html
+    \previouspage creator-debug-mode.html
+
+    \ingroup creator-reference-debugger-views
 
     \title Debugger Log
 
+    \brief Troubleshoot the debugger.
+
     You can view debug output in the \uicontrol {Debugger Log} view to
     \l {Debugger Does Not Work}{troubleshoot the debugger}.
 
     \image qtcreator-debugger-log-view.webp {Debugger Log view}
 
-    If debug output is sent to the system log, select \preferences >
-    \uicontrol Debugger > \uicontrol General >
-    \uicontrol {Force logging to console} check box.
+    If debug output is sent to the system log, go to \preferences >
+    \uicontrol Debugger > \uicontrol General and select
+    \uicontrol {Force logging to console}.
 
     Right-click the view to select the following actions:
 
@@ -1265,7 +1384,7 @@
         \li Log time stamps.
         \li Reload debugging helpers after \l{Adding Custom Debugging Helpers}
             {adding custom debugging helpers}.
-        \li Set \l{Debugger Preferences}{debugger preferences}.
+        \li Set \l{Debugger}{debugger preferences}.
     \endlist
 
     \section1 Directly Interacting with Native Debuggers
@@ -1282,15 +1401,20 @@
     handle the task. For example, instead of using the GDB
     \c print command from the command line, you can evaluate an expression in
     the \l {Evaluating Expressions}{Expressions} view.
+
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
 */
 
 /*!
     \page creator-disassembler-view.html
-    \previouspage creator-debugger-log-view.html
-    \nextpage creator-debugger-stopping.html
+    \previouspage creator-debug-mode.html
+
+    \ingroup creator-reference-debugger-views
 
     \title Viewing Disassembled Code
 
+    \brief View disassembled code for the current function.
+
     A \e disassembler translates machine language into assembly language for
     human-readability.
 
@@ -1301,13 +1425,13 @@
     \image qtcreator-debugger-disassembler-view.webp {Disassembler view}
 
     By default, GDB shows AT&T style disassembly. To switch to the Intel style,
-    select \preferences > \uicontrol Debugger >
+    go to \preferences > \uicontrol Debugger >
     \uicontrol GDB > \uicontrol {Use Intel style disassembly}.
 
     To open the \uicontrol Disassembler view:
 
     \list
-        \li Select \uicontrol Debug > \uicontrol {Operate by Instruction} while
+        \li Go to \uicontrol Debug > \uicontrol {Operate by Instruction} while
             the debugger is running.
         \li Select the \inlineimage icons/debugger_singleinstructionmode.png
             (\uicontrol {Operate by Instruction}) tool button on the debugger
@@ -1323,24 +1447,19 @@
     \uicontrol {Open Disassembler} and  set the disassembler address:
 
     \image qcreator-debugger-select-start-address.webp {Select Start Address dialog}
+
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
 */
 
 /*!
-    \previouspage creator-debugger-preferences.html
     \page creator-debugging-helpers.html
-    \nextpage creator-debugging-qml.html
+    \previouspage creator-debug-mode.html
 
-    \title Using Debugging Helpers
+    \ingroup creator-reference-debugger
 
-    To show complex structures, such as \c QObjects or associative containers,
-    in a clear and concise manner, \QC uses Python scripts that are called
-    \e {debugging helpers}.
-
-    \QC ships with debugging helpers for more than 200 of the most popular Qt
-    classes, standard C++ containers, and smart pointers, covering the usual
-    needs of a C++ application developer out-of-the-box.
+    \title Debugging Helpers
 
-    \section1 Extending Debugging Helpers
+    \brief Load, customize, and add debugging helpers.
 
     \QC uses Python scripts to translate raw memory contents and type information
     data from native debugger backends (GDB, LLDB, and CDB are currently supported)
@@ -1357,17 +1476,17 @@
     least one of the three supported backends is available.
 
     To use the default GDB pretty printers installed in your system or linked
-    to the libraries your application uses, select \preferences >
+    to the libraries your application uses, go to \preferences >
     \uicontrol Debugger > \uicontrol GDB > \uicontrol {Load system GDB pretty
-    printers}. For more information, see \l{Specifying GDB Settings}.
+    printers}. For more information, see \l{GDB}.
 
     \image qtcreator-preferences-debugger-gdb.webp {GDB preferences}
 
-    \section2 Customizing Built-In Debugging Helpers
+    \section1 Customizing Built-In Debugging Helpers
 
     You can have commands executed after built-in debugging helpers have
     been loaded and fully initialized. To load additional debugging helpers or
-    modify existing ones, select \preferences > \uicontrol Debugger >
+    modify existing ones, go to \preferences > \uicontrol Debugger >
     \uicontrol {Locals & Expressions}, and enter the commands in the
     \uicontrol {Debugging Helper Customization} field.
 
@@ -1389,10 +1508,10 @@
     \endcode
 
     To display a message box as soon as your application receives a signal
-    during debugging, select \preferences > \uicontrol Debugger > \uicontrol GDB >
+    during debugging, go to \preferences > \uicontrol Debugger > \uicontrol GDB >
     \uicontrol {Show a message box when receiving a signal}.
 
-    \section2 Adding Custom Debugging Helpers
+    \section1 Adding Custom Debugging Helpers
 
     To add debugging helpers for your own types, no compilation is required,
     just adding a few lines of Python. The scripts can address multiple versions
@@ -1444,7 +1563,7 @@
     \uicontrol {Reload Debugging Helpers} from the context menu of the
     \l {Debugger Log} view.
 
-    \section2 Debugging Helper Overview
+    \section1 Debugging Helper Overview
 
     The implementation of a debugging helper typically consists of a single
     Python function, which needs to be named \c{qdump__NS__Foo}, where
@@ -1532,7 +1651,7 @@
         d.putArrayData(base, size, typeobj)
     \endcode
 
-    \section2 Debugging Helper Implementation
+    \section1 Debugging Helper Implementation
 
     A debugging helper creates a description of the displayed data item
     in a format that is similar to GDB/MI and JSON.
@@ -1586,7 +1705,7 @@
     members specified in \c qtcreator\share\qtcreator\debugger\dumper.py.
 
 
-    \section3 Dumper Class
+    \section2 Dumper Class
 
     The \c Dumper class has generic bookkeeping, low-level, and convenience
     functions:
@@ -1752,7 +1871,7 @@
 
     \endlist
 
-    \section3 Dumper.Type Class
+    \section2 Dumper.Type Class
 
     The \c{Dumper.Type} class describes the type of a piece of data, typically
     a C++ class or struct, a pointer to a struct, or a primitive type, such as
@@ -1807,7 +1926,7 @@
     \endlist
 
 
-    \section3 Dumper.Field Class
+    \section2 Dumper.Field Class
 
     The \c{Dumper.Field} class describes a base class or a data member of a type
     object:
@@ -1830,7 +1949,7 @@
     \endlist
 
 
-    \section3 Dumper.Value Class
+    \section2 Dumper.Value Class
 
     The \c{Dumper.Value} class describes a piece of data, such as instances of
     C++ classes or primitive data types. It can also be used to describe
@@ -1892,7 +2011,7 @@
 
     \endlist
 
-    \section3 Children and SubItem Class
+    \section2 Children and SubItem Class
 
     The attempt to create child items might lead to errors if data is
     uninitialized or corrupted. To gracefully recover in such situations, use
@@ -1931,16 +2050,21 @@
             d.putSubItem("key", key)
             d.putSubItem("value", value)
     \endcode
+
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
 */
 
 
 /*!
-    \previouspage creator-qml-debugging-example.html
     \page creator-troubleshooting-debugging.html
-    \nextpage creator-analyze-mode.html
+    \previouspage creator-reference.html
+
+    \ingroup creator-reference-debugger
 
     \title Troubleshooting Debugger
 
+    \brief Solve problems that you might encounter while debugging.
+
     This section lists some typical problems that you might encounter while
     debugging and solutions to them.
 
@@ -1984,9 +2108,9 @@
             \l {Run on many platforms}{build and run kit selector}
             picked a runnable target and you can run the application.
 
-        \li Make sure the debugger is \l{Setting Up Debugger}{set up properly}.
+        \li Make sure the debugger is \l{Supported Native Debuggers}{set up properly}.
 
-        \li In the \uicontrol Debug mode, select \uicontrol View >
+        \li In the \uicontrol Debug mode, go to \uicontrol View >
             \uicontrol Views > \uicontrol {Debugger Log} to open the
             \l {Debugger Log} view. Browse the contents of the pane on
             the right hand side to find out what went wrong. Always attach the
@@ -2026,7 +2150,7 @@
 
     When using GDB as backend, you can automatically save a copy of
     its symbol index in a cache on disk and retrieve it from there
-    when loading the same binary in the future. Select \preferences >
+    when loading the same binary in the future. Go to \preferences >
     \uicontrol Debugger > \uicontrol GDB > \uicontrol {Use automatic symbol cache}.
 
     \image qtcreator-preferences-debugger-gdb.webp {GDB preferences}
@@ -2082,4 +2206,5 @@
     calls \c{prctl(0x59616d61, getppid(), 0, 0, 0);}, such as the one in
     \c{$QTCREATORDIR/lib/libptracepreload.so} to the LD_PRELOAD environment.
 
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
 */
diff --git a/doc/qtcreator/src/debugger/qtquick-debugger-example.qdoc b/doc/qtcreator/src/debugger/qtquick-debugger-example.qdoc
index 614219ce63..e7141a99f2 100644
--- a/doc/qtcreator/src/debugger/qtquick-debugger-example.qdoc
+++ b/doc/qtcreator/src/debugger/qtquick-debugger-example.qdoc
@@ -1,4 +1,4 @@
-// Copyright (C) 2018 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 // **********************************************************************
@@ -33,7 +33,7 @@
     \if defined(qtdesignstudio)
     \note In this tutorial, you are using advanced menu items. These are not
     visible by default. To toggle the visibility of advanced menu items, see
-    \l{Customizing the Menu}.
+    \l{Customizing the Menu Bar}.
 
     \endif
 
@@ -47,13 +47,13 @@
             border on the line where the \c startNewGame() function is
             called (1).
 
-            \image qtquick-example-setting-breakpoint1.png
+            \image qtquick-example-setting-breakpoint1.webp {Breakpoint in the code editor}
 
             The red circle indicates that a breakpoint is now set on that line
             number.
 
-        \li Select \uicontrol Debug > \uicontrol {Start Debugging} >
-            \uicontrol {Start Debugging of Startup Project} or press
+        \li Go to \uicontrol Debug > \uicontrol {Start Debugging} >
+            \uicontrol {Start Debugging of Startup Project}, or press
             \key{F5}.
 
         \li Once the Same Game application starts, select \uicontrol {Puzzle}
@@ -63,26 +63,26 @@
 
         \li When the debugger hits the breakpoint, it interrupts the
             application. \QC displays the nested function calls leading to the
-            current position as a call stack trace (1).
+            current position as a call stack trace.
 
-            \image qtquick-example-setting-breakpoint2.png
+            \image qtquick-example-setting-breakpoint2.webp {Debugger view}
 
-        \li Click the \inlineimage icons/debugger_stepinto_small.png
-            (\uicontrol {Step Into}) button on the toolbar or press \key F11 to step
+        \li Select \inlineimage icons/debugger_stepinto_small.png
+            (\uicontrol {Step Into}) on the toolbar or press \key F11 to step
             into the code in the stack. The samegame.js file opens in the code
             editor at the function that starts a new game.
 
-            \image qtquick-example-stack.png
+            \image qtquick-example-stack.webp {Stack view}
 
         \li Examine the local variables in the \uicontrol Locals
             view. Step through the code to see how the information changes in
             the view.
 
         \li Add a breakpoint at the end of the \c {startNewGame()} function, and
-            click \inlineimage icons/qtcreator-debugging-continue.png
+            select \inlineimage icons/qtcreator-debugging-continue.png
             (\uicontrol Continue) to hit the breakpoint.
 
-            \image qtquick-example-setting-breakpoint3.png
+            \image qtquick-example-setting-breakpoint3.webp {Second breakpoint in the Breakpoints view}
 
         \li To execute JavaScript commands in the current context, open the
             \uicontrol {QML Debugger Console}.
@@ -97,11 +97,11 @@
 
             \image qtquick-example-qml-inspector.png
 
-        \li Select \uicontrol Debug > \uicontrol {Show Application on Top} to
+        \li Go to \uicontrol Debug > \uicontrol {Show Application on Top} to
             keep the application visible while you interact with the debugger.
 
-        \li Select \uicontrol Debug > \uicontrol Select to activate selection
-            mode and then click the \uicontrol Menu button to move into the
+        \li Go to \uicontrol Debug > \uicontrol Select to activate selection
+            mode, and then select \uicontrol Menu to move into the
             \uicontrol menuButton component in the \uicontrol Locals view and
             the code editor.
 
diff --git a/doc/qtcreator/src/debugger/qtquick-debugging.qdoc b/doc/qtcreator/src/debugger/qtquick-debugging.qdoc
index 325e53bc3f..f027ec0f96 100644
--- a/doc/qtcreator/src/debugger/qtquick-debugging.qdoc
+++ b/doc/qtcreator/src/debugger/qtquick-debugging.qdoc
@@ -13,12 +13,18 @@
     \previouspage studio-debugging.html
     \nextpage creator-stack-view.html
     \else
-    \previouspage creator-debugging-helpers.html
-    \nextpage creator-debugging-example.html
+    \previouspage creator-reference.html
     \endif
 
+    \ingroup creator-reference-debugger
+    \ingroup studio-debugger
+
     \title Debugging Qt Quick Projects
 
+    \brief Debug JavaScript functions, execute JavaScript expressions to get
+    information about the state of the UI, and inspect QML properties and
+    JavaScript variables, as well as change their values temporarily at runtime.
+
     \if defined(qtcreator)
     \note You need Qt 5.0 or later to debug Qt Quick projects.
     \endif
@@ -29,7 +35,7 @@
     \if defined(qtdesignstudio)
     \note In this section, you are using advanced menu items. These are not
     visible by default. To toggle the visibility of advanced menu items, see
-    \l{Customizing the Menu}.
+    \l{Customizing the Menu Bar}.
     \endif
 
     \section1 Setting Up QML Debugging
@@ -56,8 +62,9 @@
         \list 1
 
         \li To create a build configuration that supports QML debugging,
-            select \uicontrol {Projects} > \uicontrol {Build} >
-            \uicontrol {QML debugging and profiling} > \uicontrol Enable.
+            go to \uicontrol {Projects} > \uicontrol {Build}.
+
+        \li In \uicontrol {QML debugging and profiling}, select \uicontrol Enable.
 
             \image qtcreator-build-settings-cmake-configure.webp {Build settings for a CMake project}
 
@@ -179,7 +186,7 @@
 
             \note Setting breakpoints is only possible if the application is started with block mode.
 
-        \li Select \uicontrol Debug > \uicontrol {Start Debugging} >
+        \li Go to \uicontrol Debug > \uicontrol {Start Debugging} >
             \uicontrol {Attach to QML Port}.
 
             Choose the kit configured for the device where the application to
@@ -225,7 +232,7 @@
 
         \li Select the item in the code editor.
 
-        \li Select \uicontrol Debug > \uicontrol Select to activate selection
+        \li Go to \uicontrol Debug > \uicontrol Select to activate selection
             mode and then click an item in the running application.
 
     \endlist
@@ -282,4 +289,8 @@
     When you change property values in the \uicontrol {QML Debugger Console} or
     in the \uicontrol Locals or \uicontrol Expression view, they are immediately
     updated in the running application, but not in the source code.
+
+    \if defined(qtcreator)
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
+    \endif
 */
diff --git a/doc/qtcreator/src/docker/creator-docker.qdoc b/doc/qtcreator/src/docker/creator-docker.qdoc
index 15f147d475..c63ab4b3b5 100644
--- a/doc/qtcreator/src/docker/creator-docker.qdoc
+++ b/doc/qtcreator/src/docker/creator-docker.qdoc
@@ -22,7 +22,7 @@
     {debuggers} and \l{Add Qt versions}{Qt versions}, in the Docker container
     and creates kits for the devices.
 
-    You can use CMake or qmake to build applications in the Docker container.
+    You are advised to use CMake to build applications in the Docker container.
 
     To pull images from Docker hub or other registries, use the
     \l{https://docs.docker.com/engine/reference/commandline/pull/}{docker pull}
diff --git a/doc/qtcreator/src/editors/creator-code-syntax.qdoc b/doc/qtcreator/src/editors/creator-code-syntax.qdoc
index f20ecadb8e..e2888c25ca 100644
--- a/doc/qtcreator/src/editors/creator-code-syntax.qdoc
+++ b/doc/qtcreator/src/editors/creator-code-syntax.qdoc
@@ -9,7 +9,7 @@
     \previouspage creator-how-tos.html
     \endif
 
-    \ingroup creator-how-to-edit
+    \ingroup creator-how-to-analyze
     \ingroup studio-how-to-code
 
     \title Check code syntax
@@ -66,9 +66,6 @@
 
     \section1 Set line annotation positions
 
-    To specify the position of the line annotations when looking at them in the
-    code editor, select \uicontrol {Annotation Settings} in the tooltip popup.
-
     To specify the position where the annotations are displayed, go to
     \preferences > \uicontrol {Text Editor} >
     \uicontrol Display > \uicontrol {Line annotations}, and then select
@@ -82,17 +79,11 @@
     If you hide the annotations, you can move the mouse pointer over an icon to
     view them.
 
-    \if defined(qtcreator)
-    \section1 Inspect QML and JavaScript
-
-    To inspect QML and JavaScript properties, methods, and enums, move the
-    cursor over them and go to \uicontrol Tools > \uicontrol {QML/JS} >
-    \uicontrol {Inspect API for Element Under Cursor}.
+    \sa {JavaScript and QML Checks}
 
-    \sa {Clangd}
+    \if defined(qtcreator)
+    \sa {Analyze}{How To: Analyze}, {Analyzers}, {Analyzing Code}
     \endif
-
-    \sa {JavaScript and QML Checks}
 */
 
 /*!
@@ -760,24 +751,25 @@
 
     \section1 Resetting the Code Model
 
-    If you change the build and run kit when you have QML files open in the code
-    editor, the code model might become corrupt. The following error message
-    indicates that this might have happened: \e{Using Qt Quick 1 code model
-    instead of Qt Quick 2}.
+    If you see the following error messages after you add a new QML module,
+    try building the project and then resetting the code model:
+
+    \list
+        \li QML module not found.
+        \li Unknown Component (M300).
+    \endlist
 
-    To see the error message, move the mouse pointer over code that
+    To see an error message, move the mouse pointer over code that
     \QC underlines in the code editor or when you open a QML file in \QDS.
 
     To reset the code model, select \uicontrol Tools > \uicontrol {QML/JS} >
     \uicontrol {Reset Code Model}.
 
+    \sa {Check code syntax}, {Using QML Modules with Plugins}
+
     \if defined(qtcreator)
-    If this does not help, try changing the QML emulation layer to the one that
-    was built with the same Qt version as the one selected in the build and run
-    kit.
+    \sa {Analyzing Code}
     \endif
-
-    \sa {Check code syntax}
 */
 
 /*!
diff --git a/doc/qtcreator/src/editors/creator-only/creator-clang-codemodel.qdoc b/doc/qtcreator/src/editors/creator-only/creator-clang-codemodel.qdoc
index f07a79e986..bdf06e24eb 100644
--- a/doc/qtcreator/src/editors/creator-only/creator-clang-codemodel.qdoc
+++ b/doc/qtcreator/src/editors/creator-only/creator-clang-codemodel.qdoc
@@ -125,7 +125,7 @@
     symbol support, which makes the results more reliable than before.
 
     \sa {Code Model}, {Clangd}, {Specify clangd settings},
-    {Speficy Clang tools settings}, {Use compilation databases}
+    {Specify Clang tools settings}, {Use compilation databases}
 */
 
 /*!
diff --git a/doc/qtcreator/src/editors/creator-only/creator-coding-edit-mode.qdoc b/doc/qtcreator/src/editors/creator-only/creator-coding-edit-mode.qdoc
index 0e8bba269a..c90a21f80e 100644
--- a/doc/qtcreator/src/editors/creator-only/creator-coding-edit-mode.qdoc
+++ b/doc/qtcreator/src/editors/creator-only/creator-coding-edit-mode.qdoc
@@ -111,7 +111,7 @@
     \row
         \li \inlineimage icons/live-preview.png
         \li Preview changes to QML code live in your application.
-        \li \l {Previewing on Desktop}
+        \li \l {Preview a QML file on desktop}
     \row
         \li \inlineimage icons/debugger_singleinstructionmode.png
         \li Run Clang-Tidy or Clazy to analyze the currently open file.
@@ -184,7 +184,8 @@
 
     \title Move between files
 
-    The editor toolbar shows the file that is currently open (1) in the editor.
+    The editor toolbar shows the name of the file that is currently open (1) in
+    the editor.
 
     \image qtcreator-editor-open-files.webp {Current file shown on Edit mode toolbar}
 
diff --git a/doc/qtcreator/src/editors/creator-only/creator-language-server.qdoc b/doc/qtcreator/src/editors/creator-only/creator-language-server.qdoc
index 8c01b9cfef..04690a1923 100644
--- a/doc/qtcreator/src/editors/creator-only/creator-language-server.qdoc
+++ b/doc/qtcreator/src/editors/creator-only/creator-language-server.qdoc
@@ -71,7 +71,7 @@
 
     \image qtcreator-language-server-json.webp {Prompt to install JSON language server}
 
-    Add a Java language server for \l{Connecting Android Devices}
+    Add a Java language server for \l{Developing for Android}
     {Android development}. For other languages, add generic stdIO language
     servers.
 
diff --git a/doc/qtcreator/src/external-resources/external-resources-qds.qdoc b/doc/qtcreator/src/external-resources/external-resources-qds.qdoc
index d5b7fcf1bd..2a340b9ea9 100644
--- a/doc/qtcreator/src/external-resources/external-resources-qds.qdoc
+++ b/doc/qtcreator/src/external-resources/external-resources-qds.qdoc
@@ -69,3 +69,39 @@
     \externalpage https://www.qt.io/download
     \title Try Qt
 */
+/*!
+    \externalpage https://doc.qt.io/qt-5/custom-material-reference.html
+    \title Qt Quick 3D Custom Material Reference
+*/
+/*!
+    \externalpage https://doc.qt.io/qt-5/qml-qtquick3d-arealight.html
+    \title AreaLight
+*/
+/*!
+    \externalpage https://doc.qt.io/qt-5/qml-qtquick3d-shaderinfo.html
+    \title ShaderInfo
+*/
+/*!
+    \externalpage https://doc.qt.io/qt-5/qml-qtquick3d-bufferblit.html
+    \title BufferBlit
+*/
+/*!
+    \externalpage https://doc.qt.io/qt-5/qml-qtquick3d-cullmode.html
+    \title CullMode
+*/
+/*!
+    \externalpage https://doc.qt.io/qt-5/qml-qtquick3d-depthinput.html
+    \title DepthInput
+*/
+/*!
+    \externalpage https://doc.qt.io/qt-5/qml-qtquick3d-renderstate.html
+    \title RenderState
+*/
+/*!
+    \externalpage https://doc.qt.io/qt/i18n-source-translation.html#mark-strings-for-translation
+    \title Mark Strings for Translation
+*/
+/*!
+    \externalpage https://doc.qt.io/qt/linguist-id-based-i18n.html
+    \title Text ID based translations
+*/
diff --git a/doc/qtcreator/src/external-resources/external-resources.qdoc b/doc/qtcreator/src/external-resources/external-resources.qdoc
index 3eceb28e56..009c98dd42 100644
--- a/doc/qtcreator/src/external-resources/external-resources.qdoc
+++ b/doc/qtcreator/src/external-resources/external-resources.qdoc
@@ -2,6 +2,14 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
+    \externalpage https://doc.qt.io/Boot2Qt/index.html
+    \title Boot2Qt: Documentation
+*/
+/*!
+    \externalpage https://doc.qt.io/Boot2Qt/b2qt-requirements-x11.html#setting-up-usb-access-to-embedded-devices
+    \title Boot2Qt: Setting Up USB Access to Embedded Devices
+*/
+/*!
     \externalpage https://doc.qt.io/qt/qtqml-index.html
     \title Qt Qml
 */
@@ -18,6 +26,10 @@
     \title \QMCU - Supported Target Platforms
 */
 /*!
+    \externalpage https://doc.qt.io/QtForMCUs/qtul-prerequisites.html
+    \title \QMCU - Prerequisites
+*/
+/*!
     \externalpage https://doc.qt.io/QtForMCUs/qtul-getting-started-renesas.html
     \title Getting Started on Renesas
 */
@@ -30,12 +42,16 @@
     \title Getting Started on NXP
 */
 /*!
+    \externalpage https://doc.qt.io/QtForMCUs/qtul-getting-started-on-infineon.html
+    \title Getting Started on Infineon
+*/
+/*!
     \externalpage https://doc.qt.io/QtForMCUs/qtul-getting-started-windows.html
     \title Getting Started on Windows
 */
 /*!
-    \externalpage https://adoptopenjdk.net/
-    \title AdoptOpenJDK
+    \externalpage https://adoptium.net/
+    \title Adoptium OpenJDK
 */
 /*!
     \externalpage http://openjdk.java.net
@@ -185,3 +201,19 @@
     \externalpage https://doc-snapshots.qt.io/applicationmanager-dev/cmake-qt6-am-create-installable-package.html
     \title qt6_am_create_installable_package
 */
+/*!
+    \externalpage https://valgrind.org/info/tools.html
+    \title Valgrind's Tool Suite
+*/
+/*!
+    \externalpage https://valgrind.org/docs/manual/quick-start.html#quick-start.interpret
+    \title Interpreting Memcheck's Output
+*/
+/*!
+    \externalpage https://valgrind.org/docs/manual/manual-core.html#manual-core.suppress
+    \title Suppressing Errors
+*/
+/*!
+    \externalpage https://www.openssh.com/
+    \title OpenSSH
+*/
diff --git a/doc/qtcreator/src/howto/creator-external-tools.qdoc b/doc/qtcreator/src/howto/creator-external-tools.qdoc
index 13927f3d67..fa58a1e80a 100644
--- a/doc/qtcreator/src/howto/creator-external-tools.qdoc
+++ b/doc/qtcreator/src/howto/creator-external-tools.qdoc
@@ -77,7 +77,7 @@
             {build environment} or \l {Specify the run environment}
             {run environment} of the active project. Select the build or run
             environment if the system environment does not have the necessary
-            PATH settings to find the tool chain, for example.
+            PATH settings to find the toolchain, for example.
         \else
         \li In the \uicontrol {Base environment} field, use the default settings.
         \endif
@@ -209,6 +209,10 @@
     \uicontrol External > \uicontrol {Qt Quick} > \uicontrol {QML Runtime}.
 
     \sa {Use external tools}
+
+    \if defined(qtcreator)
+    \sa {Design UIs}{How To: Design UIs}, {UI Design}
+    \endif
 */
 
 /*!
diff --git a/doc/qtcreator/src/howto/creator-how-to-view-images.qdoc b/doc/qtcreator/src/howto/creator-how-to-view-images.qdoc
index c5cf673347..17d660c4d6 100644
--- a/doc/qtcreator/src/howto/creator-how-to-view-images.qdoc
+++ b/doc/qtcreator/src/howto/creator-how-to-view-images.qdoc
@@ -43,6 +43,10 @@
     Select \uicontrol {Set as Default} to use the current settings for the
     background and outline modes and fitting images to screen as default
     values for the image viewer.
+
+    \if defined(qtcreator)
+    \sa {Design UIs}{How To: Design UIs}, {UI Design}
+    \endif
 */
 
 /*!
@@ -67,4 +71,8 @@
 
     You can then use QIcon::addPixmap() to add the pixmaps to icons in
     different modes and states.
+
+    \if defined(qtcreator)
+    \sa {Design UIs}{How To: Design UIs}, {UI Design}
+    \endif
 */
diff --git a/doc/qtcreator/src/howto/creator-only/creator-autotest.qdoc b/doc/qtcreator/src/howto/creator-only/creator-autotest.qdoc
index f05c16181a..5fa0f05c1a 100644
--- a/doc/qtcreator/src/howto/creator-only/creator-autotest.qdoc
+++ b/doc/qtcreator/src/howto/creator-only/creator-autotest.qdoc
@@ -359,10 +359,6 @@
             found by the code based test frameworks and are registered as test
             with the build system.
 
-    If a test takes more than a minute to execute, the default timeout might
-    stop the test execution. To increase the timeout, go to \preferences >
-    \uicontrol {Testing} > \uicontrol General.
-
     \section1 Select tests to run
 
     The \uicontrol Tests view shows all the tests found for the currently active
@@ -501,7 +497,7 @@
             the current project.
     \row
         \li \uicontrol {Timeout}
-        \li The maximum time in seconds to execute a test case.
+        \li Set a maximum time in seconds to execute a test case.
      \row
         \li \uicontrol {Reset Cached Choices}
         \li Sometimes, \QC cannot deduce which executable or run configuration to
diff --git a/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc b/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc
index 1b545943e3..6bbbac0475 100644
--- a/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc
+++ b/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc
@@ -80,6 +80,48 @@
 
     \generatelist creator-how-to-design
 
+    \section1 Develop for Devices
+
+    Install the toolchain for building applications for the targeted
+    embedded or mobile platform on the computer, and use \QOI to
+    install Qt libraries that are built for the platform. Then add a
+    kit with the toolchain and the Qt version for the device's architecture.
+    When possible, \QOI creates suitable kits for you. Connect the devices
+    to the computer to run, debug, and analyze applications on them.
+
+    \section2 Android
+
+    Install \l {Qt for Android} and Android tools, and connect Android devices to
+    the computer.
+
+    \generatelist creator-how-to-android
+
+    \section2 Bare Metal
+
+    Run and debug applications on small Linux devices that are not supported
+    by the remote Linux device plugin by using GDB or a hardware debugger.
+
+    \generatelist creator-how-to-bare-metal
+
+    \section2 iOS
+
+    Install \l {Qt for iOS} and Xcode, and connect iOS devices to the computer.
+
+    \generatelist creator-how-to-ios
+
+    \section2 MCUs
+
+    Install \l {Qt for MCUs}, and connect microcontrollers to the computer.
+
+    \generatelist creator-how-to-mcu
+
+    \section2 Remote Linux
+
+    Add kits for toolchains for building applications for generic Linux
+    devices, and connect the devices to the computer.
+
+    \generatelist creator-how-to-remote-linux
+
     \section1 Edit Code
 
     The code editor offers useful features for editing C++ and QML code, such
@@ -115,7 +157,7 @@
 
     \QC groups build and run specific settings as kits to make cross-platform
     development easier. Each kit consists of a set of values that define one
-    environment, such as a device, tool chain, Qt version, and debugger command
+    environment, such as a device, toolchain, Qt version, and debugger command
     to use.
 
     \generatelist creator-how-to-manage-kits
@@ -423,6 +465,12 @@
             \uicontrol {Find References to Symbol Under Cursor}.
     \endlist
 
+    \section1 Inspect QML and JavaScript
+
+    To inspect QML and JavaScript properties, methods, and enums, place the
+    cursor over them and go to \uicontrol Tools > \uicontrol {QML/JS} >
+    \uicontrol {Inspect API for Element Under Cursor}.
+
     \section1 Move between QML and C++
 
     To move to the C++ implementation of a QML type in the code editor, place the
@@ -433,7 +481,8 @@
         \li Go to \uicontrol {Follow Symbol Under Cursor} in the context menu.
     \endlist
 
-    \sa {Edit Code}{How To: Edit Code}, {Edit Mode}, {Navigate with locator}
+    \sa {Edit Code}{How To: Edit Code}, {Clangd}, {Edit Mode},
+    {Navigate with locator}
 */
 
 /*!
diff --git a/doc/qtcreator/src/howto/creator-only/creator-squish.qdoc b/doc/qtcreator/src/howto/creator-only/creator-squish.qdoc
index 4284085e72..9aaf0506f2 100644
--- a/doc/qtcreator/src/howto/creator-only/creator-squish.qdoc
+++ b/doc/qtcreator/src/howto/creator-only/creator-squish.qdoc
@@ -2,82 +2,66 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \previouspage creator-autotest.html
-    \page creator-squish.html
-    \nextpage creator-advanced.html
+    \page creator-how-to-connect-squish-server.html
+    \previouspage creator-how-tos.html
 
-    \title Using Squish
+    \ingroup creator-how-to-test
 
-    \l{https://www.qt.io/product/quality-assurance/squish}{Squish} is an automated GUI
-    testing framework for testing Android, iOS, Java, \macos, Qt, Tk, Windows, and
-    XView applications, as well as HTML-based web applications running in
-    browsers, such as Apple Safari, Mozilla Firefox, Google Chrome, and
-    Microsoft Internet Explorer and Edge.
+    \title Connect to Squish Server
 
-    The experimental Squish plugin integrates Squish into \QC. You can:
-
-    \list
-        \li Open existing Squish test suites.
-        \li Create new test suites and test cases.
-        \li Record test cases (in a very limited way compared to what you can do
-            inside the Squish IDE).
-        \li Use Squish Runner and Server to run test suites or cases and view
-            the results in the \uicontrol Squish \l{View output}{output}.
-        \li Set breakpoints before running tests to stop at certain locations and
-            inspect the local variables, similarly to when debugging a test.
-    \endlist
-
-    When running test suites or cases, the Squish Runner instructs the Squish
-    Server to start the application under test (AUT). The server can be running
-    on multiple machines, and the AUT can be located on a different path on each
-    of them. Therefore, you must either map AUTs to their corresponding paths or
-    specify AUT paths to search from in the server settings.
-
-    In addition, you can test an already running application by attaching to it.
-    This enables you to test your application using a Squish Server running on
-    another machine. However, you can have only one server attached to your
-    application at a time. Also, the attached application is not closed when the
-    test case is completed.
-
-    To use the plugin, you must download and install Squish, create a connection
-    to the Squish Server, and specify AUTs to run.
-
-    \note Enable the Squish plugin to use it.
-
-    \section1 Specifying a Squish Server
-
-    To specify a Squish Server to run:
+    To create a connection to Squish Server:
 
     \list 1
         \li Select \preferences > \uicontrol Squish.
-            \image qtcreator-squish-preferences.png "Squish general preferences"
-        \li In the \uicontrol {Squish path} field, specify the path to the Squish
+            \image qtcreator-squish-preferences.png {Squish general preferences}
+        \li In \uicontrol {Squish path}, specify the path to the Squish
             installation directory.
-        \li In the \uicontrol {License path} field, specify the path to your
+        \li In \uicontrol {License path}, specify the path to your
             Squish license file if it is not located in your home folder. For
             example, if you have a global installation with several users, where
             the license key is installed in the global folder.
-        \li Select the \uicontrol {Local server} check box to use a locally
-            installed \c {squishserver.exe}. To use a server running in another
-            machine, deselect the check box and specify the server address in the
-            \uicontrol {Server host} field and the port number in the
-            \uicontrol {Server port} field. If no port is specified, \QC starts
+        \li Select \uicontrol {Local server} to use a locally
+            installed \c {squishserver.exe}. To use a server running on another
+            computer, clear the checkbox and specify the server address in the
+            \uicontrol {Server host} and the port number in the
+            \uicontrol {Server port}. If no port is specified, \QC starts
             \c squishserver in a way that enables it to automatically select an
             open port.
-        \li Select the \uicontrol {Verbose log} check box to include additional
+        \li Select \uicontrol {Verbose log} to include additional
             logging levels in the log output.
-        \li Select the \uicontrol {Minimize IDE} check box to automatically
+        \li Select \uicontrol {Minimize IDE} to automatically
             minimize \QC when running or recording test cases.
     \endlist
 
-    \section1 Specifying AUTs
+    \sa {Create Squish test suites}, {Enable and disable plugins},
+    {Manage Squish test suites and cases}, {Select Squish AUTs}, {Squish}
+*/
+
+/*!
+    \page creator-how-to-select-squish-auts.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-test
+
+    \title Select Squish AUTs
 
-    To specify applications to test using Squish, select \uicontrol {Tools} >
+    To select applications to test using Squish, go to \uicontrol {Tools} >
     \uicontrol {Squish} > \uicontrol {Server Settings}.
 
-    \image qtcreator-squish-server-settings.png "Squish Server Settings"
+    \image qtcreator-squish-server-settings.png {Squish Server Settings}
+
+    When running test suites or cases, the Squish Runner instructs the Squish
+    Server to start the application under test (AUT). The server can be running
+    on multiple computers, and the AUT can be located on a different path on each
+    of them. Therefore, you must either map AUTs to their corresponding paths or
+    specify AUT paths to search from in the server settings.
+
+    To test an already running application using a Squish Server running on
+    another computer, attach to the application. You can attach only one server
+    to your application at a time. The attached application is not closed when
+    the test case is completed.
 
-    \section2 Mapping AUTs
+    \section1 Map AUTs
 
     To specify the path to an AUT to run, select \uicontrol {Mapped AUTs} >
     \uicontrol Add and locate the AUT.
@@ -88,13 +72,13 @@
 
     Mapping AUTs prevents the server from accidentally executing the wrong AUT
     if two different executables have the same name, as the server executes the
-    first matching AUT it finds in the \uicontrol {AUT Paths} list.
+    first matching AUT it finds in \uicontrol {AUT Paths}.
 
     To change the path to the selected AUT, select \uicontrol {Edit}.
 
     To remove the mapping to the selected AUT, select \uicontrol {Remove}.
 
-    \section2 Specifying AUT Paths
+    \section1 Specify AUT paths
 
     To specify a path to search AUTs from, select \uicontrol {AUT Paths} >
     \uicontrol Add.
@@ -107,32 +91,60 @@
 
     To remove the selected AUT path, select \uicontrol {Remove}.
 
-    \section2 Adding Attachable AUTs
+    \section1 Add attachable AUTs
 
     To specify the path to a running AUT, select \uicontrol {Attachable AUTs} >
     \uicontrol Add. In the \uicontrol {Add Attachable AUT} dialog, specify a
     connection to a running application to register an attachable AUT.
 
-    \image qtcreator-squish-server-settings-add-attachable-aut.png "Add Attachable AUT dialog"
+    \image qtcreator-squish-server-settings-add-attachable-aut.png {Add Attachable AUT dialog}
 
     To change the connection to the selected AUT, select \uicontrol {Edit}.
 
     To remove the connection to the selected AUT, select \uicontrol {Remove}.
 
-    \section1 Managing Test Suites and Cases
+    \section1 Specify settings for running tests
 
-    You can manage Squish test suites and cases in the \uicontrol Squish
-    \l {Show and hide sidebars}{view}.
+    To specify settings for running tests:
 
-    \image qtcreator-squish-view.png "Squish sidebar view"
+    \list
+        \li In \uicontrol {Maximum startup time}, set the maximum time
+            to wait for the AUT to start before throwing an error.
+        \li In \uicontrol {Maximum response time}, set the maximum time
+            to wait for the AUT to respond before throwing an error.
+        \li In \uicontrol {Maximum post-mortem wait time}, set the
+            maximum time to wait after the main AUT has exited. This is useful
+            for AUTs invoked through launcher applications, such as shell scripts
+            or batch files.
+        \li Select \uicontrol {Animate mouse cursor} to animate
+            the mouse cursor when playing back a test.
+    \endlist
+
+    \sa {Connect to Squish Server}, {Create Squish test suites},
+    {Enable and disable plugins}, {Manage Squish test suites and cases},
+    {Squish}
+*/
+
+/*!
+    \page creator-how-to-manage-squish-test-suites.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-test
+
+    \title Manage Squish test suites and cases
+
+    Manage Squish test suites and cases in the \uicontrol Squish
+    \l {Show and hide sidebars}{sidebar view}.
+
+    \image qtcreator-squish-view.png {Squish sidebar view}
 
     To show existing test suites in \uicontrol {Test Suites}, select
     \uicontrol {Open Squish Suites} in the context menu.
 
-    \image qtcreator-squish-view-open-squish-suites.png "Open Squish Test Suites dialog"
+    \image qtcreator-squish-view-open-squish-suites.png {Open Squish Test Suites dialog}
 
-    You can open the \uicontrol {Squish Test Suite} wizard for creating a new
-    test suite by selecting \uicontrol {Create New Test Suite} in the context
+    To open the \uicontrol {Squish Test Suite} wizard for creating a new
+    test suite, select \uicontrol {Create New Test Suite} in the context
     menu.
 
     To add a test case to a test suite, select it and then select
@@ -148,73 +160,40 @@
     Double-click a test suite in \uicontrol {Test Suites} to open the
     \c {suite.conf} configuration file for editing.
 
-    \section2 Creating Test Suites
-
-    To create a new test suite:
-
-    \list 1
-        \li Select \uicontrol File > \uicontrol {New Project}
-            > \uicontrol {Squish} > \uicontrol {Squish Test Suite} >
-            \uicontrol Choose.
-            \image qtcreator-squish-create-test-suite.png "Create Squish Test Suite wizard"
-        \li On the \uicontrol {Location} page, in \uicontrol {Test Suite Name},
-            enter a name for the test suite.
-            \image qtcreator-squish-create-test-suite-location.png "Location page"
-        \li In \uicontrol {Test Suite folder's parent folder}, enter the path to
-            the folder to create the test suite folder, and then select
-            \uicontrol Next.
-        \li On the \uicontrol Setup page, select the GUI toolkit used by the AUT,
-            and then select \uicontrol Next.
-            \image qtcreator-squish-create-test-suite-setup.png "Setup page"
-            Currently, only desktop GUI toolkits are supported.
-        \li On the \uicontrol {Script Language} page, select the scripting
-            language to use for the test suite's test script, and then select
-            \uicontrol Next.
-            \image qtcreator-squish-create-test-suite-language.png "Languages page"
-        \li On the \uicontrol {AUT} page, select the AUT to test, and then select
-            \uicontrol Next.
-            \image qtcreator-squish-create-test-suite-aut.png "AUT page"
-        \li On the \uicontrol {Summary} page review the test suite settings, and
-            then select \uicontrol Finish to create the test suite.
-    \endlist
-
-    The test suite is listed in \uicontrol {Test Suites} in the \uicontrol Squish
-    sidebar view.
-
-    \section2 Recording Test Cases
+    \section1 Record test cases
 
     Squish records tests using the scripting language that you specified for the
     test suite. Recordings are made into existing test cases.
 
     In \uicontrol {Test Suites}, select the \inlineimage icons/recordfill.png
-    (\uicontrol {Record Test Case}) button next to the test case name. The AUT
-    that you selected for the test suite is displayed and you can start recording
-    the test case.
+    (\uicontrol {Record Test Case}) button next to the test case name. The
+    application under test (AUT) that you selected for the test suite is
+    displayed and you can start recording the test case.
 
-    \image qtcreator-squish-control-bar-record-test-case.png "Squish control bar for recording test cases"
+    \image qtcreator-squish-control-bar-record-test-case.png {Squish control bar for recording test cases}
 
     When you are done, select the \inlineimage icons/stop_small.png
     (\uicontrol {Stop}) button in the \uicontrol {Control Bar}.
 
-    You can edit recorded test scripts or copy parts of them into manually
+    Edit recorded test scripts or copy parts of them into manually
     created test scripts.
 
-    \image qtcreator-squish-test-script-edit.png "A test script open in the editor"
+    \image qtcreator-squish-test-script-edit.png {A test script open in the editor}
 
-    \section2 Running Test Suites
+    \section1 Run test suites
 
-    You can run a recorded test case to have Squish repeat all the actions that
+    Run a recorded test case to have Squish repeat all the actions that
     you applied when recording the test, but without the pauses that humans are
     prone to but which computers don't need.
     To run a test case, select the \inlineimage icons/run_small.png
     (\uicontrol {Run}) button next to the test case in \uicontrol {Test Suites}.
 
-    \image qtcreator-squish-control-bar-run-test-case.png "Squish control bar for running test cases"
+    \image qtcreator-squish-control-bar-run-test-case.png {Squish control bar for running test cases}
 
     While the test is running, you can view test results as well as interrupt and
     stop tests in the \uicontrol {Control Bar}.
 
-    \section2 Mapping Symbolic Names
+    \section1 Map symbolic names
 
     When Squish records a test, it uses \e {symbolic names} to identify the UI
     elements. Symbolic names are stored in an object map that can be either
@@ -237,7 +216,7 @@
     (\uicontrol {Object Map}) button next to the test
     suite in \uicontrol {Test Suites}.
 
-    \image qtcreator-squish-symbolic-names.png "Symbolic Names view"
+    \image qtcreator-squish-symbolic-names.png {Symbolic Names view}
 
     You can filter the symbolic names in the \uicontrol {Symbolic Names} view.
     To edit a symbolic name or the names or values of its properties,
@@ -253,49 +232,87 @@
     property, select  \inlineimage icons/jumpto.png
     .
 
-    \section2 Inspecting Local Variables
+    \section1 Inspect local variables
 
     If you set breakpoints in the test code before running the test, the test
     execution is automatically interrupted when a breakpoint is hit. You can
     inspect the contents of local variables in the \uicontrol {Squish Locals}
     view.
 
-    \image qtcreator-squish-locals.png "Squish Locals view"
+    \image qtcreator-squish-locals.png {Squish Locals view}
 
     Use the \uicontrol {Step Into}, \uicontrol {Step Over}, and
     \uicontrol {Step Out} buttons in the \uicontrol Squish debugging
     view to step through the code.
 
-    \image qtcreator-squish-debugging-view.png "Squish debugging view"
+    \image qtcreator-squish-debugging-view.png {Squish debugging view}
 
-    \section2 Specifying Settings for Running Tests
+    \sa {Connect to Squish Server}, {Create Squish test suites},
+    {Enable and disable plugins}, {Select Squish AUTs}, {Squish}
+*/
 
-    To specify settings for running tests, select \uicontrol Tools >
-    \uicontrol Squish > \uicontrol {Server Settings}:
+/*!
+    \page creator-how-to-create-squish-test-suites.html
+    \previouspage creator-how-tos.html
 
-    \list
-        \li In the \uicontrol {Maximum startup time} field, set the maximum time
-            to wait for the AUT to start before throwing an error.
-        \li In the \uicontrol {Maximum response time} field, set the maximum time
-            to wait for the AUT to respond before throwing an error.
-        \li In the \uicontrol {Maximum post-mortem wait time} field, set the
-            maximum time to wait after the main AUT has exited. This is useful
-            for AUTs invoked through launcher applications, such as shell scripts
-            or batch files.
-        \li Select the \uicontrol {Animate mouse cursor} check box to animate
-            the mouse cursor when playing back a test.
+    \ingroup creator-how-to-test
+
+    \title Create Squish test suites
+
+    To create a new test suite:
+
+    \list 1
+        \li Go to \uicontrol File > \uicontrol {New Project}.
+        \li Select \uicontrol {Squish} > \uicontrol {Squish Test Suite} >
+            \uicontrol Choose.
+            \image qtcreator-squish-create-test-suite.png {Create Squish Test Suite wizard}
+        \li On the \uicontrol {Location} page, in \uicontrol {Test Suite Name},
+            enter a name for the test suite.
+            \image qtcreator-squish-create-test-suite-location.png {Location page}
+        \li In \uicontrol {Test Suite folder's parent folder}, enter the path to
+            the folder to create the test suite folder, and then select
+            \uicontrol Next.
+        \li On the \uicontrol Setup page, select the GUI toolkit used by the
+            application under test (AUT), and then select \uicontrol Next.
+            \image qtcreator-squish-create-test-suite-setup.png {Setup page}
+            Currently, only desktop GUI toolkits are supported.
+        \li On the \uicontrol {Script Language} page, select the scripting
+            language to use for the test suite's test scripts, and then select
+            \uicontrol Next.
+            \image qtcreator-squish-create-test-suite-language.png {Languages page}
+        \li On the \uicontrol {AUT} page, select the AUT to test, and then select
+            \uicontrol Next.
+            \image qtcreator-squish-create-test-suite-aut.png {AUT page}
+        \li On the \uicontrol {Summary} page, review the test suite settings, and
+            then select \uicontrol Finish to create the test suite.
     \endlist
 
-    \section1 Viewing Test Results
+    The test suite is listed in \uicontrol {Test Suites} in the \uicontrol Squish
+    sidebar view.
+
+    \sa {Connect to Squish Server}, {Manage Squish test suites and cases}, {Enable and disable plugins},
+    {Select Squish AUTs}, {Squish}
+*/
+
+/*!
+    \page creator-reference-squish-output.html
+    \previouspage creator-reference.html
+
+    \ingroup creator-reference-output-views
+
+    \title Squish
+
+    \brief View Squish test, runner, and server logs.
 
     Squish uses compare, verify, and exception functions to record the results of
-    tests applied to a running AUT in the test log as \e {passes} or \e {fails}.
-    In addition, any kind of test results can be recorded in the test log.
+    tests applied to a running application under test (AUT) in the test log as
+    \e {passes} or \e {fails}. In addition, any kind of test results can be
+    recorded in the test log.
 
-    You can view the test log in the \uicontrol Squish output,
+    To view the test log, go to the \uicontrol Squish output,
     \uicontrol {Test Results} tab.
 
-    \image qtcreator-squish-output-test-results.png "Test Results output"
+    \image qtcreator-squish-output-test-results.png {Test Results output}
 
     The \uicontrol Result column displays the time when each test run started
     and finished, log information and warnings, and test result status:
@@ -314,12 +331,14 @@
     the type of the operation that was performed: comparison, verification, or
     exception.
 
-    \section1 Viewing Squish Runner and Server Logs
+    \section1 View Squish runner and server logs
 
-    You can view the Squish Runner and Server logs in the \uicontrol Squish
+    To view the Squish Runner and Server logs, go to the \uicontrol Squish
     output, \uicontrol {Runner/Server Log} tab.
 
-    \image qtcreator-squish-output-runner-server-log.png "Runner and Server Log output"
+    \image qtcreator-squish-output-runner-server-log.png {Runner and Server Log output}
 
-    \sa {Enable and disable plugins}
+    \sa {Connect to Squish Server}, {Create Squish test suites},
+    {Enable and disable plugins}, {Manage Squish test suites and cases},
+    {Select Squish AUTs}, {View output}
 */
diff --git a/doc/qtcreator/src/howto/creator-only/qtcreator-faq.qdoc b/doc/qtcreator/src/howto/creator-only/qtcreator-faq.qdoc
index beadc0eb86..7126aee0cc 100644
--- a/doc/qtcreator/src/howto/creator-only/qtcreator-faq.qdoc
+++ b/doc/qtcreator/src/howto/creator-only/qtcreator-faq.qdoc
@@ -164,12 +164,12 @@
 
     You must use Python version 2.6 or 2.7.
 
-    For more information on setting up debugger, see \l{Setting Up Debugger}.
+    For more information, see \l{Supported Native Debuggers}.
 
     \b {How do I generate a core file in \QC?}
 
     To trigger the GDB command that generates a core file while debugging,
-    select \uicontrol View > \uicontrol Views > \l {Debugger Log}.
+    go to \uicontrol View > \uicontrol Views > \l {Debugger Log}.
     In the \uicontrol Command field, type \c gcore and press \key Enter. The
     core file is created in the current working directory. You can specify
     another location for the file, including a relative or absolute path, as an
diff --git a/doc/qtcreator/src/howto/creator-sessions.qdoc b/doc/qtcreator/src/howto/creator-sessions.qdoc
index 318502e54c..0f455cbc0f 100644
--- a/doc/qtcreator/src/howto/creator-sessions.qdoc
+++ b/doc/qtcreator/src/howto/creator-sessions.qdoc
@@ -60,7 +60,7 @@
 
     To manage sessions, select \uicontrol File > \uicontrol Sessions > \uicontrol Manage.
 
-    \image qtcreator-session-manager.png
+    \image qtcreator-session-manager.png {Session Manager}
 
     To save a session under a new name, select \uicontrol Clone.
 
@@ -97,7 +97,7 @@
     \key Ctrl+Alt+<number>, where \e <number> is the number of the session to
     open (available for the first nine sessions).
 
-    \image qtcreator-welcome-session.png
+    \image qtcreator-welcome-session.webp {Sessions in the Welcome mode}
 
     To view more information about a session, select the down arrow icon that
     appears when you move the mouse cursor over the session name. Select actions
diff --git a/doc/qtcreator/src/ios/creator-ios-dev.qdoc b/doc/qtcreator/src/ios/creator-ios-dev.qdoc
index d1e15e58b5..5dccfd1dcc 100644
--- a/doc/qtcreator/src/ios/creator-ios-dev.qdoc
+++ b/doc/qtcreator/src/ios/creator-ios-dev.qdoc
@@ -2,19 +2,18 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \previouspage creator-adding-docker-devices.html
     \page creator-developing-ios.html
-    \nextpage creator-developing-mcu.html
+    \previouspage creator-reference.html
 
-    \title Connecting iOS Devices
+    \ingroup creator-reference-devices
 
-    You can connect iOS devices to your local machine with a USB cable to
-    run applications built for them from \QC.
+    \title Developing for iOS
 
-    To be able to use \QC on \macos, you must install Xcode, and therefore,
-    you already have the tool chain for building applications for iOS. \QC
-    automatically detects the tool chain and creates the necessary
-    \l{glossary-buildandrun-kit}{kits} to build applications for and run them on
+    \brief Connect iOS devices to your local machine with a USB cable to
+    run applications on them.
+
+    After you install Xcode, \QC automatically detects the toolchain and creates
+    the necessary \l{Kits}{kits} to build applications for and run them on
     configured iOS devices.
 
     You only need Qt libraries that are built for iOS. You can install them as
@@ -29,7 +28,36 @@
     physical devices with iOS 17 or later because of limitations of the Apple tool for
     accessing these devices.
 
-    \section1 Configuring Devices
+    \section1 Specifying Supported iOS Versions
+
+    You can build applications for the latest iOS version and deploy them to
+    previous versions. For the most part, this works automatically. However,
+    you must take care when you manually set your own target version. If you set
+    it to a value higher than what Qt requires and supply your own \c Info.plist
+    file, you must add an \c LSMinimumSystemVersion entry to the \c Info.plist
+    that matches the value of \l{CMake: CMAKE_OSX_DEPLOYMENT_TARGET}
+    {CMAKE_OSX_DEPLOYMENT_TARGET} (when using CMake),
+    \l QMAKE_IOS_DEPLOYMENT_TARGET (when using qmake), or
+    \l{https://doc.qt.io/qbs/qml-qbsmodules-cpp.html#minimumIosVersion-prop}
+    {cpp.minimumIosVersion} (when using Qbs) because iOS (and the App Store)
+    will use the \c LSMinimumSystemVersion value as the authoritative one.
+
+    If you specify a deployment target value lower than what Qt requires, your
+    application will almost certainly crash somewhere in the Qt libraries when
+    run on an older version than Qt supports. Therefore, make sure that the
+    actual build system code reflects the minimum iOS version that is actually
+    required.
+
+    \sa {iOS}{How To: Develop for iOS}, {Expressing Supported iOS Versions}
+*/
+
+/*!
+    \page creator-how-to-connect-ios-devices.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-ios
+
+    \title Connect iOS devices
 
     The connections between \QC and an iOS device are protected by using a
     certificate that you receive from Apple when you
@@ -40,26 +68,27 @@
     The first time you connect the device to your local machine, you are asked to enable
     developer mode on the device. The next time you connect the device, \QC
     detects it automatically. To disable automatic connections to a device that
-    you do not use for development, select \uicontrol Preferences >
-    \uicontrol iOS, and deselect the \uicontrol {Ask about devices not in
-    developer mode} check box.
+    you do not use for development, go to preferences > \uicontrol iOS
+    and clear \uicontrol {Ask about devices not in developer mode}.
 
     \note The process of configuring devices and the UI varies slightly
     depending on the Xcode version that you use. We recommend that you use the
     latest available Xcode version.
 
+    \section1 Create a connection to an iOS device
+
     To configure connections between \QC and an iOS device:
 
     \list 1
 
-        \li Make sure that you have Xcode and Qt for iOS installed.
+        \li Check that you installed Xcode and \l{Qt for iOS}.
 
         \li Connect the device to your local machine with a USB cable.
 
         \li Start Xcode to configure the device.
 
-            For example, in Xcode version 15, select \uicontrol Window >
-            \uicontrol Devices and Simulators > \uicontrol Devices >
+            For example, in Xcode version 15, go to \uicontrol Window >
+            \uicontrol Devices and Simulators > \uicontrol Devices, and select
             \uicontrol + to add the connected device.
 
         \li To specify build settings:
@@ -69,7 +98,7 @@
             \li Open a project for an application you want to develop for the
                 device.
 
-            \li Select \uicontrol Projects > \uicontrol {Build & Run} to select
+            \li Go to \uicontrol Projects > \uicontrol {Build & Run} to select
                 the kit for building applications for and running them on iOS.
 
                 \image qtcreator-ios-add-kit.png "Build & Run Settings"
@@ -81,7 +110,7 @@
 
                 \image qtcreator-build-settings-ios.png "iOS build settings"
 
-            \li Select the \uicontrol {Automatically manage signing} check box
+            \li Select \uicontrol {Automatically manage signing}
                 to automatically select the provisioning profile and signing
                 certificate on your local machine that matches the entitlements
                 and the bundle identifier of the iOS device.
@@ -101,46 +130,33 @@
     \endlist
 
     \note If you cannot deploy applications because a provisioning profile is
-    missing, check that provisioning profiles are listed in Xcode by selecting
+    missing, check that provisioning profiles are listed in Xcode by going to
     \uicontrol Xcode > \uicontrol Preferences > \uicontrol Accounts. For more
     information about how to acquire and install a provisioning profile, see
     Apple documentation.
 
-    \section1 Viewing Device Connection Status
+    \section1 View device connection status
 
     When you connect an iOS device to your local machine with USB, \QC
     automatically detects the device if you have configured it by using Xcode.
-    To view information about the connected device, select \uicontrol Preferences >
+    To view information about the connected device, go to \uicontrol Preferences >
     \uicontrol Devices.
 
-    \image qtcreator-ios-device-configurations.png "Devices dialog"
+    \image qtcreator-ios-device-configurations.png {Devices dialog}
 
     If the current device state is \uicontrol Connected, (the traffic light icon is
     orange), you need to configure the device using Xcode.
 
-    \section1 Specifying Supported iOS Versions
-
-    You can build applications for the latest iOS version and deploy them to
-    previous versions. For the most part, this works automatically. However,
-    you must take care when you manually set your own target version. If you set
-    it to a value higher than what Qt requires and supply your own \c Info.plist
-    file, you must add an \c LSMinimumSystemVersion entry to the \c Info.plist
-    that matches the value of \l{CMake: CMAKE_OSX_DEPLOYMENT_TARGET}
-    {CMAKE_OSX_DEPLOYMENT_TARGET} (when using CMake),
-    \l QMAKE_IOS_DEPLOYMENT_TARGET (when using qmake), or
-    \l{https://doc.qt.io/qbs/qml-qbsmodules-cpp.html#minimumIosVersion-prop}
-    {cpp.minimumIosVersion} (when using Qbs) because iOS (and the App Store)
-    will use the \c LSMinimumSystemVersion value as the authoritative one.
+    \sa {iOS}{How To: Develop for iOS}, {Developing for iOS}
+*/
 
-    If you specify a deployment target value lower than what Qt requires, your
-    application will almost certainly crash somewhere in the Qt libraries when
-    run on an older version than Qt supports. Therefore, make sure that the
-    actual build system code reflects the minimum iOS version that is actually
-    required.
+/*!
+    \page creator-how-to-test-on-ios-simulator.html
+    \previouspage creator-how-tos.html
 
-    For more information, see \l{Expressing Supported iOS Versions}.
+    \ingroup creator-how-to-ios
 
-    \section1 Testing on Simulator
+    \title Test on iOS Simulator
 
     If you do not have an iOS device or you do not want to create an account,
     you can test applications on
@@ -149,48 +165,19 @@
     simulates a predefined set of hardware devices and software versions.
 
     You can change the simulated hardware and software version in the run
-    settings for the project. Select \uicontrol Projects > \uicontrol Run, and then select
+    settings for the project. Go to \uicontrol Projects > \uicontrol Run, and then select
     the device to simulate in the \uicontrol {Device type} field.
 
     \image qtcreator-ios-simulator-deploy.png
 
-    The simulator is started automatically when you run the application.
-    To start the simulator manually, select \uicontrol Preferences >
-    \uicontrol Devices > \uicontrol iOS > \uicontrol Start.
-
-    To take screenshots of the simulator, select \uicontrol Preferences >
-    \uicontrol Devices > \uicontrol iOS > \uicontrol Screenshot. The screenshots
-    are stored in the directory specified in the
-    \uicontrol {Screenshot directory} field.
-
-    \section2 Managing Simulators
-
-    The available simulators are listed in \uicontrol Preferences >
-    \uicontrol Devices > \uicontrol iOS.
-
-    \image qtcreator-ios-preferences.png
-
-    To create a new simulator instance:
-
-    \list
-
-        \li Select \uicontrol Create.
-
-        \li In the \uicontrol {Device type} field, select the device type from
-            a list of devices supported by the Xcode version set as current on
-            your local machine.
-
-        \li In the \uicontrol {OS version} field, select an OS version from a
-            list of OS versions supported by the selected device and the current
-            Xcode version.
-
-    \endlist
-
-    To rename the selected simulator, select \uicontrol Rename.
-
-    To reset the contents and settings of the selected simulators, select
-    \uicontrol Reset.
+    The simulator starts automatically when you run the application.
+    To start the simulator manually, either start the Simulator application
+    directly with Spotlight, or go to \uicontrol Xcode > \uicontrol {Open Developer Tool}
+    in Xcode.
 
-    To delete the selected simulator, select \uicontrol Delete.
+    Manage the available simulator devices
+    \l{https://developer.apple.com/documentation/xcode/running-your-app-in-simulator-or-on-a-device/#Configure-the-list-of-simulated-devices}
+    {in Xcode}.
 
+    \sa {iOS}{How To: Develop for iOS}, {Developing for iOS}
 */
diff --git a/doc/qtcreator/src/linux-mobile/b2qtdev.qdoc b/doc/qtcreator/src/linux-mobile/b2qtdev.qdoc
index 3f7499b5b5..4453fe4e4d 100644
--- a/doc/qtcreator/src/linux-mobile/b2qtdev.qdoc
+++ b/doc/qtcreator/src/linux-mobile/b2qtdev.qdoc
@@ -47,8 +47,7 @@
     \note On Ubuntu Linux, the development user account must have access to the
     plugged-in devices. To grant them access to the device via USB, create a new
     \c udev rule, as described in
-    \l{https://doc.qt.io/Boot2Qt/b2qt-requirements-x11.html#setting-up-usb-access-to-embedded-devices}
-    {Boot2Qt: Setting Up USB Access to Embedded Devices}.
+    \l{Boot2Qt: Setting Up USB Access to Embedded Devices}.
 
     You can edit the settings later in \preferences >
     \uicontrol Devices > \uicontrol Devices.
@@ -61,15 +60,15 @@
     \section2 Protecting Connections
 
     You can protect the connections between \QC and a device by using an
-    \l{https://www.openssh.com/}{OpenSSH} connection. OpenSSH is a
+    \l{OpenSSH} connection. OpenSSH is a
     connectivity tool for remote login using the SSH protocol. The OpenSSH
     suite is not delivered with \QC, so you must download it and install it
     on the development PC. Then, you must configure the paths to the tools in
-    \QC. For more information, see \l {Configuring SSH Connections}.
+    \QC. For more information, see \l {Configure SSH connections}.
 
     You need either a password or an SSH public and private key pair for
     authentication. If you do not have an SSH key, you can use the \c ssh-keygen
-    tool to create it in \QC. For more information, see \l {Generating SSH Keys}.
+    tool to create it in \QC. For more information, see \l {Generate SSH keys}.
 
     \QC does not store passwords. If you use password authentication, you may
     need to enter the password upon every connection to the device, or if
@@ -149,4 +148,6 @@
             application files to the device. For more information, see
             \l{Boot2Qt Run Settings}.
     \endlist
+
+    \sa {Boot2Qt: Setting Up USB Access to Embedded Devices}
 */
diff --git a/doc/qtcreator/src/linux-mobile/creator-deployment-b2qt.qdoc b/doc/qtcreator/src/linux-mobile/creator-deployment-b2qt.qdoc
index 73301bb173..27ae99c3df 100644
--- a/doc/qtcreator/src/linux-mobile/creator-deployment-b2qt.qdoc
+++ b/doc/qtcreator/src/linux-mobile/creator-deployment-b2qt.qdoc
@@ -1,25 +1,30 @@
-// Copyright (C) 2022 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
     \page creator-deployment-b2qt.html
-    \previouspage creator-deploying-android.html
-    \nextpage creator-deployment-qnx.html
+    \previouspage creator-reference.html
 
-    \title Deploying to Boot2Qt
+    \ingroup creator-reference-deploy-configurations
 
-    You can specify settings for deploying applications to \l{Boot2Qt} devices
+    \title Boot2Qt Deploy Configuration
+
+    \brief Copy application files to Boot2Qt devices.
+
+    Specify settings for deploying applications to \l{Boot2Qt} devices
     in the project configuration file and in \uicontrol Projects >
     \uicontrol {Run Settings} > \uicontrol Deployment.
 
     \image qtcreator-boot2qt-deployment-steps.png "Boot2Qt deployment steps"
 
     The deployment process is described in more detail in
-    \l{Deploying to Remote Linux}.
+    \l{Remote Linux Deploy Configuration}.
 
     \section1 Launching Applications on Boot
 
-    In addition, to have your application launch on boot, select
+    To have your application launch on boot, select
     \uicontrol {Add Deploy Step} > \uicontrol {Change default application}
     > \uicontrol {Set this application to start by default}.
+
+    \sa {Build and Run}{How To: Build and Run}, {Boot2Qt Run Settings}
 */
diff --git a/doc/qtcreator/src/linux-mobile/creator-deployment-embedded-linux.qdoc b/doc/qtcreator/src/linux-mobile/creator-deployment-embedded-linux.qdoc
index 38c6823fa3..87c54e26fa 100644
--- a/doc/qtcreator/src/linux-mobile/creator-deployment-embedded-linux.qdoc
+++ b/doc/qtcreator/src/linux-mobile/creator-deployment-embedded-linux.qdoc
@@ -1,4 +1,4 @@
-// Copyright (C) 2022 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 // **********************************************************************
@@ -9,14 +9,18 @@
 
 /*!
     \page creator-deployment-embedded-linux.html
-    \previouspage creator-deployment-qnx.html
-    \nextpage creator-connecting-mobile.html
+    \previouspage creator-reference.html
 
-    \title Deploying to Remote Linux
+    \ingroup creator-reference-deploy-configurations
 
-    You can specify settings for deploying applications to generic remote
-    Linux devices in the project configuration file and in the
-    \uicontrol Projects mode, in \uicontrol {Run Settings}.
+    \title Remote Linux Deploy Configuration
+
+    \brief Copy application files to generic remote Linux devices or create a
+    tarball.
+
+    Specify settings for deploying applications to generic remote
+    Linux devices in the project configuration file and in \uicontrol Projects >
+    \uicontrol {Run Settings} > \uicontrol Deployment.
 
     \image qtcreator-embedded-linux-deployment-details.png "Deploy to remote Linux devices"
 
@@ -107,4 +111,7 @@
 
     The \uicontrol {Deploy tarball via SFTP upload} step specifies that \QC
     uploads the tarball to the device and extracts it.
+
+    \sa {Build and Run}{How To: Build and Run},
+    {Remote Linux}{How To: Develop for remote Linux}, {Remote Linux Run Settings}
 */
diff --git a/doc/qtcreator/src/linux-mobile/creator-embedded-platforms.qdoc b/doc/qtcreator/src/linux-mobile/creator-embedded-platforms.qdoc
index 39ff44f112..2c36fa3fe4 100644
--- a/doc/qtcreator/src/linux-mobile/creator-embedded-platforms.qdoc
+++ b/doc/qtcreator/src/linux-mobile/creator-embedded-platforms.qdoc
@@ -14,87 +14,40 @@
     You can develop applications for the following embedded platforms:
 
     \list
-        \li \l {Bare Metal}
+        \li Bare Metal
         \li \l {Boot2Qt}
-        \li \l {Remote Linux}
-        \li \l {Microcontroller Units (MCU)}
+        \li Remote Linux
+        \li Microcontrollers (MCU)
         \li \l QNX
     \endlist
 
-    You must install the tool chain for building applications for the targeted
+    You must install the toolchain for building applications for the targeted
     embedded platform on the development PC and use \QMT to
     install Qt libraries that are built for the platform. You can then add a
-    \l{glossary-buildandrun-kit}{kit} with the tool chain and the Qt version
+    \l{glossary-buildandrun-kit}{kit} with the toolchain and the Qt version
     for the device's architecture. When possible, \QMT creates
     suitable kits for you.
 
     You can connect embedded devices to the development PC to run, debug, and
     analyze applications built for them from \QC.
 
-    \section1 Bare Metal
-
-    You can run and debug applications on small devices that are not supported
-    by the remote Linux device plugin by using GDB or a hardware
-    debugger.
-
-    For more information about developing applications for Bare Metal devices,
-    see \l{Connecting Bare Metal Devices}.
-
     \section1 Boot2Qt
 
     The Boot2Qt stack runs on a variety of hardware. License holders can use
     tools to customize the contents of the stack and to take it into
     production hardware.
 
-    You need either Windows 10 64-bit or later or Ubuntu Linux 64-bit 20.04 LTS
-    or later to install and use Boot2Qt.
-
     The following topics have more information about developing applications
     for Boot2Qt devices:
 
     \list
-        \li \l{https://doc.qt.io/Boot2Qt/qtdc-supported-platforms.html}
-            {Boot2Qt: Supported Target Devices and Development Hosts}
-        \li \l{https://doc.qt.io/Boot2Qt/b2qt-installation-guides.html}
-            {Boot2Qt: Installation Guides}
+        \li \l{Boot2Qt: Documentation}
         \li \l{Connecting Boot2Qt Devices}
         \li \l{Boot2Qt Run Settings}
-        \li \l{Deploying to Boot2Qt}
+        \li \l{Boot2Qt Deploy Configuration}
         \li \l{Run in Qt Application Manager}
     \endlist
 
-    \section1 Remote Linux
-
-    You must have a tool chain for building applications for embedded Linux
-    devices installed on the development PC.
-
-    The following topics have more information about developing applications
-    for remote Linux devices:
-
-    \list
-        \li \l{Adding Docker Devices}
-        \li \l{Connecting Remote Linux Devices}
-        \li \l{Deploying to Remote Linux}
-        \li \l{Remote Linux Run Settings}
-        \li \l{Run on remote Linux devices}
-        \li \l{Run in Qt Application Manager}
-    \endlist
-
-    \section1 Microcontroller Units (MCU)
-
-    You need the GNU Arm Embedded GCC compiler, libraries, and other GNU tools
-    necessary for bare metal software development on devices based on the Arm
-    Cortex-M processors.
-
-    The following topics have more information about developing applications
-    for MCUs:
-
-    \list
-        \li \l{Connecting MCUs}
-        \li \l{Running Applications on MCUs}
-        \li \l{https://doc.qt.io/QtForMCUs/index.html}{\QMCU}
-    \endlist
-
     \section1 QNX
 
     The QNX Neutrino RTOS has more command-line tools
@@ -107,11 +60,12 @@
 
     \list
         \li \l{Connecting QNX Devices}
-        \li \l{Deploying to QNX Neutrino}
+        \li \l{QNX Neutrino Deploy Configuration}
         \li \l{QNX Run Settings}
         \li \l{Run on QNX devices}
         \li \l{Qt for QNX}
     \endlist
 
-    \sa {Supported Platforms}
+    \sa {Develop for Devices}{How To: Develop for Devices}, {Devices},
+    {Supported Platforms}
 */
diff --git a/doc/qtcreator/src/linux-mobile/creator-projects-how-to-run-generic-linux.qdoc b/doc/qtcreator/src/linux-mobile/creator-projects-how-to-run-generic-linux.qdoc
index b78dcd5ca2..d39f924f04 100644
--- a/doc/qtcreator/src/linux-mobile/creator-projects-how-to-run-generic-linux.qdoc
+++ b/doc/qtcreator/src/linux-mobile/creator-projects-how-to-run-generic-linux.qdoc
@@ -5,7 +5,7 @@
     \page creator-how-to-run-on-remote-linux.html
     \previouspage creator-how-tos.html
 
-    \ingroup creator-how-to-run
+    \ingroup creator-how-to-remote-linux
 
     \title Run on remote Linux devices
 
@@ -19,7 +19,7 @@
 
         \endlist
 
-    \QC uses the compiler from the kit (tool chain) to build the application.
+    \QC uses the compiler from the kit (toolchain) to build the application.
 
     \QC copies the application files to the connected device and runs the
     application. The application views are
@@ -34,6 +34,6 @@
     Debugging works transparently if GDB server is installed on the device and
     it is compatible with the GDB on the host.
 
-    \sa {Connecting Remote Linux Devices}, {Run on many platforms}, {Compilers},
+    \sa {Remote Linux}{How To: Develop for remote Linux}, {Run on many platforms}, {Compilers},
     {Embedded Platforms}, {kit-preferences}{Kits}
 */
diff --git a/doc/qtcreator/src/linux-mobile/creator-projects-settings-run-b2qt.qdoc b/doc/qtcreator/src/linux-mobile/creator-projects-settings-run-b2qt.qdoc
index 1391cfcfd4..72ba8dd3b5 100644
--- a/doc/qtcreator/src/linux-mobile/creator-projects-settings-run-b2qt.qdoc
+++ b/doc/qtcreator/src/linux-mobile/creator-projects-settings-run-b2qt.qdoc
@@ -26,5 +26,5 @@
     host and on the device.
 
     \sa {Activate kits for a project}, {Configure projects for running}, {kits-tab}{Kits},
-    {Deploying to Boot2Qt}
+    {Boot2Qt Deploy Configuration}
 */
diff --git a/doc/qtcreator/src/linux-mobile/creator-projects-settings-run-linux.qdoc b/doc/qtcreator/src/linux-mobile/creator-projects-settings-run-linux.qdoc
index 4e2a08e132..adc27d6a93 100644
--- a/doc/qtcreator/src/linux-mobile/creator-projects-settings-run-linux.qdoc
+++ b/doc/qtcreator/src/linux-mobile/creator-projects-settings-run-linux.qdoc
@@ -19,7 +19,7 @@
     connections from the development host to the device and add the device
     configurations to kits. Select \uicontrol {Manage Kits} to add devices
     to kits. For more information, see
-    \l {Connecting Remote Linux Devices}.
+    \l {Remote Linux}{How To: Develop for remote Linux}.
 
     When you run the application, \QC copies the files to the connected device.
 
@@ -38,5 +38,5 @@
     running X11 client on a local display.
 
     \sa {Activate kits for a project}, {Configure projects for running}, {kits-tab}{Kits},
-    {Connecting Remote Linux Devices}
+    {Remote Linux}{How To: Develop for remote Linux}
 */
diff --git a/doc/qtcreator/src/linux-mobile/linuxdev-keys.qdoc b/doc/qtcreator/src/linux-mobile/linuxdev-keys.qdoc
new file mode 100644
index 0000000000..3564f1d568
--- /dev/null
+++ b/doc/qtcreator/src/linux-mobile/linuxdev-keys.qdoc
@@ -0,0 +1,82 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
+
+/*!
+    \page creator-how-to-configure-ssh.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-remote-linux
+
+    \title Configure SSH connections
+
+    To protect the connections between \QC and a device, install the \l{OpenSSH}
+    suite, which includes the \c ssh, \c sftp, and \c ssh-keygen tools on the
+    computer.
+
+    SSH connections are established via an OpenSSH client running in master
+    mode, if possible. By default, multiple sessions are shared over a single SSH
+    onnection. Establishing a connection once and then re-using it for subsequent
+    run and deploy procedures reduces connection setup overhead particularly
+    with embedded devices. Because connection sharing is not supported on
+    Windows, a new SSH connection is created for each deploy or run procedure.
+
+    To set the paths to the directories where the tools are installed:
+
+    \list 1
+        \li Go to \preferences > \uicontrol Devices > \uicontrol SSH.
+            \image qtcreator-ssh-options.png "SSH preferences"
+        \li Clear \uicontrol {Enable connection sharing} to
+            create a new SSH connection for each deploy and run procedure. This
+            option is grayed on Windows, where connection sharing is not
+            supported.
+        \li In \uicontrol {Connection sharing timeout}, specify the
+            timeout for reusing the SSH connection in minutes.
+        \li In \uicontrol {Path to ssh executable}, enter the path
+            to the directory where the OpenSSH executable is installed.
+        \li In \uicontrol {Path to sftp executable}, enter the path
+            to the directory where the SFTP executable is installed.
+        \li In \uicontrol {Path to ssh-askpass executable}, enter the
+            path to the directory where the ssh-askpass executable is installed.
+            Usually, you can use the default path that points to the
+            implementation of the tool delivered with \QC, qtc-askpass.
+        \li In \uicontrol {Path to ssh-keygen executable}, enter the
+            path to the directory where the ssh-keygen executable is installed.
+    \endlist
+
+    \sa {Remote Linux}{How To: Develop for remote Linux},
+    {Developing for Remote Linux Devices}
+*/
+
+/*!
+    \page creator-how-to-generate-ssh-keys.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-remote-linux
+
+    \title Generate SSH Keys
+
+    To protect the connections between \QC and a device, use \l{OpenSSH}.
+
+    If you do not have an SSH public and private key pair, you can generate it
+    in \QC. The connection wizard can create the key pair for you, or you can
+    create it separately.
+
+    You can specify key length and the key algorithm, RSA or ECDSA.
+    If you only use the keys to protect connections to the emulator or
+    device, you can use the default values.
+
+    \list 1
+        \li Go to \preferences > \uicontrol Devices > \uicontrol Devices
+        \li Select \uicontrol {Create New}.
+            \image qtcreator-ssh-key-configuration.png {SSH Key Configuration dialog}
+        \li In \uicontrol {Private key file}, select the location to save
+            the private key.
+            \uicontrol {Public key file} displays the location to save the
+            corresponding public key.
+        \li Select \uicontrol {Generate And Save Key Pair} to generate and save the
+            keys at the specified locations.
+    \endlist
+
+    \sa {Remote Linux}{How To: Develop for remote Linux},
+    {Developing for remote Linux devices}
+*/
diff --git a/doc/qtcreator/src/linux-mobile/linuxdev-keys.qdocinc b/doc/qtcreator/src/linux-mobile/linuxdev-keys.qdocinc
deleted file mode 100644
index f3582f2373..0000000000
--- a/doc/qtcreator/src/linux-mobile/linuxdev-keys.qdocinc
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright (C) 2019 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
-
-/*!
-
-//! [configuring ssh]
-    \section2 Configuring SSH Connections
-
-    SSH connections are established via an OpenSSH client running in master
-    mode, if possible. Connection sharing is enabled by default to allow
-    sharing multiple sessions over a single SSH connection. This way, a
-    connection is only established once and then re-used by subsequent run
-    and deploy procedures, saving connection setup overhead particularly
-    with embedded devices. Because connection sharing is not supported on
-    Windows, a new SSH connection is created for each deploy or run procedure.
-
-    To create SSH connections, you must install the \l{https://www.openssh.com/}
-    {OpenSSH} suite, which includes the ssh, sftp, and ssh-keygen tools on the
-    development PC.
-
-    To tell \QC where it can find the tools, specify the paths to the
-    directories where the tools are installed in \preferences >
-    \uicontrol Devices > \uicontrol SSH:
-
-    \image qtcreator-ssh-options.png "SSH preferences"
-
-    \list
-        \li Deselect the \uicontrol {Enable connection sharing} check box to
-            create a new SSH connection for each deploy and run procedure. This
-            option is grayed on Windows, where connection sharing is not
-            supported.
-        \li In the \uicontrol {Connection sharing timeout} field, specify the
-            timeout for reusing the SSH connection in minutes.
-        \li In the \uicontrol {Path to ssh executable} field, enter the path
-            to the directory where the OpenSSH executable is installed.
-        \li In the \uicontrol {Path to sftp executable} field, enter the path
-            to the directory where the SFTP executable is installed.
-        \li In the \uicontrol {Path to ssh-askpass executable} field, enter the
-            path to the directory where the ssh-askpass executable is installed.
-            Usually, you can use the default path that points to the
-            implementation of the tool delivered with \QC, qtc-askpass.
-        \li In the \uicontrol {Path to ssh-keygen executable} field, enter the
-            path to the directory where the ssh-keygen executable is installed.
-    \endlist
-
-//! [configuring ssh]
-
-
-//! [generating ssh keys]
-
-    \section2 Generating SSH Keys
-
-    If you do not have an SSH public and private key pair, you can generate it
-    in \QC. The connection wizard can create the key pair for you, or you can
-    create it separately.
-
-    You can specify key length and the key algorithm, RSA or ECDSA.
-    If you only use the keys to protect connections to the emulator or
-    device, you can use the default values.
-
-    \list 1
-
-        \li Select \preferences > \uicontrol Devices
-            > \uicontrol Devices > \uicontrol {Create New}.
-
-            \image qtcreator-ssh-key-configuration.png "SSH Key Configuration dialog"
-
-        \li In the \uicontrol {Private key file} field, select the location to save
-            the private key.
-
-            The \uicontrol {Public key file} field displays the location to save the
-            corresponding public key.
-
-        \li Select \uicontrol {Generate And Save Key Pair} to generate and save the
-            keys at the specified locations.
-
-    \endlist
-
-//! [generating ssh keys]
-*/
diff --git a/doc/qtcreator/src/linux-mobile/linuxdev-processes.qdoc b/doc/qtcreator/src/linux-mobile/linuxdev-processes.qdoc
new file mode 100644
index 0000000000..db73410dca
--- /dev/null
+++ b/doc/qtcreator/src/linux-mobile/linuxdev-processes.qdoc
@@ -0,0 +1,26 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
+
+/*!
+    \page creator-how-to-manage-device-processes.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-remote-linux
+
+    \title Manage device processes
+
+    To view and end processes running on embedded platforms:
+
+    \list 1
+        \li Go to \preferences > \uicontrol Devices > \uicontrol Devices.
+        \li Select an embedded device.
+            \image qtcreator-preferences-devices-remote-linux.webp {Remote Linux Device in Devices}
+        \li Select \uicontrol {Show Running Processes}.
+        \li Filter the processes by name or ID.
+        \li To update the process list, select \uicontrol {Update List}.
+        \li To end a process, select it in the list, and then select
+            \uicontrol {Kill Process}.
+    \endlist
+
+    \sa {Develop for Devices}{How To: Develop for Devices}, {Devices}
+*/
diff --git a/doc/qtcreator/src/linux-mobile/linuxdev-processes.qdocinc b/doc/qtcreator/src/linux-mobile/linuxdev-processes.qdocinc
deleted file mode 100644
index 1c9c2d0a4a..0000000000
--- a/doc/qtcreator/src/linux-mobile/linuxdev-processes.qdocinc
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (C) 2019 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
-
-/*!
-//! [managing device processes]
-
-    \section2 Managing Device Processes
-
-    You can view processes running on devices and kill them. Select
-    \preferences > \uicontrol Devices >
-    \uicontrol Devices > \uicontrol {Show Running Processes}.
-
-    You can filter the processes by name or ID in the
-    \uicontrol {List of Processes} dialog.
-
-    To update the process list, select \uicontrol {Update List}.
-
-    To kill a process, select it in the list, and then select \uicontrol {Kill
-    Process}.
-
-//! [managing device processes]
-*/
diff --git a/doc/qtcreator/src/linux-mobile/linuxdev.qdoc b/doc/qtcreator/src/linux-mobile/linuxdev.qdoc
index 401fdbd8c1..417b061171 100644
--- a/doc/qtcreator/src/linux-mobile/linuxdev.qdoc
+++ b/doc/qtcreator/src/linux-mobile/linuxdev.qdoc
@@ -1,122 +1,87 @@
-// Copyright (C) 2021 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
     /*!
     \page creator-developing-generic-linux.html
-    \previouspage creator-developing-qnx.html
-    \nextpage creator-setup-webassembly.html
+    \previouspage creator-reference.html
 
-    \title Connecting Remote Linux Devices
+    \ingroup creator-reference-devices
 
-    You can connect generic Linux devices to the development PC to run,
+    \title Developing for Remote Linux Devices
+
+    \brief Connect generic Linux devices to the computer to run,
     debug, and analyze applications built for them from \QC.
 
-    If you have a tool chain for building applications for embedded Linux
-    devices installed on the development PC, you can add
-    it to \QC. You can then select a \l{glossary-buildandrun-kit}{kit}
+    If you have a toolchain for building applications for embedded Linux
+    devices installed on the computer, add it to a \l{Kits}{kit}
     with the device type \uicontrol {Remote Linux Device} to
     build applications for and run them on the devices.
 
-    To be able to run and debug applications on remote Linux devices,
-    you must add devices and select them in the \QC \l{glossary-buildandrun-kit}
-    {kit}.
+    Use a wizard to connect remote Linux devices to the computer. You can edit
+    the settings later in \preferences > \uicontrol Devices > \uicontrol Devices.
 
-    You use a wizard to create the connections. You can edit the settings later
-    in \preferences > \uicontrol Devices >
-    \uicontrol Devices.
+    \image qtcreator-preferences-devices-remote-linux.webp {Remote Linux Device in Devices}
 
-    \image qtcreator-preferences-devices-remote-linux.webp "Remote Linux Device in the Devices tab"
+    \section1 Protecting Device Connections
 
-    You can protect the connections between \QC and a device by using an
-    \l{https://www.openssh.com/}{OpenSSH} connection. OpenSSH is a
-    connectivity tool for remote login using the SSH protocol. The OpenSSH
-    suite is not delivered with \QC, so you must download it and install it
-    on the development PC. Then, you must configure the paths to the tools in
-    \QC. For more information, see \l {Configuring SSH Connections}.
+    To protect the connections between \QC and a device, use \l{OpenSSH} for
+    remote login over the SSH protocol. The OpenSSH suite is not delivered with
+    \QC, so download it and install it on the computer. Then, configure the paths
+    to the tools in \QC.
 
     You need either a password or an SSH public and private key pair for
-    authentication. If you do not have an SSH key, you can use the ssh-keygen
-    tool to create it in \QC. For more information, see \l {Generating SSH Keys}.
+    authentication. If you do not have an SSH key, use the \c ssh-keygen
+    tool to create it in \QC.
 
     \note \QC does not store passwords, so if you use password authentication,
     you may need to enter the password on every connection to the device,
     or, if caching is enabled, at every \QC restart.
 
-    To configure connections between \QC and a remote Linux device and to
-    specify build and run settings for the device:
-
-    \list 1
-
-        \li Make sure that your device can be reached via an IP address.
-
-        \li Select \preferences > \uicontrol Kits >
-            \uicontrol {Qt Versions} > \uicontrol Add to add the Qt version
-            for embedded Linux.
-
-        \li Select \preferences > \uicontrol Kits >
-            \uicontrol Compilers > \uicontrol Add to add the compiler for
-            building the applications.
+    \sa {Adding Docker Devices}, {Remote Linux}{How To: Develop for remote Linux},
+    {Run in Qt Application Manager}, {Remote Linux Deploy Configuration},
+    {Remote Linux Run Settings}
+*/
 
-        \li To deploy applications and run them remotely on devices, specify
-            parameters for accessing the devices:
+/*!
+    \page creator-how-to-connect-remote-linux.html
+    \previouspage creator-how-tos.html
 
-            \list a
+    \ingroup creator-how-to-remote-linux
 
-                \li Select \preferences >
-                    \uicontrol Devices > \uicontrol Devices > \uicontrol Add >
-                    \uicontrol {Remote Linux Device}
-                    > \uicontrol {Start Wizard}.
+    \title Connect remote Linux devices
 
-                    \image qtcreator-preferences-devices-remote-linux-connection.webp "Connection Data wizard"
+    Create connections between generic Linux devices and \QC to run, debug, and
+    analyze applications on them.
 
-                \li In \uicontrol {The name to identify this configuration},
-                    enter a name for the connection.
+    To configure connections between \QC and a remote Linux device:
 
-                \li In \uicontrol {The device's host name or IP address},
-                    enter the host name or IP address of the device.
-                    This value will be available in the variable \c %{Device:HostAddress}.
+    \list 1
 
-                \li In \uicontrol {The device's SSH port number}, enter the port
-                    number to use for SSH connections. This value will be
-                    available in the variable \c %{Device:SshPort}.
-                \li In \uicontrol {The username to log into the device},
-                    enter the username to log into the device and run the
-                    application as.
-                    This value will be available in the variable \c %{Device:UserName}.
+        \li Make sure that your device can be reached via an IP address.
 
-                \li Select \uicontrol {Next} to open the
-                    \uicontrol {Key Deployment} dialog.
+        \li Go to \preferences > \uicontrol Kits > \uicontrol {Qt Versions}.
 
-                    \image qtcreator-preferences-devices-remote-linux-key-deployment.webp "Key Deployment dialog"
+        \li Select \uicontrol Add to add the Qt version for embedded Linux.
 
-                \li In \uicontrol {Private key file}, select a private key file
-                    to use for authentication. This value will be available in
-                    the variable \c %{Device:PrivateKeyFile}.
+        \li Go to \preferences > \uicontrol Kits > \uicontrol Compilers.
 
-                \li If you do not have a public-private key pair, select
-                    \uicontrol {Create New Key Pair}. For more information,
-                    see \l{Generating SSH Keys}.
+        \li Select \uicontrol Add to add the compiler for building the
+            applications.
 
-                \li Select \uicontrol {Deploy Public Key} to copy the public
-                    key to the device.
+        \li Go to \preferences > \uicontrol Devices > \uicontrol Devices.
 
-                \li  Select \uicontrol {Next} to create the connection.
+        \li Select \uicontrol Add to add a remote Linux device.
 
-            \endlist
+        \li Go to \preferences > \uicontrol Kits.
 
-            All of these parameters can be edited later, as well as additional ones that the
-            wizard does not show because there are sensible default values.
+        \li Select \uicontrol Add to add a kit for building for the device.
 
-           To add a device without using the wizard, select
-           \uicontrol {Add Remote Linux Device} in the pull-down
-           menu of the \uicontrol Add button.
+        \li Select the Qt version, compiler, and device that you added above.
 
-        \li Select \preferences > \uicontrol Kits >
-            \uicontrol Add to add a kit for building for the device. Select the
-            Qt version, compiler, and device that you added above, and select
-            \uicontrol {Remote Linux Device} in \uicontrol {Run device type}.
+        \li In \uicontrol {Run device type}, select
+            \uicontrol {Remote Linux Device}.
 
-            To build on the remote device, select \uicontrol {Remote Linux Device}
+        \li To build on the remote device, select \uicontrol {Remote Linux Device}
             also in \uicontrol {Build device}.
 
         \li To specify build settings:
@@ -134,13 +99,85 @@
         \li Select \uicontrol Run to specify run settings. Usually, you can use
             the default settings.
 
-    When you run the project, \QC deploys the application as specified by the
-    deploy steps. By default, \QC copies the application files to the device.
-    For more information, see \l{Deploying to Remote Linux}.
+            When you run the project, \QC deploys the application as specified by
+            the deploy steps.
 
     \endlist
 
-    \include linux-mobile/linuxdev-keys.qdocinc configuring ssh
-    \include linux-mobile/linuxdev-keys.qdocinc generating ssh keys
-    \include linux-mobile/linuxdev-processes.qdocinc managing device processes
+    \sa {Remote Linux}{How To: Develop for remote Linux},
+    {Manage Kits}{How To: Manage Kits}, {Developing for Remote Linux Devices},
+    {Remote Linux Deploy Configuration}, {Remote Linux Run Settings}
+*/
+
+/*!
+    \page creator-how-to-add-remote-linux.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-remote-linux
+
+    \title Add remote Linux devices
+
+    Create connections between \QC and generic Linux devices to run, debug, and
+    analyze applications on them.
+
+    \section1 Use a wizard to add a device
+
+    To use a wizard to add a remote Linux device:
+
+     \list 1
+
+        \li Go to \preferences > \uicontrol Devices > \uicontrol Devices.
+
+        \li Select \uicontrol Add > \uicontrol {Remote Linux Device}
+            > \uicontrol {Start Wizard}.
+
+            \image qtcreator-preferences-devices-remote-linux-connection.webp {Connection Data wizard}
+
+         \li In \uicontrol {The name to identify this configuration},
+             enter a name for the connection.
+
+         \li In \uicontrol {The device's host name or IP address},
+             enter the host name or IP address of the device.
+             This value will be available in the variable \c %{Device:HostAddress}.
+
+         \li In \uicontrol {The device's SSH port number}, enter the port
+             number to use for SSH connections. This value will be
+             available in the variable \c %{Device:SshPort}.
+         \li In \uicontrol {The username to log into the device},
+             enter the username to log into the device and run the
+             application as.
+             This value will be available in the variable \c %{Device:UserName}.
+
+         \li Select \uicontrol {Next} to open the
+             \uicontrol {Key Deployment} dialog.
+
+             \image qtcreator-preferences-devices-remote-linux-key-deployment.webp "Key Deployment dialog"
+
+         \li In \uicontrol {Private key file}, select a private key file
+             to use for authentication. This value will be available in
+             the variable \c %{Device:PrivateKeyFile}.
+
+         \li If you do not have a public-private key pair, select
+             \uicontrol {Create New Key Pair}. For more information,
+             see \l{Generate SSH keys}.
+
+         \li Select \uicontrol {Deploy Public Key} to copy the public
+             key to the device.
+
+         \li  Select \uicontrol {Next} to create the connection.
+
+     \endlist
+
+    You can change the preferences later, as well as additional ones that the
+    wizard does not show because they have sensible default values.
+
+    \section1 Manually add a device
+
+    To add a device without using the wizard, select
+    \uicontrol {Add Remote Linux Device} in the pull-down
+    menu of the \uicontrol Add button.
+
+    \sa {Remote Linux}{How To: Develop for remote Linux},
+    {Developing for Remote Linux Devices},
+    {Remote Linux Deploy Configuration}
 */
diff --git a/doc/qtcreator/src/mcu/creator-mcu-dev.qdoc b/doc/qtcreator/src/mcu/creator-mcu-dev.qdoc
index 65fba314e2..19ba26bdca 100644
--- a/doc/qtcreator/src/mcu/creator-mcu-dev.qdoc
+++ b/doc/qtcreator/src/mcu/creator-mcu-dev.qdoc
@@ -1,31 +1,29 @@
-// Copyright (C) 2020 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \previouspage creator-developing-ios.html
     \page creator-developing-mcu.html
-    \nextpage creator-developing-qnx.html
+    \previouspage creator-reference.html
 
-    \title Connecting MCUs
+    \ingroup creator-reference-devices
 
-    \QMCU enables you to use subsets of QML and Qt Quick Controls
-    to create user interfaces for devices that are powered by microcontroller
-    units (MCU). It includes a new graphics rendering engine that has a low
-    memory footprint and is optimized for MCUs and other resource-constrained
-    devices.
+    \title Developing for MCUs
 
-    You can connect MCU boards to a development host to build applications for
-    them using the GNU Arm Embedded GCC compiler, libraries, and other GNU tools
-    necessary for bare metal software development on devices based on the Arm
-    Cortex-M processors. You can deploy the applications on MCUs to run and
-    debug them using \QC.
+    \brief Connect MCU devices to the computer to run and debug applications on
+    them.
 
-    The toolchains are available for cross-compilation on Microsoft Windows,
-    Linux, and macOS. However, the Qt for \QMCU SDK is currently only available
-    for Windows and Linux.
+    \note Enable the McuSupport plugin to develop for MCUs.
 
-    For a list of \QMCU reference implementations, see the
-    \l{\QMCU - Supported Target Platforms}{\QMCU} documentation.
+    Use subsets of QML and Qt Quick Controls to create user interfaces for
+    devices that are powered by microcontroller units (MCU). \QMCU has a
+    new graphics rendering engine with a low memory footprint and optimization
+    for MCUs and other resource-constrained devices.
+
+    Connect MCU boards to a computer to build applications for them. Deploy the
+    applications on MCUs to run and debug them.
+
+    For a list of \QMCU reference implementations, see
+    \l{\QMCU - Supported Target Platforms}.
 
     \section1 Requirements
 
@@ -33,52 +31,98 @@
 
     \list
         \li \QMCU SDK (only available for Windows and Linux)
-        \li \l{https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm}
-            {GNU ARM Embedded Toolchain}
+        \li \l {\QMCU - Prerequisites}{Suitable toolchain}
     \endlist
 
+    The toolchains are available for cross-compilation on Microsoft Windows,
+    Linux, and macOS. However, the Qt for \QMCU SDK is currently only available
+    for Windows and Linux.
+
     The hardware-specific requirements vary depending on the hardware platform you are developing for.
     For more information see:
     \list
         \li \l{Getting Started on NXP}
         \li \l{Getting Started on STM}
         \li \l{Getting Started on Renesas}
+        \li \l{Getting Started on Infineon}
      \endlist
 
-    \section1 Setting Up the Development Environment
+    \section1 \QMCU SDKs
+
+    While you can use the latest \QC version to develop with any \QMCU SDK, the
+    following combinations have been tested to work well.
+
+    \table
+    \header
+        \li \QC version
+        \li \QMCU SDK version
+    \row
+        \li 12.0.2 or later
+        \li 2.7 or later
+    \row
+        \li 11.0.3
+        \li 2.6
+    \row
+        \li 10.0.2
+        \li 2.5
+    \row
+        \li 10.0.0
+        \li 2.4
+    \row
+        \li 9.0.0
+        \li 2.3
+    \row
+        \li 7.0.0 up to 8.0.2
+        \li 2.0 up to 2.2
+    \row
+        \li 6.0.x
+        \li 1.3 up to 2.2
+    \row
+        \li 4.12.4 up to 5.0.3
+        \li 1.3 up to 1.9
+    \row
+        \li 4.12.2 or 4.12.3
+        \li 1.2
+    \row
+        \li 4.12.0 or 4.12.1
+        \li 1.1
+    \row
+        \li 4.11.x
+        \li 1.0
+    \endtable
 
-    You must download and install the required software and create connections
-    between \QC and MCUs. The following subsections guide you through the
-    setup process.
+    \sa {Enable and disable plugins}, {MCUs}{How To: Develop for MCUs},
+    {Developing for MCUs}, {\QMCU}
+*/
 
-    \section2 MCU Plugin
+/*!
+    \page creator-how-to-create-mcu-kits.html
+    \previouspage creator-how-tos.html
 
-    To be able to develop applications for MCUs, you need the MCU plugin.
-    This plugin is enabled automatically by \QOI when you
-    install \QMCU.
+    \ingroup creator-how-to-mcu
 
-    \section2 Specifying MCU Settings
+    \title Connect MCU devices
 
-    To configure a connection between \QC and your MCU board, select
-    \preferences > \uicontrol Devices > \uicontrol MCU:
+    \note Enable the McuSupport plugin to develop for MCUs.
 
-    \image qtcreator-mcu-options.png "MCU preferences"
+    To configure a connection between \QC and your MCU board:
 
     \list 1
-        \li In the \uicontrol {\QMCU SDK} field, specify the path
-            to the directory where you installed \QMCU SDK.
-        \li In the \uicontrol {Targets supported by the \QMCU SDK}
-            field, select your MCU board.
-        \li In the \uicontrol Requirements section, ensure that the
-            platform-specific requirements are met. This varies depending
-            on the target chosen:
+        \li Go to \preferences > \uicontrol Devices > \uicontrol MCU.
+        \li In \uicontrol {\QMCU SDK}, specify the path to the directory where
+            you installed \QMCU SDK.
+            \image qtcreator-preferences-mcu.webp {MCU preferences}
+        \li In \uicontrol {Targets supported by the \QMCU SDK}, select your MCU
+            board.
+        \li In \uicontrol Requirements, check that the platform-specific
+            requirements are met. This depends on the target:
             \list
                 \li For STM32 targets:
                     \list
                         \li The \uicontrol {GNU ARM Embedded Toolchain} or
                             \uicontrol {IAR ARM Compiler} path.
                         \li The \uicontrol {STM32CubeProgrammer} install path.
-                        \li The \uicontrol {MCU SDK} for the chosen target.
+                        \li The \uicontrol {Board SDK} for the chosen target.
                         \li The \uicontrol {FreeRTOS Sources} for the chosen target.
                     \endlist
                  \li For NXP targets:
@@ -86,7 +130,7 @@
                         \li The \uicontrol {GNU ARM Embedded Toolchain} or
                             \uicontrol {IAR ARM Compiler} path.
                         \li The \uicontrol {MCUXpresso IDE} install path.
-                        \li The \uicontrol {MCU SDK} for the chosen target.
+                        \li The \uicontrol {Board SDK} for the chosen target.
                         \li The \uicontrol {FreeRTOS Sources} for the chosen target.
                     \endlist
                  \li For Renesas targets:
@@ -94,74 +138,103 @@
                         \li The \uicontrol {Green Hills Compiler} path.
                         \li The \uicontrol {Renesas Graphics Library} path.
                     \endlist
+                 \li For Infineon targets:
+                    \list
+                        \li The \uicontrol {Green Hills Compiler for ARM} path.
+                        \li The \uicontrol {Graphics Driver for Traveo II Cluster Series}
+                            path.
+                        \li The \uicontrol {Infineon Auto Flash Utility} path.
+                    \endlist
             \endlist
-        \li Select the
+        \li Select
             \uicontrol {Automatically create kits for all available targets on start}
-            option to create kits automatically the next time Qt Creator is
-            started.
-            \note You could also use \uicontrol {Create Kit} to manually
-            create kits for the chosen target.
-        \li Select \uicontrol Apply to save the settings.
+            to create kits automatically the next time \QC starts.
+            \note Select \uicontrol {Create Kit} to manually create kits for the
+            target.
+        \li Select \uicontrol Apply to save the preferences.
     \endlist
 
-    \note When updating to other versions of the \QMCU SDK, \QC will
-    ask you if you want to replace the existing kits, or create new ones
-    alongside. This can also be done manually, for each individual target,
-    via \uicontrol {Update Kit} and \uicontrol {Create Kit}, respectively.
-
-    \section2 Adding MCU Devices
-
-    \note This optional step is not necessary if you have already
-    set up the MCU SDK as outlined in \l{Specifying MCU Settings}.
+    \section1 Add MCU devices
 
     \QC automatically adds a default MCU device when you select
     \uicontrol Apply in the \uicontrol MCU tab after configuring the
-    MCU tool chain.
+    MCU toolchain.
 
-    \image qtcreator-mcu-device.png "MCU devices"
+    \image qtcreator-mcu-device.png {MCU devices}
 
     To add MCU devices, select \preferences > \uicontrol Devices > \uicontrol Add
     > \uicontrol {MCU Device} > \uicontrol {Start Wizard}:
 
        \list 1
-           \li In the \uicontrol Name field, give the device a name.
-           \li In the \uicontrol Type field, select the board type.
+           \li In \uicontrol Name, give the device a name.
+           \li In \uicontrol Type, select the board type.
            \li Select \uicontrol Apply to add the device.
        \endlist
 
-    \section2 Managing MCU Kits
+    \sa {Enable and disable plugins}, {MCUs}{How To: Develop for MCUs},
+    {Developing for MCUs}
+*/
+
+
+/*!
+    \page creator-how-to-manage-mcu-kits.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-mcu
 
-    \QC automatically adds kits for all the available targets, if the
+    \title Manage MCU Kits
+
+    \note Enable the McuSupport plugin to develop for MCUs.
+
+    \QC automatically adds kits for all the available MCU targets if you select
     \uicontrol {Automatically create kits for all available targets on start}
-    option is enabled under the \uicontrol MCU settings tab. You can also
-    create kits for individual targets manually, as outlined
-    in \l{Specifying MCU Settings}.
+    in \preferences > \uicontrol Devices > \uicontrol MCU.
+
+    \image qtcreator-preferences-kits-mcu.webp {MCU kit}
 
-    \image qtcreator-mcu-kit.png "MCU kits"
+    \note When you update the \QMCU SDK, \QC asks you whether you want to replace
+    the existing kits or create additional kits. To do this manually for each
+    target, select \uicontrol {Update Kit} or \uicontrol {Create Kit}.
 
-    You can edit and/or remove individual kits in \preferences > \uicontrol Kits.
+    To add new kits, go to \preferences > \uicontrol Devices > \uicontrol MCU,
+    and select \uicontrol {Create Kit}. This adds the paths to the kit's toolkits
+    and SDKs, and keeps them synchronized when you select \uicontrol Apply or
+    \uicontrol OK.
 
-    However, for adding new kits you should use the \uicontrol {Create Kit}
-    button in the {\QMCU} settings tab. This method adds the paths to
-    the kit's toolkits and SDKs, and keeps them synchronized when selecting
-    \uicontrol Apply or \uicontrol OK.
+    \section1 Change or remove MCU kits
+
+    To change or remove individual kits, go to \preferences > \uicontrol Kits.
 
     The \uicontrol {MCU dependencies} field displays paths to 3rd party
     software required for MCU development with the current kit.
 
-    \section1 Running Applications on MCUs
+    \sa {Enable and disable plugins}, {MCUs}{How To: Develop for MCUs},
+    {Developing for MCUs}
+*/
+
+/*!
+    \page creator-how-to-run-on-mcu-devices.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-mcu
 
-    You can use a wizard to set up a project for developing an application that
-    you can run on MCUs. The project uses a subset of QML and Qt Quick Controls
+    \title Create MCU projects
+
+    \note Enable the McuSupport plugin to develop for MCUs.
+
+    Create a project for developing an application that you can run on MCUs.
+    The project imports a subset of QML and Qt Quick Controls types
     that are supported by \QMCU. For more information about developing
-    applications for MCUs, see the \QMCU documentation.
+    applications for MCUs, see \l {Qt for MCUs}.
 
     To create an application and run it on a MCU board:
 
     \list 1
-        \li Select \uicontrol File > \uicontrol {New Project} >
-            \uicontrol {Application (\QMCU)} >
-            \uicontrol {MCU Support Application} > \uicontrol Choose.
+        \li Go to \uicontrol File > \uicontrol {New Project}.
+            \image qtcreator-mcu-new-project.webp {New Project dialog}
+        \li Select \uicontrol {QmlProject Application (\QMCU)} >
+            \uicontrol {Qt for MCUs Empty Application} or
+            \uicontrol {Qt for MCUs Example Application} > \uicontrol Choose.
         \li Follow the instructions of the wizard to create the project.
         \li Select \uicontrol Projects > \uicontrol {Build & Run}, and then
             select the kit for building the application and running it on the
@@ -170,37 +243,7 @@
             Usually, you can use the default settings.
     \endlist
 
-    \section1 Supported \QMCU SDKs
-
-    \note The \QMCU SDK 2.3 requires \QC 9.0.0, or later.
-
-    The following table lists the \QC versions you can use to develop
-    applications with particular \QMCU SDK versions.
-
-    \table
-    \header
-        \li \QC version
-        \li \QMCU SDK version
-    \row
-        \li 9.0.0 or later
-        \li 2.0 or later
-    \row
-        \li 7.0.0 up to 8.0.2
-        \li 2.0 up to 2.2
-    \row
-        \li 6.0.x
-        \li 1.3 up to 2.2
-    \row
-        \li 4.12.4 up to 5.0.3
-        \li 1.3 up to 1.9
-    \row
-        \li 4.12.2 or 4.12.3
-        \li 1.2
-    \row
-        \li 4.12.0 or 4.12.1
-        \li 1.1
-    \row
-        \li 4.11.x
-        \li 1.0
-    \endtable
+    \sa {Configure projects for running}, {Enable and disable plugins},
+    {MCUs}{How To: Develop for MCUs}, {Use project wizards},
+    {Developing for MCUs}
 */
diff --git a/doc/qtcreator/src/overview/creator-only/creator-deployment-overview.qdoc b/doc/qtcreator/src/overview/creator-only/creator-deployment-overview.qdoc
deleted file mode 100644
index 000017249a..0000000000
--- a/doc/qtcreator/src/overview/creator-only/creator-deployment-overview.qdoc
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (C) 2020 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
-
-// **********************************************************************
-// NOTE: the sections are not ordered by their logical order to avoid
-// reshuffling the file each time the index order changes (i.e., often).
-// Run the fixnavi.pl script to adjust the links to the index order.
-// **********************************************************************
-
-/*!
-    \previouspage creator-running-targets.html
-    \page creator-deployment.html
-    \nextpage creator-deploying-android.html
-
-    \title Deploying to Devices
-
-    Deploy configurations in the \uicontrol Projects mode
-    \uicontrol {Run Settings} handle the packaging of the application as an
-    executable and copying it to a location you want to run the executable at.
-    The files can be copied to a location in the file system of the development
-    PC or a \l{glossary-device}{device}.
-
-    \list
-
-        \li \l{Deploying to Android}
-
-            When you deploy the application to an Android device, \QC copies
-            the application files to the device. In addition, you can determine
-            the Qt libraries to use.
-
-        \li \l {Deploying to Boot2Qt}
-
-            When you deploy the application to a Boot2Qt device, \QC copies
-            the application files to the connected device. You can then test
-            and debug the application on the device with \QC.
-
-        \li  \l{Deploying to QNX Neutrino}
-
-            When you deploy the application to a QNX Neutrino device, \QC copies
-            the application files to the connected device. You can then test and
-            debug the application on the device with \QC.
-
-        \li \l{Deploying to Remote Linux}
-
-            When you deploy the application to a generic Linux-based device, \QC
-            copies the application files to the connected device. You can then
-            test and debug the application on the device with \QC.
-    \endlist
-*/
diff --git a/doc/qtcreator/src/overview/creator-only/creator-glossary.qdoc b/doc/qtcreator/src/overview/creator-only/creator-glossary.qdoc
index ac5e1cae6b..2cbac901aa 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-glossary.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-glossary.qdoc
@@ -77,7 +77,7 @@
             \li \QC groups build and run specific settings as kits to make
                 cross-platform development easier. Each kit consists of a set
                 of values that define one environment, such as a \e {device},
-                tool chain, Qt version, and debugger command to use. Configure kits at
+                toolchain, Qt version, and debugger command to use. Configure kits at
                 \preferences > \uicontrol Kits.
 
         \row
diff --git a/doc/qtcreator/src/overview/creator-only/creator-mobile-platforms.qdoc b/doc/qtcreator/src/overview/creator-only/creator-mobile-platforms.qdoc
deleted file mode 100644
index fef448c3f1..0000000000
--- a/doc/qtcreator/src/overview/creator-only/creator-mobile-platforms.qdoc
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright (C) 2022 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
-
-/*!
-    \page creator-mobile-platforms.html
-    \previouspage creator-reference.html
-
-    \ingroup creator-reference-platforms
-
-    \title Mobile Platforms
-
-    \brief Mobile platforms that you can develop applications for.
-
-    You can develop applications for the following mobile platforms:
-
-    \list
-        \li \l Android
-        \li \l iOS
-    \endlist
-
-    You must install the tool chain for building applications for the targeted
-    mobile platform on the development PC and use \QMT to
-    install Qt libraries that are built for the platform. You can then add a
-    \l{glossary-buildandrun-kit}{kit} with the tool chain and the Qt version
-    for the device's architecture. When possible, \QMT creates
-    suitable kits for you.
-
-    You can connect mobile devices to the development PC and select the
-    appropriate kit to build, run, debug, and analyze applications from \QC.
-
-    Before starting application development, analyze and define the requirements,
-    scope, and functionality of the application to ensure efficient functionality
-    and a smooth user experience on mobile devices.
-
-    \section1 Android
-
-    Starting from Qt 5.14.0, the Qt for Android package has all the
-    architectures (ABIs) installed as one. You can let \QC automatically
-    create kits for installed Qt version and tool chains.
-
-    The following topics have more information about developing applications
-    for Android devices:
-
-    \list
-        \li \l{Connecting Android Devices}
-        \li \l{Deploying to Android}
-        \li \l{Run on many platforms}
-        \li \l{Creating a Mobile Application}
-        \li \l{Debugging on Android Devices}
-        \li \l{Qt for Android}
-    \endlist
-
-    \section1 iOS
-
-    \note Deployment, running, and debugging on iOS 17 devices are not supported.
-
-    To be able to use \QC on \macos, you must install Xcode, and therefore
-    you should already have the tool chain for building applications for
-    iOS. \QC automatically detects the tool chain and creates the necessary
-    kits to build applications for and run them on configured iOS devices.
-
-    The following topics have more information about developing applications
-    for iOS devices:
-
-    \list
-        \li \l{Connecting iOS Devices}
-        \li \l{Run on many platforms}
-        \li \l{Creating a Mobile Application}
-        \li \l{Qt for iOS}
-    \endlist
-
-    \sa {Optimizing Applications for Mobile Devices}, {Supported Platforms}
-*/
diff --git a/doc/qtcreator/src/overview/creator-only/creator-mobile-targets.qdoc b/doc/qtcreator/src/overview/creator-only/creator-mobile-targets.qdoc
index fc33900659..fe4f688ab5 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-mobile-targets.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-mobile-targets.qdoc
@@ -29,18 +29,12 @@
 
     \list
 
-        \li \l{Connecting Android Devices}
+        \li \l{Developing for Android}
 
-            Qt applications for Android are compiled as \c {shared objects} that
-            are loaded by a Java launcher that is part of Qt.
-            This is totally transparent to users. As Qt is composed of libraries
-            referencing each other, Qt 5 applications are only supported on
-            Android version 4.1 (API level 16), or later, and Qt 6 applications
-            on Android version 6.0 (API level 23), or later. You must install a
-            Qt version targeting Android and the Android SDK and NDK to develop
-            for Android devices.
+            Connect Android devices to the computer to develop Qt applications
+            for them.
 
-        \li \l{Connecting Bare Metal Devices}
+        \li \l{Developing for Bare Metal Devices}
 
             You can connect bare metal devices to the development PC and use \QC
             to debug applications on them with GDB or a hardware debugger.
@@ -55,13 +49,13 @@
             Create Docker devices from Docker images and use them to build, run,
             and debug applications from \QC.
 
-        \li \l{Connecting iOS Devices}
+        \li \l{Developing for iOS}
 
             You use the tools delivered with Xcode to connect devices to \QC.
             \QC detects the tools and configured devices automatically and uses
             the tools to build, deploy, and run applications.
 
-        \li \l{Connecting MCUs}
+        \li \l{Developing for MCUs}
 
             You can connect MCU boards to a development host to deploy, run, and
             debug applications on them from \QC.
@@ -73,9 +67,9 @@
             supported for QNX Neutrino devices, and requires the QNX SDK to be
             installed on the development PC.
 
-        \li \l{Connecting Remote Linux Devices}
+        \li \l{Developing for Remote Linux Devices}
 
-            If you have a tool chain for building applications for embedded
+            If you have a toolchain for building applications for embedded
             Linux devices installed on the development
             PC, you can add it and the device to \QC.
 
diff --git a/doc/qtcreator/src/overview/creator-only/creator-overview.qdoc b/doc/qtcreator/src/overview/creator-only/creator-overview.qdoc
index b164224e84..a77af77c71 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-overview.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-overview.qdoc
@@ -94,6 +94,11 @@
             Load C++ plugins for QML to simulate data.
     \endlist
 
+    Use the QML live preview to preview a QML file or an entire Qt Quick
+    application on the desktop, as well as on Android and embedded Linux
+    devices. The changes you make to the UI are instantly visible to you
+    in the preview.
+
     If you need a traditional user interface that has a clear structure and
     enforces a platform look and feel, use \l{Qt Widgets} and the integrated
     \l{\QD}.
@@ -186,35 +191,66 @@
     build the project.
 
     Build applications for, deploy them to, and run them on the desktop
-    environment or a device. With kits, as well as build, run, and deployment
+    environment or a device. With kits, as well as build, deploy, and run
     configurations, you can quickly switch between different setups and
     target platforms.
 
     For more information, see \l{Build and Run}{How To: Build and Run},
     \l{Build Systems}, \l{Build Configurations}, and \l{Run Configurations}.
 
-    \section2 On Devices
+    \section1 Embedded Platforms
+
+    You can develop applications for the following embedded platforms:
+
+    \list
+        \li \l {Developing for Bare Metal Devices}{Bare Metal}
+        \li \l {Boot2Qt}
+        \li \l {Remote Linux}
+        \li \l {Developing for MCUs}{Microcontrollers (MCU)}
+        \li \l {Connecting QNX Devices}{QNX}
+    \endlist
 
-    When you install tool chains for device types as part of a Qt distribution,
-    the build and run configurations for the devices might be set up
-    automatically. However, you might need to install and configure some
-    additional software on the devices to be able to connect to them
-    from the computer.
+    Install the toolchain for building applications for the targeted
+    embedded platform on the computer, and then use \QOI to install Qt
+    libraries that are built for the platform. Add a kit with the toolchain and
+    the Qt version for the device's architecture. When possible, \QOI creates
+    suitable kits for you.
 
-    Deployment configurations handle the packaging and copying of the necessary
+    You can connect embedded devices to the computer and select the appropriate
+    kit to run, debug, and analyze applications built for them from \QC.
+
+    \e {Deploy configurations} handle the packaging and copying of the necessary
     files to a location you want to run the executable at, such as the file
     system of a device.
 
-    For more information, see \l{Connecting Devices} and \l{Deploying to Devices}.
+    For more information, see \l{Develop for Devices}{How To: Develop for Devices}
+    and \l{Devices}.
 
-    \section2 Previewing QML
+    \section2 Mobile Platforms
 
-    Use the QML live preview to preview a QML file or an entire Qt Quick
-    application on the desktop, as well as on Android and embedded Linux
-    devices. The changes you make to the UI are instantly visible to you
-    in the preview.
+    You can develop applications for the following mobile platforms:
 
-    For more information, see \l{Validating with Target Hardware}.
+    \list
+        \li \l Android
+        \li \l iOS
+    \endlist
+
+    Install the toolchain for building applications for the targeted mobile
+    platform on the computer, and then use \QOI to install Qt libraries that are
+    built for the platform. Add a kit with the toolchain and the Qt version for
+    the device's architecture. When possible, \QOI creates suitable kits for you.
+
+    You can connect mobile devices to the computer and select the
+    appropriate kit to build, run, debug, and analyze applications from \QC.
+
+    Before starting application development, analyze and define the requirements,
+    scope, and functionality of the application to ensure efficient functionality
+    and a smooth user experience on mobile devices.
+
+    For more information, see
+    \l{Develop for Devices}{How To: Develop for Devices},
+    \l{Optimizing Applications for Mobile Devices}, \l {Supported Platforms}, and
+    \l{Deploy Configurations}.
 
     \section1 Debugging Applications
 
@@ -230,7 +266,7 @@
             to find the next one.
     \endlist
 
-    \QC integrates several external native debuggers for inspecting the state of
+    \QC integrates several native debuggers for inspecting the state of
     your application while debugging. The debugger plugin automatically selects
     a suitable native debugger for each kit from the ones it finds on the
     computer. Edit the kits to override this choice.
@@ -242,20 +278,20 @@
 
     Connect devices to your computer to debug processes running on the devices.
 
-    For more information, see \l{Debugging}.
+    For more information, see \l{Debugging} and \l{Debug}{How To: Debug}.
 
-    \section1 Analyzing Source Code
+    \section1 Finding Issues in Source Code
 
     Devices have limited memory and CPU power, so you should use them carefully.
     \QC integrates code analysis tools for detecting memory leaks, profiling
     function execution, analyzing CPU use, and eliminating unnecessary complexity
     of code. Other tools provide code coverage and visualize trace events.
 
-    Install and configure the tools on your system to use them from \QC.
-    However, the QML Profiler is installed as part of \QC for profiling
-    Qt Quick applications.
+    Some tools, such as QML Profiler and Clang Tools, are installed with
+    \QC. Install and configure the other supported tools on the computer to use
+    them from \QC.
 
-    For more information, see \l{Analyzing Code}.
+    For more information, see \l{Analyzing Code} and \l{Analyze}{How To: Analyze}.
 
     \section1 Running Tests
 
@@ -287,10 +323,32 @@
 
     \image qtcreator-autotests.png
 
-    Map AUTs (Application Under Test) to \QC and run Squish test suites
-    and cases from it.
+    \section2 Using Squish
+
+    \brief The experimental Squish plugin integrates Squish into \QC.
+
+    \l{https://www.qt.io/product/quality-assurance/squish}{Squish} is an
+    automated GUI testing framework for testing Android, iOS, Java, \macos,
+    Qt, Tk, Windows, and XView applications, as well as HTML-based web
+    applications running in browsers.
+
+    In \QC, you can:
+
+    \list
+        \li Open existing Squish test suites.
+        \li Create new test suites and test cases.
+        \li Record test cases (in a very limited way compared to what you can do
+            inside the Squish IDE).
+        \li Use Squish Runner and Server to run test suites or cases and view
+            the results in the \uicontrol Squish \l{View output}{output}.
+        \li Set breakpoints before running tests to stop at certain locations and
+            inspect the local variables, similarly to when debugging a test.
+    \endlist
+
+    To use the plugin, you must download and install Squish, create a connection
+    to the Squish Server, and specify the application under test (AUT) to run.
 
-    For more information, see \l{Test}{How To: Test} and \l{Using Squish}.
+    For more information, see \l{Test}{How To: Test}.
 
     \section1 Publishing Applications
 
diff --git a/doc/qtcreator/src/overview/creator-only/creator-reference.qdoc b/doc/qtcreator/src/overview/creator-only/creator-reference.qdoc
index 45432f561b..7415815ff0 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-reference.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-reference.qdoc
@@ -19,6 +19,20 @@
 
     \annotatedlist creator-reference-analyzer
 
+    \section1 Debuggers
+
+    Set up and use native debuggers to debug executable binary files, as well as
+    QML, Java, and Python source code.
+
+    \annotatedlist creator-reference-debugger
+
+    \section2 Debugger Views
+
+    Inspect the state of your application while debugging in the
+    \uicontrol Debug mode.
+
+    \annotatedlist creator-reference-debugger-views
+
     \section1 Build Systems
 
     When you create projects, you can choose the build system to use for
@@ -28,7 +42,7 @@
 
     \annotatedlist creator-reference-build-systems
 
-    \section1 Build Configurations
+    \section2 Build Configurations
 
     Build configurations have everything you need to compile the sources into
     binaries. Build configurations use the tools and settings defined in their
@@ -36,6 +50,35 @@
 
     \annotatedlist creator-reference-build-configurations
 
+    \section1 Devices
+
+    Connect devices to the computer to run, debug, and analyze applications
+    built for them from \QC. When you install Qt for a target platform, such
+    as Android or QNX, the build and run configurations for the development
+    targets might be set up automatically in \QC.
+
+    \annotatedlist creator-reference-devices
+
+    \section2 Deploy Configurations
+
+    Deploy configurations handle the packaging of the application as an
+    executable and copying it to a location you want to run the executable at.
+    The files can be copied to a location in the file system of the computer
+    or a device.
+
+    \annotatedlist creator-reference-deploy-configurations
+
+    \section2 Run Configurations
+
+    Run configurations start the application in the location where the
+    deploy configuration copied it. By default, when you select
+    \uicontrol Run, \QC builds the project, deploys it to the device
+    defined in the kit, and runs it there. If you did not make changes
+    to the project since you last built and deployed it, \QC simply runs
+    it again.
+
+    \annotatedlist creator-reference-run-configurations
+
     \section1 Editors
 
     When you open files, \QC chooses a suitable editor according to the file
@@ -69,6 +112,10 @@
 
     \annotatedlist creator-reference-preferences-cpp
 
+    \section2 Debugger
+
+    \annotatedlist creator-reference-preferences-debugger
+
     \section2 Kits
 
     Preferences for build and run kits.
@@ -81,17 +128,6 @@
 
     \annotatedlist creator-reference-preferences-text-editor
 
-    \section1 Run Configurations
-
-    Run configurations start the application in the location where the
-    \e {deploy configuration} copied it. By default, when you select
-    \uicontrol Run, \QC builds the project, deploys it to the device
-    defined in the kit, and runs it there. If you did not make changes
-    to the project since you last built and deployed it, \QC simply runs
-    it again.
-
-    \annotatedlist creator-reference-run-configurations
-
     \section1 UI Design
 
     You can use a visual editor, \QD, for designing widget-based UIs
diff --git a/doc/qtcreator/src/overview/creator-only/creator-supported-platforms.qdoc b/doc/qtcreator/src/overview/creator-only/creator-supported-platforms.qdoc
index 9481519eb7..e75a5d0cef 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-supported-platforms.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-supported-platforms.qdoc
@@ -43,17 +43,12 @@
             \li \image ok.png
             \li \image ok.png
         \row
-            \li \l{Remote Linux}
-            \li \image ok.png
-            \li \image ok.png
-            \li \image ok.png
-        \row
             \li \l iOS
             \li
             \li \image ok.png
             \li
         \row
-            \li \l{Microcontroller Units (MCU)}{MCUs}
+            \li \l{MCUs}
             \li \image ok.png
             \li
             \li \image ok.png
@@ -63,6 +58,11 @@
             \li \image ok.png
             \li \inlineimage ok.png
         \row
+            \li \l{Remote Linux}
+            \li \image ok.png
+            \li \image ok.png
+            \li \image ok.png
+        \row
             \li \l{Building Applications for the Web}{WebAssembly}
             \li \image ok.png
             \li \image ok.png
@@ -74,5 +74,6 @@
     \QC automatically runs scheduled checks for updates based on the settings
     specified in \preferences > \uicontrol Environment > \uicontrol Update.
 
-    \sa {Desktop Platforms}, {Embedded Platforms}, {Mobile Platforms}
+    \sa {Develop for Devices}{How To: Develop for Devices}, {Desktop Platforms},
+    {Devices}
 */
diff --git a/doc/qtcreator/src/projects/creator-only/creator-build-settings-qmake.qdoc b/doc/qtcreator/src/projects/creator-only/creator-build-settings-qmake.qdoc
index 3f24273f09..78eb3ecf68 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-build-settings-qmake.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-build-settings-qmake.qdoc
@@ -51,7 +51,7 @@
     If debug info is being generated, you can have it placed into separate
     files, rather than embedded into the binary, by selecting
     \uicontrol Enable in the \uicontrol {Separate debug info} field. For
-    more information, see \l{Using the Performance Analyzer}. To use default
+    more information, see \l{Analyze CPU usage}. To use default
     settings, select \uicontrol {Leave at Default}.
 
     \section1 Compiling QML
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-build-run-tutorial.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-build-run-tutorial.qdoc
index ac06f8cbd1..457850d402 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-build-run-tutorial.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-build-run-tutorial.qdoc
@@ -23,13 +23,12 @@
 
     To run an example application on an Android or iOS device, you must set up
     the development environment for Android or iOS. For more information, see
-    \l{Connecting Android Devices} and \l{Connecting iOS Devices}.
+    \l{Developing for Android} and \l{Developing for iOS}.
 
     To run an example application on a Boot2Qt device, you must set up
     Boot2Qt on the development host and create connections
     between the host and devices. For more information, see
-    \l{https://doc.qt.io/Boot2Qt/b2qt-installation-guides.html}
-    {Boot2Qt: Installation Guides}
+    \l{Boot2Qt: Documentation}.
 
     If you have \l{Qt Design Studio Manual}{\QDS} installed, you can open
     \QDS examples from \QC in \QDS.
@@ -70,9 +69,8 @@
 
             If build errors occur, check that you have a Qt version, a
             \l{Add compilers}{compiler}, and the necessary kits installed. If
-            you are building for an \l{Connecting Android Devices}{Android device}
-            or \l{Connecting iOS Devices}{iOS device}, check that you set up the
-            development environment correctly.
+            you are building for an Android or iOS device, check that you set up
+            the development environment correctly.
 
             The \uicontrol Build progress bar on the toolbar turns green when
             you build the project successfully. The application opens on the
@@ -80,4 +78,7 @@
 
     \endlist
 
+    \sa {Add compilers}, {Add kits}, {Add Qt versions},
+    {Developing for Android}, {Developing for iOS},
+    {Compile Output}, {Boot2Qt: Documentation}, {Qt Design Studio Manual}
 */
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-building-running.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-building-running.qdoc
deleted file mode 100644
index bd4743a437..0000000000
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-building-running.qdoc
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (C) 2019 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
-
-// **********************************************************************
-// NOTE: the sections are not ordered by their logical order to avoid
-// reshuffling the file each time the index order changes (i.e., often).
-// Run the fixnavi.pl script to adjust the links to the index order.
-// **********************************************************************
-
-/*!
-    \previouspage creator-scxml.html
-    \page creator-building-running.html
-    \nextpage creator-live-preview.html
-
-    \title Running on Devices
-
-    \QC supports running and deploying Qt applications that you build
-    for different target platforms or with different compilers, debuggers, or
-    Qt versions. \l{glossary-buildandrun-kit}{Kits} define the tools,
-    \l{glossary-device}{device} type and other settings to use when building and
-    running your project.
-
-    \list
-
-        \li \l {Validating with Target Hardware}
-
-            You can use the QML live preview to preview a QML file or an
-            entire Qt Quick application on the desktop, as well as on
-            Android and embedded Linux devices. The changes you make to
-            the UI are instantly visible to you in the preview.
-
-        \li \l{Deploying to Devices}
-
-            \e {Deploy configurations} handle the packaging and copying of
-            the necessary files to a location you want to run the executable
-            at. The files can be copied to a location in the file system of
-            the development PC or a device.
-
-        \li \l{Connecting Devices}
-
-            When you install tool chains for device types as part of a Qt distribution,
-            the build and run settings for the devices might be set up
-            automatically. However, you might need to install and configure some
-            additional software on the devices to be able to connect to them
-            from the development PC.
-
-    \endlist
-
-    \sa {Build and Run}{How To: Build and Run}
-*/
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-building.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-building.qdoc
index d42df965a7..8dbf04e085 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-building.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-building.qdoc
@@ -36,7 +36,7 @@
         \li  Select the \uicontrol {Build and Run Kit Selector} icon or go to
              \uicontrol Build > \uicontrol {Open Build and Run Kit Selector} to select the
              build and run \l{glossary-buildandrun-kit}{kit} or an
-             \l{Managing Android Virtual Devices (AVD)}{Android device}.
+             \l{Manage AVDs}{Android device}.
 
             \image qtcreator-kit-selector.webp {Kit selector}
 
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-compilers.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-compilers.qdoc
index d92e8c90a4..8cea15ccbf 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-compilers.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-compilers.qdoc
@@ -103,7 +103,7 @@
         \li Other than the listed compilers and remote compilers.
     \endtable
 
-    The emscripten compiler is tool chain for compiling to
+    The emscripten compiler is toolchain for compiling to
     \l{Building Applications for the Web}{WebAssembly}.
 
     \section2 Bare-metal compilers
@@ -145,10 +145,10 @@
     \endcode
 
     If these commands show paths, they have been added to the global PATH
-    variable during the installation of a tool chain based on Cygwin or \MinGW,
+    variable during the installation of a toolchain based on Cygwin or \MinGW,
     even though this is against Windows conventions.
 
-    To keep working with the third-party tool chain, create a new shell link
+    To keep working with the third-party toolchain, create a new shell link
     that adds the required paths (as Visual Studio and Qt do). The shell link
     must point to cmd.exe:
 
@@ -157,19 +157,19 @@
     where the /K parameter carries out the command specified in the bat file.
 
     Create the myenv.bat file at \e path_to, which should be in a convenient
-    location. In the file, specify the paths to the tool chains. For example,
+    location. In the file, specify the paths to the toolchains. For example,
 
     \c  {set PATH=C:\path1;C:\path2;%PATH%}
 
-    where \e path1 and \e path2 are paths to the tool chains.
+    where \e path1 and \e path2 are paths to the toolchains.
 
     Finally, remove the paths from the global PATH, reboot the computer, and
     run the \c where commands again to verify that the global PATH is now clean.
 
-    You can use the shell link to run the tools in the third-party tool chains.
+    You can use the shell link to run the tools in the third-party toolchains.
 
     \sa {Compilers}, {Add Nim compilers}, {Add custom compilers},
-    {Connecting Bare Metal Devices}, {Supported Platforms}
+    {Developing for Bare Metal Devices}, {Supported Platforms}
 */
 
 /*!
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc
index f91d6e2b0c..83a1d745f7 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc
@@ -45,7 +45,7 @@
     \uicontrol {New File} dialogs you can see an icon (1), a display name (2),
     and a description (3) of the wizard.
 
-    \image qtcreator-custom-wizard.png {Wizard details in the New Project dialog}
+    \image qtcreator-custom-wizard.webp {Wizard details in the New File dialog}
 
     In most project wizards, you can choose the build system to use for
     building the project: qmake, CMake, Qbs, and possibly others, depending on
@@ -146,7 +146,7 @@
                 launcher for debugging and analysis tools.
         \row
             \li Squish
-            \li Create new \l {Using Squish}{Squish test suites}.
+            \li Create new Squish test suites.
 
     \endtable
 
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-custom-wizards.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-custom-wizards.qdoc
index 3abd3a1ab6..f4d7c81e63 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-custom-wizards.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-custom-wizards.qdoc
@@ -45,7 +45,7 @@
     and \uicontrol {New File} dialogs. For each wizard, it shows an icon (1), a
     display name (2), and a description (3).
 
-    \image qtcreator-custom-wizard.png
+    \image qtcreator-custom-wizard.webp {New File wizard}
 
     \section1 Wizard Types
 
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-debuggers.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-debuggers.qdoc
index 8762a9e97b..59db592705 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-debuggers.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-debuggers.qdoc
@@ -75,5 +75,6 @@
     The debugger disappears from the list when you select \uicontrol Apply.
     Until then, you can cancel the deletion by clicking \uicontrol Restore.
 
-    \sa {Debugging}, {Setting Up Debugger}, {Troubleshooting Debugger}
+    \sa {Debugging}, {Debuggers}, {Debugger}, {Supported Native Debuggers},
+    {Troubleshooting Debugger}
 */
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-generic.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-generic.qdoc
index e4e682d2a6..2a57fcfaac 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-generic.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-generic.qdoc
@@ -125,7 +125,7 @@
     you first need to deploy your executable and possibly other files.
     \QC does that for you automatically if you enter the necessary
     information. This works the same way as explained for CMake in
-    \l {Deploying to Remote Linux},
+    \l {Remote Linux Deploy Configuration},
     except that you also need to include your application binary in the list.
 
     \section1 Create a run configuration
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-kits.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-kits.qdoc
index 4d0e903863..4eb4faf42a 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-kits.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-kits.qdoc
@@ -25,17 +25,15 @@
     You can add kits for the desktop and for the following types of devices:
 
     \list
-        \li \l{Connecting Android Devices}{Android}
-        \li \l{Connecting Bare Metal Devices}{Bare Metal}
-        \li \l{https://doc.qt.io/Boot2Qt/b2qt-installation-guides.html}
-            {Boot2Qt} (commercial only)
-        \li \l{Emulator}{Boot2Qt Emulator} (commercial only)
+        \li \l{Developing for Android}{Android}
+        \li \l{Developing for Bare Metal Devices}{Bare Metal}
+        \li \l{Boot2Qt: Documentation}{Boot2Q} (commercial only)
         \li \l{Adding Docker Devices}{Docker} (experimental)
-        \li \l{Connecting iOS Devices}{iOS}
+        \li \l{Developing for iOS}{iOS}
         \li iOS Simulator
-        \li \l{Connecting MCUs}{MCU} (commercial only)
+        \li \l{Developing for MCUs}{MCU} (commercial only)
         \li \l{Connecting QNX Devices}{QNX}
-        \li \l{Connecting Remote Linux Devices}{Remote Linux}
+        \li \l{Developing for Remote Linux Devices}{Remote Linux}
         \li \l{Building Applications for the Web}{WebAssembly Runtime}
     \endlist
 
@@ -74,7 +72,7 @@
     \title Kits
 
     \brief Set kit preferences. A kit consists of a set of values that define
-    one environment, such as a \e {device}, tool chain, Qt version, and debugger
+    one environment, such as a \e {device}, toolchain, Qt version, and debugger
     command to use.
 
     Typically, only a subset of the kit preferences is relevant for a particular
@@ -147,6 +145,9 @@
             This setting is used to tell the code model which compiler is used.
             If your project type and build tool support it, \QC also tells the
             build tool to use this compiler for building the project.
+
+            \note qmake ignores the value of this field and fetches the compiler
+            information from \uicontrol {Qt mkspec}, which you can change.
     \row
         \li \uicontrol Environment
         \li Select \uicontrol Change to modify environment variable values for
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build-qbs.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build-qbs.qdoc
index f1b08ac048..b177af0b8d 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build-qbs.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build-qbs.qdoc
@@ -30,7 +30,7 @@
     If debug info is being generated, you can have it placed into separate
     files, rather than embedded into the binary, by selecting
     \uicontrol Enable in the \uicontrol {Separate debug info} field. For
-    more information, see \l{Using the Performance Analyzer}. To use default
+    more information, see \l{Analyze CPU usage}. To use default
     settings, select \uicontrol {Leave at Default}.
 
     For more information about the QML debugging options, see
@@ -59,7 +59,7 @@
             \endlist
 
         \li In the \uicontrol ABIs field, select the ABIs for
-            the \l{Connecting Android Devices}{Android} device
+            the \l{Developing for Android}{Android} device
             architectures to build the project for.
 
         \li In the \uicontrol {Parallel jobs} field, specify the number of
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build.qdoc
index 31bc8204d4..250a5085c4 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build.qdoc
@@ -56,7 +56,7 @@
 
     \section1 Build on remote devices
 
-    You can build applications on \l{Connecting Remote Linux Devices}
+    You can build applications on \l{Developing for Remote Linux Devices}
     {remote Linux} or \l{Adding Docker Devices}{Docker} devices if you
     have kits that specify the devices and toolchains to use. When the
     build device of the kit is a remote device, such as a remote Linux or
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-overview.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-overview.qdoc
index 93510fa438..df0b2b0f7a 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-overview.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-overview.qdoc
@@ -83,7 +83,7 @@
             \list
                 \li \l{Link projects to Axivion dashboards}{Axivion}
                 \li \l{Specify clangd settings}{Clangd}
-                \li \l{Speficy Clang tools settings}{Clang Tools}
+                \li \l{Specify Clang tools settings}{Clang Tools}
                 \li \l{Set Copilot preferences}{Copilot}
                 \li \l{Specify code style}{C++ Code Style}
                 \li \l{Set C++ file naming preferences}{C++ File Naming}
@@ -132,7 +132,7 @@
 
     Each kit consists of a set of values that define one environment, such as a
     \l{glossary-device}{device}, \l{Add compilers}{compiler},
-    \l{Add debuggers}{debugger}, and \l{Add Qt versions}{Qt version}, as well
+    \l{Add debuggers}{Debugging}, and \l{Add Qt versions}{Qt version}, as well
     as steps for building, deploying, and running applications.
 
     To copy the build, deploy, and run steps from another kit, select
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-analyze.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-analyze.qdoc
index 34233c90d8..99802a720b 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-analyze.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-analyze.qdoc
@@ -13,8 +13,8 @@
     you select for a kit in \uicontrol Projects > \uicontrol {Build & Run} >
     \uicontrol Run > \uicontrol {Run Settings}.
 
-    \QC integrates \l{Analyzing Code}{Valgrind code analysis tools} for
-    detecting memory leaks and profiling function execution.
+    With \l{Valgrind's Tool Suite}, you can detect memory leaks and profile
+    function execution.
 
     To specify Valgrind settings for the current project:
 
@@ -38,11 +38,12 @@
 
     \endlist
 
-    Click \uicontrol {Restore Global} to revert to the global settings.
+    Select \uicontrol {Restore Global} to revert to the global settings.
 
     To specify global Valgrind settings, select \preferences >
     \uicontrol Analyzer.
 
-    \sa {Configuring Projects}, {Selecting Options for Memory Analysis},
-    {Selecting Profiling Options}, {Using Valgrind Code Analysis Tools}
+    \sa {Detect memory leaks with Memcheck}, {Profile function execution},
+    {Run Valgrind tools on external applications}, {Configuring Projects},
+    {Valgrind Callgrind}, {Valgrind Memcheck}
 */
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-debug.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-debug.qdoc
index 770478d5b6..b0609ab771 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-debug.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-debug.qdoc
@@ -30,7 +30,7 @@
 
     \list
         \li \l{Adding Custom Debugging Helpers}{Custom debugging helpers}
-        \li \l{Specifying GDB Settings}{GDB commands} to execute after GDB
+        \li \l{GDB}{GDB commands} to execute after GDB
             has started, but before the debugged program is started or
             attached, and before the debugging helpers are initialized
     \endlist
@@ -42,5 +42,5 @@
     {enable QML debugging} either globally or in the \uicontrol {Build Settings}
     of the project.
 
-    \sa {Configuring Projects}, {Debugging}
+    \sa {Configuring Projects}, {Debugging}, {Debuggers}, {Debugger}
 */
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-desktop.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-desktop.qdoc
index 01458baf26..72085701e1 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-desktop.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-desktop.qdoc
@@ -32,10 +32,10 @@
 
     \section1 Run in Terminal
 
-    For console applications, check the \uicontrol{Run in terminal} check box.
-    To specify the terminal to use on Linux and \macos, select \preferences >
+    For console applications, select \uicontrol{Run in terminal}.
+    To specify the terminal to use on Linux and \macos, go to \preferences >
     \uicontrol Environment > \uicontrol System. To use an \l{Terminal}
-    {internal terminal}, select \preferences > \uicontrol Terminal >
+    {internal terminal}, go to \preferences > \uicontrol Terminal >
     \uicontrol {Use internal terminal}.
 
     \section1 Linker Libraries
@@ -48,22 +48,21 @@
     \c {make install}, and want to make sure that the deployed application will
     find the libraries also when it is run without \QC.
 
-    To disable library linking for the current project, deselect the
-    \uicontrol {Add build library search path to PATH} check box. To disable
-    library linking for all projects, select \preferences >
-    \uicontrol {Build & Run}, and then deselect the
-    \uicontrol {Add linker library search paths to run environment} check box.
+    To disable library linking for the current project, clear
+    \uicontrol {Add build library search path to PATH}. To disable
+    library linking for all projects, go to \preferences >
+    \uicontrol {Build & Run} and then clear
+    \uicontrol {Add linker library search paths to run environment}.
 
-    \section1 \macos Options
+    \section1 Debugging Linked Frameworks
 
-    The \uicontrol {Use debug version of frameworks (DYLD_IMAGE_SUFFIX=_debug)} option
-    (only available on \macos) enables you to debug (for example, step into)
-    linked frameworks, such as the Qt framework itself. You do not need this
-    option for debugging your application code.
+    On \macos, select \uicontrol {Use debug version of frameworks (DYLD_IMAGE_SUFFIX=_debug)}
+    to debug (for example, step into) linked frameworks, such as the Qt framework
+    itself. You do not need this option for debugging your application code.
 
-    \section1 Linux Options
+    \section1 Running as root User
 
-    On Linux, select the \uicontrol {Run as root user} check box to run the
+    On Linux and \macos, select \uicontrol {Run as root user} to run the
     application with root user permissions.
 
     \sa {Configure projects for running}, {Specify a custom executable to run},
diff --git a/doc/qtcreator/src/projects/creator-projects-running.qdoc b/doc/qtcreator/src/projects/creator-projects-running.qdoc
index 0b39d0d707..1dd25de23a 100644
--- a/doc/qtcreator/src/projects/creator-projects-running.qdoc
+++ b/doc/qtcreator/src/projects/creator-projects-running.qdoc
@@ -40,7 +40,7 @@
 
     If you have connected \l{Mobile Platforms}{mobile devices} or
     \l{Embedded Platforms}{embedded devices} to the computer
-    or added virtual devices, such as \l{Managing Android Virtual Devices (AVD)}
+    or added virtual devices, such as \l{Manage AVDs}
     {Android Virtual Devices (AVD)}, you can select them in the kit selector.
 
     Select \uicontrol Manage to manage device settings. For example, you can add
diff --git a/doc/qtcreator/src/python/creator-python-development.qdoc b/doc/qtcreator/src/python/creator-python-development.qdoc
index d5cd5fe31c..8978c09d60 100644
--- a/doc/qtcreator/src/python/creator-python-development.qdoc
+++ b/doc/qtcreator/src/python/creator-python-development.qdoc
@@ -25,8 +25,8 @@
         \li \l{Configure Python language servers}
         \li \l{Run Python applications}
         \li \l{Python Run Settings}
-        \li \l{PDB}
-        \li \l{Launching the Debugger}
+        \li \l{PDB versions}
+        \li \l{Supported Native Debuggers}
     \endlist
 
     For more information about developing with Qt for Python, including
diff --git a/doc/qtcreator/src/qnx/creator-deployment-qnx.qdoc b/doc/qtcreator/src/qnx/creator-deployment-qnx.qdoc
index 06fcb20abd..11b4806d66 100644
--- a/doc/qtcreator/src/qnx/creator-deployment-qnx.qdoc
+++ b/doc/qtcreator/src/qnx/creator-deployment-qnx.qdoc
@@ -9,22 +9,30 @@
 // **********************************************************************
 
 /*!
-    \previouspage creator-deployment-b2qt.html
     \page creator-deployment-qnx.html
-    \nextpage creator-deployment-embedded-linux.html
-    \title Deploying to QNX Neutrino
+    \previouspage creator-reference.html
 
-    You can specify settings for deploying applications to QNX Neutrino
+    \ingroup creator-reference-deploy-configurations
+
+    \title QNX Neutrino Deploy Configuration
+
+    \brief Copy application files to QNX Neutrino devices.
+
+    Specify settings for deploying applications to QNX Neutrino
     devices in the project configuration file and in \uicontrol Projects
     > \uicontrol {Run Settings} > \uicontrol Deployment.
 
     \image qtcreator-qnx-deployment.png "Deploy to device"
 
     The deployment process is described in more detail in
-    \l{Deploying to Remote Linux}.
+    \l{Remote Linux Deploy Configuration}.
 
     \section1 Finding Configured Devices
 
     The \uicontrol {Check for a configured device} deployment step looks for a
     device that is ready for deployment.
+
+    \sa {Build and Run}{How To: Build and Run}, {Connecting QNX Devices},
+    {QNX Run Settings}, {Remote Linux Deploy Configuration},
+    {Remote Linux Run Settings}
 */
diff --git a/doc/qtcreator/src/qnx/creator-developing-qnx.qdoc b/doc/qtcreator/src/qnx/creator-developing-qnx.qdoc
index d7ec1e6417..050534c56a 100644
--- a/doc/qtcreator/src/qnx/creator-developing-qnx.qdoc
+++ b/doc/qtcreator/src/qnx/creator-developing-qnx.qdoc
@@ -17,8 +17,8 @@
 
     \section1 Adding a QNX Neutrino Device in \QC
 
-    Adding a QNX Neutrino device is very similar to
-    \l{Connecting Remote Linux Devices}, except that
+    Adding a QNX Neutrino device is very similar to adding a
+    \l{Add remote Linux devices}{remote Linux device}, except that
     you need to select \uicontrol {QNX Device} in the
     \uicontrol {Device Configuration} wizard.
 
diff --git a/doc/qtcreator/src/qnx/creator-projects-how-to-run-qnx.qdoc b/doc/qtcreator/src/qnx/creator-projects-how-to-run-qnx.qdoc
index 364ee316bc..c6b41392c9 100644
--- a/doc/qtcreator/src/qnx/creator-projects-how-to-run-qnx.qdoc
+++ b/doc/qtcreator/src/qnx/creator-projects-how-to-run-qnx.qdoc
@@ -18,7 +18,7 @@
         \li Select \inlineimage icons/run_small.png (\uicontrol Run).
     \endlist
 
-    \QC uses the compiler specified in the QNX tool chain to build the
+    \QC uses the compiler specified in the QNX toolchain to build the
     application.
 
     \note Debugging is currently only fully supported on Linux and \macos.
diff --git a/doc/qtcreator/src/qtcreator-toc.qdoc b/doc/qtcreator/src/qtcreator-toc.qdoc
index 0a60027451..41d4ef75c8 100644
--- a/doc/qtcreator/src/qtcreator-toc.qdoc
+++ b/doc/qtcreator/src/qtcreator-toc.qdoc
@@ -22,72 +22,15 @@
                 \endlist
             \li \l{Creating Projects}
             \li \l{Configuring Projects}
-            \li \l{Validating with Target Hardware}
-            \list
-                \li \l{Previewing on Desktop}
-                \li \l{Previewing on Devices}
-                \li \l{Previewing in Browsers}
-            \endlist
-            \li \l{Deploying to Devices}
-            \list
-                \li \l{Deploying to Android}
-                \li \l{Deploying to Boot2Qt}
-                \li \l{Deploying to QNX Neutrino}
-                \li \l{Deploying to Remote Linux}
-            \endlist
             \li \l{Connecting Devices}
             \list
-                \li \l{Connecting Android Devices}
-                \li \l{Connecting Bare Metal Devices}
                 \li \l{Connecting Boot2Qt Devices}
                 \li \l{Adding Docker Devices}
-                \li \l{Connecting iOS Devices}
-                \li \l{Connecting MCUs}
                 \li \l{Connecting QNX Devices}
-                \li \l{Connecting Remote Linux Devices}
                 \li \l{Building Applications for the Web}
             \endlist
             \li \l{Debugging}
-            \list
-                \li \l{Setting Up Debugger}
-                \li \l{Launching the Debugger}
-                \li \l{Debug Mode Views}
-                    \list
-                        \li \l{Viewing Call Stack Trace}
-                        \li \l{Setting Breakpoints}
-                        \li \l{Viewing Threads}
-                        \li \l{Viewing Modules}
-                        \li \l{Viewing Source Files}
-                        \li \l{Local Variables and Function Parameters}
-                        \li \l{Evaluating Expressions}
-                        \li \l{Viewing and Editing Register State}
-                        \li \l{Debugger Log}
-                        \li \l{Viewing Disassembled Code}
-                    \endlist
-                \li \l{Stopping Applications}
-                \li \l{Examining Data}
-                \li \l{Remote Debugging}
-                \li \l{Debugger Preferences}
-                \li \l{Using Debugging Helpers}
-                \li \l{Debugging Qt Quick Projects}
-                \li \l{Troubleshooting Debugger}
-            \endlist
             \li \l{Analyzing Code}
-            \list
-                \li \l{Profiling QML Applications}
-                \li \l{Checking Code Coverage}
-                \li \l{Using Valgrind Code Analysis Tools}
-                \list
-                    \li \l{Detecting Memory Leaks with Memcheck}
-                    \li \l{Profiling Function Execution}
-                    \li \l{Running Valgrind Tools on External Applications}
-                \endlist
-                \li \l{Detecting Memory Leaks with Heob}
-                \li \l{Analyzing CPU Usage}
-                \li \l{Analyzing Code with Cppcheck}
-                \li \l{Visualizing Chrome Trace Events}
-            \endlist
-            \li \l{Using Squish}
         \endlist
         \li \l{Tutorials}
             \generatelist creator-tutorials
@@ -109,6 +52,19 @@
                 \generatelist creator-how-to-debug
             \li Design UIs
                 \generatelist creator-how-to-design
+            \li Develop for Devices
+                \list
+                    \li Android
+                        \generatelist creator-how-to-android
+                    \li Bare Metal
+                        \generatelist creator-how-to-bare-metal
+                    \li iOS
+                        \generatelist creator-how-to-ios
+                    \li MCUs
+                        \generatelist creator-how-to-mcu
+                    \li Remote Linux
+                        \generatelist creator-how-to-remote-linux
+                \endlist
             \li Edit Code
                 \generatelist creator-how-to-edit
                 \list
@@ -143,14 +99,28 @@
             \li \l{Reference}
                 \generatelist creator-reference
                 \list
+                    \li Analyzers
+                        \generatelist creator-reference-analyzer
                     \li Build Systems
                         \generatelist creator-reference-build-systems
                         \list
                             \li Build Configurations
                                 \generatelist creator-reference-build-configurations
+                        \endlist
+                    \li Devices
+                        \generatelist creator-reference-devices
+                        \list
+                            \li Deploy Configurations
+                                \generatelist creator-reference-deploy-configurations
                             \li Run Configurations
                                 \generatelist creator-reference-run-configurations
                         \endlist
+                    \li Debugger
+                        \generatelist creator-reference-debugger
+                        \list
+                            \li Debugger Views
+                                \generatelist creator-reference-debugger-views
+                        \endlist
                     \li Editors
                         \generatelist creator-reference-editors
                     \li Platforms
diff --git a/doc/qtcreator/src/qtcreator.qdoc b/doc/qtcreator/src/qtcreator.qdoc
index cc3352dd10..8f0020283e 100644
--- a/doc/qtcreator/src/qtcreator.qdoc
+++ b/doc/qtcreator/src/qtcreator.qdoc
@@ -39,12 +39,9 @@
                     \li \l{Getting Started}
                     \li \l{Creating Projects}
                     \li \l{Configuring Projects}
-                    \li \l{Validating with Target Hardware}
                     \li \l{Connecting Devices}
-                    \li \l{Deploying to Devices}
                     \li \l{Debugging}
                     \li \l{Analyzing Code}
-                    \li \l{Using Squish}
                 \endlist
             \li \b {\l{Tutorials}}
                 \generatelist creator-tutorials
@@ -65,6 +62,7 @@
                 \list
                     \li \l {Acknowledgements}
                     \li \l {Build Systems}
+                    \li \l {Devices}
                     \li \l {Command-Line Options}
                     \li \l {Custom Wizards}
                     \li \l {Keyboard Shortcuts}
diff --git a/doc/qtcreator/src/qtquick/creator-only/creator-mobile-app-tutorial.qdoc b/doc/qtcreator/src/qtquick/creator-only/creator-mobile-app-tutorial.qdoc
index f06917784b..b6f01f38a5 100644
--- a/doc/qtcreator/src/qtquick/creator-only/creator-mobile-app-tutorial.qdoc
+++ b/doc/qtcreator/src/qtquick/creator-only/creator-mobile-app-tutorial.qdoc
@@ -32,12 +32,12 @@
 
     To develop for Android devices, you must install \l{Qt for Android}
     and set up the development environment, as instructed in
-    \l{Connecting Android Devices}.
+    \l{Developing for Android}.
 
     To develop for iOS devices, you must install Xcode and use it to configure
     a device. For this, you need an Apple developer account and iOS Developer
     Program certificate that you receive from Apple. For more information, see
-    \l{Connecting iOS Devices}.
+    \l{Developing for iOS}.
 
     \include qtquick-tutorial-create-empty-project.qdocinc qtquick empty application
 
diff --git a/doc/qtcreator/src/qtquick/creator-only/qt-design-viewer.qdoc b/doc/qtcreator/src/qtquick/creator-only/qt-design-viewer.qdoc
index 8ff40ec941..58e3e900ba 100644
--- a/doc/qtcreator/src/qtquick/creator-only/qt-design-viewer.qdoc
+++ b/doc/qtcreator/src/qtquick/creator-only/qt-design-viewer.qdoc
@@ -1,27 +1,25 @@
-// Copyright (C) 2019 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
     \page qt-design-viewer.html
-    \previouspage creator-live-preview-devices.html
-    \nextpage creator-building-targets.html
+    \previouspage creator-how-tos.html
 
-    \title Previewing in Browsers
+    \ingroup creator-how-to-design
+
+    \title Preview UI prototypes in browsers
 
     \image qt-design-viewer.png
 
-    \QDV is a QML viewer that runs in your web browser. This means that you can
-    run applications in most widely-used web browsers, such as Apple Safari,
-    Google Chrome, Microsoft Edge, and Mozilla Firefox, on the desktop and on
-    mobile devices.
+    Run Qt Quick UI Prototype projects in web browsers, such as Apple Safari,
+    Google Chrome, Microsoft Edge, and Mozilla Firefox, with \QDV.
 
     The startup and compilation time depend on your browser and configuration.
-    However, the actual performance of the application once started is
-    indistinguishable from the same application running on the desktop.
+    Once started, the application performs the same as when running on the
+    desktop.
 
-    You can run Qt Quick UI Prototype projects, which
-    have a .qmlproject file that defines the main QML file and the import paths.
-    Compress the project folder into a ZIP file that you upload to \QDV.
+    The .qmlproject configuration file defines the main QML file and the import
+    paths. Compress the project folder into a ZIP file that you upload to \QDV.
 
     The loaded applications remain locally in your browser. No data is uploaded
     into the cloud.
@@ -30,11 +28,12 @@
 
     \list 1
         \li In the browser, open \l{ https://designviewer.qt.io/}{\QDV}.
-        \li Drag and drop your application package to \QDV, or click the load
+        \li Drag your application package to \QDV, or select the load
             icon to browse for your file.
     \endlist
 
     Your application is compiled and run on \QDV.
 
-    \sa {Create Qt Quick UI Prototypes}
+    \sa {Create Qt Quick UI Prototypes}, {Design UIs}{How To: Design UIs},
+    {UI Design}
 */
diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-live-preview-desktop.qdoc b/doc/qtcreator/src/qtquick/creator-only/qtquick-live-preview-desktop.qdoc
new file mode 100644
index 0000000000..75a64831c0
--- /dev/null
+++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-live-preview-desktop.qdoc
@@ -0,0 +1,22 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
+
+/*!
+    \page creator-live-preview-desktop.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-design
+
+    \title Preview a QML file on desktop
+
+    To preview the currently active QML file on the desktop:
+
+    \list
+        \li Select \inlineimage icons/live-preview.png (\uicontrol {Live Preview})
+            on the \l{Edit Mode}{editor} toolbar.
+            \image qtcreator-live-preview.webp {Application running on top of the editor view}
+        \li Go to \uicontrol Build > \uicontrol {QML Preview}.
+    \endlist
+
+    \sa {Design UIs}{How To: Design UIs}, {UI Design}
+*/
diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-states-scxml.qdocinc b/doc/qtcreator/src/qtquick/creator-only/qtquick-states-scxml.qdocinc
deleted file mode 100644
index 1f0fd5a8e0..0000000000
--- a/doc/qtcreator/src/qtquick/creator-only/qtquick-states-scxml.qdocinc
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (C) 2020 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
-
-/*!
-//! [scxml state machines]
-
-    \section1 Using SCXML State Machines
-
-    To use QML together with an SCXML state machine, add states and
-    bind them to the state machine in \l {Connection View} >
-    \uicontrol Backends, as described in \l {Managing C++ Backend Objects}.
-
-    In the \uicontrol States view, you can select \uicontrol Actions >
-    \uicontrol {Set when Condition} to edit the \c when condition of states
-    to map QML states to the states of the SCXML state machine. For an example,
-    see \l {Qt SCXML Traffic Light QML Example (Dynamic)}.
-
-    \image qmldesigner-states-when-condition.png
-
-    If you add animation to the states, you can
-    \l{Validating with Target Hardware}{preview}
-    or \l{Run on many platforms}{run}
-    the application to test the animation.
-
-//! [scxml state machines]
-*/
diff --git a/doc/qtcreator/src/qtquick/qtquick-live-preview-devices.qdoc b/doc/qtcreator/src/qtquick/qtquick-live-preview-devices.qdoc
index 584db4bb43..740b237eae 100644
--- a/doc/qtcreator/src/qtquick/qtquick-live-preview-devices.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-live-preview-devices.qdoc
@@ -1,36 +1,46 @@
-// Copyright (C) 2020 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \previouspage creator-live-preview-desktop.html
     \page creator-live-preview-devices.html
+    \if defined (qtdesignstudio)
+    \previouspage studio-live-preview-desktop.html
     \nextpage qt-design-viewer.html
 
     \title Previewing on Devices
 
-    To preview UIs on Android devices, you need to enable USB debugging on them
-    and connect them to your system with a USB cable.
+    \else
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-design
+
+    \title Preview Qt Quick UIs on devices
+    \endif
 
-    To preview UIs on Boot2Qt devices, you need to connect the devices to your
-    system with a USB cable, or a wired or wireless connection, depending on
-    the device, and configure connections to them. The necessary kits have been
-    predefined and you only need to enable them for your current project.
+    To preview a UI on an Android device, turn on USB debugging on the device
+    and connect it to the computer with a USB cable.
+
+    To preview a UI on a Boot2Qt device, connect the device to the computer
+    with a USB cable, or a wired or wireless connection, depending on
+    the device, and configure a connection to it. The necessary kits have been
+    predefined, but you need to select the one appropriate for your current
+    project.
 
     \e {Deploy configurations} handle the packaging and copying of the
     necessary files to a location in a device where you want to run the
     executable at.
 
-    \note To preview on a wirelessly connected device, select \preferences > \uicontrol Devices
-    and connect the device.
+    \note To preview on a wirelessly connected device, go to \preferences >
+    \uicontrol Devices and connect the device.
 
     To preview a UI on a device:
 
     \list 1
         \if defined(qtcreator)
-        \li In \uicontrol Projects > \uicontrol {Build & Run}, enable the kit
-            predefined for the device type (1).
+        \li Go to \uicontrol Projects > \uicontrol {Build & Run}.
+        \li Activate the kit predefined for the device type (1).
         \li Select the kit for the device in the kit selector (2).
-            \image qtcreator-live-preview-kit.png
+            \image qtcreator-kit-selector-devices.webp {Kit selector}
         \else
         \li In the bottom toolbar, select \inlineimage icons/settings.png
             and enable the kit predefined for the device type.
@@ -42,45 +52,36 @@
             press \key {Alt+P}.
     \endlist
 
-    \section2 Previewing on Android Devices
+    \section2 On Android
 
     \if defined(qtcreator)
-    The USB debugging feature on Android devices enables creating connections
-    to the devices from \QDS and running the preview utility on them.
+    Use the USB debugging feature on an Android device to create a connection
+    to the device from \QC and run the preview utility on it.
 
-    Debugging is enabled in different ways on different Android devices.
+    Debugging is turned on in different ways on different Android devices.
     Look for \uicontrol {USB Debugging} under \uicontrol {Developer Options}.
-    On some devices \uicontrol {Developer Options} is hidden and becomes visible
-    when you tap the \uicontrol {Build number} field in \uicontrol Settings >
-    \uicontrol About several times.
+    Tap \uicontrol {Build number} in \uicontrol Settings > \uicontrol About
+    several times to show \uicontrol {Developer Options}.
 
-    After you have enabled debugging, connect the Android device to the system
+    After you turn on debugging, connect the Android device to the system
     with a USB cable.
 
-    The first time you preview a UI on devices, the preview utility
-    is copied to them. This might take some time. Thereafter, previewing will
-    get faster because only the UI files need to be copied to the
-    device.
+    The first time you preview a UI on a device, the preview utility
+    is copied to it, which might take some time. Thereafter, previewing
+    gets faster because only the UI files need to be copied to the device.
     \else
-    Preview your \QDS projects with \QUV. It is an application
-    that runs on your Android device.
+    Preview \QDS projects with \QUV on an Android device.
     Learn more about \l{Viewing Applications on Android}.
     \endif
 
+    \section2 On Boot2Qt
 
-    \section2 Previewing on Boot2Qt Devices
-
-    You can preview UIs on Boot2Qt devices. For a list of supported devices, see
-    \l{https://doc.qt.io/Boot2Qt/qtdc-supported-platforms.html}
-    {Boot2Qt: Supported Target Devices and Development Hosts}.
+    Preview a UI on a supported Boot2Qt device that you configure as
+    instructed in the Boot2Qt documentation.
 
-    You must configure the device as instructed in the
-    \l{https://doc.qt.io/Boot2Qt/b2qt-installation-guides.html}
-    {Boot2Qt: Installation Guides}.
+    \sa {Boot2Qt: Documentation}, {Support Levels for Target Hardware}
 
-    \note At the time of this writing, \macos is not supported as a development
-    host for Boot2Qt. This means that you cannot preview UIs on
-    devices if you are using \QC on \macos. For more information, see
-    \l {https://doc.qt.io/Boot2Qt/qtdc-supported-platforms.html#supported-development-hosts}
-    {Boot2Qt: Supported Development Hosts}.
+    \if defined(qtcreator)
+    \sa {Design UIs}{How To: Design UIs}, {UI Design}
+    \endif
 */
diff --git a/doc/qtcreator/src/qtquick/qtquick-live-preview.qdoc b/doc/qtcreator/src/qtquick/qtquick-live-preview.qdoc
deleted file mode 100644
index 2d2ac0b36b..0000000000
--- a/doc/qtcreator/src/qtquick/qtquick-live-preview.qdoc
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright (C) 2024 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
-
-/*!
-    \page creator-live-preview.html
-    \if defined(qtdesignstudio)
-    \previouspage quick-states.html
-    \else
-    \previouspage creator-building-running.html
-    \endif
-    \nextpage creator-live-preview-desktop.html
-
-    \title Validating with Target Hardware
-
-    Preview a UI file or the entire UI on the desktop, as well as on embedded
-    Linux devices to instantly view the changes you make to the UI. On Android
-    devices, the preview shows the snapshot of your project from the moment
-    you start the preview on the device, not your changes.
-
-    \if defined(qtcreator)
-    \image qtcreator-live-preview.webp {Application running on top of the editor}
-    \else
-    \image studio-live-preview.webp
-    \endif
-
-    Or, use \QDV to run
-    \if defined(qtcreator)
-    \l{Create Qt Quick UI Prototypes}{Qt Quick UI projects}
-    \else
-    applications
-    \endif
-    in most widely-used web browsers on the desktop and in mobile devices and
-    share your designs with reviewers who don't have \QC.
-
-    \list
-        \li \l{Previewing on Desktop}
-
-            Preview individual QML files or the whole UI.
-        \li \l{Previewing on Devices}
-
-            \if defined(qtcreator)
-            Preview Qt Quick applications on devices that you
-            connect to the development PC. For more information, see
-            \l {Connecting Devices}.
-            \else
-            When you install \QDS, everything you need for previewing on
-            devices is set up automatically. You only need to connect your
-            devices to your system.
-            \endif
-
-        \if defined(qtdesignstudio)
-        \li \l{Sharing Applications Online}
-
-            Share applications online and view them in a web browser.
-
-        \li \l{Viewing Applications on Android}
-
-           Preview your \QDS projects with \QUV. It is an application
-           that runs on your Android device.
-        \else
-        \li \l{Previewing in Browsers}
-
-            Open \l{https://designviewer.qt.io/}{\QDV}
-            in a browser and load applications to it.
-        \endif
-    \endlist
-*/
diff --git a/doc/qtcreator/src/qtquick/qtquick-modules-with-plugins.qdoc b/doc/qtcreator/src/qtquick/qtquick-modules-with-plugins.qdoc
index 299bd05772..46651d8748 100644
--- a/doc/qtcreator/src/qtquick/qtquick-modules-with-plugins.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-modules-with-plugins.qdoc
@@ -36,22 +36,25 @@
     \list 1
 
         \li Create custom components and place all the \c .qml files in a
-           directory dedicated to your module. For example:
+           directory dedicated to your module. For example,
            \c {imports\asset_imports}.
 
-        \li For Qt Quick UI Prototype projects (.qmlproject), specify the path to
+        \if defined(qtcreator)
+        \li  For Qt Quick UI Prototype projects (.qmlproject), specify the path to
             the directory that has the module in the .qmlproject file
             of the application where you want to use the module
-            as a value of the \c importPaths variable. For example
+            as a value of the \c importPaths variable. For example,
             \c{importPaths: [ "imports", "asset_imports" ]}.
-
+        \else
+        \li Specify the path to the directory that has the module in the
+            .qmlproject file of the application where you want to use the module
+            as a value of the \c importPaths variable. For example,
+            \c{importPaths: [ "imports", "asset_imports" ]}.
+        \endif
         \li Create a \c qmldir file for your module and place it
             in the module directory. For more information, see
             \l {Module Definition qmldir Files}.
 
-        \li Create a \c qmltypes file, as instructed in
-            \l {Generating Type Description Files}.
-
         \li Create a directory named \c designer in your module directory.
 
         \li Create a \c .metainfo file for your module and place it in the
@@ -66,18 +69,29 @@
         \if defined(qtcreator)
         \li Import the module into the project, as instructed in
             \l {Importing QML Modules}.
-        \endlist
         \else
         \li Build your module using the same Qt version and compiler as \QDS.
-            For more information, see \l {Running QML Modules in Design Mode}.
+
+        Your module and components should now appear in \uicontrol Components.
+        \endif
+
         \endlist
 
-    Your module should now appear in \uicontrol Components. Your components
-    should appear in a subsection of \uicontrol Components if a valid
-    \c .metainfo file is in place.
+    \note If \QC cannot find the new QML module, build the project
+    and then go to \uicontrol {Tools} > \uicontrol {QML/JS} >
+    \uicontrol {Reset Code Model} to reset the code model.
+    \if defined(qtdesignstudio)
+    For more information about how to show the \uicontrol {Tools} menu, see
+    \l{Customizing the Menu}.
     \endif
 
-    \section1 Generating Type Description Files
+    \if defined(qtcreator)
+    \section1 Developing with Qt 6.1 or Earlier
+
+    Since Qt 6.2, CMake generates the \c qmltypes and \c qmldir files
+    automatically.
+
+    \section2 Generating Type Description Files
 
     When \l{Defining QML Types from C++}{registering QML types}, make sure that
     the QML module has a \c{plugins.qmltypes} file. Ideally, it should be located
@@ -110,6 +124,7 @@
     \endcode
 
     The import path affects all the targets built by the CMake project.
+    \endif
 
     \if defined(qtdesignstudio)
     \section1 Running QML Modules in Design Mode
@@ -128,4 +143,6 @@
     environment variable to check whether the plugin is currently being run
     by an application or edited in the \uicontrol Design mode.
     \endif
+
+    \sa {Resetting the Code Model}
 */
diff --git a/doc/qtcreator/src/qtquick/qtquick-profiler.qdoc b/doc/qtcreator/src/qtquick/qtquick-profiler.qdoc
index 0fd232d8b9..bd0985e312 100644
--- a/doc/qtcreator/src/qtquick/qtquick-profiler.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-profiler.qdoc
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 // **********************************************************************
@@ -8,185 +8,220 @@
 // **********************************************************************
 
 /*!
-    \page creator-qml-performance-monitor.html
+    \page creator-how-to-profile-qml.html
     \if defined(qtdesignstudio)
-    \previouspage creator-qml-debugging-example.html
+    \previouspage creator-qml-performance-monitor.html
     \nextpage studio-advanced.html
     \else
-    \previouspage creator-analyze-mode.html
-    \nextpage creator-coco.html
+    \previouspage creator-how-tos.html
     \endif
 
-    \title Profiling QML Applications
-
-    You can use the QML Profiler to find causes for typical performance problems
-    in your applications, such as slowness and unresponsive, stuttering user
-    interfaces. Typical causes include executing too much JavaScript in too few
-    frames. All JavaScript must return before the GUI thread can proceed, and
-    frames are delayed or dropped if the GUI thread is not ready.
-
-    Another typical cause for similar performance problems is creating,
-    painting, or updating invisible items, which takes time in the GUI thread.
+    \ingroup creator-how-to-analyze
 
-    \if defined(qtcreator)
-    Triggering long-running C++ functions, such as paint methods and signal
-    handlers, also takes time in the GUI thread, but is more difficult to see in
-    the QML Profiler because it does not profile C++ code.
-    \endif
+    \title Profile QML applications
 
-    To find excessive use of JavaScript, check the frame rate in animations and
-    Scene Graph events, look for gaps, and check whether the application behaves
-    as expected. The JavaScript category displays the run time of functions,
-    which you should try to keep below 16 ms per frame.
-
-    To find problems caused by handling invisible items, look for dropped
-    frames and check that you are not using too many short bindings or signal
-    handlers that are updated per frame. You can also \l{Visualizing Overdraw}
-    {visualize Scene Graph overdraw} to check scene layout and find items that
-    are never visible to the users because they are located outside the screen
-    or hidden beneath other, visible elements.
-
-    \if defined(qtcreator)
-    If frames get dropped even though JavaScript is not being run, and there are
-    large, unexplained gaps in the timeline, check your custom QQuickItem
-    implementations. You can use \l{Using Valgrind Code Analysis Tools}
-    {Valgrind} or other general purpose profilers to analyze C++ code.
-
-    You can use \e {full stack tracing} to trace from the top level QML or
-    JavaScript down to the C++ and all the way to the kernel space. You can
-    view the collected data in the \l{Visualizing Chrome Trace Events}
-    {Chrome Trace Format Viewer}.
-    \endif
+    With QML Profiler, you can find causes for typical performance problems
+    in your applications, such as slowness and unresponsive, stuttering user
+    interfaces.
 
     \if defined(qtdesignstudio)
     \note In this section, you are using advanced menu items. These are not
     visible by default. To toggle the visibility of advanced menu items, see
-    \l{Customizing the Menu}.
+    \l{Customizing the Menu Bar}.
     \endif
 
-    \section1 Using QML Profiler
 
-    To monitor the performance of an application in the QML Profiler:
+    To collect data about a QML application:
 
     \list 1
-
-        \li To be able to profile an application, you must set up QML debugging
-            for the project. For more information, see
+        \li Set up QML debugging for the project. For more information, see
             \l{Setting Up QML Debugging}.
-
         \if defined(qtcreator)
         \li In the \uicontrol Projects mode, select a \l{glossary-buildandrun-kit}
             {kit} with Qt version 4.7.4 or later.
        \endif
-
             \note To profile applications on \l{glossary-device}{devices}, you
             must install Qt libraries on them.
-
-        \li Select \uicontrol Analyze > \uicontrol {QML Profiler} to profile the
+        \li Go to \uicontrol Analyze > \uicontrol {QML Profiler} to profile the
             current application.
-
-        \li Select the
-            \inlineimage icons/qtcreator-analyze-start-button.png
-            (\uicontrol Start) button to start the application from the
-            QML Profiler.
-
-            \note If data collection does not start automatically, select the
-            \inlineimage icons/recordfill.png
-            (\uicontrol {Enable Profiling}) button.
-
+            \image qtcreator-qml-profiler-toolbar.webp {QML Profiler}
+        \li Select \inlineimage icons/qtcreator-analyze-start-button.png
+            (\uicontrol Start) to start the application from QML Profiler.
     \endlist
 
-    When you start analyzing an application, the application is launched, and
-    the QML Profiler immediately begins to collect data. This is indicated by
+    QML Profiler immediately begins to collect data, as indicated by
     the time running in the \uicontrol Elapsed field.
 
-    Data is collected until you select the \uicontrol {Enable Profiling} button. Data
-    collection
-    takes time, and therefore, there might be a delay
-    before the data is displayed.
+    \note If data collection does not start automatically, select
+    \inlineimage icons/recordfill.png (\uicontrol {Enable Profiling}).
+
+    Data is collected until you select \inlineimage icons/recordfill.png again.
+    Data collection takes time, so expect a delay before seeing data.
 
     Do not use application commands to exit the application because data is
-    sent to the QML Profiler when you select the \uicontrol {Enable Profiling} button.
-    The application continues to run for some seconds, after which it is stopped
-    automatically. If you exit the application, the data is not sent.
+    sent to QML Profiler when you select \inlineimage icons/recordfill.png.
+    The application stops in seconds. If you exit the application, the data is
+    not sent.
 
-    Select the \uicontrol {Disable Profiling} button to disable the automatic
-    start of the data collection when an
-    application is launched. Data collection starts when you select the button
-    again.
+    Select \uicontrol {Disable Profiling} to disable the automatic start of the
+    data collection when an application is launched. Data collection starts when
+    you select the button again.
 
     To save all the collected data, select \uicontrol Analyze >
     \uicontrol {QML Profiler Options} > \uicontrol {Save QML Trace}. To view the saved
     data, select \uicontrol {Load QML Trace}. You can also deliver the saved data to
     others for examination or load data saved by them.
 
-    \section1 Specifying Flushing Settings
+    \section1 Flush data while profiling
 
-    You can specify flushing settings for the QML Profiler either globally for
-    all projects or separately for each project. To specify global settings,
-    select \preferences > \uicontrol Analyzer.
+    Set data flushing preferences either globally for all projects or separately
+    for each project.
 
-    To specify custom QML Profiler settings for a particular project, select
-    \uicontrol Projects > \uicontrol Run and then select \uicontrol Custom in
-    \uicontrol {QML Profiler Settings}. To restore the global settings for the
-    project, select \uicontrol {Restore Global}.
+    To set global preferences, go to \preferences >
+    \uicontrol Analyzer > \uicontrol {QML Profiler}.
 
-    \image qml-profiler-settings.png "QML Profiler Settings"
+    To specify custom QML Profiler settings for a particular project:
 
-    Select the \uicontrol {Flush data while profiling} check box to flush the
-    data periodically instead of flushing all data when profiling stops. This
-    saves memory on the target device and shortens the wait between the
-    profiling being stopped and the data being displayed.
+    \list 1
+        \li Go to \uicontrol Projects > \uicontrol Run.
+        \li In \uicontrol {QML Profiler Settings}, select \uicontrol Custom.
+            \image qml-profiler-settings.png {QML Profiler Settings}
+    \endlist
 
-    In the \uicontrol {Flush interval} field, set the flush interval in
-    milliseconds. The shorter the interval, the more often the data is flushed.
-    The longer the interval, the more data has to be buffered in the target
-    application, potentially wasting memory. However, the flushing itself takes
-    time, which can distort the profiling results.
+    You can set the following preferences:
 
-    If you have multiple QML engines and you want to aggregate the data produced
-    by all of them into one trace, select the \uicontrol {Process data only when
-    process ends} check box. Otherwise, the profiling stops when one of the
-    engines stops.
+    \table
+    \header
+        \li Setting
+        \li Value
+    \row
+        \li \uicontrol {Flush data while profiling}
+        \li Flush the data periodically instead of flushing all data when
+            profiling stops. This saves memory on the target device and shortens
+            the wait between the profiling being stopped and the data
+            being displayed.
+    \row
+        \li \uicontrol {Flush interval}
+        \li Set the flush interval in
+            milliseconds. The shorter the interval, the more often the
+            data is flushed. The longer the interval, the more data has
+            to be buffered in the target application, potentially wasting
+            memory. However, the flushing itself takes time, which can
+            distort the profiling results.
+    \row
+        \li \uicontrol {Process data only when process ends}
+        \li Aggregate data from many QML engines into one trace. Otherwise,
+            the profiling stops when one of the engines stops.
+    \endtable
+
+    To restore the global settings for the project, select
+    \uicontrol {Restore Global}.
 
-    \section1 Attaching to Running Qt Quick Applications
+    \section1 Attach to a running Qt Quick application
 
-    You can profile Qt Quick applications that are not launched by \QC.
+    You can profile a Qt Quick application that you do not run from \QC.
     However, you must enable QML debugging and profiling for the application
     in the project build settings. For more information, see
     \l{Setting Up QML Debugging}.
 
-    To attach to waiting applications:
+    To attach to a waiting application:
 
     \list 1
-        \li Select \uicontrol Analyze >
+        \li Go to \uicontrol Analyze >
             \uicontrol {QML Profiler (Attach to Waiting Application)}.
-            \image qml-profiler-start-dialog.png "Start QML Profiler dialog"
+            \image qml-profiler-start-dialog.png {Start QML Profiler dialog}
          \li In \uicontrol Kit, select the kit used to build the application.
          \li In \uicontrol Port, specify the port to listen to.
          \li Select \uicontrol OK.
     \endlist
 
+    \sa {Profiling QML applications}
+
+    \if defined(qtcreator)
+    \sa {Analyze}{How To: Analyze}, {Analyzers}, {Analyzing Code}
+    \endif
+*/
+
+/*!
+    \page creator-qml-performance-monitor.html
+    \if defined(qtdesignstudio)
+    \previouspage creator-qml-debugging-example.html
+    \nextpage creator-how-to-profile-qml.html
+    \else
+    \previouspage creator-reference.html
+    \endif
+
+    \ingroup creator-reference-analyzer
+
+    \title Profiling QML Applications
+
+    \brief Improve the performance of QML applications.
+
+    \if defined(qtdesignstudio)
+    \note In this section, you are using advanced menu items. These are not
+    visible by default. To toggle the visibility of advanced menu items, see
+    \l{Customizing the Menu}.
+    \endif
+
+    With QML Profiler, you can find causes for typical performance problems
+    in your applications, such as slowness and unresponsive, stuttering user
+    interfaces. Typical causes include executing too much JavaScript in too few
+    frames. All JavaScript must return before the GUI thread can proceed, and
+    frames are delayed or dropped if the GUI thread is not ready.
+
+    Another typical cause for similar performance problems is creating or
+    updating invisible items, which takes time in the GUI thread.
+
+    \if defined(qtcreator)
+    Triggering long-running C++ functions, such as paint methods and signal
+    handlers, also takes time in the GUI thread, but is more difficult to see in
+    QML Profiler because it does not profile C++ code.
+    \endif
+
+    To find excessive use of JavaScript, check the frame rate in animations and
+    Scene Graph events, look for gaps, and check whether the application behaves
+    as expected. The JavaScript category displays the run time of functions,
+    which you should try to keep below 16 ms per frame.
+
+    To find problems caused by handling invisible items, look for dropped
+    frames and check that you are not using too many short bindings or signal
+    handlers that are updated per frame. You can also \l{Visualizing Overdraw}
+    {visualize Scene Graph overdraw} to check scene layout and find items that
+    are never visible to the users because they are located outside the screen
+    or hidden beneath other, visible elements.
+
+    \if defined(qtcreator)
+    If frames get dropped even though JavaScript is not being run, and there are
+    large, unexplained gaps in the timeline, check your custom QQuickItem
+    implementations. You can use \l{Profile function execution}
+    {Valgrind Callgrind} or other general purpose profilers to analyze C++ code.
+
+    You can use \e {full stack tracing} to trace from the top level QML or
+    JavaScript down to the C++ and all the way to the kernel space. You can
+    view the collected data in the \l{Chrome Trace Format Visualizer}
+    {Chrome Trace Format Viewer}.
+    \endif
+
     \section1 Analyzing Collected Data
 
     The \uicontrol Timeline view displays graphical representations of QML and
     JavaScript execution and a condensed view of all recorded events.
 
-    \image qtcreator-qml-performance-monitor.png "QML Profiler"
+    \image qtcreator-qml-profiler.webp {QML Profiler}
 
     Each row in the timeline (6) describes a type of QML events that were
     recorded. Move the cursor on an event on a row to see how long it takes and
     where in the source it is being called. To display the information only when
-    an event is selected, disable the \uicontrol {View Event Information on Mouseover}
-    button (4).
+    an event is selected, turn off \uicontrol {View Event Information on Mouseover}
+    (4).
 
     The outline (10) summarizes the period for which data was collected. Drag
     the zoom range (8) or click the outline to move on the outline. You can
-    also move between events by selecting the \uicontrol {Jump to Previous Event}
-    and \uicontrol {Jump to Next Event} buttons (1).
+    also move between events by selecting \uicontrol {Jump to Previous Event}
+    and \uicontrol {Jump to Next Event} (1).
 
-    Select the \uicontrol {Show Zoom Slider} button (2) to open a slider that you can
-    use to set the zoom level. You can also drag the zoom handles (9). To reset
+    Select \uicontrol {Show Zoom Slider} (2) to open a slider that sets the zoom
+    level. You can also drag the zoom handles (9). To reset
     the default zoom level, right-click the timeline to open the context menu,
     and select \uicontrol {Reset Zoom}.
 
@@ -194,16 +229,16 @@
 
     \section2 Selecting Event Ranges
 
-    You can select an event range (7) to view the frame rate of events and to
-    compare it with the frame rate of similar events. Select the
-    \uicontrol {Select Range} button (3) to activate the selection tool. Then click in
+    Select an event range (7) to view the frame rate of events and to
+    compare it with the frame rate of similar events. Select
+    \uicontrol {Select Range} (3) to activate the selection tool. Then click in
     the timeline to specify the beginning of the event range. Drag the selection
     handle to define the end of the range. The length of the range indicates the
     frame rate of the event.
 
-    You can use event ranges also to measure delays between two subsequent
-    events. Place a range between the end of the first event and the beginning
-    of the second event. The \uicontrol Duration field displays the delay between the
+    To measure delays between two subsequent events, place an event range between
+    the end of the first event and the beginning of the second event. The
+    \uicontrol Duration field displays the delay between the
     events in milliseconds.
 
     To zoom into an event range, double-click it.
@@ -222,12 +257,12 @@
     they include location in source code, duration and some relevant parts of
     the source code itself.
 
-    You can click on an event to move the cursor in the code editor to the part
+    Select an event to move the cursor in the code editor to the part
     of the code the event is associated with.
 
     The following types of events are displayed in the timeline view on one or
-    several rows. The availability of event types depends on the version of Qt
-    the application was compiled with and the version of Qt Quick it is using.
+    several rows. The availability of event types depends on the Qt version that
+    you build the application with and the Qt Quick version you use.
 
     \table
 
@@ -345,18 +380,17 @@
 
     \section2 Analyzing Scene Graph Events
 
-    In order to understand the scene graph category, it's important to
-    understand how the Qt Quick scene graph works. See
-    \l {Qt Quick Scene Graph} and \l {Qt Quick Scene Graph Default Renderer}
-    for a detailed description. The following events are reported in the
+    To understand the scene graph category, read more about how
+    Qt Quick scene graph works in \l {Qt Quick Scene Graph} and
+    \l {Qt Quick Scene Graph Default Renderer}. The following events are reported in the
     \uicontrol {Scene Graph} category. Not all events are generated by all render
     loops. In the Windows and Basic render loops everything runs in the same
     thread and the distinction between GUI thread and render thread is
     meaningless.
 
-    If you set the environment variable QSG_RENDER_TIMING, you get a textual
+    Set the environment variable QSG_RENDER_TIMING, to get a textual
     output of similar, but slightly different timings from the application
-    being profiled. For easier orientation, the differences are listed below.
+    being profiled. The differences are listed below.
 
     \table
     \header
@@ -434,7 +468,7 @@
         \li Swapping frames after rendering.
         \li The output of swap times triggered by setting QSG_RENDER_TIMING is
             incorrect for the basic render loop and versions of Qt prior to
-            Qt 5.4. The QML profiler shows the correct swap times.
+            Qt 5.4. QML Profiler shows the correct swap times.
     \row
         \li \uicontrol {Render Preprocess}
         \li Render
@@ -550,7 +584,7 @@
     Synchronize happens in scene graph synchronizing phase, while prepare and
     render happen in scene graph rendering phase.
 
-    Setting the environment variable \c QSG_RENDERER_DEBUG=render will also give
+    Set the environment variable \c QSG_RENDERER_DEBUG=render to get
     additional textual output of render call counts of different rendering passes.
     These call counts are summed up in the Render Frame event.
 
@@ -616,24 +650,24 @@
 
     The \uicontrol Statistics view displays the number of times each binding, create,
     compile, JavaScript, or signal event is triggered and the average time it
-    takes. This allows you to examine which events you need to optimize. A high
+    takes. Examine the statistics to learn which events to optimize. A high
     number of occurrences might indicate that an event is triggered
     unnecessarily. To view the median, longest, and shortest time for the
     occurrences, select \uicontrol {Extended Event Statistics} in the context menu.
 
-    Click on an event to move to it in the source code
+    Select an event to move to it in the source code
     in the code editor.
 
     \image qml-profiler-statistics.png "Statistics view"
 
-    The \uicontrol Callers and \uicontrol Callees panes show dependencies between events.
+    \uicontrol Callers and \uicontrol Callees show dependencies between events.
     They allow you to examine the internal functions of the application.
-    The \uicontrol Callers pane summarizes the QML events that trigger a binding.
+    \uicontrol Callers summarizes the QML events that trigger a binding.
     This tells you what caused a change in a binding.
-    The \uicontrol Callees pane summarizes the QML events that a binding triggers.
+    \uicontrol Callees summarizes the QML events that a binding triggers.
     This tells you which QML events are affected if you change a binding.
 
-    Click on an event to move to it in the source code in the code editor.
+    Select an event to move to it in the source code in the code editor.
 
     When you select an event in the \uicontrol Timeline view, information about
     it is displayed in the \uicontrol Statistics and \uicontrol {Flame Graph}
@@ -643,7 +677,7 @@
     \uicontrol {Copy Table} or \uicontrol {Copy Row} in the context menu.
 
     JavaScript events are shown in the \uicontrol Statistics view only for applications
-    that use Qt Quick 2 and are compiled with Qt 5.3 or later.
+    that use Qt Quick 2 and are built with Qt 5.3 or later.
 
     \section2 Visualizing Statistics as Flame Graphs
 
@@ -671,4 +705,9 @@
     suitable for analyzing per frame execution times. However, it is very easy
     to see the total impact of the various QML and JavaScript events there.
 
+    \sa {Profile QML applications}
+
+    \if defined(qtcreator)
+    \sa {Analyze}{How To: Analyze}, {Analyzers}, {Analyzing Code}
+    \endif
 */
diff --git a/doc/qtcreator/src/user-interface/creator-file-system-view.qdoc b/doc/qtcreator/src/user-interface/creator-file-system-view.qdoc
index 24f3b38479..a8ce9dbb5a 100644
--- a/doc/qtcreator/src/user-interface/creator-file-system-view.qdoc
+++ b/doc/qtcreator/src/user-interface/creator-file-system-view.qdoc
@@ -1,4 +1,4 @@
-// Copyright (C) 2023 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
@@ -15,7 +15,11 @@
 
     \title File System
 
+    \if defined(qtdesignstudio)
+    \brief View all the files in the current directory.
+    \else
     \brief Shows all the files in the current directory.
+    \endif
 
     \if defined(qtcreator)
     \note Usually, \l{Navigate with locator}{searching with the locator}
@@ -25,14 +29,14 @@
 
     \image qtcreator-filesystem-view.webp {File System view in the sidebar}
     \else
-    \image qtcreator-filesystem-view-design.png {File System view}
+    \image filesystem-view-design.webp {File System view}
     \endif
 
-    To move to the root directory of the file system, select \uicontrol Computer
-    in the menu (1). Select \uicontrol Home to move to the user's home
-    directory. Further, you can select a project to move to an open project
-    or \uicontrol Projects to move to the directory specified in the
-    \uicontrol {Projects directory} field in \preferences >
+    To go to the root directory of the file system, select \uicontrol Computer
+    in the menu (1). Select \uicontrol Home to go to the user's home
+    directory. Further, you can select a project to go to an open project
+    or \uicontrol Projects to go to the directory specified in
+    \uicontrol {Projects directory} in \preferences >
     \uicontrol {Build & Run} > \uicontrol General.
 
     The file that is currently active in the editor determines which folder
@@ -46,12 +50,13 @@
     \endlist
 
     To stop the synchronization between the editor and the
-    \uicontrol {File System} view, deselect the \inlineimage icons/linkicon.png
-    (\uicontrol {Synchronize Root Directory with Editor}) button.
+    \uicontrol {File System} view, clear \inlineimage icons/linkicon.png
+    (\uicontrol {Synchronize Root Directory with Editor}).
 
     The view displays the path to the active file as bread crumbs. You can move
     to any directory along the path by clicking it.
 
+    \if defined(qtcreator)
     \section1 File System Context Menu
 
     Use the context menu functions to:
@@ -64,34 +69,24 @@
             that has the file. To specify the terminal to use on Linux and
             \macos, select \preferences > \uicontrol Environment >
             \uicontrol System.
-            \if defined(qtcreator)
             To use an \l{Terminal} {internal terminal}, select \preferences >
             \uicontrol Terminal > \uicontrol {Use internal terminal}.
-            \endif
         \li Search in the selected directory.
         \li View file properties, such as name, path, MIME type, default editor,
             line endings, indentation, owner, size, last read and modified
             dates, and permissions.
-        \li Create new files. For more information, see
-            \if defined(qtdesignstudio)
-            \l{Adding Files to Projects}.
-            \else
-            \l{Create files}.
-            \endif
+        \li Create new files. For more information, see {Create files}.
         \li Rename existing files. To move the file to another directory, enter
             the relative or absolute path to its new location in addition to the
             new filename.
         \li Remove existing files.
         \li Create new folders.
-        \if defined(qtcreator)
         \li Compare the selected file with the currently open file in the diff
             editor. For more information, see \l{Compare files}.
-        \endif
         \li Display the contents of a particular directory in the view.
         \li Collapse all open folders.
     \endlist
 
-    \if defined(qtcreator)
     \section1 File System View Toolbar
 
     The toolbar in the \uicontrol {File System} view has additional
@@ -101,16 +96,15 @@
     (\uicontrol Options):
 
     \list
-        \li To hide the bread crumbs, deselect the
-            \uicontrol {Show Bread Crumbs} check box.
+        \li To hide the bread crumbs, clear \uicontrol {Show Bread Crumbs}.
         \li By default, the view separates folders from files and lists them
-            first. To list all items in alphabetic order, deselect the
-            \uicontrol {Show Folders on Top} check box.
+            first. To list all items in alphabetic order, clear
+            \uicontrol {Show Folders on Top}.
         \li To also show hidden files, select \uicontrol {Show Hidden Files}.
     \endlist
 
     To stop the synchronization with the file currently open in the
-    editor, deselect \inlineimage icons/linkicon.png
+    editor, clear \inlineimage icons/linkicon.png
     (\uicontrol {Synchronize with Editor}).
 
     \sa {View CMake project contents}, {Projects}
diff --git a/doc/qtcreator/src/user-interface/creator-only/creator-how-to-show-and-hide-sidebars.qdoc b/doc/qtcreator/src/user-interface/creator-only/creator-how-to-show-and-hide-sidebars.qdoc
index 230ce2adde..106562ab55 100644
--- a/doc/qtcreator/src/user-interface/creator-only/creator-how-to-show-and-hide-sidebars.qdoc
+++ b/doc/qtcreator/src/user-interface/creator-only/creator-how-to-show-and-hide-sidebars.qdoc
@@ -15,7 +15,7 @@
 
     Select views in the sidebar menu (1):
 
-    \image qtcreator-sidebar.png
+    \image qtcreator-sidebar.webp {Views open in the sidebar}
 
     You can change the view of the sidebars in the following ways:
 
diff --git a/doc/qtcreator/src/user-interface/creator-open-documents-view.qdoc b/doc/qtcreator/src/user-interface/creator-open-documents-view.qdoc
index 87760c448c..67c0134c78 100644
--- a/doc/qtcreator/src/user-interface/creator-open-documents-view.qdoc
+++ b/doc/qtcreator/src/user-interface/creator-open-documents-view.qdoc
@@ -1,4 +1,4 @@
-// Copyright (C) 2023 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
@@ -16,13 +16,26 @@
 
     \title Open Documents
 
+    \if defined(qtdesignstudio)
+    \brief View currently open files.
+    \else
     \brief Shows currently open files.
+    \endif
 
+    \if defined(qtdesignstudio)
+    \image open-documents-view.webp {Open Documents view}
+    \else
     \image qtcreator-open-documents-view.png {Open Documents view}
+    \endif
 
     You can use the context menu to apply some of the functions also available
-    in the \uicontrol File menu and in the \l {File System Context Menu}
-    {File System} view to the file that you select in the view.
+    in the \uicontrol File menu and in the
+    \if defined(qtcreator)
+    \l {File System Context Menu}{File System}
+    \else
+    \uicontrol {File System}
+    \endif
+    view to the file that you select in the view.
 
     In addition, you can:
 
diff --git a/doc/qtcreator/src/user-interface/creator-projects-view.qdoc b/doc/qtcreator/src/user-interface/creator-projects-view.qdoc
index b6b74f0993..d28e6f9ef0 100644
--- a/doc/qtcreator/src/user-interface/creator-projects-view.qdoc
+++ b/doc/qtcreator/src/user-interface/creator-projects-view.qdoc
@@ -1,4 +1,4 @@
-// Copyright (C) 2023 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
@@ -15,7 +15,11 @@
 
     \title Projects
 
+    \if defined(qtdesignstudio)
+    \brief View a list of the files contained within the open project.
+    \else
     \brief Shows a list of projects in a project tree.
+    \endif
 
     \if defined(qtcreator)
     The project tree has a list of all projects open in the current
@@ -29,7 +33,7 @@
     is the fastest way to find a particular project, file, class, or function,
     or almost anything else in your project.
     \else
-    \image qtcreator-projects-view-design.png {Projects view}
+    \image projects-view-design.webp {Projects view}
     \endif
 
     You can use the project tree in the following ways:
@@ -43,14 +47,19 @@
             Use the \l{Switch between modes} {mode selector} to open the current
             file in another editor.
             \endif
-        \li To bring up a \l{Projects View Context Menu}{context menu}
+        \li To open a
+            \if defined(qtcreator)
+            \l{Projects View Context Menu}{context menu}
+            \else
+            context menu
+            \endif
             that has the actions most commonly needed, right-click an
             item in the project tree. For example, through the menu of
             the project root directory you can, among other actions, run
             and close the project.
         \li To see the absolute path of a file, move the mouse pointer over the
             file name.
-        \li To move files from one project to another, drag-and-drop them
+        \li To move files from one project to another, drag them
             in the project tree. \QC makes the necessary changes to project
             configuration files.
     \endlist
@@ -58,6 +67,7 @@
     \note If you cannot see a file in the \l Projects view, switch to the
     \uicontrol {File System} view, which shows all the files in the file system.
 
+    \if defined(qtcreator)
     \section1 Projects View Context Menu
 
     The \uicontrol Projects view has context menus for managing projects,
@@ -65,22 +75,15 @@
     projects and subprojects:
 
     \list
-        \if defined(qtcreator)
         \li Set a project as the active project.
-        \endif
         \li Execute \uicontrol Build menu commands.
         \li Create new files. For more information, see
-            \if defined(qtdesignstudio)
-            \l{Adding Files to Projects}.
-            \else
             \l{Create files}.
-            \endif
         \li Rename existing files. If you change the base name of a
             file, \QC displays a list of other files with the same base name
             and offers to rename them as well. If you rename a UI file (.ui),
             \QC also changes corresponding include statements accordingly.
         \li Remove existing files.
-        \if defined(qtcreator)
         \li Remove existing directories from \l{Import an existing project}
             {generic projects}.
         \li Add existing files and directories.
@@ -88,16 +91,13 @@
             \l{Add libraries to qmake projects}.
         \li Add and remove subprojects.
         \li Find unused functions.
-        \endif
         \li Search in the selected directory.
 
         \li Open a terminal window in the project directory. To specify the
             terminal to use on Linux and \macos, select \preferences >
             \uicontrol Environment > \uicontrol System.
-            \if defined(qtcreator)
             To use an \l{Terminal}{internal terminal}, select \preferences >
             \uicontrol Terminal > \uicontrol {Use internal terminal}.
-            \endif
         \li Open a terminal window in the project directory that you configured
             for building or running the project.
         \li Expand or collapse the tree view to show or hide all files and
@@ -114,7 +114,6 @@
     the \l {File System} view. To view a project in it, select
     \uicontrol {Show in File System View}.
 
-    \if defined(qtcreator)
     \section1 Projects View Toolbar
 
     The toolbar in the \uicontrol Projects view has additional options.
diff --git a/doc/qtcreator/src/user-interface/creator-ui.qdoc b/doc/qtcreator/src/user-interface/creator-ui.qdoc
index 9041e6432f..9794667f5b 100644
--- a/doc/qtcreator/src/user-interface/creator-ui.qdoc
+++ b/doc/qtcreator/src/user-interface/creator-ui.qdoc
@@ -95,7 +95,7 @@
     \endif
 
     \if defined(qtdesignstudio)
-    \section1 Customizing the Menu
+    \section1 Customizing the Menu Bar
 
     By default, top-level menu items \uicontrol Build, \uicontrol Debug, and
     \uicontrol Analyze are not visible. These menu items have options for
@@ -113,6 +113,9 @@
 
     You need to restart \QDS to apply changes made to these settings.
 
+    \note To show or hide the \uicontrol {Menu Bar}, select \uicontrol View >
+    \uicontrol {Show Menu Bar}, or use \key {Ctrl+Alt+M}.
+
     \section1 Customizing the UI
 
     The following topics describe how to customize the UI:
diff --git a/doc/qtcreator/src/vcs/creator-vcs-git.qdoc b/doc/qtcreator/src/vcs/creator-vcs-git.qdoc
index ea23e53443..e853a86812 100644
--- a/doc/qtcreator/src/vcs/creator-vcs-git.qdoc
+++ b/doc/qtcreator/src/vcs/creator-vcs-git.qdoc
@@ -30,10 +30,6 @@
     You can use the \l{http://code.google.com/p/gerrit/}{Gerrit} code review
     tool for projects that use Git.
 
-    \if defined(qtdesignstudio)
-    \include creator-vcs-options.qdocinc vcs options
-    \endif
-
     \if defined(qtcreator)
     \section1 Using Git for Windows
 
diff --git a/doc/qtcreator/src/webassembly/creator-webassembly.qdoc b/doc/qtcreator/src/webassembly/creator-webassembly.qdoc
index 4a459e8cdd..e4bea34751 100644
--- a/doc/qtcreator/src/webassembly/creator-webassembly.qdoc
+++ b/doc/qtcreator/src/webassembly/creator-webassembly.qdoc
@@ -24,7 +24,7 @@
     \note Enable the WebAssembly plugin to use it.
 
     To build applications for the web and run them in a web browser, you need to
-    install Qt for WebAssembly and the tool chain for compiling to WebAssembly.
+    install Qt for WebAssembly and the toolchain for compiling to WebAssembly.
 
     \section1 Requirements
 
@@ -35,12 +35,12 @@
         \li Qt for WebAssembly 5.15, or later
         \li On Windows: \l{http://wiki.qt.io/MinGW}{\MinGW} 7.3.0, or later
         \li \l{https://emscripten.org/docs/introducing_emscripten/index.html}
-            {emscripten} tool chain for compiling to WebAssembly
+            {emscripten} toolchain for compiling to WebAssembly
     \endlist
 
     \section1 Setting Up the Development Environment
 
-    You need to install and configure Qt for WebAssembly and the tool chain for
+    You need to install and configure Qt for WebAssembly and the toolchain for
     compiling to WebAssembly. \QOI automatically adds a build and
     run kit to \QC.
 
diff --git a/doc/qtcreatordev/src/plugin-metadata.qdoc b/doc/qtcreatordev/src/plugin-metadata.qdoc
index b233ef60bc..20d4073fd1 100644
--- a/doc/qtcreatordev/src/plugin-metadata.qdoc
+++ b/doc/qtcreatordev/src/plugin-metadata.qdoc
@@ -323,6 +323,27 @@
     }
     \endcode
 
+    \section2 Other Meta Data
+
+    \table
+        \header
+            \li Key
+            \li Value Type
+            \li Meaning
+        \row
+            \li Mimetypes
+            \li String or array of strings
+            \li Possibly multiple lines of
+                \l{https://www.freedesktop.org/wiki/Specifications/shared-mime-info-spec/}{XML MIME-info}
+                used for registering additional or adapting built-in MIME types.
+        \row
+            \li JsonWizardPaths
+            \li Array of strings
+            \li A list of paths relative to the plugin location or paths to the
+                \l{The Qt Resource System}{Qt resource system} that are searched for
+                \l{http://doc.qt.io/qtcreator/creator-project-wizards.html}{template-based wizards}.
+    \endtable
+
     \section2 A Note on Plugin Versions
 
     Plugin versions are in the form \c{x.y.z_n} where, \c x, \c y, \c z and \c n are
diff --git a/doc/qtcreatordev/src/qtcreator-dev.qdoc b/doc/qtcreatordev/src/qtcreator-dev.qdoc
index 368298b31f..ae68f3f407 100644
--- a/doc/qtcreatordev/src/qtcreator-dev.qdoc
+++ b/doc/qtcreatordev/src/qtcreator-dev.qdoc
@@ -138,7 +138,7 @@
 
     Most software projects and development processes require various external
     tools. Several external tools, such as popular version control systems and
-    build tool chains are integrated into \QC. However, it is impossible for a
+    build toolchains are integrated into \QC. However, it is impossible for a
     single tool to cover all the use cases, and therefore you can integrate
     additional tools to \QC.
 
diff --git a/doc/qtcreatordev/src/qtcreator-module.qdoc b/doc/qtcreatordev/src/qtcreator-module.qdoc
index 83d0b3fe15..652f715133 100644
--- a/doc/qtcreatordev/src/qtcreator-module.qdoc
+++ b/doc/qtcreatordev/src/qtcreator-module.qdoc
@@ -92,7 +92,7 @@
                 handling.
 
         \row
-            \li \l{Debugger}
+            \li \l{Debugging}
             \li Debugging functionality.
 
         \row
diff --git a/doc/qtdesignstudio/config/qtdesignstudio.qdocconf b/doc/qtdesignstudio/config/qtdesignstudio.qdocconf
index 72b38940f7..95d1475cf1 100644
--- a/doc/qtdesignstudio/config/qtdesignstudio.qdocconf
+++ b/doc/qtdesignstudio/config/qtdesignstudio.qdocconf
@@ -120,4 +120,9 @@ macro.function                  = "\\fn"
 macro.QMLD                      = "Qt Design Studio"
 
 navigation.landingpage = "$IDE_DISPLAY_NAME Manual"
+
+# Auto-generate navigation linking based on "All Topics":
+navigation.toctitles = "All Topics"
+navigation.toctitles.inclusive = false
+
 buildversion = "$IDE_DISPLAY_NAME Manual $QTC_VERSION"
diff --git a/doc/qtdesignstudio/examples/doc/FresnelExample.qdoc b/doc/qtdesignstudio/examples/doc/FresnelExample.qdoc
new file mode 100644
index 0000000000..8dbc8bcfbf
--- /dev/null
+++ b/doc/qtdesignstudio/examples/doc/FresnelExample.qdoc
@@ -0,0 +1,90 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
+
+/*!
+    \page fresnel-effect-example.html
+    \ingroup studioexamples
+
+    \title Fresnel Example
+    \brief Illustrates how to work with the fresnel effect.
+
+    \image fresnel-example.webp
+
+    The \e{Fresnel} example illustrates how to add and adjust a fresnel effect on
+    a 3D model.
+
+    The fresnel effect affects how materials reflect light at different viewing angles. Imagine the
+    water on a lake. If you look down at the water from straight above, you can see through the
+    water, but if you look from a lower angle, the reflections are stronger.
+
+    \image fresnel-angle.webp
+
+    \section1 Running the Example
+
+    To run the example in \QDS, go to the \uicontrol Welcome screen and select the example
+    from the \uicontrol Examples tab.
+
+    \section1 The 3D Scene
+
+    The example project consists of a basic 3D scene with the following components:
+
+    \list
+      \li A 3D model.
+      \li A directional light.
+      \li An HDR image used to light the scene (image-based lighting).
+    \endlist
+
+    \section1 The Material
+
+    The material on the 3D model in this example is a principled material with a
+    clearcoat.
+
+    \section2 Clearcoat
+
+    A clearcoat is an additional specular layer applied to the surface of a material. The
+    clearcoating is transparent and doesn't add any color to the material, but it affects
+    how light interacts with the material.
+
+    You adjust clearcoat properties independently from the base material.
+
+    \section2 Fresnel Properties
+
+    The following properties affect how the fresnel effect renders. These properties are
+    available both for the base material and the clearcoat layer. Adjusting the settings for the
+    clearcoat has a bigger visual effect.
+
+    \table
+      \header
+        \li Property
+        \li Description
+      \row
+        \li Fresnel power
+        \li Increasing the fresnel power decreases the head-on reflections (steep viewing angle)
+            while maintaining the reflections seen from more shallow viewing angles.
+      \row
+        \li Enable scale and bias
+        \li Takes the scale and bias properties into account.
+      \row
+        \li Scale
+        \li Determines the rate of change in reflection intensity as the viewing angle varies. A
+        large scale value results in a gentler transition between weak and strong reflections, while
+        a smaller scale creates a more abrupt shift in reflection intensity.
+      \row
+        \li Bias
+        \li Controls the offset for the fresnel power property and determines how quickly the
+        reflection transitions from weak to strong as the viewing
+        angle changes. A larger bias value shifts the transition point toward steeper angles.
+    \endtable
+
+    \section3 Adjusting the Fresnel Settings
+
+    To adjust the settings:
+
+    \list 1
+      \li In \uicontrol {Material Browser}, double-click \e {Monkey Material}.
+      \li In \uicontrol {Material Editor}, find the properties under
+      \uicontrol {Clearcoat} and \uicontrol {Fresnel} respectively.
+    \endlist
+
+    \note You see the changes live as you edit them in the \uicontrol 2D view.
+*/
diff --git a/doc/qtdesignstudio/examples/doc/images/fresnel-angle.webp b/doc/qtdesignstudio/examples/doc/images/fresnel-angle.webp
new file mode 100644
index 0000000000..2fe11380f0
--- /dev/null
+++ b/doc/qtdesignstudio/examples/doc/images/fresnel-angle.webp
diff --git a/doc/qtdesignstudio/examples/doc/images/fresnel-example.webp b/doc/qtdesignstudio/examples/doc/images/fresnel-example.webp
new file mode 100644
index 0000000000..75436595aa
--- /dev/null
+++ b/doc/qtdesignstudio/examples/doc/images/fresnel-example.webp
diff --git a/doc/qtdesignstudio/examples/doc/rainSnowParticles.qdoc b/doc/qtdesignstudio/examples/doc/rainSnowParticles.qdoc
index 88dbd5fbdb..5cc040d427 100644
--- a/doc/qtdesignstudio/examples/doc/rainSnowParticles.qdoc
+++ b/doc/qtdesignstudio/examples/doc/rainSnowParticles.qdoc
@@ -41,7 +41,7 @@
 
     Now you have added a particle system to your scene.
 
-    \image rain-snow-tutorial-particle-system
+    \image rain-snow-tutorial-particle-system.png
 
     \section2 Adjusting the Behavior and Apperance of the Particle System
     Next, you adjust the position, behavior, and apperance of the particle
diff --git a/doc/qtdesignstudio/images/3d-view-context-menu.png b/doc/qtdesignstudio/images/3d-view-context-menu.png
deleted file mode 100644
index 5b08c568cb..0000000000
--- a/doc/qtdesignstudio/images/3d-view-context-menu.png
+++ /dev/null
diff --git a/doc/qtdesignstudio/images/3d-view-context-menu.webp b/doc/qtdesignstudio/images/3d-view-context-menu.webp
new file mode 100644
index 0000000000..1b58f9bded
--- /dev/null
+++ b/doc/qtdesignstudio/images/3d-view-context-menu.webp
diff --git a/doc/qtdesignstudio/images/camera-look-at-node.webp b/doc/qtdesignstudio/images/camera-look-at-node.webp
new file mode 100644
index 0000000000..e5a92308a3
--- /dev/null
+++ b/doc/qtdesignstudio/images/camera-look-at-node.webp
diff --git a/doc/qtdesignstudio/images/edit-list-model-model-editor.webp b/doc/qtdesignstudio/images/edit-list-model-model-editor.webp
new file mode 100644
index 0000000000..e7f47c6402
--- /dev/null
+++ b/doc/qtdesignstudio/images/edit-list-model-model-editor.webp
diff --git a/doc/qtdesignstudio/images/filesystem-view-design.webp b/doc/qtdesignstudio/images/filesystem-view-design.webp
new file mode 100644
index 0000000000..8d59b85482
--- /dev/null
+++ b/doc/qtdesignstudio/images/filesystem-view-design.webp
diff --git a/doc/qtdesignstudio/images/icons/add_material.png b/doc/qtdesignstudio/images/icons/add_material.png
new file mode 100644
index 0000000000..6ecb64a180
--- /dev/null
+++ b/doc/qtdesignstudio/images/icons/add_material.png
diff --git a/doc/qtdesignstudio/images/icons/add_texture.png b/doc/qtdesignstudio/images/icons/add_texture.png
new file mode 100644
index 0000000000..8b94da637d
--- /dev/null
+++ b/doc/qtdesignstudio/images/icons/add_texture.png
diff --git a/doc/qtdesignstudio/images/icons/camera_speed.png b/doc/qtdesignstudio/images/icons/camera_speed.png
new file mode 100644
index 0000000000..6fcabb05c8
--- /dev/null
+++ b/doc/qtdesignstudio/images/icons/camera_speed.png
diff --git a/doc/qtdesignstudio/images/icons/easing-curve-spline.png b/doc/qtdesignstudio/images/icons/easing-curve-spline.png
new file mode 100644
index 0000000000..d76bf15f21
--- /dev/null
+++ b/doc/qtdesignstudio/images/icons/easing-curve-spline.png
diff --git a/doc/qtdesignstudio/images/icons/easing-curve-spline-icon.png b/doc/qtdesignstudio/images/icons/easing-curve-unify.png
index c5328bed8a..c5328bed8a 100644
--- a/doc/qtdesignstudio/images/icons/easing-curve-spline-icon.png
+++ b/doc/qtdesignstudio/images/icons/easing-curve-unify.png
diff --git a/doc/qtdesignstudio/images/icons/export.png b/doc/qtdesignstudio/images/icons/export.png
new file mode 100644
index 0000000000..6d6f15bd4a
--- /dev/null
+++ b/doc/qtdesignstudio/images/icons/export.png
diff --git a/doc/qtdesignstudio/images/icons/import.png b/doc/qtdesignstudio/images/icons/import.png
new file mode 100644
index 0000000000..b4ca149761
--- /dev/null
+++ b/doc/qtdesignstudio/images/icons/import.png
diff --git a/doc/qtdesignstudio/images/icons/reverse_order.png b/doc/qtdesignstudio/images/icons/reverse_order.png
new file mode 100644
index 0000000000..5e661b29cc
--- /dev/null
+++ b/doc/qtdesignstudio/images/icons/reverse_order.png
diff --git a/doc/qtdesignstudio/images/material-editor-browser.webp b/doc/qtdesignstudio/images/material-editor-browser.webp
index 160c96e877..1865bf8a54 100644
--- a/doc/qtdesignstudio/images/material-editor-browser.webp
+++ b/doc/qtdesignstudio/images/material-editor-browser.webp
diff --git a/doc/qtdesignstudio/images/materials-remove-material.png b/doc/qtdesignstudio/images/materials-remove-material.png
deleted file mode 100644
index 9ef0a91e5b..0000000000
--- a/doc/qtdesignstudio/images/materials-remove-material.png
+++ /dev/null
diff --git a/doc/qtdesignstudio/images/materials-remove-material.webp b/doc/qtdesignstudio/images/materials-remove-material.webp
new file mode 100644
index 0000000000..64d1d19891
--- /dev/null
+++ b/doc/qtdesignstudio/images/materials-remove-material.webp
diff --git a/doc/qtdesignstudio/images/model-editor-new-model.webp b/doc/qtdesignstudio/images/model-editor-new-model.webp
new file mode 100644
index 0000000000..6ea705a047
--- /dev/null
+++ b/doc/qtdesignstudio/images/model-editor-new-model.webp
diff --git a/doc/qtdesignstudio/images/navigator-material-texture.png b/doc/qtdesignstudio/images/navigator-material-texture.png
deleted file mode 100644
index 849625e1eb..0000000000
--- a/doc/qtdesignstudio/images/navigator-material-texture.png
+++ /dev/null
diff --git a/doc/qtdesignstudio/images/navigator-material-texture.webp b/doc/qtdesignstudio/images/navigator-material-texture.webp
new file mode 100644
index 0000000000..5ac9152627
--- /dev/null
+++ b/doc/qtdesignstudio/images/navigator-material-texture.webp
diff --git a/doc/qtdesignstudio/images/open-documents-view.webp b/doc/qtdesignstudio/images/open-documents-view.webp
new file mode 100644
index 0000000000..c3080b92b5
--- /dev/null
+++ b/doc/qtdesignstudio/images/open-documents-view.webp
diff --git a/doc/qtdesignstudio/images/projects-view-design.webp b/doc/qtdesignstudio/images/projects-view-design.webp
new file mode 100644
index 0000000000..6fd1e6333c
--- /dev/null
+++ b/doc/qtdesignstudio/images/projects-view-design.webp
diff --git a/doc/qtdesignstudio/images/qmldesigner-canvas-color.png b/doc/qtdesignstudio/images/qmldesigner-canvas-color.png
deleted file mode 100644
index 6baef3eb90..0000000000
--- a/doc/qtdesignstudio/images/qmldesigner-canvas-color.png
+++ /dev/null
diff --git a/doc/qtdesignstudio/images/qmldesigner-canvas-color.webp b/doc/qtdesignstudio/images/qmldesigner-canvas-color.webp
new file mode 100644
index 0000000000..3474076844
--- /dev/null
+++ b/doc/qtdesignstudio/images/qmldesigner-canvas-color.webp
diff --git a/doc/qtdesignstudio/images/qmldesigner-element-properties.png b/doc/qtdesignstudio/images/qmldesigner-element-properties.png
deleted file mode 100644
index 0a8c4a1041..0000000000
--- a/doc/qtdesignstudio/images/qmldesigner-element-properties.png
+++ /dev/null
diff --git a/doc/qtdesignstudio/images/qmldesigner-element-properties.webp b/doc/qtdesignstudio/images/qmldesigner-element-properties.webp
new file mode 100644
index 0000000000..a90062d6be
--- /dev/null
+++ b/doc/qtdesignstudio/images/qmldesigner-element-properties.webp
diff --git a/doc/qtdesignstudio/images/qmldesigner-form-editor-move-cursor.png b/doc/qtdesignstudio/images/qmldesigner-form-editor-move-cursor.png
deleted file mode 100644
index 018a94c88f..0000000000
--- a/doc/qtdesignstudio/images/qmldesigner-form-editor-move-cursor.png
+++ /dev/null
diff --git a/doc/qtdesignstudio/images/qmldesigner-form-editor-move-cursor.webp b/doc/qtdesignstudio/images/qmldesigner-form-editor-move-cursor.webp
new file mode 100644
index 0000000000..a1b7f83e8d
--- /dev/null
+++ b/doc/qtdesignstudio/images/qmldesigner-form-editor-move-cursor.webp
diff --git a/doc/qtdesignstudio/images/qmldesigner-form-editor.png b/doc/qtdesignstudio/images/qmldesigner-form-editor.png
deleted file mode 100644
index f32f6965ba..0000000000
--- a/doc/qtdesignstudio/images/qmldesigner-form-editor.png
+++ /dev/null
diff --git a/doc/qtdesignstudio/images/qmldesigner-form-editor.webp b/doc/qtdesignstudio/images/qmldesigner-form-editor.webp
new file mode 100644
index 0000000000..b360c5c241
--- /dev/null
+++ b/doc/qtdesignstudio/images/qmldesigner-form-editor.webp
diff --git a/doc/qtdesignstudio/images/qmldesigner-preview-size.png b/doc/qtdesignstudio/images/qmldesigner-preview-size.png
deleted file mode 100644
index 1a4a5e01ee..0000000000
--- a/doc/qtdesignstudio/images/qmldesigner-preview-size.png
+++ /dev/null
diff --git a/doc/qtdesignstudio/images/qmldesigner-preview-size.webp b/doc/qtdesignstudio/images/qmldesigner-preview-size.webp
new file mode 100644
index 0000000000..37f0c32ecf
--- /dev/null
+++ b/doc/qtdesignstudio/images/qmldesigner-preview-size.webp
diff --git a/doc/qtdesignstudio/images/qmldesigner-snap-margins.png b/doc/qtdesignstudio/images/qmldesigner-snap-margins.png
deleted file mode 100644
index 703ed8cc9a..0000000000
--- a/doc/qtdesignstudio/images/qmldesigner-snap-margins.png
+++ /dev/null
diff --git a/doc/qtdesignstudio/images/qmldesigner-snap-margins.webp b/doc/qtdesignstudio/images/qmldesigner-snap-margins.webp
new file mode 100644
index 0000000000..c6ea462063
--- /dev/null
+++ b/doc/qtdesignstudio/images/qmldesigner-snap-margins.webp
diff --git a/doc/qtdesignstudio/images/qmldesigner-transition-editor-startup.png b/doc/qtdesignstudio/images/qmldesigner-transition-editor-startup.png
deleted file mode 100644
index d269470e0d..0000000000
--- a/doc/qtdesignstudio/images/qmldesigner-transition-editor-startup.png
+++ /dev/null
diff --git a/doc/qtdesignstudio/images/qmldesigner-transition-editor-startup.webp b/doc/qtdesignstudio/images/qmldesigner-transition-editor-startup.webp
new file mode 100644
index 0000000000..a246e48411
--- /dev/null
+++ b/doc/qtdesignstudio/images/qmldesigner-transition-editor-startup.webp
diff --git a/doc/qtdesignstudio/images/qmldesigner-transitions.webp b/doc/qtdesignstudio/images/qmldesigner-transitions.webp
new file mode 100644
index 0000000000..ca4aae53ff
--- /dev/null
+++ b/doc/qtdesignstudio/images/qmldesigner-transitions.webp
diff --git a/doc/qtdesignstudio/images/qmldesigner-zooming.gif b/doc/qtdesignstudio/images/qmldesigner-zooming.gif
index d8d5beb6b3..82de8223be 100644
--- a/doc/qtdesignstudio/images/qmldesigner-zooming.gif
+++ b/doc/qtdesignstudio/images/qmldesigner-zooming.gif
diff --git a/doc/qtdesignstudio/images/qtquick-assets-tab.png b/doc/qtdesignstudio/images/qtquick-assets-tab.png
deleted file mode 100644
index 11c4fe54b4..0000000000
--- a/doc/qtdesignstudio/images/qtquick-assets-tab.png
+++ /dev/null
diff --git a/doc/qtdesignstudio/images/qtquick-assets-tab.webp b/doc/qtdesignstudio/images/qtquick-assets-tab.webp
new file mode 100644
index 0000000000..2e65a7edd9
--- /dev/null
+++ b/doc/qtdesignstudio/images/qtquick-assets-tab.webp
diff --git a/doc/qtdesignstudio/images/qtquick-designer-rotating-items.png b/doc/qtdesignstudio/images/qtquick-designer-rotating-items.png
deleted file mode 100644
index f20669be4e..0000000000
--- a/doc/qtdesignstudio/images/qtquick-designer-rotating-items.png
+++ /dev/null
diff --git a/doc/qtdesignstudio/images/qtquick-designer-rotating-items.webp b/doc/qtdesignstudio/images/qtquick-designer-rotating-items.webp
new file mode 100644
index 0000000000..17a3a664c0
--- /dev/null
+++ b/doc/qtdesignstudio/images/qtquick-designer-rotating-items.webp
diff --git a/doc/qtdesignstudio/images/qtquick-designer-scaling-items.png b/doc/qtdesignstudio/images/qtquick-designer-scaling-items.png
deleted file mode 100644
index 891915dae8..0000000000
--- a/doc/qtdesignstudio/images/qtquick-designer-scaling-items.png
+++ /dev/null
diff --git a/doc/qtdesignstudio/images/qtquick-designer-scaling-items.webp b/doc/qtdesignstudio/images/qtquick-designer-scaling-items.webp
new file mode 100644
index 0000000000..cabbd7e02a
--- /dev/null
+++ b/doc/qtdesignstudio/images/qtquick-designer-scaling-items.webp
diff --git a/doc/qtdesignstudio/images/qtquick-item-properties-common.png b/doc/qtdesignstudio/images/qtquick-item-properties-common.png
deleted file mode 100644
index 6311b1ce58..0000000000
--- a/doc/qtdesignstudio/images/qtquick-item-properties-common.png
+++ /dev/null
diff --git a/doc/qtdesignstudio/images/qtquick-item-properties-common.webp b/doc/qtdesignstudio/images/qtquick-item-properties-common.webp
new file mode 100644
index 0000000000..5177534146
--- /dev/null
+++ b/doc/qtdesignstudio/images/qtquick-item-properties-common.webp
diff --git a/doc/qtdesignstudio/images/qtquick-library-context-menu.png b/doc/qtdesignstudio/images/qtquick-library-context-menu.png
deleted file mode 100644
index f611ea6f1c..0000000000
--- a/doc/qtdesignstudio/images/qtquick-library-context-menu.png
+++ /dev/null
diff --git a/doc/qtdesignstudio/images/qtquick-library-context-menu.webp b/doc/qtdesignstudio/images/qtquick-library-context-menu.webp
new file mode 100644
index 0000000000..32fce38c93
--- /dev/null
+++ b/doc/qtdesignstudio/images/qtquick-library-context-menu.webp
diff --git a/doc/qtdesignstudio/images/qtquick-transition-editor-settings.png b/doc/qtdesignstudio/images/qtquick-transition-editor-settings.png
deleted file mode 100644
index a0fef65a51..0000000000
--- a/doc/qtdesignstudio/images/qtquick-transition-editor-settings.png
+++ /dev/null
diff --git a/doc/qtdesignstudio/images/qtquick-transition-editor-settings.webp b/doc/qtdesignstudio/images/qtquick-transition-editor-settings.webp
new file mode 100644
index 0000000000..71734e3eaa
--- /dev/null
+++ b/doc/qtdesignstudio/images/qtquick-transition-editor-settings.webp
diff --git a/doc/qtdesignstudio/images/qtquick-transition-editor-view.png b/doc/qtdesignstudio/images/qtquick-transition-editor-view.png
deleted file mode 100644
index 3d747783af..0000000000
--- a/doc/qtdesignstudio/images/qtquick-transition-editor-view.png
+++ /dev/null
diff --git a/doc/qtdesignstudio/images/qtquick-transition-editor-view.webp b/doc/qtdesignstudio/images/qtquick-transition-editor-view.webp
new file mode 100644
index 0000000000..b409b5d57f
--- /dev/null
+++ b/doc/qtdesignstudio/images/qtquick-transition-editor-view.webp
diff --git a/doc/qtdesignstudio/images/repeater3d-listmodel-navigator.png b/doc/qtdesignstudio/images/repeater3d-listmodel-navigator.png
index f4b3093bbb..302d7d397a 100644
--- a/doc/qtdesignstudio/images/repeater3d-listmodel-navigator.png
+++ b/doc/qtdesignstudio/images/repeater3d-listmodel-navigator.png
diff --git a/doc/qtdesignstudio/images/repeater3d-model-editor.webp b/doc/qtdesignstudio/images/repeater3d-model-editor.webp
new file mode 100644
index 0000000000..e0e6087366
--- /dev/null
+++ b/doc/qtdesignstudio/images/repeater3d-model-editor.webp
diff --git a/doc/qtdesignstudio/images/studio-3d-editor-axis-helper.webp b/doc/qtdesignstudio/images/studio-3d-editor-axis-helper.webp
index d0a13907e5..c1388d72ed 100644
--- a/doc/qtdesignstudio/images/studio-3d-editor-axis-helper.webp
+++ b/doc/qtdesignstudio/images/studio-3d-editor-axis-helper.webp
diff --git a/doc/qtdesignstudio/images/studio-3d-editor-move.webp b/doc/qtdesignstudio/images/studio-3d-editor-move.webp
index d2ff9b9aac..ac40c5cf1a 100644
--- a/doc/qtdesignstudio/images/studio-3d-editor-move.webp
+++ b/doc/qtdesignstudio/images/studio-3d-editor-move.webp
diff --git a/doc/qtdesignstudio/images/studio-3d-editor-rotate.webp b/doc/qtdesignstudio/images/studio-3d-editor-rotate.webp
index 7cd8fe1bf6..368a2d57fd 100644
--- a/doc/qtdesignstudio/images/studio-3d-editor-rotate.webp
+++ b/doc/qtdesignstudio/images/studio-3d-editor-rotate.webp
diff --git a/doc/qtdesignstudio/images/studio-3d-editor-scale.webp b/doc/qtdesignstudio/images/studio-3d-editor-scale.webp
index be0270d34b..6523539449 100644
--- a/doc/qtdesignstudio/images/studio-3d-editor-scale.webp
+++ b/doc/qtdesignstudio/images/studio-3d-editor-scale.webp
diff --git a/doc/qtdesignstudio/images/studio-3d-editor.webp b/doc/qtdesignstudio/images/studio-3d-editor.webp
index 903ad69b25..2218505917 100644
--- a/doc/qtdesignstudio/images/studio-3d-editor.webp
+++ b/doc/qtdesignstudio/images/studio-3d-editor.webp
diff --git a/doc/qtdesignstudio/images/studio-3d-properties-type.png b/doc/qtdesignstudio/images/studio-3d-properties-type.png
deleted file mode 100644
index c0363d0233..0000000000
--- a/doc/qtdesignstudio/images/studio-3d-properties-type.png
+++ /dev/null
diff --git a/doc/qtdesignstudio/images/studio-3d-properties-type.webp b/doc/qtdesignstudio/images/studio-3d-properties-type.webp
new file mode 100644
index 0000000000..7f353ff655
--- /dev/null
+++ b/doc/qtdesignstudio/images/studio-3d-properties-type.webp
diff --git a/doc/qtdesignstudio/images/studio-3d-scene-environment-ambient-occlusion.webp b/doc/qtdesignstudio/images/studio-3d-scene-environment-ambient-occlusion.webp
new file mode 100644
index 0000000000..91e01bc809
--- /dev/null
+++ b/doc/qtdesignstudio/images/studio-3d-scene-environment-ambient-occlusion.webp
diff --git a/doc/qtdesignstudio/images/studio-3d-scene-environment-antialiasing.webp b/doc/qtdesignstudio/images/studio-3d-scene-environment-antialiasing.webp
new file mode 100644
index 0000000000..a8cae264d3
--- /dev/null
+++ b/doc/qtdesignstudio/images/studio-3d-scene-environment-antialiasing.webp
diff --git a/doc/qtdesignstudio/images/studio-3d-scene-environment-image-based-lighting.webp b/doc/qtdesignstudio/images/studio-3d-scene-environment-image-based-lighting.webp
new file mode 100644
index 0000000000..d5a9da81fb
--- /dev/null
+++ b/doc/qtdesignstudio/images/studio-3d-scene-environment-image-based-lighting.webp
diff --git a/doc/qtdesignstudio/images/studio-3d-scene-environment-light-probe.png b/doc/qtdesignstudio/images/studio-3d-scene-environment-light-probe.png
deleted file mode 100644
index 7a062a2a36..0000000000
--- a/doc/qtdesignstudio/images/studio-3d-scene-environment-light-probe.png
+++ /dev/null
diff --git a/doc/qtdesignstudio/images/studio-3d-scene-environment-properties.png b/doc/qtdesignstudio/images/studio-3d-scene-environment-properties.png
deleted file mode 100644
index 353e0c3584..0000000000
--- a/doc/qtdesignstudio/images/studio-3d-scene-environment-properties.png
+++ /dev/null
diff --git a/doc/qtdesignstudio/images/studio-3d-scene-environment-properties.webp b/doc/qtdesignstudio/images/studio-3d-scene-environment-properties.webp
new file mode 100644
index 0000000000..bb3e62d716
--- /dev/null
+++ b/doc/qtdesignstudio/images/studio-3d-scene-environment-properties.webp
diff --git a/doc/qtdesignstudio/images/studio-3d-split-view.webp b/doc/qtdesignstudio/images/studio-3d-split-view.webp
index 630fdb48fe..aec301c91f 100644
--- a/doc/qtdesignstudio/images/studio-3d-split-view.webp
+++ b/doc/qtdesignstudio/images/studio-3d-split-view.webp
diff --git a/doc/qtdesignstudio/images/studio-curve-editor.png b/doc/qtdesignstudio/images/studio-curve-editor.png
deleted file mode 100644
index 01cd7f5ab4..0000000000
--- a/doc/qtdesignstudio/images/studio-curve-editor.png
+++ /dev/null
diff --git a/doc/qtdesignstudio/images/studio-curve-editor.webp b/doc/qtdesignstudio/images/studio-curve-editor.webp
new file mode 100644
index 0000000000..79624624d1
--- /dev/null
+++ b/doc/qtdesignstudio/images/studio-curve-editor.webp
diff --git a/doc/qtdesignstudio/images/studio-ext-scene-environment.webp b/doc/qtdesignstudio/images/studio-ext-scene-environment.webp
new file mode 100644
index 0000000000..cc26498c95
--- /dev/null
+++ b/doc/qtdesignstudio/images/studio-ext-scene-environment.webp
diff --git a/doc/qtdesignstudio/images/studio-flow-action-area-properties.png b/doc/qtdesignstudio/images/studio-flow-action-area-properties.png
deleted file mode 100644
index 9e69282fe8..0000000000
--- a/doc/qtdesignstudio/images/studio-flow-action-area-properties.png
+++ /dev/null
diff --git a/doc/qtdesignstudio/images/studio-flow-action-area-properties.webp b/doc/qtdesignstudio/images/studio-flow-action-area-properties.webp
new file mode 100644
index 0000000000..e269557c16
--- /dev/null
+++ b/doc/qtdesignstudio/images/studio-flow-action-area-properties.webp
diff --git a/doc/qtdesignstudio/images/studio-flow-action-area.png b/doc/qtdesignstudio/images/studio-flow-action-area.png
deleted file mode 100644
index 531af8aab5..0000000000
--- a/doc/qtdesignstudio/images/studio-flow-action-area.png
+++ /dev/null
diff --git a/doc/qtdesignstudio/images/studio-flow-action-area.webp b/doc/qtdesignstudio/images/studio-flow-action-area.webp
new file mode 100644
index 0000000000..f6d4c4d5f4
--- /dev/null
+++ b/doc/qtdesignstudio/images/studio-flow-action-area.webp
diff --git a/doc/qtdesignstudio/images/studio-flow-item.png b/doc/qtdesignstudio/images/studio-flow-item.png
deleted file mode 100644
index 905174d600..0000000000
--- a/doc/qtdesignstudio/images/studio-flow-item.png
+++ /dev/null
diff --git a/doc/qtdesignstudio/images/studio-flow-item.webp b/doc/qtdesignstudio/images/studio-flow-item.webp
new file mode 100644
index 0000000000..1b3c54d818
--- /dev/null
+++ b/doc/qtdesignstudio/images/studio-flow-item.webp
diff --git a/doc/qtdesignstudio/images/studio-flow-signal-list.png b/doc/qtdesignstudio/images/studio-flow-signal-list.png
deleted file mode 100644
index 4af0a0e853..0000000000
--- a/doc/qtdesignstudio/images/studio-flow-signal-list.png
+++ /dev/null
diff --git a/doc/qtdesignstudio/images/studio-flow-signal-list.webp b/doc/qtdesignstudio/images/studio-flow-signal-list.webp
new file mode 100644
index 0000000000..248f4f8590
--- /dev/null
+++ b/doc/qtdesignstudio/images/studio-flow-signal-list.webp
diff --git a/doc/qtdesignstudio/images/studio-flow-transition-line-properties.png b/doc/qtdesignstudio/images/studio-flow-transition-line-properties.png
deleted file mode 100644
index 93c948e7ec..0000000000
--- a/doc/qtdesignstudio/images/studio-flow-transition-line-properties.png
+++ /dev/null
diff --git a/doc/qtdesignstudio/images/studio-flow-transition-line-properties.webp b/doc/qtdesignstudio/images/studio-flow-transition-line-properties.webp
new file mode 100644
index 0000000000..e56dfd218e
--- /dev/null
+++ b/doc/qtdesignstudio/images/studio-flow-transition-line-properties.webp
diff --git a/doc/qtdesignstudio/images/studio-flow-transition-properties.png b/doc/qtdesignstudio/images/studio-flow-transition-properties.png
deleted file mode 100644
index e754f3012e..0000000000
--- a/doc/qtdesignstudio/images/studio-flow-transition-properties.png
+++ /dev/null
diff --git a/doc/qtdesignstudio/images/studio-flow-transition-properties.webp b/doc/qtdesignstudio/images/studio-flow-transition-properties.webp
new file mode 100644
index 0000000000..a47a8977dd
--- /dev/null
+++ b/doc/qtdesignstudio/images/studio-flow-transition-properties.webp
diff --git a/doc/qtdesignstudio/images/studio-flow-view-properties.png b/doc/qtdesignstudio/images/studio-flow-view-properties.png
deleted file mode 100644
index 95fe403b76..0000000000
--- a/doc/qtdesignstudio/images/studio-flow-view-properties.png
+++ /dev/null
diff --git a/doc/qtdesignstudio/images/studio-flow-view-properties.webp b/doc/qtdesignstudio/images/studio-flow-view-properties.webp
new file mode 100644
index 0000000000..7592e57954
--- /dev/null
+++ b/doc/qtdesignstudio/images/studio-flow-view-properties.webp
diff --git a/doc/qtdesignstudio/images/studio-project-wizards.png b/doc/qtdesignstudio/images/studio-project-wizards.png
deleted file mode 100644
index 3a329bd16e..0000000000
--- a/doc/qtdesignstudio/images/studio-project-wizards.png
+++ /dev/null
diff --git a/doc/qtdesignstudio/images/studio-project-wizards.webp b/doc/qtdesignstudio/images/studio-project-wizards.webp
new file mode 100644
index 0000000000..fcb7c22ff0
--- /dev/null
+++ b/doc/qtdesignstudio/images/studio-project-wizards.webp
diff --git a/doc/qtdesignstudio/images/studio-qtquick-3d-components.png b/doc/qtdesignstudio/images/studio-qtquick-3d-components.png
deleted file mode 100644
index 25974ab326..0000000000
--- a/doc/qtdesignstudio/images/studio-qtquick-3d-components.png
+++ /dev/null
diff --git a/doc/qtdesignstudio/images/studio-qtquick-3d-components.webp b/doc/qtdesignstudio/images/studio-qtquick-3d-components.webp
new file mode 100644
index 0000000000..54be760fd2
--- /dev/null
+++ b/doc/qtdesignstudio/images/studio-qtquick-3d-components.webp
diff --git a/doc/qtdesignstudio/images/studio-qtquick-3d-view.png b/doc/qtdesignstudio/images/studio-qtquick-3d-view.png
deleted file mode 100644
index 9c0e8fc82b..0000000000
--- a/doc/qtdesignstudio/images/studio-qtquick-3d-view.png
+++ /dev/null
diff --git a/doc/qtdesignstudio/images/studio-qtquick-3d-view.webp b/doc/qtdesignstudio/images/studio-qtquick-3d-view.webp
new file mode 100644
index 0000000000..7351317e10
--- /dev/null
+++ b/doc/qtdesignstudio/images/studio-qtquick-3d-view.webp
diff --git a/doc/qtdesignstudio/images/studio-qtquick-camera-properties.webp b/doc/qtdesignstudio/images/studio-qtquick-camera-properties.webp
new file mode 100644
index 0000000000..e54afe807e
--- /dev/null
+++ b/doc/qtdesignstudio/images/studio-qtquick-camera-properties.webp
diff --git a/doc/qtdesignstudio/images/studio-timeline-empty.png b/doc/qtdesignstudio/images/studio-timeline-empty.png
deleted file mode 100644
index 861a1021bb..0000000000
--- a/doc/qtdesignstudio/images/studio-timeline-empty.png
+++ /dev/null
diff --git a/doc/qtdesignstudio/images/studio-timeline-empty.webp b/doc/qtdesignstudio/images/studio-timeline-empty.webp
new file mode 100644
index 0000000000..16aa728a52
--- /dev/null
+++ b/doc/qtdesignstudio/images/studio-timeline-empty.webp
diff --git a/doc/qtdesignstudio/images/texture-editor.png b/doc/qtdesignstudio/images/texture-editor.png
deleted file mode 100644
index e8eecbd13b..0000000000
--- a/doc/qtdesignstudio/images/texture-editor.png
+++ /dev/null
diff --git a/doc/qtdesignstudio/images/texture-editor.webp b/doc/qtdesignstudio/images/texture-editor.webp
new file mode 100644
index 0000000000..092a6f0dab
--- /dev/null
+++ b/doc/qtdesignstudio/images/texture-editor.webp
diff --git a/doc/qtdesignstudio/src/components/qtquick-component-context-menu.qdocinc b/doc/qtdesignstudio/src/components/qtquick-component-context-menu.qdocinc
index 34140b8894..7fb95a9880 100644
--- a/doc/qtdesignstudio/src/components/qtquick-component-context-menu.qdocinc
+++ b/doc/qtdesignstudio/src/components/qtquick-component-context-menu.qdocinc
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
@@ -26,7 +26,7 @@
         \li Group
         \li \l{Organizing Components}
     \row
-        \li Position
+        \li Positioner
         \li \l{Using Positioners}
     \row
         \li Layout
@@ -53,8 +53,8 @@
         \li Move Component Instances into Separate Files
         \li \l{Turning Component Instances into Custom Components}
     \row
-        \li Add New Signal Handler
-        \li \l{Adding Signal Handlers}
+        \li Connecting Components to Signals
+        \li \l{Connecting Components to Signals in the Connection View}
     \row
         \li Go to Implementation
         \li \l{Using UI Files}
diff --git a/doc/qtdesignstudio/src/components/qtquick-data-models.qdoc b/doc/qtdesignstudio/src/components/qtquick-data-models.qdoc
index 400e264d02..b93b745bc2 100644
--- a/doc/qtdesignstudio/src/components/qtquick-data-models.qdoc
+++ b/doc/qtdesignstudio/src/components/qtquick-data-models.qdoc
@@ -142,17 +142,17 @@
     To edit list models:
 
     \list 1
-        \li Drag-and-drop a \uicontrol {Grid View} or \uicontrol {List View}
+        \li Drag a \uicontrol {Grid View} or \uicontrol {List View}
             from \uicontrol Components >
             \uicontrol {Default Components} > \uicontrol Views to the
             \uicontrol Navigator or \uicontrol {2D} view.
         \li Right-click the view in \uicontrol Navigator, and select
-            \uicontrol {Edit List Model} in the context-menu to open
-            the list model editor:
-            \image qtquick-designer-edit-list-model.png "List view in model editor"
-        \li Double-click the column headings and cells to change their values.
-        \li Use the toolbar buttons to add, remove, or move rows and columns.
-            In a list, each column represents a property and each row adds a
+            \uicontrol {Edit Model} in the context-menu to open the
+            \uicontrol {Model Editor} view.
+            \image edit-list-model-model-editor.webp "List view in Model Editor"
+        \li Double-click a cell to edit its value.
+        \li Use the toolbar buttons to add or remove rows and columns.
+            In a list, each column represents a property, and each row adds a
             list item.
     \endlist
 
diff --git a/doc/qtdesignstudio/src/components/qtquick-preset-components.qdoc b/doc/qtdesignstudio/src/components/qtquick-preset-components.qdoc
index 19ee8e60dd..4920cf582d 100644
--- a/doc/qtdesignstudio/src/components/qtquick-preset-components.qdoc
+++ b/doc/qtdesignstudio/src/components/qtquick-preset-components.qdoc
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
@@ -58,7 +58,7 @@
         \li \l {Custom Effects and Materials}
         \li \l {Lights}
         \li \l {Cameras}
-        \li \l {Scene Environment}
+        \li \l {Scene Environments}
         \li \l {Morph Target}
         \li \l {Repeater3D}
         \li \l {Loader3D}
diff --git a/doc/qtdesignstudio/src/developers/studio-designer-developer-workflow.qdoc b/doc/qtdesignstudio/src/developers/studio-designer-developer-workflow.qdoc
index 0a6531fe12..e8c6c8e329 100644
--- a/doc/qtdesignstudio/src/developers/studio-designer-developer-workflow.qdoc
+++ b/doc/qtdesignstudio/src/developers/studio-designer-developer-workflow.qdoc
@@ -10,7 +10,7 @@
 
     \note In this section, you are using advanced menu items. These are not
     visible by default. To toggle the visibility of advanced menu items, see
-    \l{Customizing the Menu}.
+    \l{Customizing the Menu Bar}.
 
     \QDS enables designers and developers to work together on common
     projects to develop applications. Designers use the \l{Design Views}{views}
@@ -46,7 +46,7 @@
         \li Select \uicontrol {File} > \uicontrol {Export Project} > \uicontrol {Generate CMake Build Files}.
             \image studio-project-export.webp "Export the \QDS project for Qt Creator"
 
-        \li Select \uicontrol {Details} to access the \l {Advanced Options}.
+        \li Select \uicontrol {Details} to access the \uicontrol {Advanced Options}.
             \image studio-project-export-advanced.webp "Access Advanced Options in the project exporter"
 
             \note The project exporter has default settings selected. This works better if the project
@@ -68,7 +68,7 @@
     After exporting the project from the \QDS, you have to open it from Qt Creator.
 
     If you have used any version before \QDS 4.0 to create the project, manually include this code
-    in the \l {CMakeLists.txt} file so the exported project works in Qt Creator.
+    in the \e {CMakeLists.txt} file so the exported project works in Qt Creator.
 
     \code
         set(BUILD_QDS_COMPONENTS ON CACHE BOOL "Build design studio components")
@@ -83,6 +83,6 @@
     \endcode
 
     \note If you have created the project with the \QDS version 4.0 or above, you already have this code in
-          \l {CMakeLists.txt} by default.
+          \e {CMakeLists.txt} by default.
 
 */
diff --git a/doc/qtcreator/src/qtquick/qtquick-live-preview-desktop.qdoc b/doc/qtdesignstudio/src/how-to/qtdesignstudio-live-preview-desktop.qdoc
index 2f939c69cb..5145bc2397 100644
--- a/doc/qtcreator/src/qtquick/qtquick-live-preview-desktop.qdoc
+++ b/doc/qtdesignstudio/src/how-to/qtdesignstudio-live-preview-desktop.qdoc
@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \previouspage creator-live-preview.html
-    \page creator-live-preview-desktop.html
+    \page studio-live-preview-desktop.html
+    \previouspage studio-live-preview.html
     \nextpage creator-live-preview-devices.html
 
     \title Previewing on Desktop
@@ -11,16 +11,9 @@
     To preview the currently active QML file on the desktop:
 
     \list
-        \if defined(qtcreator)
-        \li Select \inlineimage icons/live-preview.png (\uicontrol {Live Preview})
-            on the \l{Edit Mode}{editor} toolbar.
-            \image qtcreator-live-preview.webp {Application running on top of the editor view}
-        \li Select \uicontrol Build > \uicontrol {QML Preview}.
-    \endlist
-        \else
         \li Select the \uicontrol {Live Preview} button on the top toolbar.
         \li Press \key {Alt+P}.
-        \image studio-live-preview.webp
+            \image studio-live-preview.webp
     \endlist
 
     To preview any QML file in the project:
@@ -47,5 +40,4 @@
         \li In \uicontrol {Override device QML viewer}, select the folder where
             the preview tool executable is located.
     \endlist
-    \endif
 */
diff --git a/doc/qtdesignstudio/src/mcus/qtdesignstudio-compatibility-with-mcu-sdks.qdoc b/doc/qtdesignstudio/src/mcus/qtdesignstudio-compatibility-with-mcu-sdks.qdoc
index de94f59d80..0e833cead1 100644
--- a/doc/qtdesignstudio/src/mcus/qtdesignstudio-compatibility-with-mcu-sdks.qdoc
+++ b/doc/qtdesignstudio/src/mcus/qtdesignstudio-compatibility-with-mcu-sdks.qdoc
@@ -16,10 +16,16 @@
         \li \QDS Version
         \li \QMCU SDK Version
     \row
-        \li 4.3 or later
-        \li 2.6 or later
+        \li 4.5 or later
+        \li 2.8 or later
     \row
-        \li 4.2 or later
+        \li 4.4
+        \li 2.7
+    \row
+        \li 4.3
+        \li 2.6
+    \row
+        \li 4.2
         \li 2.5
     \row
         \li 4.0 up to 4.1
diff --git a/doc/qtdesignstudio/src/overviews/qtquick-creating-ui-logic.qdoc b/doc/qtdesignstudio/src/overviews/qtquick-creating-ui-logic.qdoc
index a5e05f8beb..1ea19bac4b 100644
--- a/doc/qtdesignstudio/src/overviews/qtquick-creating-ui-logic.qdoc
+++ b/doc/qtdesignstudio/src/overviews/qtquick-creating-ui-logic.qdoc
@@ -84,7 +84,7 @@
         \li \l{Connecting Components to Signals}
     \row
         \li Formatting connections
-        \li \l{Adding Actions and Assignments}
+        \li \l{Actions and Conditions}
     \row
         \li Dynamically changing the behavior of a component
         \li \l{Adding Bindings Between Properties}
diff --git a/doc/qtdesignstudio/src/overviews/qtquick-export.qdoc b/doc/qtdesignstudio/src/overviews/qtquick-export.qdoc
index f9ae3b8d7b..f083f85f8e 100644
--- a/doc/qtdesignstudio/src/overviews/qtquick-export.qdoc
+++ b/doc/qtdesignstudio/src/overviews/qtquick-export.qdoc
@@ -10,7 +10,7 @@
 
     \note In this section, you are using advanced menu items. These are not
     visible by default. To toggle the visibility of advanced menu items, see
-    \l{Customizing the Menu}.
+    \l{Customizing the Menu Bar}.
 
     \l{glossary-component}{Components} contained in \l{UI Files}
     {UI files} (.ui.qml) can be exported to JSON metadata format and PNG assets.
diff --git a/doc/qtdesignstudio/src/overviews/qtquick-live-preview.qdoc b/doc/qtdesignstudio/src/overviews/qtquick-live-preview.qdoc
new file mode 100644
index 0000000000..d286c41c7a
--- /dev/null
+++ b/doc/qtdesignstudio/src/overviews/qtquick-live-preview.qdoc
@@ -0,0 +1,38 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
+
+/*!
+    \page studio-live-preview.html
+    \previouspage quick-states.html
+    \nextpage studio-live-preview-desktop.html
+
+    \title Validating with Target Hardware
+
+    Preview a UI file or the entire UI on the desktop, as well as on embedded
+    Linux devices to instantly view the changes you make to the UI. On Android
+    devices, the preview shows the snapshot of your project from the moment
+    you start the preview on the device, not your changes.
+
+    \image studio-live-preview.webp
+
+    Or, use \QDV to run applications in most widely-used web browsers on the
+    desktop and in mobile devices and share your designs with reviewers who
+    don't have \QC.
+
+    \list
+        \li \l{Previewing on Desktop}
+
+            Preview individual QML files or the whole UI.
+        \li \l{Previewing on Devices}
+
+            Connect your devices to your computer.
+
+        \li \l{Sharing Applications Online}
+
+            Share applications online and view them in a web browser.
+
+        \li \l{Viewing Applications on Android}
+
+           Preview \QDS projects with \QUV on an Android device.
+    \endlist
+*/
diff --git a/doc/qtdesignstudio/src/overviews/qtquick-optimizing-designs.qdoc b/doc/qtdesignstudio/src/overviews/qtquick-optimizing-designs.qdoc
index 3cf0c1336b..937362450b 100644
--- a/doc/qtdesignstudio/src/overviews/qtquick-optimizing-designs.qdoc
+++ b/doc/qtdesignstudio/src/overviews/qtquick-optimizing-designs.qdoc
@@ -21,7 +21,7 @@
     \endlist
 
     For more useful information for application developers, see
-    \l {Performance Considerations And Suggestions}.
+    \l {QML Performance Considerations And Suggestions}.
 
     For more information about optimizing 3D scenes, see
     \l{Creating Optimized 3D Scenes}.
diff --git a/doc/qtdesignstudio/src/overviews/qtquick-production-quality-animation.qdoc b/doc/qtdesignstudio/src/overviews/qtquick-production-quality-animation.qdoc
index fcf1a4c455..068a7c140b 100644
--- a/doc/qtdesignstudio/src/overviews/qtquick-production-quality-animation.qdoc
+++ b/doc/qtdesignstudio/src/overviews/qtquick-production-quality-animation.qdoc
@@ -28,7 +28,7 @@
     to upload the draw primitives to the graphics hardware.
 
     The frames-per-second (FPS) refresh rate of animations is displayed in the
-    \uicontrol FPS field on the \l{Summary of Main Toolbar Actions}{toolbar}
+    \uicontrol FPS field on the toolbar
     in the \uicontrol Design mode.
 
     To improve the FPS rate, application developers should:
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-app-flows.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-app-flows.qdoc
index 05906cba86..5e4a503800 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-app-flows.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-app-flows.qdoc
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
@@ -66,8 +66,11 @@
 
     \title Adding Flow Views
 
-    You can add a flow view to an existing project or create a new project
-    for it, as described in \l {Creating Projects}.
+    A flow view is the base component of the flow diagram that you can use to wireframe
+    the UI of your application. For more information, see \l{Designing Application Flows}.
+
+    Add a flow view to an existing project or create a new project for it, as described in
+    \l {Creating Projects}.
 
     To create the flow view, select \uicontrol File >
     \uicontrol {New File} >
@@ -76,24 +79,18 @@
 
     \image studio-flow-view-create.png "Create Flow View wizard template"
 
-    You only need to select the \uicontrol {Use Event Simulator} check box if
-    you want to add an event simulator to the flow view. The event simulator
-    needs the project to be imported to the flow view, so you also need
-    to select the \uicontrol {Use Application Import} check box. You need the
+    If you want to add an event simulator to the flow view, select the
+    \uicontrol {Use Event Simulator} checkbox. In this case, select also the
+    \uicontrol {Use Application Import} checkbox to import the project to the flow view
+    as the event simulator requires it to work correctly. You need the
     import also for access to the project \c Constants.qml file that contains
-    global settings for the project.
-
-    The flow view properties enable you to adjust the appearance of all
-    the items in the flow: action areas, transition lines, decisions, and
-    wildcards. You can change the global settings for all items by editing
-    flow view properties, or you can select an individual action area or
-    transition line and change the appearance of just that component, including
-    the color, line thickness, dotted or solid lines, and even the curve of
-    the line. This enables you to add extra semantics to the design
-    of the flow diagram itself.
+    global settings for the project. For more information, see \l {Simulating Events}.
 
-    You can \l{Adding Flow Items}{add flow items} to the flow view to design
-    the UI.
+    You can adjust the appearance of all the items in the flow: action areas,
+    transition lines, decisions, and wildcards. Change the global settings for all items
+    by editing the flow view properties. To add additional semantics to the flow diagram
+    design, select an individual action area or transition line and change the appearance
+    of just that component.
 
     \section1 Flow View Properties
 
@@ -102,12 +99,12 @@
     \l Visibility sections in the \l Properties view. Specify flow view
     properties in the \uicontrol {Flow View} section.
 
-    \image studio-flow-view-properties.png "Flow View component properties"
+    \image studio-flow-view-properties.webp "Flow View component properties"
 
     To specify the \uicontrol {Flow Item} that is currently visible in the
     flow view, set its index in the \uicontrol {Current index} field.
 
-    You can use the \l{Picking Colors}{color picker} to set colors for:
+    Use the \l{Picking Colors}{color picker} to set colors for:
 
     \list
         \li Transition lines
@@ -133,9 +130,6 @@
     area or transition line, see \l{Flow Action Area Properties} and
     \l{Flow Transition Properties}.
 
-    In the \uicontrol Layout tab, you can use \l{Setting Anchors and Margins}
-    {anchors} to position the component.
-
     In the \uicontrol Advanced section, you can manage the more
     \l{Specifying Developer Properties}{advanced properties}
     of components.
@@ -148,29 +142,26 @@
 
     \title Adding Flow Items
 
-    After you create a \l{Adding Flow Views}{Flow View} component, you can
-    use a project wizard template to add a \uicontrol {Flow Item} component
-    for each screen in the UI.
+    After you create a \l{Adding Flow Views}{Flow View} component, use a project wizard
+    template to add a \uicontrol {Flow Item} component for each screen in the UI.
 
     If you \l{Importing 2D Assets}{imported} your screen designs from a
     design tool as individual \l{glossary-component}{components}
-    (\e {.ui.qml} files), you can use them as content for flow items.
+    (\e {.ui.qml} files), you can use them as content for flow items like any other components.
     The imported components are listed in \uicontrol Components
     > \uicontrol {My Components}.
 
-    If you are building your UI from scratch in \QDS, you must first add
-    components to the flow items to create the screens as you would any
-    components. For more information, see \l {Using Components}. The
-    flow items that you attach the components to are listed under
+    If you are building your UI from scratch in \QDS, add components to the flow items
+    first to create the screens as you would any components. For more information, see
+    \l {Using Components}. The flow items that you attach the components to are listed under
     \uicontrol {My Components}.
 
-    \image studio-flow-item.png "Custom Flow Item in Components"
+    \image studio-flow-item.webp "Custom Flow Item in Components"
 
     \note You must use the wizard to create the flow items. After you create
     a flow view, the \uicontrol {Flow View} module is added to
-    \uicontrol Components. It contains a \uicontrol {Flow Item} component that
-    you can use to \l{Applying States in Flows}{apply states to flow items}, and
-    that you should use solely for that purpose.
+    \uicontrol Components. It contains the \uicontrol {Flow Item} component for
+    \l{Applying States in Flows}{applying states to flow items}, and solely for that purpose.
 
     To add flow items:
 
@@ -181,7 +172,7 @@
             to create flow items for each screen in the UI.
         \li Add content to the flow item in one of the following ways:
             \list
-                \li Drag-and-drop components from \uicontrol Components to a
+                \li Drag components from \uicontrol Components to a
                     flow item in the \l {2D} view or \l Navigator.
                 \li Drag a screen from \uicontrol Components
                     > \uicontrol {My Components} to a flow item in
@@ -190,10 +181,9 @@
         \li In \l Properties, edit the properties of each flow item.
     \endlist
 
-    You can now drag the flow items from \uicontrol Components
-    > \uicontrol {My Components} to the flow view in the \uicontrol {2D}
-    or \uicontrol Navigator view. When you have all the flow items in place, you can
-    \l{Adding Action Areas and Transitions}{add action areas} to them to create
+    Now, drag the flow items from \uicontrol Components > \uicontrol {My Components} to the
+    flow view in the \uicontrol {2D} or \uicontrol Navigator view. When you have all the flow
+    items in place, \l{Adding Action Areas and Transitions}{add action areas} to them to create
     transitions between them.
 
     \section1 Flow Item Properties
@@ -209,23 +199,20 @@
     properties are used to \l{Applying States in Flows}{apply states}
     in flows.
 
-    To include another flow view into a flow view, select the UI file (.ui.qml)
+    To include another flow view as a flow item into a flow view, select the UI file (.ui.qml)
     that specifies the flow view in the \uicontrol {Loader source} field.
 
     Usually, a flow item is inactive and invisible when it is not currently
     selected in the flow. Especially, all events from the flow item are ignored.
     To make a flow item always active, so that another flow item within it
     can respond to events and trigger the opening of a dialog, for example,
-    select the \uicontrol {Force active} check box.
+    select the \uicontrol {Force active} checkbox.
 
-    By default, transitions are drawn from action areas to the target flow item.
+    In the flow view, transitions are drawn from action areas to the target flow item by default.
     To draw the transitions from the edges of flow items instead, select the
-    \uicontrol {Join lines} check box in the \uicontrol {Transition Lines}
+    \uicontrol {Join lines} checkbox in the \uicontrol {Transition Lines}
     section.
 
-    In the \uicontrol Layout tab, you can use \l{Setting Anchors and Margins}
-    {anchors} to position the component.
-
     In the \uicontrol Advanced section, you can manage the more
     \l{Specifying Developer Properties}{advanced properties} of components.
 */
@@ -237,26 +224,19 @@
 
     \title Adding Action Areas and Transitions
 
-    \e {Action areas} can act as clickable areas that initiate transitions
-    between flow items or they can \l{Connecting and Releasing Signals}
-    {create connections} to any signal from any component in a
+    \e {Action areas} are clickable areas that initiate transitions between flow items or
+    \l{Connecting and Releasing Signals}{create connections} to any signal from any component in a
     \l{Adding Flow Items}{flow item}. For example, you could connect an
     action to the \c onPressed signal of a button in your flow item to
     determine what should happen when users press the button.
 
-    \image studio-flow-action-area.png "Flow Action Area in the 2D view"
+    \image studio-flow-action-area.webp "Flow Action Area in the 2D view"
 
-    \note To connect components to \l{Connecting and Releasing Signals}
-    {signals}, you must first export the components as
-    \l{Adding Property Aliases}{aliases} in \l Navigator.
-    To create and release connections, select
-    \uicontrol {Open Signal Dialog} in the context menu.
+    Select the type of the mouse or touch input to use for triggering
+    events, such as click, double-click, flick, pinch, or long press.
 
-    You can select the type of the mouse or touch input to use for triggering
-    events, such as click, double-click, flick, pinch, or press.
-
-    Typically, a flow item can be connected to several other flow items in the
-    flow with two-way connections. To avoid clutter, you can set an action area
+    Typically, a flow item is connected to several other flow items in the
+    flow with two-way connections. To avoid clutter, set an action area
     as \e {go back} instead of adding explicit transition lines to and from
     every potentially connected flow item. When the \uicontrol {Go back} option
     is enabled, the transition will always take the user back to the previous
@@ -270,7 +250,7 @@
     To create action areas:
 
     \list 1
-        \li Right-click the flow item in the \l {2D} view and select
+        \li Select the flow item in the \l {2D} view, then right-click it, and select
             \uicontrol {Flow} > \uicontrol {Create Flow Action} in
             the context menu.
         \li Drag the action area to the UI control that you want to connect
@@ -288,29 +268,29 @@
 
     \section1 Common Properties
 
-    You can specify basic properties for \uicontrol {Flow Action Area}
+    Specify basic properties for \uicontrol {Flow Action Area}
     and \uicontrol {Flow Transition} components in the \l {Type}{Component},
     \l {2D Geometry}{Geometry - 2D}, and \l Visibility sections in the
     \uicontrol Properties view.
 
-    In the \uicontrol Layout tab, you can use \l{Setting Anchors and Margins}
-    {anchors} to position the component.
+    Use \l{Setting Anchors and Margins}{anchors} in the \uicontrol Layout tab to position
+    the component.
 
-    In the \uicontrol Advanced section, you can manage the more
-    \l{Specifying Developer Properties}{advanced properties} of components.
+    Manage the more \l{Specifying Developer Properties}{advanced properties} of components
+    in the \uicontrol Advanced section.
 
     \section1 Flow Action Area Properties
 
-    In the \uicontrol {Flow Action Area} section, you can use the
-    \l{Picking Colors}{color picker} to set line and fill color.
+    Use the \l{Picking Colors}{color picker} in the \uicontrol {Flow Action Area} section
+    to set line and fill color.
 
-    \image studio-flow-action-area-properties.png "Flow Action Area properties"
+    \image studio-flow-action-area-properties.webp "Flow Action Area properties"
 
-    In the \uicontrol {Flow Action} and \uicontrol {Action Area} sections,
-    specify additional properties for action areas:
+    Specify additional properties for action areas in the \uicontrol {Flow Action} and
+    \uicontrol {Action Area} sections:
 
     \list
-        \li Select the \uicontrol {Go back} check box to specify that the
+        \li Select the \uicontrol {Go back} checkbox to specify that the
             transition will always take the user back to the previous flow item.
         \li In the \uicontrol {Event IDs} field, specify the IDs of the
             events to connect to, such as mouse, touch or keyboard events.
@@ -318,22 +298,22 @@
             mouse or touch input to use for triggering events.
         \li In the \uicontrol {Line width} field, set the width of the
             action area outline.
-        \li Select the \uicontrol {Dashed line} check box to draw a dashed
+        \li Select the \uicontrol {Dashed line} checkbox to draw a dashed
             action area outline.
-        \li Select the \uicontrol Enabled check box to enable interaction
+        \li Select the \uicontrol Enabled checkbox to enable interaction
             with the action area during preview.
     \endlist
 
     \section1 Flow Transition Properties
 
-    In the \uicontrol Transition section, specify additional properties for
-    transitions between \l{Adding Flow Items}{flow items}:
+    Specify additional properties for transitions between \l{Adding Flow Items}{flow items}
+    in the \uicontrol Transition section:
 
-    \image studio-flow-transition-properties.png "Flow Transition properties"
+    \image studio-flow-transition-properties.webp "Flow Transition properties"
 
     \list
         \li Select the \uicontrol Condition checkbox to activate the
-            transition. You can select \inlineimage icons/action-icon.png
+            transition. Select \inlineimage icons/action-icon.png
             to \l{Adding Bindings Between Properties}{bind} a condition
             to the transition.
         \li In the \uicontrol Question field, enter the text that will appear
@@ -348,10 +328,10 @@
             ends.
     \endlist
 
-    You can specify the following properties to change the appearance of
-    transition lines in the \uicontrol {2D} view:
+    Specify the following properties to change the appearance of transition lines in
+    the \uicontrol {2D} view:
 
-    \image studio-flow-transition-line-properties.png "Flow Transition Line properties"
+    \image studio-flow-transition-line-properties.webp "Flow Transition Line properties"
 
     \list
         \li In the \uicontrol {Line width} field, set the width of the
@@ -360,7 +340,7 @@
             the start point (\uicontrol Out) or end point (\uicontrol In) of a
             transition line or a break to the specified offset. This enables
             you to move them up and down or left and right.
-        \li Select the \uicontrol {Dashed line} check box to draw a dashed line.
+        \li Select the \uicontrol {Dashed line} checkbox to draw a dashed line.
         \li In the \uicontrol Type field, select \uicontrol Bezier to draw
             transition lines as bezier curves.
         \li In the \uicontrol Radius field, specify the corner radius for
@@ -371,19 +351,19 @@
         \li In the \uicontrol {Label position} field, set the position of
             the value of the \uicontrol Question field in respect to the
             transition start point.
-        \li Select the \uicontrol {Label flip side} check box to move the
+        \li Select the \uicontrol {Label flip side} checkbox to move the
             \uicontrol Question value to the opposite side of the transition
             line.
     \endlist
 
     \section1 Connecting and Releasing Signals
 
-    To connect a component to a \l{Connecting Components to Signals}{signal},
-    select \uicontrol {Open Signal Dialog} in the context menu. The
-    \uicontrol {Signal List} dialog displays the signals for all components
-    that you export as \l{Adding Property Aliases}{aliases} in \l Navigator.
+    To connect components to \l{Connecting Components to Signals}{signals}, export the
+    components first as \l{Adding Property Aliases}{aliases} in \l Navigator. To create
+    and release connections, select \uicontrol {Open Signal Dialog} in the context menu.
+    The \uicontrol {Signal List} dialog displays the signals for all components.
 
-    \image studio-flow-signal-list.png "Signal List dialog"
+    \image studio-flow-signal-list.webp "Signal List dialog"
 
     To connect a component to a signal, select \uicontrol Connect next to one
     in the list. To release a connected signal, select \uicontrol Release.
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-debugging.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-debugging.qdoc
index 9d1fa446ae..09cd1d0f58 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-debugging.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-debugging.qdoc
@@ -22,8 +22,10 @@
             \uicontrol Debug mode.
         \li \l{Profiling QML Applications}
 
-            You can use the QML Profiler to find causes for typical performance
+            You can use QML Profiler to find causes for typical performance
             problems in your UIs, such as slowness, freezing, and stuttering.
-            The QML Profiler is installed and configured as part of \QDS.
+            QML Profiler is installed and configured as part of \QDS.
     \endlist
+
+    \sa {Profile QML applications}
 */
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-faq.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-faq.qdoc
deleted file mode 100644
index 8f7267e0d3..0000000000
--- a/doc/qtdesignstudio/src/qtdesignstudio-faq.qdoc
+++ /dev/null
@@ -1,139 +0,0 @@
-// Copyright (C) 2021 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
-
-/*!
-    \previouspage creator-how-to-get-help.html
-    \page studio-faq.html
-    \nextpage studio-platforms.html
-
-    \title Frequently Asked Questions
-
-    This section contains answers to some frequently asked questions about \QDS
-    grouped by categories. You might also find answers to your questions in the
-    product documentation by searching or browsing the index in the
-    \l{Get help}{Help mode}. Many questions are also answered by the
-    \l{Examples}{examples} and \l{Tutorials}{video tutorials}.
-
-    \list
-        \li \l {FAQ - \QB}{\QB}
-        \li \l {FAQ - Assets}{Assets}
-        \li \l {FAQ - Components}{Components}
-        \li \l {FAQ - Views}{Views}
-        \li \l {FAQ - Integration Between \QDS and Qt Creator}{Integration Between \QDS and Qt Creator}
-        \li \l {FAQ - Performance}{Performance}
-        \li \l {FAQ - Data Simulation}{Data Simulation}
-    \endlist
-
-    \section1 FAQ - \QB
-
-    \section2 How does \QBPS differ from \QBSK and \QBF?
-
-    \QBPS, \QBSK, and \QBF are functionally similar. The biggest difference
-    between the tools is that \QBSK and \QBF can export .svg (vector), .png, and
-    .jpeg files, while \QBPS only supports .png and .jpeg. Adobe Illustrator
-    users can port their designs into Photoshop, but they must be rasterized
-    into \e {smart objects}.
-
-    For more information, see \l {Exporting from Design Tools}.
-
-    \section2 Do I need to copy the .qml files in the resource folder after each design modification?
-
-    No you don't. When you add new or modified .metadata files to your project
-    from Photoshop, \QBPS, \QBSK, or \QBF, select the \uicontrol {Merge QML}
-    check box in the \uicontrol {Asset Import} dialog to merge the changes into
-    existing QML files instead of overwriting them.
-
-    For more information, see \l {Importing 2D Assets}.
-
-    \section2 Where can I find log files generated by \QB while exporting metadata?
-
-    On Windows, the logs are stored inside the temp folder in
-    \c {C:\Users\<USERNAME>\AppData\Local\Temp}. The log files are named as
-    \e csxs<versionNumber>-<HostID>.log. Please note that you might have to set
-    the log level to generate logs. Also note the CEP version while setting the
-    log level. The CEP version depends on the Photoshop version you are using.
-    Currently the latest version is version 10.
-
-    \section1 FAQ - Assets
-
-    \section2 Can I import my organization's preferred font in \QDS?
-
-    Yes, you can import your custom fonts, for example, in .ttf or .otf formats.
-    Fonts installed on your system will be available to use in your imported
-    designs. If you need to deploy the device, you will have to import the font
-    into the project.
-
-    For more information, see \l {Using Custom Fonts}.
-
-    \section1 FAQ - Components
-
-    \section2 Can I use custom components?
-
-    Yes, you can create custom components and controls by using wizard templates
-    or move component instances into separate files to turn them into new
-    components that you can create instances of. For more information, see
-    \l {Using Components}.
-
-    \section2 What are the 3D import formats for \QDS?
-
-    You can import files stored in several widely-used formats, such as .fbx,
-    .obj, .gltf, .glb, .blend, .dae, .uia, and .uip.
-
-    For more information, see \l {Importing 3D Assets}.
-
-    \section2 How can I integrate custom C++ components into QDS?
-
-    You must create your own QML module that contains the components and
-    provides additional information about your components. For more information,
-    see \l {Using QML Modules with Plugins}.
-
-    \section1 FAQ - Views
-
-    \section2 What are the keyboard shortcuts for moving around in the \uicontrol{3D} view?
-
-    \list
-        \li To pan: \key Alt + middle mouse button
-        \li To orbit (rotate): \key Alt (or \key Option on \macos) + left mouse button
-        \li To zoom: \key Alt + right mouse button
-    \endlist
-
-    For more information, see the \l {3D} view.
-
-    \section1 FAQ - Integration Between \QDS and Qt Creator
-
-    \section2 Can I automatically propagate name changes between \QDS and Qt Creator?
-
-    Unfortunately we do not automate renaming files between tools at the moment.
-    If you decide to change the name of a property, alias, or signal in \QDS,
-    you need to manually change the name in Qt Creator to maintain the connection.
-    However, you can rename symbols in all files within a project. To rename a
-    QML type in a project, select \uicontrol Tools > \uicontrol QML/JS >
-    \uicontrol {Rename Symbol Under Cursor} or press \key Ctrl+Shift+R. For more
-    information, see \l {Rename symbols}.
-
-    \section2 How can I add .qml files to my project in Qt Creator?
-
-    Use the project wizard templates to create an application in \QDS and copy
-    your .qml files to the project folder. Then make some changes to the project
-    configuration and source files, as instructed in
-    \l {Converting UI Projects to Applications}.
-
-    \section1 FAQ - Performance
-
-    \section2 Will my application with 3D components run at 60 FPS?
-
-    With the ability to test the full (2D/3D) UI in \QDS on target hardware,
-    you will quickly be able to determine if a 3D object is causing performance
-    issues using the \uicontrol FPS field in the \uicontrol Design mode.
-    \uicontrol FPS displays the frames-per-second (FPS) refresh rate of
-    previewed animations.
-
-    See \l {Optimizing Your 3D Scene} to learn how you can enhance the
-    performance by optimizing your scene.
-
-    \section1 FAQ - Data Simulation
-
-    \section2 Can I automatically generate dummy data?
-    No, this is not supported at the moment. For more information about creating
-    the data manually, see \l {Loading Placeholder Data}.
-    */
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-finding-qt-runtime-version.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-finding-qt-runtime-version.qdoc
index cb9c7e86e9..5f2bc9bdad 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-finding-qt-runtime-version.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-finding-qt-runtime-version.qdoc
@@ -34,5 +34,8 @@
         \row
             \li 4.4
             \li 6.6.2
+        \row
+            \li 4.5
+            \li 6.7.0 (with additional Quick3D features)
     \endtable
 */
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-help-overview.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-help-overview.qdoc
index be9e6b4ed5..36fbc8c015 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-help-overview.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-help-overview.qdoc
@@ -11,8 +11,7 @@
     \table
         \row
             \li \image qds-front-help.png
-            \li Learn more about using the \uicontrol Help mode, frequently
-                asked questions, and supported platforms.
+            \li Learn more about using the \uicontrol Help mode and supported platforms.
     \endtable
 
     \list
@@ -23,9 +22,6 @@
             and index functions to find particular topics in the helps, or
             request context-sensitive help by pressing \key F1 in the Design
             mode.
-        \li \l{Frequently Asked Questions}
-
-            Contains answers to some frequently asked questions about \QDS.
         \li \l{Supported Platforms}
 
             You can install and run \QDS on several operating systems to design
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-implementing-applications.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-implementing-applications.qdoc
index 1f0aa08629..d19ede682f 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-implementing-applications.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-implementing-applications.qdoc
@@ -41,7 +41,7 @@
             you can inspect the state of your UI while debugging.
 
             The memory and CPU power available on devices are limited and
-            you should use them carefully. The QML Profiler enables you to
-            profile Qt Quick UIs.
+            you should use them carefully. With QML Profiler, you can find
+            problems in QML code.
     \endlist
 */
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-packaging.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-packaging.qdoc
index 1e426f011e..4158a7b545 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-packaging.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-packaging.qdoc
@@ -10,7 +10,7 @@
 
     \note In this section, you are using advanced menu items. These are not
     visible by default. To toggle the visibility of advanced menu items, see
-    \l{Customizing the Menu}.
+    \l{Customizing the Menu Bar}.
 
     When you are ready to deliver your application to users or upload it to
     app stores, you can use \QDS to create suitable packages that contain all
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-platforms.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-platforms.qdoc
index 5a50eb2bf4..501e30adc7 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-platforms.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-platforms.qdoc
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
@@ -11,20 +11,20 @@
     You can install and run \QDS on several operating systems to create
     applications for multiple desktop, embedded, and mobile device platforms.
 
-    \section1 Development Platforms
+    \section1 Host Platforms
 
     \QDS is available in binary packages for the following operating systems:
 
     \list
-        \li \macOS 11.0
-        \li Linux:
-            \list
-                \li CentOS 8.1
-                \li openSUSE Leap 15.1
-                \li SUSE Linux Enterprise Server 15 (SLES 15)
-                \li Ubuntu 20.04
-            \endlist
-        \li Windows 10, version 2004
+        \li Windows 11
+        \li Windows 10 64-bit
+        \li \macOS 12, 13
+        \list
+            \li ARM-based Mac
+            \li Intel Mac
+        \endlist
+        \li Linux Ubuntu 22.04 (latest LTS)
+        \li Linux Ubuntu 20.04
     \endlist
 
     \note For a good user experience on Windows 10, we recommend the following
@@ -36,9 +36,9 @@
     \QB is available for the following design tools:
 
     \list
-        \li Adobe Photoshop version 24.0
-        \li Adobe XD version 55.0.12
-        \li Figma version 116.4
-        \li Sketch version 90.0
+        \li Adobe Photoshop 25.0
+        \li Adobe XD 57.1.12.2
+        \li Figma 116.15.15
+        \li Sketch 99.1
     \endlist
 */
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-projects.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-projects.qdoc
index 3daf6e7089..46b2ac8fbb 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-projects.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-projects.qdoc
@@ -37,7 +37,7 @@
         \li
         \li Lists your most recently used presets.
     \row
-        \li {1,2} General
+        \li {1,3} General
         \li Empty
         \li Creates a project that uses default components such as rectangles,
             images, and text. You can run the application on all target
@@ -47,6 +47,11 @@
         \li Creates a project that uses default and 3D components such as
             cameras, lights, 3D models, and materials.
     \row
+        \li 3D Extended
+        \li Creates a project that uses default and 3D components, such as
+            camera, light, model and materials. Extended scene environment is
+            also included to enable various built-in effects.
+    \row
         \li \QMCU
         \li MCU
         \li Creates an application that uses a subset of default components
@@ -77,7 +82,7 @@
             \note This tab is not visible if there are no saved custom presets.
     \endtable
 
-    \image studio-project-wizards.png "The Create Project wizard"
+    \image studio-project-wizards.webp "The Create Project wizard"
 
     To test how well your designs work, you can preview the
     UIs on the desktop, embedded Linux devices, or Android devices. For more
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-terms.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-terms.qdoc
index 9c517f9846..70ff56517c 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-terms.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-terms.qdoc
@@ -30,7 +30,7 @@
     An \e asset is an image, font file, 3D model, or other supported file that
     you add to your \l{glossary-project}{project}.
 
-    \image qtquick-assets-tab.png "Assets"
+    \image qtquick-assets-tab.webp "Assets"
 
     Assets are packaged with \l{glossary-component}{components} for delivery
     to users.
@@ -187,7 +187,7 @@
     also be modified by another component, unless a particular component
     type has explicitly disallowed this for a specific property.
 
-    \image qtquick-item-properties-common.png "Properties view"
+    \image qtquick-item-properties-common.webp "Properties view"
 
     Read more about properties:
 
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc
index cf00e32419..659e446bb3 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
@@ -16,29 +16,30 @@
                             \list
                                 \li \l{2D}
                                 \li \l{3D}
-                                \li \l{Material Editor and Browser}
-                                \li \l{Components}
                                 \li \l{Assets}
-                                \li \l{Navigator}
-                                \li \l{Properties}
-                                \li \l{Connections}
-                                \li \l{States}
-                                \li \l{Translations}
-                                \li \l{Transitions}
-                                \li \l{Timeline}
-                                \li \l{Curves}
                                 \li \l{Code}
                                     \generatelist studio-how-to-code
                                     \generatelist studio-how-to-refactor-code
                                     \generatelist studio-how-to-search
                                     \generatelist studio-preferences-code
-                                \li \l{Projects}
+                                \li \l{Components}
+                                \li \l{Connections}
+                                \li \l{Content Library}
+                                \li \l{Curves}
+                                \li \l{Effect Composer}
                                 \li \l{File System}
+                                \li \l{Material Editor and Browser}
+                                \li \l{Model Editor}
+                                \li \l{Navigator}
                                 \li \l{Open Documents}
-                                \li \l{Content Library}
-                                \li \l{Texture Editor}
+                                \li \l{Projects}
+                                \li \l{Properties}
                                 \li \l{Qt Insight}
-                                \li \l{Effect Composer}
+                                \li \l{States}
+                                \li \l{Texture Editor}
+                                \li \l{Timeline}
+                                \li \l{Transitions}
+                                \li \l{Translations}
                            \endlist
                         \li \l{Managing Workspaces}
                         \li \l{Manage sessions}
@@ -89,7 +90,7 @@
                                 \li \l{Custom Effects and Materials}
                                 \li \l{Lights}
                                 \li \l{Cameras}
-                                \li \l{Scene Environment}
+                                \li \l{Scene Environments}
                                 \li \l{Morph Target}
                                 \li \l{Repeater3D}
                                 \li \l{Loader3D}
@@ -214,6 +215,9 @@
                             \endlist
                         \li \l{Debugging a Qt Quick Application}
                         \li \l{Profiling QML Applications}
+                            \list
+                                \li \l{Profile QML applications}
+                            \endlist
                     \endlist
             \endlist
         \li \l{Advanced Designer Topics}
@@ -261,7 +265,6 @@
                         \li \l {Search from documentation}
                         \li \l {Select the help start page}
                     \endlist
-                \li \l{Frequently Asked Questions}
                 \li \l{Supported Platforms}
             \endlist
         \li \l{Technical Support}
diff --git a/doc/qtdesignstudio/src/qtdesignstudio.qdoc b/doc/qtdesignstudio/src/qtdesignstudio.qdoc
index 6d84474605..6aab55a1ad 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio.qdoc
@@ -86,7 +86,6 @@
         \li \b {\l Help}
             \list
                 \li \l{Get help}{Getting Help}
-                \li \l{Frequently Asked Questions}
                 \li \l{Supported Platforms}
             \endlist
         \row
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-camera.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-camera.qdoc
index 202249188d..89da3cbb34 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-camera.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-camera.qdoc
@@ -8,13 +8,13 @@
 
     \title Cameras
 
-    A camera is always necessary to view the content of a 3D scene. A camera
+    A camera is necessary to view the content of a 3D scene. A camera
     defines how to project the content of a 3D scene into a 2D coordinate space,
     which can then be used on a 2D surface. When a camera is present in the
     scene, it can be used to direct what is displayed in a \l {3D Views}
     {3D view}.
 
-     \image studio-qtquick-3d-components.png "Qt Quick 3D components in Components"
+    \image studio-qtquick-3d-components.webp "Qt Quick 3D components in Components"
 
     To add a camera component to your UI, do one of the following:
     \list
@@ -31,7 +31,7 @@
     \uicontrol QtQuick3D module to your project, as described in
     \l {Adding and Removing Modules}.
 
-    You can use the following components in your scenes to determine camera
+    The following components in your scenes determine the camera
     projection:
 
     \list
@@ -65,7 +65,7 @@
 
     You can edit the camera properties in the \uicontrol Properties view.
 
-   \image studio-qtquick-camera-properties "Properties view for Perspective Camera"
+   \image studio-qtquick-camera-properties.webp "Properties view for Perspective Camera"
 
     \section1 Setting Camera Field of View
 
@@ -73,6 +73,8 @@
     when \l {Creating Projects}{creating your project}, the camera properties
     will be slightly different.
 
+    \note Orthographic cameras don't have the FOV property.
+
     The camera frustum can be obtained by taking a frustum (that is, a
     truncation with parallel planes) of the cone of vision that a camera or eye
     would have to the rectangular viewports typically used in computer graphics.
@@ -112,10 +114,10 @@
     \note The \uicontrol {Horizontal magnification} and
     \uicontrol {Vertical magnification} properties are not available in Qt 5.
 
-    The \uicontrol {Frustum culling enabled} property determines whether the
+    The \uicontrol {Frustum culling} property determines whether the
     objects outside the camera frustum will be culled, which means they will not
     be passed to the renderer.
-    \note The \uicontrol {Frustum culling enabled} property is not available in
+    \note The \uicontrol {Frustum culling} property is not available in
     Qt 5.
 
     The default values are intended to cause anything within the view
@@ -124,5 +126,22 @@
     better results with ambient occlusion or with effects that use the depth
     buffer of the camera, such as the \e {depth of field} effect.
 
-    \note Orthographic cameras don't have the FOV property.
+    \section1 Setting a Camera to Look at an Object
+
+    Setting the camera to look at a specific object can be useful, for example,
+    if you want to create a cinematic effect or have the camera follow a user-controlled object.
+
+    To set a camera to look at an object:
+
+    \list 1
+      \li In \uicontrol Navigator, select the camera.
+      \li In \uicontrol Properties > \uicontrol {Look-at-Node}, select the object that
+      the camera should look at.
+      \image camera-look-at-node.webp
+    \endlist
+
+    When you set a camera to look at an object, the camera automatically rotates to
+    point toward the assigned object, even if the object or the camera moves. The rotation only
+    happens around the x and y axes.
+
 */
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-custom-shaders.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-custom-shaders.qdoc
index b559fd2230..f053834f0d 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-custom-shaders.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-custom-shaders.qdoc
@@ -29,7 +29,7 @@
     \uicontrol {Custom Material} components, in
     \uicontrol Components > \uicontrol {Qt Quick3D} > \uicontrol {Qt Quick 3D}.
 
-    \image studio-qtquick-3d-components.png "Effect and Custom Material Components in Components"
+    \image studio-qtquick-3d-components.webp "Effect and Custom Material Components in Components"
 
     \note In Qt 5 the \uicontrol Effect component is located in
     \uicontrol {Qt Quick 3D Effects} >
@@ -218,7 +218,7 @@
 
     \row
         \li \l Blending
-        \li \inlineimage ok.png
+        \li
         \li A pass command that specifies the source blending function.
 
             The \uicontrol Source property specifies the source blending
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-editor.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-editor.qdoc
index 7111d2db90..ebe842a555 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-editor.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-editor.qdoc
@@ -1,4 +1,4 @@
-// Copyright (C) 2022 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
@@ -6,8 +6,12 @@
     \page studio-3d-editor.html
     \nextpage studio-material-editor.html
 
+    \ingroup studio-views
+
     \title 3D
 
+    \brief Edit a 3D scene.
+
     When editing a 3D scene, you view the scene in the \uicontrol{3D}
     view. You can change the projection of the view by switching between
     \e {perspective camera} and \e {orthographic camera} modes. When using the
@@ -25,7 +29,7 @@
     components from \uicontrol Components > \inlineimage icons/plus.png
     > \uicontrol {Qt Quick 3D} > \uicontrol {Qt Quick 3D}.
 
-    You can use the \l{Summary of the 3D View Toolbar Buttons}{toolbar buttons}
+    You can use the toolbar buttons
     to \e transform 3D components and manipulate the 3D scene. Transformation
     refers to moving, rotating, or scaling of a component. The \e pivot of the
     component is used as the origin for transformations. You can set a
@@ -56,7 +60,7 @@
       \li Delete components
     \endlist
 
-    \image 3d-view-context-menu.png
+    \image 3d-view-context-menu.webp "The context menu in the 3D view"
 
     To refresh the contents of the \uicontrol{3D} view, press \key P or
     select the \inlineimage icons/reset.png
@@ -71,6 +75,8 @@
 
     \section1 Controlling the 3D View Camera
 
+    \section2 Toggling Camera Mode
+
     To switch to perspective camera mode, select
     \inlineimage perspective_camera.png
     (\uicontrol {Toggle Perspective/Orthographic Edit Camera}).
@@ -78,14 +84,16 @@
     \inlineimage orthographic_camera.png
     . You can also Toggle the camera mode by using the keyboard shortcut \key T.
 
+    \section2 Navigating in the 3D Scene
+
     You can navigate the scene by panning, rotating, and zooming the 3D view
     camera:
 
     \list
         \li To pan, press \key Alt (or \key Option on \macos) and use the
             middle mouse button to click and drag anywhere in the rendered
-            view to slide the view around.
-            \note It is not possible to pan using Magic Mouse.
+            view to slide the view around. Alternatively, press and hold \key {right mouse
+            button} and \key {left mouse button} and drag anywhere in the view to pan.
         \li To orbit, press \key Alt and click and drag anywhere in the rendered
             view to rotate the view.
         \li To zoom, use the mouse wheel or press \key Alt and right-click
@@ -104,6 +112,17 @@
     selected, the camera is pointed at the world origin. This does not affect
     the camera zoom level.
 
+    \image studio-3d-editor-axis-helper.webp "Axis helper in the 3D view"
+
+    You can use scene cameras (2) to view the \uicontrol View3D component from a
+    specific angle in the \l {2D} view while editing scenes. Different types of
+    cameras are available in \uicontrol Components
+    > \uicontrol {Qt Quick 3D} > \uicontrol {Qt Quick 3D}. For more information
+    about using cameras in the scene, the available camera types, and their
+    properties, see \l{Cameras}.
+
+    \section2 Using Split View
+
     To view the scene in a split view of four different point of views, select
     \inlineimage icons/split-view.png.
 
@@ -114,14 +133,44 @@
     independently. Navigate each split by panning, rotating, and zooming, as
     described above.
 
-    \image studio-3d-editor-axis-helper.webp "Axis helper in the 3D view"
+    \section2 Using Fly Mode
 
-    You can use scene cameras (2) to view the \uicontrol View3D component from a
-    specific angle in the \l {2D} view while editing scenes. Different types of
-    cameras are available in \uicontrol Components
-    > \uicontrol {Qt Quick 3D} > \uicontrol {Qt Quick 3D}. For more information
-    about using cameras in the scene, the available camera types, and their
-    properties, see \l{Cameras}.
+    You can move around freely in the 3D scene with fly mode. To navigate the scene with
+    fly mode, keep the \key {right mouse button} pressed and use the listed keys to move
+    around the scene.
+
+    \table
+    \header
+        \li Key
+        \li Action
+    \row
+        \li \key W or \key {Up arrow}
+        \li Move forward.
+    \row
+        \li \key S or \key {Down arrow}
+        \li Move backward.
+    \row
+        \li \key A or \key {Left arrow}
+        \li Move left.
+    \row
+        \li \key D or \key {Right arrow}
+        \li Move right.
+    \row
+        \li \key E or \key {Page up}
+        \li Move up.
+    \row
+        \li \key Q or \key {Page down}
+        \li Move down.
+    \endtable
+
+    To adjust the movement speed, select \inlineimage icons/camera_speed.png in the
+    \uicontrol 3D view toolbar to open the configuration dialog.
+
+    In the configuration dialog, you can:
+    \list
+        \li Adjust the movement speed of the camera with a slider.
+        \li Set a value multiplier for the speed slider.
+    \endlist
 
     \section1 Using Global and Local Orientation
 
@@ -423,120 +472,4 @@
     Select \uicontrol{Reset All Viewports} to reset the shading of the scene in all of the
     splits.
 
-    \section1 Summary of the 3D View Toolbar Buttons
-
-    The \uicontrol{3D} view toolbar contains the following buttons:
-
-    \table
-    \header
-        \li Button
-        \li Tooltip
-        \li Keyboard Shortcut
-        \li Read More
-    \row
-        \li \inlineimage icons/select_group.png
-            \inlineimage icons/select_item.png
-        \li Toggle Group/Single Selection Mode
-        \li \key Q
-        \li \l{Selecting Components}
-    \row
-        \li \inlineimage icons/move_off.png
-        \li Activate the Move Tool
-        \li \key W
-        \li \l{moving components 3d view}{Moving Components}
-    \row
-        \li \inlineimage icons/rotate_off.png
-        \li Activate Rotate Tool
-        \li \key E
-        \li \l{Rotating Components}
-    \row
-        \li \inlineimage icons/scale_off.png
-        \li Activate Scale Tool
-        \li \key R
-        \li \l{Scaling Components}
-    \row
-        \li \inlineimage icons/fit_selected.png
-        \li Fit Selected Object to View
-        \li \key F
-        \li \l{Controlling the 3D View Camera}
-    \row
-        \li  \inlineimage icons/perspective_camera.png
-             \inlineimage icons/orthographic_camera.png
-        \li Toggle Perspective/Orthographic Edit Camera
-        \li \key T
-        \li \l{Controlling the 3D View Camera}
-    \row
-        \li \inlineimage icons/global.png
-        \li Toggle Global/Local Orientation
-        \li \key Y
-        \li \l{Using Global and Local Orientation}
-    \row
-        \li \inlineimage icons/edit_light_off.png
-            \inlineimage icons/edit_light_on.png
-        \li Toggle Edit Light On/Off
-        \li \key U
-        \li \l{Using Edit Light}
-    \row
-        \li \inlineimage icons/snapping-3d.png
-        \li Toggle Snapping During Node Drag
-        \li \key Shift + \key Tab
-        \li \l{Snapping}
-    \row
-        \li \inlineimage icons/snapping-3d-conf.png
-        \li Open Snap Configuration Dialog
-        \li
-        \li \l{Configuring Snapping}
-    \row
-        \li \inlineimage icons/align-camera-on.png
-        \li Align Selected Cameras to View
-        \li
-        \li\l{Aligning Views and Cameras}
-    \row
-        \li \inlineimage icons/align-view-on.png
-        \li Align View to Selected Camera
-        \li
-        \li \l{Aligning Views and Cameras}
-    \row
-        \li \inlineimage icons/visibilityon.png
-        \li Visibility Toggles
-        \li
-        \li \l{Toggling Visibility}
-    \row
-        \li \inlineimage icons/3d-background-color.png
-        \li Background Color Actions
-        \li
-        \li \l{Changing Colors}
-    \row
-        \li \inlineimage icons/split-view.png
-        \li Toggle Split View On/Off
-        \li \key Ctrl + \key Alt + \key Q
-        \li \l{Using Split View}
-    \row
-        \li \inlineimage icons/particles-seek.png
-        \li Seek Particle System Time
-        \li
-        \li \l{Particle Editor}
-    \row
-        \li \inlineimage icons/particle-animation-on.png
-        \li Toggle Particle Animation
-        \li \key V
-        \li \l{Particle Editor}
-    \row
-        \li \inlineimage icons/particle-play.png
-            \inlineimage icons/particle-pause.png
-        \li Play/Pause Particles
-        \li \key ,
-        \li \l{Particle Editor}
-    \row
-        \li \inlineimage icons/particle-restart.png
-        \li Restart Particles
-        \li \key /
-        \li \l{Particle Editor}
-    \row
-        \li \inlineimage icons/reset.png
-        \li Reset View
-        \li \key P
-        \li
-    \endtable
-
 */
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-effects.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-effects.qdoc
index 158932dff8..95eb3232d7 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-effects.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-effects.qdoc
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
@@ -263,7 +263,7 @@
         be transparent in the \uicontrol {Background Mode} field of the
         \uicontrol {Scene Environment} component. Otherwise, the clear color of
         the background hides the blur. For more information, see
-        \l {Scene Environment}.
+        \l {Scene Environments}.
 
         The \uicontrol {Fade Amount} property defines the fade speed of the
         trail.
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-lights.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-lights.qdoc
index af994d5877..c7ae1e955e 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-lights.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-lights.qdoc
@@ -9,7 +9,7 @@
     \title Lights
 
     Light components are the primary source of lighting in a \QDS scene.
-    As a secondary light source, you can use \l{Setting the Light Probe}
+    As a secondary light source, you can use \l{Setting Image Based Lighting}
     {image-based lighting}.
 
     To add a light component to your UI, do one of the following:
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-model.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-model.qdoc
index 4159269bc7..e1f6edd8de 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-model.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-model.qdoc
@@ -27,11 +27,14 @@
       \note You can not create \uicontrol Empty models this way.
     \endlist
 
+    Double-clicking a 3D model in \uicontrol 2D view opens the \uicontrol 3D view with
+    the 3D model selected.
+
     If you cannot find the model components in \uicontrol {Components}, add the
     \uicontrol QtQuick3D module to your project, as described in
     \l {Adding and Removing Modules}.
 
-    \image studio-qtquick-3d-components.png "The Qt Quick 3D section in Components"
+    \image studio-qtquick-3d-components.webp "The Qt Quick 3D section in Components"
 
     \section1 Model Properties
 
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-repeater-3d.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-repeater-3d.qdoc
index 9e181a8aae..0f0d0634ca 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-repeater-3d.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-repeater-3d.qdoc
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
@@ -8,10 +8,6 @@
 
     \title Repeater3D
 
-    \note The \uicontrol Repeater3D component is released as a tech preview
-    feature in \QDS 2.2, and its functionality will be improved in future
-    releases.
-
     The \uicontrol Repeater3D component is used to create multiple
     similar items. Like other view types, \uicontrol Repeater3D needs a model
     and a delegate. The delegate sets the item to use and the model sets the
@@ -100,90 +96,58 @@
     \endlist
     \image repeater3d-numeric-model.webp
 
-    \section1 Adding a Repeater3D Component with a List Model
+    \section1 Adding a Repeater3D Component with a Model
 
     This section explains how to add a \uicontrol Repeater3D component with
-    a ListModel to your \QDS project:
+    a model to your \QDS project:
 
     To add a \uicontrol Repeater3D component:
 
     \list 1
       \li Drag a \uicontrol Repeater3D component from \uicontrol Components to
       \e scene in \uicontrol Navigator.
-      \li You need to enter the QML code for the \uicontrol ListModel manually.
-      Go to the \uicontrol {Code} view and enter the following code somewhere
-      inside the root object:
-      \code qml
-        ListModel {
-            id: planetModel
-            ListElement {
-                name: "Mars"
-                radius: 3.39
-            }
-            ListElement {
-                name: "Earth"
-                radius: 6.37
-            }
-            ListElement {
-                name: "Venus"
-                radius: 6.05
-            }
-        }
-        \endcode
-      The default root object for a \QDS project is \uicontrol Rectangle, so
-      you can paste the \uicontrol ListModel code, for example, like this:
-      \code qml
-      Rectangle {
-        width: Constants.width
-        height: Constants.height
-        color: Constants.backgroundColor
-
-        ListModel {
-            id: planetModel
-            ListElement {
-                name: "Mars"
-                radius: 3.39
-            }
-            ListElement {
-                name: "Earth"
-                radius: 6.37
-            }
-            ListElement {
-                name: "Venus"
-                radius: 6.05
-            }
-        }
-
-        View3D {
-            id: view3D
-            anchors.fill: parent
-            ...
-    \endcode
-    \li In the \uicontrol {Code} view, add \c {model: planetModel} to the
-    \uicontrol Repeater3D object to tell that you want to use your
-    \uicontrol ListModel as the model for the \uicontrol Repeater3D object.
-    \code qml
-    Repeater3D {
-        id: repeater3D
-        model: planetModel
-    }
-    \endcode
+      \li Go to \uicontrol {Model Editor} and create a new model with the name
+      \e planetModel.
+      \li Add the following columns and data to the model.
+        \raw HTML
+        <table>
+          <tr>
+            <th>name (<i>String</i>)</th>
+            <th>radius (<i>Real</i>)</th>
+          </tr>
+          <tr>
+            <td>Mars</td>
+            <td>3.39</td>
+          </tr>
+          <tr>
+            <td>Earth</td>
+            <td>6.37</td>
+          </tr>
+          <tr>
+            <td>Venus</td>
+            <td>6.05</td>
+          </tr>
+        </table>
+        \endraw
+        \note You can also import a model in JSON or CSV format. See \l {Importing a Data Model}.
+        \image repeater3d-model-editor.webp
+      \li In \uicontrol Navigator, select \e{_3DRepeater}.
+      \li In \uicontrol Properties, set \uicontrol Model to \e {DataStore.planetModel}.
     \endlist
-
     Now, you have set up the \uicontrol Repeater3D component to use a
     \uicontrol ListModel to draw the items. Next, you need to add the
-    item to draw. In this example we are using a \uicontrol Sphere.
+    item to draw. In this example, you are using a \uicontrol Sphere.
 
     \list 1
-      \li From \uicontrol Components, drag a \uicontrol Sphere to \e repeater3D
+      \li From \uicontrol Components, drag a \uicontrol Sphere to \e _3DRepeater
       in \uicontrol Navigator.
       \image repeater3d-listmodel-navigator.png
-      \li Select \e sphere in \uicontrol Navigator and select
+      \li Select \e sphere in \uicontrol Navigator and in the \Properties view, select
       \inlineimage icons/action-icon.png
       next to \uicontrol Scale > \uicontrol X.
       \li Select \uicontrol {Set binding} to open \uicontrol {Binding Editor}.
       \li In the binding editor, enter \c{radius}. This sets the X
-      scale to the radius value defined in the ListModel for each of the sphere
+      scale to the radius value defined in the model for each of the sphere
       instances.
       \image repeater3d-radius-binding.png
       \li Select \uicontrol OK.
@@ -195,7 +159,7 @@
     position so you need to change the position to see all spheres.
 
     \list 1
-      \li Select \e sphere in \uicontrol Navigator and select
+      \li Select \e sphere in \uicontrol Navigator and in the \uicontrol Properties view, select
       \inlineimage icons/action-icon.png
       next to \uicontrol Translation > \uicontrol X.
       \li Select \uicontrol {Set binding} to open \uicontrol {Binding Editor}.
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-scene-environment.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-scene-environment.qdoc
index 6e9db7012c..5d18f39a83 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-scene-environment.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-scene-environment.qdoc
@@ -1,4 +1,4 @@
-// Copyright (C) 2020 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
@@ -6,31 +6,43 @@
     \previouspage studio-3d-camera.html
     \nextpage studio-3d-morph-target.html
 
-    \title Scene Environment
+    \title Scene Environments
 
-    You can use the \uicontrol {Scene Environment} component to specify
-    how a scene is rendered globally. You can specify settings for antialiasing,
-    scene background, ambient occlusion, and image-based lighting in the
-    \l Properties view. The \uicontrol {Scene Environment} component is available
-    in \uicontrol Components > \uicontrol {Qt Quick 3D}. It is
-    automatically included under the 3D view component in \l{Creating Projects}
-    {projects created} using the \uicontrol {Qt Quick 3D Application} wizard
-    template.
+    The \uicontrol {Scene Environment} and the \uicontrol {Extended Scene Environment}
+    components define how a scene is rendered globally.
 
-    \note If you select \uicontrol {Qt 5} as the \uicontrol {Target Qt Version}
-    when \l {Creating Projects}{creating your project}, the available properties
-    for this component will be slightly different. The properties may also be
-    situated differently in the \uicontrol Properties view.
+    \note The available properties for the scene environments and their location in the
+    \uicontrol Properties view vary according to \uicontrol {Target Qt Version} that
+    you select when \l {Creating Projects}{creating your project}.
+
+    \note \uicontrol {Extended Scene Environment} is available in projects created with
+    Qt 6.5 or higher as the \uicontrol {Target Qt Version}.
+
+    \section1 Adding Scene Environments to Projects
+
+    Add the scene environment components to projects by selecting a suitable preset when
+    \l{Creating Projects}{creating your project}.
+
+    Use the \uicontrol {3D} preset to create a project with a \uicontrol View3D
+    component that includes a scene environment. If you need to add it manually, it is
+    available in \uicontrol Components > \uicontrol {Qt Quick 3D}.
+
+    Use the \uicontrol {Extended 3D} preset to create a project with a 3D view
+    component that includes an extended scene environment. It is also
+    available in \uicontrol Components > \uicontrol {Qt Quick 3D Helpers}.
 
     \section1 Setting the Scene Environment
 
-    In the \uicontrol {Scene Environment} section of the \uicontrol Properties
-    view, you can specify whether and how the background of the scene should be
-    cleared, specify whether you wish to perform depth-tests on the scene,
-    apply post-processing effects to the scene, and define how colors are
-    tonemapped before the scene is rendered.
+    To define properties for the scene environment, select \uicontrol {Scene Environment}
+    in \uicontrol Navigator and specify its properties in the \uicontrol Properties view.
 
-    \image studio-3d-scene-environment-properties.png "The Scene Environment properties"
+    Set the properties in the \uicontrol {Scene Environment} section of the
+    \uicontrol Properties view to specify whether and how the background
+    of the scene should be cleared, to apply post-processing effects to the scene,
+    to define how colors are tonemapped before the scene is rendered, and to
+    specify fog settings.
+
+    \image studio-3d-scene-environment-properties.webp "The Scene Environment properties"
 
     The \uicontrol {Clear color} property specifies which color will be used to
     clear the background of the scene if \uicontrol {Background mode} is defined
@@ -64,23 +76,22 @@
                     image as a \uicontrol SkyBox using the
                     \uicontrol Image property in the \uicontrol {Light probe}
                     section (In Qt 5, the \uicontrol {Light Probe} property in
-                    the \uicontrol {Image-Based Lighting} group.
+                    the \uicontrol {Image-Based Lighting} group).
+            \row
+                \li SkyBoxCubeMap
+                \li The scene will not be cleared, but instead a
+                    \uicontrol SkyBox or Skydome that uses a \uicontrol CubeMapTexture
+                    will be rendered. A cube map texture has six faces
+                    (X+, X-, Y+, Y-, Z+, and Z-), where each face is an individual
+                    2D image. Selecting this mode allows custom materials and post-processing
+                    effects to work with cube map textures in their shaders.
         \endtable
 
     To leave the scene uncleared, select \uicontrol {Unspecified} as the
     \uicontrol {Background mode}.
 
-    You can perform depth tests to optimize the scene environment. To skip the
-    depth tests, deselect the \uicontrol {Enable depth test} checkbox. Note that
-    skipping the tests can cause rendering errors.
-
-    To have the renderer write to the depth buffer as part of the color pass,
-    deselect the \uicontrol {Enable depth prepass} checkbox. Deselecting the
-    checkbox disables the depth prepass on any GPU that uses tiled rendering
-    architecture.
-
-    The \uicontrol Effect property defines a post-processing effect to the
-    scene. Use the dropdown menu to select one of the effects that will be
+    The \uicontrol Effects property defines post-processing effects applied
+    to the scene. Use the dropdown menu to select one of the effects that will be
     applied to the entire scene. The order of the effects is significant since
     the result of each effect is fed to the next.
 
@@ -92,14 +103,21 @@
     tonemapping, or \uicontrol ToneMapModeFilmic to apply filmic tonemapping.
     \note The \uicontrol {Tonemap mode} property is not available in Qt 5.
 
+    The \uicontrol Fog property defines settings for fog applied to the
+    scene. When the \uicontrol Fog property of a scene environment is set to a
+    valid \uicontrol Fog object, the properties are used to configure the
+    rendering of fog. The simple fog provided by this type is implemented by
+    the materials. Use the dropdown menu to select a \uicontrol Fog object for
+    your scene.
+
     \section1 Applying Antialiasing
 
-    Antialiasing is used to make curved lines smoother on the screen. In the
+    Use antialiasing to make curved lines smoother on the screen. In the
     \uicontrol Antialiasing section of the \uicontrol Properties view, you can
     specify the mode and quality of antialiasing and also enable temporal
     antialiasing and define its strength.
 
-    \image studio-3d-scene-environment-antialiasing.png "The Antialiasing properties"
+    \image studio-3d-scene-environment-antialiasing.webp "The antialiasing properties"
 
     The \uicontrol {Antialiasing mode} property specifies the mode of
     antialiasing applied when the scene is rendered. Select one of the following
@@ -174,11 +192,12 @@
     animations stop.
 
     The \uicontrol {Temporal AA strength} property modifies the amount of
-    temporal movement in antialiasing. This property only has an effect when
+    temporal movement in antialiasing. This property is only available when
     the \uicontrol {Temporal AA} property is set to true.
 
-    \note In Qt 5, the antialiasing properties are located in
-    \uicontrol Properties > \uicontrol {Scene Environment}.
+    The \uicontrol {Specular AA} property enables specular antialiasing. Specular
+    aliasing is often visible in form of bright dots and flickering when moving the
+    camera around.
 
     \section1 Applying Ambient Occlusion
 
@@ -188,14 +207,17 @@
     \uicontrol {Sample rate}, and \uicontrol Bias properties in the
     \uicontrol {Ambient Occlusion} section of the \uicontrol Properties view.
 
-    \image studio-3d-scene-environment-ambient-occlusion.png "The Ambient Occlusion properties"
+    \image studio-3d-scene-environment-ambient-occlusion.webp "The ambient occlusion properties"
+
+    In \uicontrol Properties > \uicontrol {Ambient Occlusion}, select the
+    \uicontrol Enabled checkbox to define settings for ambient occlusion.
 
-    You can set the strength of the shadows using the \uicontrol Strength
-    property, which defines the amount of ambient occlusion applied. A value of
-    100 causes full darkness shadows, while lower values cause the shadowing to
-    appear lighter. A value of 0 disables ambient occlusion entirely, thus
-    improving performance at a cost to the visual realism of 3D objects rendered
-    in the scene. All values other than 0 have the same impact on performance.
+    Set the strength of the shadows using the \uicontrol Strength property,
+    which defines the amount of ambient occlusion applied. A value of 100 causes
+    full darkness shadows, while lower values cause the shadowing to appear lighter.
+    A value of 0 disables ambient occlusion entirely, thus improving performance at
+    a cost to the visual realism of 3D objects rendered in the scene. All values other
+    than 0 have the same impact on performance.
 
     The \uicontrol Distance property defines roughly how far the ambient occlusion
     shadows spread away from objects. Greater distances cause increasing impact
@@ -213,7 +235,7 @@
     occlusion, try adjusting the value in the \uicontrol {Clip far} field in
     the \l{Cameras}{scene camera} properties.
 
-    The \uicontrol {Sample rate} property specifies the number of shades of gray,
+    The \uicontrol {Sample Rate} property specifies the number of shades of gray,
     thus defining the quality of ambient occlusion at the expense of performance.
 
     The \uicontrol Bias property defines a cutoff distance preventing objects
@@ -227,15 +249,15 @@
     differently: \uicontrol {AO strength}, \uicontrol {AO distance},
     \uicontrol {AO softness}, \uicontrol {AO dither}, and \uicontrol {AO bias}.
 
-    \section1 Setting the Light Probe
+    \section1 Setting Image Based Lighting
 
-    In the \uicontrol {Light Probe} section of the \uicontrol Properties view,
-    you can set the \uicontrol Image, \uicontrol Exposure, \uicontrol Horizon,
+    In the \uicontrol {Image Based Lighting} section of the \uicontrol Properties view,
+    you can set the \uicontrol {HDR Image}, \uicontrol Exposure, \uicontrol Horizon,
     and \uicontrol Orientation properties for image-based lighting.
 
-    \image studio-3d-scene-environment-light-probe.png "The Light Probe properties"
+    \image studio-3d-scene-environment-image-based-lighting.webp "Image based lighting properties"
 
-    The \uicontrol Image property defines an image used to light the scene
+    The \uicontrol {HDR Image} property defines an image used to light the scene
     instead of or in addition to standard lights. The image is preferably a
     high-dynamic range image or a pre-generated cubemap. Pre-baking provides
     significant performance improvements at run time because no time is spent on
@@ -286,4 +308,45 @@
 
     The value of the \uicontrol {Probe FOV} property sets the angle of the
     image source field of view when using a camera source as the IBL probe.
+
+    \section2 Advanced Scene Environment settings
+
+    You can perform depth tests to optimize the scene environment. To skip the
+    depth tests, clear the \uicontrol {Enable depth test} checkbox. Note that
+    skipping the tests can cause rendering errors.
+
+    To have the renderer write to the depth buffer as part of the color pass,
+    clear the \uicontrol {Enable depth prepass} checkbox. Clearing the
+    checkbox disables the depth prepass on any GPU that uses tiled rendering
+    architecture.
+
+    To specify additional render settings for debugging scenes, define
+    \uicontrol {Debug Settings}.
+
+    To define lightmap baking settings for direct and indirect lighting, use
+    the \uicontrol {Light Mapper} property to specify a lightmapper object.
+    These settings are not relevant at other times, such as when using already
+    generated lightmaps to render a scene.
+
+    \section1 Setting the Extended Scene Environment
+
+    In addition to properties described above, in the extended scene environment
+    you can apply effects to your scene by defining them as properties. When enabling
+    one or more of these effects, the result is similar to manually adding
+    \l {3D Effects}{effects} to \uicontrol {Scene Environment}.
+
+    Use \uicontrol {Extended Scene Environment} instead of \uicontrol {Scene Environment}
+    to add multiple and complex effects to your scene. Because the \uicontrol
+    {Extended Scene Environment} combines the effects that are enabled, the number of
+    render passes is reduced, which results in significantly better performance
+    than applying individual post-processing effects to the scene.
+
+    For the extended scene environment, you can also define \uicontrol {Local Custom Properties}.
+
+    \image studio-ext-scene-environment.webp "Properties of Extended Scene Environment"
+
+    \note If additional post-processing effects are manually added to
+    \uicontrol {Scene Environment}, those effects will be applied before the effects
+    defined in the properties of \uicontrol {Extended Scene Environment}.
+
 */
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-view.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-view.qdoc
index 5f2f53ca96..1ada3625ff 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-view.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-view.qdoc
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
@@ -8,42 +8,61 @@
 
     \title 3D Views
 
-    To create a Qt Quick 3D UI project, we recommend using a \uicontrol
-    {Qt Quick 3D Application} wizard template that adds the
+    To create a Qt Quick 3D UI project, use the \uicontrol {3D} preset that adds the
     \l {3D Components}{Qt Quick 3D} components to \uicontrol Components
-    and contains a 3D view. A 3D view component includes a
-    \l {Scene Environment}{scene environment} as well as a scene
-    \l {Lights}{light}, \l {Cameras}{camera}, and
-    \l {3D Models}{model}. A default \l {Materials and Shaders}{material}
-    is attached to the model. You can attach \l {Textures}{textures}
-    to materials. For more information about creating projects, see \l{Creating Projects}.
-
-    To add a 3D view to some other kind of a project, you first need to add the
+    and contains a 3D view component. The \uicontrol {View3D} component
+    includes a \l {Scene Environments}{scene environment} as well as a scene \l {Lights}{light},
+    \l {Cameras}{camera}, and \l {3D Models}{model}. A default \l {Materials and Shaders}{material}
+    is attached to the model. You can attach \l {Textures}{textures} to materials.
+
+    To create a project with many complex effects, use the \uicontrol {Extended 3D} preset
+    that creates a project with an \uicontrol {Extended View3D} component.
+    The extended 3D view includes an {Extended Scene Environment}
+    component that enables using various effects by defining them as properties.
+
+    \note The extended 3D view is available in projects created with Qt 6.5
+    or higher set as the target version.
+
+    For more information about creating projects, see \l{Creating Projects}.
+
+    To manually add a 3D view to your project, you first need to add the
     \uicontrol {Qt Quick 3D} module to \uicontrol {Components}, as described in
     \l {Adding and Removing Modules}.
 
-    \image studio-qtquick-3d-components.png "Qt Quick 3D components in Components"
+    \note \uicontrol {The Qt Quick 3D} module is not available in projects created
+    with Qt 5 set as the target version.
 
-    You can now drag-and-drop a \uicontrol View3D component to the \l Navigator
-    or \l {2D} view.
+    \image studio-qtquick-3d-components.webp "QtQuick3D components"
 
-    \image studio-navigator-view3d.png "A View 3D component in the Navigator"
+    You can now drag a \uicontrol View3D or an \uicontrol {Extended View3D} component from
+    \l Components > \uicontrol QtQuick3D > \uicontrol Items to \l Navigator or to the
+    \l {2D} view.
 
-    By default, a directional light and a perspective camera are used in a 3D
-    scene created by using the wizard template mentioned above. To use other
-    light and camera types, select the component in the \uicontrol{3D} or
-    \uicontrol Navigator view and change the type of the component in the \uicontrol
-    Type field in \l Properties. For example, to use a point light, enter
-    \e {PointLight}.
+    To switch to the \uicontrol 3D view while maintaining the camera orientation of the
+    \uicontrol View3D, right-click a \uicontrol View3D or an \uicontrol {Extended View3D}
+    component in the \uicontrol Navigator or \uicontrol 2D view and select
+    \uicontrol {Edit in 3D View}. Alternatively, you can double-click a \uicontrol View3D
+    or an \uicontrol {Extended View3D} component in the \uicontrol 2D view to open the
+    \uicontrol 3D view. Double-clicking a 3D model in the \uicontrol 2D view opens the
+    \uicontrol 3D view with the 3D model selected.
 
-    \image studio-3d-properties-type.png "Type field in Properties view"
+    \image studio-navigator-view3d.png "A View 3D component in Navigator"
 
-    Similarly to other components, you can select a 3D view in \uicontrol
-    Navigator or the \uicontrol{3D} view and modify its property values in the
-    \uicontrol Properties view. Use the properties in the \uicontrol View3D
-    tab to set properties specific to a 3D view component.
+    By default, a directional light and a perspective camera are used in 3D
+    scenes created by using the \uicontrol 3D and \uicontrol {Extended 3D}
+    presets. To use other light and camera types, select the component in
+    the \uicontrol {3D} or \uicontrol Navigator view and change the type of
+    the component in the \uicontrol Type field in \l Properties. For example,
+    to use a point light, enter \c {PointLight}.
 
-    \image studio-qtquick-3d-view.png "View 3D component properties"
+    \image studio-3d-properties-type.webp "Type field in the Properties view"
+
+    Select a 3D view in \uicontrol Navigator or in \uicontrol{3D} to modify
+    its property values in the \uicontrol Properties view. Use the properties
+    in the \uicontrol View3D tab to set properties specific to a 3D view
+    component.
+
+    \image studio-qtquick-3d-view.webp "View 3D component properties"
 
     The \uicontrol Camera property defines which camera is used to render the
     scene to the \uicontrol {2D} view. If this property is not defined, the
@@ -63,4 +82,7 @@
 
     \note The \uicontrol {Import Scene} property can only be set once.
     Subsequent changes will have no effect.
+
+    The \uicontrol {Render Format} property defines the format of the backing
+    texture.
 */
diff --git a/doc/qtdesignstudio/src/reference/qtdesignstudio-keyboard-shortcuts.qdoc b/doc/qtdesignstudio/src/reference/qtdesignstudio-keyboard-shortcuts.qdoc
index ac6354ca90..21b195b522 100644
--- a/doc/qtdesignstudio/src/reference/qtdesignstudio-keyboard-shortcuts.qdoc
+++ b/doc/qtdesignstudio/src/reference/qtdesignstudio-keyboard-shortcuts.qdoc
@@ -112,6 +112,9 @@
             \li  Previous open document in history
             \li  \key{Ctrl+Tab}
         \row
+            \li  Toggle \uicontrol {Menu Bar} visibility
+            \li  \key{Ctrl+Alt+M}
+        \row
             \li  Switch to \uicontrol Welcome mode
             \li  \key{Ctrl+1}
         \row
@@ -201,7 +204,10 @@
             \li  Action
             \li  Keyboard shortcut
         \row
-            \li  Open the QML file that defines the selected component
+            \li  Open the project with \uicontrol {Live Preview}.
+            \li  \key{Alt+P} (\key{Opt+P} on \macos)
+        \row
+            \li  Open the QML file that defines the selected component.
             \li  \key{F2}
         \row
             \li  Jump to the \uicontrol {Code} view.
diff --git a/doc/qtdesignstudio/src/views/qtquick-assets.qdoc b/doc/qtdesignstudio/src/views/qtquick-assets.qdoc
index b95bf1e889..fad871debd 100644
--- a/doc/qtdesignstudio/src/views/qtquick-assets.qdoc
+++ b/doc/qtdesignstudio/src/views/qtquick-assets.qdoc
@@ -1,4 +1,4 @@
-// Copyright (C) 2022 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
@@ -6,43 +6,31 @@
     \previouspage quick-components-view.html
     \nextpage qtquick-navigator.html
 
+    \ingroup studio-views
+
     \title Assets
 
+    \brief Select assets such as images and fonts to use in your application.
+
     The \uicontrol Assets view lists available assets.
 
     \uicontrol {Assets} displays the images and other files
-    that you add to the project folder by dragging-and-dropping external asset
+    that you add to the project folder by dragging external asset
     files to \QDS or by selecting \inlineimage icons/plus.png
     . For more information about importing assets to \QDS, see
     \l {Importing 2D Assets} and \l {Importing 3D Assets}.
 
-    To add assets to your UI, drag-and-drop them from
+    To add assets to your UI, drag them from
     \uicontrol Assets to the \l Navigator, \l {2D}, or \l {3D} view.
 
     To add multiple assets to your UI simultaneously, multiselect them first by
     holding \key Ctrl and clicking the asset files you wish to select.
 
-    \image qtquick-assets-tab.png "Assets view"
+    \image qtquick-assets-tab.webp "Assets view"
 
-    When you drag-and-drop assets from \uicontrol Assets to the \l Navigator
+    When you drag assets from \uicontrol Assets to the \l Navigator
     or \l {2D} view, component instances with a suitable type are
     automatically created for you. For example, instances of the
     \l{Images}{Image} component will be created for graphics files.
 
-    \section1 Context Menu Commands
-
-    \image qtquick-library-context-menu.png "Context menu commands in Assets"
-
-    To use the context menu commands in \uicontrol Assets, right-click the
-    name of a folder and select one of the following commands:
-
-    \list
-        \li \uicontrol {Expand All}: expands all folders.
-        \li \uicontrol {Collapse All}: collapses all folders.
-        \li \uicontrol {Rename Folder}: prompts you to enter a new name
-            for the folder.
-        \li \uicontrol {New Folder}: creates a new folder.
-        \li \uicontrol {Delete Folder}: deletes the folder.
-    \endlist
-
 */
diff --git a/doc/qtdesignstudio/src/views/qtquick-components-view.qdoc b/doc/qtdesignstudio/src/views/qtquick-components-view.qdoc
index 1e2786bfbc..5933e4be70 100644
--- a/doc/qtdesignstudio/src/views/qtquick-components-view.qdoc
+++ b/doc/qtdesignstudio/src/views/qtquick-components-view.qdoc
@@ -1,13 +1,18 @@
-// Copyright (C) 2021 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
     \page quick-components-view.html
     \previouspage studio-material-editor.html
     \nextpage quick-assets.html
+    \sa {Using Components}
+
+    \ingroup studio-views
 
     \title Components
 
+    \brief Select preset components and your own components to use in your application.
+
     The \uicontrol Component view lists the available components.
 
     \image qtquick-components-tab.png "Components view"
@@ -52,7 +57,7 @@
         \li \l{Custom Shaders}
         \li \l{Lights}
         \li \l{Cameras}
-        \li \l{Scene Environment}
+        \li \l{Scene Environments}
         \li \l{Morph Target}
         \li \l{Repeater3D}
         \li \l{Particles}
@@ -86,27 +91,4 @@
     final application package, it is recommended that you select
     \uicontrol {Remove Module} to remove the ones you don't use in the project.
 
-    \section1 Context Menu Commands
-
-    \image qtquick-components-context-menu.png "Context menu commands in Components"
-    \image qtquick-components-context-menu-hide.png "Context menu command Hide Category"
-
-    To use the context menu commands in \uicontrol Components, right-click the
-    name of a module or category and select one of the following commands:
-
-    \list
-        \li \uicontrol {Remove Module}: removes the module and all of its
-            components from \uicontrol Components.
-        \li \uicontrol {Expand All}: expands all the modules.
-        \li \uicontrol {Collapse All}: collapses all the modules.
-        \li \uicontrol {Hide Category}: hides the category from the module.
-        \li \uicontrol {Show Module Hidden Categories}: shows the hidden
-            categories of the module.
-        \li \uicontrol {Show All Hidden Categories}: shows the hidden
-            categories in all of the modules.
-    \endlist
-
-    \note The context menu commands for the \uicontrol Components categories do
-    not function if you have entered something into the \uicontrol Search field.
-    Clear the \uicontrol Search field to resume using the context menu commands.
 */
diff --git a/doc/qtdesignstudio/src/views/qtquick-connection-view.qdoc b/doc/qtdesignstudio/src/views/qtquick-connection-view.qdoc
index 5cc2c4a667..066ff1c9dc 100644
--- a/doc/qtdesignstudio/src/views/qtquick-connection-view.qdoc
+++ b/doc/qtdesignstudio/src/views/qtquick-connection-view.qdoc
@@ -1,13 +1,19 @@
-// Copyright (C) 2021 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
     \page qtquick-connection-view.html
     \previouspage qtquick-properties-view.html
     \nextpage qtquick-states-view.html
+    \sa {Working with Connections}
+
+    \ingroup studio-views
 
     \title Connections
 
+    \brief Add functionality to the UI by creating connections between components,
+    signals, and component properties.
+
     The \uicontrol {Connections} view is a collection of views that enable you
     to create connections between components and the application, to bind
     component properties together, and to add custom properties for components.
@@ -36,29 +42,4 @@
     {preset properties} that you can specify values for. You can add
     custom properties that would not otherwise exist for a particular
     \l{Component Types}{component type}.
-
-    \section1 Summary of the Connections View Tabs
-
-    \table
-    \header
-        \li Tab
-        \li Purpose
-        \li Read More
-    \row
-        \li \uicontrol Connections
-        \li Create connections between components and the application logic
-            by accessing signals outside of the components that emit them.
-        \li \l{Connecting Components to Signals}
-    \row
-        \li \uicontrol Bindings
-        \li Dynamically change the behavior of a component by creating a
-            binding between the properties of two components.
-        \li \l{Adding Bindings Between Properties}
-        \row
-        \li \uicontrol Properties
-        \li Add custom properties that would not otherwise exist for a
-            particular preset component or your own custom component.
-        \li \l{Specifying Custom Properties}
-
-    \endtable
 */
diff --git a/doc/qtdesignstudio/src/views/qtquick-curve-editor.qdoc b/doc/qtdesignstudio/src/views/qtquick-curve-editor.qdoc
index 88ba762f53..52e1ba5963 100644
--- a/doc/qtdesignstudio/src/views/qtquick-curve-editor.qdoc
+++ b/doc/qtdesignstudio/src/views/qtquick-curve-editor.qdoc
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
@@ -6,12 +6,16 @@
     \previouspage qtquick-timeline-view.html
     \nextpage qtquick-text-editor.html
 
+    \ingroup studio-views
+
     \title Curves
 
+    \brief View and modify the animation curve.
+
     The \uicontrol {Curves} view shows the interpolated values of an animated
     property over the animation range.
 
-    \image studio-curve-editor.png "Curves"
+    \image studio-curve-editor.webp "Curves"
 
     When you edit an animation curve, you implicitly edit the
     \l{Editing Easing Curves}{easing curves} that the underlying system uses
@@ -20,11 +24,22 @@
     simultaneously.
 
     You can use the toolbar buttons to add \uicontrol Linear, \uicontrol Step,
-    or \uicontrol Spline interpolation between two keyframes.
+    or \uicontrol Spline interpolation between keyframes.
+
+    To apply interpolation between keyframes:
+    \list 1
+        \li Select the keyframes. To select multiple keyframes, press and hold
+        \key Ctrl, and then select them.
+        \li Select \inlineimage icons/easing-curve-linear-icon.png (\uicontrol Linear),
+        \inlineimage icons/easing-curve-step-icon.png (\uicontrol Step) or
+        \inlineimage icons/easing-curve-spline.png (\uicontrol Spline) depending on
+        which interpolation method you want to use.
+    \endlist
 
     When you set interpolation to \uicontrol Spline, handles appear in
     \uicontrol {Curves} that you can use to modify the curve. Select
-    \uicontrol Unify to lock the handle on the left of a keyframe to the one
+    \inlineimage icons/easing-curve-unify.png (\uicontrol Unify) to lock the handle on the
+    left of a keyframe to the one
     on the right of it so that moving the left handle also moves the right
     handle.
 
@@ -32,53 +47,14 @@
     in \l Navigator, you can select \inlineimage icons/lockon.png
     to unlock it. You can also lock individual easing curves for editing.
 
-    To lock an animation curve, hover the mouse over the keyframe in the list,
+    To lock an animation curve, hover the mouse over the property in the list,
     and then select \inlineimage icons/lockoff.png
     .
 
-    To pin an animation curve, hover the mouse over the keyframe in the list,
+    To pin an animation curve, hover the mouse over the property in the list,
     and then select \inlineimage icons/pin.png
     .
 
-    \section1 Curves Toolbar
-
-    The \uicontrol {Curves} toolbar contains the following buttons and
-    fields.
-
-    \table
-    \header
-        \li Button/Field
-        \li Action
-    \row
-        \li \inlineimage icons/easing-curve-linear-icon.png
-        \li \uicontrol Linear specifies that the interpolation between
-            keyframes is linear.
-    \row
-        \li \inlineimage icons/easing-curve-step-icon.png
-        \li \uicontrol Step uses steps for interpolation between keyframes.
-    \row
-        \li \inlineimage icons/easing-curve-spline-icon.png
-        \li \uicontrol Spline uses bezier spline curves for interpolation
-            between keyframes and displays handles for managing them.
-    \row
-        \li \uicontrol {Set Default}
-        \li Currently not used.
-    \row
-        \li \uicontrol Unify
-        \li For \uicontrol Spline curves, locks the handle on the left of a
-            keyframe to the one on the right.
-    \row
-        \li Start Frame
-        \li Specifies the first frame of the curve.
-    \row
-        \li End Frame
-        \li Specifies the last frame of the curve.
-    \row
-        \li Current Frame
-        \li Displays the frame that the playhead is currently on. Enter a
-            number in the field to move the playhead to the respective frame.
-    \endtable
-
     \section1 Editing Animation Curves
 
     To edit animation curves:
@@ -90,14 +66,14 @@
             \uicontrol {Curves} to open the animation curve editor.
         \li Right-click in \uicontrol {Curves}, and select
             \uicontrol {Insert Keyframe} to add a keyframe.
-        \li Select keyframes to display the easing curves attached to them.
-            To select multiple keyframes, press and hold \key Ctrl.
+        \li Select properties in the list to display the easing curves attached to them.
+            To select multiple properties, press and hold \key Ctrl, and then select them.
     \endlist
 
     Your changes are automatically saved when you close the view.
 
     \section1 Deleting Keyframes in Curves
 
-    To delete the selected keyframe, select \uicontrol {Delete All Keyframes}
+    To delete the selected keyframe, select \uicontrol {Delete Selected Keyframes}
     in the context menu.
 */
diff --git a/doc/qtdesignstudio/src/views/qtquick-designer.qdoc b/doc/qtdesignstudio/src/views/qtquick-designer.qdoc
index 3ca0149437..d4fb09efc6 100644
--- a/doc/qtdesignstudio/src/views/qtquick-designer.qdoc
+++ b/doc/qtdesignstudio/src/views/qtquick-designer.qdoc
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 // **********************************************************************
@@ -27,218 +27,8 @@
 
     \section1 Summary of Design Views
 
-    In addition to the summary of design views, the table below includes an MCU
-    column that indicates the views which are fully supported on MCU projects.
-    For more information, see  \l {\QDS Features on MCU Projects}.
+    The following table provides a summary of the design views. For information on
+    MCU support, see \l {\QDS Features on MCU Projects}.
 
-    \table
-    \header
-        \li View
-        \li Purpose
-        \li MCU
-        \li Read More
-    \row
-        \li \l {2D}
-        \li Provides a working area for designing 2D UIs.
-            When you are editing 3D scenes, the \uicontrol {2D} view is
-            used as a canvas for the 3D scene projected by the camera.
-        \li \image ok.png
-        \li \l {2D}
-    \row
-        \li \l {3D}
-        \li Provides an editor for files you created using 3D graphics
-            applications and stored in one of the supported formats.
-        \li
-        \li \l {3D}
-    \row
-        \li \l {Material Editor and Browser}
-        \li In the \uicontrol {Material Editor} and
-        \uicontrol {Material Browser} views, you create and manage materials and
-        textures.
-        \li
-        \li \l {Material Editor and Browser}
-   \row
-        \li \l Components
-        \li Contains preset components and your own components, that you can use
-            to design you application.
-        \li \image ok.png
-        \li \l{Using Components}
-   \row
-        \li \l Assets
-        \li Contains assets such as images and fonts that you can use in your
-            application.
-        \li \image ok.png
-        \li \l Assets
-    \row
-        \li \l Navigator
-        \li Displays the composition of the current component file as
-            a tree structure. A component file can contain references
-            to other components and assets.
-        \li \image ok.png
-        \li \l Navigator
-    \row
-        \li \l Properties
-        \li Enables you to modify the properties of the selected component.
-        \li \image ok.png
-        \li \l {Specifying Component Properties}
-    \row
-        \li \l{Connections}
-        \li Enables you to add functionality to the UI by creating
-            connections between components, signals, and component properties.
-        \li \image ok.png
-        \li \l{Working with Connections}
-    \row
-        \li \l States
-        \li Displays the different states that can be applied to a component.
-            Typically, states describe UI configurations, such as the
-            visibility and behavior of components and the available user
-            actions.
-        \li \image ok.png
-        \li \l{Working with States}
-    \row
-        \li \l{Transitions}
-        \li Enables you to make movement between states smooth by animating
-            the changes between states.
-        \li \image ok.png
-        \li \l{Animating Transitions Between States}
-    \row
-        \li \l Translations
-        \li Provides functionality to add multi-language support to your
-        project.
-        \li
-        \li \l{Translations}
-    \row
-        \li \l Timeline
-        \li Provides a timeline and keyframe based editor for animating
-            the properties of components.
-        \li \image ok.png
-        \li \l{Creating Timeline Animations}
-    \row
-        \li \l{Curves}
-        \li Enables you to view and modify the whole animation curve by
-            inserting keyframes to the curve and dragging them and the point
-            handlers to modify the curve.
-        \li
-        \li \l {Editing Animation Curves}
-    \row
-        \li \l{Code}
-        \li Provides a code editor for viewing and modifying the code
-            generated by the visual editors.
-        \li \image ok.png
-        \li \l {Code}
-    \row
-        \li \l Projects
-        \li Shows a list of open projects and the files they contain.
-        \li \image ok.png
-        \li \l Projects
-     \row
-        \li \l{File System}
-        \li Shows all files in the currently selected directory.
-        \li \image ok.png
-        \li \l{File System}
-    \row
-        \li \l{Open Documents}
-        \li Shows currently open files.
-        \li \image ok.png
-        \li \l{Open Documents}
-    \row
-        \li \l{Content Library}
-        \li The \uicontrol {Content Library} view contains material, texture,
-        and environment bundles with assets that you can use in your project.
-        \li
-        \li \l{Content Library}
-    \row
-        \li \l{Texture Editor}
-        \li In the \uicontrol {Texture Editor} view, you create and manage
-        textures.
-        \li
-        \li \l{Texture Editor}
-    \row
-        \li \l{Effect Composer}
-        \li Use \uicontrol {Effect Composer} to compose custom effects.
-        \li
-        \li \l{Effect Composer}
-    \endtable
-
-    \section1 Summary of Main Toolbar Actions
-
-    The top level toolbar in the \uicontrol  Design mode contains shortcuts to
-    widely used actions.
-
-    \table
-    \header
-        \li Button/Field
-        \li Action
-        \li Keyboard Shortcut
-        \li Read More
-
-    \row
-        \li \inlineimage icons/home.png
-        \li \uicontrol {Home}: opens the welcome page.
-        \li
-        \li
-    \row
-      \li \inlineimage icons/start_playback.png
-      \li \uicontrol {Play}: runs the application.
-      \li
-      \li
-    \row
-      \li \uicontrol {Live Preview}
-      \li Shows a preview of the current file or the entire UI. The changes you
-          make to the UI are instantly visible to you in the preview.
-      \li \key Alt+P (\key Opt+P on \macos)
-      \li \l{Validating with Target Hardware}
-
-    \row
-        \li Currently open file
-        \li Displays the location and filename of the currently open file. You
-            can select another file in the list of open files to view it in
-            the \uicontrol {2D} and \uicontrol Navigator views.
-        \li
-        \li \l{Open Documents}
-    \row
-        \li \inlineimage icons/prev.png
-        \li \uicontrol {Go Back}: moves a step backwards in your location history.
-            That is, returns the focus to the last location in the last file it
-            was on.
-        \li \key Alt+< (\key Opt+Cmd+< on \macos)
-        \li
-    \row
-        \li \inlineimage icons/next.png
-        \li \uicontrol {Go Forward}: moves a step forward in your location history.
-        \li \key Alt+> (\key Opt+Cmd+> on \macos)
-        \li
-    \row
-        \li \inlineimage icons/close.png
-        \li \uicontrol {Close Document}: closes the current file.
-        \li \key Ctrl+W (\key Cmd+W on \macos)
-        \li
-    \row
-        \li \inlineimage icons/create_component.png
-        \li Creates a custom component from the selected item.
-        \li
-        \li \l{Creating Custom Components}
-    \row
-        \li \inlineimage icons/edit_component.png
-        \li Edits the selected custom component.
-        \li
-        \li \l{Creating Custom Components}
-    \row
-        \li Workspace
-        \li Displays the currently selected workspace. To switch to another
-            workspace, select it in the list.
-        \li
-        \li \l{Managing Workspaces}
-    \row
-        \li \inlineimage icons/lockoff.png
-        / \inlineimage icons/lockon.png
-        \li Toggles the views to locked or movable in \QDS.
-        \li
-        \li \l{Managing Workspaces}
-    \row
-        \li \uicontrol Share
-        \li Shares the application online using Qt Design Viewer.
-        \li
-        \li \l{Sharing Applications Online}
-    \endtable
+    \annotatedlist studio-views
 */
diff --git a/doc/qtdesignstudio/src/views/qtquick-easing-curve-editor.qdoc b/doc/qtdesignstudio/src/views/qtquick-easing-curve-editor.qdoc
index ef518989ce..66b54c0d55 100644
--- a/doc/qtdesignstudio/src/views/qtquick-easing-curve-editor.qdoc
+++ b/doc/qtdesignstudio/src/views/qtquick-easing-curve-editor.qdoc
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
@@ -79,7 +79,7 @@
     \endlist
 
     When you attach easing curves to keyframes, the shape of the
-    \l{keyframe_marker}{keyframe marker} on a keyframe track in
+    keyframe marker on a keyframe track in
     \l Timeline changes from \inlineimage icons/keyframe_linear_active.png
     to a marker that describes the type of the selected easing curve.
 
diff --git a/doc/qtdesignstudio/src/views/qtquick-effect-maker-view.qdoc b/doc/qtdesignstudio/src/views/qtquick-effect-maker-view.qdoc
index 3d7e046d85..f0de1a3522 100644
--- a/doc/qtdesignstudio/src/views/qtquick-effect-maker-view.qdoc
+++ b/doc/qtdesignstudio/src/views/qtquick-effect-maker-view.qdoc
@@ -4,10 +4,14 @@
 /*!
     \page qtquick-effect-composer-view.html
     \previouspage studio-qt-insight.html
-    \nextpage creator-project-managing-workspaces.html
+    \nextpage studio-model-editor.html
+
+    \ingroup studio-views
 
     \title Effect Composer
 
+    \brief Compose custom effects.
+
     Use \uicontrol {Effect Composer} to create post-processing effects that
     can be applied to 2D or 3D components. The effects created with \uicontrol {Effect Composer}
     are shader effects, which can be used in any \QDS projects.
@@ -86,4 +90,4 @@
     \uicontrol Navigator, and in \uicontrol Properties >
     \uicontrol {Exposed Custom Properties}, select or clear the
     \uicontrol timeRunning checkbox.
-
+*/
diff --git a/doc/qtdesignstudio/src/views/qtquick-form-editor.qdoc b/doc/qtdesignstudio/src/views/qtquick-form-editor.qdoc
index 3ac3027392..7ecd0a77db 100644
--- a/doc/qtdesignstudio/src/views/qtquick-form-editor.qdoc
+++ b/doc/qtdesignstudio/src/views/qtquick-form-editor.qdoc
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
@@ -6,13 +6,17 @@
     \previouspage creator-using-qt-quick-designer.html
     \nextpage studio-3d-editor.html
 
+    \ingroup studio-views
+
     \title 2D
 
+    \brief Design 2D UIs.
+
     You design applications in the \uicontrol {2D} view by opening
     component files and placing instances of \l{Component Types}{2D components}
     and \l{Assets}{assets} into them.
 
-    \image qmldesigner-form-editor.png "The 2D view"
+    \image qmldesigner-form-editor.webp "The 2D view"
 
     When you select component instances in the \uicontrol {2D} view, markers
     appear around their edges and in their corners. Depending on the shape of
@@ -25,60 +29,12 @@
         \li \l{Rotating 2D Components}{Rotate}
     \endlist
 
-    \section1 Summary of 2D View Buttons
-
-    The \uicontrol {2D} view toolbar contains the following buttons and
-    fields.
-
-    \table
-    \header
-        \li Button/Field
-        \li Tooltip
-        \li Read More
-    \row
-        \li \uicontrol {Override Width}
-        \li Shows a preview of the component using the specified width.
-        \li \l{Previewing Component Size}
-    \row
-        \li \uicontrol {Override Height}
-        \li Shows a preview of the component using the specified height.
-        \li \l{Previewing Component Size}
-    \row
-        \li \inlineimage icons/canvas-color.png
-        \li Sets the color of the \uicontrol {2D} view working area.
-        \li \l{Setting Canvas Color}
-    \row
-        \li \inlineimage icons/zoomIn.png
-        \li Zooms in.
-        \li \l{Zooming}
-    \row
-        \li \inlineimage icons/zoomOut.png
-        \li Zooms out.
-        \li \l{Zooming}
-    \row
-        \li Zoom level
-        \li Sets the zoom level that you select from the list.
-        \li \l{Zooming}
-    \row
-        \li \inlineimage icons/zoomAll.png
-        \li Zooms to fit all content.
-        \li \l{Zooming}
-    \row
-        \li \inlineimage icons/zoomSelection.png
-        \li Zooms to fit the current selection.
-        \li \l{Zooming}
-    \row
-        \li \inlineimage icons/reset.png
-        \li Refreshes the contents of the \uicontrol {2D} view.
-        \li \l{Refreshing 2D View Contents}
-    \endtable
-
     \section1 Moving Components
 
     When the move cursor is displayed, you can move the selected component
     instance to any position in the \uicontrol {2D} view.
 
-    \image qmldesigner-form-editor-move-cursor.png "Move cursor in the 2D view"
+    \image qmldesigner-form-editor-move-cursor.webp "Move cursor in the 2D view"
 
     For more information about alternative ways of positioning component
     instances in UIs, see \l{Scalable Layouts}.
@@ -88,7 +44,7 @@
     When the resize cursor is displayed, you can drag the markers to resize
     component instances.
 
-    \image qtquick-designer-scaling-items.png "The 2D view"
+    \image qtquick-designer-scaling-items.webp "The 2D view"
 
     To have the resizing done from the center of the selected component instance
     rather than from its edges, press \key Alt (or \key Opt on \macos).
@@ -110,7 +66,7 @@
     clockwise or counter-clockwise to freely rotate the component instance
     around its origin.
 
-    \image qtquick-designer-rotating-items.png "2D rotation tool"
+    \image qtquick-designer-rotating-items.webp "2D rotation tool"
 
     Additionally, press \key Shift or \key Alt (or \key Opt on \macos)
     to rotate component instances in steps of 5 or 45 degrees, respectively.
@@ -152,9 +108,9 @@
     \image qtquick-designer-options.png "Qt Quick Designer preferences"
 
     The following image shows the snapping lines (1) when
-    \uicontrol {Parent component padding} is set to 5 pixels.
+    \uicontrol {Parent component padding} is set to 10 pixels.
 
-    \image qmldesigner-snap-margins.png "Snapping lines on canvas"
+    \image qmldesigner-snap-margins.webp "Snapping lines on canvas"
 
     For alternative ways of aligning and distributing component instances by
     using the \l Properties view, see \l{Aligning and Distributing Components}.
@@ -181,7 +137,7 @@
     values are not changed permanently in the UI file. You can permanently
     change the property values in the \uicontrol Properties view (4).
 
-    \image qmldesigner-preview-size.png "Component width and height"
+    \image qmldesigner-preview-size.webp "Component width and height"
 
     To set the initial size of the root component, select \uicontrol Edit >
     \uicontrol Preferences > \uicontrol {Qt Quick} > \uicontrol {Qt Quick Designer}
@@ -204,7 +160,7 @@
     not affect the background color of your root component or component
     instances in any way.
 
-    \image qmldesigner-canvas-color.png "Transparent canvas color for a transparent component instance"
+    \image qmldesigner-canvas-color.webp "Transparent canvas color for a transparent component instance"
 
     \section1 Refreshing 2D View Contents
 
@@ -219,6 +175,4 @@
     To refresh the contents of the \uicontrol {2D} view, press \key R or
     select the \inlineimage icons/reset.png
     (\uicontrol {Reset View}) button.
-
-    \include qtquick-component-context-menu.qdocinc context-menu
 */
diff --git a/doc/qtdesignstudio/src/views/qtquick-navigator.qdoc b/doc/qtdesignstudio/src/views/qtquick-navigator.qdoc
index f0cd1fe235..cfba22dc60 100644
--- a/doc/qtdesignstudio/src/views/qtquick-navigator.qdoc
+++ b/doc/qtdesignstudio/src/views/qtquick-navigator.qdoc
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
@@ -6,8 +6,12 @@
     \previouspage quick-assets.html
     \nextpage qtquick-properties-view.html
 
+    \ingroup studio-views
+
     \title Navigator
 
+    \brief View the composition of the current component file as a tree structure.
+
     The \uicontrol Navigator view displays the components in the current
     component file and their relationships. \l{glossary-component}{Components}
     (1) are listed in a tree structure, below their parent (2). You can preview
@@ -36,57 +40,11 @@
     you can change the source of an Image component by selecting
     \uicontrol {Change Source URL} in the context menu.
 
-    \section1 Summary of Navigator Buttons
-
-    The following table lists the \uicontrol Navigator buttons:
-
-    \table
-    \header
-        \li Icon
-        \li Tooltip
-        \li Read More
-    \row
-        \li \inlineimage icons/arrowleft.png
-        \li Moves the component one level up in the component tree, so that
-            it becomes the last sibling of its current parent.
-        \li \l{Arranging Components}
-    \row
-        \li \inlineimage icons/arrowright.png
-        \li Moves the component one level down in the component tree, so that it
-            becomes the child of its last sibling.
-        \li \l{Arranging Components}
-    \row
-        \li \inlineimage icons/navigator-arrowdown.png
-        \li Moves the component down within its parent.
-        \li \l{Arranging Components}
-    \row
-        \li \inlineimage icons/navigator-arrowup.png
-        \li Moves the component up within its parent.
-        \li \l{Arranging Components}
-    \row
-        \li \inlineimage icons/filtericon.png
-        \li Shows and hides invisible components in \uicontrol Navigator.
-        \li \l{Showing and Hiding Components}
-    \row
-        \li \inlineimage icons/alias.png
-        \li Adds a property alias that you can use from outside of the
-            component.
-        \li \l{Adding Property Aliases}
-    \row
-        \li \inlineimage icons/visibilityon.png
-        \li Shows and hides components in the \uicontrol {2D} view.
-        \li \l{Showing and Hiding Components}
-    \row
-        \li \inlineimage icons/lockon.png
-        \li Locks components in all views.
-        \li \l{Locking Components}
-    \endtable
-
     \section1 Showing and Hiding Components
 
     To show and hide components in the \uicontrol {2D} view when focusing on
-    specific parts of the application, click \inlineimage icons/visibilityon.png
-    in \uicontrol Navigator.
+    specific parts of the application, select \inlineimage icons/eye_open.png and
+    \inlineimage icons/visibility-off.png in \uicontrol Navigator.
 
     To change the visibility of a component in the application code, select the
     \uicontrol Visibility check box in the \uicontrol Properties view or select
@@ -99,10 +57,8 @@
     component. To hide or show child components, edit the properties of the
     parent component.
 
-    To hide invisible components in \uicontrol Navigator, click
-    \inlineimage icons/filtericon.png
-    (\uicontrol {Filter Tree}) and select
-    \uicontrol {Show Only Visible Components}.
+    To show and hide invisible components in \uicontrol Navigator, select
+    \inlineimage {icons/visibilityon.png}.
 
     \section1 Locking Components
 
@@ -141,9 +97,8 @@
     By default, components that are located at the top of the file are listed at
     the bottom of the \uicontrol Navigator tree and behind overlapping
     components in the \uicontrol {2D} view. To list the components in the order
-    in which they appear in the file, as some other tools do, click
-    \inlineimage icons/filtericon.png
-    (\uicontrol {Filter Tree}), and select \uicontrol {Reverse Component Order}.
+    in which they appear in the file, as some other tools do, select
+    \inlineimage {icons/reverse_order.png}.
 
     To move a component to the top or bottom of the tree within its parent,
     right-click it in the \uicontrol Navigator or \uicontrol {2D} view
@@ -156,20 +111,18 @@
 
     \image qtquick-designer-navigator-arrange.gif "Reversing component order"
 
-    You can also drag-and-drop the component to another position in the tree or
-    use the arrow buttons to move the component in the tree. You can use the
-    left and right arrow buttons to change the parent of the component.
+    You can also drag the component to another position in the tree or use the
+    \inlineimage {icons/navigator-arrowup.png} and \inlineimage {icons/navigator-arrowdown.png}
+    buttons to move the component in the tree. You can use the \inlineimage {icons/arrowleft.png}
+    and \inlineimage {icons/arrowright.png} buttons to change the parent of the component.
 
     \image qmldesigner-navigator-arrows.png "Navigator buttons"
 
-    When you drag-and-drop instances of components to the \uicontrol {2D} view,
+    When you drag instances of components to the \uicontrol {2D} view,
     the new component is added as a child of the component
     beneath it. When you move the components, it is not possible to determine
     whether you want to adjust their position or attach them to a new parent component.
-    Therefore, the parent component is not automatically changed. To change the
-    parent of the component, press down the \key Shift key before you drag-and-drop
-    the component into a new position. The topmost component under the cursor becomes the
-    new parent of the component.
+    Therefore, the parent component is not automatically changed.
 
     \section1 Adding Property Aliases
 
@@ -236,5 +189,4 @@
 
     \image qmldesigner-breadcrumbs.png "Component hierarchy"
 
-    \include qtquick-component-context-menu.qdocinc context-menu
 */
diff --git a/doc/qtdesignstudio/src/views/qtquick-properties-view.qdoc b/doc/qtdesignstudio/src/views/qtquick-properties-view.qdoc
index acde01a951..2d660c9951 100644
--- a/doc/qtdesignstudio/src/views/qtquick-properties-view.qdoc
+++ b/doc/qtdesignstudio/src/views/qtquick-properties-view.qdoc
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
@@ -6,21 +6,25 @@
     \previouspage qtquick-navigator.html
     \nextpage qtquick-connection-view.html
 
+    \ingroup studio-views
+
     \title Properties
 
+    \brief Modify the properties of the selected component.
+
     The \uicontrol Properties view displays all the properties of the selected
     \l{glossary-component}{component}. The properties are grouped by type. The
     top part of the view displays properties that are common to all components,
     such as component type, ID, name, geometry, and visibility.
 
-    \image qtquick-item-properties-common.png "Basic component properties"
+    \image qtquick-item-properties-common.webp "Basic component properties"
 
     The bottom part of the view displays properties that have been defined for
     the component type. For example, the following image displays the predefined
     properties you can set for \l{basic-rectangle}{Rectangle} and \l Text
     components.
 
-    \image qmldesigner-element-properties.png "Rectangle and Text properties"
+    \image qmldesigner-element-properties.webp "Rectangle and Text properties"
 
     \section1 Custom Properties
 
@@ -42,46 +46,6 @@
 
     \image custom-properties.png
 
-    \section1 Summary of Properties View Buttons
-
-    The following table lists the \uicontrol Properties view buttons:
-
-    \table
-    \header
-        \li Icon
-        \li Tooltip
-        \li Read More
-    \row
-        \li \inlineimage icons/alias.png
-        \li Adds a property alias that you can use from outside of the
-            component for the root component. You can use a menu item
-            in the actions menu to add property aliases for property
-            values of child components.
-        \li \l{Adding Property Aliases}
-    \row
-        \li \inlineimage icons/action-icon.png
-        \li Opens a menu with actions for:
-            \list
-                \li Resetting property values to their default values
-                \li Setting property bindings
-                \li Creating property aliases
-                \li Inserting keyframes for timeline animations
-            \endlist
-        \li
-        \list
-                \li \l{Viewing Changes in Properties}
-                \li \l{Adding Bindings Between Properties}
-                \li \l{Adding Property Aliases}
-                \li \l{Setting Keyframe Values}
-        \endlist
-    \row
-        \li \inlineimage icons/action-icon-binding.png
-        \li Indicates that the value of the property is bound to the value
-            of another property. Opens the same menu as the action icon.
-        \li \l{Adding Bindings Between Properties}
-
-    \endtable
-
     \section1 Viewing Changes in Properties
 
     The default values of properties are displayed in white color, while the
diff --git a/doc/qtdesignstudio/src/views/qtquick-properties.qdoc b/doc/qtdesignstudio/src/views/qtquick-properties.qdoc
index fc8ba92e93..87dfd7a341 100644
--- a/doc/qtdesignstudio/src/views/qtquick-properties.qdoc
+++ b/doc/qtdesignstudio/src/views/qtquick-properties.qdoc
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
@@ -17,7 +17,7 @@
     All components share a set of properties that you can specify in the
     \uicontrol Properties view.
 
-    \image qtquick-item-properties-common.png "Basic component properties"
+    \image qtquick-item-properties-common.webp "Basic component properties"
 
     \section2 Type
 
diff --git a/doc/qtdesignstudio/src/views/qtquick-states-view.qdoc b/doc/qtdesignstudio/src/views/qtquick-states-view.qdoc
index 407e2f5769..5270df5b06 100644
--- a/doc/qtdesignstudio/src/views/qtquick-states-view.qdoc
+++ b/doc/qtdesignstudio/src/views/qtquick-states-view.qdoc
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
@@ -7,12 +7,16 @@
     \nextpage studio-translations.html
     \sa {Working with States}
 
+    \ingroup studio-views
+
     \title States
 
+    \brief Apply states to a component.
+
     The \uicontrol States view displays the different
     \l{Working with States}{states} of a UI.
 
-    \image qmldesigner-transitions.png "States view"
+    \image qmldesigner-transitions.webp "States view"
 
     To open the \uicontrol States view, select \uicontrol View >
     \uicontrol Views > \uicontrol States.
diff --git a/doc/qtdesignstudio/src/views/qtquick-states.qdoc b/doc/qtdesignstudio/src/views/qtquick-states.qdoc
index 9f91c52f46..ab31c93f46 100644
--- a/doc/qtdesignstudio/src/views/qtquick-states.qdoc
+++ b/doc/qtdesignstudio/src/views/qtquick-states.qdoc
@@ -4,7 +4,7 @@
 /*!
     \page quick-states.html
     \previouspage quick-json-data-properties.html
-    \nextpage creator-live-preview.html
+    \nextpage studio-live-preview.html
 
     \title Working with States
 
diff --git a/doc/qtdesignstudio/src/views/qtquick-text-editor.qdoc b/doc/qtdesignstudio/src/views/qtquick-text-editor.qdoc
index f202df3c37..6941a1c2ec 100644
--- a/doc/qtdesignstudio/src/views/qtquick-text-editor.qdoc
+++ b/doc/qtdesignstudio/src/views/qtquick-text-editor.qdoc
@@ -6,8 +6,12 @@
     \previouspage qtquick-curve-editor.html
     \nextpage creator-projects-view.html
 
+    \ingroup studio-views
+
     \title Code
 
+    \brief View and modify the code generated by the visual editors.
+
     To view and modify the code in a \l{UI Files}{UI file} (.ui.qml) or
     component file (.qml), go to \uicontrol View and select \uicontrol Views >
     \uicontrol Code. \QDS generates the code when you create components in the
diff --git a/doc/qtdesignstudio/src/views/qtquick-timeline-view.qdoc b/doc/qtdesignstudio/src/views/qtquick-timeline-view.qdoc
index 8194726184..2e34d70dc4 100644
--- a/doc/qtdesignstudio/src/views/qtquick-timeline-view.qdoc
+++ b/doc/qtdesignstudio/src/views/qtquick-timeline-view.qdoc
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
@@ -6,14 +6,18 @@
     \previouspage qtquick-transition-editor.html
     \nextpage qtquick-curve-editor.html
 
+    \ingroup studio-views
+
     \title Timeline
 
+    \brief Animate the properties of components.
+
     You can use the timeline and keyframe based editor in the
     \uicontrol Timeline view to animate the properties of
     \l{glossary_component}{components}. The view is empty until
     you create a timeline.
 
-    \image studio-timeline-empty.png "Empty Timeline view"
+    \image studio-timeline-empty.webp "Empty Timeline view"
 
     Select the \inlineimage icons/plus.png
     (\uicontrol {Add Timeline}) button to
@@ -23,7 +27,7 @@
     \image studio-timeline-settings.png "Timeline Settings dialog"
 
     When you select \uicontrol Close, the \uicontrol Timeline view appears.
-    It now displays a \l{Timeline Toolbar}{toolbar} and a ruler but no
+    It now displays a toolbar and a ruler but no
     keyframe tracks.
 
     \image studio-timeline-no-tracks.webp "Timeline view without keyframe tracks"
@@ -86,171 +90,4 @@
 
     \image studio-timeline-keyframe-track-colors.webp "Keyframe track colors in Timeline"
 
-    \section1 Timeline Toolbar
-
-    The \uicontrol Timeline toolbar contains the following buttons and fields.
-
-    \table
-    \header
-        \li Button/Field
-        \li Action
-        \li Read More
-    \row
-        \li \inlineimage icons/settings.png
-        \li Opens the \uicontrol {Timeline Settings} dialog for editing
-            timeline settings.
-        \li \l{Creating a Timeline}
-    \row
-        \li Timeline ID
-        \li Displays the ID of the current timeline.
-        \li \l{Creating a Timeline}
-    \row
-        \li \inlineimage icons/to_first_frame.png
-        \li \uicontrol {To Start (Home)} moves to the first frame on the
-            timeline.
-        \li \l{Navigating in Timeline}
-    \row
-        \li \inlineimage icons/back_one_frame.png
-        \li \uicontrol {Previous (,)} moves to the previous frame on the
-            timeline.
-        \li \l{Navigating in Timeline}
-    \row
-        \li \inlineimage icons/start_playback.png
-        \li \uicontrol {Play (Space)} previews the animation.
-        \li \l{Viewing the Animation}
-    \row
-        \li \inlineimage icons/forward_one_frame.png
-        \li \uicontrol {Next (.)} moves to the next frame on the timeline.
-        \li \l{Navigating in Timeline}
-    \row
-        \li \inlineimage icons/to_last_frame.png
-        \li \uicontrol {To End (End)} moves to the last frame on the timeline.
-        \li \l{Navigating in Timeline}
-    \row
-        \li Current Keyframe
-        \li Displays the frame that the playhead is currently on. Enter a
-            number in the field to move the playhead to the respective frame.
-        \li \l{Navigating in Timeline}
-    \row
-        \li \inlineimage icons/global_record_keyframes.png
-        \li Records changes in keyframe values.
-        \li \l {Setting Keyframe Values}
-    \row
-        \li \inlineimage icons/curve_editor.png
-        \li Opens \uicontrol {Easing Curve Editor} for attaching an easing
-            curve to the selected transition.
-        \li \l{Editing Easing Curves}
-    \row
-        \li Start Frame
-        \li Specifies the first frame of the timeline. Negative values are
-            allowed. The difference between the start frame and the end frame
-            determines the duration of the animation.
-        \li \l{Creating a Timeline}
-    \row
-        \li \inlineimage icons/zoomOut.png
-        \li \uicontrol {Zoom Out} (\key Ctrl+-) zooms out of the view.
-        \li \l{Zooming in Timeline}
-    \row
-        \li Slider
-        \li Sets the zooming level.
-        \li \l{Zooming in Timeline}
-    \row
-        \li \inlineimage icons/zoomIn.png
-        \li \uicontrol {Zoom In} (\key Ctrl++) zooms into the view.
-        \li \l{Zooming in Timeline}
-    \row
-        \li End Frame
-        \li Specifies the last frame of the timeline. The difference between
-            the start frame and the end frame determines the duration of the
-            animation, so if the start frame is 0, the end frame equals the
-            duration.
-        \li \l{Creating a Timeline}
-    \row
-        \li State Name
-        \li Displays the name of the current state.
-        \li \l{Binding Animations to States}
-    \endtable
-
-    \section1 Keyframe Track Icons
-
-    Each keyframe track can contain the following buttons and markers.
-
-    \table
-    \header
-        \li Button/Icon
-        \li Action
-        \li Read More
-    \row
-        \li \inlineimage icons/previous_keyframe.png
-        \li Jumps to the previous frame on the timeline.
-        \li \l{Setting Keyframe Values}
-    \row
-        \li \inlineimage icons/next_keyframe.png
-        \li Jumps to the next frame on the timeline.
-        \li \l{Setting Keyframe Values}
-    \row
-        \li \inlineimage icons/local_record_keyframes.png
-        \li Records changes in keyframe values for a particular property.
-        \li \l {Setting Keyframe Values}
-    \target keyframe_marker
-    \row
-        \li \inlineimage icons/keyframe.png
-        \li Indicates the type of easing curve attached to the keyframe.
-            When a keyframe track is selected, the keyframe markers on it turn
-            gray, and when a keyframe itself is selected, its marker turns
-            brown:
-            \list
-                \li \inlineimage icons/keyframe_linear_active.png
-                    - linear easing curve
-                \li \inlineimage icons/keyframe_manualbezier_active.png
-                    - manually set Bezier curve
-                \li \inlineimage icons/keyframe_autobezier_active.png
-                    - automatically set Bezier curve
-                \li \inlineimage icons/keyframe_lineartobezier_active.png
-                    - linear-to-Bezier curve
-            \endlist
-        \li \l {Editing Easing Curves}
-    \endtable
-
-    \section1 Timeline Context Menu
-
-    The following table summarizes the context menu items available for each
-    keyframe track for a component, property, or keyframe marker and provides
-    links to more information about them.
-
-    \table
-    \header
-        \li To Learn About
-        \li Go To
-    \row
-        \li Delete All Keyframes
-        \li \l{Deleting Keyframes}
-    \row
-        \li Add Keyframes at Current Frame
-        \li \l{Setting Keyframe Values}
-    \row
-        \li Copy All Keyframes
-        \li \l{Copying Keyframes}
-    \row
-        \li Paste Keyframes
-        \li \l{Copying Keyframes}
-    \row
-        \li Remove Property
-        \li \l{Setting Keyframe Values}
-    \row
-        \li Delete Keyframe
-        \li \l{Deleting Keyframes}
-    \row
-        \li Edit Easing Curve
-        \li \l{Editing Easing Curves}
-    \row
-        \li Edit Keyframe
-        \li \l{Editing Keyframe Values}
-    \row
-        \li Override Color
-        \li \l{Setting Keyframe Track Color}
-    \row
-        \li Reset Color
-        \li \l{Setting Keyframe Track Color}
-    \endtable
 */
diff --git a/doc/qtdesignstudio/src/views/qtquick-timeline.qdoc b/doc/qtdesignstudio/src/views/qtquick-timeline.qdoc
index c6a33f62c7..b599932ed0 100644
--- a/doc/qtdesignstudio/src/views/qtquick-timeline.qdoc
+++ b/doc/qtdesignstudio/src/views/qtquick-timeline.qdoc
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
@@ -191,7 +191,7 @@
     position of the playhead, right-click the component name on the timeline and
     select \uicontrol {Add Keyframes at Current Frame}.
 
-    Keyframes are marked on the timeline by using \l{keyframe_marker}{markers}
+    Keyframes are marked on the timeline by using markers
     of different colors and shapes, depending on whether they are active or
     inactive or whether you have applied \l{Editing Easing Curves}
     {easing curves} to them.
diff --git a/doc/qtdesignstudio/src/views/qtquick-transition-editor.qdoc b/doc/qtdesignstudio/src/views/qtquick-transition-editor.qdoc
index b21207259e..7f73e0ceca 100644
--- a/doc/qtdesignstudio/src/views/qtquick-transition-editor.qdoc
+++ b/doc/qtdesignstudio/src/views/qtquick-transition-editor.qdoc
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
@@ -6,8 +6,12 @@
     \previouspage studio-translations.html
     \nextpage qtquick-timeline-view.html
 
+    \ingroup studio-views
+
     \title Transitions
 
+    \brief Make movement between states smooth.
+
     To make movement between states smooth, you can use
     \uicontrol {Transitions} to animate the changes between
     states.
@@ -17,7 +21,7 @@
     animated, such as colors or numbers, in the \l Properties view. For example,
     you can animate the changes in the position of a component.
 
-    \image qtquick-transition-editor-view.png "Transitions view"
+    \image qtquick-transition-editor-view.webp "Transitions view"
 
     In \uicontrol {Transitions}, you can set the start frame, end
     frame, and duration for the transition of each property. You can also
@@ -31,46 +35,6 @@
     and \inlineimage icons/zoom_big.png
     buttons to zoom out of or into the view.
 
-    \section1 Summary of Transitions Toolbar Actions
-
-    \table
-    \header
-        \li Button/Field
-        \li Action
-        \li Read More
-    \row
-        \li \inlineimage icons/settings.png
-        \li Opens \uicontrol {Transition Settings} dialog for editing
-            transition settings.
-        \li \l{Specifying Transition Settings}
-    \row
-        \li Transition ID
-        \li Displays a list of transitions that you can open in
-            \uicontrol {Transitions}.
-        \li \l{Animating Transitions Between States}
-    \row
-        \li \inlineimage icons/curve_editor.png
-        \li Opens \uicontrol {Easing Curve Editor} for attaching an easing
-            curve to the selected transition.
-        \li \l{Editing Easing Curves}
-    \row
-        \li \inlineimage icons/zoomOut.png
-        \li \uicontrol {Zoom Out} (\key Ctrl+-): zooms out of the view.
-        \li \l{Zooming in Transitions}
-    \row
-        \li Slider
-        \li Sets the zooming level.
-        \li \l{Zooming in Transitions}
-    \row
-        \li \inlineimage icons/zoomIn.png
-        \li \uicontrol {Zoom In} (\key Ctrl++): zooms into the view.
-        \li \l{Zooming in Transitions}
-    \row
-        \li Maximum Duration
-        \li Specifies the maximum duration of the transition.
-        \li
-    \endtable
-
     \section1 Animating Transitions Between States
 
     To animate transitions:
@@ -78,12 +42,12 @@
     \list 1
         \li Select \uicontrol View > \uicontrol Views >
             \uicontrol {Transition Editor}.
-            \image qmldesigner-transition-editor-startup.png "Empty Transitions view"
+            \image qmldesigner-transition-editor-startup.webp "Empty Transitions view"
         \li Select the \inlineimage icons/plus.png
             (\uicontrol {Add Transition}) button to add a transition. This
             works only if you have added at least one state and modified at
             least one property in it.
-            \image qtquick-transition-editor-view.png "Transitions view"
+            \image qtquick-transition-editor-view.webp "Transitions view"
         \li Move the blue bar next to the component or property name to set
             the start and end frame of the animation of the property. Pull its
             left and right edges to set the duration of the animation.
@@ -98,7 +62,7 @@
     (\uicontrol {Transition Settings (S)}) button in
     \uicontrol {Transition Editor}.
 
-    \image qtquick-transition-editor-settings.png "Transitions settings"
+    \image qtquick-transition-editor-settings.webp "Transitions settings"
 
     To add transitions:
 
diff --git a/doc/qtdesignstudio/src/views/studio-content-library.qdoc b/doc/qtdesignstudio/src/views/studio-content-library.qdoc
index e2785149e1..b3dbb28065 100644
--- a/doc/qtdesignstudio/src/views/studio-content-library.qdoc
+++ b/doc/qtdesignstudio/src/views/studio-content-library.qdoc
@@ -6,8 +6,13 @@
     \previouspage creator-open-documents-view.html
     \nextpage studio-texture-editor.html
 
+    \ingroup studio-views
+
     \title Content Library
 
+    \brief Select material, texture, and environment bundles with assets to
+    use in your application.
+
     \note The \uicontrol {Content Library} view is included in the
     \l{https://www.qt.io/pricing}{Qt Design Studio Enterprise license}.
 
diff --git a/doc/qtdesignstudio/src/views/studio-material-editor.qdoc b/doc/qtdesignstudio/src/views/studio-material-editor.qdoc
index bb2923a7ab..44cea9504a 100644
--- a/doc/qtdesignstudio/src/views/studio-material-editor.qdoc
+++ b/doc/qtdesignstudio/src/views/studio-material-editor.qdoc
@@ -1,4 +1,4 @@
-// Copyright (C) 2022 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
@@ -6,9 +6,12 @@
     \previouspage studio-3d-editor.html
     \nextpage quick-components-view.html
 
+    \ingroup studio-views
 
     \title Material Editor and Browser
 
+    \brief Create and manage materials and textures.
+
     In the \uicontrol {Material Editor} and \uicontrol {Material Browser} views,
     you create and manage materials and textures.
 
@@ -21,7 +24,8 @@
     To create a new material, do one of the following:
 
     \list
-      \li In \uicontrol {Material Browser}, select \inlineimage icons/plus.png
+      \li In \uicontrol {Material Browser}, select \inlineimage icons/add_material.png
+      \inlineimage icons/plus.png
       .
       \li In \uicontrol {Material Editor}, select \inlineimage icons/plus.png
       .
@@ -67,7 +71,7 @@
       \li In \uicontrol{Properties}, select
       \inlineimage icons/close.png
       next to the material.
-      \image materials-remove-material.png
+      \image materials-remove-material.webp "Remove a material in model properties"
     \endlist
 
    \section2 Copying and Pasting Material Properties
@@ -82,7 +86,7 @@
       want to copy properties from.
       \li Select \uicontrol {Copy properties} and then
       \uicontrol All or a property group.
-      \image material-copy-properties.png
+      \image material-copy-properties.png "Copy material properties in Material Browser"
       \li Right-click the material that you want to copy the properties to.
       \li Select \uicontrol {Paste properties}.
     \endlist
@@ -114,11 +118,10 @@
       \li From \uicontrol{Assets}, drag an image to
       \uicontrol{Reflection Map}.
       \li In \uicontrol {Navigator}, select
-      \inlineimage icons/filtericon.png
-      and then clear \uicontrol {Show Only Visible Components}. Now the
+      \inlineimage {icons/visibilityon.png}. Now the
       texture you just added to the material is visible in
       \uicontrol {Navigator}.
-      \image navigator-material-texture.png
+      \image navigator-material-texture.webp "Materials visible in Navigator"
       \li In \uicontrol {Navigator}, select the texture.
       \li In \uicontrol {Properties}, set \uicontrol {Texture Mapping} to
       \uicontrol {Environment}.
@@ -276,8 +279,8 @@
     To create a new texture, do one of the following in
     \uicontrol {Material Browser}:
     \list
-      \li Select \inlineimage icons/plus.png
-      in the \uicontrol Textures section.
+      \li Select \inlineimage icons/add_texture.png \inlineimage icons/plus.png
+      .
       \li Right-click anywhere in the \uicontrol Textures section and select
       \uicontrol {Create new texture}.
     \endlist
diff --git a/doc/qtdesignstudio/src/views/studio-model-editor.qdoc b/doc/qtdesignstudio/src/views/studio-model-editor.qdoc
new file mode 100644
index 0000000000..4d10f87552
--- /dev/null
+++ b/doc/qtdesignstudio/src/views/studio-model-editor.qdoc
@@ -0,0 +1,62 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
+
+/*!
+    \page studio-model-editor.html
+    \previouspage qtquick-effect-composer-view.html
+    \nextpage creator-project-managing-workspaces.html
+
+    \ingroup studio-views
+
+    \title Model Editor
+
+    \brief Create, manage, import, and export data models.
+
+    In the \uicontrol {Model Editor} view, you can create, manage, import, and export
+    data models. With data models, you can, for example, populate views with data.
+
+    \image edit-list-model-model-editor.webp
+
+    For examples of how to use data models, see
+    \l {Adding a Repeater3D Component with a List Model}.
+
+    \section1 Creating a Data Model
+
+    To create a data model:
+    \list 1
+      \li In \uicontrol {Model Editor}, select \inlineimage {icons/zoomIn.png}.
+      \li Enter a name and select \uicontrol {Create}.
+    \endlist
+
+    This creates a single-cell table.
+
+    \image model-editor-new-model.webp
+
+     Next, add columns, rows, and data to the model.
+
+    \note You must manually save the table after you have made changes. To do this,
+    select \inlineimage {icons/save-effect-composer.png}.
+
+    \section1 Editing a Data Model
+
+    Edit a data model in one of the following ways:
+    \list
+      \li Right-click a column name to edit its name and type, delete, or sort it.
+      \li Double-click a cell to edit its content.
+      \li Use the toolbar to add and remove columns and rows.
+    \endlist
+
+    \note You must manually save the table after you have made changes. To do this,
+    select \inlineimage {icons/save-effect-composer.png}.
+
+    \section1 Importing a Data Model
+
+    Import data models from JSON or CSV files. To do this, select \inlineimage {icons/import.png}
+    in \uicontrol {Model Editor}.
+
+    \section1 Exporting a Data Model
+
+    Export data models to JSON or CSV files. To do this, select \inlineimage {icons/export.png}
+    in \uicontrol {Model Editor}.
+
+*/
diff --git a/doc/qtdesignstudio/src/views/studio-qtinsight.qdoc b/doc/qtdesignstudio/src/views/studio-qtinsight.qdoc
index 6af9b071e1..6f420e1cb7 100644
--- a/doc/qtdesignstudio/src/views/studio-qtinsight.qdoc
+++ b/doc/qtdesignstudio/src/views/studio-qtinsight.qdoc
@@ -6,8 +6,12 @@
     \previouspage studio-texture-editor.html
     \nextpage qtquick-effect-composer-view.html
 
+    \ingroup studio-views
+
     \title Qt Insight
 
+    \brief Manage your Qt Insight.
+
     In the \uicontrol {Qt Insight} view, you manage your Qt Insight.
 
     Qt Insight is an analytics solution that provides real user insights on the usage of Qt
diff --git a/doc/qtdesignstudio/src/views/studio-texture-editor.qdoc b/doc/qtdesignstudio/src/views/studio-texture-editor.qdoc
index ef45d8efdf..62b0eb147c 100644
--- a/doc/qtdesignstudio/src/views/studio-texture-editor.qdoc
+++ b/doc/qtdesignstudio/src/views/studio-texture-editor.qdoc
@@ -1,4 +1,4 @@
-// Copyright (C) 2022 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
@@ -6,11 +6,15 @@
     \previouspage studio-content-library.html
     \nextpage studio-qt-insight.html
 
+    \ingroup studio-views
+
     \title Texture Editor
 
+    \brief Create and manage textures.
+
     In the \uicontrol {Texture Editor} view, you create and manage textures.
 
-    \image texture-editor.png
+    \image texture-editor.webp "Texture Editor"
 
     \section1 Creating a Texture
 
@@ -38,7 +42,7 @@
       \li Select \inlineimage icons/apply.png
       .
       \li Select the material and property that you want to add the texture to.
-      \image select-material-property.png
+      \image select-material-property.png "Select a material property"
     \endlist
 
     \note You can also apply textures to materials in the
diff --git a/doc/qtdesignstudio/src/views/studio-translations.qdoc b/doc/qtdesignstudio/src/views/studio-translations.qdoc
index a2a610b313..ecf43369a4 100644
--- a/doc/qtdesignstudio/src/views/studio-translations.qdoc
+++ b/doc/qtdesignstudio/src/views/studio-translations.qdoc
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
@@ -6,8 +6,12 @@
     \previouspage qtquick-states-view.html
     \nextpage qtquick-timeline-view.html
 
+    \ingroup studio-views
+
     \title Translations
 
+    \brief Handle translations and multi-language support.
+
     The \uicontrol Translations view is included in the
     \l{https://www.qt.io/pricing}{Qt Design Studio Enterprise license}.
 
@@ -16,49 +20,6 @@
 
     \image studio-translations-view.png "Translations view"
 
-    \section1 Summary of Translations View Buttons
-
-    The \uicontrol {Translations} view contains the following buttons.
-
-    \table
-    \header
-        \li Button
-        \li Function
-        \li Read More
-    \row
-        \li \inlineimage icons/select-languages.png
-        \li Select which languages you want your project to support.
-        \li
-    \row
-        \li \inlineimage icons/export-json-translations.png
-        \li Export all your translations to a JSON file.
-        \li \l{Importing and Exporting Translations}
-    \row
-        \li \inlineimage icons/import-json-translations.png
-        \li Import translations from a JSON file.
-        \li \l{Importing and Exporting Translations}
-    \row
-        \li \inlineimage icons/generate-translation-files.png
-        \li Generate Qt compiled translation source files (\e{.qm})
-        and Qt translation source files (\e{.ts}).
-        \li \l{Generating Qt Translation Source Files}
-    \row
-        \li \inlineimage icons/project-translation-test.png
-        \li Run translation test for several documents and create a test report.
-        \li \l{Running Translation Test for Several Documents}
-    \row
-        \li \inlineimage icons/qml-translation-test.png
-        \li Run translation test for the currently open document. This test
-        shows translation warnings in the \uicontrol{2D} view and creates a
-        test report.
-        \li \l{Running Translation Test for a Single Document}
-    \row
-        \li \inlineimage icons/export-translations.png
-        \li Export all translations used in your project or all translations
-        currently visible in your UI.
-        \li \l{Exporting Translations in Other Ways}
-    \endtable
-
     \section1 Importing and Exporting Translations
 
     You can import and export translations using JSON files.
diff --git a/doc/qtdesignstudio/src/views/studio-workspaces.qdoc b/doc/qtdesignstudio/src/views/studio-workspaces.qdoc
index 407513c40f..ed79be99d1 100644
--- a/doc/qtdesignstudio/src/views/studio-workspaces.qdoc
+++ b/doc/qtdesignstudio/src/views/studio-workspaces.qdoc
@@ -3,7 +3,7 @@
 
 /*!
     \page creator-project-managing-workspaces.html
-    \previouspage qtquick-effect-composer-view.html
+    \previouspage studio-model-editor.html
     \nextpage creator-project-managing-sessions.html
 
     \title Managing Workspaces
diff --git a/qt_attributions.json b/qt_attributions.json
index 65a92cecc8..56e4fe0595 100644
--- a/qt_attributions.json
+++ b/qt_attributions.json
@@ -556,5 +556,73 @@
         "License": "BSD 3-Clause \"New\" or \"Revised\" License",
         "LicenseFile": "src/libs/3rdparty/qtkeychain/COPYING",
         "Copyright": "Copyright (C) 2011-2015 Frank Osterfeld, Copyright (C) 2016 Mathias Hasselmann"
+    },
+    {
+        "Id": "pyprof2calltree",
+        "Name": "pyprof2calltree",
+        "QDocModule": "qtcreator",
+        "QtParts": ["tools"],
+        "QtUsage": "Used for converting profile data of debugger dumper execution to kcachegrind-compatible input in visualize.py",
+        "Path": "share/qtcreator/debugger",
+        "Description": "Creates python profiling output which is readable by kcachegrind",
+        "Homepage": "https://github.com/pwaller/pyprof2calltree",
+        "License": "MIT License",
+        "LicenseId": "MIT",
+        "LicenseFile": "share/qtcreator/debugger/LICENSE.MIT",
+        "Copyright": "Copyright(C) 2006-2008, David Allouche, Jp Calderone, Itamar Shtull-Trauring, Copyright(C) 2006-2017, Johan Dahlin, Copyright(C) 2008, Olivier Grisel <olivier.grisel@ensta.org>, Copyright(C) 2008, David Glick, Copyright(C) 2013, Steven Maude, Copyright(C) 2013-2018, Peter Waller <p@pwaller.net>, Copyright(C) 2013, Lukas Graf <lukas.graf@4teamwork.ch>, Copyright(C) 2013, Jamie Wong <http://jamie-wong.com>, Copyright(C) 2013, Yury V. Zaytsev <yury@shurup.com>, Copyright(C) 2014, Michael Droettboom <mdroe@stsci.edu>, Copyright(C) 2015, Zev Benjamin <zev@mit.edu>, Copyright(C) 2018, Jon Dufresne <jon.dufresne@gmail.com>"
+    },
+    {
+        "Id": "lua",
+        "Name": "Lua",
+        "QDocModule": "qtcreator",
+        "QtParts": ["tools"],
+        "QtUsage": "Used for scripting plugins.",
+        "Path": "src/libs/3rdparty/lua",
+        "Description": "Lua is a powerful, efficient, lightweight, embeddable scripting language.",
+        "Homepage": "https://www.lua.org/",
+        "License": "MIT License",
+        "LicenseFile": "src/libs/3rdparty/lua/LICENSE",
+        "Copyright": "Copyright © 1994-2023 Lua.org, PUC-Rio.",
+        "Version": "5.4.6"
+    },
+    {
+        "Id": "sol2",
+        "Name": "sol2",
+        "QDocModule": "qtcreator",
+        "QtParts": ["tools"],
+        "QtUsage": "Used for binding C++ and Lua.",
+        "Path": "src/libs/3rdparty/sol2",
+        "Description": "sol2 is a C++ library binding to Lua.",
+        "Homepage": "https://github.com/ThePhD/sol2",
+        "License": "MIT License",
+        "LicenseFile": "src/libs/3rdparty/sol2/LICENSE.txt",
+        "Copyright": "Copyright (c) 2008 Paul Evans",
+        "Version": "3.3.1 (revision 9c882a28)"
+    },
+    {
+        "Id": "ms-jpq-lua-async-await",
+        "Name": "ms-jpq/lua-async-await",
+        "QDocModule": "qtcreator",
+        "QtParts": ["tools"],
+        "QtUsage": "Used for async/await support in Lua modules.",
+        "Path": "src/plugins/lua/bindings",
+        "Description": "lua-async-await implements the async/await pattern in Lua.",
+        "Homepage": "https://github.com/ms-jpq/lua-async-await",
+        "License": "MIT License",
+        "LicenseFile": "src/plugins/lua/bindings/ASYNC-LICENSE.txt",
+        "Copyright": "Copyright (c) 2008 Paul Evans"
+    },
+    {
+        "Id": "kikito/inspect.lua",
+        "Name": "kikito/inspect.lua",
+        "QDocModule": "qtcreator",
+        "QtParts": ["tools"],
+        "QtUsage": "Used for pretty printing from Lua scripts.",
+        "Path": "src/plugins/luatests/luatests",
+        "Description": "inspect.lua is a library for pretty printing complex objects in Lua.",
+        "Homepage": "https://github.com/kikito/inspect.lua",
+        "License": "MIT License",
+        "LicenseFile": "src/plugins/luatests/luatests/INSPECT-LICENSE.txt",
+        "Copyright": "Copyright (c) 2022 Enrique García Cota"
     }
 ]
diff --git a/share/qtcreator/android/sdk_definitions.json b/share/qtcreator/android/sdk_definitions.json
index 22e4a322d8..ed1e42402f 100644
--- a/share/qtcreator/android/sdk_definitions.json
+++ b/share/qtcreator/android/sdk_definitions.json
@@ -1,12 +1,12 @@
 {
     "common": {
         "sdk_tools_url": {
-            "linux": "https://dl.google.com/android/repository/commandlinetools-linux-9123335_latest.zip",
-            "linux_sha256": "0bebf59339eaa534f4217f8aa0972d14dc49e7207be225511073c661ae01da0a",
-            "windows": "https://dl.google.com/android/repository/commandlinetools-win-9123335_latest.zip",
-            "windows_sha256": "8a90e6a3deb2fa13229b2e335efd07687dcc8a55a3c544da9f40b41404993e7d",
-            "mac": "https://dl.google.com/android/repository/commandlinetools-mac-9123335_latest.zip",
-            "mac_sha256": "d0192807f7e1cd4a001d13bb1e5904fc287b691211648877258aa44d1fa88275"
+            "linux": "https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip",
+            "linux_sha256": "2d2d50857e4eb553af5a6dc3ad507a17adf43d115264b1afc116f95c92e5e258",
+            "windows": "https://dl.google.com/android/repository/commandlinetools-win-11076708_latest.zip",
+            "windows_sha256": "4d6931209eebb1bfb7c7e8b240a6a3cb3ab24479ea294f3539429574b1eec862",
+            "mac": "https://dl.google.com/android/repository/commandlinetools-mac-11076708_latest.zip",
+            "mac_sha256": "7bc5c72ba0275c80a8f19684fb92793b83a6b5c94d4d179fc5988930282d7e64"
         },
         "sdk_essential_packages": {
             "default": ["platform-tools", "platforms;android-31", "cmdline-tools;latest"],
diff --git a/share/qtcreator/debugger/python2/README.txt b/share/qtcreator/debugger-with-python2/README.txt
index 70e03d52ca..70e03d52ca 100644
--- a/share/qtcreator/debugger/python2/README.txt
+++ b/share/qtcreator/debugger-with-python2/README.txt
diff --git a/share/qtcreator/debugger/python2/android_stdtypes.py b/share/qtcreator/debugger-with-python2/android_stdtypes.py
index 8b25d7bb35..8b25d7bb35 100644
--- a/share/qtcreator/debugger/python2/android_stdtypes.py
+++ b/share/qtcreator/debugger-with-python2/android_stdtypes.py
diff --git a/share/qtcreator/debugger/python2/boosttypes.py b/share/qtcreator/debugger-with-python2/boosttypes.py
index 5eb0c1a1be..5eb0c1a1be 100644
--- a/share/qtcreator/debugger/python2/boosttypes.py
+++ b/share/qtcreator/debugger-with-python2/boosttypes.py
diff --git a/share/qtcreator/debugger/python2/cdbbridge.py b/share/qtcreator/debugger-with-python2/cdbbridge.py
index a9d86e24ee..a9d86e24ee 100644
--- a/share/qtcreator/debugger/python2/cdbbridge.py
+++ b/share/qtcreator/debugger-with-python2/cdbbridge.py
diff --git a/share/qtcreator/debugger/python2/creatortypes.py b/share/qtcreator/debugger-with-python2/creatortypes.py
index 24c16ce009..24c16ce009 100644
--- a/share/qtcreator/debugger/python2/creatortypes.py
+++ b/share/qtcreator/debugger-with-python2/creatortypes.py
diff --git a/share/qtcreator/debugger/python2/dumper.py b/share/qtcreator/debugger-with-python2/dumper.py
index 1fd42848d4..1fd42848d4 100644
--- a/share/qtcreator/debugger/python2/dumper.py
+++ b/share/qtcreator/debugger-with-python2/dumper.py
diff --git a/share/qtcreator/debugger/python2/gdbbridge.py b/share/qtcreator/debugger-with-python2/gdbbridge.py
index d61160eed3..9699e518fe 100644
--- a/share/qtcreator/debugger/python2/gdbbridge.py
+++ b/share/qtcreator/debugger-with-python2/gdbbridge.py
@@ -772,7 +772,7 @@ class Dumper(DumperBase):
 
     def makeStdString(init):
         # Works only for small allocators, but they are usually empty.
-        gdb.execute('set $d=(std::string*)calloc(sizeof(std::string), 2)')
+        gdb.execute('set $d=(std::string*)calloc(2, sizeof(std::string))')
         gdb.execute('call($d->basic_string("' + init +
                     '",*(std::allocator<char>*)(1+$d)))')
         value = gdb.parse_and_eval('$d').dereference()
@@ -787,7 +787,7 @@ class Dumper(DumperBase):
         h = self.hexencode(data)
         #DumperBase.warn('DATA: %s' % h)
         string = ''.join('\\x' + h[2 * i:2 * i + 2] for i in range(size))
-        exp = '(%s*)memcpy(calloc(%d, 1), "%s", %d)' \
+        exp = '(%s*)memcpy(calloc(1, %d), "%s", %d)' \
             % (value.type.name, size, string, size)
         #DumperBase.warn('EXP: %s' % exp)
         res = gdb.parse_and_eval(exp)
diff --git a/share/qtcreator/debugger/python2/gdbtracepoint.py b/share/qtcreator/debugger-with-python2/gdbtracepoint.py
index 871132ac48..871132ac48 100644
--- a/share/qtcreator/debugger/python2/gdbtracepoint.py
+++ b/share/qtcreator/debugger-with-python2/gdbtracepoint.py
diff --git a/share/qtcreator/debugger/python2/libcpp_stdtypes.py b/share/qtcreator/debugger-with-python2/libcpp_stdtypes.py
index 44b3a235ff..44b3a235ff 100644
--- a/share/qtcreator/debugger/python2/libcpp_stdtypes.py
+++ b/share/qtcreator/debugger-with-python2/libcpp_stdtypes.py
diff --git a/share/qtcreator/debugger/python2/lldbbridge.py b/share/qtcreator/debugger-with-python2/lldbbridge.py
index 4d9b74b2ea..4d9b74b2ea 100644
--- a/share/qtcreator/debugger/python2/lldbbridge.py
+++ b/share/qtcreator/debugger-with-python2/lldbbridge.py
diff --git a/share/qtcreator/debugger/python2/misctypes.py b/share/qtcreator/debugger-with-python2/misctypes.py
index 9099f19a2f..9099f19a2f 100644
--- a/share/qtcreator/debugger/python2/misctypes.py
+++ b/share/qtcreator/debugger-with-python2/misctypes.py
diff --git a/share/qtcreator/debugger/python2/opencvtypes.py b/share/qtcreator/debugger-with-python2/opencvtypes.py
index 5cfd60c5d2..5cfd60c5d2 100644
--- a/share/qtcreator/debugger/python2/opencvtypes.py
+++ b/share/qtcreator/debugger-with-python2/opencvtypes.py
diff --git a/share/qtcreator/debugger/python2/pdbbridge.py b/share/qtcreator/debugger-with-python2/pdbbridge.py
index 228f4c8c1f..228f4c8c1f 100644
--- a/share/qtcreator/debugger/python2/pdbbridge.py
+++ b/share/qtcreator/debugger-with-python2/pdbbridge.py
diff --git a/share/qtcreator/debugger/python2/personaltypes.py b/share/qtcreator/debugger-with-python2/personaltypes.py
index 291922b8fa..291922b8fa 100644
--- a/share/qtcreator/debugger/python2/personaltypes.py
+++ b/share/qtcreator/debugger-with-python2/personaltypes.py
diff --git a/share/qtcreator/debugger/python2/qttypes.py b/share/qtcreator/debugger-with-python2/qttypes.py
index b08f60a9bb..b08f60a9bb 100644
--- a/share/qtcreator/debugger/python2/qttypes.py
+++ b/share/qtcreator/debugger-with-python2/qttypes.py
diff --git a/share/qtcreator/debugger/python2/stdtypes.py b/share/qtcreator/debugger-with-python2/stdtypes.py
index c14812dee1..8bc86671c6 100644
--- a/share/qtcreator/debugger/python2/stdtypes.py
+++ b/share/qtcreator/debugger-with-python2/stdtypes.py
@@ -850,7 +850,7 @@ def qedit__std__vector(d, value, data):
     values = data.split(',')
     n = len(values)
     innerType = value.type[0].name
-    cmd = "set $d = (%s*)calloc(sizeof(%s)*%s,1)" % (innerType, innerType, n)
+    cmd = "set $d = (%s*)calloc(%s,sizeof(%s))" % (innerType, n, innerType)
     gdb.execute(cmd)
     cmd = "set {void*[3]}%s = {$d, $d+%s, $d+%s}" % (value.address(), n, n)
     gdb.execute(cmd)
diff --git a/share/qtcreator/debugger/python2/utils.py b/share/qtcreator/debugger-with-python2/utils.py
index 8019d1e530..8019d1e530 100644
--- a/share/qtcreator/debugger/python2/utils.py
+++ b/share/qtcreator/debugger-with-python2/utils.py
diff --git a/share/qtcreator/debugger/LICENSE.MIT b/share/qtcreator/debugger/LICENSE.MIT
new file mode 100644
index 0000000000..6dee3d0a7f
--- /dev/null
+++ b/share/qtcreator/debugger/LICENSE.MIT
@@ -0,0 +1,20 @@
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
diff --git a/share/qtcreator/debugger/cdbbridge.py b/share/qtcreator/debugger/cdbbridge.py
index b5fc683cba..4ac053eb55 100644
--- a/share/qtcreator/debugger/cdbbridge.py
+++ b/share/qtcreator/debugger/cdbbridge.py
@@ -75,6 +75,13 @@ class Dumper(DumperBase):
         self.outputLock = threading.Lock()
         self.isCdb = True
 
+        #FIXME
+        typeid = self.typeid_for_string('@QVariantMap')
+        del self.type_code_cache[typeid]
+        del self.type_target_cache[typeid]
+        del self.type_size_cache[typeid]
+        del self.type_alignment_cache[typeid]
+
     def enumValue(self, nativeValue):
         val = nativeValue.nativeDebuggerValue()
         # remove '0n' decimal prefix of the native cdb value output
@@ -117,6 +124,7 @@ class Dumper(DumperBase):
         elif not nativeValue.type().resolved and nativeValue.type().code() == TypeCode.Struct and not nativeValue.hasChildren():
             val.ldisplay = self.enumValue(nativeValue)
         val.isBaseClass = val.name == nativeValue.type().name()
+        val.typeid = self.from_native_type(nativeValue.type())
         val.nativeValue = nativeValue
         val.laddress = nativeValue.address()
         val.lbitsize = nativeValue.bitsize()
@@ -137,14 +145,10 @@ class Dumper(DumperBase):
                               for f in nativeType.fields()])
         return typeId
 
-    def nativeValueType(self, nativeValue):
-        return self.fromNativeType(nativeValue.type())
-
-    def fromNativeType(self, nativeType):
+    def from_native_type(self, nativeType):
         self.check(isinstance(nativeType, cdbext.Type))
-        typeId = self.nativeTypeId(nativeType)
-        if self.typeData.get(typeId, None) is not None:
-            return self.Type(self, typeId)
+        typeid = self.typeid_for_string(self.nativeTypeId(nativeType))
+        self.type_nativetype_cache[typeid] = nativeType
 
         if nativeType.name().startswith('void'):
             nativeType = FakeVoidType(nativeType.name(), self)
@@ -154,70 +158,61 @@ class Dumper(DumperBase):
             if nativeType.name().startswith('<function>'):
                 code = TypeCode.Function
             elif nativeType.targetName() != nativeType.name():
-                return self.createPointerType(nativeType.targetName())
+                return self.create_pointer_typeid(self.typeid_for_string(nativeType.targetName()))
 
         if code == TypeCode.Array:
             # cdb reports virtual function tables as arrays those ar handled separetly by
             # the DumperBase. Declare those types as structs prevents a lookup to a
             # none existing type
             if not nativeType.name().startswith('__fptr()') and not nativeType.name().startswith('<gentype '):
-                targetName = nativeType.targetName()
-                count = nativeType.arrayElements()
-                if targetName.endswith(']'):
-                    (prefix, suffix, inner_count) = self.splitArrayType(targetName)
-                    type_name = '%s[%d][%d]%s' % (prefix, count, inner_count, suffix)
-                else:
-                    type_name = '%s[%d]' % (targetName, count)
-                tdata = self.TypeData(self, typeId)
-                tdata.name = type_name
-                tdata.code = TypeCode.Array
-                tdata.ltarget = targetName
-                tdata.lbitsize = lambda: nativeType.bitsize()
-                return self.Type(self, typeId)
+                targetName = nativeType.targetName().strip()
+                self.type_name_cache[typeid] = nativeType.name()
+                self.type_code_cache[typeid] = code
+                self.type_target_cache[typeid] = self.typeid_for_string(targetName)
+                self.type_size_cache[typeid] = nativeType.bitsize() // 8
+                return typeid
 
             code = TypeCode.Struct
 
-        tdata = self.TypeData(self, typeId)
-        tdata.name = nativeType.name()
-        tdata.lbitsize = lambda: nativeType.bitsize()
-        tdata.code = code
-        tdata.moduleName = lambda: nativeType.module()
-        if code == TypeCode.Struct:
-            tdata.lfields = lambda value: \
-                self.listFields(nativeType, value)
-            tdata.lalignment = lambda: \
-                self.nativeStructAlignment(nativeType)
-        tdata.enumDisplay = lambda intval, addr, form: \
+        self.type_name_cache[typeid] = nativeType.name()
+        self.type_size_cache[typeid] = nativeType.bitsize() // 8
+        self.type_code_cache[typeid] = code
+        self.type_modulename_cache[typeid] = nativeType.module()
+        self.type_enum_display_cache[typeid] = lambda intval, addr, form: \
             self.nativeTypeEnumDisplay(nativeType, intval, form)
-        tdata.templateArguments = lambda: \
-            self.listTemplateParameters(nativeType.name())
-        return self.Type(self, typeId)
+        return typeid
 
-    def listNativeValueChildren(self, nativeValue):
+    def listNativeValueChildren(self, nativeValue, include_bases):
+        fields = []
         index = 0
         nativeMember = nativeValue.childFromIndex(index)
         while nativeMember:
+            # Why this restriction to things with address? Can't nativeValue
+            # be e.g. located in registers, without address?
             if nativeMember.address() != 0:
-                yield self.fromNativeValue(nativeMember)
+                if include_bases or nativeMember.name() != nativeMember.type().name():
+                    field = self.fromNativeValue(nativeMember)
+                    fields.append(field)
             index += 1
             nativeMember = nativeValue.childFromIndex(index)
+        return fields
 
-    def listValueChildren(self, value):
+    def listValueChildren(self, value, include_bases=True):
         nativeValue = value.nativeValue
         if nativeValue is None:
             nativeValue = cdbext.createValue(value.address(), self.lookupNativeType(value.type.name, 0))
-        return self.listNativeValueChildren(nativeValue)
+        return self.listNativeValueChildren(nativeValue, include_bases)
 
-    def listFields(self, nativeType, value):
+    def nativeListMembers(self, value, native_type, include_bases):
         nativeValue = value.nativeValue
         if nativeValue is None:
-            nativeValue = cdbext.createValue(value.address(), nativeType)
-        return self.listNativeValueChildren(nativeValue)
+            nativeValue = cdbext.createValue(value.address(), native_type)
+        return self.listNativeValueChildren(nativeValue, include_bases)
 
     def nativeStructAlignment(self, nativeType):
         #DumperBase.warn("NATIVE ALIGN FOR %s" % nativeType.name)
         def handleItem(nativeFieldType, align):
-            a = self.fromNativeType(nativeFieldType).alignment()
+            a = self.type_alignment(self.from_native_type(nativeFieldType))
             return a if a > align else align
         align = 1
         for f in nativeType.fields():
@@ -398,20 +393,6 @@ class Dumper(DumperBase):
         else:
             return typeName
 
-    def lookupType(self, typeNameIn, module=0):
-        if len(typeNameIn) == 0:
-            return None
-        typeName = self.stripQintTypedefs(typeNameIn)
-        if self.typeData.get(typeName, None) is None:
-            nativeType = self.lookupNativeType(typeName, module)
-            if nativeType is None:
-                return None
-            _type = self.fromNativeType(nativeType)
-            if _type.typeId != typeName:
-                self.registerTypeAlias(_type.typeId, typeName)
-            return _type
-        return self.Type(self, typeName)
-
     def lookupNativeType(self, name, module=0):
         if name.startswith('void'):
             return FakeVoidType(name, self)
@@ -439,9 +420,6 @@ class Dumper(DumperBase):
             ptr = cdbext.getAddressByName(type.name + '::staticMetaObject')
         return ptr
 
-    def warn(self, msg):
-        self.put('{name="%s",value="",type="",numchild="0"},' % msg)
-
     def fetchVariables(self, args):
         self.resetStats()
         (ok, res) = self.tryFetchInterpreterVariables(args)
@@ -458,13 +436,17 @@ class Dumper(DumperBase):
         self.anonNumber = 0
 
         variables = []
-        for val in cdbext.listOfLocals(self.partialVariable):
-            dumperVal = self.fromNativeValue(val)
-            dumperVal.lIsInScope = dumperVal.name not in self.uninitialized
-            variables.append(dumperVal)
+        try:
+            for val in cdbext.listOfLocals(self.partialVariable):
+                dumperVal = self.fromNativeValue(val)
+                dumperVal.lIsInScope = dumperVal.name not in self.uninitialized
+                variables.append(dumperVal)
 
-        self.handleLocals(variables)
-        self.handleWatches(args)
+            self.handleLocals(variables)
+            self.handleWatches(args)
+        except Exception:
+            t,v,tb = sys.exc_info()
+            self.showException("FETCH VARIABLES", t, v, tb)
 
         self.put('],partial="%d"' % (len(self.partialVariable) > 0))
         self.put(',timings=%s' % self.timings)
@@ -485,9 +467,6 @@ class Dumper(DumperBase):
     def findValueByExpression(self, exp):
         return cdbext.parseAndEvaluate(exp)
 
-    def nativeDynamicTypeName(self, address, baseType):
-        return None  # Does not work with cdb
-
     def nativeValueDereferenceReference(self, value):
         return self.nativeValueDereferencePointer(value)
 
@@ -518,7 +497,7 @@ class Dumper(DumperBase):
         else:
             val = self.Value(self)
             val.laddress = value.pointer()
-            val._type = DumperBase.Type(self, value.type.targetName)
+            val.typeid = self.typeid_for_string(value.type.targetName)
             val.nativeValue = value.nativeValue
 
         return val
@@ -540,14 +519,11 @@ class Dumper(DumperBase):
         res = self.nativeParseAndEvaluate(symbolName)
         return None if res is None else res.address()
 
-    def putItemX(self, value):
-        #DumperBase.warn('PUT ITEM: %s' % value.stringify())
+    def putItem(self, value: DumperBase.Value):
 
         typeobj = value.type  # unqualified()
         typeName = typeobj.name
 
-        self.addToCache(typeobj)  # Fill type cache
-
         if not value.lIsInScope:
             self.putSpecialValue('optimizedout')
             #self.putType(typeobj)
@@ -571,8 +547,7 @@ class Dumper(DumperBase):
             return
 
         self.putAddress(value.address())
-        if value.lbitsize is not None:
-            self.putField('size', value.lbitsize // 8)
+        self.putField('size', self.type_size(value.typeid))
 
         if typeobj.code == TypeCode.Function:
             #DumperBase.warn('FUNCTION VALUE: %s' % value)
@@ -738,7 +713,7 @@ class Dumper(DumperBase):
         #DumperBase.warn('INAME: %s' % self.currentIName)
         if self.autoDerefPointers:
             # Generic pointer type with AutomaticFormat, but never dereference char types:
-            if value.type.targetName not in (
+            if value.type.targetName.strip() not in (
                 'char',
                 'signed char',
                 'int8_t',
@@ -769,7 +744,7 @@ class Dumper(DumperBase):
 
     def putCStyleArray(self, value):
         arrayType = value.type
-        innerType = arrayType.ltarget
+        innerType = arrayType.target()
         address = value.address()
         if address:
             self.putValue('@0x%x' % address, priority=-1)
@@ -783,7 +758,7 @@ class Dumper(DumperBase):
 
         p = value.address()
         if displayFormat != DisplayFormat.Raw and p:
-            if innerType.name in (
+            if innerType.name.strip() in (
                 'char',
                 'int8_t',
                 'qint8',
@@ -828,7 +803,7 @@ class Dumper(DumperBase):
         innerSize = innerType.size()
         self.putNumChild(n)
         #DumperBase.warn('ADDRESS: 0x%x INNERSIZE: %s INNERTYPE: %s' % (addrBase, innerSize, innerType))
-        enc = innerType.simpleEncoding()
+        enc = self.type_encoding_cache.get(innerType.typeid, None)
         maxNumChild = self.maxArrayCount()
         if enc:
             self.put('childtype="%s",' % innerType.name)
@@ -863,12 +838,8 @@ class Dumper(DumperBase):
 
             if innerType in ('wchar_t', 'WCHAR'):
                 self.putType(typeName)
-                charSize = self.lookupType('wchar_t').size()
-                (length, data) = self.encodeCArray(ptr, charSize, limit)
-                if charSize == 2:
-                    self.putValue(data, 'utf16', length=length)
-                else:
-                    self.putValue(data, 'ucs4', length=length)
+                (length, data) = self.encodeCArray(ptr, 2, limit)
+                self.putValue(data, 'utf16', length=length)
                 return True
 
         if displayFormat == DisplayFormat.Latin1String:
@@ -931,19 +902,12 @@ class Dumper(DumperBase):
         self.putItem(derefValue)
         self.currentChildType = savedCurrentChildType
 
-    def extractPointer(self, value):
-        code = 'I' if self.ptrSize() == 4 else 'Q'
-        return self.extractSomething(value, code, 8 * self.ptrSize())
-
     def createValue(self, datish, typish):
-        if self.isInt(datish):  # Used as address.
+        if isinstance(datish, int):  # Used as address.
             return self.createValueFromAddressAndType(datish, typish)
         if isinstance(datish, bytes):
             val = self.Value(self)
-            if isinstance(typish, self.Type):
-                val._type = typish
-            else:
-                val._type = self.Type(self, typish)
+            val.typeid = self.create_typeid(typish)
             #DumperBase.warn('CREATING %s WITH DATA %s' % (val.type.name, self.hexencode(datish)))
             val.ldata = datish
             val.check()
@@ -952,11 +916,8 @@ class Dumper(DumperBase):
 
     def createValueFromAddressAndType(self, address, typish):
         val = self.Value(self)
-        if isinstance(typish, self.Type):
-            val._type = typish
-        else:
-            val._type = self.Type(self, typish)
+        val.typeid = self.create_typeid(typish)
         val.laddress = address
         if self.useDynamicType:
-            val._type = val.type.dynamicType(address)
+            val.typeid = self.dynamic_typeid_at_address(val.typeid, address)
         return val
diff --git a/share/qtcreator/debugger/dumper.py b/share/qtcreator/debugger/dumper.py
index 059bf7b23e..488f1e362e 100644
--- a/share/qtcreator/debugger/dumper.py
+++ b/share/qtcreator/debugger/dumper.py
@@ -3,7 +3,7 @@
 
 import os
 import codecs
-import collections
+import functools
 import glob
 import struct
 import sys
@@ -31,11 +31,7 @@ except:
     def hexencode_(s):
         return ''.join(["%x" % c for c in s])
 
-if sys.version_info[0] >= 3:
-    toInteger = int
-else:
-    toInteger = long
-
+toInteger = int
 
 class ReportItem():
     """
@@ -55,19 +51,6 @@ class ReportItem():
             % (self.value, self.encoding, self.priority, self.length)
 
 
-class Timer():
-    def __init__(self, d, desc):
-        self.d = d
-        self.desc = desc + '-' + d.currentIName
-
-    def __enter__(self):
-        self.starttime = time.time()
-
-    def __exit__(self, exType, exValue, exTraceBack):
-        elapsed = int(1000 * (time.time() - self.starttime))
-        self.d.timings.append([self.desc, elapsed])
-
-
 class Children():
     def __init__(self, d, numChild=1, childType=None, childNumChild=None,
                  maxNumChild=None, addrBase=None, addrStep=None):
@@ -147,20 +130,28 @@ class UnnamedSubItem(SubItem):
 class DumperBase():
     @staticmethod
     def warn(message):
-        print('bridgemessage={msg="%s"},' % message.replace('"', '$').encode('latin1'))
+        print('bridgemessage={msg="%s"}' % message.replace('"', "'").replace('\\', '\\\\'))
 
-    @staticmethod
-    def showException(msg, exType, exValue, exTraceback):
-        DumperBase.warn('**** CAUGHT EXCEPTION: %s ****' % msg)
+    #@staticmethod
+    def showException(self, msg, exType, exValue, exTraceback):
+        self.warn('**** CAUGHT EXCEPTION: %s ****' % msg)
         try:
             import traceback
-            for line in traceback.format_exception(exType, exValue, exTraceback):
-                DumperBase.warn('%s' % line)
+            for frame_desc in traceback.format_exception(exType, exValue, exTraceback):
+                for line in frame_desc.split('\n'):
+                    self.warn(line)
         except:
             pass
 
-    def timer(self, desc):
-        return Timer(self, desc)
+    def dump_location(self):
+        import traceback
+        from io import StringIO
+        io = StringIO()
+        traceback.print_stack(file=io)
+        data = io.getvalue()
+        self.warn('LOCATION:')
+        for line in data.split('\n')[:-3]:
+            self.warn(line)
 
     def __init__(self):
         self.isCdb = False
@@ -185,7 +176,6 @@ class DumperBase():
         self.passExceptions = False
         self.isTesting = False
 
-        self.typeData = {}
         self.isBigEndian = False
         self.packCode = '<'
 
@@ -197,6 +187,8 @@ class DumperBase():
 
         self.dumpermodules = []
 
+        self.init_type_cache()
+
         try:
             # Fails in the piping case
             self.dumpermodules = [
@@ -217,9 +209,10 @@ class DumperBase():
         self.currentPrintsAddress = True
         self.currentChildType = None
         self.currentChildNumChild = None
-        self.registerKnownTypes()
+        self.register_known_types()
 
     def setVariableFetchingOptions(self, args):
+        self.last_args = args
         self.resultVarName = args.get('resultvarname', '')
         self.expandedINames = args.get('expanded', {})
         self.stringCutOff = int(args.get('stringcutoff', 10000))
@@ -239,10 +232,25 @@ class DumperBase():
         self.partialVariable = args.get('partialvar', '')
         self.uninitialized = args.get('uninitialized', [])
         self.uninitialized = list(map(lambda x: self.hexdecode(x), self.uninitialized))
-        self.partialUpdate = int(args.get('partial', '0'))
-        #DumperBase.warn('NAMESPACE: "%s"' % self.qtNamespace())
-        #DumperBase.warn('EXPANDED INAMES: %s' % self.expandedINames)
-        #DumperBase.warn('WATCHERS: %s' % self.watchers)
+        #self.warn('NAMESPACE: "%s"' % self.qtNamespace())
+        #self.warn('EXPANDED INAMES: %s' % self.expandedINames)
+        #self.warn('WATCHERS: %s' % self.watchers)
+
+    # Call this with 'py theDumper.profile1() from Creator
+    def profile(self):
+        '''Internal profiling'''
+        import cProfile
+        import visualize
+        profiler = cProfile.Profile()
+        profiler.enable()
+        self.profiled_command()
+        profiler.disable()
+        visualize.profile_visualize(profiler.getstats())
+
+    def profiled_command(self):
+        args = self.last_args
+        args['partialvar'] = ''
+        self.fetchVariables(args)
 
     def setFallbackQtVersion(self, args):
         version = int(args.get('version', self.fallbackQtVersion))
@@ -279,7 +287,6 @@ class DumperBase():
         self.generalCache = {}
 
         self.counts = {}
-        self.structPatternCache = {}
         self.timings = []
         self.expandableINames = set({})
 
@@ -331,7 +338,7 @@ class DumperBase():
         self.currentType = ReportItem()
 
     def exitSubItem(self, item, exType, exValue, exTraceBack):
-        #DumperBase.warn('CURRENT VALUE: %s: %s %s' %
+        #self.warn('CURRENT VALUE: %s: %s %s' %
         # (self.currentIName, self.currentValue, self.currentType))
         if exType is not None:
             if self.passExceptions:
@@ -341,9 +348,9 @@ class DumperBase():
         if not self.isCli:
             try:
                 if self.currentType.value:
-                    typeName = self.currentType.value
-                    if len(typeName) > 0 and typeName != self.currentChildType:
-                        self.putField('type', typeName)
+                    typename = self.currentType.value
+                    if len(typename) > 0 and typename != self.currentChildType:
+                        self.putField('type', typename)
                 if self.currentValue.value is None:
                     self.put('value="",encoding="notaccessible",numchild="0",')
                 else:
@@ -361,8 +368,8 @@ class DumperBase():
             self.indent -= 1
             try:
                 if self.currentType.value:
-                    typeName = self.currentType.value
-                    self.put('<%s> = {' % typeName)
+                    typename = self.currentType.value
+                    self.put('<%s> = {' % typename)
 
                 if self.currentValue.value is None:
                     self.put('<not accessible>')
@@ -388,14 +395,14 @@ class DumperBase():
         self.currentType = item.savedType
         return True
 
-    def stripForFormat(self, typeName):
-        if not isinstance(typeName, str):
-            raise RuntimeError('Expected string in stripForFormat(), got %s' % type(typeName))
-        if typeName in self.cachedFormats:
-            return self.cachedFormats[typeName]
+    def stripForFormat(self, typename):
+        if not isinstance(typename, str):
+            raise RuntimeError('Expected string in stripForFormat(), got %s' % type(typename))
+        if typename in self.cachedFormats:
+            return self.cachedFormats[typename]
         stripped = ''
         inArray = 0
-        for c in typeName:
+        for c in typename:
             if c == '<':
                 break
             if c == ' ':
@@ -407,59 +414,192 @@ class DumperBase():
             if inArray and ord(c) >= 48 and ord(c) <= 57:
                 continue
             stripped += c
-        self.cachedFormats[typeName] = stripped
+        self.cachedFormats[typename] = stripped
         return stripped
 
-    def templateArgument(self, typeobj, position):
-        return typeobj.templateArgument(position)
+    def templateArgument(self, typeobj, index):
+        return self.type_template_argument(typeobj.typeid, index)
 
     def intType(self):
-        result = self.lookupType('int')
-        self.intType = lambda: result
-        return result
+        return self.type_for_int
 
     def charType(self):
-        result = self.lookupType('char')
-        self.charType = lambda: result
-        return result
+        return self.type_for_char
 
     def ptrSize(self):
         result = self.lookupType('void*').size()
         self.ptrSize = lambda: result
         return result
 
-    def lookupType(self, typeName):
-        nativeType = self.lookupNativeType(typeName)
-        return None if nativeType is None else self.fromNativeType(nativeType)
-
-    def registerKnownTypes(self):
-        tdata = self.TypeData(self, 'unsigned short')
-        tdata.lbitsize = 16
-        tdata.lalignment = 2
-        tdata.code = TypeCode.Integral
+    def lookupType(self, typename):
+        if not isinstance(typename, str):
+            raise RuntimeError('ARG ERROR FOR lookupType, got %s' % type(typename))
+
+        typeid = self.typeid_for_string(typename)
+        native_type = self.type_nativetype_cache.get(typeid)
+        if native_type is None:
+            native_type = self.lookupNativeType(typename)
+            if native_type is None:
+                #sCANNOT DETERMINE SIZE FOR TYelf.dump_location()
+                self.dump_location()
+                self.warn("TYPEIDS: %s" % self.typeid_cache)
+                self.warn("COULD NOT FIND TYPE '%s'" % typename)
+                return None
 
-        tdata = self.TypeData(self, 'QChar')
-        tdata.lbitsize = 16
-        tdata.lalignment = 2
-        tdata.code = TypeCode.Struct
-        tdata.lfields = [self.Field(dumper=self, name='ucs',
-                                    type='unsigned short', bitsize=16, bitpos=0)]
-        tdata.templateArguments = lambda: []
+        self.type_nativetype_cache[typeid] = native_type
+        typeid = self.from_native_type(native_type)
+        if typeid == 0:
+            return None
+        return self.Type(self, typeid)
+
+    def register_type(self, name, code, size, enc=None):
+        typeid = self.typeid_for_string(name)
+        self.type_code_cache[typeid] = code
+        self.type_size_cache[typeid] = size
+        self.type_alignment_cache[typeid] = size
+        if enc is not None:
+            self.type_encoding_cache[typeid] = enc
+        return typeid
+
+    def register_int(self, name, size, enc=None):
+        typeid = self.typeid_for_string(name)
+        self.type_code_cache[typeid] = TypeCode.Integral
+        self.type_size_cache[typeid] = size
+        self.type_alignment_cache[typeid] = size
+        if enc is not None:
+            self.type_encoding_cache[typeid] = enc
+        return typeid
+
+    def register_enum(self, name, size):
+        typeid = self.typeid_for_string(name)
+        self.type_code_cache[typeid] = TypeCode.Enum
+        self.type_size_cache[typeid] = size
+        self.type_alignment_cache[typeid] = size
+        return typeid
+
+    def register_typedef(self, name, target_typeid):
+        typeid = self.typeid_for_string(name)
+        self.type_code_cache[typeid] = TypeCode.Typedef
+        self.type_target_cache[typeid] = target_typeid
+        self.type_size_cache[typeid] = self.type_size_cache[target_typeid]
+        self.type_alignment_cache[typeid] = self.type_alignment_cache[target_typeid]
+        return typeid
+
+    def register_struct(self, name, p5=0, p6=0, s=0):
+        # p5 = n  -> n * ptrsize for Qt 5
+        # p6 = n  -> n * ptrsize for Qt 6
+        #if self.qtVersion() >= 0x060000:   # FIXME: Qt 5, ptrSize()
+        size = 8 * p6 + s
+        typeid = self.typeid_for_string(name)
+        self.type_code_cache[typeid] = TypeCode.Struct
+        self.type_size_cache[typeid] = size
+        self.type_alignment_cache[typeid] = 8
+        return typeid
+
+    def register_known_types(self):
+        typeid = 0
+        self.typeid_cache[''] = typeid
+        self.type_code_cache[typeid] = TypeCode.Void
+        self.type_name_cache[typeid] = '<Error>'
+        self.type_size_cache[typeid] = 1
+
+        typeid_char = self.register_int('char', 1, 'uint:1')
+        self.type_for_char = self.Type(self, typeid_char)
+        self.register_int('signed char', 1, 'int:1')
+        self.register_int('unsigned char', 1, 'uint:1')
+        self.register_int('bool', 1, 'uint:1')
+        self.register_int('char8_t', 1, 'uint:1')
+        self.register_int('int8_t', 1, 'int:1')
+        self.register_int('uint8_t', 1, 'uint:1')
+        self.register_int('qint8', 1, 'int:1')
+        self.register_int('quint8', 1, 'uint:1')
+
+        self.register_int('short', 2, 'int:2')
+        self.register_int('short int', 2, 'int:2')
+        self.register_int('signed short', 2, 'int:2')
+        self.register_int('signed short int', 2, 'int:2')
+        typeid_unsigned_short = \
+        self.register_int('unsigned short', 2, 'uint:2')
+        self.register_int('unsigned short int', 2, 'uint:2')
+        self.register_int('char16_t', 2, 'uint:2')
+        self.register_int('int16_t', 2, 'int:2')
+        self.register_int('uint16_t', 2, 'uint:2')
+        self.register_int('qint16', 2, 'int:2')
+        self.register_int('quint16', 2, 'uint:2')
+
+        typeid_int = self.register_type('int', 4, 'int:4')
+        self.type_for_int = self.Type(self, typeid_int)
+        self.register_int('int', 4, 'int:4')
+        self.register_int('signed int', 4, 'int:4')
+        self.register_int('unsigned int', 4, 'uint:4')
+        self.register_int('char32_t', 4, 'int:4')
+        self.register_int('int32_t', 4, 'int:4')
+        self.register_int('uint32_t', 4, 'uint:4')
+        self.register_int('qint32', 4, 'int:4')
+        self.register_int('quint32', 4, 'uint:4')
+
+        self.register_int('long long', 8, 'int:8')
+        self.register_int('signed long long', 8, 'int:8')
+        self.register_int('unsigned long long', 8, 'uint:8')
+        self.register_int('int64_t', 8, 'int:8')
+        self.register_int('uint64_t', 8, 'uint:8')
+        self.register_int('qint64', 8, 'int:8')
+        self.register_int('quint64', 8, 'uint:8')
+
+        self.register_type('float', TypeCode.Float, 4, 'float:4')
+        typeid_double = self.register_type('double', TypeCode.Float, 8, 'float:8')
+        self.register_typedef('qreal', typeid_double)
+
+        typeid_qchar = self.register_type('@QChar', TypeCode.Struct, 2, 'uint:2')
+        #self.type_fields_cache[typeid_qchar] = [
+        #    self.Field(name='ucs', typeid=typeid_unsigned_short, bitsize=16, bitpos=0)]
+
+        self.register_enum('@Qt::ItemDataRole', 4)
+
+        self.register_struct('@QObject', p5=2, p6=2)
+        self.register_struct('@QObjectPrivate', p5=10, p6=10) # FIXME: Not exact
+
+        self.register_struct('@QByteArray', p5=1, p6=3)
+        self.register_struct('@QString', p5=1, p6=3)
+        self.register_struct('@QStandardItemData', p5=3, p6=5)
+        self.register_struct('@QVariant', p5=2, p6=4)
+        self.register_struct('@QXmlAttributes::Attribute', p5=4, p6=12)
+
+        self.register_struct('@QList<@QObject*>', p5=1, p6=3)
+        self.register_struct('@QList<@QStandardItemData>', p5=1, p6=3)
+        self.register_struct('@QList<@QRect>', p5=1, p6=3)
+
+        typeid_var_list = self.register_struct('@QList<@QVariant>', p5=1, p6=3)
+        self.register_typedef('@QVariantList', typeid_var_list)
+
+        typeid_var_map = self.register_struct('@QMap<@QString, @QVariant>', p5=1, p6=1)
+        self.register_typedef('@QVariantMap', typeid_var_map)
+
+        typeid_var_hash = self.register_struct('@QHash<@QString, @QVariant>', p5=1, p6=1)
+        self.register_typedef('@QVariantHash', typeid_var_hash)
+
+        self.register_struct('@QPoint', s=8)
+        self.register_struct('@QPointF', s=16)
+        self.register_struct('@QLine', s=16)
+        self.register_struct('@QLineF', s=32)
+
+        # FIXME: Comment out for production, see [MARK_A]
+        name1 = 'std::__cxx11::basic_string<char,std::char_traits<char>,std::allocator<char>>'
+        self.register_struct(name1, p6=4)
 
     def nativeDynamicType(self, address, baseType):
         return baseType  # Override in backends.
 
-    def listTemplateParameters(self, typename):
-        return self.listTemplateParametersManually(typename)
-
-    def listTemplateParametersManually(self, typename):
+    def fill_template_parameters_manually(self, typeid):
+        typename = self.type_name(typeid)
         # Undo id mangling for template typedefs. Relevant for QPair.
         if typename.endswith('}'):
             typename = typename[typename.find('{') + 1 : -1]
 
-        targs = []
         if not typename.endswith('>'):
-            return targs
+            return
+
+        targs = []
 
         def push(inner):
             # Handle local struct definitions like QList<main(int, char**)::SomeStruct>
@@ -471,14 +611,14 @@ class DumperBase():
                 inner = inner[6:].strip()
             if inner.endswith(' const'):
                 inner = inner[:-6].strip()
-            #DumperBase.warn("FOUND: %s" % inner)
+            #self.warn("FOUND: %s" % inner)
             targs.append(inner)
 
-        #DumperBase.warn("SPLITTING %s" % typename)
+        #self.warn("SPLITTING %s" % typename)
         level = 0
         inner = ''
         for c in typename[::-1]:  # Reversed...
-            #DumperBase.warn("C: %s" % c)
+            #self.warn("C: %s" % c)
             if c == '>':
                 if level > 0:
                     inner += c
@@ -492,7 +632,7 @@ class DumperBase():
                     inner = ''
                     break
             elif c == ',':
-                #DumperBase.warn('c: %s level: %s' % (c, level))
+                #self.warn('c: %s level: %s' % (c, level))
                 if level == 1:
                     push(inner)
                     inner = ''
@@ -501,28 +641,34 @@ class DumperBase():
             else:
                 inner += c
 
-        #DumperBase.warn("TARGS: %s %s" % (typename, targs))
-        res = []
+        #self.warn("TARGS: %s %s" % (typename, targs))
+        idx = 0
         for item in targs[::-1]:
             if len(item) == 0:
                 continue
-            c = ord(item[0])
-            if c in (45, 46) or (c >= 48 and c < 58):  # '-', '.' or digit.
-                if item.find('.') > -1:
-                    res.append(float(item))
-                else:
-                    if item.endswith('l'):
-                        item = item[:-1]
-                    if item.endswith('u'):
-                        item = item[:-1]
-                    val = toInteger(item)
-                    if val > 0x80000000:
-                        val -= 0x100000000
-                    res.append(val)
+            if item == "false": # Triggered in StdTuple dumper
+                self.type_template_arguments_cache[(typeid, idx)] = False
+            elif item == "true":
+                self.type_template_arguments_cache[(typeid, idx)] = True
             else:
-                res.append(self.Type(self, item))
-        #DumperBase.warn("RES: %s %s" % (typename, [(None if t is None else t.name) for t in res]))
-        return res
+                c = ord(item[0])
+                if c in (45, 46) or (c >= 48 and c < 58):  # '-', '.' or digit.
+                    if '.' in item:
+                        res.append(float(item))
+                    else:
+                        if item.endswith('l'):
+                            item = item[:-1]
+                        if item.endswith('u'):
+                            item = item[:-1]
+                        val = int(item)
+                        if val > 0x80000000:
+                            val -= 0x100000000
+                        self.type_template_arguments_cache[(typeid, idx)] = val
+                else:
+                    targ = self.Type(self, self.create_typeid_from_name(item))
+                    self.type_template_arguments_cache[(typeid, idx)] = targ
+            idx += 1
+            #self.warn('MANUAL: %s %s' % (type_name, targs))
 
     # Hex decoding operating on str, return str.
     @staticmethod
@@ -619,7 +765,7 @@ class DumperBase():
             (dummy, dummy, dummy, length) = self.split('IIIp', array_data_ptr)
             length = self.extractInt(array_data_ptr + 3 * self.ptrSize()) & 0x3ffffff
             alloc = length  # pretend.
-            data = self.extractPointer(array_data_ptr + self.ptrSize())
+            data = self.extract_pointer_at_address(array_data_ptr + self.ptrSize())
         return data, length, alloc
 
     def encodeStringHelper(self, value, limit):
@@ -666,14 +812,14 @@ class DumperBase():
                            displayFormat=DisplayFormat.Automatic,
                            makeExpandable=True):
         charSize = charType.size()
-        self.putCharArrayValue(data, size, charSize, displayFormat=displayFormat)
+        self.putCharArrayValue(data, size, charSize, displayFormat)
 
         if makeExpandable:
             self.putNumChild(size)
             if self.isExpanded():
                 with Children(self):
                     for i in range(size):
-                        self.putSubItem(size, self.createValue(data + i * charSize, charType))
+                        self.putSubItem(size, self.createValueFromAddress(data + i * charSize, charType))
 
     def readMemory(self, addr, size):
         return self.hexencode(bytes(self.readRawMemory(addr, size)))
@@ -699,39 +845,6 @@ class DumperBase():
     def stringData(self, value): # -> (data, size, alloc)
         return self.qArrayData(value)
 
-    def extractTemplateArgument(self, typename, position):
-        level = 0
-        skipSpace = False
-        inner = ''
-        for c in typename[typename.find('<') + 1: -1]:
-            if c == '<':
-                inner += c
-                level += 1
-            elif c == '>':
-                level -= 1
-                inner += c
-            elif c == ',':
-                if level == 0:
-                    if position == 0:
-                        return inner.strip()
-                    position -= 1
-                    inner = ''
-                else:
-                    inner += c
-                    skipSpace = True
-            else:
-                if skipSpace and c == ' ':
-                    pass
-                else:
-                    inner += c
-                    skipSpace = False
-        # Handle local struct definitions like QList<main(int, char**)::SomeStruct>
-        inner = inner.strip()
-        p = inner.find(')::')
-        if p > -1:
-            inner = inner[p + 3:]
-        return inner
-
     def putStringValue(self, value):
         length, data = self.encodeStringHelper(value, self.displayStringLimit)
         self.putValue(data, 'utf16', length=length)
@@ -750,10 +863,9 @@ class DumperBase():
             self.putType('int')
 
     def putEnumItem(self, name, ival, typish):
-        buf = bytearray(struct.pack('i', ival))
         val = self.Value(self)
-        val.ldata = bytes(buf)
-        val._type = self.createType(typish)
+        val.ldata = ival
+        val.typeid = self.create_typeid(typish)
         with SubItem(self, name):
             self.putItem(val)
 
@@ -826,15 +938,19 @@ class DumperBase():
     def putSymbolValue(self, address):
         self.putValue(self.prettySymbolByAddress(address))
 
-    def putVTableChildren(self, item, itemCount):
-        p = item.pointer()
+    def putVTableChildren(self, value, itemCount):
+        p = self.value_as_address(value)
+        entry_typeid = self.create_pointer_typeid(self.create_typeid('void'))
         for i in range(itemCount):
-            deref = self.extractPointer(p)
+            deref = self.extract_pointer_at_address(p)
             if deref == 0:
                 itemCount = i
                 break
             with SubItem(self, i):
-                self.putItem(self.createPointerValue(deref, 'void'))
+                val = self.Value(self)
+                val.ldata = deref
+                val.typeid = entry_typeid
+                self.putItem(val)
                 p += self.ptrSize()
         return itemCount
 
@@ -842,7 +958,9 @@ class DumperBase():
         baseIndex = 0
         for item in value.members(True):
             if item.name is not None:
-                if item.name.startswith('_vptr.') or item.name.startswith('__vfptr'):
+                if (item.name.startswith('_vptr.')
+                        or item.name.startswith('_vptr$')
+                        or item.name.startswith('__vfptr')):
                     with SubItem(self, '[vptr]'):
                         # int (**)(void)
                         self.putType(' ')
@@ -892,15 +1010,22 @@ class DumperBase():
 
     def check(self, exp):
         if not exp:
+            self.warn('Check failed: %s' % exp)
+            self.dump_location()
             raise RuntimeError('Check failed: %s' % exp)
 
+    def check_typeid(self, typeid):
+        if not isinstance(typeid, int):
+            size = self.type_size_cache.get(typeid, None)
+            raise RuntimeError('WRONG TYPE FOR TYPEID: %s %s' % (str(typeid), type(typeid)))
+
     def checkRef(self, ref):
         # Assume there aren't a million references to any object.
         self.check(ref >= -1)
         self.check(ref < 1000000)
 
     def checkIntType(self, thing):
-        if not self.isInt(thing):
+        if not isinstance(thing, int):
             raise RuntimeError('Expected an integral value, got %s' % type(thing))
 
     def readToFirstZero(self, base, typesize, maximum):
@@ -919,7 +1044,7 @@ class DumperBase():
                 maximum = int(maximum / 2)
                 self.warn('REDUCING READING MAXIMUM TO %s' % maximum)
 
-        #DumperBase.warn('BASE: 0x%x TSIZE: %s MAX: %s' % (base, typesize, maximum))
+        #self.warn('BASE: 0x%x TSIZE: %s MAX: %s' % (base, typesize, maximum))
         for i in range(0, maximum, typesize):
             t = struct.unpack_from(code, blob, i)[0]
             if t == 0:
@@ -1039,11 +1164,14 @@ class DumperBase():
     def putType(self, typish, priority=0):
         # Higher priority values override lower ones.
         if priority >= self.currentType.priority:
-            types = (str) if sys.version_info[0] >= 3 else (str, unicode)
-            if isinstance(typish, types):
+            if isinstance(typish, str):
                 self.currentType.value = typish
-            else:
+            elif isinstance(typish, int):
+                self.currentType.value = self.type_name(typish)
+            elif isinstance(typish, self.Type):
                 self.currentType.value = typish.name
+            else:
+                self.currentType.value = str(type(typish))
             self.currentType.priority = priority
 
     def putValue(self, value, encoding=None, priority=0, length=None):
@@ -1095,23 +1223,26 @@ class DumperBase():
             self.putItem(value)
 
     def isExpanded(self):
-        #DumperBase.warn('IS EXPANDED: %s in %s: %s' % (self.currentIName,
+        #self.warn('IS EXPANDED: %s in %s: %s' % (self.currentIName,
         #    self.expandedINames, self.currentIName in self.expandedINames))
         return self.currentIName in self.expandedINames
 
-    def mangleName(self, typeName):
+    def mangleName(self, typename):
         return '_ZN%sE' % ''.join(map(lambda x: '%d%s' % (len(x), x),
-                                      typeName.split('::')))
+                                      typename.split('::')))
 
-    def arrayItemCountFromTypeName(self, typeName, fallbackMax=1):
-        itemCount = typeName[typeName.find('[') + 1:typeName.find(']')]
+    def arrayItemCountFromTypeName(self, typename, fallbackMax=1):
+        itemCount = typename[typename.find('[') + 1:typename.find(']')]
         return int(itemCount) if itemCount else fallbackMax
 
     def putCStyleArray(self, value):
-        arrayType = value.type.unqualified()
-        innerType = arrayType.ltarget
+        arrayType = value.type
+        innerType = arrayType.target()
+        #self.warn("ARRAY TYPE: %s" % arrayType)
+        #self.warn("INNER TYPE: %s" % innerType)
         if innerType is None:
-            innerType = value.type.target().unqualified()
+            innerType = value.type.target()
+
         address = value.address()
         if address:
             self.putValue('@0x%x' % address, priority=-1)
@@ -1161,19 +1292,19 @@ class DumperBase():
     def cleanAddress(self, addr):
         if addr is None:
             return '<no address>'
-        return '0x%x' % toInteger(hex(addr), 16)
+        return '0x%x' % int(hex(addr), 16)
 
-    def stripNamespaceFromType(self, typeName):
+    def stripNamespaceFromType(self, typename):
         ns = self.qtNamespace()
-        if len(ns) > 0 and typeName.startswith(ns):
-            typeName = typeName[len(ns):]
-        # DumperBase.warn( 'stripping %s' % typeName )
+        if len(ns) > 0 and typename.startswith(ns):
+            typename = typename[len(ns):]
+        # self.warn( 'stripping %s' % typename )
         lvl = 0
         pos = None
         stripChunks = []
-        sz = len(typeName)
+        sz = len(typename)
         for index in range(0, sz):
-            s = typeName[index]
+            s = typename[index]
             if s == '<':
                 lvl += 1
                 if lvl == 1:
@@ -1188,22 +1319,22 @@ class DumperBase():
         if lvl != 0:
             raise RuntimeError("unbalanced at end of type name")
         for (f, l) in reversed(stripChunks):
-            typeName = typeName[:f] + typeName[l:]
-        return typeName
+            typename = typename[:f] + typename[l:]
+        return typename
 
-    def tryPutPrettyItem(self, typeName, value):
+    def tryPutPrettyItem(self, typename, value):
         value.check()
         if self.useFancy and self.currentItemFormat() != DisplayFormat.Raw:
-            self.putType(typeName)
+            self.putType(typename)
 
-            nsStrippedType = self.stripNamespaceFromType(typeName)\
+            nsStrippedType = self.stripNamespaceFromType(typename)\
                 .replace('::', '__')
 
             # Strip leading 'struct' for C structs
             if nsStrippedType.startswith('struct '):
                 nsStrippedType = nsStrippedType[7:]
 
-            #DumperBase.warn('STRIPPED: %s' % nsStrippedType)
+            #self.warn('STRIPPED: %s' % nsStrippedType)
             # The following block is only needed for D.
             if nsStrippedType.startswith('_A'):
                 # DMD v2.058 encodes string[] as _Array_uns long long.
@@ -1216,7 +1347,7 @@ class DumperBase():
                     return True
 
             dumper = self.qqDumpers.get(nsStrippedType)
-            #DumperBase.warn('DUMPER: %s' % dumper)
+            #self.warn('DUMPER: %s' % dumper)
             if dumper is not None:
                 dumper(self, value)
                 return True
@@ -1242,15 +1373,15 @@ class DumperBase():
         self.putField('editvalue', value)
 
     # This is shared by pointer and array formatting.
-    def tryPutSimpleFormattedPointer(self, ptr, typeName, innerType, displayFormat, limit):
+    def tryPutSimpleFormattedPointer(self, ptr, typename, innerType, displayFormat, limit):
         if displayFormat == DisplayFormat.Automatic:
             targetType = innerType
             if innerType.code == TypeCode.Typedef:
-                targetType = innerType.ltarget
+                targetType = innerType.target()
 
             if targetType.name in ('char', 'signed char', 'unsigned char', 'uint8_t', 'CHAR'):
                 # Use UTF-8 as default for char *.
-                self.putType(typeName)
+                self.putType(typename)
                 (length, shown, data) = self.readToFirstZero(ptr, 1, limit)
                 self.putValue(data, 'utf8', length=length)
                 if self.isExpanded():
@@ -1258,7 +1389,7 @@ class DumperBase():
                 return True
 
             if targetType.name in ('wchar_t', 'WCHAR'):
-                self.putType(typeName)
+                self.putType(typename)
                 charSize = self.lookupType('wchar_t').size()
                 (length, data) = self.encodeCArray(ptr, charSize, limit)
                 if charSize == 2:
@@ -1268,58 +1399,54 @@ class DumperBase():
                 return True
 
         if displayFormat == DisplayFormat.Latin1String:
-            self.putType(typeName)
+            self.putType(typename)
             (length, data) = self.encodeCArray(ptr, 1, limit)
             self.putValue(data, 'latin1', length=length)
             return True
 
         if displayFormat == DisplayFormat.SeparateLatin1String:
-            self.putType(typeName)
+            self.putType(typename)
             (length, data) = self.encodeCArray(ptr, 1, limit)
             self.putValue(data, 'latin1', length=length)
             self.putDisplay('latin1:separate', data)
             return True
 
         if displayFormat == DisplayFormat.Utf8String:
-            self.putType(typeName)
+            self.putType(typename)
             (length, data) = self.encodeCArray(ptr, 1, limit)
             self.putValue(data, 'utf8', length=length)
             return True
 
         if displayFormat == DisplayFormat.SeparateUtf8String:
-            self.putType(typeName)
+            self.putType(typename)
             (length, data) = self.encodeCArray(ptr, 1, limit)
             self.putValue(data, 'utf8', length=length)
             self.putDisplay('utf8:separate', data)
             return True
 
         if displayFormat == DisplayFormat.Local8BitString:
-            self.putType(typeName)
+            self.putType(typename)
             (length, data) = self.encodeCArray(ptr, 1, limit)
             self.putValue(data, 'local8bit', length=length)
             return True
 
         if displayFormat == DisplayFormat.Utf16String:
-            self.putType(typeName)
+            self.putType(typename)
             (length, data) = self.encodeCArray(ptr, 2, limit)
             self.putValue(data, 'utf16', length=length)
             return True
 
         if displayFormat == DisplayFormat.Ucs4String:
-            self.putType(typeName)
+            self.putType(typename)
             (length, data) = self.encodeCArray(ptr, 4, limit)
             self.putValue(data, 'ucs4', length=length)
             return True
 
         return False
 
-    def putFormattedPointer(self, value):
-        #with self.timer('formattedPointer'):
-        self.putFormattedPointerX(value)
-
     def putDerefedPointer(self, value):
-        derefValue = value.dereference()
-        innerType = value.type.target()  # .unqualified()
+        derefValue = self.value_dereference(value)
+        innerType = value.type.target()
         self.putType(innerType)
         savedCurrentChildType = self.currentChildType
         self.currentChildType = innerType.name
@@ -1332,47 +1459,47 @@ class DumperBase():
         self.putItem(derefValue)
         self.currentChildType = savedCurrentChildType
 
-    def putFormattedPointerX(self, value):
+    def putFormattedPointer(self, value):
         self.putOriginalAddress(value.address())
-        #DumperBase.warn("PUT FORMATTED: %s" % value)
-        pointer = value.pointer()
+        #self.warn("PUT FORMATTED: %s" % value)
+        pointer = self.value_as_address(value)
         self.putAddress(pointer)
-        #DumperBase.warn('POINTER: 0x%x' % pointer)
+        #self.warn('POINTER: 0x%x' % pointer)
         if pointer == 0:
-            #DumperBase.warn('NULL POINTER')
-            self.putType(value.type)
+            #self.warn('NULL POINTER')
+            self.putType(value.typeid)
             self.putValue('0x0')
             return
 
-        typeName = value.type.name
+        typename = self.type_name(value.typeid)
 
         try:
             self.readRawMemory(pointer, 1)
         except:
             # Failure to dereference a pointer should at least
             # show the value of a pointer.
-            #DumperBase.warn('BAD POINTER: %s' % value)
+            #self.warn('BAD POINTER: %s' % value)
             self.putValue('0x%x' % pointer)
-            self.putType(typeName)
+            self.putType(typename)
             return
 
         if self.currentIName.endswith('.this'):
             self.putDerefedPointer(value)
             return
 
-        displayFormat = self.currentItemFormat(value.type.name)
-        innerType = value.type.target()  # .unqualified()
+        displayFormat = self.currentItemFormat(typename)
+        innerType = value.type.target()
 
         if innerType.name == 'void':
-            #DumperBase.warn('VOID POINTER: %s' % displayFormat)
-            self.putType(typeName)
+            #self.warn('VOID POINTER: %s' % displayFormat)
+            self.putType(typename)
             self.putSymbolValue(pointer)
             return
 
         if displayFormat == DisplayFormat.Raw:
             # Explicitly requested bald pointer.
-            #DumperBase.warn('RAW')
-            self.putType(typeName)
+            #self.warn('RAW')
+            self.putType(typename)
             self.putValue('0x%x' % pointer)
             self.putExpandable()
             if self.currentIName in self.expandedINames:
@@ -1384,27 +1511,27 @@ class DumperBase():
         limit = self.displayStringLimit
         if displayFormat in (DisplayFormat.SeparateLatin1String, DisplayFormat.SeparateUtf8String):
             limit = 1000000
-        if self.tryPutSimpleFormattedPointer(pointer, typeName,
+        if self.tryPutSimpleFormattedPointer(pointer, typename,
                                              innerType, displayFormat, limit):
             self.putExpandable()
             return
 
         if DisplayFormat.Array10 <= displayFormat and displayFormat <= DisplayFormat.Array10000:
             n = (10, 100, 1000, 10000)[displayFormat - DisplayFormat.Array10]
-            self.putType(typeName)
+            self.putType(typename)
             self.putItemCount(n)
-            self.putArrayData(value.pointer(), n, innerType)
+            self.putArrayData(self.value_as_address(value), n, innerType)
             return
 
         if innerType.code == TypeCode.Function:
             # A function pointer.
             self.putSymbolValue(pointer)
-            self.putType(typeName)
+            self.putType(typename)
             return
 
-        #DumperBase.warn('AUTODEREF: %s' % self.autoDerefPointers)
-        #DumperBase.warn('INAME: %s' % self.currentIName)
-        #DumperBase.warn('INNER: %s' % innerType.name)
+        #self.warn('AUTODEREF: %s' % self.autoDerefPointers)
+        #self.warn('INAME: %s' % self.currentIName)
+        #self.warn('INNER: %s' % innerType.name)
         if self.autoDerefPointers:
             # Generic pointer type with AutomaticFormat, but never dereference char types:
             if innerType.name not in (
@@ -1425,9 +1552,9 @@ class DumperBase():
                 self.putDerefedPointer(value)
                 return
 
-        #DumperBase.warn('GENERIC PLAIN POINTER: %s' % value.type)
-        #DumperBase.warn('ADDR PLAIN POINTER: 0x%x' % value.laddress)
-        self.putType(typeName)
+        #self.warn('GENERIC PLAIN POINTER: %s' % value.type)
+        #self.warn('ADDR PLAIN POINTER: 0x%x' % value.laddress)
+        self.putType(typename)
         self.putSymbolValue(pointer)
         self.putExpandable()
         if self.currentIName in self.expandedINames:
@@ -1458,7 +1585,7 @@ class DumperBase():
                 #   - int postedEvents;
                 #   - QDynamicMetaObjectData *metaObject;
                 #   - QBindingStorage bindingStorage;
-                extra = self.extractPointer(dd + 9 * ptrSize + 2 * intSize)
+                extra = self.extract_pointer_at_address(dd + 9 * ptrSize + 2 * intSize)
                 if extra == 0:
                     return False
 
@@ -1478,7 +1605,7 @@ class DumperBase():
                 #   - uint isWidget : 1; etc...
                 #   - int postedEvents;
                 #   - QDynamicMetaObjectData *metaObject;
-                extra = self.extractPointer(dd + 5 * ptrSize + 2 * intSize)
+                extra = self.extract_pointer_at_address(dd + 5 * ptrSize + 2 * intSize)
                 if extra == 0:
                     return False
 
@@ -1582,7 +1709,7 @@ class DumperBase():
 
         try:
             customEventOffset = 8 if self.isMsvcTarget() else 9
-            customEventFunc = self.extractPointer(vtablePtr + customEventOffset * self.ptrSize())
+            customEventFunc = self.extract_pointer_at_address(vtablePtr + customEventOffset * self.ptrSize())
         except:
             self.bump('nostruct-3')
             return False
@@ -1594,7 +1721,7 @@ class DumperBase():
             customEventFunc = getJumpAddress_x86(self, customEventFunc)
             if customEventFunc in (self.qtCustomEventFunc, self.qtCustomEventPltFunc):
                 return True
-            customEventFunc = self.extractPointer(customEventFunc)
+            customEventFunc = self.extract_pointer_at_address(customEventFunc)
             if customEventFunc in (self.qtCustomEventFunc, self.qtCustomEventPltFunc):
                 return True
             # If the object is defined in another module there may be another level of indirection
@@ -1603,18 +1730,18 @@ class DumperBase():
         return customEventFunc in (self.qtCustomEventFunc, self.qtCustomEventPltFunc)
 
 #    def extractQObjectProperty(objectPtr):
-#        vtablePtr = self.extractPointer(objectPtr)
-#        metaObjectFunc = self.extractPointer(vtablePtr)
+#        vtablePtr = self.extract_pointer_at_address(objectPtr)
+#        metaObjectFunc = self.extract_pointer_at_address(vtablePtr)
 #        cmd = '((void*(*)(void*))0x%x)((void*)0x%x)' % (metaObjectFunc, objectPtr)
 #        try:
-#            #DumperBase.warn('MO CMD: %s' % cmd)
+#            #self.warn('MO CMD: %s' % cmd)
 #            res = self.parseAndEvaluate(cmd)
-#            #DumperBase.warn('MO RES: %s' % res)
+#            #self.warn('MO RES: %s' % res)
 #            self.bump('successfulMetaObjectCall')
-#            return res.pointer()
+#            return self.value_as_address(res)
 #        except:
 #            self.bump('failedMetaObjectCall')
-#            #DumperBase.warn('COULD NOT EXECUTE: %s' % cmd)
+#            #self.warn('COULD NOT EXECUTE: %s' % cmd)
 #        return 0
 
     def extractMetaObjectPtr(self, objectPtr, typeobj):
@@ -1631,29 +1758,29 @@ class DumperBase():
             # contents 'vanishes' as the reported size of the string
             # gets zeroed out(?).
             # Try vtable, metaObject() is the first entry.
-            vtablePtr = self.extractPointer(objectPtr)
-            metaObjectFunc = self.extractPointer(vtablePtr)
+            vtablePtr = self.extract_pointer_at_address(objectPtr)
+            metaObjectFunc = self.extract_pointer_at_address(vtablePtr)
             cmd = '((void*(*)(void*))0x%x)((void*)0x%x)' % (metaObjectFunc, objectPtr)
             try:
-                #DumperBase.warn('MO CMD: %s' % cmd)
+                #self.warn('MO CMD: %s' % cmd)
                 res = self.parseAndEvaluate(cmd)
-                #DumperBase.warn('MO RES: %s' % res)
+                #self.warn('MO RES: %s' % res)
                 self.bump('successfulMetaObjectCall')
-                return res.pointer()
+                return self.value_as_address(res)
             except:
                 self.bump('failedMetaObjectCall')
-                #DumperBase.warn('COULD NOT EXECUTE: %s' % cmd)
+                #self.warn('COULD NOT EXECUTE: %s' % cmd)
             return 0
 
         def extractStaticMetaObjectFromTypeHelper(someTypeObj):
             if someTypeObj.isSimpleType():
                 return 0
 
-            typeName = someTypeObj.name
-            isQObjectProper = typeName == self.qtNamespace() + 'QObject'
+            typename = someTypeObj.name
+            isQObjectProper = typename == self.qtNamespace() + 'QObject'
 
             # No templates for now.
-            if typeName.find('<') >= 0:
+            if typename.find('<') >= 0:
                 return 0
 
             result = self.findStaticMetaObject(someTypeObj)
@@ -1706,16 +1833,16 @@ class DumperBase():
 
         ptrSize = self.ptrSize()
 
-        typeName = typeobj.name
-        result = self.knownStaticMetaObjects.get(typeName, None)
+        typename = typeobj.name
+        result = self.knownStaticMetaObjects.get(typename, None)
         if result is not None:  # Is 0 or the static metaobject.
             self.bump('typecached')
-            #DumperBase.warn('CACHED RESULT: %s %s 0x%x' % (self.currentIName, typeName, result))
+            #self.warn('CACHED RESULT: %s %s 0x%x' % (self.currentIName, typename, result))
             return result
 
         if not self.couldBeQObjectPointer(objectPtr):
             self.bump('cannotBeQObject')
-            #DumperBase.warn('DOES NOT LOOK LIKE A QOBJECT: %s' % self.currentIName)
+            #self.warn('DOES NOT LOOK LIKE A QOBJECT: %s' % self.currentIName)
             return 0
 
         metaObjectPtr = 0
@@ -1731,26 +1858,17 @@ class DumperBase():
 
         #if metaObjectPtr:
         #    self.bump('foundMetaObject')
-        #    self.knownStaticMetaObjects[typeName] = metaObjectPtr
+        #    self.8;
 
         return metaObjectPtr
 
-    def split(self, pattern, value):
-        if isinstance(value, self.Value):
-            return value.split(pattern)
-        if self.isInt(value):
-            val = self.Value(self)
-            val.laddress = value
-            return val.split(pattern)
-        raise RuntimeError('CANNOT EXTRACT STRUCT FROM %s' % type(value))
-
     def extractCString(self, addr):
         result = bytearray()
         while True:
-            d = self.extractByte(addr)
-            if d == 0:
+            d = bytes(self.readRawMemory(addr, 1))
+            if d[0] == 0:
                 break
-            result.append(d)
+            result += d
             addr += 1
         return result
 
@@ -1775,21 +1893,21 @@ class DumperBase():
         data = array + begin * stepSize
         return data, size
 
-    def putTypedPointer(self, name, addr, typeName):
+    def putTypedPointer(self, name, addr, typename):
         """ Prints a typed pointer, expandable if the type can be resolved,
             and without children otherwise """
         with SubItem(self, name):
             self.putAddress(addr)
             self.putValue('@0x%x' % addr)
-            typeObj = self.lookupType(typeName)
+            typeObj = self.lookupType(typename)
             if typeObj:
                 self.putType(typeObj)
                 self.putExpandable()
                 if self.isExpanded():
                     with Children(self):
-                        self.putFields(self.createValue(addr, typeObj))
+                        self.putFields(self.createValueFromAddress(addr, typeObj))
             else:
-                self.putType(typeName)
+                self.putType(typename)
 
     # This is called is when a QObject derived class is expanded
     def tryPutQObjectGuts(self, value):
@@ -1803,24 +1921,24 @@ class DumperBase():
         stringdataOffset = ptrSize
         if self.isWindowsTarget() and self.qtVersion() >= 0x060000:
             stringdataOffset += ptrSize # indirect super data member
-        stringdata = self.extractPointer(toInteger(metaObjectPtr) + stringdataOffset)
+        stringdata = self.extract_pointer_at_address(int(metaObjectPtr) + stringdataOffset)
 
-        def unpackString(base, size):
+        def unpack_string(base, size):
             try:
                 s = struct.unpack_from('%ds' % size, self.readRawMemory(base, size))[0]
-                return s if sys.version_info[0] == 2 else s.decode('utf8')
+                return s.decode('utf8')
             except:
                 return '<not available>'
 
         if revision >= 9:  # Qt 6.
             pos, size = self.split('II', stringdata + 8 * index)
-            return unpackString(stringdata + pos, size)
+            return unpack_string(stringdata + pos, size)
 
         if revision >= 7:  # Qt 5.
             byteArrayDataSize = 24 if ptrSize == 8 else 16
-            literal = stringdata + toInteger(index) * byteArrayDataSize
+            literal = stringdata + int(index) * byteArrayDataSize
             base, size, _ = self.qArrayDataHelper(literal)
-            return unpackString(base, size)
+            return unpack_string(base, size)
 
         ldata = stringdata + index
         return self.extractCString(ldata).decode('utf8')
@@ -1844,11 +1962,11 @@ class DumperBase():
                 index = name
             elif self.qtVersion() >= 0x050000:
                 revision = 7
-                dataPtr = self.extractPointer(metaObjectPtr + 2 * self.ptrSize())
+                dataPtr = self.extract_pointer_at_address(metaObjectPtr + 2 * self.ptrSize())
                 index = self.extractInt(dataPtr + 4 * handle)
             else:
                 revision = 6
-                dataPtr = self.extractPointer(metaObjectPtr + 2 * self.ptrSize())
+                dataPtr = self.extract_pointer_at_address(metaObjectPtr + 2 * self.ptrSize())
                 index = self.extractInt(dataPtr + 4 * handle)
             #self.putValue("index: %s rev: %s" % (index, revision))
             name = self.metaString(metaObjectPtr, index, revision)
@@ -1873,14 +1991,14 @@ class DumperBase():
     def putQObjectGutsHelper(self, qobject, qobjectPtr, handle, metaObjectPtr, origType):
         ptrSize = self.ptrSize()
 
-        def putt(name, value, typeName=' '):
+        def putt(name, value, typename=' '):
             with SubItem(self, name):
                 self.putValue(value)
-                self.putType(typeName)
+                self.putType(typename)
 
         def extractSuperDataPtr(someMetaObjectPtr):
             #return someMetaObjectPtr['d']['superdata']
-            return self.extractPointer(someMetaObjectPtr)
+            return self.extract_pointer_at_address(someMetaObjectPtr)
 
         def extractDataPtr(someMetaObjectPtr):
             # dataPtr = metaObjectPtr['d']['data']
@@ -1888,14 +2006,14 @@ class DumperBase():
                 offset = 3
             else:
                 offset = 2
-            return self.extractPointer(someMetaObjectPtr + offset * ptrSize)
+            return self.extract_pointer_at_address(someMetaObjectPtr + offset * ptrSize)
 
         isQMetaObject = origType == 'QMetaObject'
         isQObject = origType == 'QObject'
 
-        #DumperBase.warn('OBJECT GUTS: %s 0x%x ' % (self.currentIName, metaObjectPtr))
+        #self.warn('OBJECT GUTS: %s 0x%x ' % (self.currentIName, metaObjectPtr))
         dataPtr = extractDataPtr(metaObjectPtr)
-        #DumperBase.warn('DATA PTRS: %s 0x%x ' % (self.currentIName, dataPtr))
+        #self.warn('DATA PTRS: %s 0x%x ' % (self.currentIName, dataPtr))
         (revision, classname,
             classinfo, classinfo2,
             methodCount, methods,
@@ -1913,7 +2031,7 @@ class DumperBase():
         ns = self.qtNamespace()
         extraData = 0
         if qobjectPtr:
-            dd = self.extractPointer(qobjectPtr + ptrSize)
+            dd = self.extract_pointer_at_address(qobjectPtr + ptrSize)
             if self.qtVersion() >= 0x60000:
                 (dvtablePtr, qptr, parent, children, bindingStorageData, bindingStatus,
                     flags, postedEvents, dynMetaObjectPtr, # Up to here QObjectData.
@@ -1942,7 +2060,7 @@ class DumperBase():
                 if not self.isCli:
                     self.putSortGroup(8)
 
-                dvtablePtr, qptr, parentPtr, children = self.split('ppp{QList<QObject *>}', dd)
+                dvtablePtr, qptr, parentPtr, children = self.split('ppp{@QList<@QObject *>}', dd)
                 self.putItem(children)
 
         if isQMetaObject:
@@ -2003,8 +2121,9 @@ class DumperBase():
                         if False:
                             with SubItem(self, '[connections]'):
                                 if connectionListsPtr:
-                                    typeName = '@QObjectConnectionListVector'
-                                    self.putItem(self.createValue(connectionListsPtr, typeName))
+                                    typename = '@QObjectConnectionListVector'
+                                    self.putItem(self.createValueFromAddress(connectionListsPtr,
+typename))
                                 else:
                                     self.putItemCount(0)
 
@@ -2053,19 +2172,19 @@ class DumperBase():
                             if qobject and self.qtPropertyFunc:
                                     # LLDB doesn't like calling it on a derived class, possibly
                                     # due to type information living in a different shared object.
-                                    #base = self.createValue(qobjectPtr, '@QObject')
-                                    #DumperBase.warn("CALL FUNC: 0x%x" % self.qtPropertyFunc)
+                                    #base = self.createValueFromAddress(qobjectPtr, '@QObject')
+                                    #self.warn("CALL FUNC: 0x%x" % self.qtPropertyFunc)
                                 cmd = '((QVariant(*)(void*,char*))0x%x)((void*)0x%x,"%s")' \
                                     % (self.qtPropertyFunc, qobjectPtr, name)
                                 try:
-                                        #DumperBase.warn('PROP CMD: %s' % cmd)
+                                        #self.warn('PROP CMD: %s' % cmd)
                                     res = self.parseAndEvaluate(cmd)
-                                    #DumperBase.warn('PROP RES: %s' % res)
+                                    #self.warn('PROP RES: %s' % res)
                                 except:
                                     self.bump('failedMetaObjectCall')
                                     putt(name, ' ')
                                     continue
-                                    #DumperBase.warn('COULD NOT EXECUTE: %s' % cmd)
+                                    #self.warn('COULD NOT EXECUTE: %s' % cmd)
                                 #self.putCallItem(name, '@QVariant', base, 'property', '"' + name + '"')
                                 if res is None:
                                     self.bump('failedMetaObjectCall2')
@@ -2077,37 +2196,42 @@ class DumperBase():
 
                         # Dynamic properties.
                         if extraData:
-                            def list6Generator(addr, innerType):
+                            def list6Generator(addr, inner_typeid):
                                 data, size = self.listData(addr)
+                                inner_size = self.type_size(inner_typeid)
                                 for i in range(size):
-                                    yield self.createValue(data + i * innerType.size(), innerType)
+                                    yield self.createValueFromAddress(data, inner_typeid)
+                                    data += inner_size
 
-                            def list5Generator(addr, innerType):
+                            def list5Generator(addr, inner_typeid):
                                 data, size = self.listData(addr)
                                 for i in range(size):
-                                    yield self.createValue(data + i * ptrSize, innerType)
+                                    yield self.createValueFromAddress(data, inner_typeid)
+                                    data += ptrSize
 
-                            def vectorGenerator(addr, innerType):
+                            def vectorGenerator(addr, inner_typeid):
                                 data, size = self.vectorData(addr)
+                                inner_size = self.type_size(inner_typeid)
                                 for i in range(size):
-                                    yield self.createValue(data + i * innerType.size(), innerType)
+                                    yield self.createValueFromAddress(data, inner_typeid)
+                                    data += inner_size
 
-                            byteArrayType = self.createType('@QByteArray')
-                            variantType = self.createType('@QVariant')
+                            variant_typeid = self.cheap_typeid_from_name('@QVariant')
                             if self.qtVersion() >= 0x60000:
-                                values = vectorGenerator(extraData + 3 * ptrSize, variantType)
+                                values = vectorGenerator(extraData + 3 * ptrSize, variant_typeid)
                             elif self.qtVersion() >= 0x50600:
-                                values = vectorGenerator(extraData + 2 * ptrSize, variantType)
+                                values = vectorGenerator(extraData + 2 * ptrSize, variant_typeid)
                             elif self.qtVersion() >= 0x50000:
-                                values = list5Generator(extraData + 2 * ptrSize, variantType)
+                                values = list5Generator(extraData + 2 * ptrSize, variant_typeid)
                             else:
-                                values = list5Generator(extraData + 2 * ptrSize,
-                                                        variantType.pointer())
+                                variantptr_typeid = self.cheap_typeid_from_name('@QVariant')
+                                values = list5Generator(extraData + 2 * ptrSize, variantptr_typeid)
 
+                            bytearray_typeid = self.cheap_typeid_from_name('@QByteArray')
                             if self.qtVersion() >= 0x60000:
-                                names = list6Generator(extraData, byteArrayType)
+                                names = list6Generator(extraData, bytearray_typeid)
                             else:
-                                names = list5Generator(extraData + ptrSize, byteArrayType)
+                                names = list5Generator(extraData + ptrSize, bytearray_typeid)
 
                             for (k, v) in zip(names, values):
                                 with SubItem(self, propertyCount + dynamicPropertyCount):
@@ -2169,7 +2293,7 @@ class DumperBase():
 
         if isQObject:
             with SubItem(self, '[d]'):
-                self.putItem(self.createValue(dd, '@QObjectPrivate'))
+                self.putItem(self.createValueFromAddress(dd, '@QObjectPrivate'))
                 self.putSortGroup(15)
 
         if isQMetaObject:
@@ -2199,10 +2323,10 @@ class DumperBase():
         with SubItem(self, '[connections]'):
             ptrSize = self.ptrSize()
             self.putNoType()
-            privateType = self.createType('@QObjectPrivate')
+            privateType = self.create_typeid_from_name('@QObjectPrivate')
             d_ptr = dd.cast(privateType.pointer()).dereference()
             connections = d_ptr['connectionLists']
-            if self.connections.integer() == 0:
+            if self.value_as_integer(connections) == 0:
                 self.putItemCount(0)
             else:
                 connections = connections.dereference()
@@ -2215,72 +2339,74 @@ class DumperBase():
                     innerType = connections.type[0]
                     # Should check:  innerType == ns::QObjectPrivate::ConnectionList
                     data, size = self.vectorData(connections)
-                    connectionType = self.createType('@QObjectPrivate::Connection')
+                    connection_typeid = self.create_typeid_from_name('@QObjectPrivate::Connection')
+                    connection_ptr_typeid = self.create_pointer_typeid(connection_typeid)
                     for i in range(size):
-                        first = self.extractPointer(data + i * 2 * ptrSize)
+                        first = self.extract_pointer_at_address(data + i * 2 * ptrSize)
                         while first:
-                            self.putSubItem('%s' % pp,
-                                            self.createPointerValue(first, connectionType))
-                            first = self.extractPointer(first + 3 * ptrSize)
+                            val = self.Value(self)
+                            val.ldata = first
+                            val.typeid = connection_typeid
+                            self.putSubItem('%s' % pp, val)
+                            first = self.extract_pointer_at_address(first + 3 * ptrSize)
                             # We need to enforce some upper limit.
                             pp += 1
                             if pp > 1000:
                                 break
 
-    def currentItemFormat(self, typeName=None):
+    def currentItemFormat(self, typename=None):
         displayFormat = self.formats.get(self.currentIName, DisplayFormat.Automatic)
         if displayFormat == DisplayFormat.Automatic:
-            if typeName is None:
-                typeName = self.currentType.value
-            needle = None if typeName is None else self.stripForFormat(typeName)
+            if typename is None:
+                typename = self.currentType.value
+            needle = None if typename is None else self.stripForFormat(typename)
             displayFormat = self.typeformats.get(needle, DisplayFormat.Automatic)
         return displayFormat
 
     def putSubItem(self, component, value):  # -> ReportItem
         if not isinstance(value, self.Value):
             raise RuntimeError('WRONG VALUE TYPE IN putSubItem: %s' % type(value))
-        if not isinstance(value.type, self.Type):
-            raise RuntimeError('WRONG TYPE TYPE IN putSubItem: %s' % type(value.type))
         res = None
         with SubItem(self, component):
             self.putItem(value)
             res = self.currentValue
         return res  # The 'short' display.
 
-    def putArrayData(self, base, n, innerType, childNumChild=None):
+    def putArrayData(self, base, n, inner_typish, childNumChild=None):
         self.checkIntType(base)
         self.checkIntType(n)
-        addrBase = base
-        innerSize = innerType.size()
+        inner_typeid = self.typeid_for_typish(inner_typish)
+        inner_size = self.type_size_cache.get(inner_typeid, None)
         self.putNumChild(n)
-        #DumperBase.warn('ADDRESS: 0x%x INNERSIZE: %s INNERTYPE: %s' % (addrBase, innerSize, innerType))
-        enc = innerType.simpleEncoding()
+        #self.warn('ADDRESS: 0x%x INNERSIZE: %s INNERTYPE: %s' % (base, inner_size, inner_typeid))
+        enc = self.type_encoding_cache.get(inner_typeid, None)
         maxNumChild = self.maxArrayCount()
         if enc:
-            self.put('childtype="%s",' % innerType.name)
-            self.put('addrbase="0x%x",' % addrBase)
-            self.put('addrstep="0x%x",' % innerSize)
+            self.put('childtype="%s",' % self.type_name(inner_typeid))
+            self.put('addrbase="0x%x",' % base)
+            self.put('addrstep="0x%x",' % inner_size)
             self.put('arrayencoding="%s",' % enc)
             self.put('endian="%s",' % self.packCode)
             if n > maxNumChild:
                 self.put('childrenelided="%s",' % n)
                 n = maxNumChild
             self.put('arraydata="')
-            self.put(self.readMemory(addrBase, n * innerSize))
+            self.put(self.readMemory(base, n * inner_size))
             self.put('",')
         else:
+            innerType = self.Type(self, inner_typeid)
             with Children(self, n, innerType, childNumChild, maxNumChild,
-                          addrBase=addrBase, addrStep=innerSize):
+                          addrBase=base, addrStep=inner_size):
                 for i in self.childRange():
-                    self.putSubItem(i, self.createValue(addrBase + i * innerSize, innerType))
+                    self.putSubItem(i, self.createValueFromAddress(base + i * inner_size, innerType))
 
-    def putArrayItem(self, name, addr, n, typeName):
+    def putArrayItem(self, name, addr, n, typename):
         self.checkIntType(addr)
         self.checkIntType(n)
         with SubItem(self, name):
             self.putEmptyValue()
-            self.putType('%s [%d]' % (typeName, n))
-            self.putArrayData(addr, n, self.lookupType(typeName))
+            self.putType('%s [%d]' % (typename, n))
+            self.putArrayData(addr, n, self.lookupType(typename))
             self.putAddress(addr)
 
     def putPlotDataHelper(self, base, n, innerType, maxNumChild=1000 * 1000):
@@ -2303,13 +2429,15 @@ class DumperBase():
         """
         Special handling for char** argv.
         """
+        ptr_size = self.ptrSize()
         n = 0
-        p = value
-        # p is 0 for "optimized out" cases. Or contains rubbish.
+        argv = self.value_as_address(value)
+        # argv is 0 for "optimized out" cases. Or contains rubbish.
         try:
-            if value.integer():
-                while p.dereference().integer() and n <= 100:
-                    p += 1
+            if argv:
+                p = argv
+                while self.extract_pointer_at_address(p) and n <= 100:
+                    p += ptr_size
                     n += 1
         except:
             pass
@@ -2325,44 +2453,54 @@ class DumperBase():
                         self.putSubItem(i, p.dereference())
                         p += 1
 
+    def extract_pointer_at_address(self, address):
+        blob = self.value_data_from_address(address, self.ptrSize())
+        return int.from_bytes(blob, byteorder='little')
+
+    def value_extract_integer(self, value, size, signed):
+        if isinstance(value.lvalue, int):
+            return value.lvalue
+        if isinstance(value.ldata, int):
+            return value.ldata
+        #with self.dumper.timer('extractInt'):
+        value.check()
+        blob = self.value_data(value, size)
+        return int.from_bytes(blob, byteorder='little', signed=signed)
+
+    def value_extract_something(self, valuish, size, signed=False):
+        if isinstance(valuish, int):
+            blob = self.value_data_from_address(valuish, size)
+        elif isinstance(valuish, self.Value):
+            blob = self.value_data(valuish, size)
+        else:
+            raise RuntimeError('CANT EXTRACT FROM %s' % type(valuish))
+        res = int.from_bytes(blob, byteorder='little', signed=signed)
+        #self.warn("EXTRACTED %s SIZE %s FROM %s" % (res, size, blob))
+        return res
+
     def extractPointer(self, value):
-        try:
-            if value.type.code == TypeCode.Array:
-                return value.address()
-        except:
-            pass
-        code = 'I' if self.ptrSize() == 4 else 'Q'
-        return self.extractSomething(value, code, 8 * self.ptrSize())
+        return self.value_extract_something(value, self.ptrSize())
 
     def extractInt64(self, value):
-        return self.extractSomething(value, 'q', 64)
+        return self.value_extract_something(value, 8, True)
 
     def extractUInt64(self, value):
-        return self.extractSomething(value, 'Q', 64)
+        return self.value_extract_something(value, 8)
 
     def extractInt(self, value):
-        return self.extractSomething(value, 'i', 32)
+        return self.value_extract_something(value, 4, True)
 
     def extractUInt(self, value):
-        return self.extractSomething(value, 'I', 32)
+        return self.value_extract_something(value, 4)
 
     def extractShort(self, value):
-        return self.extractSomething(value, 'h', 16)
+        return self.value_extract_something(value, 2, True)
 
     def extractUShort(self, value):
-        return self.extractSomething(value, 'H', 16)
+        return self.value_extract_something(value, 2)
 
     def extractByte(self, value):
-        return self.extractSomething(value, 'b', 8)
-
-    def extractSomething(self, value, pattern, bitsize):
-        if self.isInt(value):
-            val = self.Value(self)
-            val.laddress = value
-            return val.extractSomething(pattern, bitsize)
-        if isinstance(value, self.Value):
-            return value.extractSomething(pattern, bitsize)
-        raise RuntimeError('CANT EXTRACT FROM %s' % type(value))
+        return self.value_extract_something(value, 1)
 
     # Parses a..b and  a.(s).b
     def parseRange(self, exp):
@@ -2405,9 +2543,9 @@ class DumperBase():
 
             try:
                 # Allow integral expressions.
-                ss = self.parseAndEvaluate(s[1:len(s) - 1]).integer() if s else 1
-                aa = self.parseAndEvaluate(a).integer()
-                bb = self.parseAndEvaluate(b).integer()
+                ss = self.value_as_integer(self.parseAndEvaluate(s[1:len(s) - 1])) if s else 1
+                aa = self.value_as_integer(self.parseAndEvaluate(a))
+                bb = self.value_as_integer(self.parseAndEvaluate(b))
                 if aa < bb and ss > 0:
                     return True, aa, ss, bb + 1, template
             except:
@@ -2419,14 +2557,14 @@ class DumperBase():
             self.putField('numchild', numchild)
 
     def handleLocals(self, variables):
-        #DumperBase.warn('VARIABLES: %s' % variables)
-        #with self.timer('locals'):
+        #self.warn('VARIABLES: %s' % variables)
         shadowed = {}
         for value in variables:
             if value.name == 'argv':
                 if value.type.code == TypeCode.Pointer:
-                    if value.type.ltarget.code == TypeCode.Pointer:
-                        if value.type.ltarget.ltarget.name == 'char':
+                    target = value.type.target()
+                    if target.code == TypeCode.Pointer:
+                        if target.target().name == 'char':
                             self.putSpecialArgv(value)
                             continue
 
@@ -2455,7 +2593,7 @@ class DumperBase():
     def handleWatch(self, origexp, exp, iname):
         exp = str(exp).strip()
         escapedExp = self.hexencode(exp)
-        #DumperBase.warn('HANDLING WATCH %s -> %s, INAME: "%s"' % (origexp, exp, iname))
+        #self.warn('HANDLING WATCH %s -> %s, INAME: "%s"' % (origexp, exp, iname))
 
         # Grouped items separated by semicolon.
         if exp.find(';') >= 0:
@@ -2475,7 +2613,7 @@ class DumperBase():
         # Special array index: e.g a[1..199] or a[1.(3).199] for stride 3.
         isRange, begin, step, end, template = self.parseRange(exp)
         if isRange:
-            #DumperBase.warn('RANGE: %s %s %s in %s' % (begin, step, end, template))
+            #self.warn('RANGE: %s %s %s in %s' % (begin, step, end, template))
             r = range(begin, end, step)
             n = len(r)
             with TopLevelItem(self, iname):
@@ -2714,7 +2852,7 @@ class DumperBase():
         self.doContinue()
 
     def doInsertInterpreterBreakpoint(self, args, wasPending):
-        #DumperBase.warn('DO INSERT INTERPRETER BREAKPOINT, WAS PENDING: %s' % wasPending)
+        #self.warn('DO INSERT INTERPRETER BREAKPOINT, WAS PENDING: %s' % wasPending)
         # Will fail if the service is not yet up and running.
         response = self.sendInterpreterRequest('setbreakpoint', args)
         bp = None if response is None else response.get('breakpoint', None)
@@ -2749,14 +2887,6 @@ class DumperBase():
     def extractInterpreterStack(self):
         return self.sendInterpreterRequest('backtrace', {'limit': 10})
 
-    def isInt(self, thing):
-        if isinstance(thing, int):
-            return True
-        if sys.version_info[0] == 2:
-            if isinstance(thing, long):
-                return True
-        return False
-
     def putItems(self, count, generator, maxNumChild=10000):
         self.putItemCount(count)
         if self.isExpanded():
@@ -2765,131 +2895,124 @@ class DumperBase():
                     self.putSubItem(i, val)
 
     def putItem(self, value):
-        #with self.timer('putItem'):
-        self.putItemX(value)
-
-    def putItemX(self, value):
-        #DumperBase.warn('PUT ITEM: %s' % value.stringify())
-
-        typeobj = value.type  # unqualified()
-        typeName = typeobj.name
-
-        self.addToCache(typeobj)  # Fill type cache
+        #self.warn('PUT ITEM: %s' % value.stringify())
+        #self.dump_location()
+        #self.addToCache(typeobj)  # Fill type cache
 
         if not value.lIsInScope:
             self.putSpecialValue('optimizedout')
-            #self.putType(typeobj)
-            #self.putSpecialValue('outofscope')
             self.putNumChild(0)
             return
 
         if not isinstance(value, self.Value):
             raise RuntimeError('WRONG TYPE IN putItem: %s' % type(self.Value))
 
+        typeid = value.typeid
+        typecode = self.type_code(typeid)
+        typename = self.type_name(typeid)
+
         # Try on possibly typedefed type first.
-        if self.tryPutPrettyItem(typeName, value):
-            if typeobj.code == TypeCode.Pointer:
+        if self.tryPutPrettyItem(typename, value):
+            if typecode == TypeCode.Pointer:
                 self.putOriginalAddress(value.address())
             else:
                 self.putAddress(value.address())
             return
 
-        if typeobj.code == TypeCode.Typedef:
-            #DumperBase.warn('TYPEDEF VALUE: %s' % value.stringify())
+        if typecode == TypeCode.Typedef:
+            #self.warn('TYPEDEF VALUE: %s' % value.stringify())
             self.putItem(value.detypedef())
-            self.putBetterType(typeName)
+            self.putBetterType(typename)
             return
 
-        if typeobj.code == TypeCode.Pointer:
+        if typecode == TypeCode.Pointer:
             self.putFormattedPointer(value)
             if value.summary and self.useFancy:
                 self.putValue(self.hexencode(value.summary), 'utf8:1:0')
             return
 
         self.putAddress(value.address())
-        if value.lbitsize is not None:
-            self.putField('size', value.lbitsize // 8)
 
-        if typeobj.code == TypeCode.Function:
-            #DumperBase.warn('FUNCTION VALUE: %s' % value)
-            self.putType(typeobj)
-            self.putSymbolValue(value.pointer())
+        if typecode == TypeCode.Function:
+            #self.warn('FUNCTION VALUE: %s' % value)
+            self.putType(typeid)
+            self.putSymbolValue(self.value_as_address(value))
             self.putNumChild(0)
             return
 
-        if typeobj.code == TypeCode.Enum:
-            #DumperBase.warn('ENUM VALUE: %s' % value.stringify())
-            self.putType(typeobj.name)
+        if typecode == TypeCode.Enum:
+            #self.warn('ENUM VALUE: %s' % value.stringify())
+            self.putType(typename)
             self.putValue(value.display())
             self.putNumChild(0)
             return
 
-        if typeobj.code == TypeCode.Array:
-            #DumperBase.warn('ARRAY VALUE: %s' % value)
+        if typecode == TypeCode.Array:
+            #self.warn('ARRAY VALUE: %s' % value)
             self.putCStyleArray(value)
             return
 
-        if typeobj.code == TypeCode.Bitfield:
-            #DumperBase.warn('BITFIELD VALUE: %s %d %s' % (value.name, value.lvalue, typeName))
+        if typecode == TypeCode.Bitfield:
+            #self.warn('BITFIELD VALUE: %s %d %s' % (value.name, value.lvalue, typename))
             self.putNumChild(0)
-            dd = typeobj.ltarget.tdata.enumDisplay
-            self.putValue(str(value.lvalue) if dd is None else dd(
-                value.lvalue, value.laddress, '%d'))
-            self.putType(typeName)
+            #dd = typeobj.target().enumDisplay
+            #self.putValue(str(value.lvalue) if dd is None else dd(
+            #    value.lvalue, value.laddress, '%d'))
+            self.putValue(self.value_as_integer(value))
+            self.putType(typename)
             return
 
-        if typeobj.code == TypeCode.Integral:
-            #DumperBase.warn('INTEGER: %s %s' % (value.name, value))
-            val = value.value()
+        if typecode == TypeCode.Integral:
+            #self.warn('INTEGER: %s %s' % (value.name, value))
             self.putNumChild(0)
-            self.putValue(val)
-            self.putType(typeName)
+            self.putValue(self.value_as_integer(value))
+            self.putType(typename)
             return
 
-        if typeobj.code == TypeCode.Float:
-            #DumperBase.warn('FLOAT VALUE: %s' % value)
+        if typecode == TypeCode.Float:
+            #self.warn('FLOAT VALUE: %s' % value)
             self.putValue(value.value())
             self.putNumChild(0)
-            self.putType(typeobj.name)
+            self.putType(typename)
             return
 
-        if typeobj.code in (TypeCode.Reference, TypeCode.RValueReference):
-            #DumperBase.warn('REFERENCE VALUE: %s' % value)
+        if typecode in (TypeCode.Reference, TypeCode.RValueReference):
+            #self.warn('REFERENCE VALUE: %s' % value)
             val = value.dereference()
             if val.laddress != 0:
                 self.putItem(val)
             else:
                 self.putSpecialValue('nullreference')
-            self.putBetterType(typeName)
+            self.putBetterType(typename)
             return
 
-        if typeobj.code == TypeCode.Complex:
-            self.putType(typeobj)
+        if typecode == TypeCode.Complex:
+            self.putType(typeid)
             self.putValue(value.display())
             self.putNumChild(0)
             return
 
-        if typeobj.code == TypeCode.FortranString:
+        if typecode == TypeCode.FortranString:
             self.putValue(self.hexencode(value.data()), 'latin1')
             self.putNumChild(0)
-            self.putType(typeobj)
+            self.putType(typeid)
 
-        if typeName.endswith('[]'):
+        if typename.endswith('[]'):
             # D arrays, gdc compiled.
             n = value['length']
             base = value['ptr']
-            self.putType(typeName)
+            self.putType(typename)
             self.putItemCount(n)
             if self.isExpanded():
-                self.putArrayData(base.pointer(), n, base.type.target())
+                self.putArrayData(self.value_as_address(base), n, base.type.target())
             return
 
-        #DumperBase.warn('SOME VALUE: %s' % value)
-        #DumperBase.warn('GENERIC STRUCT: %s' % typeobj)
-        #DumperBase.warn('INAME: %s ' % self.currentIName)
-        #DumperBase.warn('INAMES: %s ' % self.expandedINames)
-        #DumperBase.warn('EXPANDED: %s ' % (self.currentIName in self.expandedINames))
-        self.putType(typeName)
+        #self.warn('SOME VALUE: %s' % value)
+        #self.warn('GENERIC STRUCT: %s' % typeid)
+        #self.warn('INAME: %s ' % self.currentIName)
+        #self.warn('INAMES: %s ' % self.expandedINames)
+        #self.warn('EXPANDED: %s ' % (self.currentIName in self.expandedINames))
+        self.putType(typename)
 
         if value.summary is not None and self.useFancy:
             self.putValue(self.hexencode(value.summary), 'utf8:1:0')
@@ -2898,7 +3021,7 @@ class DumperBase():
 
         self.putExpandable()
         self.putEmptyValue()
-        #DumperBase.warn('STRUCT GUTS: %s  ADDRESS: 0x%x ' % (value.name, value.address()))
+        #self.warn('STRUCT GUTS: %s  ADDRESS: 0x%x ' % (value.name, value.address()))
         if self.showQObjectNames:
             #with self.timer(self.currentIName):
             self.putQObjectNameValue(value)
@@ -2911,8 +3034,8 @@ class DumperBase():
                     self.tryPutQObjectGuts(value)
 
     def symbolAddress(self, symbolName):
-        res = self.parseAndEvaluate('(size_t)&' + symbolName)
-        return None if res is None else res.pointer()
+        res = self.parseAndEvaluate('(void *)&' + symbolName)
+        return None if res is None else self.value_as_address(res)
 
     def qtHookDataSymbolName(self):
         return 'qtHookData'
@@ -2922,7 +3045,7 @@ class DumperBase():
         if addr:
             # Only available with Qt 5.3+
             (hookVersion, x, x, x, x, x, tiVersion) = self.split('ppppppp', addr)
-            #DumperBase.warn('HOOK: %s TI: %s' % (hookVersion, tiVersion))
+            #self.warn('HOOK: %s TI: %s' % (hookVersion, tiVersion))
             if hookVersion >= 3:
                 self.qtTypeInfoVersion = lambda: tiVersion
                 return tiVersion
@@ -2954,16 +3077,15 @@ class DumperBase():
             #self._stack = inspect.stack()
             self.dumper = dumper
             self.name = None
-            self._type = None
+            self.typeid = None
+            self.code = None
+            self.size = None
             self.ldata = None        # Target address in case of references and pointers.
             self.laddress = None     # Own address.
             self.lvalue = None
             self.lIsInScope = True
             self.ldisplay = None
             self.summary = None      # Always hexencoded UTF-8.
-            self.lbitpos = None
-            self.lbitsize = None
-            self.targetValue = None  # For references.
             self.isBaseClass = None
             self.nativeValue = None
             self.autoDerefCount = 0
@@ -2972,49 +3094,47 @@ class DumperBase():
             val = self.dumper.Value(self.dumper)
             val.dumper = self.dumper
             val.name = self.name
-            val._type = self._type
+            val.typeid = self.typeid
+            val.code = self.code = None
+            val.size = self.size
             val.ldata = self.ldata
             val.laddress = self.laddress
+            val.lvalue = self.lvalue
             val.lIsInScope = self.lIsInScope
             val.ldisplay = self.ldisplay
             val.summary = self.summary
-            val.lbitpos = self.lbitpos
-            val.lbitsize = self.lbitsize
-            val.targetValue = self.targetValue
             val.nativeValue = self.nativeValue
             return val
 
         @property
         def type(self):
-            if self._type is None and self.nativeValue is not None:
-                self._type = self.dumper.nativeValueType(self.nativeValue)
-            return self._type
+            return self.dumper.Type(self.dumper, self.typeid)
 
         def check(self):
-            if self.laddress is not None and not self.dumper.isInt(self.laddress):
-                raise RuntimeError('INCONSISTENT ADDRESS: %s' % type(self.laddress))
-            if self.type is not None and not isinstance(self.type, self.dumper.Type):
-                raise RuntimeError('INCONSISTENT TYPE: %s' % type(self.type))
+            #if self.typeid is not None and not isinstance(self.typeid, int):
+            #    raise RuntimeError('INCONSISTENT TYPE: %s' % type(self.typeid))
+            #if self.laddress is not None and not isinstance(self.laddress, int):
+            #    raise RuntimeError('INCONSISTENT ADDRESS: %s' % type(self.laddress))
+            pass
 
         def __str__(self):
             #raise RuntimeError('Not implemented')
             return self.stringify()
 
         def __int__(self):
-            return self.integer()
+            return self.dumper.value_as_integer(self)
 
         def stringify(self):
             addr = 'None' if self.laddress is None else ('0x%x' % self.laddress)
-            return "Value(name='%s',type=%s,bsize=%s,bpos=%s,data=%s,address=%s)" \
-                % (self.name, self.type.name, self.lbitsize, self.lbitpos,
-                   self.dumper.hexencode(self.ldata), addr)
+            if isinstance(self.ldata, int):
+                data = str(self.ldata)
+            else:
+                data = self.dumper.hexencode(self.ldata)
+            return "Value(name='%s',typeid=%s, type=%s,data=%s,address=%s)" \
+                % (self.name, self.typeid, self.type.name, data, addr)
 
         def displayEnum(self, form='%d', bitsize=None):
-            intval = self.integer(bitsize)
-            dd = self.type.tdata.enumDisplay
-            if dd is None:
-                return str(intval)
-            return dd(intval, self.laddress, form)
+            return self.dumper.value_display_enum(self, form, bitsize)
 
         def display(self):
             if self.ldisplay is not None:
@@ -3023,451 +3143,70 @@ class DumperBase():
             if simple is not None:
                 return str(simple)
             #if self.ldata is not None:
-            #    if sys.version_info[0] == 2 and isinstance(self.ldata, buffer):
-            #        return bytes(self.ldata).encode('hex')
             #    return self.ldata.encode('hex')
             if self.laddress is not None:
                 return 'value of type %s at address 0x%x' % (self.type.name, self.laddress)
             return '<unknown data>'
 
         def pointer(self):
-            if self.type.code == TypeCode.Typedef:
-                return self.detypedef().pointer()
-            return self.extractInteger(self.dumper.ptrSize() * 8, True)
-
-        def integer(self, bitsize=None):
-            if self.type.code == TypeCode.Typedef:
-                return self.detypedef().integer()
-            elif isinstance(self.lvalue, int):
-                return self.lvalue
-            # Could be something like 'short unsigned int'
-            unsigned = self.type.name == 'unsigned' \
-                or self.type.name.startswith('unsigned ') \
-                or self.type.name.find(' unsigned ') != -1
-            if bitsize is None:
-                bitsize = self.type.lbitsize
-            return self.extractInteger(bitsize, unsigned)
+            return self.dumper.value_as_address(self)
+
+        def as_address(self):
+            return self.dumper.value_as_address(self)
+
+        def integer(self):
+            return self.dumper.value_as_integer(self)
 
         def floatingPoint(self):
-            if self.nativeValue is not None and not self.dumper.isCdb:
-                return str(self.nativeValue)
-            if self.type.code == TypeCode.Typedef:
-                return self.detypedef().floatingPoint()
-            if self.type.size() == 8:
-                return self.extractSomething('d', 64)
-            if self.type.size() == 4:
-                return self.extractSomething('f', 32)
-            # Fall back in case we don't have a nativeValue at hand.
-            # FIXME: This assumes Intel's 80bit extended floats. Which might
-            # be wrong.
-            l, h = self.split('QQ')
-            if True:  # 80 bit floats
-                sign = (h >> 15) & 1
-                exp = (h & 0x7fff)
-                fraction = l
-                bit63 = (l >> 63) & 1
-                #DumperBase.warn("SIGN: %s  EXP: %s  H: 0x%x L: 0x%x" % (sign, exp, h, l))
-                if exp == 0:
-                    if bit63 == 0:
-                        if l == 0:
-                            res = '-0' if sign else '0'
-                        else:
-                            res = (-1)**sign * l * 2**(-16382)  # subnormal
-                    else:
-                        res = 'pseudodenormal'
-                elif exp == 0x7fff:
-                    res = 'special'
-                else:
-                    res = (-1)**sign * l * 2**(exp - 16383 - 63)
-            else:  # 128 bits
-                sign = h >> 63
-                exp = (h >> 48) & 0x7fff
-                fraction = h & (2**48 - 1)
-                #DumperBase.warn("SIGN: %s  EXP: %s  FRAC: %s  H: 0x%x L: 0x%x" % (sign, exp, fraction, h, l))
-                if exp == 0:
-                    if fraction == 0:
-                        res = -0.0 if sign else 0.0
-                    else:
-                        res = (-1)**sign * fraction / 2**48 * 2**(-62)  # subnormal
-                elif exp == 0x7fff:
-                    res = ('-inf' if sign else 'inf') if fraction == 0 else 'nan'
-                else:
-                    res = (-1)**sign * (1 + fraction / 2**48) * 2**(exp - 63)
-            return res
+            return self.dumper.value_as_floating_point(self)
 
         def value(self):
-            if self.type is not None:
-                if self.type.code == TypeCode.Enum:
-                    return self.displayEnum()
-                if self.type.code == TypeCode.Typedef:
-                    return self.detypedef().value()
-                if self.type.code == TypeCode.Integral:
-                    return self.integer()
-                if self.type.code == TypeCode.Bitfield:
-                    return self.integer()
-                if self.type.code == TypeCode.Float:
-                    return self.floatingPoint()
-                if self.type.code == TypeCode.Pointer:
-                    return self.pointer()
-            return None
+            return self.dumper.value_display(self)
 
         def extractPointer(self):
-            return self.split('p')[0]
+            return self.dumper.value_extract_something(self, self.dumper.ptrSize())
 
         def hasMember(self, name):
-            return self.findMemberByName(name) is not None
+            return self.dumper.value_member_by_name(self, name) is not None
 
-        def findMemberByName(self, name):
-            self.check()
-            if self.type.code == TypeCode.Typedef:
-                return self.findMemberByName(self.detypedef())
-            if self.type.code in (
-                    TypeCode.Pointer,
-                    TypeCode.Reference,
-                    TypeCode.RValueReference):
-                res = self.dereference().findMemberByName(name)
-                if res is not None:
-                    return res
-            if self.type.code == TypeCode.Struct:
-                #DumperBase.warn('SEARCHING FOR MEMBER: %s IN %s' % (name, self.type.name))
-                members = self.members(True)
-                #DumperBase.warn('MEMBERS: %s' % members)
-                for member in members:
-                    #DumperBase.warn('CHECKING FIELD %s' % member.name)
-                    if member.type.code == TypeCode.Typedef:
-                        member = member.detypedef()
-                    if member.name == name:
-                        return member
-                for member in members:
-                    if member.type.code == TypeCode.Typedef:
-                        member = member.detypedef()
-                    if member.name == name:  # Could be base class.
-                        return member
-                    if member.type.code == TypeCode.Struct:
-                        res = member.findMemberByName(name)
-                        if res is not None:
-                            return res
-            return None
+        def __getitem__(self, indexish):
+            return self.dumper.value_member_by_indexish(self, indexish)
 
-        def __getitem__(self, index):
-            #DumperBase.warn('GET ITEM %s %s' % (self, index))
-            self.check()
-            if self.type.code == TypeCode.Typedef:
-                #DumperBase.warn('GET ITEM STRIP TYPEDEFS TO %s' % self.type.ltarget)
-                return self.cast(self.type.ltarget).__getitem__(index)
-            if isinstance(index, str):
-                if self.type.code == TypeCode.Pointer:
-                    #DumperBase.warn('GET ITEM %s DEREFERENCE TO %s' % (self, self.dereference()))
-                    return self.dereference().__getitem__(index)
-                res = self.findMemberByName(index)
-                if res is None:
-                    raise RuntimeError('No member named %s in type %s'
-                                       % (index, self.type.name))
-                return res
-            elif isinstance(index, self.dumper.Field):
-                field = index
-            elif self.dumper.isInt(index):
-                if self.type.code == TypeCode.Array:
-                    addr = self.laddress + int(index) * self.type.ltarget.size()
-                    return self.dumper.createValue(addr, self.type.ltarget)
-                if self.type.code == TypeCode.Pointer:
-                    addr = self.pointer() + int(index) * self.type.ltarget.size()
-                    return self.dumper.createValue(addr, self.type.ltarget)
-                return self.members(False)[index]
-            else:
-                raise RuntimeError('BAD INDEX TYPE %s' % type(index))
-            field.check()
-
-            #DumperBase.warn('EXTRACT FIELD: %s, BASE 0x%x' % (field, self.address()))
-            if self.type.code == TypeCode.Pointer:
-                #DumperBase.warn('IS TYPEDEFED POINTER!')
-                res = self.dereference()
-                #DumperBase.warn('WAS POINTER: %s' % res)
-
-            return field.extract(self)
-
-        def extractField(self, field):
-            if not isinstance(field, self.dumper.Field):
-                raise RuntimeError('BAD INDEX TYPE %s' % type(field))
-
-            if field.extractor is not None:
-                val = field.extractor(self)
-                if val is not None:
-                    #DumperBase.warn('EXTRACTOR SUCCEEDED: %s ' % val)
-                    return val
-
-            if self.type.code == TypeCode.Typedef:
-                return self.cast(self.type.ltarget).extractField(field)
-            if self.type.code in (TypeCode.Reference, TypeCode.RValueReference):
-                return self.dereference().extractField(field)
-            #DumperBase.warn('FIELD: %s ' % (field,))
-            val = self.dumper.Value(self.dumper)
-            val.name = field.name
-            val.isBaseClass = field.isBase
-            val._type = field.fieldType()
-
-            if field.isArtificial:
-                if self.laddress is not None:
-                    val.laddress = self.laddress
-                if self.ldata is not None:
-                    val.ldata = self.ldata
-                return val
-
-            fieldBitsize = field.bitsize
-            fieldSize = (fieldBitsize + 7) // 8
-            fieldBitpos = field.bitpos
-            fieldOffset = fieldBitpos // 8
-            fieldType = field.fieldType()
-
-            if fieldType.code == TypeCode.Bitfield:
-                fieldBitpos -= fieldOffset * 8
-                ldata = self.data()
-                data = 0
-                for i in range(fieldSize):
-                    data = data << 8
-                    if self.dumper.isBigEndian:
-                        lbyte = ldata[i]
-                    else:
-                        lbyte = ldata[fieldOffset + fieldSize - 1 - i]
-                    if isinstance(lbyte, (str, bytes)):
-                        data += ord(lbyte)
-                    else:
-                        data += lbyte
-                data = data >> fieldBitpos
-                data = data & ((1 << fieldBitsize) - 1)
-                val.lvalue = data
-                val.laddress = None
-                return val
-
-            if self.laddress is not None:
-                val.laddress = self.laddress + fieldOffset
-            elif self.ldata is not None:
-                val.ldata = self.ldata[fieldOffset:fieldOffset + fieldSize]
-            else:
-                self.dumper.check(False)
-
-            if fieldType.code in (TypeCode.Reference, TypeCode.RValueReference):
-                if val.laddress is not None:
-                    val = self.dumper.createReferenceValue(val.laddress, fieldType.ltarget)
-                    val.name = field.name
-
-            #DumperBase.warn('GOT VAL %s FOR FIELD %s' % (val, field))
-            val.lbitsize = fieldBitsize
-            val.check()
-            return val
-
-        # This is the generic version for synthetic values.
-        # The native backends replace it in their fromNativeValue()
-        # implementations.
-        def members(self, includeBases):
-            #DumperBase.warn("LISTING MEMBERS OF %s" % self)
-            if self.type.code == TypeCode.Typedef:
-                return self.detypedef().members(includeBases)
-
-            tdata = self.type.tdata
-            #if isinstance(tdata.lfields, list):
-            #    return tdata.lfields
-
-            fields = []
-            if tdata.lfields is not None:
-                if isinstance(tdata.lfields, list):
-                    fields = tdata.lfields
-                else:
-                    fields = list(tdata.lfields(self))
-
-            #DumperBase.warn("FIELDS: %s" % fields)
-            res = []
-            for field in fields:
-                if isinstance(field, self.dumper.Value):
-                    #DumperBase.warn("USING VALUE DIRECTLY %s" % field.name)
-                    res.append(field)
-                    continue
-                if field.isBase and not includeBases:
-                    #DumperBase.warn("DROPPING BASE %s" % field.name)
-                    continue
-                res.append(self.extractField(field))
-            #DumperBase.warn("GOT MEMBERS: %s" % res)
-            return res
+        def members(self, include_bases):
+            return self.dumper.value_members(self, include_bases)
 
         def __add__(self, other):
-            self.check()
-            if self.dumper.isInt(other):
-                stripped = self.type.stripTypedefs()
-                if stripped.code == TypeCode.Pointer:
-                    address = self.pointer() + stripped.dereference().size() * other
-                    val = self.dumper.Value(self.dumper)
-                    val.laddress = None
-                    val.ldata = bytes(struct.pack(self.dumper.packCode + 'Q', address))
-                    val._type = self._type
-                    return val
-            raise RuntimeError('BAD DATA TO ADD TO: %s %s' % (self.type, other))
+            return self.dumper.value_plus_something(self, other)
 
         def __sub__(self, other):
-            self.check()
-            if self.type.name == other.type.name:
-                stripped = self.type.stripTypedefs()
-                if stripped.code == TypeCode.Pointer:
-                    return (self.pointer() - other.pointer()) // stripped.dereference().size()
-            raise RuntimeError('BAD DATA TO SUB TO: %s %s' % (self.type, other))
+            return self.dumper.value_minus_something(self, other)
 
         def dereference(self):
-            self.check()
-            if self.type.code == TypeCode.Typedef:
-                return self.detypedef().dereference()
-            val = self.dumper.Value(self.dumper)
-            if self.type.code in (TypeCode.Reference, TypeCode.RValueReference):
-                val.summary = self.summary
-                if self.nativeValue is None:
-                    val.laddress = self.pointer()
-                    if val.laddress is None and self.laddress is not None:
-                        val.laddress = self.laddress
-                    val._type = self.type.dereference()
-                    if self.dumper.useDynamicType:
-                        val._type = self.dumper.nativeDynamicType(val.laddress, val.type)
-                else:
-                    val = self.dumper.nativeValueDereferenceReference(self)
-            elif self.type.code == TypeCode.Pointer:
-                try:
-                    val = self.dumper.nativeValueDereferencePointer(self)
-                except:
-                    val.laddress = self.pointer()
-                    val._type = self.type.dereference()
-                    if self.dumper.useDynamicType:
-                        val._type = self.dumper.nativeDynamicType(val.laddress, val.type)
-            else:
-                raise RuntimeError("WRONG: %s" % self.type.code)
-            #DumperBase.warn("DEREFERENCING FROM: %s" % self)
-            #DumperBase.warn("DEREFERENCING TO: %s" % val)
-            #dynTypeName = val.type.dynamicTypeName(val.laddress)
-            #if dynTypeName is not None:
-            #    val._type = self.dumper.createType(dynTypeName)
-            return val
+            return self.dumper.value_dereference(self)
 
         def detypedef(self):
-            self.check()
-            if self.type.code != TypeCode.Typedef:
-                raise RuntimeError("WRONG")
-            val = self.copy()
-            val._type = self.type.ltarget
-            #DumperBase.warn("DETYPEDEF FROM: %s" % self)
-            #DumperBase.warn("DETYPEDEF TO: %s" % val)
-            return val
-
-        def extend(self, size):
-            if self.type.size() < size:
-                val = self.dumper.Value(self.dumper)
-                val.laddress = None
-                val.ldata = self.zeroExtend(self.ldata)
-                return val
-            if self.type.size() == size:
-                return self
-            raise RuntimeError('NOT IMPLEMENTED')
-
-        def zeroExtend(self, data, size):
-            ext = '\0' * (size - len(data))
-            if sys.version_info[0] == 3:
-                pad = bytes(ext, encoding='latin1')
-            else:
-                pad = bytes(ext)
-            return pad + data if self.dumper.isBigEndian else data + pad
+            return self.dumper.value_detypedef(self)
 
         def cast(self, typish):
-            self.check()
-            val = self.dumper.Value(self.dumper)
-            val.laddress = self.laddress
-            val.lbitsize = self.lbitsize
-            val.ldata = self.ldata
-            val._type = self.dumper.createType(typish)
-            return val
+            return self.dumper.value_cast(self, typish)
 
         def address(self):
             self.check()
             return self.laddress
 
-        def data(self, size=None):
-            self.check()
-            if self.ldata is not None:
-                if len(self.ldata) > 0:
-                    if size is None:
-                        return self.ldata
-                    if size == len(self.ldata):
-                        return self.ldata
-                    if size < len(self.ldata):
-                        return self.ldata[:size]
-                    #raise RuntimeError('ZERO-EXTENDING  DATA TO %s BYTES: %s' % (size, self))
-                    return self.zeroExtend(self.ldata, size)
-            if self.laddress is not None:
-                if size is None:
-                    size = self.type.size()
-                res = self.dumper.readRawMemory(self.laddress, size)
-                if len(res) > 0:
-                    return res
-                raise RuntimeError('CANNOT CONVERT ADDRESS TO BYTES: %s' % self)
-            raise RuntimeError('CANNOT CONVERT TO BYTES: %s' % self)
-
-        def extractInteger(self, bitsize, unsigned):
-            #with self.dumper.timer('extractInt'):
-            self.check()
-            if bitsize > 32:
-                size = 8
-                code = 'Q' if unsigned else 'q'
-            elif bitsize > 16:
-                size = 4
-                code = 'I' if unsigned else 'i'
-            elif bitsize > 8:
-                size = 2
-                code = 'H' if unsigned else 'h'
-            else:
-                size = 1
-                code = 'B' if unsigned else 'b'
-            rawBytes = self.data(size)
-            res = struct.unpack_from(self.dumper.packCode + code, rawBytes, 0)[0]
-            #DumperBase.warn('Extract: Code: %s Bytes: %s Bitsize: %s Size: %s'
-            #    % (self.dumper.packCode + code, self.dumper.hexencode(rawBytes), bitsize, size))
-            return res
-
-        def extractSomething(self, code, bitsize):
-            #with self.dumper.timer('extractSomething'):
-            self.check()
-            size = (bitsize + 7) >> 3
-            rawBytes = self.data(size)
-            res = struct.unpack_from(self.dumper.packCode + code, rawBytes, 0)[0]
-            return res
+        def data(self):
+            return self.dumper.value_data(self, self.dumper.type_size(self.typeid))
 
         def to(self, pattern):
             return self.split(pattern)[0]
 
         def split(self, pattern):
-            #with self.dumper.timer('split'):
-            #DumperBase.warn('EXTRACT STRUCT FROM: %s' % self.type)
-            (pp, size, fields) = self.dumper.describeStruct(pattern)
-            #DumperBase.warn('SIZE: %s ' % size)
-            result = struct.unpack_from(self.dumper.packCode + pp, self.data(size))
-
-            def structFixer(field, thing):
-                #DumperBase.warn('STRUCT MEMBER: %s' % type(thing))
-                if field.isStruct:
-                    #if field.type != field.fieldType():
-                    #    raise RuntimeError('DO NOT SIMPLIFY')
-                    #DumperBase.warn('FIELD POS: %s' % field.type.stringify())
-                    #DumperBase.warn('FIELD TYE: %s' % field.fieldType().stringify())
-                    res = self.dumper.createValue(thing, field.fieldType())
-                    #DumperBase.warn('RES TYPE: %s' % res.type)
-                    if self.laddress is not None:
-                        res.laddress = self.laddress + field.offset()
-                    return res
-                return thing
-            if len(fields) != len(result):
-                raise RuntimeError('STRUCT ERROR: %s %s' % (fields, result))
-            return tuple(map(structFixer, fields, result))
+            return self.dumper.value_split(self, pattern)
 
     def checkPointer(self, p, align=1):
-        ptr = p if self.isInt(p) else p.pointer()
+        ptr = p if isinstance(p, int) else p.pointer()
         self.readRawMemory(ptr, 1)
 
-    def type(self, typeId):
-        return self.typeData.get(typeId)
-
     def splitArrayType(self, type_name):
         #  "foo[2][3][4]" ->  ("foo", "[3][4]", 2)
         pos1 = len(type_name)
@@ -3481,249 +3220,171 @@ class DumperBase():
         item_count = type_name[pos1 + 1:pos2]
         return (type_name[0:pos1].strip(), type_name[pos2 + 1:].strip(), int(item_count))
 
-    def registerTypeAlias(self, existingTypeId, aliasId):
-        #DumperBase.warn('REGISTER ALIAS %s FOR %s' % (aliasId, existingTypeId))
-        self.typeData[aliasId] = self.typeData[existingTypeId]
-
-    class TypeData():
-        def __init__(self, dumper, type_id):
-            self.dumper = dumper
-            self.lfields = None  # None or Value -> list of member Values
-            self.lalignment = None  # Function returning alignment of this struct
-            self.lbitsize = None
-            self.ltarget = None  # Inner type for arrays
-            self.templateArguments = None
-            self.code = None
-            self.name = type_id
-            self.typeId = type_id
-            self.enumDisplay = None
-            self.moduleName = None
-            #DumperBase.warn('REGISTER TYPE: %s' % type_id)
-            dumper.typeData[type_id] = self
-
-        def copy(self):
-            tdata = self.dumper.TypeData(self.dumper, self.typeId)
-            tdata.dumper = self.dumper
-            tdata.lfields = self.lfields
-            tdata.lalignment = self.lalignment
-            tdata.lbitsize = self.lbitsize
-            tdata.ltarget = self.ltarget
-            tdata.templateArguments = self.templateArguments
-            tdata.code = self.code
-            tdata.name = self.name
-            tdata.typeId = self.typeId
-            tdata.enumDisplay = self.enumDisplay
-            tdata.moduleName = self.moduleName
-            return tdata
-
-        @property
-        def bitsize(self):
-            if callable(self.lbitsize):
-                self.lbitsize = self.lbitsize()
-            return self.lbitsize
+    def registerTypeAlias(self, existing_type_id, alias_id):
+        #self.warn('REGISTER ALIAS %s FOR %s' % (aliasId, existingTypeId))
+        self.type_alias[alias_id] = existing_type_id
+
+    def init_type_cache(self):
+        self.type_name_cache = {}
+        self.type_fields_cache = {}
+        self.type_alignment_cache = {}
+        self.type_bitsize_cache = {}
+        self.type_size_cache = {}
+        self.type_target_cache = {}
+        self.type_template_arguments_cache = {}
+        self.type_code_cache = {}
+        self.type_enum_display_cache = {}
+        self.type_module_name_cache = {}
+        self.type_nativetype_cache = {}
+        self.type_modulename_cache = {}
+        self.type_encoding_cache = {}
+        self.typeid_cache = {}   # internal typename -> id
+        self.typeid_current = 100
+        self.typeid_from_typekey = {}   # typename -> id
+
+    def dump_type_cache(self):
+        self.warn('NAME: %s' % self.type_name_cache)
+        self.warn('CODE: %s' % self.type_code_cache)
+        #self.warn('FIELDS: %s' % self.type_fields_cache)
+        self.warn('SIZE: %s' % self.type_size_cache)
+        self.warn('TARGS: %s' % self.type_template_arguments_cache)
+        self.warn('BITSIZE: %s' % self.type_bitsize_cache)
+        self.warn('TARGET: %s' % self.type_target_cache)
+        #self.warn('NATIVETYPE: %s' % self.type_nativetype_cache)
+
+    def dump_typeid(self, typeid):
+        self.warn('  NAME: %s' % self.type_name_cache.get(typeid, None))
+        self.warn('  CODE: %s' % self.type_code_cache.get(typeid, None))
+        #self.warn('  FIELDS: %s' % self.type_fields_cache.get(typeid, None))
+        self.warn('  SIZE: %s' % self.type_size_cache.get(typeid, None))
+        self.warn('  TARGS: %s' % self.type_template_arguments_cache.get(typeid, None))
+        self.warn('  BITSIZE: %s' % self.type_bitsize_cache.get(typeid, None))
+        self.warn('  TARGET: %s' % self.type_target_cache.get(typeid, None))
+        #self.warn('  NATIVETYPE: %s' % self.type_nativetype_cache.get(typeid, None))
+
+    def typeid_for_typish(self, typish):
+        if isinstance(typish, int):
+            return typish
+        if isinstance(typish, str):
+            return self.typeid_for_string(typish)
+        if isinstance(typish, self.Type):
+            return typish.typeid
+        self.warn('NO TYPE FOR TYPISH: %s' % str(typish))
+        return 0
+
+    def sanitize_type_name(self, typeid_str):
+        if not ' ' in  typeid_str:
+            # FIXME: This uses self.qtNamespace() too early.
+            #typeid_arr.append(self.qtNamespace())
+            return typeid_str.replace('@', '')
+        typeid_arr = []
+        last_char_was_space = False
+        for c in typeid_str:
+            if c == '@' in typeid_str:
+                # FIXME: This uses self.qtNamespace() too early.
+                #typeid_arr.append(self.qtNamespace())
+                pass
+            elif c == ' ':
+                last_char_was_space = True
+            elif c in '&*<>,':
+                last_char_was_space = False
+                typeid_arr.append(c)
+            else:
+                if last_char_was_space:
+                    typeid_arr.append(' ')
+                    last_char_was_space = False
+                typeid_arr.append(c)
+        #self.warn("SANITIZE: '%s' TO '%s'" % (typeid_str, ''.join(typeid_arr)))
+        return ''.join(typeid_arr)
+
+    def typeid_for_string(self, typeid_str, type_name=None):
+        #typeid = self.typeid_cache.get(typeid_str, None)
+        #if typeid is not None:
+        #    return typeid
+        sane_typeid_str = self.sanitize_type_name(typeid_str)
+        typeid = self.typeid_cache.get(sane_typeid_str, None)
+        if typeid is not None:
+            return typeid
+
+        self.typeid_current += 1
+        if type_name is None:
+            type_name = sane_typeid_str
+        typeid = self.typeid_current
+        self.typeid_cache[typeid_str] = typeid
+        self.typeid_cache[sane_typeid_str] = typeid
+        self.type_name_cache[typeid] = type_name
+        #if typeid == 103:
+        #self.warn("CREATED TYPE: %d %s" % (typeid, sane_typeid_str))
+        #if typeid == 135: self.dump_location()
+        return typeid
 
     class Type():
-        def __init__(self, dumper, typeId):
-            self.typeId = typeId.replace('@', dumper.qtNamespace())
+        __slots__ = ['dumper', 'typeid']
+        def __init__(self, dumper, typeid):
             self.dumper = dumper
-            self.initialized = False
+            self.typeid = typeid
 
         def __str__(self):
-            #return self.typeId
-            return self.stringify()
-
-        @property
-        def tdata(self):
-            if not self.initialized:
-                self.initialized = True
-                self.data = self.dumper.typeData.get(self.typeId, None)
-                if self.data is None:
-                    #DumperBase.warn('USING : %s' % self.typeId)
-                    self.dumper.lookupType(self.typeId)
-                    self.data = self.dumper.typeData.get(self.typeId)
-            return self.data
-
-        def setTdata(self, tdata):
-            self.initialized = True
-            self.data = tdata
+            return self.dumper.type_stringify(self.typeid)
 
         @property
         def name(self):
-            return self.typeId if self.tdata is None else self.tdata.name
+            return self.dumper.type_name(self.typeid)
 
         @property
         def code(self):
-            return self.tdata.code
+            return self.dumper.type_code(self.typeid)
 
-        @property
-        def lbitsize(self):
-            return self.tdata.bitsize
+        def bitsize(self):
+            return self.dumper.type_bitsize(self.typeid)
 
-        @property
-        def lbitpos(self):
-            return self.tdata.lbitpos
+        def size(self):
+            return self.dumper.type_size(self.typeid)
 
-        @property
-        def ltarget(self):
-            if isinstance(self.tdata.ltarget, str):
-                self.tdata.ltarget = self.dumper.createType(self.tdata.ltarget)
-            return self.tdata.ltarget
+        def target(self):
+            return self.dumper.Type(self.dumper, self.dumper.type_target(self.typeid))
 
         @property
         def targetName(self):
-            if self.tdata.ltarget is None:
+            target = self.target()
+            if target is None:
                 return ''
-            return self.tdata.ltarget if isinstance(self.tdata.ltarget, str) else self.tdata.ltarget.name
+            return target if isinstance(target, str) else target.name
 
         @property
         def moduleName(self):
-            if callable(self.tdata.moduleName):
-                self.tdata.moduleName = self.tdata.moduleName()
-            return self.tdata.moduleName
-
-        def stringify(self):
-            return 'Type(name="%s",bsize=%s,code=%s)' \
-                % (self.tdata.name, self.lbitsize, self.tdata.code)
+            return self.dumper.type_modulename_cache.get(self.typeid, None)
 
         def __getitem__(self, index):
-            if self.dumper.isInt(index):
-                return self.templateArgument(index)
+            if isinstance(index, int):
+                return self.dumper.type_template_argument(self.typeid, index)
             raise RuntimeError('CANNOT INDEX TYPE')
 
-        def dynamicTypeName(self, address):
-            if self.tdata.code != TypeCode.Struct:
-                return None
-            try:
-                vtbl = self.dumper.extractPointer(address)
-            except:
-                return None
-            #DumperBase.warn('VTBL: 0x%x' % vtbl)
-            if not self.dumper.couldBePointer(vtbl):
-                return None
-            return self.dumper.nativeDynamicTypeName(address, self)
-
-        def dynamicType(self, address):
-            # FIXME: That buys some performance at the cost of a fail
-            # of Gdb13393 dumper test.
-            #return self
-            #with self.dumper.timer('dynamicType %s 0x%s' % (self.name, address)):
-            dynTypeName = self.dynamicTypeName(address)
-            if dynTypeName is not None:
-                return self.dumper.createType(dynTypeName)
-            return self
-
         def check(self):
-            if self.tdata.name is None:
-                raise RuntimeError('TYPE WITHOUT NAME: %s' % self.typeId)
+            #if self.tdata.name is None:
+            #    raise RuntimeError('TYPE WITHOUT NAME: %s' % self.typeid)
+            pass
 
         def dereference(self):
-            if self.code == TypeCode.Typedef:
-                return self.ltarget.dereference()
-            self.check()
-            return self.ltarget
-
-        def unqualified(self):
-            return self
+            return self.dumper.Type(self.dumper, self.dumper.type_dereference(self.typeid))
 
         def templateArguments(self):
-            if self.tdata is None:
-                return self.dumper.listTemplateParameters(self.typeId)
-            return self.tdata.templateArguments()
-
-        def templateArgument(self, position):
-            #DumperBase.warn('TDATA: %s' % self.tdata)
-            #DumperBase.warn('ID: %s' % self.typeId)
-            if self.tdata is None or self.tdata.templateArguments is None:
-                # Native lookups didn't help. Happens for 'wrong' placement of 'const'
-                # etc. with LLDB. But not all is lost:
-                ta = self.dumper.listTemplateParameters(self.typeId)
-                #DumperBase.warn('MANUAL: %s' % ta)
-                res = ta[position]
-                #DumperBase.warn('RES: %s' % res.typeId)
-                return res
-            #DumperBase.warn('TA: %s %s' % (position, self.typeId))
-            #DumperBase.warn('ARGS: %s' % self.tdata.templateArguments())
-            return self.tdata.templateArguments()[position]
-
-        def simpleEncoding(self):
-            res = {
-                'bool': 'int:1',
-                'char': 'int:1',
-                'int8_t': 'int:1',
-                'qint8': 'int:1',
-                'signed char': 'int:1',
-                'char8_t': 'uint:1',
-                'unsigned char': 'uint:1',
-                'uint8_t': 'uint:1',
-                'quint8': 'uint:1',
-                'short': 'int:2',
-                'int16_t': 'int:2',
-                'qint16': 'int:2',
-                'unsigned short': 'uint:2',
-                'char16_t': 'uint:2',
-                'uint16_t': 'uint:2',
-                'quint16': 'uint:2',
-                'int': 'int:4',
-                'int32_t': 'int:4',
-                'qint32': 'int:4',
-                'unsigned int': 'uint:4',
-                'char32_t': 'uint:4',
-                'uint32_t': 'uint:4',
-                'quint32': 'uint:4',
-                'long long': 'int:8',
-                'int64_t': 'int:8',
-                'qint64': 'int:8',
-                'unsigned long long': 'uint:8',
-                'uint64_t': 'uint:8',
-                'quint64': 'uint:8',
-                'float': 'float:4',
-                'double': 'float:8',
-                'QChar': 'uint:2'
-            }.get(self.name, None)
-            return res
+            return self.dumper.type_template_arguments(self.typeid)
+
+        def templateArgument(self, index):
+            return self.dumper.type_template_argument(self.typeid, index)
 
         def isSimpleType(self):
             return self.code in (TypeCode.Integral, TypeCode.Float, TypeCode.Enum)
 
         def alignment(self):
-            if self.tdata.code == TypeCode.Typedef:
-                return self.ltarget.alignment()
-            if self.tdata.code in (TypeCode.Integral, TypeCode.Float, TypeCode.Enum):
-                if self.tdata.name in ('double', 'long long', 'unsigned long long'):
-                    # Crude approximation.
-                    return 8 if self.dumper.isWindowsTarget() else self.dumper.ptrSize()
-                return self.size()
-            if self.tdata.code in (TypeCode.Pointer, TypeCode.Reference, TypeCode.RValueReference):
-                return self.dumper.ptrSize()
-            if self.tdata.lalignment is not None:
-                #if isinstance(self.tdata.lalignment, function): # Does not work that way.
-                if hasattr(self.tdata.lalignment, '__call__'):
-                    return self.tdata.lalignment()
-                return self.tdata.lalignment
-            return 1
+            return self.dumper.type_alignment(self.typeid)
 
         def pointer(self):
-            return self.dumper.createPointerType(self)
-
-        def target(self):
-            return self.ltarget
+            return self.dumper.Type(self.dumper, self.dumper.create_pointer_typeid(self.typeid))
 
         def stripTypedefs(self):
-            if isinstance(self, self.dumper.Type) and self.code != TypeCode.Typedef:
-                #DumperBase.warn('NO TYPEDEF: %s' % self)
-                return self
-            return self.ltarget
-
-        def size(self):
-            bs = self.lbitsize
-            if bs % 8 != 0:
-                DumperBase.warn('ODD SIZE: %s' % self)
-            return (7 + bs) >> 3
-
-        def bitsize(self):
-            if self.lbitsize is not None:
-                return self.lbitsize
-            raise RuntimeError('DONT KNOW SIZE: %s' % self)
+            return self.dumper.Type(self.dumper, self.dumper.type_target(self.typeid))
 
         def isMovableType(self):
             if self.code in (TypeCode.Pointer, TypeCode.Integral, TypeCode.Float):
@@ -3748,264 +3409,195 @@ class DumperBase():
                 return self.dumper.qtVersion() >= 0x050600
             return False
 
-    class Field(collections.namedtuple('Field',
-                                       ['dumper', 'name', 'type', 'bitsize', 'bitpos',
-                                        'extractor', 'isBase', 'isStruct', 'isArtificial'])):
+    class Field:
+        __slots__ = ['name', 'typeid', 'bitsize', 'bitpos', 'is_struct', 'is_artificial', 'is_base_class']
 
-        def __new__(cls, dumper, name=None, type=None, bitsize=None, bitpos=None,
-                    extractor=None, isBase=False, isStruct=False, isArtificial=False):
-            return super(DumperBase.Field, cls).__new__(
-                cls, dumper, name, type, bitsize, bitpos,
-                extractor, isBase, isStruct, isArtificial)
+        def __init__(self, name=None, typeid=None, bitsize=None, bitpos=None,
+                    extractor=None, is_struct=False, is_artificial=False, is_base_class=False):
+            self.name = name
+            self.typeid = typeid
+            self.bitsize = bitsize
+            self.bitpos = bitpos
+            self.is_struct = is_struct
+            self.is_base_class = is_base_class
 
-        __slots__ = ()
-
-        def __str__(self):
-            return self.stringify()
-
-        def stringify(self):
-            #return 'Field(name="%s")' % self.name
-            typename = None if self.type is None else self.type.stringify()
-            return 'Field(name="%s",type=%s,bitpos=%s,bitsize=%s)' \
-                % (self.name, typename, self.bitpos, self.bitsize)
-
-        def check(self):
-            pass
-
-        def size(self):
-            return self.bitsize() // 8
-
-        def offset(self):
-            return self.bitpos // 8
-
-        def fieldType(self):
-            if self.type is not None:
-                return self.type
-            raise RuntimeError('CANT GET FIELD TYPE FOR %s' % self)
-            return None
 
     def ptrCode(self):
         return 'I' if self.ptrSize() == 4 else 'Q'
 
-    def toPointerData(self, address):
-        if not self.isInt(address):
-            raise RuntimeError('wrong')
-        return bytes(struct.pack(self.packCode + self.ptrCode(), address))
-
     def fromPointerData(self, bytes_value):
         return struct.unpack(self.packCode + self.ptrCode(), bytes_value)
 
-    def createPointerValue(self, targetAddress, targetTypish):
-        if not isinstance(targetTypish, self.Type) and not isinstance(targetTypish, str):
-            raise RuntimeError('Expected type in createPointerValue(), got %s'
-                               % type(targetTypish))
-        if not self.isInt(targetAddress):
+    def createPointerValue(self, target_address, target_typish):
+        if not isinstance(target_address, int):
             raise RuntimeError('Expected integral address value in createPointerValue(), got %s'
-                               % type(targetTypish))
+                               % type(target_typish))
         val = self.Value(self)
-        val.ldata = self.toPointerData(targetAddress)
-        targetType = self.createType(targetTypish)
-        if self.useDynamicType:
-            targetType = targetType.dynamicType(targetAddress)
-        val._type = self.createPointerType(targetType)
+        val.ldata = target_address
+        val.typeid = self.create_pointer_typeid(self.create_typeid(target_typish))
         return val
-
-    def createReferenceValue(self, targetAddress, targetType):
-        if not isinstance(targetType, self.Type):
-            raise RuntimeError('Expected type in createReferenceValue(), got %s'
-                               % type(targetType))
-        if not self.isInt(targetAddress):
-            raise RuntimeError('Expected integral address value in createReferenceValue(), got %s'
-                               % type(targetType))
-        val = self.Value(self)
-        val.ldata = self.toPointerData(targetAddress)
-        if self.useDynamicType:
-            targetType = targetType.dynamicType(targetAddress)
-        val._type = self.createReferenceType(targetType)
-        return val
-
-    def createPointerType(self, targetType):
-        if not isinstance(targetType, (str, self.Type)):
-            raise RuntimeError('Expected type or str in createPointerType(), got %s'
-                               % type(targetType))
-        typeId = (targetType if isinstance(targetType, str) else targetType.typeId) + ' *'
-        tdata = self.TypeData(self, typeId)
-        tdata.name = (targetType if isinstance(targetType, str) else targetType.name) + '*'
-        tdata.lbitsize = 8 * self.ptrSize()
-        tdata.code = TypeCode.Pointer
-        tdata.ltarget = targetType
-        return self.Type(self, typeId)
-
-    def createReferenceType(self, targetType):
-        if not isinstance(targetType, self.Type):
-            raise RuntimeError('Expected type in createReferenceType(), got %s'
-                               % type(targetType))
-        typeId = targetType.typeId + ' &'
-        tdata = self.TypeData(self, typeId)
-        tdata.name = targetType.name + ' &'
-        tdata.code = TypeCode.Reference
-        tdata.ltarget = targetType
-        tdata.lbitsize = 8 * self.ptrSize()  # Needed for Gdb13393 test.
-        #tdata.lbitsize = None
-        return self.Type(self, typeId)
-
-    def createRValueReferenceType(self, targetType):
-        if not isinstance(targetType, self.Type):
-            raise RuntimeError('Expected type in createRValueReferenceType(), got %s'
-                               % type(targetType))
-        typeId = targetType.typeId + ' &&'
-        tdata = self.TypeData(self, typeId)
-        tdata.name = targetType.name + ' &&'
-        tdata.code = TypeCode.RValueReference
-        tdata.ltarget = targetType
-        tdata.lbitsize = None
-        return self.Type(self, typeId)
-
-    def createArrayType(self, targetType, count):
-        if not isinstance(targetType, self.Type):
-            raise RuntimeError('Expected type in createArrayType(), got %s'
-                               % type(targetType))
-        targetTypeId = targetType.typeId
-
-        if targetTypeId.endswith(']'):
-            (prefix, suffix, inner_count) = self.splitArrayType(targetTypeId)
-            type_id = '%s[%d][%d]%s' % (prefix, count, inner_count, suffix)
-            type_name = type_id
+        #target_typeid = self.create_typeid(target_typish)
+        #if self.useDynamicType:
+        #    target_typeid = self.dynamic_typeid_at_address(target_typeid, target_address)
+        #val.typeid = self.create_pointer_typeid(target_typeid)
+        #return val
+
+    def createPointerType(self, target_typish):
+        typeid = self.create_pointer_typeid(self.typeid_for_typish(target_typish))
+        return self.Type(self, typeid)
+
+    def create_pointer_typeid(self, target_typeid):
+        name = self.type_name(target_typeid) + ' *'
+        typeid = self.typeid_for_string(name)
+        self.type_size_cache[typeid] = self.ptrSize()
+        self.type_alignment_cache[typeid] = self.ptrSize()
+        self.type_code_cache[typeid] = TypeCode.Pointer
+        self.type_target_cache[typeid] = target_typeid
+        return typeid
+
+    def create_reference_typeid(self, target_typeid):
+        type_name = self.type_name_cache[target_typeid] + ' &'
+        typeid = self.typeid_for_string(type_name)
+        self.type_code_cache[typeid] = TypeCode.Reference
+        self.type_target_cache[typeid] = target_typeid
+        #self.type_size_cache[typeid] = self.ptrSize()  # Needed for Gdb13393 test.
+        return typeid
+
+    def create_rvalue_reference_typeid(self, target_typeid):
+        type_name = self.type_name_cache[target_typeid] + ' &&'
+        typeid = self.typeid_for_string(type_name)
+        self.type_code_cache[typeid] = TypeCode.RValueReference
+        self.type_target_cache[typeid] = target_typeid
+        return typeid
+
+    def create_array_typeid(self, target_typeid, count):
+        target_type_name = self.type_name(target_typeid)
+        if target_type_name.endswith(']'):
+            (prefix, suffix, inner_count) = self.splitArrayType(target_type_name)
+            type_name = '%s[%d][%d]%s' % (prefix, count, inner_count, suffix)
         else:
-            type_id = '%s[%d]' % (targetTypeId, count)
-            type_name = '%s[%d]' % (targetType.name, count)
-
-        tdata = self.TypeData(self, type_id)
-        tdata.name = type_name
-        tdata.code = TypeCode.Array
-        tdata.ltarget = targetType
-        tdata.lbitsize = targetType.lbitsize * count
-        return self.Type(self, type_id)
-
-    def createBitfieldType(self, targetType, bitsize):
-        if not isinstance(targetType, self.Type):
-            raise RuntimeError('Expected type in createBitfieldType(), got %s'
-                               % type(targetType))
-        typeId = '%s:%d' % (targetType.typeId, bitsize)
-        tdata = self.TypeData(self, typeId)
-        tdata.name = '%s : %d' % (targetType.typeId, bitsize)
-        tdata.code = TypeCode.Bitfield
-        tdata.ltarget = targetType
-        tdata.lbitsize = bitsize
-        return self.Type(self, typeId)
-
-    def createTypedefedType(self, targetType, typeName, typeId=None):
-        if typeId is None:
-            typeId = typeName
-        if not isinstance(targetType, self.Type):
-            raise RuntimeError('Expected type in createTypedefType(), got %s'
-                               % type(targetType))
+            type_name = '%s[%d]' % (target_type_name, count)
+        typeid = self.typeid_for_string(type_name)
+        self.type_code_cache[typeid] = TypeCode.Array
+        self.type_target_cache[typeid] = target_typeid
+        self.type_size_cache[typeid] = self.type_size(target_typeid) * count
+        self.type_alignment_cache[typeid] = self.type_alignment_cache.get(target_typeid, None)
+        return typeid
+
+    def create_bitfield_typeid(self, target_typeid, bitsize):
+        target_typename = self.type_name(target_typeid)
+        typeid = self.typeid_for_string('%s:%d' % (target_typename, bitsize))
+        self.type_name_cache[typeid] = '%s : %d' % (target_typename, bitsize)
+        self.type_code_cache[typeid] = TypeCode.Bitfield
+        self.type_target_cache[typeid] = target_typeid
+        self.type_bitsize_cache[typeid] = bitsize
+        return typeid
+
+    def create_typedefed_typeid(self, target_typeid, type_name, type_key):
+        typeid = self.typeid_for_string(type_key, type_name)
         # Happens for C-style struct in GDB: typedef { int x; } struct S1;
-        if targetType.typeId == typeId:
-            return targetType
-        tdata = self.TypeData(self, typeId)
-        tdata.name = typeName
-        tdata.code = TypeCode.Typedef
-        tdata.ltarget = targetType
-        tdata.lbitsize = targetType.lbitsize
-        #tdata.lfields = targetType.lfields
-        tdata.lbitsize = targetType.lbitsize
-        return self.Type(self, typeId)
-
-    def knownArrayTypeSize(self):
-        return 3 * self.ptrSize() if self.qtVersion() >= 0x060000 else self.ptrSize()
-
-    def knownTypeSize(self, typish):
-        if typish[0] == 'Q':
-            if typish.startswith('QList<') or typish.startswith('QVector<'):
-                return self.knownArrayTypeSize()
-            if typish == 'QObject':
-                return 2 * self.ptrSize()
-            if typish == 'QStandardItemData':
-                return 4 * self.ptrSize() if self.qtVersion() >= 0x060000 else 2 * self.ptrSize()
-            if typish == 'Qt::ItemDataRole':
-                return 4
-            if typish == 'QChar':
-                return 2
-        if typish in ('quint32', 'qint32'):
-            return 4
-        return None
+        if target_typeid == typeid:
+            return target_typeid
+        self.type_code_cache[typeid] = TypeCode.Typedef
+        self.type_target_cache[typeid] = target_typeid
+        self.type_size_cache[typeid] = self.type_size_cache.get(target_typeid, None)
+        return typeid
 
     def createType(self, typish, size=None):
-        if isinstance(typish, self.Type):
-            #typish.check()
-            if hasattr(typish, 'lbitsize') and typish.lbitsize is not None and typish.lbitsize > 0:
-                return typish
-            # Size 0 is sometimes reported by GDB but doesn't help at all.
-            # Force using the fallback:
-            typish = typish.name
+        return self.Type(self, self.create_typeid(typish, size))
 
+    def create_typeid(self, typish, size=None):
+        if isinstance(typish, int):
+            return typish
+        if isinstance(typish, self.Type):
+            return typish.typeid
         if isinstance(typish, str):
-            ns = self.qtNamespace()
-            typish = typish.replace('@', ns)
-            if typish.startswith(ns):
-                if size is None:
-                    size = self.knownTypeSize(typish[len(ns):])
-            else:
-                if size is None:
-                    size = self.knownTypeSize(typish)
-                if size is not None:
-                    typish = ns + typish
-
-            tdata = self.typeData.get(typish, None)
-            if tdata is not None:
-                if tdata.lbitsize is not None:
-                    if callable(tdata.lbitsize) or tdata.lbitsize > 0:
-                        return self.Type(self, typish)
-
-            knownType = self.lookupType(typish)
-            #DumperBase.warn('KNOWN: %s' % knownType)
-            if knownType is not None:
-                #DumperBase.warn('USE FROM NATIVE')
-                return knownType
-
-            #DumperBase.warn('FAKING: %s SIZE: %s' % (typish, size))
-            tdata = self.TypeData(self, typish)
-            tdata.templateArguments = lambda: self.listTemplateParameters(typish)
-            if size is not None:
-                tdata.lbitsize = 8 * size
-            if typish.endswith('*'):
-                tdata.code = TypeCode.Pointer
-                tdata.lbitsize = 8 * self.ptrSize()
-                tdata.ltarget = typish[:-1].strip()
-
-            typeobj = self.Type(self, tdata.typeId)
-            #DumperBase.warn('CREATE TYPE: %s' % typeobj.stringify())
-            typeobj.check()
-            return typeobj
+            return self.create_typeid_from_name(typish)
         raise RuntimeError('NEED TYPE, NOT %s' % type(typish))
 
-    def createValueFromAddressAndType(self, address, typish):
+    def cheap_typeid_from_name(self, typename_):
+        ns = self.qtNamespace()
+        typename = typename_.replace('@', ns)
+        return self.cheap_typeid_from_name_nons(typename)
+
+    def cheap_typeid_from_name_nons(self, typename):
+        if typename in self.typeid_cache:
+            return self.typeid_for_string(typename)
+
+        if typename.startswith('QList<') or typename.startswith('QVector<'):
+            typeid = self.typeid_for_string(typename)
+            if typeid:
+                size = 3 * self.ptrSize() if self.qtVersion() >= 0x060000 else self.ptrSize()
+                self.type_code_cache[typeid] = TypeCode.Struct
+                self.type_size_cache[typeid] = size
+                return typeid
+
+        if typename.endswith('*'):
+            inner_typeid = self.cheap_typeid_from_name_nons(typename[0:-1])
+            if inner_typeid != 0:
+                return self.create_pointer_typeid(inner_typeid)
+
+        return 0
+
+    def create_typeid_from_name(self, typename_, size=None):
+        ns = self.qtNamespace()
+        typename = typename_.replace('@', ns)
+
+        if typename in self.typeid_cache:
+            return self.typeid_for_string(typename)
+
+        # This triggers for boost::variant<int, std::string> due to the mis-encoding
+        # of the second template parameter.   [MARK_A]
+        knownType = self.lookupType(typename)
+        #self.warn('KNOWN: %s FOR %s' % (knownType, typename))
+        if knownType is not None:
+            #self.warn('USE FROM NATIVE')
+            #self.dump_location()
+            return knownType.typeid
+
+        #self.warn('FAKING: %s SIZE: %s' % (typename, size))
+        typeid = self.typeid_for_string(typename)
+        if size is not None:
+            self.type_size_cache[typeid] = size
+            self.type_code_cache[typeid] = TypeCode.Struct
+        if typename.endswith('*'):
+            self.type_code_cache[typeid] = TypeCode.Pointer
+            self.type_size_cache[typeid] = self.ptrSize()
+            self.type_target_cache[typeid] = self.typeid_for_string(typename[:-1].strip())
+
+        #self.dump_location()
+        #self.warn('CREATED TYPE: %s' % typeid)
+        return typeid
+
+    def createValueFromAddress(self, address, typish):
         val = self.Value(self)
-        val._type = self.createType(typish)
-        #DumperBase.warn('CREATING %s AT 0x%x' % (val.type.name, datish))
+        val.typeid = self.create_typeid(typish)
+        #self.warn('CREATING %s AT 0x%x' % (val.type.name, address))
         val.laddress = address
         if self.useDynamicType:
-            val._type = val.type.dynamicType(address)
+            val.typeid = self.dynamic_typeid_at_address(val.typeid, address)
+        return val
+
+    def createValueFromData(self, data, typish):
+        val = self.Value(self)
+        val.typeid = self.create_typeid(typish)
+        #self.warn('CREATING %s WITH DATA %s' % (val.type.name, self.hexencode(data)))
+        val.ldata = data
+        val.check()
         return val
 
     def createValue(self, datish, typish):
-        if self.isInt(datish):  # Used as address.
-            return self.createValueFromAddressAndType(datish, typish)
+        if isinstance(datish, int):  # Used as address.
+            return self.createValueFromAddress(datish, typish)
         if isinstance(datish, bytes):
-            val = self.Value(self)
-            val._type = self.createType(typish)
-            #DumperBase.warn('CREATING %s WITH DATA %s' % (val.type.name, self.hexencode(datish)))
-            val.ldata = datish
-            val.check()
-            return val
+            return self.createValueFromData(datish, typish)
         raise RuntimeError('EXPECTING ADDRESS OR BYTES, GOT %s' % type(datish))
 
     def createProxyValue(self, proxy_data, type_name):
-        tdata = self.TypeData(self, type_name)
-        tdata.code = TypeCode.Struct
+        typeid = self.typeid_for_string(type_name)
+        self.type_code_cache[typeid] = TypeCode.Struct
         val = self.Value(self)
-        val._type = self.Type(self, type_name)
+        val.typeid = typeid
         val.ldata = proxy_data
         return val
 
@@ -4013,109 +3605,667 @@ class DumperBase():
         def __init__(self, dumper):
             self.dumper = dumper
             self.pattern = ''
-            self.currentBitsize = 0
+            self.current_size = 0
             self.fields = []
             self.autoPadNext = False
             self.maxAlign = 1
 
-        def addField(self, fieldSize, fieldCode=None, fieldIsStruct=False,
-                     fieldName=None, fieldType=None, fieldAlign=1):
+        def add_field(self, field_size, field_code=None, field_is_struct=False,
+                      field_name=None, field_typeid=0, field_align=1):
+
+            if field_code is None:
+                field_code = '%ss' % field_size
 
-            if fieldType is not None:
-                fieldType = self.dumper.createType(fieldType)
-            if fieldSize is None and fieldType is not None:
-                fieldSize = fieldType.size()
-            if fieldCode is None:
-                fieldCode = '%ss' % fieldSize
+            #self.dumper.warn("FIELD SIZE: %s %s %s " % (field_name, field_size, str(field_align)))
 
             if self.autoPadNext:
-                self.currentBitsize = 8 * ((self.currentBitsize + 7) >> 3)  # Fill up byte.
-                padding = (fieldAlign - (self.currentBitsize >> 3)) % fieldAlign
-                #DumperBase.warn('AUTO PADDING AT %s BITS BY %s BYTES' % (self.currentBitsize, padding))
-                field = self.dumper.Field(self.dumper, bitpos=self.currentBitsize,
+                padding = (field_align - self.current_size) % field_align
+                #self.warn('AUTO PADDING AT %s BITS BY %s BYTES' % (self.current_size, padding))
+                field = self.dumper.Field(self.dumper, bitpos=self.current_size * 8,
                                           bitsize=padding * 8)
                 self.pattern += '%ds' % padding
-                self.currentBitsize += padding * 8
+                self.current_size += padding
                 self.fields.append(field)
                 self.autoPadNext = False
 
-            if fieldAlign > self.maxAlign:
-                self.maxAlign = fieldAlign
-            #DumperBase.warn("MAX ALIGN: %s" % self.maxAlign)
+            if field_align > self.maxAlign:
+                self.maxAlign = field_align
 
-            field = self.dumper.Field(dumper=self.dumper, name=fieldName, type=fieldType,
-                                      isStruct=fieldIsStruct, bitpos=self.currentBitsize,
-                                      bitsize=fieldSize * 8)
+            #self.warn("MAX ALIGN: %s" % self.maxAlign)
 
-            self.pattern += fieldCode
-            self.currentBitsize += fieldSize * 8
+            field = self.dumper.Field(name=field_name, typeid=field_typeid,
+                                      is_struct=field_is_struct, bitpos=self.current_size *8,
+                                      bitsize=field_size * 8)
+
+            self.pattern += field_code
+            self.current_size += field_size
             self.fields.append(field)
 
+    def describe_struct_member(self, typename):
+        typename = typename.replace('@', self.qtNamespace())
+
+        typeid = self.cheap_typeid_from_name_nons(typename)
+        if typeid:
+            size = self.type_size_cache.get(typeid, None)
+            if size is not None:
+                return size, typeid
+
+        typeobj = self.lookupType(typename)
+        self.warn("LOOKUP FIELD TYPE: %s TYPEOBJ: %s" % (typename, typeobj))
+        if typeobj is not None:
+            typeid = typeobj.typeid
+            size = self.type_size_cache.get(typeid, None)
+            if size is not None:
+                return size, typeid
+
+        self.warn("UNKNOWN EMBEDDED TYPE: %s" % typename)
+        return 0, 0
+
+    @functools.lru_cache(maxsize = None)
     def describeStruct(self, pattern):
-        if pattern in self.structPatternCache:
-            return self.structPatternCache[pattern]
         ptrSize = self.ptrSize()
         builder = self.StructBuilder(self)
         n = None
-        typeName = ''
+        typename = ''
         readingTypeName = False
+        #self.warn("PATTERN: %s" % pattern)
         for c in pattern:
+            #self.warn("PAT CODE: %s %s" % (c, str(n)))
             if readingTypeName:
                 if c == '}':
                     readingTypeName = False
-                    fieldType = self.createType(typeName)
-                    fieldAlign = fieldType.alignment()
-                    builder.addField(n, fieldIsStruct=True,
-                                     fieldType=fieldType, fieldAlign=fieldAlign)
-                    typeName = None
+                    n, field_typeid = self.describe_struct_member(typename)
+
+                    field_align = self.type_alignment(field_typeid)
+                    builder.add_field(n,
+                                      field_is_struct=True,
+                                      field_typeid=field_typeid,
+                                      field_align=field_align)
+                    typename = None
                     n = None
                 else:
-                    typeName += c
+                    typename += c
             elif c == 't':  # size_t
-                builder.addField(ptrSize, self.ptrCode(), fieldAlign=ptrSize)
+                builder.add_field(ptrSize, self.ptrCode(), field_align=ptrSize)
             elif c == 'p':  # Pointer as int
-                builder.addField(ptrSize, self.ptrCode(), fieldAlign=ptrSize)
+                builder.add_field(ptrSize, self.ptrCode(), field_align=ptrSize)
             elif c == 'P':  # Pointer as Value
-                builder.addField(ptrSize, '%ss' % ptrSize, fieldAlign=ptrSize)
+                builder.add_field(ptrSize, '%ss' % ptrSize, field_align=ptrSize)
             elif c in ('d'):
-                builder.addField(8, c, fieldAlign=ptrSize)  # fieldType = 'double' ?
+                builder.add_field(8, c, field_align=ptrSize)  # field_type = 'double' ?
             elif c in ('q', 'Q'):
-                builder.addField(8, c, fieldAlign=ptrSize)
+                builder.add_field(8, c, field_align=ptrSize)
             elif c in ('i', 'I', 'f'):
-                builder.addField(4, c, fieldAlign=4)
+                builder.add_field(4, c, field_align=4)
             elif c in ('h', 'H'):
-                builder.addField(2, c, fieldAlign=2)
+                builder.add_field(2, c, field_align=2)
             elif c in ('b', 'B', 'c'):
-                builder.addField(1, c, fieldAlign=1)
+                builder.add_field(1, c, field_align=1)
             elif c >= '0' and c <= '9':
                 if n is None:
                     n = ''
                 n += c
             elif c == 's':
-                builder.addField(int(n), fieldAlign=1)
+                builder.add_field(int(n), field_align=1)
                 n = None
             elif c == '{':
                 readingTypeName = True
-                typeName = ''
+                typename = ''
             elif c == '@':
                 if n is None:
                     # Automatic padding depending on next item
                     builder.autoPadNext = True
                 else:
                     # Explicit padding.
-                    builder.currentBitsize = 8 * ((builder.currentBitsize + 7) >> 3)
-                    padding = (int(n) - (builder.currentBitsize >> 3)) % int(n)
+                    padding = (int(n) - builder.current_size) % int(n)
                     field = self.Field(self)
                     builder.pattern += '%ds' % padding
-                    builder.currentBitsize += padding * 8
+                    builder.current_size += padding
                     builder.fields.append(field)
                     n = None
             else:
                 raise RuntimeError('UNKNOWN STRUCT CODE: %s' % c)
         pp = builder.pattern
-        size = (builder.currentBitsize + 7) >> 3
+        size = builder.current_size
         fields = builder.fields
         tailPad = (builder.maxAlign - size) % builder.maxAlign
         size += tailPad
-        self.structPatternCache[pattern] = (pp, size, fields)
+        #self.warn("FIELDS: %s" % ((pp, size, fields),))
         return (pp, size, fields)
+
+    def type_stringify(self, typeid):
+        return 'Type(id="%s",name="%s",bsize=%s,code=%s)'% (
+            str(typeid),
+            self.type_name_cache.get(typeid, '?'),
+            self.type_bitsize_cache.get(typeid, '?'),
+            self.type_code_cache.get(typeid, '?'))
+
+    def type_name(self, typeid):
+        name = self.type_name_cache.get(typeid, None)
+        if name is None:
+            self.dump_type_cache()
+            self.check_typeid(typeid)
+            raise RuntimeError('UNNAMED TYPE: %d' % typeid)
+        return name
+
+    def type_code(self, typeid):
+        # This does not seem to be needed for GDB and LLDB
+        if not typeid in self.type_code_cache:
+            typename = self.type_name_cache.get(typeid, None)
+            if typename is None:
+                raise RuntimeError('NAME/ID ERROR FOR %s' % typeid)
+            #self.warn("EMERGENCY LOOKUP: %s "  % typename)
+            typeobj = self.lookupType(typename)
+            if typeobj is None:
+                #self.warn("EMERGENCY LOOKUP FAILED: %s "  % typeid)
+                #self.dump_type_cache()
+                return TypeCode.Struct
+            #self.warn("EMERGENCY LOOKUP SUCCEEDED: %s "  % typeid)
+            typeid = typeobj.typeid
+        return self.type_code_cache[typeid]
+
+    def type_bitpos(self, typeid):
+        return self.type_bitpos_cache[typeid]
+
+    def type_target(self, typeid):
+        return self.type_target_cache.get(typeid, None)
+        targetid = self.type_target_cache.get(typeid, None)
+        if not targetid in self.type_code_cache:
+            typename = self.type_name_cache.get(targetid, None)
+            if typename is None:
+                raise RuntimeError('NAME/ID ERROR FOR TARGET %s' % targetid)
+            typeobj = self.lookupType(typename)
+            if typeobj is None:
+                #self.warn("EMERGENCY LOOKUP FAILED FOR %s %s "  % (typename, typeid))
+                #self.dump_type_cache()
+                return 0 # Void type id
+        return targetid
+
+    def type_template_arguments(self, typeid):
+        targs = []
+        #self.dump_type_cache()
+        #self.warn('TRY TEMPLATE ARGS FOR %s' % typeid)
+        for index in range(0, 100):
+            targ = self.type_template_argument(typeid, index)
+            #self.warn('INDEX %s %s' % (index, targ))
+            if targ is None:
+                break
+            targs.append(targ)
+        #self.warn('TARGS %s' % targs)
+        return targs
+
+    def nativeTemplateParameter(self, typeid, index, nativeType):
+        return None
+
+    def type_template_argument(self, typeid, index):
+        targ = self.type_template_arguments_cache.get((typeid, index), None)
+        if targ is not None:
+            return targ
+
+        native_type = self.type_nativetype_cache.get(typeid, None)
+        if native_type is not None:
+            targ = self.nativeTemplateParameter(typeid, index, native_type)
+            if targ is not None:
+                self.type_template_arguments_cache[(typeid, index)] = targ
+                return targ
+
+        # FIXME: The block below is apparently not needed anymore in the GDB
+        # and LLDB cases, so removing also doesn't bring performance. But it
+        # is at least potentially one source of type lookups.
+        #typename = self.type_name(typeid)
+        #self.dump_type_cache()
+        #self.warn('TEMPLATE ARGS FOR %s %s' % (typeid, typename))
+        #typeobj = self.lookupType(typename)
+        #if typeobj is not None:
+        #    #self.warn('  FOUNT NATIVE %s %s, %s' % (typeid, typeobj, native_type))
+        #    native_type = self.type_nativetype_cache.get(typeobj.typeid, None)
+        #    #targ = self.type_template_argument(typeobj.typeid, index)
+        #    targ = self.nativeTemplateParameter(typeobj.typeid, index, native_type)
+        #    if targ is not None:
+        #        self.type_template_arguments_cache[(typeid, index)] = targ
+        #        return targ
+
+        # Native lookups didn't help. Happens for 'wrong' placement of 'const'
+        # etc. with LLDB or template parameter packs with gcc in boost::variant
+        # 13.2.0. But not all is lost:
+        self.fill_template_parameters_manually(typeid)
+        targ = self.type_template_arguments_cache.get((typeid, index), None)
+        return targ
+
+    def type_alignment(self, typeid):
+        alignment = self.type_alignment_cache.get(typeid, None)
+        if alignment is not None:
+            return alignment
+
+        code = self.type_code_cache.get(typeid, None)
+        if code in (TypeCode.Typedef, TypeCode.Array):
+            alignment = self.type_alignment(self.type_target_cache[typeid])
+        elif code in (TypeCode.Integral, TypeCode.Float, TypeCode.Enum):
+            name = self.type_name(typeid)
+            if name in ('double', 'long long', 'unsigned long long'):
+                # Crude approximation.
+                alignment =  8 if self.isWindowsTarget() else self.ptrSize()
+            else:
+                alignment = self.type_size(typeid)
+        elif code in (TypeCode.Pointer, TypeCode.Reference, TypeCode.RValueReference):
+            alignment = self.ptrSize()
+        elif self.isCdb:
+            alignment = self.nativeStructAlignment(self.type_nativetype(typeid))
+        else:
+            size = self.type_size(typeid)
+            if size is None:
+                self.dump_type_cache()
+                self.warn("NO ALIGNMENT FOUND FOR SIZE OF TYPE %s" % str(typeid))
+                return 1
+            if size >= self.ptrSize():
+                alignment = self.ptrSize()
+            else:
+                alignment = size
+            #self.warn("GUESSING ALIGNMENT %s FOR TYPEID %s" % (alignment, typeid))
+        self.type_alignment_cache[typeid] = alignment
+        return alignment
+
+
+    def type_nativetype(self, typeid):
+        native_type = self.type_nativetype_cache.get(typeid, None)
+        if native_type is not None:
+            return native_type
+
+        typename = self.type_name(typeid)
+        native_type = self.lookupNativeType(typename)
+        # Also cache unsuccessful attempts
+        self.type_nativetype_cache[typeid] = native_type
+
+        return native_type
+
+
+    def type_size(self, typeid):
+        self.check_typeid(typeid)
+        size = self.type_size_cache.get(typeid, None)
+        if size is not None:
+            return size
+
+        if size is None:
+            nativeType = self.type_nativetype(typeid)
+            if not self.type_size_cache.get(typeid):
+                self.from_native_type(nativeType)
+            size = self.type_size_cache.get(typeid, None)
+
+        if size is not None:
+            self.type_size_cache[typeid] = size
+        else:
+            self.dump_type_cache()
+            self.warn("CANNOT DETERMINE SIZE FOR TYPE %s" % str(typeid))
+
+        return size
+
+    def type_bitsize(self, typeid):
+        bitsize = self.type_bitsize_cache.get(typeid, None)
+        if bitsize is None:
+            bitsize = 8 * self.type_size(typeid)
+            self.type_bitsize_cache[typeid] = bitsize
+        return bitsize
+
+    def dynamic_typeid_at_address(self, base_typeid, address):
+        #with self.dumper.timer('dynamic_typeid_at_address %s 0x%s' % (self.name, address)):
+        type_code = self.type_code_cache.get(base_typeid, None)
+        if type_code != TypeCode.Struct:
+           #self.dump_type_cache()
+           #self.warn('SHORT CUT FOR BASE ID: %d TC: %s' % (base_typeid, type_code))
+           return base_typeid
+
+        # This turned out to be expensive.
+        #try:
+        #    vtbl = self.extract_pointer_at_address(address)
+        #except:
+        #    return base_typeid
+        ##self.warn('VTBL: 0x%x' % vtbl)
+        #if not self.couldBePointer(vtbl):
+        #    return base_typeid
+        #self.warn("DYN TYPE FOR %s %s" % (base_typeid, self.type_name(base_typeid)))
+
+        return self.nativeDynamicType(address, base_typeid)
+
+    # This is the generic version for synthetic values.
+    # The native backends replace it in their fromNativeValue()
+    # implementations.
+    def value_members(self, value, include_bases):
+        #self.warn("LISTING MEMBERS OF %s" % value)
+        #self.warn("LISTING MEMBERS OF TYPE %s %s" % (value.typeid, self.type_name(value.typeid)))
+        typeid = value.typeid
+
+        members = self.type_fields_cache.get(typeid, None)
+        if members is not None:
+            return members
+
+        members = []
+        native_type = self.type_nativetype_cache.get(typeid, None)
+        if native_type is None:
+            native_type = self.lookupNativeType(self.type_name(typeid))
+        if not native_type is None:
+            members = self.nativeListMembers(value, native_type, include_bases)
+            #self.warn("FIELDS 2: %s" % ', '.join(str(f) for f in members))
+        else:
+            self.warn("NO NATIVE TYPE FIELDS FOR: %s" % typeid)
+
+        #self.warn("GOT MEMBERS: %s" % ', '.join(str(f.name) for f in members))
+        return members
+
+    def value_member_by_field(self, value, field):
+        #self.warn("EXTRACTING MEMBER '%s' OF %s AT OFFSET %s" % (field.name, field.typeid, field.bitpos))
+        val = self.Value(self)
+        val.typeid = field.typeid
+        val.name = field.name
+        val.isBaseClass = field.is_base_class
+        #self.warn('CREATING %s WITH DATA %s' % (val.type.name, self.hexencode(data)))
+        field_offset = field.bitpos // 8
+        if value.laddress is not None:
+            val.laddress = value.laddress + field_offset
+        field_size = (field.bitsize + 7) // 8
+        blob = self.value_data(value, field_offset + field_size)
+        val.ldata = blob[field_offset:field_offset + field_size]
+        #self.dump_location()
+        return val
+
+    def value_member_by_name(self, value, name):
+        #field = self.type_fields_cache.get((value.typeid, name), None)
+        #if field is not None:
+        #    return self.value_member_by_field(value, field)
+
+        #self.dump_location()
+        #self.warn("WANT MEMBER  '%s' OF  '%s'" % (name, value))
+        #value.check()
+        value_typecode = self.type_code(value.typeid)
+        if value_typecode == TypeCode.Typedef:
+            return self.value_member_by_name(self.value_detypedef(value), name)
+        if value_typecode in (TypeCode.Pointer, TypeCode.Reference, TypeCode.RValueReference):
+            res = self.value_member_by_name(self.value_dereference(value), name)
+            if res is not None:
+                return res
+        if value_typecode == TypeCode.Struct:
+            #self.warn('SEARCHING FOR MEMBER: %s IN %s' % (name, value.type.name))
+            members = self.value_members(value, True)
+            #self.warn('MEMBERS: %s' % ', '.join(str(m.name) for m in members))
+            base = None
+            for member in members:
+                #self.warn('CHECKING FIELD %s' % member.name)
+                if member.type.code == TypeCode.Typedef:
+                    member = member.detypedef()
+                if member.name == name:
+                    #self.warn('FOUND MEMBER 1: %s IN %s' % (name, value.type.name))
+                    return member
+                if member.isBaseClass:
+                    base = member
+            if self.isCdb:
+                if base is not None:
+                    # self.warn("CHECKING BASE CLASS '%s' for '%s'" % (base.type.name, name))
+                    res = self.value_member_by_name(base, name)
+                    if res is not None:
+                        # self.warn('FOUND MEMBER 2: %s IN %s' % (name, value.type.name))
+                        return res
+            else:
+                for member in members:
+                    if member.type.code == TypeCode.Typedef:
+                        member = member.detypedef()
+                    if member.name == name:  # Could be base class.
+                        return member
+                    if member.type.code == TypeCode.Struct:
+                        res = self.value_member_by_name(member, name)
+                        if res is not None:
+                            #self.warn('FOUND MEMBER 2: %s IN %s' % (name, value.type.name))
+                            return res
+
+            #self.warn('DID NOT FIND MEMBER: %s IN %s' % (name, value.type.name))
+            #self.dump_location()
+        return None
+
+    def value_member_by_indexish(self, value, indexish):
+        #self.warn('GET ITEM %s %s' % (self, indexish))
+        #value.check()
+        value_typecode = self.type_code(value.typeid)
+        if isinstance(indexish, str):
+            if value_typecode == TypeCode.Pointer:
+                #self.warn('GET ITEM %s DEREFERENCE TO %s' % (value, value.dereference()))
+                return value.dereference().__getitem__(indexish)
+            res = self.value_member_by_name(value, indexish)
+            if res is None:
+                raise RuntimeError('No member named %s in type %s'
+                                   % (indexish, value.type.name))
+            return res
+        if isinstance(indexish, int):
+            if value_typecode == TypeCode.Array:
+                addr = value.laddress + int(indexish) * value.type.target().size()
+                return self.createValueFromAddress(addr, value.type.target())
+            if value_typecode == TypeCode.Pointer:
+                addr = value.pointer() + int(indexish) * value.type.target().size()
+                return self.createValueFromAddress(addr, value.type.target())
+            return self.value_members(value, False)[indexish]
+        raise RuntimeError('BAD INDEX TYPE %s' % type(indexish))
+
+    def value_extract_bits(self, value, bitpos, bitsize):
+        value_size = self.type_size(value.typeid)
+        ldata = bytes(self.value_data(value, value_size))
+        bdata = ''.join([format(x, '0>8b')[::-1] for x in ldata])
+        fdata = bdata[bitpos : bitpos + bitsize]
+        fdata = fdata[::-1]
+        return int(fdata, 2)
+
+    def value_display_enum(self, value, form='%d', bitsize=None):
+        size = value.type.size()
+        intval = self.value_extract_integer(value, size, False)
+        dd = self.type_enum_display_cache.get(value.typeid, None)
+        if dd is None:
+            return str(intval)
+        return dd(intval, value.laddress, form)
+
+    def value_as_address(self, value):
+        return self.value_extract_integer(value, self.ptrSize(), False)
+
+    def value_as_integer(self, value):
+        if isinstance(value.ldata, int):
+            return value.ldata
+        type_name = self.type_name(value.typeid)
+        signed = type_name != 'unsigned' \
+            and not type_name.startswith('unsigned ') \
+            and  type_name.find(' unsigned ') == -1
+        size = value.type.size()
+        return self.value_extract_integer(value, size, signed)
+
+    def value_as_floating_point(self, value):
+        if value.nativeValue is not None and not self.isCdb:
+            return str(value.nativeValue)
+        if self.type_code(value.typeid) == TypeCode.Typedef:
+            return self.value_as_floating_point(self.value_detypedef(value))
+        if value.type.size() == 8:
+            blob = self.value_data(value, 8)
+            return struct.unpack_from(self.packCode + 'd', blob, 0)[0]
+        if value.type.size() == 4:
+            blob = self.value_data(value, 4)
+            return struct.unpack_from(self.packCode + 'f', blob, 0)[0]
+        # Fall back in case we don't have a nativeValue at hand.
+        # FIXME: This assumes Intel's 80bit extended floats. Which might
+        # be wrong.
+        l, h = value.split('QQ')
+        if True:  # 80 bit floats
+            sign = (h >> 15) & 1
+            exp = (h & 0x7fff)
+            fraction = l
+            bit63 = (l >> 63) & 1
+            #self.warn("SIGN: %s  EXP: %s  H: 0x%x L: 0x%x" % (sign, exp, h, l))
+            if exp == 0:
+                if bit63 == 0:
+                    if l == 0:
+                        res = '-0' if sign else '0'
+                    else:
+                        res = (-1)**sign * l * 2**(-16382)  # subnormal
+                else:
+                    res = 'pseudodenormal'
+            elif exp == 0x7fff:
+                res = 'special'
+            else:
+                res = (-1)**sign * l * 2**(exp - 16383 - 63)
+        else:  # 128 bits
+            sign = h >> 63
+            exp = (h >> 48) & 0x7fff
+            fraction = h & (2**48 - 1)
+            #self.warn("SIGN: %s  EXP: %s  FRAC: %s  H: 0x%x L: 0x%x" % (sign, exp, fraction, h, l))
+            if exp == 0:
+                if fraction == 0:
+                    res = -0.0 if sign else 0.0
+                else:
+                    res = (-1)**sign * fraction / 2**48 * 2**(-62)  # subnormal
+            elif exp == 0x7fff:
+                res = ('-inf' if sign else 'inf') if fraction == 0 else 'nan'
+            else:
+                res = (-1)**sign * (1 + fraction / 2**48) * 2**(exp - 63)
+        return res
+
+    def value_data(self, value, size):
+        if value.ldata is not None:
+            return value.ldata[:size]
+        if value.laddress is not None:
+            return self.value_data_from_address(value.laddress, size)
+        raise RuntimeError('CANNOT CONVERT TO BYTES: %s' % value)
+
+    def value_data_from_address(self, address, size):
+        if not isinstance(address, int):
+            raise RuntimeError('ADDRESS WRONG TYPE: %s' % type(address))
+        if not isinstance(size, int):
+            raise RuntimeError('SIZE WRONG TYPE: %s' % type(size))
+        if size <= 0:
+            raise RuntimeError('SIZE WRONG VALUE: %s' % size)
+        res = self.readRawMemory(address, size)
+        if len(res) > 0:
+            return res
+        raise RuntimeError('CANNOT READ %d BYTES FROM ADDRESS: %s %s' % (size, address))
+
+    def value_display(self, value):
+        type_code = self.type_code(value.typeid)
+        if type_code == TypeCode.Enum:
+            return self.value_display_enum(value)
+        if type_code == TypeCode.Typedef:
+            return self.value_display(self.value_detypedef(value))
+        if type_code == TypeCode.Integral:
+            return self.value_as_integer(value)
+        if type_code == TypeCode.Bitfield:
+            return self.value_as_integer(value)
+        if type_code == TypeCode.Float:
+            return self.value_as_floating_point(value)
+        if type_code == TypeCode.Pointer:
+            return self.value_as_address(value)
+        return None
+
+    def value_detypedef(self, value):
+        #value.check()
+        #if value.type.code != TypeCode.Typedef:
+        #    raise RuntimeError("WRONG")
+        val = value.copy()
+        val.typeid = self.type_target(value.typeid)
+        #self.warn("DETYPEDEF FROM: %s" % self)
+        #self.warn("DETYPEDEF TO: %s" % val)
+        return val
+
+    def split(self, pattern, value_or_address):
+        if isinstance(value_or_address, self.Value):
+            return self.value_split(value_or_address, pattern)
+        if isinstance(value_or_address, int):
+            val = self.Value(self)
+            val.laddress = value_or_address
+            return self.value_split(val, pattern)
+        raise RuntimeError('CANNOT EXTRACT STRUCT FROM %s' % type(value_or_address))
+
+    def value_split(self, value, pattern):
+        #self.warn('EXTRACT STRUCT FROM: %s' % self.type)
+        (pp, size, fields) = self.describeStruct(pattern)
+        #self.warn('SIZE: %s ' % size)
+
+        blob = self.value_data(value, size)
+        address = value.laddress
+
+        parts = struct.unpack_from(self.packCode + pp, blob)
+
+        def fix_struct(field, part):
+            #self.warn('STRUCT MEMBER: %s' % type(part))
+            if field.is_struct:
+                res = self.Value(self)
+                res.typeid = field.typeid
+                res.ldata = part
+                if address is not None:
+                    res.laddress = address + field.bitpos // 8
+                return res
+            return part
+
+        if len(fields) != len(parts):
+            raise RuntimeError('STRUCT ERROR: %s %s' % (fields, parts))
+        return tuple(map(fix_struct, fields, parts))
+
+    def type_dereference(self, typeid):
+        if self.type_code(typeid) == TypeCode.Typedef:
+            return self.type_dereference(self.type_target(typeid))
+        return self.type_target(typeid)
+
+    def type_strip_typedefs(self, typeid):
+        if self.type_code(typeid) == TypeCode.Typedef:
+            return self.type_strip_typedefs(self.type_target(typeid))
+        return typeid
+
+    def value_dereference(self, value):
+        value.check()
+        #if value.type.code == TypeCode.Typedef:
+        #    return self.value_dereference(self.value_detypedef(value))
+        val = self.Value(self)
+        if value.type.code in (TypeCode.Reference, TypeCode.RValueReference):
+            val.summary = value.summary
+            if value.nativeValue is None:
+                val.laddress = value.pointer()
+                if val.laddress is None and value.laddress is not None:
+                    val.laddress = value.laddress
+                val.typeid = self.type_dereference(value.typeid)
+                if self.useDynamicType:
+                    val.typeid = self.nativeDynamicType(val.laddress, val.typeid)
+            else:
+                val = self.nativeValueDereferenceReference(value)
+        elif value.type.code == TypeCode.Pointer:
+            try:
+                val = self.nativeValueDereferencePointer(value)
+            except:
+                val.laddress = value.pointer()
+                val.typeid = self.type_dereference(value.typeid)
+                if self.useDynamicType:
+                    val.typeid = self.nativeDynamicType(val.laddress, val.typeid)
+        else:
+            raise RuntimeError("WRONG: %s" % value.type.code)
+
+        return val
+
+    def value_cast(self, value, typish):
+        value.check()
+        val = self.Value(self)
+        val.laddress = value.laddress
+        val.ldata = value.ldata
+        val.typeid = self.create_typeid(typish)
+        return val
+
+    def value_plus_something(self, value, other):
+        value.check()
+        if isinstance(other, int):
+            stripped = self.type_strip_typedefs(value.typeid)
+            if self.type_code(stripped) == TypeCode.Pointer:
+                item_size = self.type_size(self.type_dereference(stripped))
+                address = self.value_as_address(value) + item_size * other
+                val = self.Value(self)
+                val.laddress = None
+                val.ldata = address
+                val.typeid = value.typeid
+                return val
+        raise RuntimeError('BAD DATA TO ADD TO: %s %s' % (value.type, other))
+
+    def value_minus_something(self, value, other):
+        value.check()
+        if other.type.name == value.type.name:
+            stripped = self.type_strip_typedefs(value.typeid)
+            if self.type_code(stripped.code) == TypeCode.Pointer:
+                item_size = self.type_size(self.type_dereference(stripped))
+                return (value.pointer() - other.pointer()) // item_size
+        raise RuntimeError('BAD DATA TO SUB TO: %s %s' % (value.type, other))
+
diff --git a/share/qtcreator/debugger/gdbbridge.py b/share/qtcreator/debugger/gdbbridge.py
index d61160eed3..744d246142 100644
--- a/share/qtcreator/debugger/gdbbridge.py
+++ b/share/qtcreator/debugger/gdbbridge.py
@@ -10,11 +10,10 @@ import gdb
 import os
 import os.path
 import re
-import sys
 import struct
 import tempfile
 
-from dumper import DumperBase, Children, toInteger, TopLevelItem
+from dumper import DumperBase, Children, TopLevelItem
 from utils import TypeCode
 from gdbtracepoint import *
 
@@ -119,7 +118,6 @@ ScanStackCommand()
 class PlainDumper():
     def __init__(self, printer):
         self.printer = printer
-        self.typeCache = {}
 
     def __call__(self, d, value):
         if value.nativeValue is None:
@@ -137,8 +135,6 @@ class PlainDumper():
         if isinstance(val, str):
             # encode and avoid extra quotes ('"') at beginning and end
             d.putValue(d.hexencode(val), 'utf8:1:0')
-        elif sys.version_info[0] <= 2 and isinstance(val, unicode):
-            d.putValue(val)
         elif val is not None:  # Assuming LazyString
             d.putCharArrayValue(val.address, val.length,
                                 val.type.target().sizeof)
@@ -166,7 +162,7 @@ def importPlainDumpers(args):
             gdb.execute('disable pretty-printer .* .*')
         except:
             # Might occur in non-ASCII directories
-            DumperBase.warn('COULD NOT DISABLE PRETTY PRINTERS')
+            theDumper.warn('COULD NOT DISABLE PRETTY PRINTERS')
     else:
         theDumper.usePlainDumpers = True
         theDumper.importPlainDumpers()
@@ -192,15 +188,17 @@ class Dumper(DumperBase):
 
         # These values will be kept between calls to 'fetchVariables'.
         self.isGdb = True
-        self.typeCache = {}
         self.interpreterBreakpointResolvers = []
 
+    def warn(self, message):
+        print('bridgemessage={msg="%s"},' % message.replace('"', '$').encode('latin1'))
+
     def prepare(self, args):
         self.output = []
         self.setVariableFetchingOptions(args)
 
     def fromFrameValue(self, nativeValue):
-        #DumperBase.warn('FROM FRAME VALUE: %s' % nativeValue.address)
+        #self.warn('FROM FRAME VALUE: %s' % nativeValue.address)
         val = nativeValue
         if self.useDynamicType:
             try:
@@ -209,71 +207,43 @@ class Dumper(DumperBase):
                 pass
         return self.fromNativeValue(val)
 
-    def nativeValueType(self, nativeValue):
-        return self.fromNativeType(nativeValue.type)
-
     def fromNativeValue(self, nativeValue):
-        #DumperBase.warn('FROM NATIVE VALUE: %s' % nativeValue)
+        #self.warn('FROM NATIVE VALUE: %s' % nativeValue)
         self.check(isinstance(nativeValue, gdb.Value))
         nativeType = nativeValue.type
         code = nativeType.code
+
+        val = self.Value(self)
+        val.nativeValue = nativeValue
+
         if code == gdb.TYPE_CODE_REF:
-            targetType = self.fromNativeType(nativeType.target().unqualified())
-            val = self.createReferenceValue(toInteger(nativeValue.address), targetType)
-            val.nativeValue = nativeValue
-            #DumperBase.warn('CREATED REF: %s' % val)
+            target_typeid = self.from_native_type(nativeType.target().unqualified())
+            val.ldata = int(nativeValue.address)
+            if self.useDynamicType:  # needed for Gdb13393
+                target_typeid = self.dynamic_typeid_at_address(target_typeid, val.ldata)
+            val.typeid = self.create_reference_typeid(target_typeid)
+            #self.warn('CREATED REF: %s' % val)
             return val
+
         if code == gdb.TYPE_CODE_PTR:
-            try:
-                nativeTargetValue = nativeValue.dereference()
-            except:
-                nativeTargetValue = None
-            targetType = self.fromNativeType(nativeType.target().unqualified())
-            val = self.createPointerValue(toInteger(nativeValue), targetType)
-            # The nativeValue is needed in case of multiple inheritance, see
-            # QTCREATORBUG-17823. Using it triggers nativeValueDereferencePointer()
-            # later which
-            # is surprisingly expensive.
-            val.nativeValue = nativeValue
-            #DumperBase.warn('CREATED PTR 1: %s' % val)
+            target_typeid = self.from_native_type(nativeType.target().unqualified())
+            val.ldata = int(nativeValue)
+            val.typeid = self.create_pointer_typeid(target_typeid)
+            #self.warn('CREATED PTR 1: %s' % val)
             if nativeValue.address is not None:
-                val.laddress = toInteger(nativeValue.address)
-            #DumperBase.warn('CREATED PTR 2: %s' % val)
+                val.laddress = int(nativeValue.address)
+            #self.warn('CREATED PTR 2: %s' % val)
             return val
-        if code == gdb.TYPE_CODE_TYPEDEF:
-            targetType = nativeType.strip_typedefs().unqualified()
-            #DumperBase.warn('TARGET TYPE: %s' % targetType)
-            if targetType.code == gdb.TYPE_CODE_ARRAY:
-                val = self.Value(self)
-            else:
-                try:
-                    # Cast may fail for arrays, for typedefs to __uint128_t with
-                    # gdb.error: That operation is not available on integers
-                    # of more than 8 bytes.
-                    # See test for Bug5799, QTCREATORBUG-18450.
-                    val = self.fromNativeValue(nativeValue.cast(targetType))
-                except:
-                    val = self.Value(self)
-            #DumperBase.warn('CREATED TYPEDEF: %s' % val)
-        else:
-            val = self.Value(self)
 
-        val.nativeValue = nativeValue
         if nativeValue.address is not None:
-            val.laddress = toInteger(nativeValue.address)
-        else:
-            size = nativeType.sizeof
-            chars = self.lookupNativeType('unsigned char')
-            y = nativeValue.cast(chars.array(0, int(nativeType.sizeof - 1)))
-            buf = bytearray(struct.pack('x' * size))
-            for i in range(size):
-                try:
-                    buf[i] = int(y[i])
-                except:
-                    pass
-            val.ldata = bytes(buf)
+            val.laddress = int(nativeValue.address)
+        elif code == gdb.TYPE_CODE_STRUCT:
+            try:
+                val.ldata = nativeValue.bytes # GDB 15 only
+            except:
+                val.ldata = self.nativeDataFromValueFallback(nativeValue, nativeValue.type.sizeof)
 
-        val._type = self.fromNativeType(nativeType)
+        val.typeid = self.from_native_type(nativeType)
         val.lIsInScope = not nativeValue.is_optimized_out
         code = nativeType.code
         if code == gdb.TYPE_CODE_ENUM:
@@ -283,76 +253,103 @@ class Dumper(DumperBase):
                 val.ldisplay += ' (%s)' % intval
         elif code == gdb.TYPE_CODE_COMPLEX:
             val.ldisplay = str(nativeValue)
-        elif code in [gdb.TYPE_CODE_BOOL, gdb.TYPE_CODE_INT]:
+        elif code == gdb.TYPE_CODE_BOOL:
+            # FIXME: why?
+            # Using ldata breaks StdVariant test, not setting lvalue breaks the Bitfield[s2] test.
+            val.lvalue = int(nativeValue)
+            val.ldata = None
+        elif code == gdb.TYPE_CODE_INT:
             try:
                 # extract int presentation from native value and remember it
-                val.lvalue = int(nativeValue)
+                val.ldata = int(nativeValue)
             except:
                 # GDB only support converting integers of max. 64 bits to Python int as of now
                 pass
+        elif code == gdb.TYPE_CODE_TYPEDEF:
+            targetType = nativeType.strip_typedefs().unqualified()
+            if targetType.code in [gdb.TYPE_CODE_BOOL, gdb.TYPE_CODE_INT]:
+                typeid = val.typeid
+                val = self.fromNativeValue(nativeValue.cast(targetType))
+                val.typeid = typeid
         #elif code == gdb.TYPE_CODE_ARRAY:
         #    val.type.ltarget = nativeValue[0].type.unqualified()
         return val
 
+    def nativeDataFromValueFallback(self, nativeValue, size):
+        chars = self.lookupNativeType('unsigned char')
+        try:
+            y = nativeValue.cast(chars.array(0, int(size - 1)))
+            buf = bytearray(struct.pack('x' * size))
+            for i in range(size):
+                try:
+                    buf[i] = int(y[i])
+                except:
+                    pass
+            return bytes(buf)
+        except:
+            self.warn('VALUE EXTRACTION FAILED: VALUE: %s SIZE: %s' % (nativeValue, size))
+        return None
+
     def ptrSize(self):
         result = gdb.lookup_type('void').pointer().sizeof
         self.ptrSize = lambda: result
         return result
 
-    def fromNativeType(self, nativeType):
+    def from_native_type(self, nativeType):
         self.check(isinstance(nativeType, gdb.Type))
-        code = nativeType.code
-        #DumperBase.warn('FROM NATIVE TYPE: %s' % nativeType)
+
+        #self.warn('FROM NATIVE TYPE: %s' % nativeType)
         nativeType = nativeType.unqualified()
 
-        if code == gdb.TYPE_CODE_PTR:
-            #DumperBase.warn('PTR')
-            targetType = self.fromNativeType(nativeType.target().unqualified())
-            return self.createPointerType(targetType)
+        typeid_str = self.native_type_key(nativeType)
+        known_typeid = self.typeid_from_typekey.get(typeid_str, None)
+        if known_typeid is not None:
+            return known_typeid
 
-        if code == gdb.TYPE_CODE_REF:
-            #DumperBase.warn('REF')
-            targetType = self.fromNativeType(nativeType.target().unqualified())
-            return self.createReferenceType(targetType)
-
-        if hasattr(gdb, "TYPE_CODE_RVALUE_REF"):
-            if code == gdb.TYPE_CODE_RVALUE_REF:
-                #DumperBase.warn('RVALUEREF')
-                targetType = self.fromNativeType(nativeType.target())
-                return self.createRValueReferenceType(targetType)
-
-        if code == gdb.TYPE_CODE_ARRAY:
-            #DumperBase.warn('ARRAY')
+        code = nativeType.code
+
+        if code == gdb.TYPE_CODE_PTR:
+            #self.warn('PTR')
+            target_typeid = self.from_native_type(nativeType.target().unqualified())
+            typeid = self.create_pointer_typeid(target_typeid)
+
+        elif code == gdb.TYPE_CODE_REF:
+            #self.warn('REF')
+            target_typeid = self.from_native_type(nativeType.target().unqualified())
+            typeid = self.create_reference_typeid(target_typeid)
+
+        elif code == gdb.TYPE_CODE_RVALUE_REF and hasattr(gdb, "TYPE_CODE_RVALUE_REF"):
+            #self.warn('RVALUEREF')
+            target_typeid = self.from_native_type(nativeType.target())
+            typeid = self.create_rvalue_reference_typeid(target_typeid)
+
+        elif code == gdb.TYPE_CODE_ARRAY:
+            #self.warn('ARRAY')
             nativeTargetType = nativeType.target().unqualified()
-            targetType = self.fromNativeType(nativeTargetType)
+            target_typeid = self.from_native_type(nativeTargetType)
             if nativeType.sizeof == 0:
                 # QTCREATORBUG-23998, note that nativeType.name == None here,
                 # whereas str(nativeType) returns sth like 'QObject [5]'
                 count = self.arrayItemCountFromTypeName(str(nativeType), 1)
             else:
                 count = nativeType.sizeof // nativeTargetType.sizeof
-            return self.createArrayType(targetType, count)
+            typeid = self.create_array_typeid(target_typeid, count)
 
-        if code == gdb.TYPE_CODE_TYPEDEF:
-            #DumperBase.warn('TYPEDEF')
+        elif code == gdb.TYPE_CODE_TYPEDEF:
+            #self.warn('TYPEDEF')
             nativeTargetType = nativeType.unqualified()
             while nativeTargetType.code == gdb.TYPE_CODE_TYPEDEF:
                 nativeTargetType = nativeTargetType.strip_typedefs().unqualified()
-            targetType = self.fromNativeType(nativeTargetType)
-            return self.createTypedefedType(targetType, str(nativeType),
-                                            self.nativeTypeId(nativeType))
+            target_typeid = self.from_native_type(nativeTargetType)
+            typeid = self.create_typedefed_typeid(target_typeid, str(nativeType), typeid_str)
 
-        if code == gdb.TYPE_CODE_ERROR:
+        elif code == gdb.TYPE_CODE_ERROR:
             self.warn('Type error: %s' % nativeType)
-            return self.Type(self, '')
-
-        typeId = self.nativeTypeId(nativeType)
-        res = self.typeData.get(typeId, None)
-        if res is None:
-            tdata = self.TypeData(self, typeId)
-            tdata.name = str(nativeType)
-            tdata.lbitsize = nativeType.sizeof * 8
-            tdata.code = {
+            typeid = 0 # the invalid id
+
+        else:
+            typeid = self.typeid_for_string(typeid_str)
+            type_code = {
                 #gdb.TYPE_CODE_TYPEDEF : TypeCode.Typedef, # Handled above.
                 gdb.TYPE_CODE_METHOD: TypeCode.Function,
                 gdb.TYPE_CODE_VOID: TypeCode.Void,
@@ -372,38 +369,60 @@ class Dumper(DumperBase):
                 gdb.TYPE_CODE_COMPLEX: TypeCode.Complex,
                 gdb.TYPE_CODE_STRING: TypeCode.FortranString,
             }[code]
-            if tdata.code == TypeCode.Enum:
-                tdata.enumDisplay = lambda intval, addr, form: \
+            self.type_name_cache[typeid] = str(nativeType)
+            self.type_size_cache[typeid] = nativeType.sizeof
+            self.type_code_cache[typeid] = type_code
+            self.type_nativetype_cache[typeid] = nativeType
+
+            if type_code == TypeCode.Enum:
+                self.type_enum_display_cache[typeid] = lambda intval, addr, form: \
                     self.nativeTypeEnumDisplay(nativeType, intval, form)
-            if tdata.code == TypeCode.Struct:
-                tdata.lalignment = lambda: \
-                    self.nativeStructAlignment(nativeType)
-                tdata.lfields = lambda value: \
-                    self.listMembers(value, nativeType)
-            tdata.templateArguments = lambda: \
-                    self.listTemplateParameters(nativeType)
-        #    warn('CREATE TYPE: %s' % typeId)
-        #else:
-        #    warn('REUSE TYPE: %s' % typeId)
-        return self.Type(self, typeId)
-
-    def listTemplateParameters(self, nativeType):
-        targs = []
-        pos = 0
-        while True:
-            try:
-                targ = nativeType.template_argument(pos)
-            except:
-                break
-            if isinstance(targ, gdb.Type):
-                targs.append(self.fromNativeType(targ.unqualified()))
-            elif isinstance(targ, gdb.Value):
-                targs.append(self.fromNativeValue(targ).value())
-            else:
-                raise RuntimeError('UNKNOWN TEMPLATE PARAMETER')
-            pos += 1
-        targs2 = self.listTemplateParametersManually(str(nativeType))
-        return targs if len(targs) >= len(targs2) else targs2
+
+        self.type_nativetype_cache[typeid] = nativeType
+
+# FIXME: Field offset caching (or later extraction?) broken
+#       if code == gdb.TYPE_CODE_STRUCT:
+#           field_type_name = self.type_name_cache.get(typeid, '')
+#           #self.warn("CACHING FIELDS OF %s '%s'" % (typeid, field_type_name))
+#           try:
+#               fields = nativeType.fields()
+#               #self.warn("FOUND FIELDS %s" % fields)
+#           except:
+#               #self.warn("NO FIELDS IN %s '%s'" % (typeid, field_type_name))
+#               fields = []
+#           for nativeField in fields:
+#               field_name = nativeField.name
+#               if field_name.startswith('std::allocator'):
+#                   continue
+#               field_bitpos = nativeField.bitpos
+#               field_typeid = self.typeid_for_string(str(nativeType))
+#               field_size = nativeField.type.sizeof
+#               #self.warn("CACHING '%s' OF %s AT BITPOS %s SIZE %s" %
+#               #    (field_name, typeid, field_bitpos, field_size))
+#               self.type_fields_cache[(typeid, field_name)] = self.Field(
+#                   name=field_name,
+#                   typeid=field_typeid,
+#                   bitpos=field_bitpos,
+#                   bitsize=field_size * 8
+#               )
+#               pass
+
+
+        #self.warn("FROM NATIVE TYPE: %s %s %s" % (typeid, id(nativeType), nativeType))
+        self.typeid_from_typekey[str(nativeType)] = typeid
+
+        return typeid
+
+    def nativeTemplateParameter(self, typeid, index, nativeType):
+        try:
+            targ = nativeType.template_argument(index)
+        except:
+            return None
+        if isinstance(targ, gdb.Type):
+            return self.Type(self, self.from_native_type(targ.unqualified()))
+        if isinstance(targ, gdb.Value):
+            return self.fromNativeValue(targ).value()
+        raise RuntimeError('UNKNOWN TEMPLATE PARAMETER')
 
     def nativeTypeEnumDisplay(self, nativeType, intval, form):
         try:
@@ -432,7 +451,7 @@ class Dumper(DumperBase):
             pass
         return form % intval
 
-    def nativeTypeId(self, nativeType):
+    def native_type_key(self, nativeType):
         if nativeType and (nativeType.code == gdb.TYPE_CODE_TYPEDEF):
             return '%s{%s}' % (nativeType, nativeType.strip_typedefs())
         name = str(nativeType)
@@ -444,133 +463,106 @@ class Dumper(DumperBase):
             c = 's'
         else:
             return name
-        typeId = c + ''.join(['{%s:%s}' % (f.name, self.nativeTypeId(f.type))
-                              for f in nativeType.fields()])
-        return typeId
-
-    def nativeStructAlignment(self, nativeType):
-        #DumperBase.warn('NATIVE ALIGN FOR %s' % nativeType.name)
-        def handleItem(nativeFieldType, align):
-            a = self.fromNativeType(nativeFieldType).alignment()
-            return a if a > align else align
-        align = 1
-        for f in nativeType.fields():
-            align = handleItem(f.type, align)
-        return align
+        id_str = c + ''.join(['{%s:%s}' %
+            (f.name, self.typeid_for_string(self.native_type_key(f.type)))
+                for f in nativeType.fields()])
+        #self.warn("NATIVE TYPE KEY: %s" % id_str)
+        return id_str
 
-        #except:
-        #    # Happens in the BoostList dumper for a 'const bool'
-        #    # item named 'constant_time_size'. There isn't anything we can do
-        #    # in this case.
-        #   pass
-
-        #yield value.extractField(field)
-
-    def memberFromNativeFieldAndValue(self, nativeField, nativeValue, fieldName, value):
-        nativeMember = self.nativeMemberFromField(nativeValue, nativeField)
-        if nativeMember is None:
-            val = self.Value(self)
-            val.name = fieldName
-            val._type = self.fromNativeType(nativeField.type)
-            val.lIsInScope = False
-            return val
-        val = self.fromNativeValue(nativeMember)
-        nativeFieldType = nativeField.type.unqualified()
-        if nativeField.bitsize:
-            val.lvalue = int(nativeMember)
-            val.laddress = None
-            fieldType = self.fromNativeType(nativeFieldType)
-            val._type = self.createBitfieldType(fieldType, nativeField.bitsize)
-        val.isBaseClass = nativeField.is_base_class
-        val.name = fieldName
-        return val
-
-    def nativeMemberFromField(self, nativeValue, nativeField):
-        if nativeField.is_base_class:
-            return nativeValue.cast(nativeField.type)
-        try:
-            return nativeValue[nativeField]
-        except:
-            pass
-        try:
-            return nativeValue[nativeField.name]
-        except:
-            pass
-        return None
-
-    def listMembers(self, value, nativeType):
+    def nativeListMembers(self, value, nativeType, include_base):
         nativeValue = value.nativeValue
+        value_size = self.type_size(value.typeid)
+        ldata = bytes(self.value_data(value, value_size))
+        laddress = value.laddress
 
         anonNumber = 0
 
-        #DumperBase.warn('LISTING FIELDS FOR %s' % nativeType)
+        fields = []
+        #self.warn('LISTING FIELDS FOR %s' % nativeType)
         for nativeField in nativeType.fields():
-            fieldName = nativeField.name
+            if not include_base and nativeField.is_base_class:
+                continue
+
+            field_name = nativeField.name
             # Something without a name.
             # Anonymous union? We need a dummy name to distinguish
             # multiple anonymous unions in the struct.
             # Since GDB commit b5b08fb4 anonymous structs get also reported
             # with a 'None' name.
-            if fieldName is None or len(fieldName) == 0:
-                # Something without a name.
-                # Anonymous union? We need a dummy name to distinguish
-                # multiple anonymous unions in the struct.
+            if field_name is None or len(field_name) == 0:
                 anonNumber += 1
-                fieldName = '#%s' % anonNumber
-            #DumperBase.warn('FIELD: %s' % fieldName)
+                field_name = '#%s' % anonNumber
+            #self.warn('FIELD: %s' % field_name)
+
+            nativeFieldType = nativeField.type.unqualified()
+            field_typeid = self.from_native_type(nativeFieldType)
+            #self.warn('  TYPE: %s' % nativeFieldType)
+            #self.warn('  TYPE KEY: %s' % self.native_type_key(nativeFieldType))
+
+            if nativeValue is not None:
+                try:
+                    native_member = nativeValue[nativeField]
+                except:
+                    self.warn('  COULD NOT ACCESS FIELD: %s' % nativeFieldType)
+                    continue
+
+                val = self.fromNativeValue(native_member)
+                if nativeField.bitsize:
+                    val.lvalue = None
+                    val.ldata = int(native_member)
+                    val.laddress = None
+                    val.typeid = self.create_bitfield_typeid(field_typeid, nativeField.bitsize)
+                val.isBaseClass = nativeField.is_base_class
+                val.name = field_name
+                fields.append(val)
+                continue
+
             # hasattr(nativeField, 'bitpos') == False indicates a static field,
-            # but if we have access to a nativeValue .fromNativeField will
+            # but if we have access to a nativeValue, so fromNativeField will
             # also succeed. We essentially skip only static members from
             # artificial values, like array members constructed from address.
-            if hasattr(nativeField, 'bitpos') or nativeValue is not None:
-                yield self.fromNativeField(nativeField, nativeValue, fieldName)
-
-    def fromNativeField(self, nativeField, nativeValue, fieldName):
-        nativeFieldType = nativeField.type.unqualified()
-        #DumperBase.warn('  TYPE: %s' % nativeFieldType)
-        #DumperBase.warn('  TYPEID: %s' % self.nativeTypeId(nativeFieldType))
+            if not hasattr(nativeField, 'bitpos'):
+                continue
 
-        if hasattr(nativeField, 'bitpos'):
             bitpos = nativeField.bitpos
-        else:
-            bitpos = 0
 
-        if hasattr(nativeField, 'bitsize') and nativeField.bitsize != 0:
-            bitsize = nativeField.bitsize
-        else:
-            bitsize = 8 * nativeFieldType.sizeof
+            if hasattr(nativeField, 'bitsize') and nativeField.bitsize != 0:
+                bitsize = nativeField.bitsize
+            else:
+                bitsize = 8 * nativeFieldType.sizeof
 
-        fieldType = self.fromNativeType(nativeFieldType)
-        if bitsize != nativeFieldType.sizeof * 8:
-            fieldType = self.createBitfieldType(fieldType, bitsize)
-        else:
-            fieldType = fieldType
+            field_typeid = self.from_native_type(nativeFieldType)
+            is_bitfield = bitsize != nativeFieldType.sizeof * 8
+
+            val = self.Value(self)
+            val.name = field_name
+            val.isBaseClass = nativeField.is_base_class
+
+            if is_bitfield:
+                val.typeid = self.create_bitfield_typeid(field_typeid, bitsize)
+                val.ldata = self.value_extract_bits(value, bitpos, bitsize)
+            else:
+                val.typeid = field_typeid
+                field_offset = bitpos // 8
+                if laddress is not None:
+                    val.laddress = laddress + field_offset
+                field_size = (bitsize + 7) // 8
+                val.ldata = ldata[field_offset:field_offset + field_size]
+
+            #self.warn('GOT VAL %s FOR FIELD %s' % (val, nativeField))
+            fields.append(val)
+
+        return fields
 
-        if nativeValue is None:
-            extractor = None
-        else:
-            extractor = lambda value, \
-                capturedNativeField = nativeField, \
-                capturedNativeValue = nativeValue, \
-                capturedFieldName = fieldName: \
-                self.memberFromNativeFieldAndValue(capturedNativeField,
-                                                   capturedNativeValue,
-                                                   capturedFieldName,
-                                                   value)
-
-        #DumperBase.warn("FOUND NATIVE FIELD: %s bitpos: %s" % (fieldName, bitpos))
-        return self.Field(dumper=self, name=fieldName, isBase=nativeField.is_base_class,
-                          bitsize=bitsize, bitpos=bitpos, type=fieldType,
-                          extractor=extractor)
 
     def listLocals(self, partialVar):
         frame = gdb.selected_frame()
 
         try:
             block = frame.block()
-            #DumperBase.warn('BLOCK: %s ' % block)
+            #self.warn('BLOCK: %s ' % block)
         except RuntimeError as error:
-            #DumperBase.warn('BLOCK IN FRAME NOT ACCESSIBLE: %s' % error)
+            #self.warn('BLOCK IN FRAME NOT ACCESSIBLE: %s' % error)
             return []
         except:
             self.warn('BLOCK NOT ACCESSIBLE FOR UNKNOWN REASONS')
@@ -594,14 +586,12 @@ class Dumper(DumperBase):
                     if partialVar is not None and partialVar != name:
                         continue
 
-                    # 'NotImplementedError: Symbol type not yet supported in
-                    # Python scripts.'
-                    #DumperBase.warn('SYMBOL %s  (%s, %s)): ' % (symbol, name, symbol.name))
+                    #self.warn('SYMBOL %s  (%s, %s)): ' % (symbol, name, symbol.name))
                     if self.passExceptions and not self.isTesting:
                         nativeValue = frame.read_var(name, block)
                         value = self.fromFrameValue(nativeValue)
                         value.name = name
-                        #DumperBase.warn('READ 0: %s' % value.stringify())
+                        #self.warn('READ 0: %s' % value.stringify())
                         items.append(value)
                         continue
 
@@ -610,14 +600,14 @@ class Dumper(DumperBase):
                         nativeValue = frame.read_var(name, block)
                         value = self.fromFrameValue(nativeValue)
                         value.name = name
-                        #DumperBase.warn('READ 1: %s' % value.stringify())
+                        #self.warn('READ 1: %s' % value.stringify())
                         items.append(value)
                         continue
                     except:
                         pass
 
                     try:
-                        #DumperBase.warn('READ 2: %s' % item.value)
+                        #self.warn('READ 2: %s' % item.value)
                         value = self.fromFrameValue(frame.read_var(name))
                         value.name = name
                         items.append(value)
@@ -631,8 +621,8 @@ class Dumper(DumperBase):
                         pass
 
                     try:
-                        #DumperBase.warn('READ 3: %s %s' % (name, item.value))
-                        #DumperBase.warn('ITEM 3: %s' % item.value)
+                        #self.warn('READ 3: %s %s' % (name, item.value))
+                        #self.warn('ITEM 3: %s' % item.value)
                         value = self.fromFrameValue(gdb.parse_and_eval(name))
                         value.name = name
                         items.append(value)
@@ -661,16 +651,17 @@ class Dumper(DumperBase):
         return self.ptrSize() == 8
 
     def fetchVariables(self, args):
+        start_time = time.perf_counter()
         self.resetStats()
         self.prepare(args)
 
         self.isBigEndian = gdb.execute('show endian', to_string=True).find('big endian') > 0
         self.packCode = '>' if self.isBigEndian else '<'
 
-        (ok, res) = self.tryFetchInterpreterVariables(args)
-        if ok:
-            safePrint(res)
-            return
+        #(ok, res) = self.tryFetchInterpreterVariables(args)
+        #if ok:
+        #    safePrint(res)
+        #    return
 
         self.put('data=[')
 
@@ -679,7 +670,7 @@ class Dumper(DumperBase):
         partialName = partialVar.split('.')[1].split('@')[0] if isPartial else None
 
         variables = self.listLocals(partialName)
-        #DumperBase.warn('VARIABLES: %s' % variables)
+        #self.warn('VARIABLES: %s' % variables)
 
         # Take care of the return value of the last function call.
         if len(self.resultVarName) > 0:
@@ -711,9 +702,12 @@ class Dumper(DumperBase):
             self.put(',qtnamespace="%s"' % self.qtNamespaceToReport)
             self.qtNamespaceToReport = None
 
+        run_time = time.perf_counter() - start_time
+        #self.warn("PTIME: %s" % run_time)
         self.put(',partial="%d"' % isPartial)
+        self.put(',runtime="%s"' % run_time)
         self.put(',counts=%s' % self.counts)
-        self.put(',timings=%s' % self.timings)
+        #self.put(',timings=%s' % self.timings)
         self.reportResult(''.join(self.output), args)
 
     def parseAndEvaluate(self, exp):
@@ -721,7 +715,7 @@ class Dumper(DumperBase):
         return None if val is None else self.fromNativeValue(val)
 
     def nativeParseAndEvaluate(self, exp):
-        #DumperBase.warn('EVALUATE "%s"' % exp)
+        #self.warn('EVALUATE "%s"' % exp)
         try:
             val = gdb.parse_and_eval(exp)
             return val
@@ -744,20 +738,20 @@ class Dumper(DumperBase):
             else:
                 arg += a
 
-        #DumperBase.warn('CALL: %s -> %s(%s)' % (value, function, arg))
-        typeName = value.type.name
-        if typeName.find(':') >= 0:
-            typeName = "'" + typeName + "'"
+        #self.warn('CALL: %s -> %s(%s)' % (value, function, arg))
+        type_name = value.type.name
+        if type_name.find(':') >= 0:
+            type_name = "'" + type_name + "'"
         # 'class' is needed, see http://sourceware.org/bugzilla/show_bug.cgi?id=11912
-        #exp = '((class %s*)%s)->%s(%s)' % (typeName, value.laddress, function, arg)
+        #exp = '((class %s*)%s)->%s(%s)' % (type_name, value.laddress, function, arg)
         addr = value.address()
         if addr is None:
             addr = self.pokeValue(value)
-        #DumperBase.warn('PTR: %s -> %s(%s)' % (value, function, addr))
-        exp = '((%s*)0x%x)->%s(%s)' % (typeName, addr, function, arg)
-        #DumperBase.warn('CALL: %s' % exp)
+        #self.warn('PTR: %s -> %s(%s)' % (value, function, addr))
+        exp = '((%s*)0x%x)->%s(%s)' % (type_name, addr, function, arg)
+        #self.warn('CALL: %s' % exp)
         result = gdb.parse_and_eval(exp)
-        #DumperBase.warn('  -> %s' % result)
+        #self.warn('  -> %s' % result)
         res = self.fromNativeValue(result)
         if value.address() is None:
             self.releaseValue(addr)
@@ -765,14 +759,14 @@ class Dumper(DumperBase):
 
     def makeExpression(self, value):
         typename = '::' + value.type.name
-        #DumperBase.warn('  TYPE: %s' % typename)
+        #self.warn('  TYPE: %s' % typename)
         exp = '(*(%s*)(0x%x))' % (typename, value.address())
-        #DumperBase.warn('  EXP: %s' % exp)
+        #self.warn('  EXP: %s' % exp)
         return exp
 
     def makeStdString(init):
         # Works only for small allocators, but they are usually empty.
-        gdb.execute('set $d=(std::string*)calloc(sizeof(std::string), 2)')
+        gdb.execute('set $d=(std::string*)calloc(2, sizeof(std::string))')
         gdb.execute('call($d->basic_string("' + init +
                     '",*(std::allocator<char>*)(1+$d)))')
         value = gdb.parse_and_eval('$d').dereference()
@@ -785,14 +779,14 @@ class Dumper(DumperBase):
         size = value.type.size()
         data = value.data()
         h = self.hexencode(data)
-        #DumperBase.warn('DATA: %s' % h)
+        #self.warn('DATA: %s' % h)
         string = ''.join('\\x' + h[2 * i:2 * i + 2] for i in range(size))
-        exp = '(%s*)memcpy(calloc(%d, 1), "%s", %d)' \
+        exp = '(%s*)memcpy(calloc(1, %d), "%s", %d)' \
             % (value.type.name, size, string, size)
-        #DumperBase.warn('EXP: %s' % exp)
+        #self.warn('EXP: %s' % exp)
         res = gdb.parse_and_eval(exp)
-        #DumperBase.warn('RES: %s' % res)
-        return toInteger(res)
+        #self.warn('RES: %s' % res)
+        return int(res)
 
     def releaseValue(self, address):
         gdb.parse_and_eval('free(0x%x)' % address)
@@ -819,7 +813,7 @@ class Dumper(DumperBase):
         return self.cachedInferior
 
     def readRawMemory(self, address, size):
-        #DumperBase.warn('READ: %s FROM 0x%x' % (size, address))
+        #self.warn('READ: %s FROM 0x%x' % (size, address))
         if address == 0 or size == 0:
             return bytes()
         res = self.selectedInferior().read_memory(address, size)
@@ -832,7 +826,7 @@ class Dumper(DumperBase):
             return 0
         try:
             # Older GDB ~7.4 don't have gdb.Symbol.value()
-            return toInteger(symbol.value().address)
+            return int(symbol.value().address)
         except:
             pass
 
@@ -1020,7 +1014,7 @@ class Dumper(DumperBase):
 
     def findSymbol(self, symbolName):
         try:
-            return toInteger(gdb.parse_and_eval("(size_t)&'%s'" % symbolName))
+            return int(gdb.parse_and_eval("(size_t)&'%s'" % symbolName))
         except:
             return 0
 
@@ -1052,30 +1046,24 @@ class Dumper(DumperBase):
     def handleQtCoreLoaded(self, objfile):
         fd, tmppath = tempfile.mkstemp()
         os.close(fd)
-        try:
-            cmd = 'maint print msymbols -objfile "%s" -- %s' % (objfile.filename, tmppath)
-            symbols = gdb.execute(cmd, to_string=True)
-        except:
-            try:
-                # command syntax depends on gdb version - below is gdb < 8
-                cmd = 'maint print msymbols %s "%s"' % (tmppath, objfile.filename)
-                symbols = gdb.execute(cmd, to_string=True)
-            except:
-                pass
+        cmd = 'maint print msymbols -objfile "%s" -- %s' % (objfile.filename, tmppath)
+        symbols = gdb.execute(cmd, to_string=True)
         ns = ''
         with open(tmppath) as f:
+            ns1re = re.compile(r'_ZN?(\d*)(\w*)L17msgHandlerGrabbedE? ')
+            ns2re = re.compile(r'_ZN?(\d*)(\w*)L17currentThreadDataE? ')
             for line in f:
-                if line.find('msgHandlerGrabbed ') >= 0:
+                if 'msgHandlerGrabbed ' in line:
                     # [11] b 0x7ffff683c000 _ZN4MynsL17msgHandlerGrabbedE
                     # section .tbss Myns::msgHandlerGrabbed  qlogging.cpp
-                    ns = re.split(r'_ZN?(\d*)(\w*)L17msgHandlerGrabbedE? ', line)[2]
+                    ns = ns1re.split(line)[2]
                     if len(ns):
                         ns += '::'
                     break
-                if line.find('currentThreadData ') >= 0:
+                if 'currentThreadData ' in line:
                     # [ 0] b 0x7ffff67d3000 _ZN2UUL17currentThreadDataE
                     # section .tbss  UU::currentThreadData qthread_unix.cpp\\n
-                    ns = re.split(r'_ZN?(\d*)(\w*)L17currentThreadDataE? ', line)[2]
+                    ns = ns2re.split(line)[2]
                     if len(ns):
                         ns += '::'
                     break
@@ -1104,21 +1092,21 @@ class Dumper(DumperBase):
             self.qtPropertyFunc = self.findSymbol(sym)
 
     def assignValue(self, args):
-        typeName = self.hexdecode(args['type'])
+        type_name = self.hexdecode(args['type'])
         expr = self.hexdecode(args['expr'])
         value = self.hexdecode(args['value'])
         simpleType = int(args['simpleType'])
         ns = self.qtNamespace()
-        if typeName.startswith(ns):
-            typeName = typeName[len(ns):]
-        typeName = typeName.replace('::', '__')
-        pos = typeName.find('<')
+        if type_name.startswith(ns):
+            type_name = type_name[len(ns):]
+        type_name = type_name.replace('::', '__')
+        pos = type_name.find('<')
         if pos != -1:
-            typeName = typeName[0:pos]
-        if typeName in self.qqEditable and not simpleType:
-            #self.qqEditable[typeName](self, expr, value)
+            type_name = type_name[0:pos]
+        if type_name in self.qqEditable and not simpleType:
+            #self.qqEditable[type_name](self, expr, value)
             expr = self.parseAndEvaluate(expr)
-            self.qqEditable[typeName](self, expr, value)
+            self.qqEditable[type_name](self, expr, value)
         else:
             cmd = 'set variable (%s)=%s' % (expr, value)
             gdb.execute(cmd)
@@ -1152,63 +1140,28 @@ class Dumper(DumperBase):
         nativeValue = value.nativeValue
         return self.fromNativeValue(nativeValue.cast(nativeValue.type.target()))
 
-    def nativeDynamicTypeName(self, address, baseType):
+    def nativeDynamicType(self, address, base_typeid):
         # Needed for Gdb13393 test.
-        nativeType = self.lookupNativeType(baseType.name)
+        nativeType = self.type_nativetype_cache.get(base_typeid, None)
         if nativeType is None:
-            return None
+            return base_typeid
         nativeTypePointer = nativeType.pointer()
         nativeValue = gdb.Value(address).cast(nativeTypePointer).dereference()
-        val = nativeValue.cast(nativeValue.dynamic_type)
-        return str(val.type)
-        #try:
-        #    vtbl = gdb.execute('info symbol {%s*}0x%x' % (baseType.name, address), to_string = True)
-        #except:
-        #    return None
-        #pos1 = vtbl.find('vtable ')
-        #if pos1 == -1:
-        #    return None
-        #pos1 += 11
-        #pos2 = vtbl.find(' +', pos1)
-        #if pos2 == -1:
-        #    return None
-        #return vtbl[pos1 : pos2]
-
-    def nativeDynamicType(self, address, baseType):
-        # Needed for Gdb13393 test.
-        nativeType = self.lookupNativeType(baseType.name)
-        if nativeType is None:
-            return baseType
-        nativeTypePointer = nativeType.pointer()
-        nativeValue = gdb.Value(address).cast(nativeTypePointer).dereference()
-        return self.fromNativeType(nativeValue.dynamic_type)
+        return self.from_native_type(nativeValue.dynamic_type)
 
     def enumExpression(self, enumType, enumValue):
         return self.qtNamespace() + 'Qt::' + enumValue
 
-    def lookupNativeType(self, typeName):
-        nativeType = self.lookupNativeTypeHelper(typeName)
-        if nativeType is not None:
-            self.check(isinstance(nativeType, gdb.Type))
-        return nativeType
-
-    def lookupNativeTypeHelper(self, typeName):
-        typeobj = self.typeCache.get(typeName)
-        #DumperBase.warn('LOOKUP 1: %s -> %s' % (typeName, typeobj))
-        if typeobj is not None:
-            return typeobj
-
-        if typeName == 'void':
-            typeobj = gdb.lookup_type(typeName)
-            self.typeCache[typeName] = typeobj
-            self.typesToReport[typeName] = typeobj
+    def lookupNativeType(self, type_name):
+        if type_name == 'void':
+            typeobj = gdb.lookup_type(type_name)
+            self.typesToReport[type_name] = typeobj
             return typeobj
 
         #try:
-        #    typeobj = gdb.parse_and_eval('{%s}&main' % typeName).typeobj
+        #    typeobj = gdb.parse_and_eval('{%s}&main' % type_name).typeobj
         #    if not typeobj is None:
-        #        self.typeCache[typeName] = typeobj
-        #        self.typesToReport[typeName] = typeobj
+        #        self.typesToReport[type_name] = typeobj
         #        return typeobj
         #except:
         #    pass
@@ -1217,22 +1170,21 @@ class Dumper(DumperBase):
         # gcc produces '{anonymous}', gdb '(anonymous namespace)'
         # '<unnamed>' has been seen too. The only thing gdb
         # understands when reading things back is '(anonymous namespace)'
-        if typeName.find('{anonymous}') != -1:
-            ts = typeName
+        if type_name.find('{anonymous}') != -1:
+            ts = type_name
             ts = ts.replace('{anonymous}', '(anonymous namespace)')
             typeobj = self.lookupNativeType(ts)
             if typeobj is not None:
-                self.typeCache[typeName] = typeobj
-                self.typesToReport[typeName] = typeobj
+                self.typesToReport[type_name] = typeobj
                 return typeobj
 
-        #DumperBase.warn(" RESULT FOR 7.2: '%s': %s" % (typeName, typeobj))
+        #self.warn(" RESULT FOR 7.2: '%s': %s" % (type_name, typeobj))
 
         # This part should only trigger for
         # gdb 7.1 for types with namespace separators.
         # And anonymous namespaces.
 
-        ts = typeName
+        ts = type_name
         while True:
             if ts.startswith('class '):
                 ts = ts[6:]
@@ -1259,36 +1211,32 @@ class Dumper(DumperBase):
             typeobj = self.lookupNativeType(ts[0:-1])
             if typeobj is not None:
                 typeobj = typeobj.pointer()
-                self.typeCache[typeName] = typeobj
-                self.typesToReport[typeName] = typeobj
+                self.typesToReport[type_name] = typeobj
                 return typeobj
 
         try:
-            #DumperBase.warn("LOOKING UP 1 '%s'" % ts)
+            #self.warn("LOOKING UP 1 '%s'" % ts)
             typeobj = gdb.lookup_type(ts)
         except RuntimeError as error:
-            #DumperBase.warn("LOOKING UP 2 '%s' ERROR %s" % (ts, error))
+            #self.warn("LOOKING UP '%s' FAILED" % ts)
+            pass
+            #self.warn("LOOKING UP 2 '%s' ERROR %s" % (ts, error))
             # See http://sourceware.org/bugzilla/show_bug.cgi?id=11912
             exp = "(class '%s'*)0" % ts
             try:
                 typeobj = self.parse_and_eval(exp).type.target()
-                #DumperBase.warn("LOOKING UP 3 '%s'" % typeobj)
+                #self.warn("LOOKING UP 3 '%s'" % typeobj)
             except:
                 # Can throw 'RuntimeError: No type named class Foo.'
                 pass
-        except:
-            #DumperBase.warn("LOOKING UP '%s' FAILED" % ts)
-            pass
 
         if typeobj is not None:
-            #DumperBase.warn('CACHING: %s' % typeobj)
-            self.typeCache[typeName] = typeobj
-            self.typesToReport[typeName] = typeobj
+            #self.warn('CACHING: %s' % typeobj)
+            self.typesToReport[type_name] = typeobj
 
         # This could still be None as gdb.lookup_type('char[3]') generates
         # 'RuntimeError: No type named char[3]'
-        #self.typeCache[typeName] = typeobj
-        #self.typesToReport[typeName] = typeobj
+        #self.typesToReport[type_name] = typeobj
         return typeobj
 
     def doContinue(self):
@@ -1332,7 +1280,7 @@ class Dumper(DumperBase):
                             if typeobj.code == gdb.TYPE_CODE_PTR:
                                 dereftype = typeobj.target().unqualified()
                                 if dereftype.name == needle:
-                                    addr = toInteger(value)
+                                    addr = int(value)
                                     res = None
                                     for pat in pats:
                                         try:
@@ -1442,14 +1390,6 @@ class Dumper(DumperBase):
     def reportResult(self, result, args):
         print('result={token="%s",%s}' % (args.get("token", 0), result))
 
-    def profile1(self, args):
-        '''Internal profiling'''
-        import cProfile
-        tempDir = tempfile.gettempdir() + '/bbprof'
-        cProfile.run('theDumper.fetchVariables(%s)' % args, tempDir)
-        import pstats
-        pstats.Stats(tempDir).sort_stats('time').print_stats()
-
     def profile2(self, args):
         import timeit
         print(timeit.repeat('theDumper.fetchVariables(%s)' % args,
diff --git a/share/qtcreator/debugger/libcpp_stdtypes.py b/share/qtcreator/debugger/libcpp_stdtypes.py
index 44b3a235ff..2db8352101 100644
--- a/share/qtcreator/debugger/libcpp_stdtypes.py
+++ b/share/qtcreator/debugger/libcpp_stdtypes.py
@@ -5,6 +5,7 @@ from stdtypes import qdump__std__array, qdump__std__complex, qdump__std__once_fl
 from utils import DisplayFormat
 from dumper import Children, DumperBase
 
+import struct
 
 def qform__std____1__array():
     return [DisplayFormat.ArrayPlot]
@@ -163,231 +164,114 @@ def qdump__std____1__stack(d, value):
     d.putBetterType(value.type)
 
 
-def GetChildMemberWithName(value, name):
-    members = value.members(True)
 
-    for member in members:
-        if member.name == name:
-            return member
-    return None
-
-
-def GetIndexOfChildWithName(value, name):
-    members = value.members(True)
-
-    for i, member in enumerate(members):
-        if member.name == name:
-            return i
-    return None
-
-
-class StringLayout:
-    CSD = 0
-    DSC = 1
-
-
-def std_1_string_dumper_v2(d, value):
-    charType = value['__l']['__data_'].dereference().type
-
-    R = GetChildMemberWithName(value, "__r_")
-    if not R:
-        raise Exception("Could not find __r_")
-
-    # __r_ is a compressed_pair of the actual data and the allocator. The data we
-    # want is in the first base class.
-    R_Base_SP = R[0]
-
-    if not R_Base_SP:
-        raise Exception("Could not find R_Base_SP")
-
-    Rep_Sp = GetChildMemberWithName(R_Base_SP, "__value_")
-
-    if not Rep_Sp:
-        raise Exception("Could not find __value_")
-
-    # Our layout seems a little different
-    Rep_Sp = Rep_Sp[0]
-
-    if not Rep_Sp:
-        raise Exception("Could not find Rep_Sp")
-
-    L = GetChildMemberWithName(Rep_Sp, "__l")
-
-    if not L:
-        raise Exception("Could not find __l")
-
-    layout = StringLayout.CSD
-    if GetIndexOfChildWithName(L, "__data_") == 0:
-        layout = StringLayout.DSC
-
-    short_mode = False
-    using_bitmasks = True
-    size = 0
-    size_mode_value = 0
-
-    Short_Sp = GetChildMemberWithName(Rep_Sp, "__s")
-    if not Short_Sp:
-        raise Exception("Could not find __s")
-
-    Is_Long = GetChildMemberWithName(Short_Sp, "__is_long_")
-    Size_Sp = GetChildMemberWithName(Short_Sp, "__size_")
-    if not Size_Sp:
-        raise Exception("Could not find __size_")
-
-    if Is_Long:
-        using_bitmasks = False
-        short_mode = Is_Long.integer() == 0
-        size = Size_Sp.integer()
-    else:
-        size_mode_value = Size_Sp.integer()
-        mode_mask = 1
-        if layout == StringLayout.DSC:
-            mode_mask = 0x80
-        short_mode = (size_mode_value & mode_mask) == 0
-
-    if short_mode:
-        Location_Sp = GetChildMemberWithName(Short_Sp, "__data_")
-
-        if using_bitmasks:
-            size = ((size_mode_value >> 1) % 256)
-            if layout == StringLayout.DSC:
-                size = size_mode_value
-
-        # The string is most likely not initialized yet
-        if size > 100 or not Location_Sp:
-            raise Exception("Probably not initialized yet")
-
-        d.putCharArrayHelper(d.extractPointer(Location_Sp), size,
-                             charType, d.currentItemFormat())
-        return
-
-    Location_Sp = GetChildMemberWithName(L, "__data_")
-    Size_Vo = GetChildMemberWithName(L, "__size_")
-    Capacity_Vo = GetChildMemberWithName(L, "__cap_")
-
-    if not Location_Sp or not Size_Vo or not Capacity_Vo:
-        raise Exception("Could not find Location_Sp, Size_Vo or Capacity_Vo")
-
-    size = Size_Vo.integer()
-    capacity = Capacity_Vo.integer()
-    if not using_bitmasks and layout == StringLayout.CSD:
-        capacity *= 2
-    if capacity < size:
-        raise Exception("Capacity is less than size")
-
-    d.putCharArrayHelper(d.extractPointer(Location_Sp), size,
-                         charType, d.currentItemFormat())
-
-
-def std_1_string_dumper_v1(d, value):
-    charType = value['__l']['__data_'].dereference().type
-    D = None
-
-    if d.isLldb:
-        D = value[0][0][0][0]
-    elif d.isGdb:
-        D = value["__r_"].members(True)[0][0][0]
-    else:
-        raise Exception("Unknown debugger (neither gdb nor lldb)")
-
-    layoutDecider = D[0][0]
-    if not layoutDecider:
-        raise Exception("Could not find layoutDecider")
-
-    size = 0
-    size_mode_value = 0
-    short_mode = False
-    libcxx_version = 14
-
-    layoutModeIsDSC = layoutDecider.name == '__data_'
-    if (layoutModeIsDSC):
-        size_mode = D[1][1][0]
-        if not size_mode:
-            raise Exception("Could not find size_mode")
-        if not size_mode.name == '__size_':
-            size_mode = D[1][1][1]
-            if not size_mode:
-                raise Exception("Could not find size_mode")
-
-        size_mode_value = size_mode.integer()
-        short_mode = ((size_mode_value & 0x80) == 0)
-    else:
-        size_mode = D[1][0][0]
-        if not size_mode:
-            raise Exception("Could not find size_mode")
-
-        if size_mode.name == '__is_long_':
-            libcxx_version = 15
-            short_mode = (size_mode.integer() == 0)
-
-            size_mode = D[1][0][1]
-            size_mode_value = size_mode.integer()
-        else:
-            size_mode_value = size_mode.integer()
-            short_mode = ((size_mode_value & 1) == 0)
-
-    if short_mode:
-        s = D[1]
-
-        if not s:
-            raise Exception("Could not find s")
-
-        if libcxx_version == 14:
-            location_sp = s[0] if layoutModeIsDSC else s[1]
-            size = size_mode_value if layoutModeIsDSC else ((size_mode_value >> 1) % 256)
-        elif libcxx_version == 15:
-            location_sp = s[0] if layoutModeIsDSC else s[2]
-            size = size_mode_value
-
-    else:
-        l = D[0]
-        if not l:
-            raise Exception("Could not find l")
-
-        # we can use the layout_decider object as the data pointer
-        location_sp = layoutDecider if layoutModeIsDSC else l[2]
-        size_vo = l[1]
-        if not size_vo or not location_sp:
-            raise Exception("Could not find size_vo or location_sp")
-        size = size_vo.integer()
-
-    if short_mode and location_sp:
-        d.putCharArrayHelper(d.extractPointer(location_sp), size,
-                             charType, d.currentItemFormat())
-    else:
-        d.putCharArrayHelper(location_sp.integer(),
-                             size, charType, d.currentItemFormat())
-
-    return
+# Examples for std::__1::string layouts for libcxx version 16
+#
+#   std::string b = "asd"
+#
+#   b = {
+#       static __endian_factor = 2,
+#       __r_ = {
+#           <std::__1::__compressed_pair_elem<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >::__rep, 0, false>> = {
+#               __value_ = {{
+#                   __l = {
+#                       {__is_long_ = 0, __cap_ = 842641539},
+#                       __size_ = 140737353746888,
+#                       __data_ = 0x7ffff7fa0a20 <std::__1::codecvt<wchar_t, char, __mbstate_t>::id> \"\\377\\377\\377\\377\\377\\377\\377\\377\\006\"
+#                   },
+#                   __s = {
+#                       {__is_long_ = 0 '\\000', __size_ = 3 '\\003'},
+#                       __padding_ = 0x7fffffffd859 \"asd\",
+#                       __data_ = \"asd\\000\\000\\000\\000\\310\\t\\372\\367\\377\\177\\000\\000 \\n\\372\\367\\377\\177\\000\"
+#                   },
+#                   __r = {
+#                       __words = {1685283078, 140737353746888, 140737353746976}
+#                   }
+#               }}
+#           },
+#           <std::__1::__compressed_pair_elem<std::__1::allocator<char>, 1, true>> = {
+#               <std::__1::allocator<char>> = {
+#                   <std::__1::__non_trivial_if<true, std::__1::allocator<char> >> = {
+#                       <No data fields>
+#                   },
+#                   <No data fields>
+#               },
+#               <No data fields>
+#           },
+#           <No data fields>
+#       },
+#       static npos = 18446744073709551615
+#   }
+#
+#
+#   std::string c = "asdlonasdlongstringasdlongstringasdlongstringasdlongstringgstring"
+#
+#   c = {
+#       static __endian_factor = 2,
+#       __r_ = {
+#           <std::__1::__compressed_pair_elem<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >::__rep, 0, false>> = {
+#               __value_ = {{
+#                   __l = {
+#                       {__is_long_ = 1, __cap_ = 40},   #  size_type: __cap_
+#                       __size_ = 65,
+#                       __data_ = 0x5555555592a0 \"asdlonasdlongstringasdlongstringasdlongstringasdlongstringgstring\"
+#                   },
+#                   __s = {
+#                       {__is_long_ = 1 '\\001', __size_ = 40 '('},
+#                       __padding_ = 0x7fffffffd831 \"\", __data_ = \"\\000\\000\\000\\000\\000\\000\\000A\\000\\000\\000\\000\\000\\000\\000\\240\\222UUUU\\000\"
+#                   },
+#                   __r = {
+#                       __words = {81, 65, 93824992252576}
+#                   }
+#               }}
+#           },
+#           <std::__1::__compressed_pair_elem<std::__1::allocator<char>, 1, true>> = {
+#               <std::__1::allocator<char>> = {
+#                   <std::__1::__non_trivial_if<true, std::__1::allocator<char> >> = {
+#                       <No data fields>
+#                   },
+#                   <No data fields>
+#               },
+#               <No data fields
+#           >},
+#           <No data fields>
+#       },
+#       static npos = 18446744073709551615
+#   }"
 
 def qdump__std____1__string(d, value):
-    try:
-        std_1_string_dumper_v2(d, value)
-    except Exception as eV2:
-        try:
-            std_1_string_dumper_v1(d, value)
-        except Exception as eV1:
-            d.putValue("Could not parse: %s, %s" % (eV1, eV2))
-
-
-def qdump__std____1__wstring(d, value):
-    try:
-        std_1_string_dumper_v2(d, value)
-    except Exception as eV2:
-        try:
-            std_1_string_dumper_v1(d, value)
-        except Exception as eV1:
-            d.putValue("Could not parse: %s, %s" % (eV1, eV2))
-
-
-def qdump__std____1__basic_string(d, value):
-    innerType = value.type[0].name
-    if innerType in ("char", "char8_t", "char16_t"):
-        qdump__std____1__string(d, value)
-    elif innerType in ("wchar_t", "char32_t"):
-        qdump__std____1__wstring(d, value)
+    charType = value.type[0]
+    blob = bytes(value.data())
+    r0, r1, r2 = struct.unpack(d.packCode + 'QQQ', blob)
+    if d.isLldb and d.isArmMac:
+        is_long = r2 >> 63
+        if is_long:
+            # [---------------- data ptr ---------------]  63:0
+            # [------------------ size  ----------------]
+            # [?----------------  alloc ----------------]
+            data = r0
+            size = r1
+        else:
+            # [------------------- data ----------------]  63:0
+            # [------------------- data ----------------]
+            # [?ssss-------------- data ----------------]
+            data = value.laddress
+            size = (r2 >> 56) &  255
     else:
-        d.warn("UNKNOWN INNER TYPE %s" % innerType)
+        is_long = r0 & 1
+        if is_long:
+            # [------------------ alloc ---------------?]  63:0
+            # [------------------- size ----------------]
+            # [----------------- data ptr --------------]
+            data = r2
+            size = r1
+        else:
+            # [------------------- data ----------sssss?]  63:0
+            # [------------------- data ----------------]
+            # [------------------- data ----------------]
+            data = value.laddress + charType.size()
+            size = (r0 & 255) // 2
+    d.putCharArrayHelper(data, size, charType)
 
 
 def qdump__std____1__shared_ptr(d, value):
diff --git a/share/qtcreator/debugger/lldbbridge.py b/share/qtcreator/debugger/lldbbridge.py
index 7809a6a3dc..6b08ac3d32 100644
--- a/share/qtcreator/debugger/lldbbridge.py
+++ b/share/qtcreator/debugger/lldbbridge.py
@@ -116,33 +116,29 @@ class Dumper(DumperBase):
         self.isInterrupting_ = False
         self.interpreterBreakpointResolvers = []
 
-        DumperBase.warn = Dumper.warn_impl
         self.report('lldbversion=\"%s\"' % lldb.SBDebugger.GetVersionString())
 
-    @staticmethod
-    def warn_impl(message):
-        if message[-1:] == '\n':
-            message += '\n'
+    def warn(self, msg):
+        #self.put('{name="%s",value="",type="",numchild="0"},' % toCString(msg))
+        if msg[-1:] == '\n':
+            msg += '\n'
         print('@\nbridgemessage={msg="%s",channel="%s"}\n@'
-                % (message.replace('"', '$'), LogChannel.AppError))
-
-    def fromNativeFrameValue(self, nativeValue):
-        return self.fromNativeValue(nativeValue)
+                % (msg.replace('"', '$'), LogChannel.AppError))
 
     def fromNativeValue(self, nativeValue):
         self.check(isinstance(nativeValue, lldb.SBValue))
         nativeType = nativeValue.GetType()
-        typeName = nativeType.GetName()
+        type_name = nativeType.GetName()
         code = nativeType.GetTypeClass()
 
         # Display the result of GetSummary() for Core Foundation string
         # and string-like types.
         summary = None
         if self.useFancy:
-            if (typeName.startswith('CF')
-                    or typeName.startswith('__CF')
-                    or typeName.startswith('NS')
-                    or typeName.startswith('__NSCF')):
+            if (type_name.startswith('CF')
+                    or type_name.startswith('__CF')
+                    or type_name.startswith('NS')
+                    or type_name.startswith('__NSCF')):
                 if code == lldb.eTypeClassPointer:
                     summary = nativeValue.Dereference().GetSummary()
                 elif code == lldb.eTypeClassReference:
@@ -156,26 +152,26 @@ class Dumper(DumperBase):
             nativeTargetType = nativeType.GetDereferencedType()
             if not nativeTargetType.IsPointerType():
                 nativeTargetType = nativeTargetType.GetUnqualifiedType()
-            targetType = self.fromNativeType(nativeTargetType)
-            val = self.createReferenceValue(nativeValue.GetValueAsUnsigned(), targetType)
+            target_typeid = self.from_native_type(nativeTargetType)
+            target_address = nativeValue.GetValueAsUnsigned()
+            val = self.Value(self)
+            val.ldata = target_address.to_bytes(self.ptrSize(), 'little')
+            if self.useDynamicType:
+                target_typeid = self.dynamic_typeid_at_address(target_typeid, target_address)
+            val.typeid = self.create_reference_typeid(target_typeid)
             val.laddress = nativeValue.AddressOf().GetValueAsUnsigned()
-            #DumperBase.warn('CREATED REF: %s' % val)
+            #self.warn('CREATED REF: %s' % val)
+
         elif code == lldb.eTypeClassPointer:
             nativeTargetType = nativeType.GetPointeeType()
             if not nativeTargetType.IsPointerType():
                 nativeTargetType = nativeTargetType.GetUnqualifiedType()
-            targetType = self.fromNativeType(nativeTargetType)
-            val = self.createPointerValue(nativeValue.GetValueAsUnsigned(), targetType)
-            #DumperBase.warn('CREATED PTR 1: %s' % val)
+            target_typeid = self.from_native_type(nativeTargetType)
+            val = self.Value(self)
+            val.ldata = nativeValue.GetValueAsUnsigned()
+            val.typeid = self.create_pointer_typeid(target_typeid)
             val.laddress = nativeValue.AddressOf().GetValueAsUnsigned()
-            #DumperBase.warn('CREATED PTR 2: %s' % val)
-        elif code == lldb.eTypeClassTypedef:
-            nativeTargetType = nativeType.GetUnqualifiedType()
-            if hasattr(nativeTargetType, 'GetCanonicalType'):
-                nativeTargetType = nativeTargetType.GetCanonicalType()
-            val = self.fromNativeValue(nativeValue.Cast(nativeTargetType))
-            val._type = self.fromNativeType(nativeType)
-            #DumperBase.warn('CREATED TYPEDEF: %s' % val)
+
         else:
             val = self.Value(self)
             address = nativeValue.GetLoadAddress()
@@ -193,7 +189,7 @@ class Dumper(DumperBase):
                     except:
                         pass
 
-            val._type = self.fromNativeType(nativeType)
+            val.typeid = self.from_native_type(nativeType)
 
             if code == lldb.eTypeClassEnumeration:
                 intval = nativeValue.GetValueAsSigned()
@@ -209,43 +205,32 @@ class Dumper(DumperBase):
                 val.ldisplay = str(nativeValue.GetValue())
             #elif code == lldb.eTypeClassArray:
             #    if hasattr(nativeType, 'GetArrayElementType'): # New in 3.8(?) / 350.x
-            #        val.type.ltarget = self.fromNativeType(nativeType.GetArrayElementType())
+            #        val.type.ltarget = self.from_native_type(nativeType.GetArrayElementType())
             #    else:
             #        fields = nativeType.get_fields_array()
             #        if len(fields):
-            #            val.type.ltarget = self.fromNativeType(fields[0])
+            #            val.type.ltarget = self.from_native_type(fields[0])
             #elif code == lldb.eTypeClassVector:
-            #    val.type.ltarget = self.fromNativeType(nativeType.GetVectorElementType())
+            #    val.type.ltarget = self.from_native_type(nativeType.GetVectorElementType())
 
         val.summary = summary
         val.lIsInScope = nativeValue.IsInScope()
         val.name = nativeValue.GetName()
         return val
 
-    def nativeStructAlignment(self, nativeType):
-        def handleItem(nativeFieldType, align):
-            a = self.fromNativeType(nativeFieldType).alignment()
-            return a if a > align else align
-        align = 1
-        for i in range(nativeType.GetNumberOfDirectBaseClasses()):
-            base = nativeType.GetDirectBaseClassAtIndex(i)
-            align = handleItem(base.GetType(), align)
-        for i in range(nativeType.GetNumberOfFields()):
-            child = nativeType.GetFieldAtIndex(i)
-            align = handleItem(child.GetType(), align)
-        return align
-
-    def listMembers(self, value, nativeType):
-        #DumperBase.warn("ADDR: 0x%x" % self.fakeAddress_)
-        if value.laddress:
-            fakeAddress = lldb.SBAddress(value.laddress, self.target)
-            fakeLAddress = value.laddress
-        else:
-            fakeAddress = self.fakeAddress_
-            fakeLAddress = self.fakeLAddress_
+    def nativeListMembers(self, value, nativeType, include_base):
+        #self.warn("ADDR: 0x%x" % self.fakeAddress_)
+        nativeValue = value.nativeValue
+        if nativeValue is None:
+            if value.laddress:
+                fakeAddress = lldb.SBAddress(value.laddress, self.target)
+                fakeLAddress = value.laddress
+            else:
+                fakeAddress = self.fakeAddress_
+                fakeLAddress = self.fakeLAddress_
+            nativeValue = self.target.CreateValueFromAddress('x', fakeAddress, nativeType)
 
-        fakeValue = self.target.CreateValueFromAddress('x', fakeAddress, nativeType)
-        fakeValue.SetPreferSyntheticValue(False)
+        nativeValue.SetPreferSyntheticValue(False)
 
         baseNames = {}
         for i in range(nativeType.GetNumberOfDirectBaseClasses()):
@@ -262,86 +247,99 @@ class Dumper(DumperBase):
 
         # Normal members and non-empty base classes.
         anonNumber = 0
-        for i in range(fakeValue.GetNumChildren()):
-            nativeField = fakeValue.GetChildAtIndex(i)
+
+        fields = []
+        for i in range(nativeValue.GetNumChildren()):
+            nativeField = nativeValue.GetChildAtIndex(i)
             nativeField.SetPreferSyntheticValue(False)
 
             fieldName = nativeField.GetName()
             nativeFieldType = nativeField.GetType()
 
             if fieldName in fieldBits:
-                (fieldBitsize, fieldBitpos, isBitfield) = fieldBits[fieldName]
+                (bitsize, bitpos, isBitfield) = fieldBits[fieldName]
             else:
-                fieldBitsize = nativeFieldType.GetByteSize() * 8
-                fieldBitpos = None
+                bitsize = nativeFieldType.GetByteSize() * 8
+                bitpos = None
                 isBitfield = False
 
             if isBitfield:  # Bit fields
-                fieldType = self.createBitfieldType(
-                    self.createType(self.typeName(nativeFieldType)), fieldBitsize)
-                yield self.Field(self, name=fieldName, type=fieldType,
-                                 bitsize=fieldBitsize, bitpos=fieldBitpos)
+                field_typeid = self.create_bitfield_typeid(
+                    self.create_typeid(nativeFieldType.GetName()), bitsize)
+                val = self.Value(self)
+                val.name = fieldName
+                val.isBaseClass = False
+                val.typeid = field_typeid
+                val.ldata = self.value_extract_bits(value, bitpos, bitsize)
+                val.laddress = None
+                fields.append(val)
 
             elif fieldName is None:  # Anon members
                 anonNumber += 1
                 fieldName = '#%s' % anonNumber
-                fakeMember = fakeValue.GetChildAtIndex(i)
+                fakeMember = nativeValue.GetChildAtIndex(i)
                 fakeMemberAddress = fakeMember.GetLoadAddress()
-                offset = fakeMemberAddress - fakeLAddress
-                yield self.Field(self, name=fieldName, type=self.fromNativeType(nativeFieldType),
-                                 bitsize=fieldBitsize, bitpos=8 * offset)
+                val = self.Value(self)
+                val.name = fieldName
+                val.isBaseClass = False
+                val.typeid = typeid=self.from_native_type(nativeFieldType)
+                field_offset = fakeMemberAddress - fakeLAddress
+                if value.laddress is not None:
+                    val.laddress = value.laddress + field_offset
+                if value.ldata is not None:
+                    field_size = (bitsize + 7) // 8
+                    val.ldata = value.ldata[field_offset:field_offset + field_size]
+                fields.append(val)
 
             elif fieldName in baseNames:  # Simple bases
-                member = self.fromNativeValue(fakeValue.GetChildAtIndex(i))
+                member = self.fromNativeValue(nativeValue.GetChildAtIndex(i))
                 member.isBaseClass = True
-                yield member
+                fields.append(member)
 
             else:  # Normal named members
-                member = self.fromNativeValue(fakeValue.GetChildAtIndex(i))
+                member = self.fromNativeValue(nativeValue.GetChildAtIndex(i))
                 member.name = nativeField.GetName()
-                yield member
-
-        # Empty bases are not covered above.
-        for i in range(nativeType.GetNumberOfDirectBaseClasses()):
-            fieldObj = nativeType.GetDirectBaseClassAtIndex(i)
-            fieldType = fieldObj.GetType()
-            if fieldType.GetNumberOfFields() == 0:
-                if fieldType.GetNumberOfDirectBaseClasses() == 0:
-                    member = self.Value(self)
-                    fieldName = fieldObj.GetName()
-                    member._type = self.fromNativeType(fieldType)
-                    member.name = fieldName
-                    member.fields = []
-                    if False:
-                        # This would be correct if we came here only for
-                        # truly empty base classes. Alas, we don't, see below.
-                        member.ldata = bytes()
-                        member.lbitsize = fieldType.GetByteSize() * 8
-                    else:
-                        # This is a hack. LLDB 3.8 reports declared but not defined
-                        # types as having no fields and(!) size == 1. At least
-                        # for the common case of a single base class we can
-                        # fake the contents by using the whole derived object's
-                        # data as base class data.
-                        data = fakeValue.GetData()
-                        size = nativeType.GetByteSize()
-                        member.lbitsize = size * 8
-                        error = lldb.SBError()
-                        member.laddress = value.laddress
-                        member.ldata = data.ReadRawData(error, 0, size)
-                    member.isBaseClass = True
-                    member.ltype = self.fromNativeType(fieldType)
-                    member.name = fieldName
-                    yield member
+                fields.append(member)
+
+
+        if include_base:
+            # Empty bases are not covered above.
+            for i in range(nativeType.GetNumberOfDirectBaseClasses()):
+                fieldObj = nativeType.GetDirectBaseClassAtIndex(i)
+                fieldType = fieldObj.GetType()
+                if fieldType.GetNumberOfFields() == 0:
+                    if fieldType.GetNumberOfDirectBaseClasses() == 0:
+                        member = self.Value(self)
+                        fieldName = fieldObj.GetName()
+                        member.typeid = self.from_native_type(fieldType)
+                        member.name = fieldName
+                        member.fields = []
+                        if False:
+                            # This would be correct if we came here only for
+                            # truly empty base classes. Alas, we don't, see below.
+                            member.ldata = bytes()
+                        else:
+                            # This is a hack. LLDB 3.8 reports declared but not defined
+                            # types as having no fields and(!) size == 1. At least
+                            # for the common case of a single base class we can
+                            # fake the contents by using the whole derived object's
+                            # data as base class data.
+                            data = nativeValue.GetData()
+                            size = nativeType.GetByteSize()
+                            error = lldb.SBError()
+                            member.laddress = value.laddress
+                            member.ldata = data.ReadRawData(error, 0, size)
+                        member.isBaseClass = True
+                        fields.append(member)
+        return fields
 
     def ptrSize(self):
         result = self.target.GetAddressByteSize()
         self.ptrSize = lambda: result
         return result
 
-    def fromNativeType(self, nativeType):
+    def from_native_type(self, nativeType):
         self.check(isinstance(nativeType, lldb.SBType))
-        code = nativeType.GetTypeClass()
 
         # eTypeClassInvalid           = (0u),
         # eTypeClassArray             = (1u << 0),
@@ -367,43 +365,41 @@ class Dumper(DumperBase):
         # // Define a mask that can be used for any type when finding types
         # eTypeClassAny               = (0xffffffffu)
 
-        #DumperBase.warn('CURRENT: %s' % self.typeData.keys())
-        #DumperBase.warn('FROM NATIVE TYPE: %s' % nativeType.GetName())
-        if code == lldb.eTypeClassInvalid:
-            return None
+        #self.warn('CURRENT: %s' % self.typeData.keys())
+        #self.warn('FROM NATIVE TYPE: %s' % nativeType.GetName())
 
-        if code == lldb.eTypeClassBuiltin:
-            nativeType = nativeType.GetUnqualifiedType()
+        typeid_str = self.native_type_key(nativeType)
+        known_typeid = self.typeid_from_typekey.get(typeid_str, None)
+        if known_typeid is not None:
+            return known_typeid
 
-        if code == lldb.eTypeClassPointer:
-            #DumperBase.warn('PTR')
-            nativeTargetType = nativeType.GetPointeeType()
-            if not nativeTargetType.IsPointerType():
-                nativeTargetType = nativeTargetType.GetUnqualifiedType()
-            #DumperBase.warn('PTR: %s' % nativeTargetType.name)
-            return self.createPointerType(self.fromNativeType(nativeTargetType))
+        code = nativeType.GetTypeClass()
 
-        if code == lldb.eTypeClassReference:
+        if code == lldb.eTypeClassInvalid:
+            typeid = 0
+
+        elif code == lldb.eTypeClassPointer:
+            #self.warn('PTR: %s' % nativeTargetType.name)
+            target_typeid  = self.from_native_type(nativeType.GetPointeeType())
+            typeid = self.create_pointer_typeid(target_typeid)
+
+        elif code == lldb.eTypeClassReference:
             #DumperBase.warn('REF')
-            nativeTargetType = nativeType.GetDereferencedType()
-            if not nativeTargetType.IsPointerType():
-                nativeTargetType = nativeTargetType.GetUnqualifiedType()
-            #DumperBase.warn('REF: %s' % nativeTargetType.name)
-            return self.createReferenceType(self.fromNativeType(nativeTargetType))
+            target_typeid = self.from_native_type(nativeType.GetDereferencedType())
+            typeid = self.create_reference_typeid(target_typeid)
 
-        if code == lldb.eTypeClassTypedef:
+        elif code == lldb.eTypeClassTypedef:
             #DumperBase.warn('TYPEDEF')
             nativeTargetType = nativeType.GetUnqualifiedType()
             if hasattr(nativeTargetType, 'GetCanonicalType'):
                 nativeTargetType = nativeTargetType.GetCanonicalType()
-            targetType = self.fromNativeType(nativeTargetType)
-            return self.createTypedefedType(targetType, nativeType.GetName(),
-                                            self.nativeTypeId(nativeType))
+            target_typeid = self.from_native_type(nativeTargetType)
+            typeid = self.create_typedefed_typeid(target_typeid, nativeType.GetName(),
+                                                typeid_str)
 
-        nativeType = nativeType.GetUnqualifiedType()
-        typeName = self.typeName(nativeType)
-
-        if code in (lldb.eTypeClassArray, lldb.eTypeClassVector):
+        elif code in (lldb.eTypeClassArray, lldb.eTypeClassVector):
+            nativeType = nativeType.GetUnqualifiedType()
+            type_name = nativeType.GetName()
             #DumperBase.warn('ARRAY: %s' % nativeType.GetName())
             if hasattr(nativeType, 'GetArrayElementType'):  # New in 3.8(?) / 350.x
                 nativeTargetType = nativeType.GetArrayElementType()
@@ -412,141 +408,139 @@ class Dumper(DumperBase):
                         #DumperBase.warn('BAD: %s ' % nativeTargetType.get_fields_array())
                         nativeTargetType = nativeType.GetVectorElementType()
                 count = nativeType.GetByteSize() // nativeTargetType.GetByteSize()
-                targetTypeName = nativeTargetType.GetName()
-                if targetTypeName.startswith('(anon'):
-                    typeName = nativeType.GetName()
-                    pos1 = typeName.rfind('[')
-                    targetTypeName = typeName[0:pos1].strip()
-                #DumperBase.warn("TARGET TYPENAME: %s" % targetTypeName)
-                targetType = self.fromNativeType(nativeTargetType)
-                targetType.setTdata(targetType.tdata.copy())
-                targetType.tdata.name = targetTypeName
-                return self.createArrayType(targetType, count)
-            if hasattr(nativeType, 'GetVectorElementType'):  # New in 3.8(?) / 350.x
+                target_typename = nativeTargetType.GetName()
+                if target_typename.startswith('(anon'):
+                    type_name = nativeType.GetName()
+                    pos1 = type_name.rfind('[')
+                    target_typename = type_name[0:pos1].strip()
+                #DumperBase.warn("TARGET TYPENAME: %s" % target_typename)
+                target_typeid = self.from_native_type(nativeTargetType)
+                #target_typeid.setTdata(target_typeid.tdata.copy())
+                #target_typeid.tdata.name = target_typename
+                typeid = self.create_array_typeid(target_typeid, count)
+            elif hasattr(nativeType, 'GetVectorElementType'):  # New in 3.8(?) / 350.x
                 nativeTargetType = nativeType.GetVectorElementType()
                 count = nativeType.GetByteSize() // nativeTargetType.GetByteSize()
-                targetType = self.fromNativeType(nativeTargetType)
-                return self.createArrayType(targetType, count)
-            return self.createType(nativeType.GetName())
+                target_typeid = self.from_native_type(nativeTargetType)
+                typeid = self.create_array_typeid(target_typeid, count)
+            else:
+                typeid = self.create_type(nativeType.GetName())
+
+        else:
+            nativeType = nativeType.GetUnqualifiedType()
+            type_name = nativeType.GetName()
 
-        typeId = self.nativeTypeId(nativeType)
-        res = self.typeData.get(typeId, None)
-        if res is None:
+            typeid = self.typeid_for_string(typeid_str)
+            #if not typeid in self.typeid_cache:
             #  # This strips typedefs for pointers. We don't want that.
             #  typeobj.nativeType = nativeType.GetUnqualifiedType()
-            tdata = self.TypeData(self, typeId)
-            tdata.name = typeName
-            tdata.lbitsize = nativeType.GetByteSize() * 8
+            self.type_name_cache[typeid] = type_name
+            self.type_size_cache[typeid] = nativeType.GetByteSize()
+            type_code = None
             if code == lldb.eTypeClassBuiltin:
-                if utils.isFloatingPointTypeName(typeName):
-                    tdata.code = TypeCode.Float
-                elif utils.isIntegralTypeName(typeName):
-                    tdata.code = TypeCode.Integral
-                elif typeName in ('__int128', 'unsigned __int128'):
-                    tdata.code = TypeCode.Integral
-                elif typeName == 'void':
-                    tdata.code = TypeCode.Void
-                elif typeName == 'wchar_t':
-                    tdata.code = TypeCode.Integral
-                elif typeName in ("char16_t", "char32_t", "char8_t"):
-                    tdata.code = TypeCode.Integral
+                if utils.isFloatingPointTypeName(type_name):
+                    type_code = TypeCode.Float
+                elif utils.isIntegralTypeName(type_name):
+                    type_code = TypeCode.Integral
+                elif type_name in ('__int128', 'unsigned __int128'):
+                    type_code = TypeCode.Integral
+                elif type_name == 'void':
+                    type_code = TypeCode.Void
+                elif type_name == 'wchar_t':
+                    type_code = TypeCode.Integral
+                elif type_name in ("char16_t", "char32_t", "char8_t"):
+                    type_code = TypeCode.Integral
                 else:
-                    self.warn('UNKNOWN TYPE KEY: %s: %s' % (typeName, code))
+                    self.warn('UNKNOWN TYPE KEY: %s: %s' % (type_name, code))
             elif code == lldb.eTypeClassEnumeration:
-                tdata.code = TypeCode.Enum
-                tdata.enumDisplay = lambda intval, addr, form: \
+                type_code = TypeCode.Enum
+                self.type_enum_display_cache[typeid] = lambda intval, addr, form: \
                     self.nativeTypeEnumDisplay(nativeType, intval, form)
             elif code in (lldb.eTypeClassComplexInteger, lldb.eTypeClassComplexFloat):
-                tdata.code = TypeCode.Complex
+                type_code = TypeCode.Complex
             elif code in (lldb.eTypeClassClass, lldb.eTypeClassStruct, lldb.eTypeClassUnion):
-                tdata.code = TypeCode.Struct
-                tdata.lalignment = lambda: \
-                    self.nativeStructAlignment(nativeType)
-                tdata.lfields = lambda value: \
-                    self.listMembers(value, nativeType)
-                tdata.templateArguments = lambda: \
-                    self.listTemplateParametersHelper(nativeType)
+                type_code = TypeCode.Struct
             elif code == lldb.eTypeClassFunction:
-                tdata.code = TypeCode.Function
+                type_code = TypeCode.Function
             elif code == lldb.eTypeClassMemberPointer:
-                tdata.code = TypeCode.MemberPointer
-        #    warn('CREATE TYPE: %s' % typeId)
+                type_code = TypeCode.MemberPointer
+
+            if code is not None:
+                self.type_code_cache[typeid] = type_code
+
+        self.type_nativetype_cache[typeid] = nativeType
+        self.typeid_from_typekey[typeid_str] = typeid
+
+        # self.warn('REUSE TYPE: %s' % typeid)
+        return typeid
+
+    def nativeTemplateParameter(self, typeid, index, nativeType):
+        #n = nativeType.GetNumberOfTemplateArguments()
+        #if n != len(stringArgs):
+        #    # Something wrong in the debug info.
+        #    # Should work in theory, doesn't work in practice.
+        #    # Items like std::allocator<std::pair<unsigned int const, float> report 0
+        #    # for nativeType.GetNumberOfTemplateArguments() with LLDB 3.8
+        #    return stringArgs
+
+        kind = nativeType.GetTemplateArgumentKind(index)
+        # eTemplateArgumentKindNull = 0,
+        # eTemplateArgumentKindType,
+        # eTemplateArgumentKindDeclaration,
+        # eTemplateArgumentKindIntegral,
+        # eTemplateArgumentKindTemplate,
+        # eTemplateArgumentKindTemplateExpansion,
+        # eTemplateArgumentKindExpression,
+        # eTemplateArgumentKindPack
+        if kind == lldb.eTemplateArgumentKindType:
+            innerType = nativeType.GetTemplateArgumentType(index) \
+                .GetUnqualifiedType().GetCanonicalType()
+            return self.Type(self, self.from_native_type(innerType))
+        #elif kind == lldb.eTemplateArgumentKindIntegral:
+        #   innerType = nativeType.GetTemplateArgumentType(i).GetUnqualifiedType().GetCanonicalType()
+        #   #DumperBase.warn('INNER TYP: %s' % innerType)
+        #   basicType = innerType.GetBasicType()
+        #   #DumperBase.warn('IBASIC TYP: %s' % basicType)
+        #   inner = self.extractTemplateArgument(nativeType.GetName(), i)
+        #   exp = '(%s)%s' % (innerType.GetName(), inner)
+        #   #DumperBase.warn('EXP : %s' % exp)
+        #   val = self.nativeParseAndEvaluate('(%s)%s' % (innerType.GetName(), inner))
+        #   # Clang writes 'int' and '0xfffffff' into the debug info
+        #   # LLDB manages to read a value of 0xfffffff...
+        #   #if basicType == lldb.eBasicTypeInt:
+        #   value = val.GetValueAsUnsigned()
+        #   if value >= 0x8000000:
+        #       value -= 0x100000000
+        #   #DumperBase.warn('KIND: %s' % kind)
+        #   targs.append(value)
         #else:
-        #    warn('REUSE TYPE: %s' % typeId)
-        return self.Type(self, typeId)
-
-    def listTemplateParametersHelper(self, nativeType):
-        stringArgs = self.listTemplateParameters(nativeType.GetName())
-        n = nativeType.GetNumberOfTemplateArguments()
-        if n != len(stringArgs):
-            # Something wrong in the debug info.
-            # Should work in theory, doesn't work in practice.
-            # Items like std::allocator<std::pair<unsigned int const, float> report 0
-            # for nativeType.GetNumberOfTemplateArguments() with LLDB 3.8
-            return stringArgs
-
-        targs = []
-        for i in range(nativeType.GetNumberOfTemplateArguments()):
-            kind = nativeType.GetTemplateArgumentKind(i)
-            # eTemplateArgumentKindNull = 0,
-            # eTemplateArgumentKindType,
-            # eTemplateArgumentKindDeclaration,
-            # eTemplateArgumentKindIntegral,
-            # eTemplateArgumentKindTemplate,
-            # eTemplateArgumentKindTemplateExpansion,
-            # eTemplateArgumentKindExpression,
-            # eTemplateArgumentKindPack
-            if kind == lldb.eTemplateArgumentKindType:
-                innerType = nativeType.GetTemplateArgumentType(
-                    i).GetUnqualifiedType().GetCanonicalType()
-                targs.append(self.fromNativeType(innerType))
-            #elif kind == lldb.eTemplateArgumentKindIntegral:
-            #   innerType = nativeType.GetTemplateArgumentType(i).GetUnqualifiedType().GetCanonicalType()
-            #   #DumperBase.warn('INNER TYP: %s' % innerType)
-            #   basicType = innerType.GetBasicType()
-            #   #DumperBase.warn('IBASIC TYP: %s' % basicType)
-            #   inner = self.extractTemplateArgument(nativeType.GetName(), i)
-            #   exp = '(%s)%s' % (innerType.GetName(), inner)
-            #   #DumperBase.warn('EXP : %s' % exp)
-            #   val = self.nativeParseAndEvaluate('(%s)%s' % (innerType.GetName(), inner))
-            #   # Clang writes 'int' and '0xfffffff' into the debug info
-            #   # LLDB manages to read a value of 0xfffffff...
-            #   #if basicType == lldb.eBasicTypeInt:
-            #   value = val.GetValueAsUnsigned()
-            #   if value >= 0x8000000:
-            #       value -= 0x100000000
-            #   #DumperBase.warn('KIND: %s' % kind)
-            #   targs.append(value)
-            else:
-                #DumperBase.warn('UNHANDLED TEMPLATE TYPE : %s' % kind)
-                targs.append(stringArgs[i])  # Best we can do.
+        #    #DumperBase.warn('UNHANDLED TEMPLATE TYPE : %s' % kind)
+        #    targs.append(stringArgs[i])  # Best we can do.
         #DumperBase.warn('TARGS: %s %s' % (nativeType.GetName(), [str(x) for x in  targs]))
-        return targs
-
-    def typeName(self, nativeType):
-        # Don't use GetDisplayTypeName since LLDB removed the inline namespace __1
-        # https://reviews.llvm.org/D74478
-        return nativeType.GetName()
+        #return targs
+        return None
 
-    def nativeTypeId(self, nativeType):
-        if nativeType and (nativeType.GetTypeClass() == lldb.eTypeClassTypedef):
+    def native_type_key(self, nativeType):
+        code = nativeType.GetTypeClass()
+        if nativeType and code == lldb.eTypeClassTypedef:
             nativeTargetType = nativeType.GetUnqualifiedType()
             if hasattr(nativeTargetType, 'GetCanonicalType'):
                 nativeTargetType = nativeTargetType.GetCanonicalType()
             return '%s{%s}' % (nativeType.name, nativeTargetType.name)
-        name = self.typeName(nativeType)
+        # Don't use GetDisplayTypeName since LLDB removed the inline namespace __1
+        # https://reviews.llvm.org/D74478
+        name = nativeType.GetName()
         if name is None or len(name) == 0:
             c = '0'
-        elif name == '(anonymous struct)' and nativeType.GetTypeClass() == lldb.eTypeClassStruct:
-            c = 's'
-        elif name == '(anonymous struct)' and nativeType.GetTypeClass() == lldb.eTypeClassUnion:
-            c = 'u'
+        elif name == '(anonymous struct)':
+            c = 's' if code == lldb.eTypeClassStruct else 'u'
         else:
             return name
         fields = nativeType.get_fields_array()
-        typeId = c + ''.join(['{%s:%s}' % (f.name, self.nativeTypeId(f.GetType())) for f in fields])
-        #DumperBase.warn('NATIVE TYPE ID FOR %s IS %s' % (name, typeId))
-        return typeId
+        id_str = c + ''.join(['{%s:%s}' %
+            (f.name, self.typeid_for_string(self.native_type_key(f.GetType())))
+                for f in fields])
+        return id_str
 
     def nativeTypeEnumDisplay(self, nativeType, intval, form):
         if hasattr(nativeType, 'get_enum_members_array'):
@@ -575,12 +569,82 @@ class Dumper(DumperBase):
             return '(' + ' | '.join(flags) + ') (' + (form % intval) + ')'
         return form % intval
 
-    def nativeDynamicTypeName(self, address, baseType):
-        return None  # FIXME: Seems sufficient, no idea why.
-        addr = self.target.ResolveLoadAddress(address)
-        ctx = self.target.ResolveSymbolContextForAddress(addr, 0)
-        sym = ctx.GetSymbol()
-        return sym.GetName()
+    def nativeDynamicType(self, address, base_typeid):
+        return self.nativeDynamicType_2(address, base_typeid)
+
+    def nativeDynamicType_1(self, address, base_typeid):
+        # Solutions 1: Breaks StdUniquePtr and QVariant1 test
+        return base_typeid
+
+    def nativeDynamicType_2(self, address, base_typeid):
+        # Solution 2: ~10% slower in total than Solution 1
+        typename = self.type_name(base_typeid)
+        #self.warn("LOOKING FOR DYN TYPE: 0x%x %s" % (address, typename))
+        #self.warn(" PRETTY: 0x%x %s" % (address, self.prettySymbolByAddress(address)))
+
+        expr = '(void*)%s' % address
+        value = self.target.EvaluateExpression(expr)
+
+        #self.warn("VALUE: %s" % value)
+        if value.GetType().GetName() == "void *":
+            #self.warn("NO DYN TYPE: %s" % value)
+            return base_typeid
+
+        dvalue = value.Dereference()
+        #self.warn("DVALUE: %s" % value)
+        sbtype = dvalue.GetType()
+        #self.warn("TYPE: %s" % sbtype)
+
+        #self.warn("OUTPUT: %s" % output)
+        #self.warn("DYNTYPE: %s" % dyn_typename)
+        return self.from_native_type(sbtype)
+
+    def nativeDynamicType_3(self, address, base_typeid):
+        # Solution 3: Doesn't improve over 1
+        typename = self.type_name(base_typeid)
+        self.warn("LOOKING FOR DYN TYPE: 0x%x %s" % (address, typename))
+        #self.warn(" PRETTY: 0x%x %s" % (address, self.prettySymbolByAddress(address)))
+        nativeType = self.type_nativetype_cache.get(base_typeid, None)
+        #self.warn(" NATIVE BASE %s" % nativeType)
+        if nativeType is None:
+            return base_typeid
+        #versionValue = self.target.EvaluateExpression('qtHookData[2]').GetNonSyntheticValue()
+        addr = lldb.SBAddress(address, self.target)
+        value = self.target.CreateValueFromAddress('x', addr, nativeType)
+        self.warn(" VALUE %s" % value)
+        return base_typeid
+
+    def nativeDynamicType_4(self, address, base_typeid):
+        #self.warn("RESULT: %s" % result)
+        #self.warn("ADDRESS: 0x%x" % address)
+
+        #thread = self.currentThread()
+        #frame = thread.GetFrameAtIndex(0)
+        #expr = '(void*)%s' % address
+        #value = self.target.EvaluateExpression(expr)
+        #sbtype = self.lookupNativeType(typename)
+        #addr = self.target.ResolveLoadAddress(address)
+        #addr = lldb.SBAddress(address, self.target)
+        #value = self.target.CreateValueFromAddress('x', addr, sbtype)
+        #x = lldb::DynamicValueType()
+        #lldb.eNoDynamicValues
+        #lldb.eDynamicCanRunTarget
+        #lldb.eDynamicDontRunTarget
+        #dyn_value = value.GetDynamicValue(lldb.eDynamicDontRunTarget)
+        #typ = dyn_value.GetType()
+        self.warn("GOT DYN VALUE: %s" % dyn_value)
+        #self.warn("GOT TYPE: %s FOR OBJECT AT 0x%x" % (typ, address))
+        return self.from_native_type(typ)
+
+        #result = lldb.SBCommandReturnObject()
+        #cmd = 'p (void*)%s' % address
+        #self.debugger.GetCommandInterpreter().HandleCommand(cmd, result)
+        #if not result.Succeeded():
+        #    return self.Type(self, typeid)
+        #output = result.GetOutput().strip()
+        #dyn_typename = output[1:output.find('$') - 4]
+        #sbtype = self.lookupNativeType(dyn_typename)
+
 
     def stateName(self, s):
         try:
@@ -638,11 +702,11 @@ class Dumper(DumperBase):
         #DumperBase.warn('  -> %s' % result)
         return self.fromNativeValue(result)
 
-    def pokeValue(self, typeName, *args):
+    def pokeValue(self, type_name, *args):
         thread = self.currentThread()
         frame = thread.GetFrameAtIndex(0)
         inner = ','.join(args)
-        value = frame.EvaluateExpression(typeName + '{' + inner + '}')
+        value = frame.EvaluateExpression(type_name + '{' + inner + '}')
         #DumperBase.warn('  TYPE: %s' % value.type)
         #DumperBase.warn('  ADDR: 0x%x' % value.address)
         #DumperBase.warn('  VALUE: %s' % value)
@@ -830,8 +894,6 @@ class Dumper(DumperBase):
             #DumperBase.warn('RECURSE PTR')
             typeobj = self.lookupNativeType(name[:-1].strip())
             if typeobj is not None:
-                #DumperBase.warn('RECURSE RESULT X: %s' % typeobj)
-                self.fromNativeType(typeobj.GetPointerType())
                 #DumperBase.warn('RECURSE RESULT: %s' % typeobj.GetPointerType())
                 return typeobj.GetPointerType()
 
@@ -1289,14 +1351,12 @@ class Dumper(DumperBase):
     def findSymbol(self, symbolName):
         return self.target.FindFirstGlobalVariable(symbolName)
 
-    def warn(self, msg):
-        self.put('{name="%s",value="",type="",numchild="0"},' % toCString(msg))
-
     def fetchVariables(self, args):
-        (ok, res) = self.tryFetchInterpreterVariables(args)
-        if ok:
-            self.reportResult(res, args)
-            return
+        start_time = time.perf_counter()
+        #(ok, res) = self.tryFetchInterpreterVariables(args)
+        #if ok:
+        #    self.reportResult(res, args)
+        #    return
 
         self.setVariableFetchingOptions(args)
 
@@ -1312,6 +1372,8 @@ class Dumper(DumperBase):
             self.reportResult('error="No frame"', args)
             return
 
+        self.isArmMac = frame.module.triple.startswith('arm64-apple')
+
         self.output = []
         isPartial = len(self.partialVariable) > 0
 
@@ -1358,13 +1420,15 @@ class Dumper(DumperBase):
                 # This can happen for unnamed function parameters with
                 # default values:  void foo(int = 0)
                 continue
-            value = self.fromNativeFrameValue(val)
+            value = self.fromNativeValue(val)
             variables.append(value)
 
         self.handleLocals(variables)
         self.handleWatches(args)
 
-        self.put('],partial="%d"' % isPartial)
+        run_time = time.perf_counter() - start_time
+
+        self.put('],partial="%d",runtime="%s"' % (isPartial, run_time))
         self.reportResult(self.takeOutput(), args)
 
 
@@ -1456,6 +1520,21 @@ class Dumper(DumperBase):
             if bp is not None:
                 self.reportBreakpointUpdate(bp)
 
+    def wantAutoContinue(self, frame):
+        if self.platform_ != 'remote-android':
+            return False
+        funcname = frame.GetFunctionName()
+        if funcname and funcname.startswith('java.'):
+            return True
+        module = frame.GetModule()
+        filespec = module.GetPlatformFileSpec() # Not GetFileSpec
+        filename = filespec.GetFilename()
+        if filename == 'libart.so':
+            return True
+        if funcname == None and not frame.line_entry.file.IsValid() and filename == None:
+            return True
+        return False
+
     def handleEvent(self, event):
         if lldb.SBBreakpoint.EventIsBreakpointEvent(event):
             self.handleBreakpointEvent(event)
@@ -1490,8 +1569,12 @@ class Dumper(DumperBase):
             if state == lldb.eStateStopped:
                 stoppedThread = self.firstStoppedThread()
                 if stoppedThread:
-                    #self.report("STOPPED THREAD: %s" % stoppedThread)
                     frame = stoppedThread.GetFrameAtIndex(0)
+                    if self.wantAutoContinue(frame):
+                        #self.warn("AUTO CONTINUE")
+                        error = self.process.Continue()
+                        return
+
                     #self.report("FRAME: %s" % frame)
                     function = frame.GetFunction()
                     functionName = function.GetName()
@@ -1966,14 +2049,14 @@ class Dumper(DumperBase):
         value = self.hexdecode(args['value'])
         simpleType = int(args['simpleType'])
         lhs = self.findValueByExpression(expr)
-        typeName = lhs.GetType().GetName()
-        typeName = typeName.replace('::', '__')
-        pos = typeName.find('<')
+        type_name = lhs.GetType().GetName()
+        type_name = type_name.replace('::', '__')
+        pos = type_name.find('<')
         if pos != -1:
-            typeName = typeName[0:pos]
-        if typeName in self.qqEditable and not simpleType:
+            type_name = type_name[0:pos]
+        if type_name in self.qqEditable and not simpleType:
             expr = self.parseAndEvaluate(expr)
-            self.qqEditable[typeName](self, expr, value)
+            self.qqEditable[type_name](self, expr, value)
         else:
             self.parseAndEvaluate(expr + '=' + value)
         self.reportResult(self.describeError(error), args)
@@ -2077,10 +2160,10 @@ class Tester(Dumper):
 
 if 'QT_CREATOR_LLDB_PROCESS' in os.environ:
     # Initialize Qt Creator dumper
-    try:
+    #try:
         theDumper = Dumper()
-    except Exception as error:
-        print('@\nstate="enginesetupfailed",error="{}"@\n'.format(error))
+    #except Exception as error:
+    #    print('@\nstate="enginesetupfailed",error="{}"@\n'.format(error))
 
 # ------------------------------ For use in LLDB ------------------------------
 
diff --git a/share/qtcreator/debugger/qttypes.py b/share/qtcreator/debugger/qttypes.py
index 06e7d47325..af99534c9b 100644
--- a/share/qtcreator/debugger/qttypes.py
+++ b/share/qtcreator/debugger/qttypes.py
@@ -221,15 +221,15 @@ def qdump__Qt__ItemDataRole(d, value):
 
 
 def qdump__QStandardItemData(d, value):
-    d.createType('@Qt::ItemDataRole') # warm up cache
+    #d.createType('@Qt::ItemDataRole') # warm up cache
     role, pad, val = value.split('{@Qt::ItemDataRole}@{@QVariant}')
     d.putPairContents(role.value(), (role, val), 'role', 'value')
 
 
 def qdump__QStandardItem(d, value):
-    d.createType('@QStandardItemData') # warm up cache
-    d.createType('@QStandardItem')
-    d.createType('@QStandardItem*')
+    #d.createType('@QStandardItemData') # warm up cache
+    #d.createType('@QStandardItem')
+    #d.createType('@QStandardItem*')
 
     vtable, dptr = value.split('pp')
     if d.qtVersion() >= 0x060000:
@@ -549,14 +549,11 @@ def qdump__QDir(d, value):
                 #d.putCallItem('absolutePath', '@QString', value, 'absolutePath')
                 #d.putCallItem('canonicalPath', '@QString', value, 'canonicalPath')
                 with SubItem(d, 'absolutePath'):
-                    typ = d.lookupType(ns + 'QString')
-                    d.putItem(d.createValue(privAddress + absoluteDirEntryOffset, typ))
+                    d.putItem(d.createValue(privAddress + absoluteDirEntryOffset, '@QString'))
                 with SubItem(d, 'entryInfoList'):
-                    typ = d.lookupType(ns + 'QFileInfo')
-                    qdumpHelper_QList(d, privAddress + fileInfosOffset, typ)
+                    qdumpHelper_QList(d, privAddress + fileInfosOffset, '@QFileInfo')
                 with SubItem(d, 'entryList'):
-                    typ = d.lookupType(ns + 'QStringList')
-                    d.putItem(d.createValue(privAddress + filesOffset, typ))
+                    d.putItem(d.createValue(privAddress + filesOffset, '@QStringList'))
             d.putFields(value)
 
 
@@ -1095,14 +1092,15 @@ def qform__QList():
 
 
 def qdump__QList(d, value):
-    return qdumpHelper_QList(d, value, d.createType(value.type[0]))
+    return qdumpHelper_QList(d, value, value.type[0])
 
 
 def qdump__QVariantList(d, value):
-    qdumpHelper_QList(d, value, d.createType('@QVariant'))
+    qdumpHelper_QList(d, value, '@QVariant')
 
 
-def qdumpHelper_QList(d, value, innerType):
+def qdumpHelper_QList(d, value, inner_typish):
+    innerType = d.createType(inner_typish)
     data, size = d.listData(value, check=True)
     d.putItemCount(size)
 
@@ -1224,7 +1222,8 @@ def qdump__QLocale(d, value):
     #        index = int(value['d']['d']['m_data']...)
     #d.check(index >= 0)
     #d.check(index <= qqLocalesCount)
-    if d.qtVersion() < 0x50000:
+    qtVersion = d.qtVersion()
+    if qtVersion < 0x50000:
         d.putStringValue(d.call('const char *', value, 'name'))
         d.putPlainChildren(value)
         return
@@ -1238,14 +1237,20 @@ def qdump__QLocale(d, value):
         = d.split('2s{short}2s'
                   + '{@QChar}{@QChar}{short}{@QChar}{@QChar}'
                   + '{@QChar}{@QChar}{@QChar}', data)
+
+    prefix = ns + 'QLocale::'
     try:
-        d.putStringValue(d.call('const char *', value, 'name'))
+        if qtVersion >= 0x060700:
+            res = d.call('const char *', value, 'name', prefix + 'TagSeparator::Underscore')
+        else:
+            res = d.call('const char *', value, 'name')
+        d.putStringValue(res)
     except:
         pass
+
     d.putExpandable()
     if d.isExpanded():
         with Children(d):
-            prefix = ns + 'QLocale::'
             d.putSubItem('country', d.createValue(countryId, prefix + 'Country'))
             d.putSubItem('language', d.createValue(languageId, prefix + 'Language'))
             d.putSubItem('numberOptions', d.createValue(numberOptions, prefix + 'NumberOptions'))
@@ -1425,7 +1430,9 @@ if False:
             d.putSpecialValue('minimumitemcount', 0)
 
 
-def qdump__QPair(d, value):
+# FIXME: Qt 5
+# remvign the _xxxx makes GDB work with Qt 5 but breaks LLDB
+def qdump__QPair_xxxx(d, value):
     typeCode = '{%s}@{%s}' % (value.type[0].name, value.type[1].name)
     first, pad, second = value.split(typeCode)
     with Children(d):
@@ -1857,7 +1864,7 @@ def qdump__QStringRef(d, value):
 
 
 def qdump__QStringList(d, value):
-    qdumpHelper_QList(d, value, d.createType('@QString'))
+    qdumpHelper_QList(d, value, '@QString')
     d.putBetterType(value.type)
 
 
@@ -2304,22 +2311,22 @@ def qdump__QVector(d, value):
     if d.qtVersion() >= 0x060000:
         data, length = d.listData(value)
         d.putItemCount(length)
-        d.putPlotData(data, length, d.createType(value.type.ltarget[0]))
+        d.putPlotData(data, length, value.type.target()[0])
         # g++ 9.3 does not add the template parameter list to the debug info.
         # Fake it for the common case:
         if value.type.name == d.qtNamespace() + "QVector":
-            d.putBetterType(value.type.name + '<' + value.type.ltarget[0].name + '>')
+            d.putBetterType(value.type.name + '<' + value.type.target()[0].name + '>')
     else:
         data, length = d.vectorData(value)
         d.putItemCount(length)
-        d.putPlotData(data, length, d.createType(value.type[0]))
+        d.putPlotData(data, length, value.type[0])
 
 
 if False:
     def qdump__QObjectConnectionList(d, value):
         data, length = d.vectorData(value)
         d.putItemCount(length)
-        d.putPlotData(data, length, d.createType('@QObjectPrivate::ConnectionList'))
+        d.putPlotData(data, length, '@QObjectPrivate::ConnectionList')
 
 
 def qdump__QVarLengthArray(d, value):
@@ -2913,15 +2920,13 @@ def qdump_64__QJSValue_6(d, value):
         elif typ > 7:
             val = d.Value(d)
             val.ldata = struct.pack('q', dd ^ 0xfffc000000000000)
-            val._type = d.createType('double')
-            d.putItem(val)
+            d.putItem(val.cast('double'))
             d.putType(value.type.name + ' (double)')
         elif typ <= 3: # Heap
             if dd & 1: # String
                 val = d.Value(d)
                 val.ldata = struct.pack('q', dd & ~1)
-                val._type = d.createType('@QString*')
-                d.putItem(val)
+                d.putItem(val.cast('@QString*'))
                 d.putType(value.type.name + ' (QString)')
             else:
                 # FIXME: Arrays, Objects missing.
@@ -2955,16 +2960,13 @@ def qdump_64__QJSValue_6(d, value):
             val = d.Value(d)
             val.ldata = struct.pack('q', pointer)
             if typ == 1:
-                val._type = d.createType('double*')
-                d.putItem(val)
+                d.putItem(val.cast('double*'))
                 d.putType(value.type.name + ' (double)')
             elif typ == 3:
-                val._type = d.createType('@QV4::Value*')
-                d.putItem(val)
+                d.putItem(val.cast('@QV4::Value*'))
                 d.putType(value.type.name + ' (QV4::Value)')
             elif typ == 5:
-                val._type = d.createType('@QString*')
-                d.putItem(val)
+                d.putItem(val.cast('@QString*'))
                 d.putType(value.type.name + ' (QString)')
 
         else:
@@ -3538,7 +3540,7 @@ def qdump__QCborValue(d, value):
     d.putPlainChildren(value)
 
 def qdump__QCborValue_proxy(d, value):
-    item_data, container_ptr, item_type, is_cbor = value.data()
+    item_data, container_ptr, item_type, is_cbor = value.ldata
 
     def typename(key, is_cbor):
         if is_cbor:
diff --git a/share/qtcreator/debugger/stdtypes.py b/share/qtcreator/debugger/stdtypes.py
index bc4bb84dcb..dbe663ef63 100644
--- a/share/qtcreator/debugger/stdtypes.py
+++ b/share/qtcreator/debugger/stdtypes.py
@@ -909,7 +909,7 @@ def qedit__std__vector(d, value, data):
     values = data.split(',')
     n = len(values)
     innerType = value.type[0].name
-    cmd = "set $d = (%s*)calloc(sizeof(%s)*%s,1)" % (innerType, innerType, n)
+    cmd = "set $d = (%s*)calloc(%s,sizeof(%s))" % (innerType, n, innerType)
     gdb.execute(cmd)
     cmd = "set {void*[3]}%s = {$d, $d+%s, $d+%s}" % (value.address(), n, n)
     gdb.execute(cmd)
diff --git a/share/qtcreator/debugger/visualize.py b/share/qtcreator/debugger/visualize.py
new file mode 100644
index 0000000000..578d3bb705
--- /dev/null
+++ b/share/qtcreator/debugger/visualize.py
@@ -0,0 +1,86 @@
+# Copyright(C) 2006-2008, David Allouche, Jp Calderone, Itamar Shtull-Trauring
+# Copyright(C) 2006-2017, Johan Dahlin
+# Copyright(C) 2008, Olivier Grisel <olivier.grisel@ensta.org>
+# Copyright(C) 2008, David Glick
+# Copyright(C) 2013, Steven Maude
+# Copyright(C) 2013-2018, Peter Waller <p@pwaller.net>
+# Copyright(C) 2013, Lukas Graf <lukas.graf@4teamwork.ch>
+# Copyright(C) 2013, Jamie Wong <http://jamie-wong.com>
+# Copyright(C) 2013, Yury V. Zaytsev <yury@shurup.com>
+# Copyright(C) 2014, Michael Droettboom <mdroe@stsci.edu>
+# Copyright(C) 2015, Zev Benjamin <zev@mit.edu>
+# Copyright(C) 2018, Jon Dufresne <jon.dufresne@gmail.com>
+#
+# All rights reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+""" This is a stripped down and modified version of pyprof2calltree """
+
+def profile_visualize(entries):
+    import cProfile
+    import io
+    import subprocess
+    import tempfile
+    from collections import defaultdict
+
+    def add_code_by_position(code):
+        filename, _, name = cProfile.label(code)
+        code_by_position[(filename, name)].add(code)
+
+    def munged_function_name(code):
+        filename, firstlineno, name = cProfile.label(code)
+        if len(code_by_position[(filename, name)]) == 1:
+            return name
+        return "%s:%d" % (name, firstlineno)
+
+    code_by_position = defaultdict(set)
+    for entry in entries:
+        add_code_by_position(entry.code)
+        if entry.calls:
+            for subentry in entry.calls:
+                add_code_by_position(subentry.code)
+
+    fd, outfile = tempfile.mkstemp("-qtc-debugger-profile.txt")
+    with io.open(fd, "w") as out:
+        scale = 1e9
+
+        out.write('event: ns : Nanoseconds\n')
+        out.write('events: ns\n')
+
+        for entry in entries:
+            code = entry.code
+
+            filename, firstlineno, name = cProfile.label(code)
+            munged_name = munged_function_name(code)
+
+            out.write('fl=%s\nfn=%s\n' % (filename, munged_name))
+            out.write('%d %d\n' % (firstlineno, int(entry.inlinetime * scale)))
+
+            if entry.calls:
+                for subentry in entry.calls:
+                    filename, firstlineno, name = cProfile.label(subentry.code)
+                    munged_name = munged_function_name(subentry.code)
+                    out.write('cfl=%s\ncfn=%s\n' % (filename, munged_name))
+                    out.write('calls=%d %d\n' % (subentry.callcount, firstlineno))
+                    out.write('%d %d\n' % (firstlineno, int(subentry.totaltime * scale)))
+            out.write('\n')
+
+    subprocess.Popen(["kcachegrind", outfile])
+
diff --git a/share/qtcreator/qmldesigner/assetsLibraryQmlSources/Assets.qml b/share/qtcreator/qmldesigner/assetsLibraryQmlSources/Assets.qml
index cfa4020995..26bef6f8e9 100644
--- a/share/qtcreator/qmldesigner/assetsLibraryQmlSources/Assets.qml
+++ b/share/qtcreator/qmldesigner/assetsLibraryQmlSources/Assets.qml
@@ -94,7 +94,7 @@ Item {
         anchors.fill: parent
         acceptedButtons: Qt.RightButton
         onClicked: {
-            if (assetsModel.haveFiles) {
+            if (assetsModel.hasFiles) {
                 function onFolderCreated(path) {
                     assetsView.addCreatedFolder(path)
                 }
@@ -182,13 +182,13 @@ Item {
             leftPadding: 10
             color: StudioTheme.Values.themeTextColor
             font.pixelSize: StudioTheme.Values.baseFont
-            visible: !assetsModel.haveFiles && !root.__searchBoxEmpty
+            visible: !assetsModel.hasFiles && !root.__searchBoxEmpty
         }
 
         Item { // placeholder when the assets library is empty
             width: parent.width
             height: parent.height - toolbar.height - column.spacing
-            visible: !assetsModel.haveFiles && root.__searchBoxEmpty
+            visible: !assetsModel.hasFiles && root.__searchBoxEmpty
             clip: true
 
             MouseArea { // right clicking the empty area of the view
diff --git a/share/qtcreator/qmldesigner/assetsLibraryQmlSources/AssetsContextMenu.qml b/share/qtcreator/qmldesigner/assetsLibraryQmlSources/AssetsContextMenu.qml
index 391c622048..a8eb5285f5 100644
--- a/share/qtcreator/qmldesigner/assetsLibraryQmlSources/AssetsContextMenu.qml
+++ b/share/qtcreator/qmldesigner/assetsLibraryQmlSources/AssetsContextMenu.qml
@@ -83,7 +83,7 @@ StudioControls.Menu {
         root.__selectedAssetPathsList = selectedAssetPathsList
         root.__fileIndex = fileIndex
         root.__dirIndex = dirModelIndex
-        root.__dirPath = AssetsLibraryBackend.assetsModel.filePath(dirModelIndex)
+        root.__dirPath = root.assetsModel.filePath(dirModelIndex)
         root.__isDirectory = false
         root.popup()
     }
@@ -124,9 +124,9 @@ StudioControls.Menu {
         id: addTexturesItem
         text: qsTr("Add Texture")
         enabled: rootView.hasMaterialLibrary
-        visible: root.__fileIndex && AssetsLibraryBackend.assetsModel.allFilePathsAreTextures(root.__selectedAssetPathsList)
+        visible: root.__fileIndex && root.assetsModel.allFilePathsAreTextures(root.__selectedAssetPathsList)
         height: addTexturesItem.visible ? addTexturesItem.implicitHeight : 0
-        onTriggered: AssetsLibraryBackend.rootView.addTextures(root.__selectedAssetPathsList)
+        onTriggered: root.rootView.addTextures(root.__selectedAssetPathsList)
     }
 
     StudioControls.MenuItem {
@@ -134,7 +134,7 @@ StudioControls.Menu {
         text: qsTr("Add Light Probe")
         enabled: rootView.hasMaterialLibrary && rootView.hasSceneEnv
         visible: root.__fileIndex && root.__selectedAssetPathsList.length === 1
-                 && AssetsLibraryBackend.assetsModel.allFilePathsAreTextures(root.__selectedAssetPathsList)
+                 && root.assetsModel.allFilePathsAreTextures(root.__selectedAssetPathsList)
         height: addLightProbes.visible ? addLightProbes.implicitHeight : 0
         onTriggered: rootView.addLightProbe(root.__selectedAssetPathsList[0])
     }
@@ -145,7 +145,7 @@ StudioControls.Menu {
         visible: root.__fileIndex
         height: deleteFileItem.visible ? deleteFileItem.implicitHeight : 0
         onTriggered: {
-            let deleted = AssetsLibraryBackend.assetsModel.requestDeleteFiles(root.__selectedAssetPathsList)
+            let deleted = root.assetsModel.requestDeleteFiles(root.__selectedAssetPathsList)
             if (!deleted)
                 confirmDeleteFiles.open()
         }
@@ -182,7 +182,7 @@ StudioControls.Menu {
 
     StudioControls.MenuItem {
         text: qsTr("New Folder")
-        visible: AssetsLibraryBackend.assetsModel.haveFiles
+        visible: root.assetsModel.hasFiles
         height: visible ? implicitHeight : 0
 
         NewFolderDialog {
@@ -209,11 +209,11 @@ StudioControls.Menu {
         }
 
         onTriggered: {
-            if (!AssetsLibraryBackend.assetsModel.hasChildren(root.__dirIndex)) {
+            if (!root.assetsModel.hasChildren(root.__dirIndex)) {
                 // NOTE: the folder may still not be empty -- it doesn't have files visible to the
                 // user, but that doesn't mean that there are no other files (e.g. files of unknown
                 // types) on disk in this directory.
-                AssetsLibraryBackend.assetsModel.deleteFolderRecursively(root.__dirIndex)
+                root.assetsModel.deleteFolderRecursively(root.__dirIndex)
             } else {
                 confirmDeleteFolderDialog.open()
             }
@@ -222,7 +222,7 @@ StudioControls.Menu {
 
     StudioControls.MenuItem {
         text: qsTr("New Effect")
-        visible: rootView.canCreateEffects()
+        visible: root.rootView.canCreateEffects()
         height: visible ? implicitHeight : 0
 
         NewEffectDialog {
@@ -235,15 +235,22 @@ StudioControls.Menu {
     }
 
     StudioControls.MenuItem {
-        text: rootView.showInGraphicalShellMsg()
+        text: root.rootView.showInGraphicalShellMsg()
 
         enabled: root.__showInGraphicalShellEnabled
 
         onTriggered: {
             if (!root.__fileIndex || root.__selectedAssetPathsList.length > 1)
-                rootView.showInGraphicalShell(root.__dirPath)
+                root.rootView.showInGraphicalShell(root.__dirPath)
             else
-                rootView.showInGraphicalShell(root.__selectedAssetPathsList[0])
+                root.rootView.showInGraphicalShell(root.__selectedAssetPathsList[0])
         }
     }
+
+    StudioControls.MenuItem {
+        text: qsTr("Add to Content Library")
+        visible: root.rootView.userBundleEnabled() && root.__fileIndex && root.assetsModel.allFilePathsAreTextures(root.__selectedAssetPathsList)
+        height: visible ? implicitHeight : 0
+        onTriggered: root.rootView.addAssetsToContentLibrary(root.__selectedAssetPathsList)
+    }
 }
diff --git a/share/qtcreator/qmldesigner/assetsLibraryQmlSources/AssetsView.qml b/share/qtcreator/qmldesigner/assetsLibraryQmlSources/AssetsView.qml
index 9326e6a5e3..aeabc92c6d 100644
--- a/share/qtcreator/qmldesigner/assetsLibraryQmlSources/AssetsView.qml
+++ b/share/qtcreator/qmldesigner/assetsLibraryQmlSources/AssetsView.qml
@@ -70,9 +70,9 @@ TreeView {
     model: assetsModel
 
     onRowsChanged: {
-        if (root.rows > root.rootPathRow + 1 && !assetsModel.haveFiles ||
-            root.rows <= root.rootPathRow + 1 && assetsModel.haveFiles) {
-            assetsModel.syncHaveFiles()
+        if (root.rows > root.rootPathRow + 1 && !assetsModel.hasFiles ||
+            root.rows <= root.rootPathRow + 1 && assetsModel.hasFiles) {
+            assetsModel.syncHasFiles()
         }
 
         root.updateRows()
@@ -366,7 +366,7 @@ TreeView {
 
     function moveSelection(amount)
     {
-        if (!assetsModel.haveFiles || !amount)
+        if (!assetsModel.hasFiles || !amount)
             return
 
         let index = root.currentFilePath ? assetsModel.indexForPath(root.currentFilePath)
diff --git a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsEditDelegate.qml b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsEditDelegate.qml
index 90b3021c96..fd969382e6 100644
--- a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsEditDelegate.qml
+++ b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsEditDelegate.qml
@@ -96,6 +96,16 @@ Item {
                         if (realField.activeFocus)
                             realField.contentItem.focus = true
                     }
+
+                    textFromValue: function (value, locale) {
+                        locale.numberOptions = Locale.OmitGroupSeparator
+                        var decimals = realField.trailingZeroes ? realField.decimals : decimalCounter(realField.realValue)
+                        if (decimals > 0) {
+                            var text = Number(realField.realValue).toLocaleString(locale, 'f', decimals + 1)
+                            return text.substring(0, text.length - 1)
+                        }
+                        return Number(realField.realValue).toLocaleString(locale, 'f', decimals)
+                    }
                 }
             }
         }
diff --git a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsToolbar.qml b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsToolbar.qml
index 8b4c08f845..e7997f7eae 100644
--- a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsToolbar.qml
+++ b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsToolbar.qml
@@ -29,6 +29,11 @@ Rectangle {
         root.model.insertRow(root.model.rowCount())
     }
 
+    function closeDialogs() {
+        addColumnDialog.reject()
+        fileDialog.reject()
+    }
+
     RowLayout {
         id: container
 
@@ -49,7 +54,7 @@ Rectangle {
                 id: addColumnLeftButton
 
                 buttonIcon: StudioTheme.Constants.addcolumnleft_medium
-                tooltip: qsTr("Add property left")
+                tooltip: qsTr("Add column left")
                 enabled: root.model.selectedColumn > -1
                 onClicked: addColumnDialog.popUp(root.model.selectedColumn)
             }
@@ -58,7 +63,7 @@ Rectangle {
                 id: addColumnRightButton
 
                 buttonIcon: StudioTheme.Constants.addcolumnright_medium
-                tooltip: qsTr("Add property right")
+                tooltip: qsTr("Add column right")
                 enabled: root.model.selectedColumn > -1
                 onClicked: addColumnDialog.popUp(root.model.selectedColumn + 1)
             }
@@ -67,7 +72,7 @@ Rectangle {
                 id: deleteColumnButton
 
                 buttonIcon: StudioTheme.Constants.deletecolumn_medium
-                tooltip: qsTr("Delete selected property")
+                tooltip: qsTr("Delete selected column")
                 enabled: root.model.selectedColumn > -1
                 onClicked: root.model.removeColumn(root.model.selectedColumn)
             }
@@ -81,7 +86,7 @@ Rectangle {
                 id: addRowBelowButton
 
                 buttonIcon: StudioTheme.Constants.addrowbelow_medium
-                tooltip: qsTr("Insert row below")
+                tooltip: qsTr("Add row below")
                 enabled: root.model.selectedRow > -1
                 onClicked: root.model.insertRow(root.model.selectedRow + 1)
             }
@@ -90,7 +95,7 @@ Rectangle {
                 id: addRowAboveButton
 
                 buttonIcon: StudioTheme.Constants.addrowabove_medium
-                tooltip: qsTr("Insert row above")
+                tooltip: qsTr("Add row above")
                 enabled: root.model.selectedRow > -1
                 onClicked: root.model.insertRow(root.model.selectedRow)
             }
@@ -117,8 +122,18 @@ Rectangle {
 
                 buttonIcon: StudioTheme.Constants.save_medium
                 tooltip: qsTr("Save changes")
-                enabled: root.model.collectionName !== ""
+                enabled: root.model.collectionName !== "" && root.model.hasUnsavedChanges
                 onClicked: root.model.saveDataStoreCollections()
+
+                Rectangle {
+                    width: StudioTheme.Values.smallStatusIndicatorDiameter
+                    height: StudioTheme.Values.smallStatusIndicatorDiameter
+                    radius: StudioTheme.Values.smallStatusIndicatorDiameter / 2
+                    anchors.right: parent.right
+                    anchors.top: parent.top
+                    visible: root.model.hasUnsavedChanges
+                    color: StudioTheme.Values.themeIconColorSelected
+                 }
             }
 
             IconButton {
diff --git a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml
index c9a6d2dbcb..2193bd1763 100644
--- a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml
+++ b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml
@@ -21,11 +21,19 @@ Rectangle {
     color: StudioTheme.Values.themeControlBackground
 
     function closeDialogs() {
-        editPropertyDialog.close()
+        editPropertyDialog.reject()
+        deleteColumnDialog.reject()
+        toolbar.closeDialogs()
+    }
+
+    MouseArea {
+        anchors.fill: parent
+        onClicked: tableView.model.deselectAll()
     }
 
     Column {
         id: topRow
+        readonly property real maxAvailableHeight: root.height
 
         visible: root.model.collectionName !== ""
         width: parent.width
@@ -39,6 +47,11 @@ Rectangle {
         }
 
         GridLayout {
+            id: gridLayout
+            readonly property real maxAvailableHeight: topRow.maxAvailableHeight
+                                                       - topRow.spacing
+                                                       - toolbar.height
+
             columns: 3
             rowSpacing: 1
             columnSpacing: 1
@@ -92,7 +105,8 @@ Rectangle {
                         id: topHeaderMouseArea
 
                         anchors.fill: parent
-                        anchors.margins: 5
+                        anchors.leftMargin: StudioTheme.Values.borderHover
+                        anchors.rightMargin: StudioTheme.Values.borderHover
                         acceptedButtons: Qt.LeftButton | Qt.RightButton
                         hoverEnabled: true
                         onClicked: (mouse) => {
@@ -147,12 +161,18 @@ Rectangle {
 
                     StudioControls.MenuItem {
                         text: qsTr("Sort Ascending")
-                        onTriggered: sortedModel.sort(headerMenu.clickedHeaderIndex, Qt.AscendingOrder)
+                        onTriggered: {
+                            tableView.closeEditor()
+                            tableView.model.sort(headerMenu.clickedHeaderIndex, Qt.AscendingOrder)
+                        }
                     }
 
                     StudioControls.MenuItem {
                         text: qsTr("Sort Descending")
-                        onTriggered: sortedModel.sort(headerMenu.clickedHeaderIndex, Qt.DescendingOrder)
+                        onTriggered: {
+                            tableView.closeEditor()
+                            tableView.model.sort(headerMenu.clickedHeaderIndex, Qt.DescendingOrder)
+                        }
                     }
                 }
             }
@@ -174,7 +194,8 @@ Rectangle {
 
                     MouseArea {
                         anchors.fill: parent
-                        anchors.margins: 5
+                        anchors.topMargin: StudioTheme.Values.borderHover
+                        anchors.bottomMargin: StudioTheme.Values.borderHover
                         acceptedButtons: Qt.LeftButton
                         onClicked: tableView.model.selectRow(index)
                     }
@@ -187,15 +208,29 @@ Rectangle {
                 model: root.sortedModel
                 clip: true
 
-                property point tableStart: tableTopLeftCorner.mapToItem(root, Qt.point(x, y));
+                readonly property real maxAvailableHeight: gridLayout.maxAvailableHeight
+                                                           - addRowButton.height
+                                                           - headerView.height
+                                                           - (2 * gridLayout.rowSpacing)
+                readonly property real maxAvailableWidth: gridLayout.width
+                                                          - StudioTheme.Values.collectionTableHorizontalMargin
+                                                          - rowIdView.width
+                                                          - addColumnButton.width
+                                                          - gridLayout.columnSpacing
+
+                property real childrenWidth: tableView.contentItem.childrenRect.width
+                property real childrenHeight: tableView.contentItem.childrenRect.height
+
+                property int targetRow
+                property int targetColumn
 
                 Layout.alignment: Qt.AlignTop + Qt.AlignLeft
                 Layout.preferredWidth: tableView.contentWidth
                 Layout.preferredHeight: tableView.contentHeight
                 Layout.minimumWidth: 100
                 Layout.minimumHeight: 20
-                Layout.maximumWidth: root.width - (tableStart.x + addColumnContainer.width)
-                Layout.maximumHeight: root.height - (tableStart.y + addRowContainer.height)
+                Layout.maximumWidth: maxAvailableWidth
+                Layout.maximumHeight: maxAvailableHeight
 
                 columnWidthProvider: function(column) {
                     if (!isColumnLoaded(column))
@@ -215,6 +250,45 @@ Rectangle {
                     return Math.max(h, StudioTheme.Values.collectionCellMinimumHeight)
                 }
 
+                function ensureRowIsVisible(row) {
+                    let rows = tableView.model.rowCount()
+                    let rowIsLoaded = tableView.isRowLoaded(row)
+
+                    if (row < 0 || row >= rows || rowIsLoaded) {
+                        if (rowIsLoaded)
+                            tableView.positionViewAtRow(row, Qt.AlignLeft | Qt.AlignTop)
+
+                        tableView.targetRow = -1
+                        return
+                    }
+
+                    tableView.targetRow = row
+                    tableView.positionViewAtRow(row, Qt.AlignLeft | Qt.AlignTop)
+                    ensureTimer.start()
+                }
+
+                function ensureColumnIsVisible(column) {
+                    let columns = tableView.model.columnCount()
+                    let columnIsLoaded = tableView.isColumnLoaded(column)
+
+                    if (column < 0 || column >= columns || columnIsLoaded) {
+                        if (columnIsLoaded)
+                            tableView.positionViewAtColumn(column, Qt.AlignLeft | Qt.AlignTop)
+
+                        tableView.targetColumn = -1
+                        return
+                    }
+
+                    tableView.targetColumn = column
+                    tableView.positionViewAtColumn(column, Qt.AlignLeft | Qt.AlignTop)
+                    ensureTimer.start()
+                }
+
+                onMaxAvailableHeightChanged: resetSizeTimer.start()
+                onMaxAvailableWidthChanged: resetSizeTimer.start()
+                onChildrenWidthChanged: resetSizeTimer.start()
+                onChildrenHeightChanged: resetSizeTimer.start()
+
                 delegate: Rectangle {
                     id: itemCell
 
@@ -264,7 +338,7 @@ Rectangle {
                             Text {
                                 text: display ?? ""
                                 color: itemSelected ? StudioTheme.Values.themeInteraction
-                                                    : StudioTheme.Values.themePlaceholderTextColorInteraction
+                                                    : StudioTheme.Values.themeTextColor
                                 leftPadding: 5
                                 topPadding: 3
                                 bottomPadding: 3
@@ -297,15 +371,70 @@ Rectangle {
                             top: itemCell.top
                             left: itemCell.left
                         }
+                        Component.onCompleted: tableView.model.deselectAll()
                     }
+                }
 
-                    Connections {
-                        target: tableView.model
+                Timer {
+                    id: resetSizeTimer
 
-                        function onModelReset() {
-                            tableView.clearColumnWidths()
-                            tableView.clearRowHeights()
-                        }
+                    interval: 100
+                    repeat: false
+                    onTriggered: {
+                        let cWidth = Math.min(tableView.maxAvailableWidth, tableView.childrenWidth)
+                        let cHeight = Math.min(tableView.maxAvailableHeight, tableView.childrenHeight)
+
+                        if (tableView.contentWidth !== cWidth || tableView.contentHeight !== cHeight)
+                            tableView.returnToBounds()
+                    }
+                }
+
+                Timer {
+                    id: ensureTimer
+
+                    interval: 100
+                    repeat: false
+                    onTriggered: {
+                        tableView.ensureRowIsVisible(tableView.targetRow)
+                        tableView.ensureColumnIsVisible(tableView.targetColumn)
+                    }
+                }
+
+                Connections {
+                    target: tableView.model
+
+                    function onModelReset() {
+                        root.closeDialogs()
+                        tableView.clearColumnWidths()
+                        tableView.clearRowHeights()
+                    }
+
+                    function onRowsInserted(parent, first, last) {
+                        tableView.closeEditor()
+                        tableView.model.selectRow(first)
+                        tableView.ensureRowIsVisible(first)
+                    }
+
+                    function onColumnsInserted(parent, first, last) {
+                        tableView.closeEditor()
+                        tableView.model.selectColumn(first)
+                        tableView.ensureColumnIsVisible(first)
+                    }
+
+                    function onRowsRemoved(parent, first, last) {
+                        let nextRow = first - 1
+                        if (nextRow < 0 && tableView.model.rowCount(parent) > 0)
+                            nextRow = 0
+
+                        tableView.model.selectRow(nextRow)
+                    }
+
+                    function onColumnsRemoved(parent, first, last) {
+                        let nextColumn = first - 1
+                        if (nextColumn < 0 && tableView.model.columnCount(parent) > 0)
+                            nextColumn = 0
+
+                        tableView.model.selectColumn(nextColumn)
                     }
                 }
 
@@ -331,7 +460,7 @@ Rectangle {
             }
 
             HelperWidgets.IconButton {
-                id: addColumnContainer
+                id: addColumnButton
 
                 iconSize:16
                 Layout.preferredWidth: 24
@@ -346,7 +475,7 @@ Rectangle {
             }
 
             HelperWidgets.IconButton {
-                id: addRowContainer
+                id: addRowButton
 
                 iconSize:16
                 Layout.preferredWidth: tableView.width
@@ -367,10 +496,38 @@ Rectangle {
         }
     }
 
+    ColumnLayout {
+        id: importsProblem
+
+        visible: !topRow.visible && rootView.dataStoreExists && !rootView.projectImportExists
+        width: parent.width
+        anchors.verticalCenter: parent.verticalCenter
+        clip: true
+
+        Text {
+            text: qsTr("Import the project to your design document to make the Model Editor enabled.")
+            Layout.alignment: Qt.AlignCenter
+            Layout.maximumWidth: parent.width
+            leftPadding: StudioTheme.Values.collectionItemTextPadding
+            rightPadding: StudioTheme.Values.collectionItemTextPadding
+            color: StudioTheme.Values.themeTextColor
+            font.pixelSize: StudioTheme.Values.mediumFontSize
+            wrapMode: Text.Wrap
+        }
+
+        HelperWidgets.Button {
+            text: qsTr("Enable DataStore (This will add the required import)")
+            Layout.alignment: Qt.AlignCenter
+            onClicked: rootView.addProjectImport()
+            leftPadding: StudioTheme.Values.collectionItemTextPadding
+            rightPadding: StudioTheme.Values.collectionItemTextPadding
+        }
+    }
+
     Text {
         anchors.centerIn: parent
-        text: qsTr("Select a model to continue")
-        visible: !topRow.visible
+        text: qsTr("There are no models in this project.\nAdd or import a model.")
+        visible: !topRow.visible && !importsProblem.visible
         color: StudioTheme.Values.themeTextColor
         font.pixelSize: StudioTheme.Values.mediumFontSize
     }
diff --git a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionItem.qml b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionItem.qml
index 31ced43c1d..d963070536 100644
--- a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionItem.qml
+++ b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionItem.qml
@@ -16,9 +16,17 @@ Item {
     implicitHeight: boundingRect.height + 3
 
     property color textColor
+    readonly property string name: collectionName ?? ""
+    readonly property bool isSelected: collectionIsSelected
+    readonly property int id: index
+
+    function rename(newName) {
+        collectionName = newName
+    }
 
     signal selectItem(int itemIndex)
     signal deleteItem()
+    signal contextMenuRequested()
 
     Item {
         id: boundingRect
@@ -90,155 +98,12 @@ Item {
                 MouseArea {
                     anchors.fill: parent
                     acceptedButtons: Qt.RightButton | Qt.LeftButton
-                    onClicked: collectionMenu.popup()
-                }
-            }
-        }
-    }
-
-    StudioControls.Menu {
-        id: collectionMenu
-
-        closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside
-
-        StudioControls.MenuItem {
-            text: qsTr("Delete")
-            shortcut: StandardKey.Delete
-            onTriggered: deleteDialog.open()
-        }
-
-        StudioControls.MenuItem {
-            text: qsTr("Rename")
-            shortcut: StandardKey.Replace
-            onTriggered: renameDialog.open()
-        }
-
-        StudioControls.MenuItem {
-            text: qsTr("Assign to the selected node")
-            enabled: CollectionEditorBackend.rootView.targetNodeSelected
-            onTriggered: rootView.assignCollectionToSelectedNode(collectionName)
-        }
-    }
-
-    component Spacer: Item {
-        implicitWidth: 1
-        implicitHeight: StudioTheme.Values.columnGap
-    }
-
-    StudioControls.Dialog {
-        id: deleteDialog
-
-        title: qsTr("Deleting the model")
-        clip: true
-        implicitWidth: 300
-
-        contentItem: ColumnLayout {
-            spacing: 2
-
-            Text {
-                Layout.fillWidth: true
-
-                wrapMode: Text.WordWrap
-                color: StudioTheme.Values.themeTextColor
-                text: qsTr("Are you sure that you want to delete model \"%1\"?"
-                           + "\nThe model will be deleted permanently.").arg(collectionName)
-
-            }
-
-            Spacer {}
-
-            RowLayout {
-                spacing: StudioTheme.Values.sectionRowSpacing
-                Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
-
-                HelperWidgets.Button {
-                    text: qsTr("Delete")
-                    onClicked: root.deleteItem()
-                }
-
-                HelperWidgets.Button {
-                    text: qsTr("Cancel")
-                    onClicked: deleteDialog.reject()
-                }
-            }
-        }
-    }
-
-    StudioControls.Dialog {
-        id: renameDialog
-
-        title: qsTr("Rename model")
-
-        onAccepted: {
-            if (newNameField.text !== "")
-                collectionName = newNameField.text
-        }
-
-        onOpened: {
-            newNameField.text = collectionName
-        }
-
-        contentItem: ColumnLayout {
-            spacing: 2
-
-            Text {
-                text: qsTr("Previous name: " + collectionName)
-                color: StudioTheme.Values.themeTextColor
-            }
-
-            Spacer {}
-
-            Text {
-                Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
-                text: qsTr("New name:")
-                color: StudioTheme.Values.themeTextColor
-            }
-
-            StudioControls.TextField {
-                id: newNameField
-
-                Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
-                Layout.fillWidth: true
-
-                actionIndicator.visible: false
-                translationIndicator.visible: false
-                validator: newNameValidator
-
-                Keys.onEnterPressed: renameDialog.accept()
-                Keys.onReturnPressed: renameDialog.accept()
-                Keys.onEscapePressed: renameDialog.reject()
-
-                onTextChanged: {
-                    btnRename.enabled = newNameField.text !== ""
-                }
-            }
-
-            Spacer {}
-
-            RowLayout {
-                Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
-                spacing: StudioTheme.Values.sectionRowSpacing
-
-                HelperWidgets.Button {
-                    id: btnRename
-
-                    text: qsTr("Rename")
-                    onClicked: renameDialog.accept()
-                }
-
-                HelperWidgets.Button {
-                    text: qsTr("Cancel")
-                    onClicked: renameDialog.reject()
+                    onClicked: contextMenuRequested()
                 }
             }
         }
     }
 
-    RegularExpressionValidator {
-        id: newNameValidator
-        regularExpression: /^\w+$/
-    }
-
     states: [
         State {
             name: "default"
diff --git a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionListView.qml b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionListView.qml
index ef06a2e7a0..2b95abfc4f 100644
--- a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionListView.qml
+++ b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionListView.qml
@@ -2,6 +2,11 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import HelperWidgets 2.0 as HelperWidgets
+import StudioControls 1.0 as StudioControls
+import StudioTheme as StudioTheme
 import CollectionEditorBackend
 
 ListView {
@@ -10,8 +15,201 @@ ListView {
     model: CollectionEditorBackend.model
     clip: true
 
+    function closeDialogs() {
+        currentCollection.dereference()
+        collectionMenu.close()
+        deleteDialog.reject()
+        renameDialog.reject()
+    }
+
     delegate: CollectionItem {
         implicitWidth: root.width
         onDeleteItem: root.model.removeRow(index)
+        onContextMenuRequested: collectionMenu.openMenu(this)
+    }
+
+    QtObject {
+        id: currentCollection
+
+        property CollectionItem item
+        readonly property string name: item ? item.name : ""
+        readonly property bool selected: item ? item.isSelected : false
+        readonly property int index: item ? item.id : -1
+
+        function rename(newName) {
+            if (item)
+                item.rename(newName)
+        }
+
+        function deleteItem() {
+            if (item)
+                item.deleteItem()
+        }
+
+        function dereference() {
+            item = null
+        }
+    }
+
+    StudioControls.Menu {
+        id: collectionMenu
+
+        closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside
+
+        function openMenu(item) {
+            currentCollection.item = item
+            popup()
+        }
+
+        StudioControls.MenuItem {
+            text: qsTr("Delete")
+            shortcut: StandardKey.Delete
+            onTriggered: deleteDialog.open()
+        }
+
+        StudioControls.MenuItem {
+            text: qsTr("Rename")
+            shortcut: StandardKey.Replace
+            onTriggered: renameDialog.open()
+        }
+
+        StudioControls.MenuItem {
+            text: qsTr("Assign to the selected node")
+            enabled: CollectionEditorBackend.rootView.targetNodeSelected
+            onTriggered: rootView.assignCollectionToSelectedNode(currentCollection.name)
+        }
+    }
+
+    StudioControls.Dialog {
+        id: deleteDialog
+
+        title: qsTr("Deleting the model")
+        clip: true
+
+        onAccepted: currentCollection.deleteItem()
+
+        contentItem: ColumnLayout {
+            id: deleteDialogContent // Keep the id here even if it's not used, because the dialog might lose implicitSize
+
+            width: 300
+            spacing: 2
+
+            Text {
+                Layout.fillWidth: true
+
+                wrapMode: Text.WordWrap
+                color: StudioTheme.Values.themeTextColor
+                text: qsTr("Are you sure that you want to delete model \"%1\"?"
+                           + "\nThe model will be deleted permanently.").arg(currentCollection.name)
+
+            }
+
+            Spacer {}
+
+            RowLayout {
+                spacing: StudioTheme.Values.sectionRowSpacing
+                Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
+                Layout.fillWidth: true
+                Layout.preferredHeight: 40
+
+                HelperWidgets.Button {
+                    text: qsTr("Delete")
+                    onClicked: deleteDialog.accept()
+                }
+
+                HelperWidgets.Button {
+                    text: qsTr("Cancel")
+                    onClicked: deleteDialog.reject()
+                }
+            }
+        }
+    }
+
+    StudioControls.Dialog {
+        id: renameDialog
+
+        title: qsTr("Rename model")
+
+        onAccepted: {
+            if (newNameField.text !== "")
+                currentCollection.rename(newNameField.text)
+        }
+
+        onOpened: {
+            newNameField.text = currentCollection.name
+        }
+
+        contentItem: ColumnLayout {
+            spacing: 2
+
+            Text {
+                text: qsTr("Previous name: " + currentCollection.name)
+                color: StudioTheme.Values.themeTextColor
+            }
+
+            Spacer {}
+
+            Text {
+                Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
+                text: qsTr("New name:")
+                color: StudioTheme.Values.themeTextColor
+            }
+
+            StudioControls.TextField {
+                id: newNameField
+
+                Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
+                Layout.fillWidth: true
+
+                actionIndicator.visible: false
+                translationIndicator.visible: false
+                validator: newNameValidator
+
+                Keys.onEnterPressed: renameDialog.accept()
+                Keys.onReturnPressed: renameDialog.accept()
+                Keys.onEscapePressed: renameDialog.reject()
+
+                onTextChanged: {
+                    btnRename.enabled = newNameField.text !== ""
+                }
+            }
+
+            Spacer {}
+
+            RowLayout {
+                Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
+                spacing: StudioTheme.Values.sectionRowSpacing
+
+                HelperWidgets.Button {
+                    id: btnRename
+
+                    text: qsTr("Rename")
+                    onClicked: renameDialog.accept()
+                }
+
+                HelperWidgets.Button {
+                    text: qsTr("Cancel")
+                    onClicked: renameDialog.reject()
+                }
+            }
+        }
+    }
+
+    Connections {
+        target: root.model
+
+        function onModelReset() {
+            root.closeDialogs()
+        }
+    }
+
+    RegularExpressionValidator {
+        id: newNameValidator
+        regularExpression: /^\w+$/
+    }
+
+    component Spacer: Item {
+        implicitWidth: 1
+        implicitHeight: StudioTheme.Values.columnGap
     }
 }
diff --git a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionView.qml b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionView.qml
index acf82fe452..9d483037ac 100644
--- a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionView.qml
+++ b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionView.qml
@@ -28,6 +28,12 @@ Item {
         print("TODO: deleteSelectedCollection")
     }
 
+    function closeDialogs() {
+        importDialog.reject()
+        newCollection.reject()
+        warningDialog.reject()
+    }
+
     ImportDialog {
         id: importDialog
 
@@ -147,6 +153,8 @@ Item {
             }
 
             CollectionListView { // Model Groups
+                id: collectionListView
+
                 Layout.fillWidth: true
                 Layout.minimumHeight: bottomSpacer.isExpanded ? 150 : 0
                 Layout.fillHeight: !bottomSpacer.isExpanded
@@ -187,4 +195,12 @@ Item {
             SplitView.fillWidth: true
         }
     }
+
+    Connections {
+        target: root.model
+
+        function onModelReset() {
+            root.closeDialogs()
+        }
+    }
 }
diff --git a/share/qtcreator/qmldesigner/collectionEditorQmlSource/ColorViewDelegate.qml b/share/qtcreator/qmldesigner/collectionEditorQmlSource/ColorViewDelegate.qml
index 6bb1b60159..16e55acfb4 100644
--- a/share/qtcreator/qmldesigner/collectionEditorQmlSource/ColorViewDelegate.qml
+++ b/share/qtcreator/qmldesigner/collectionEditorQmlSource/ColorViewDelegate.qml
@@ -16,19 +16,33 @@ Row {
 
     property color color
     property bool supportGradient: false
-    readonly property color __editColor: edit
+
+    property QtObject backendValue: QtObject {
+        property color value: edit
+        readonly property color editColor: edit
+
+        function resetValue() {
+            if (value)
+                value = ""
+        }
+
+        onValueChanged: {
+            if (editColor !== value)
+                edit = value
+        }
+    }
 
     property variant value: {
-        if (!edit)
+        if (!colorEditor.backendValue || !colorEditor.backendValue.value)
             return "white" // default color for Rectangle
 
         if (colorEditor.isVector3D) {
-            return Qt.rgba(__editColor.x,
-                           __editColor.y,
-                           __editColor.z, 1)
+            return Qt.rgba(colorEditor.backendValue.value.x,
+                           colorEditor.backendValue.value.y,
+                           colorEditor.backendValue.value.z, 1)
         }
 
-        return __editColor
+        return colorEditor.backendValue.value
     }
 
     property alias gradientPropertyName: popupDialog.gradientPropertyName
@@ -42,31 +56,17 @@ Row {
 
     property bool __block: false
 
-    function getColorFromEditValue() {
-        if (!edit)
-            return "white" // default color for Rectangle
-
-        if (colorEditor.isVector3D) {
-            return Qt.rgba(__editColor.x,
-                           __editColor.y,
-                           __editColor.z, 1)
-        }
-
-        return __editColor
-    }
-
     function resetShapeColor() {
-        if (edit)
-            edit = ""
+        colorEditor.backendValue.resetValue()
     }
 
     function writeColor() {
         if (colorEditor.isVector3D) {
-            edit = Qt.vector3d(colorEditor.color.r,
+            colorEditor.backendValue.value = Qt.vector3d(colorEditor.color.r,
                                colorEditor.color.g,
                                colorEditor.color.b)
         } else {
-            edit = colorEditor.color
+            colorEditor.backendValue.value = colorEditor.color
         }
     }
 
@@ -77,7 +77,7 @@ Row {
     // Syncing color from backend to frontend and block reflection
     function syncColor() {
         colorEditor.__block = true
-        colorEditor.color = colorEditor.getColorFromEditValue()
+        colorEditor.color = colorEditor.value
         hexTextField.syncColor()
         colorEditor.__block = false
     }
@@ -92,7 +92,7 @@ Row {
                 colorEditor.syncColor()
         }
 
-        function on__EditColorChanged() {
+        function onBackendValueChanged() {
             if (popupDialog.isSolid())
                 colorEditor.syncColor()
         }
@@ -208,7 +208,7 @@ Row {
                 if (colorEditor.supportGradient && popupDialog.loaderItem.gradientModel.hasGradient) {
                     var hexColor = convertColorToString(colorEditor.color)
                     hexTextField.text = hexColor
-                    edit = hexColor
+                    colorEditor.backendValue.value = hexColor
                     popupDialog.loaderItem.commitGradientColor()
                 }
             }
@@ -292,5 +292,5 @@ Row {
 
     Component.onCompleted: popupDialog.determineActiveColorMode()
 
-    on__EditColorChanged: popupDialog.determineActiveColorMode()
+    onBackendValueChanged: popupDialog.determineActiveColorMode()
 }
diff --git a/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibrary.qml b/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibrary.qml
index c6db8425ff..2c98b58adc 100644
--- a/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibrary.qml
+++ b/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibrary.qml
@@ -23,6 +23,7 @@ Item {
         texturesView.closeContextMenu()
         environmentsView.closeContextMenu()
         effectsView.closeContextMenu()
+        userView.closeContextMenu()
         HelperWidgets.Controller.closeContextMenu()
     }
 
@@ -113,10 +114,18 @@ Item {
                     id: tabBar
                     width: parent.width
                     height: StudioTheme.Values.toolbarHeight
-                    tabsModel: [{name: qsTr("Materials"),    icon: StudioTheme.Constants.material_medium},
-                                {name: qsTr("Textures"),     icon: StudioTheme.Constants.textures_medium},
-                                {name: qsTr("Environments"), icon: StudioTheme.Constants.languageList_medium},
-                                {name: qsTr("Effects"),      icon: StudioTheme.Constants.effects}]
+
+                    Component.onCompleted: {
+                        var tabs = [
+                            { name: qsTr("Materials"),    icon: StudioTheme.Constants.material_medium },
+                            { name: qsTr("Textures"),     icon: StudioTheme.Constants.textures_medium },
+                            { name: qsTr("Environments"), icon: StudioTheme.Constants.languageList_medium },
+                            { name: qsTr("Effects"),      icon: StudioTheme.Constants.effects }
+                        ];
+                        if (ContentLibraryBackend.rootView.userBundleEnabled())
+                            tabs.push({ name: qsTr("User Assets"), icon: StudioTheme.Constants.effects });
+                        tabBar.tabsModel = tabs;
+                    }
                 }
             }
         }
@@ -148,7 +157,8 @@ Item {
 
                 onUnimport: (bundleMat) => {
                     confirmUnimportDialog.targetBundleItem = bundleMat
-                    confirmUnimportDialog.targetBundleType = "material"
+                    confirmUnimportDialog.targetBundleLabel = "material"
+                    confirmUnimportDialog.targetBundleModel = ContentLibraryBackend.materialsModel
                     confirmUnimportDialog.open()
                 }
 
@@ -208,7 +218,31 @@ Item {
 
                 onUnimport: (bundleItem) => {
                     confirmUnimportDialog.targetBundleItem = bundleItem
-                    confirmUnimportDialog.targetBundleType = "effect"
+                    confirmUnimportDialog.targetBundleLabel = "effect"
+                    confirmUnimportDialog.targetBundleModel = ContentLibraryBackend.effectsModel
+                    confirmUnimportDialog.open()
+                }
+
+                onCountChanged: root.responsiveResize(stackLayout.width, stackLayout.height)
+            }
+
+            ContentLibraryUserView {
+                id: userView
+
+                adsFocus: root.adsFocus
+                width: root.width
+
+                cellWidth: root.thumbnailSize
+                cellHeight: root.thumbnailSize + 20
+                numColumns: root.numColumns
+                hideHorizontalScrollBar: true
+
+                searchBox: searchBox
+
+                onUnimport: (bundleItem) => {
+                    confirmUnimportDialog.targetBundleItem = bundleItem
+                    confirmUnimportDialog.targetBundleLabel = "material"
+                    confirmUnimportDialog.targetBundleModel = ContentLibraryBackend.userModel
                     confirmUnimportDialog.open()
                 }
 
diff --git a/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryMaterial.qml b/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryMaterial.qml
index 93b226d6ca..0e9fc4903e 100644
--- a/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryMaterial.qml
+++ b/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryMaterial.qml
@@ -12,12 +12,15 @@ import WebFetcher
 Item {
     id: root
 
-    signal showContextMenu()
-
     // Download states: "" (ie default, not downloaded), "unavailable", "downloading", "downloaded",
     //                  "failed"
     property string downloadState: modelData.isDownloaded() ? "downloaded" : ""
 
+    property bool importerRunning: false
+
+    signal showContextMenu()
+    signal addToProject()
+
     visible: modelData.bundleMaterialVisible
 
     MouseArea {
@@ -29,7 +32,7 @@ Item {
         acceptedButtons: Qt.LeftButton | Qt.RightButton
 
         onPressed: (mouse) => {
-            if (mouse.button === Qt.LeftButton && !materialsModel.importerRunning) {
+            if (mouse.button === Qt.LeftButton && !root.importerRunning) {
                 if (root.downloadState === "downloaded")
                     ContentLibraryBackend.rootView.startDragMaterial(modelData, mapToGlobal(mouse.x, mouse.y))
             } else if (mouse.button === Qt.RightButton && root.downloadState === "downloaded") {
@@ -96,12 +99,12 @@ Item {
                 pressColor: Qt.hsla(c.hslHue, c.hslSaturation, c.hslLightness, .4)
                 anchors.right: img.right
                 anchors.bottom: img.bottom
-                enabled: !ContentLibraryBackend.materialsModel.importerRunning
+                enabled: !root.importerRunning
                 visible: root.downloadState === "downloaded"
                          && (containsMouse || mouseArea.containsMouse)
 
                 onClicked: {
-                    ContentLibraryBackend.materialsModel.addToProject(modelData)
+                    root.addToProject()
                 }
             }
 
diff --git a/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryMaterialContextMenu.qml b/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryMaterialContextMenu.qml
index ca3a05bdd1..b67ec311ef 100644
--- a/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryMaterialContextMenu.qml
+++ b/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryMaterialContextMenu.qml
@@ -15,8 +15,9 @@ StudioControls.Menu {
 
     readonly property bool targetAvailable: targetMaterial && !importerRunning
 
-    signal unimport(var bundleMat);
-    signal addToProject(var bundleMat)
+    signal unimport();
+    signal addToProject()
+    signal applyToSelected(bool add)
 
     function popupMenu(targetMaterial = null)
     {
@@ -29,13 +30,13 @@ StudioControls.Menu {
     StudioControls.MenuItem {
         text: qsTr("Apply to selected (replace)")
         enabled: root.targetAvailable && root.hasModelSelection
-        onTriggered: materialsModel.applyToSelected(root.targetMaterial, false)
+        onTriggered: root.applyToSelected(false)
     }
 
     StudioControls.MenuItem {
         text: qsTr("Apply to selected (add)")
         enabled: root.targetAvailable && root.hasModelSelection
-        onTriggered: materialsModel.applyToSelected(root.targetMaterial, true)
+        onTriggered: root.applyToSelected(true)
     }
 
     StudioControls.MenuSeparator {}
@@ -45,7 +46,7 @@ StudioControls.Menu {
         text: qsTr("Add an instance to project")
 
         onTriggered: {
-            root.addToProject(root.targetMaterial)
+            root.addToProject()
         }
     }
 
@@ -53,6 +54,6 @@ StudioControls.Menu {
         enabled: root.targetAvailable && root.targetMaterial.bundleMaterialImported
         text: qsTr("Remove from project")
 
-        onTriggered: root.unimport(root.targetMaterial)
+        onTriggered: root.unimport()
     }
 }
diff --git a/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryMaterialsView.qml b/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryMaterialsView.qml
index c21baf4c58..9a0e33b8e5 100644
--- a/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryMaterialsView.qml
+++ b/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryMaterialsView.qml
@@ -27,8 +27,6 @@ HelperWidgets.ScrollView {
         root.count = c
     }
 
-    property var currMaterialItem: null
-    property var rootItem: null
     property var materialsModel: ContentLibraryBackend.materialsModel
 
     required property var searchBox
@@ -51,17 +49,19 @@ HelperWidgets.ScrollView {
         ContentLibraryMaterialContextMenu {
             id: ctxMenu
 
-            hasModelSelection: materialsModel.hasModelSelection
-            importerRunning: materialsModel.importerRunning
+            hasModelSelection: root.materialsModel.hasModelSelection
+            importerRunning: root.materialsModel.importerRunning
 
-            onUnimport: (bundleMat) => root.unimport(bundleMat)
-            onAddToProject: (bundleMat) => materialsModel.addToProject(bundleMat)
+            onApplyToSelected: (add) => root.materialsModel.applyToSelected(ctxMenu.targetMaterial, add)
+
+            onUnimport: root.unimport(ctxMenu.targetMaterial)
+            onAddToProject: root.materialsModel.addToProject(ctxMenu.targetMaterial)
         }
 
         Repeater {
             id: categoryRepeater
 
-            model: materialsModel
+            model: root.materialsModel
 
             delegate: HelperWidgets.Section {
                 id: section
@@ -73,7 +73,7 @@ HelperWidgets.ScrollView {
                 bottomPadding: StudioTheme.Values.sectionPadding
 
                 caption: bundleCategoryName
-                visible: bundleCategoryVisible && !materialsModel.isEmpty
+                visible: bundleCategoryVisible && !root.materialsModel.isEmpty
                 expanded: bundleCategoryExpanded
                 expandOnClick: false
                 category: "ContentLib_Mat"
@@ -103,7 +103,10 @@ HelperWidgets.ScrollView {
                             width: root.cellWidth
                             height: root.cellHeight
 
+                            importerRunning: root.materialsModel.importerRunning
+
                             onShowContextMenu: ctxMenu.popupMenu(modelData)
+                            onAddToProject: root.materialsModel.addToProject(modelData)
                         }
 
                         onCountChanged: root.assignMaxCount()
@@ -115,13 +118,13 @@ HelperWidgets.ScrollView {
         Text {
             id: infoText
             text: {
-                if (!materialsModel.matBundleExists)
+                if (!root.materialsModel.matBundleExists)
                     qsTr("No materials available. Make sure you have internet connection.")
                 else if (!ContentLibraryBackend.rootView.isQt6Project)
                     qsTr("<b>Content Library</b> materials are not supported in Qt5 projects.")
                 else if (!ContentLibraryBackend.rootView.hasQuick3DImport)
                     qsTr("To use <b>Content Library</b>, first add the QtQuick3D module in the <b>Components</b> view.")
-                else if (!materialsModel.hasRequiredQuick3DImport)
+                else if (!root.materialsModel.hasRequiredQuick3DImport)
                     qsTr("To use <b>Content Library</b>, version 6.3 or later of the QtQuick3D module is required.")
                 else if (!ContentLibraryBackend.rootView.hasMaterialLibrary)
                     qsTr("<b>Content Library</b> is disabled inside a non-visual component.")
@@ -134,7 +137,7 @@ HelperWidgets.ScrollView {
             font.pixelSize: StudioTheme.Values.baseFontSize
             topPadding: 10
             leftPadding: 10
-            visible: materialsModel.isEmpty
+            visible: root.materialsModel.isEmpty
         }
     }
 }
diff --git a/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryTexture.qml b/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryTexture.qml
index f74f190040..4fbeb1b8b5 100644
--- a/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryTexture.qml
+++ b/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryTexture.qml
@@ -148,7 +148,7 @@ Item {
         visible: root.delegateVisible && root.downloadState != "downloading"
         cache: false
 
-        property string webUrl: modelData.textureWebUrl
+        property string textureUrl: modelData.textureUrl
 
         IconButton {
             id: downloadIcon
@@ -279,7 +279,7 @@ Item {
 
     FileDownloader {
         id: textureDownloader
-        url: image.webUrl
+        url: image.textureUrl
         probeUrl: false
         downloadEnabled: true
         onDownloadStarting: {
@@ -333,7 +333,7 @@ Item {
 
     FileDownloader {
         id: iconDownloader
-        url: modelData.textureWebIconUrl
+        url: modelData.textureIconUrl
         probeUrl: false
         downloadEnabled: true
         targetFilePath: modelData.textureIconPath
diff --git a/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryTexturesView.qml b/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryTexturesView.qml
index 1fac9f2234..617b724e66 100644
--- a/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryTexturesView.qml
+++ b/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryTexturesView.qml
@@ -27,9 +27,6 @@ HelperWidgets.ScrollView {
         root.count = c
     }
 
-    property var currMaterialItem: null
-    property var rootItem: null
-
     required property var searchBox
     required property var model
     required property string sectionCategory
diff --git a/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryUserView.qml b/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryUserView.qml
new file mode 100644
index 0000000000..1288e14c2a
--- /dev/null
+++ b/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryUserView.qml
@@ -0,0 +1,169 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+import QtQuick
+import Qt.labs.qmlmodels
+import HelperWidgets as HelperWidgets
+import StudioControls as StudioControls
+import StudioTheme as StudioTheme
+import ContentLibraryBackend
+
+HelperWidgets.ScrollView {
+    id: root
+
+    clip: true
+    interactive: !ctxMenuMaterial.opened && !ctxMenuTexture.opened
+                 && !ContentLibraryBackend.rootView.isDragging && !HelperWidgets.Controller.contextMenuOpened
+
+    property real cellWidth: 100
+    property real cellHeight: 120
+    property int numColumns: 4
+
+    property int count: 0
+    function assignMaxCount() {
+        let c = 0
+        for (let i = 0; i < categoryRepeater.count; ++i)
+            c = Math.max(c, categoryRepeater.itemAt(i)?.count ?? 0)
+
+        root.count = c
+    }
+
+    required property var searchBox
+
+    signal unimport(var bundleItem);
+
+    function closeContextMenu() {
+        ctxMenuMaterial.close()
+        ctxMenuTexture.close()
+    }
+
+    function expandVisibleSections() {
+        for (let i = 0; i < categoryRepeater.count; ++i) {
+            let cat = categoryRepeater.itemAt(i)
+            if (cat.visible && !cat.expanded)
+                cat.expandSection()
+        }
+    }
+
+    Column {
+        ContentLibraryMaterialContextMenu {
+            id: ctxMenuMaterial
+
+            hasModelSelection: ContentLibraryBackend.userModel.hasModelSelection
+            importerRunning: ContentLibraryBackend.userModel.importerRunning
+
+            onApplyToSelected: (add) => ContentLibraryBackend.userModel.applyToSelected(ctxMenuMaterial.targetMaterial, add)
+
+            onUnimport: root.unimport(ctxMenuMaterial.targetMaterial)
+            onAddToProject: ContentLibraryBackend.userModel.addToProject(ctxMenuMaterial.targetMaterial)
+        }
+
+        ContentLibraryTextureContextMenu {
+            id: ctxMenuTexture
+
+            hasSceneEnv: ContentLibraryBackend.texturesModel.hasSceneEnv
+        }
+
+        Repeater {
+            id: categoryRepeater
+
+            model: ContentLibraryBackend.userModel
+
+            delegate: HelperWidgets.Section {
+                id: section
+
+                width: root.width
+                leftPadding: StudioTheme.Values.sectionPadding
+                rightPadding: StudioTheme.Values.sectionPadding
+                topPadding: StudioTheme.Values.sectionPadding
+                bottomPadding: StudioTheme.Values.sectionPadding
+
+                caption: categoryName
+                visible: categoryVisible
+                category: "ContentLib_User"
+
+                function expandSection() {
+                    section.expanded = true
+                }
+
+                property alias count: repeater.count
+
+                onCountChanged: root.assignMaxCount()
+
+                property int numVisibleItem: 1 // initially, the tab is invisible so this will be 0
+
+                Grid {
+                    width: section.width - section.leftPadding - section.rightPadding
+                    spacing: StudioTheme.Values.sectionGridSpacing
+                    columns: root.numColumns
+
+                    Repeater {
+                        id: repeater
+                        model: categoryItems
+
+                        delegate: DelegateChooser {
+                            role: "itemType"
+
+                            DelegateChoice {
+                                roleValue: "material"
+                                ContentLibraryMaterial {
+                                    width: root.cellWidth
+                                    height: root.cellHeight
+
+                                    importerRunning: ContentLibraryBackend.userModel.importerRunning
+
+                                    onShowContextMenu: ctxMenuMaterial.popupMenu(modelData)
+                                    onAddToProject: ContentLibraryBackend.userModel.addToProject(modelData)
+
+                                    onVisibleChanged: {
+                                        section.numVisibleItem += visible ? 1 : -1
+                                    }
+                                }
+                            }
+                            DelegateChoice {
+                                roleValue: "texture"
+                                delegate: ContentLibraryTexture {
+                                    width: root.cellWidth
+                                    height: root.cellWidth // for textures use a square size since there is no name row
+
+                                    onShowContextMenu: ctxMenuTexture.popupMenu(modelData)
+                                }
+                            }
+                        }
+
+                        onCountChanged: root.assignMaxCount()
+                    }
+                }
+
+                Text {
+                    text: qsTr("No match found.");
+                    color: StudioTheme.Values.themeTextColor
+                    font.pixelSize: StudioTheme.Values.baseFontSize
+                    leftPadding: 10
+                    visible: !searchBox.isEmpty() && section.numVisibleItem === 0
+                }
+            }
+        }
+
+        Text {
+            id: infoText
+            text: {
+                if (!ContentLibraryBackend.effectsModel.bundleExists)
+                    qsTr("User bundle couldn't be found.")
+                else if (!ContentLibraryBackend.rootView.isQt6Project)
+                    qsTr("<b>Content Library</b> is not supported in Qt5 projects.")
+                else if (!ContentLibraryBackend.rootView.hasQuick3DImport)
+                    qsTr("To use <b>Content Library</b>, first add the QtQuick3D module in the <b>Components</b> view.")
+                else if (!ContentLibraryBackend.rootView.hasMaterialLibrary)
+                    qsTr("<b>Content Library</b> is disabled inside a non-visual component.")
+                else
+                    ""
+            }
+            color: StudioTheme.Values.themeTextColor
+            font.pixelSize: StudioTheme.Values.baseFontSize
+            topPadding: 10
+            leftPadding: 10
+            visible: ContentLibraryBackend.effectsModel.isEmpty
+        }
+    }
+}
diff --git a/share/qtcreator/qmldesigner/contentLibraryQmlSource/UnimportBundleMaterialDialog.qml b/share/qtcreator/qmldesigner/contentLibraryQmlSource/UnimportBundleMaterialDialog.qml
index 48be045d8b..4385e3bf82 100644
--- a/share/qtcreator/qmldesigner/contentLibraryQmlSource/UnimportBundleMaterialDialog.qml
+++ b/share/qtcreator/qmldesigner/contentLibraryQmlSource/UnimportBundleMaterialDialog.qml
@@ -12,24 +12,27 @@ import ContentLibraryBackend
 StudioControls.Dialog {
     id: root
 
-    title: qsTr("Bundle material might be in use")
+    property var targetBundleItem
+    property var targetBundleLabel // "effect" or "material"
+    property var targetBundleModel
+
+    title: qsTr("Bundle %1 might be in use").arg(root.targetBundleLabel)
     anchors.centerIn: parent
     closePolicy: Popup.CloseOnEscape
     implicitWidth: 300
     modal: true
 
-    property var targetBundleType // "effect" or "material"
-    property var targetBundleItem
+    onOpened: warningText.forceActiveFocus()
 
     contentItem: Column {
         spacing: 20
         width: parent.width
 
         Text {
-            id: folderNotEmpty
+            id: warningText
 
-            text: qsTr("If the %1 you are removing is in use, it might cause the project to malfunction.\n\nAre you sure you want to remove the %1?")
-                        .arg(root.targetBundleType)
+            text: qsTr("If the %1 you are removing is in use, it might cause the project to malfunction.\n\nAre you sure you want to remove it?")
+                        .arg(root.targetBundleLabel)
             color: StudioTheme.Values.themeTextColor
             wrapMode: Text.WordWrap
             anchors.right: parent.right
@@ -49,11 +52,7 @@ StudioControls.Dialog {
                 text: qsTr("Remove")
 
                 onClicked: {
-                    if (root.targetBundleType === "material")
-                        ContentLibraryBackend.materialsModel.removeFromProject(root.targetBundleItem)
-                    else if (root.targetBundleType === "effect")
-                        ContentLibraryBackend.effectsModel.removeFromProject(root.targetBundleItem)
-
+                    root.targetBundleModel.removeFromProject(root.targetBundleItem)
                     root.accept()
                 }
             }
@@ -64,6 +63,4 @@ StudioControls.Dialog {
             }
         }
     }
-
-    onOpened: folderNotEmpty.forceActiveFocus()
 }
diff --git a/share/qtcreator/qmldesigner/designericons.json b/share/qtcreator/qmldesigner/designericons.json
index 157012b312..005494b471 100644
--- a/share/qtcreator/qmldesigner/designericons.json
+++ b/share/qtcreator/qmldesigner/designericons.json
@@ -219,7 +219,7 @@
             }
         },
         "CameraSpeedConfigIcon": {
-            "iconName": "camera_medium"
+            "iconName": "cameraSpeed_medium"
         },
         "EditColorIcon": {
             "iconName": "colorSelection_medium"
diff --git a/share/qtcreator/qmldesigner/edit3dQmlSource/CameraSpeedConfigurationDialog.qml b/share/qtcreator/qmldesigner/edit3dQmlSource/CameraSpeedConfigurationDialog.qml
index 2e2ff54700..b51369ffa3 100644
--- a/share/qtcreator/qmldesigner/edit3dQmlSource/CameraSpeedConfigurationDialog.qml
+++ b/share/qtcreator/qmldesigner/edit3dQmlSource/CameraSpeedConfigurationDialog.qml
@@ -57,7 +57,7 @@ Rectangle {
 
                 HelperWidgets.IconIndicator {
                     anchors.fill: parent
-                    icon: StudioTheme.Constants.camera_medium
+                    icon: StudioTheme.Constants.cameraSpeed_medium
                     pixelSize: StudioTheme.Values.myIconFontSize * 1.4
                     iconColor: StudioTheme.Values.themeLinkIndicatorColorHover
                     enabled: false
diff --git a/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectComposer.qml b/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectComposer.qml
index dda1d93ff9..305bbc7925 100644
--- a/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectComposer.qml
+++ b/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectComposer.qml
@@ -365,7 +365,7 @@ ColumnLayout {
     Connections {
         id: dragConnection
         target: root.draggedSec
-        onYChanged: root.handleDragMove()
+        function onYChanged() { root.handleDragMove() }
     }
 
     Timer {
diff --git a/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectComposerPreview.qml b/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectComposerPreview.qml
index c832b2f370..c0c47f7366 100644
--- a/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectComposerPreview.qml
+++ b/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectComposerPreview.qml
@@ -21,6 +21,7 @@ Column {
     readonly property int updateDelay: 100
 
     readonly property int previewMargin: 5
+    readonly property int extraMargin: 200
 
     property real previewScale: 1
 
@@ -246,6 +247,8 @@ Column {
             layer.enabled: true
             layer.mipmap: true
             layer.smooth: true
+            layer.sourceRect: Qt.rect(-root.extraMargin, -root.extraMargin,
+                                      width + root.extraMargin * 2, height + root.extraMargin * 2)
             visible: false
 
             Image {
@@ -347,10 +350,6 @@ Column {
                 width: source.width
                 height: source.height
                 anchors.centerIn: parent
-                // Cache the layer. This way heavy shaders rendering doesn't
-                // slow down code editing & rest of the UI.
-                layer.enabled: true
-                layer.smooth: true
             }
         }
 
@@ -383,7 +382,6 @@ Column {
         Connections {
             target: effectComposerModel
             function onShadersBaked() {
-                console.log("Shaders Baked!")
                 updateTimer.restart()
             }
         }
diff --git a/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectComposerTopBar.qml b/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectComposerTopBar.qml
index d5ac4461c4..8f98ae25b2 100644
--- a/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectComposerTopBar.qml
+++ b/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectComposerTopBar.qml
@@ -48,7 +48,7 @@ Rectangle {
             style: StudioTheme.Values.viewBarButtonStyle
             buttonIcon: StudioTheme.Constants.saveAs_medium
             tooltip: qsTr("Save current composition with a new name")
-            enabled: root.backendModel ? root.backendModel.isEnabled && !root.backendModel.isEmpty
+            enabled: root.backendModel ? root.backendModel.isEnabled && root.backendModel.currentComposition !== ""
                                        : false
 
             onClicked: root.saveAsClicked()
@@ -58,7 +58,8 @@ Rectangle {
             style: StudioTheme.Values.viewBarButtonStyle
             buttonIcon: StudioTheme.Constants.assignTo_medium
             tooltip: qsTr("Assign current composition to selected item")
-            enabled: root.backendModel ? root.backendModel.isEnabled
+            enabled: root.backendModel ? root.backendModel.hasValidTarget
+                                         && root.backendModel.isEnabled
                                          && root.backendModel.currentComposition !== ""
                                        : false
 
diff --git a/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectCompositionNode.qml b/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectCompositionNode.qml
index 6defa3b092..a606461b5c 100644
--- a/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectCompositionNode.qml
+++ b/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectCompositionNode.qml
@@ -43,6 +43,8 @@ HelperWidgets.Section {
 
             EffectCompositionNodeUniform {
                 width: root.width
+
+                onReset: nodeUniformsModel.resetData(index)
             }
         }
     }
diff --git a/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectCompositionNodeUniform.qml b/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectCompositionNodeUniform.qml
index 71cbf94f8b..7c3214c5fa 100644
--- a/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectCompositionNodeUniform.qml
+++ b/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectCompositionNodeUniform.qml
@@ -13,9 +13,10 @@ Item {
     id: root
 
     height: layout.implicitHeight
-
     visible: !uniformUseCustomValue
 
+    signal reset()
+
     Component.onCompleted: {
         if (uniformType === "int") {
             if (uniformControlType === "channel")
@@ -49,10 +50,11 @@ Item {
     RowLayout {
         id: layout
 
-        spacing: 20
         anchors.fill: parent
 
         Text {
+            id: textName
+
             text: uniformDisplayName
             color: StudioTheme.Values.themeTextColor
             font.pixelSize: StudioTheme.Values.baseFontSize
@@ -63,11 +65,38 @@ Item {
             elide: Text.ElideRight
 
             HelperWidgets.ToolTipArea {
+                id: tooltipArea
+
                 anchors.fill: parent
                 tooltip: uniformDescription
             }
         }
 
+        Item {
+            Layout.preferredHeight: 30
+            Layout.preferredWidth: 30
+
+            MouseArea {
+                id: mouseArea
+
+                anchors.fill: parent
+                hoverEnabled: true
+            }
+
+            HelperWidgets.IconButton {
+                id: iconButton
+
+                buttonSize: 24
+                icon: StudioTheme.Constants.reload_medium
+                iconSize: 16
+                anchors.centerIn: parent
+                visible: mouseArea.containsMouse || iconButton.containsMouse
+                tooltip: qsTr("Reset value")
+                onClicked: root.reset()
+            }
+
+        }
+
         Loader {
             id: valueLoader
             Layout.fillWidth: true
diff --git a/share/qtcreator/qmldesigner/effectComposerQmlSources/SaveAsDialog.qml b/share/qtcreator/qmldesigner/effectComposerQmlSources/SaveAsDialog.qml
index d139ba9205..65b01be457 100644
--- a/share/qtcreator/qmldesigner/effectComposerQmlSources/SaveAsDialog.qml
+++ b/share/qtcreator/qmldesigner/effectComposerQmlSources/SaveAsDialog.qml
@@ -50,11 +50,13 @@ StudioControls.Dialog {
                         if (/[^A-Za-z0-9_]+/.test(text))
                             errMsg = qsTr("Name contains invalid characters.")
                         else if (!/^[A-Z]/.test(text))
-                            errMsg = qsTr("Name must start with a capital letter")
+                            errMsg = qsTr("Name must start with a capital letter.")
                         else if (text.length < 3)
-                            errMsg = qsTr("Name must have at least 3 characters")
+                            errMsg = qsTr("Name must have at least 3 characters.")
                         else if (/\s/.test(text))
-                            errMsg = qsTr("Name cannot contain white space")
+                            errMsg = qsTr("Name cannot contain white space.")
+                        else if (EffectComposerBackend.effectComposerModel.nameExists(text))
+                            errMsg = qsTr("Name is already taken.")
 
                         emptyText.text = errMsg
                         btnSave.enabled = errMsg.length === 0
diff --git a/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueColor.qml b/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueColor.qml
index 4b00bd7613..f7482260b5 100644
--- a/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueColor.qml
+++ b/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueColor.qml
@@ -15,8 +15,14 @@ Row {
     StudioControls.ColorEditor {
         actionIndicatorVisible: false
 
-        Component.onCompleted: color = uniformValue
+        // color: uniformValue binding can get overwritten by normal operation of the control
+        property color resetValue: uniformValue
 
-        onColorChanged: uniformValue = color
+        onResetValueChanged: color = uniformValue
+        Component.onCompleted: color = uniformValue
+        onColorChanged: {
+            if (uniformValue !== color)
+                uniformValue = color
+        }
     }
 }
diff --git a/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueFloat.qml b/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueFloat.qml
index 7348d6668b..969d7e2949 100644
--- a/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueFloat.qml
+++ b/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueFloat.qml
@@ -14,6 +14,10 @@ Row {
     HelperWidgets.DoubleSpinBox {
         id: spinBox
 
+        // value: uniformValue binding can get overwritten by normal operation of the control
+        property double resetValue: uniformValue
+        onResetValueChanged: value = resetValue
+
         width: 60
         spinBoxIndicatorVisible: false
         inputHAlignment: Qt.AlignHCenter
@@ -22,7 +26,7 @@ Row {
         value: uniformValue
         stepSize: .01
         decimals: 2
-        onValueChanged: uniformValue = value
+        onValueModified: uniformValue = value
     }
 
     StudioControls.Slider {
diff --git a/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueInt.qml b/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueInt.qml
index 89f571c8cb..d67929168a 100644
--- a/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueInt.qml
+++ b/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueInt.qml
@@ -14,6 +14,10 @@ Row {
     HelperWidgets.DoubleSpinBox {
         id: spinBox
 
+        // value: uniformValue binding can get overwritten by normal operation of the control
+        property double resetValue: uniformValue
+        onResetValueChanged: value = resetValue
+
         width: 60
         spinBoxIndicatorVisible: false
         inputHAlignment: Qt.AlignHCenter
@@ -22,7 +26,7 @@ Row {
         value: uniformValue
         stepSize: 1
         decimals: 0
-        onValueChanged: uniformValue = Math.round(value)
+        onValueModified: uniformValue = Math.round(value)
     }
 
     StudioControls.Slider {
diff --git a/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueVec2.qml b/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueVec2.qml
index b703d5f184..adb4fe9905 100644
--- a/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueVec2.qml
+++ b/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueVec2.qml
@@ -15,6 +15,10 @@ RowLayout {
     HelperWidgets.DoubleSpinBox {
         id: vX
 
+        // value: uniformValue binding can get overwritten by normal operation of the control
+        property double resetValue: uniformValue.x
+        onResetValueChanged: value = resetValue
+
         Layout.fillWidth: true
         Layout.minimumWidth: 30
         Layout.maximumWidth: 60
@@ -26,7 +30,7 @@ RowLayout {
         value: uniformValue.x
         stepSize: .01
         decimals: 2
-        onValueChanged: uniformValue.x = value
+        onValueModified: uniformValue.x = value
     }
 
     Item { // spacer
@@ -51,6 +55,10 @@ RowLayout {
     HelperWidgets.DoubleSpinBox {
         id: vY
 
+        // value: uniformValue binding can get overwritten by normal operation of the control
+        property double resetValue: uniformValue.y
+        onResetValueChanged: value = resetValue
+
         Layout.fillWidth: true
         Layout.minimumWidth: 30
         Layout.maximumWidth: 60
@@ -62,7 +70,7 @@ RowLayout {
         value: uniformValue.y
         stepSize: .01
         decimals: 2
-        onValueChanged: uniformValue.y = value
+        onValueModified: uniformValue.y = value
     }
 
     Item { // spacer
diff --git a/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueVec3.qml b/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueVec3.qml
index d59b63a514..78573c48f6 100644
--- a/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueVec3.qml
+++ b/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueVec3.qml
@@ -15,6 +15,10 @@ RowLayout {
     HelperWidgets.DoubleSpinBox {
         id: vX
 
+        // value: uniformValue binding can get overwritten by normal operation of the control
+        property double resetValue: uniformValue.x
+        onResetValueChanged: value = resetValue
+
         Layout.fillWidth: true
         Layout.minimumWidth: 30
         Layout.maximumWidth: 60
@@ -26,7 +30,7 @@ RowLayout {
         value: uniformValue.x
         stepSize: .01
         decimals: 2
-        onValueChanged: uniformValue.x = value
+        onValueModified: uniformValue.x = value
     }
 
     Item { // spacer
@@ -51,6 +55,10 @@ RowLayout {
     HelperWidgets.DoubleSpinBox {
         id: vY
 
+        // value: uniformValue binding can get overwritten by normal operation of the control
+        property double resetValue: uniformValue.y
+        onResetValueChanged: value = resetValue
+
         Layout.fillWidth: true
         Layout.minimumWidth: 30
         Layout.maximumWidth: 60
@@ -62,7 +70,7 @@ RowLayout {
         value: uniformValue.y
         stepSize: .01
         decimals: 2
-        onValueChanged: uniformValue.y = value
+        onValueModified: uniformValue.y = value
     }
 
     Item { // spacer
@@ -87,6 +95,10 @@ RowLayout {
     HelperWidgets.DoubleSpinBox {
         id: vZ
 
+        // value: uniformValue binding can get overwritten by normal operation of the control
+        property double resetValue: uniformValue.z
+        onResetValueChanged: value = resetValue
+
         Layout.fillWidth: true
         Layout.minimumWidth: 30
         Layout.maximumWidth: 60
@@ -98,7 +110,7 @@ RowLayout {
         value: uniformValue.z
         stepSize: .01
         decimals: 2
-        onValueChanged: uniformValue.z = value
+        onValueModified: uniformValue.z = value
     }
 
     Item { // spacer
diff --git a/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueVec4.qml b/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueVec4.qml
index 7e930abf81..61ce8e6389 100644
--- a/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueVec4.qml
+++ b/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueVec4.qml
@@ -15,6 +15,10 @@ RowLayout {
     HelperWidgets.DoubleSpinBox {
         id: vX
 
+        // value: uniformValue binding can get overwritten by normal operation of the control
+        property double resetValue: uniformValue.x
+        onResetValueChanged: value = resetValue
+
         Layout.fillWidth: true
         Layout.minimumWidth: 30
         Layout.maximumWidth: 60
@@ -26,7 +30,7 @@ RowLayout {
         value: uniformValue.x
         stepSize: .01
         decimals: 2
-        onValueChanged: uniformValue.x = value
+        onValueModified: uniformValue.x = value
     }
 
     Item { // spacer
@@ -51,6 +55,10 @@ RowLayout {
     HelperWidgets.DoubleSpinBox {
         id: vY
 
+        // value: uniformValue binding can get overwritten by normal operation of the control
+        property double resetValue: uniformValue.y
+        onResetValueChanged: value = resetValue
+
         Layout.fillWidth: true
         Layout.minimumWidth: 30
         Layout.maximumWidth: 60
@@ -62,7 +70,7 @@ RowLayout {
         value: uniformValue.y
         stepSize: .01
         decimals: 2
-        onValueChanged: uniformValue.y = value
+        onValueModified: uniformValue.y = value
     }
 
     Item { // spacer
@@ -87,6 +95,10 @@ RowLayout {
     HelperWidgets.DoubleSpinBox {
         id: vZ
 
+        // value: uniformValue binding can get overwritten by normal operation of the control
+        property double resetValue: uniformValue.z
+        onResetValueChanged: value = resetValue
+
         Layout.fillWidth: true
         Layout.minimumWidth: 30
         Layout.maximumWidth: 60
@@ -98,7 +110,7 @@ RowLayout {
         value: uniformValue.z
         stepSize: .01
         decimals: 2
-        onValueChanged: uniformValue.z = value
+        onValueModified: uniformValue.z = value
     }
 
     Item { // spacer
@@ -123,6 +135,10 @@ RowLayout {
     HelperWidgets.DoubleSpinBox {
         id: vW
 
+        // value: uniformValue binding can get overwritten by normal operation of the control
+        property double resetValue: uniformValue.w
+        onResetValueChanged: value = resetValue
+
         Layout.fillWidth: true
         Layout.minimumWidth: 30
         Layout.maximumWidth: 60
@@ -134,7 +150,7 @@ RowLayout {
         value: uniformValue.w
         stepSize: .01
         decimals: 2
-        onValueChanged: uniformValue.w = value
+        onValueModified: uniformValue.w = value
     }
 
     Item { // spacer
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/ambient-sound-16.png b/share/qtcreator/qmldesigner/itemLibrary/images/ambient-sound-16.png
new file mode 100644
index 0000000000..6b16d81397
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/ambient-sound-16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/ambient-sound-24.png b/share/qtcreator/qmldesigner/itemLibrary/images/ambient-sound-24.png
new file mode 100644
index 0000000000..0549a84758
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/ambient-sound-24.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/ambient-sound-24@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/ambient-sound-24@2x.png
new file mode 100644
index 0000000000..8876f95ae6
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/ambient-sound-24@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/animated-image-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/animated-image-icon.png
new file mode 100644
index 0000000000..71371f97a3
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/animated-image-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/animated-image-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/animated-image-icon16.png
new file mode 100644
index 0000000000..86b80e95ab
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/animated-image-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/animated-image-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/animated-image-icon@2x.png
new file mode 100644
index 0000000000..4ad2a9011b
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/animated-image-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/animatedsprite-loading.png b/share/qtcreator/qmldesigner/itemLibrary/images/animatedsprite-loading.png
new file mode 100644
index 0000000000..ff2bbbd140
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/animatedsprite-loading.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/audio-engine-16.png b/share/qtcreator/qmldesigner/itemLibrary/images/audio-engine-16.png
new file mode 100644
index 0000000000..da40bc69a2
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/audio-engine-16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/audio-engine-24.png b/share/qtcreator/qmldesigner/itemLibrary/images/audio-engine-24.png
new file mode 100644
index 0000000000..b3ebdf745b
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/audio-engine-24.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/audio-engine-24@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/audio-engine-24@2x.png
new file mode 100644
index 0000000000..476df8640f
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/audio-engine-24@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/audio-listener-16.png b/share/qtcreator/qmldesigner/itemLibrary/images/audio-listener-16.png
new file mode 100644
index 0000000000..ecc583b859
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/audio-listener-16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/audio-listener-24.png b/share/qtcreator/qmldesigner/itemLibrary/images/audio-listener-24.png
new file mode 100644
index 0000000000..ee181f57cc
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/audio-listener-24.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/audio-listener-24@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/audio-listener-24@2x.png
new file mode 100644
index 0000000000..2588277e53
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/audio-listener-24@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/audio-output-16px.png b/share/qtcreator/qmldesigner/itemLibrary/images/audio-output-16px.png
new file mode 100644
index 0000000000..6ae703de64
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/audio-output-16px.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/audio-output-24px.png b/share/qtcreator/qmldesigner/itemLibrary/images/audio-output-24px.png
new file mode 100644
index 0000000000..f2133ca716
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/audio-output-24px.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/audio-output-24px@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/audio-output-24px@2x.png
new file mode 100644
index 0000000000..9336b81b6e
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/audio-output-24px@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/audio-room-16.png b/share/qtcreator/qmldesigner/itemLibrary/images/audio-room-16.png
new file mode 100644
index 0000000000..98f245d624
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/audio-room-16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/audio-room-24.png b/share/qtcreator/qmldesigner/itemLibrary/images/audio-room-24.png
new file mode 100644
index 0000000000..294d1574ae
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/audio-room-24.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/audio-room-24@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/audio-room-24@2x.png
new file mode 100644
index 0000000000..bef7f80e3e
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/audio-room-24@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/border-image-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/border-image-icon.png
new file mode 100644
index 0000000000..5418a0f55a
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/border-image-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/border-image-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/border-image-icon16.png
new file mode 100644
index 0000000000..17f7ed0688
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/border-image-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/border-image-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/border-image-icon@2x.png
new file mode 100644
index 0000000000..fb4fb33910
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/border-image-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/busyindicator-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/busyindicator-icon.png
new file mode 100644
index 0000000000..666d1ed93f
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/busyindicator-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/busyindicator-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/busyindicator-icon16.png
new file mode 100644
index 0000000000..5aa57d7f48
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/busyindicator-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/busyindicator-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/busyindicator-icon@2x.png
new file mode 100644
index 0000000000..bb2278ff89
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/busyindicator-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/button-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/button-icon.png
new file mode 100644
index 0000000000..c44909f6dd
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/button-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/button-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/button-icon16.png
new file mode 100644
index 0000000000..5c921deb13
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/button-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/button-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/button-icon@2x.png
new file mode 100644
index 0000000000..f90a1ba7dc
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/button-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/checkbox-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/checkbox-icon.png
new file mode 100644
index 0000000000..ee669b3a88
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/checkbox-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/checkbox-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/checkbox-icon16.png
new file mode 100644
index 0000000000..8d89eab841
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/checkbox-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/checkbox-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/checkbox-icon@2x.png
new file mode 100644
index 0000000000..51c5601de0
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/checkbox-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/column-positioner-icon-16px.png b/share/qtcreator/qmldesigner/itemLibrary/images/column-positioner-icon-16px.png
new file mode 100644
index 0000000000..8d963e2bab
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/column-positioner-icon-16px.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/column-positioner-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/column-positioner-icon.png
new file mode 100644
index 0000000000..0cd116d13c
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/column-positioner-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/column-positioner-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/column-positioner-icon@2x.png
new file mode 100644
index 0000000000..3247384285
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/column-positioner-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/combobox-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/combobox-icon.png
new file mode 100644
index 0000000000..2d31b17c65
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/combobox-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/combobox-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/combobox-icon16.png
new file mode 100644
index 0000000000..15fc3505ba
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/combobox-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/combobox-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/combobox-icon@2x.png
new file mode 100644
index 0000000000..5f82390596
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/combobox-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/component-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/component-icon.png
new file mode 100644
index 0000000000..9c7df42bc7
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/component-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/component-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/component-icon16.png
new file mode 100644
index 0000000000..99941541c6
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/component-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/component-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/component-icon@2x.png
new file mode 100644
index 0000000000..f66349a63b
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/component-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/control-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/control-icon.png
new file mode 100644
index 0000000000..fd9e4e8ff3
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/control-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/control-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/control-icon16.png
new file mode 100644
index 0000000000..31c765483e
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/control-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/control-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/control-icon@2x.png
new file mode 100644
index 0000000000..22604d2492
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/control-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/default-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/default-icon.png
new file mode 100644
index 0000000000..564226e949
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/default-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/default3d.png b/share/qtcreator/qmldesigner/itemLibrary/images/default3d.png
new file mode 100644
index 0000000000..a3b6c7f6f2
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/default3d.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/default3d16.png b/share/qtcreator/qmldesigner/itemLibrary/images/default3d16.png
new file mode 100644
index 0000000000..de8906a724
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/default3d16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/default3d@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/default3d@2x.png
new file mode 100644
index 0000000000..7ca04a01ea
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/default3d@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/delaybutton-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/delaybutton-icon.png
new file mode 100644
index 0000000000..5a55bd9f77
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/delaybutton-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/delaybutton-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/delaybutton-icon16.png
new file mode 100644
index 0000000000..cd21394e46
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/delaybutton-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/delaybutton-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/delaybutton-icon@2x.png
new file mode 100644
index 0000000000..7beee2fab0
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/delaybutton-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/dial-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/dial-icon.png
new file mode 100644
index 0000000000..b3b63e3523
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/dial-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/dial-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/dial-icon16.png
new file mode 100644
index 0000000000..8d8c7c09b0
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/dial-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/dial-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/dial-icon@2x.png
new file mode 100644
index 0000000000..22547a16b8
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/dial-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/drop-area-16px.png b/share/qtcreator/qmldesigner/itemLibrary/images/drop-area-16px.png
new file mode 100644
index 0000000000..278690f07f
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/drop-area-16px.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/drop-area-24px.png b/share/qtcreator/qmldesigner/itemLibrary/images/drop-area-24px.png
new file mode 100644
index 0000000000..a286efb032
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/drop-area-24px.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/drop-area-24px@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/drop-area-24px@2x.png
new file mode 100644
index 0000000000..47abb7f9e3
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/drop-area-24px@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/extended-view3d-16px.png b/share/qtcreator/qmldesigner/itemLibrary/images/extended-view3d-16px.png
new file mode 100644
index 0000000000..d9027813d0
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/extended-view3d-16px.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/extended-view3d-24px.png b/share/qtcreator/qmldesigner/itemLibrary/images/extended-view3d-24px.png
new file mode 100644
index 0000000000..a8a0bf65a4
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/extended-view3d-24px.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/extended-view3d-24px@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/extended-view3d-24px@2x.png
new file mode 100644
index 0000000000..a2f7bf93d3
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/extended-view3d-24px@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/flickable-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/flickable-icon.png
new file mode 100644
index 0000000000..bdc2253959
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/flickable-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/flickable-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/flickable-icon16.png
new file mode 100644
index 0000000000..d7ab9de8a7
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/flickable-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/flickable-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/flickable-icon@2x.png
new file mode 100644
index 0000000000..b28b0fa4d9
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/flickable-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/flipable-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/flipable-icon.png
new file mode 100644
index 0000000000..1f5f6966c0
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/flipable-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/flipable-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/flipable-icon16.png
new file mode 100644
index 0000000000..cf252f08b8
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/flipable-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/flow-positioner-icon-16px.png b/share/qtcreator/qmldesigner/itemLibrary/images/flow-positioner-icon-16px.png
new file mode 100644
index 0000000000..67be7b474d
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/flow-positioner-icon-16px.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/flow-positioner-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/flow-positioner-icon.png
new file mode 100644
index 0000000000..f8fa80970e
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/flow-positioner-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/flow-positioner-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/flow-positioner-icon@2x.png
new file mode 100644
index 0000000000..fc3deff849
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/flow-positioner-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/focusscope-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/focusscope-icon.png
new file mode 100644
index 0000000000..0dff9a075d
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/focusscope-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/focusscope-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/focusscope-icon16.png
new file mode 100644
index 0000000000..50c6f75cd8
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/focusscope-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/focusscope-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/focusscope-icon@2x.png
new file mode 100644
index 0000000000..b3ffdea6eb
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/focusscope-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/frame-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/frame-icon.png
new file mode 100644
index 0000000000..32abc8bf1e
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/frame-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/frame-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/frame-icon16.png
new file mode 100644
index 0000000000..e5b65ad53b
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/frame-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/frame-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/frame-icon@2x.png
new file mode 100644
index 0000000000..8b876f38ec
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/frame-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/grid-positioner-icon-16px.png b/share/qtcreator/qmldesigner/itemLibrary/images/grid-positioner-icon-16px.png
new file mode 100644
index 0000000000..47b34f9d14
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/grid-positioner-icon-16px.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/grid-positioner-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/grid-positioner-icon.png
new file mode 100644
index 0000000000..10d0b69a7b
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/grid-positioner-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/grid-positioner-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/grid-positioner-icon@2x.png
new file mode 100644
index 0000000000..4374b60e7a
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/grid-positioner-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/gridview-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/gridview-icon.png
new file mode 100644
index 0000000000..7457fbd7e1
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/gridview-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/gridview-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/gridview-icon16.png
new file mode 100644
index 0000000000..038a02ed86
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/gridview-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/gridview-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/gridview-icon@2x.png
new file mode 100644
index 0000000000..af233a0df3
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/gridview-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/groupbox-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/groupbox-icon.png
new file mode 100644
index 0000000000..5542ecf8bf
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/groupbox-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/groupbox-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/groupbox-icon16.png
new file mode 100644
index 0000000000..9cf4324819
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/groupbox-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/groupbox-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/groupbox-icon@2x.png
new file mode 100644
index 0000000000..80dab3c716
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/groupbox-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/image-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/image-icon.png
new file mode 100644
index 0000000000..318ce0874a
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/image-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/image-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/image-icon16.png
new file mode 100644
index 0000000000..3aa46b6106
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/image-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/image-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/image-icon@2x.png
new file mode 100644
index 0000000000..cc84918975
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/image-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/item-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/item-icon.png
new file mode 100644
index 0000000000..af81cdfdb1
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/item-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/item-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/item-icon16.png
new file mode 100644
index 0000000000..46d3ec1dbc
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/item-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/item-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/item-icon@2x.png
new file mode 100644
index 0000000000..f05aa57c2f
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/item-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/itemdelegate-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/itemdelegate-icon.png
new file mode 100644
index 0000000000..822cf3e7b8
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/itemdelegate-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/itemdelegate-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/itemdelegate-icon16.png
new file mode 100644
index 0000000000..b3ed007a0e
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/itemdelegate-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/itemdelegate-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/itemdelegate-icon@2x.png
new file mode 100644
index 0000000000..cb81308ff8
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/itemdelegate-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/keyframe-16px.png b/share/qtcreator/qmldesigner/itemLibrary/images/keyframe-16px.png
new file mode 100644
index 0000000000..6e1c9f912a
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/keyframe-16px.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/label-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/label-icon.png
new file mode 100644
index 0000000000..788bef078c
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/label-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/label-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/label-icon16.png
new file mode 100644
index 0000000000..b68d384568
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/label-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/label-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/label-icon@2x.png
new file mode 100644
index 0000000000..7001413d3b
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/label-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/listview-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/listview-icon.png
new file mode 100644
index 0000000000..5a2f3c203b
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/listview-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/listview-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/listview-icon16.png
new file mode 100644
index 0000000000..2657bf2181
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/listview-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/listview-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/listview-icon@2x.png
new file mode 100644
index 0000000000..b1d3fb67d2
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/listview-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/loader-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/loader-icon.png
new file mode 100644
index 0000000000..29082eacf1
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/loader-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/loader-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/loader-icon16.png
new file mode 100644
index 0000000000..4a2b093259
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/loader-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/loader-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/loader-icon@2x.png
new file mode 100644
index 0000000000..750b13bd02
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/loader-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/media-player-16px.png b/share/qtcreator/qmldesigner/itemLibrary/images/media-player-16px.png
new file mode 100644
index 0000000000..515287a846
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/media-player-16px.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/media-player-24px.png b/share/qtcreator/qmldesigner/itemLibrary/images/media-player-24px.png
new file mode 100644
index 0000000000..1b31ddc826
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/media-player-24px.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/media-player-24px@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/media-player-24px@2x.png
new file mode 100644
index 0000000000..86ae5914ac
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/media-player-24px@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/mouse-area-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/mouse-area-icon.png
new file mode 100644
index 0000000000..fe316caf8d
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/mouse-area-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/mouse-area-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/mouse-area-icon16.png
new file mode 100644
index 0000000000..bc8725fb5f
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/mouse-area-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/mouse-area-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/mouse-area-icon@2x.png
new file mode 100644
index 0000000000..04a25e13db
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/mouse-area-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/page-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/page-icon.png
new file mode 100644
index 0000000000..b5ac87e899
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/page-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/page-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/page-icon16.png
new file mode 100644
index 0000000000..bc6810b605
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/page-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/page-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/page-icon@2x.png
new file mode 100644
index 0000000000..23db032f4a
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/page-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/pageindicator-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/pageindicator-icon.png
new file mode 100644
index 0000000000..edb6b377bb
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/pageindicator-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/pageindicator-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/pageindicator-icon16.png
new file mode 100644
index 0000000000..0fb8967564
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/pageindicator-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/pageindicator-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/pageindicator-icon@2x.png
new file mode 100644
index 0000000000..7be0ee813b
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/pageindicator-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/pane-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/pane-icon.png
new file mode 100644
index 0000000000..62ebe487ff
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/pane-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/pane-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/pane-icon16.png
new file mode 100644
index 0000000000..2b8048441c
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/pane-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/pane-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/pane-icon@2x.png
new file mode 100644
index 0000000000..55bb116a69
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/pane-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/pathview-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/pathview-icon.png
new file mode 100644
index 0000000000..8dc82b8196
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/pathview-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/pathview-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/pathview-icon16.png
new file mode 100644
index 0000000000..a6a61f61b2
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/pathview-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/pathview-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/pathview-icon@2x.png
new file mode 100644
index 0000000000..d654a8e7e6
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/pathview-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/progressbar-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/progressbar-icon.png
new file mode 100644
index 0000000000..a023f73c30
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/progressbar-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/progressbar-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/progressbar-icon16.png
new file mode 100644
index 0000000000..6fede21d8c
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/progressbar-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/progressbar-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/progressbar-icon@2x.png
new file mode 100644
index 0000000000..0069400335
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/progressbar-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/radiobutton-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/radiobutton-icon.png
new file mode 100644
index 0000000000..d38170e22f
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/radiobutton-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/radiobutton-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/radiobutton-icon16.png
new file mode 100644
index 0000000000..07b46a8ab0
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/radiobutton-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/radiobutton-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/radiobutton-icon@2x.png
new file mode 100644
index 0000000000..4bbddda4b2
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/radiobutton-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/rangeslider-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/rangeslider-icon.png
new file mode 100644
index 0000000000..1c4c7b2948
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/rangeslider-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/rangeslider-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/rangeslider-icon16.png
new file mode 100644
index 0000000000..3be4624ddd
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/rangeslider-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/rangeslider-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/rangeslider-icon@2x.png
new file mode 100644
index 0000000000..aee69b3302
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/rangeslider-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/rect-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/rect-icon.png
new file mode 100644
index 0000000000..3997195f72
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/rect-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/rect-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/rect-icon16.png
new file mode 100644
index 0000000000..72893106ae
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/rect-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/rect-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/rect-icon@2x.png
new file mode 100644
index 0000000000..150fa50ea2
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/rect-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/repeater-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/repeater-icon.png
new file mode 100644
index 0000000000..efe3ca80b4
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/repeater-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/repeater-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/repeater-icon16.png
new file mode 100644
index 0000000000..775a57a38c
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/repeater-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/repeater-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/repeater-icon@2x.png
new file mode 100644
index 0000000000..bb541b6711
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/repeater-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/roundbutton-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/roundbutton-icon.png
new file mode 100644
index 0000000000..d4b470dc25
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/roundbutton-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/roundbutton-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/roundbutton-icon16.png
new file mode 100644
index 0000000000..f6f3666639
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/roundbutton-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/roundbutton-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/roundbutton-icon@2x.png
new file mode 100644
index 0000000000..4553e165e7
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/roundbutton-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/row-positioner-icon-16px.png b/share/qtcreator/qmldesigner/itemLibrary/images/row-positioner-icon-16px.png
new file mode 100644
index 0000000000..1c5be82245
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/row-positioner-icon-16px.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/row-positioner-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/row-positioner-icon.png
new file mode 100644
index 0000000000..a7e654c918
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/row-positioner-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/row-positioner-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/row-positioner-icon@2x.png
new file mode 100644
index 0000000000..48c99f8c0e
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/row-positioner-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/scrollview-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/scrollview-icon.png
new file mode 100644
index 0000000000..5ef73ff19f
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/scrollview-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/scrollview-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/scrollview-icon16.png
new file mode 100644
index 0000000000..f8ca7a3685
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/scrollview-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/scrollview-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/scrollview-icon@2x.png
new file mode 100644
index 0000000000..0eb7f9665e
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/scrollview-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/slider-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/slider-icon.png
new file mode 100644
index 0000000000..bd0a9729be
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/slider-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/slider-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/slider-icon16.png
new file mode 100644
index 0000000000..a08622df89
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/slider-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/slider-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/slider-icon@2x.png
new file mode 100644
index 0000000000..93842e4cdd
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/slider-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/spatial-audio-16.png b/share/qtcreator/qmldesigner/itemLibrary/images/spatial-audio-16.png
new file mode 100644
index 0000000000..676fe13404
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/spatial-audio-16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/spatial-audio-24.png b/share/qtcreator/qmldesigner/itemLibrary/images/spatial-audio-24.png
new file mode 100644
index 0000000000..29f7f14db3
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/spatial-audio-24.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/spatial-audio-24@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/spatial-audio-24@2x.png
new file mode 100644
index 0000000000..a518cada63
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/spatial-audio-24@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/spinbox-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/spinbox-icon.png
new file mode 100644
index 0000000000..37277c5e43
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/spinbox-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/spinbox-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/spinbox-icon16.png
new file mode 100644
index 0000000000..f88711dd25
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/spinbox-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/spinbox-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/spinbox-icon@2x.png
new file mode 100644
index 0000000000..b62a3bad51
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/spinbox-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/stackview-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/stackview-icon.png
new file mode 100644
index 0000000000..a6ced34925
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/stackview-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/stackview-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/stackview-icon16.png
new file mode 100644
index 0000000000..0f19d0efa3
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/stackview-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/stackview-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/stackview-icon@2x.png
new file mode 100644
index 0000000000..9b5ef9517b
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/stackview-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/swipeview-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/swipeview-icon.png
new file mode 100644
index 0000000000..031cb27c36
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/swipeview-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/swipeview-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/swipeview-icon16.png
new file mode 100644
index 0000000000..446c469690
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/swipeview-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/swipeview-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/swipeview-icon@2x.png
new file mode 100644
index 0000000000..0ccb978c46
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/swipeview-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/switch-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/switch-icon.png
new file mode 100644
index 0000000000..e018159286
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/switch-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/switch-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/switch-icon16.png
new file mode 100644
index 0000000000..9abd275659
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/switch-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/switch-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/switch-icon@2x.png
new file mode 100644
index 0000000000..787f54ca41
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/switch-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/text-edit-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/text-edit-icon.png
new file mode 100644
index 0000000000..068ebeef0f
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/text-edit-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/text-edit-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/text-edit-icon16.png
new file mode 100644
index 0000000000..b96ed468cb
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/text-edit-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/text-edit-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/text-edit-icon@2x.png
new file mode 100644
index 0000000000..3b7cb6d5da
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/text-edit-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/text-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/text-icon.png
new file mode 100644
index 0000000000..29a81f5d6c
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/text-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/text-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/text-icon16.png
new file mode 100644
index 0000000000..ee7cc512cb
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/text-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/text-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/text-icon@2x.png
new file mode 100644
index 0000000000..1df8f765de
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/text-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/text-input-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/text-input-icon.png
new file mode 100644
index 0000000000..c743c22074
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/text-input-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/text-input-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/text-input-icon16.png
new file mode 100644
index 0000000000..3ceef6d037
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/text-input-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/text-input-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/text-input-icon@2x.png
new file mode 100644
index 0000000000..666644d2d3
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/text-input-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/textarea-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/textarea-icon.png
new file mode 100644
index 0000000000..f1b2dc0f84
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/textarea-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/textarea-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/textarea-icon16.png
new file mode 100644
index 0000000000..4afc1fbab5
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/textarea-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/textarea-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/textarea-icon@2x.png
new file mode 100644
index 0000000000..c32ecc71a9
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/textarea-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/textfield-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/textfield-icon.png
new file mode 100644
index 0000000000..ba5537acef
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/textfield-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/textfield-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/textfield-icon16.png
new file mode 100644
index 0000000000..c4a62a6582
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/textfield-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/textfield-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/textfield-icon@2x.png
new file mode 100644
index 0000000000..e05fd41b9a
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/textfield-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/timeline-16px.png b/share/qtcreator/qmldesigner/itemLibrary/images/timeline-16px.png
new file mode 100644
index 0000000000..d4ecf00031
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/timeline-16px.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/timeline-animation-16px.png b/share/qtcreator/qmldesigner/itemLibrary/images/timeline-animation-16px.png
new file mode 100644
index 0000000000..31b8fed666
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/timeline-animation-16px.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/timer-16px.png b/share/qtcreator/qmldesigner/itemLibrary/images/timer-16px.png
new file mode 100644
index 0000000000..c675d5a707
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/timer-16px.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/timer-24px.png b/share/qtcreator/qmldesigner/itemLibrary/images/timer-24px.png
new file mode 100644
index 0000000000..bd9419aaa0
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/timer-24px.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/timer-24px@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/timer-24px@2x.png
new file mode 100644
index 0000000000..ff2d487cc9
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/timer-24px@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/toolbar-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/toolbar-icon.png
new file mode 100644
index 0000000000..5cb5b2e1af
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/toolbar-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/toolbar-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/toolbar-icon16.png
new file mode 100644
index 0000000000..569373afa1
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/toolbar-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/toolbar-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/toolbar-icon@2x.png
new file mode 100644
index 0000000000..fd9e6ceebc
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/toolbar-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/toolbutton-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/toolbutton-icon.png
new file mode 100644
index 0000000000..3298f69519
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/toolbutton-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/toolbutton-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/toolbutton-icon16.png
new file mode 100644
index 0000000000..9ab7861c25
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/toolbutton-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/toolbutton-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/toolbutton-icon@2x.png
new file mode 100644
index 0000000000..e5958cded3
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/toolbutton-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/toolseparator-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/toolseparator-icon.png
new file mode 100644
index 0000000000..5e99f06f2e
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/toolseparator-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/toolseparator-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/toolseparator-icon16.png
new file mode 100644
index 0000000000..68f22c5df1
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/toolseparator-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/toolseparator-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/toolseparator-icon@2x.png
new file mode 100644
index 0000000000..549c11c67c
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/toolseparator-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/tumbler-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/tumbler-icon.png
new file mode 100644
index 0000000000..98eb8232a2
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/tumbler-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/tumbler-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/tumbler-icon16.png
new file mode 100644
index 0000000000..ff5f95cf32
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/tumbler-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/tumbler-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/tumbler-icon@2x.png
new file mode 100644
index 0000000000..236abf0cfe
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/tumbler-icon@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/video-16px.png b/share/qtcreator/qmldesigner/itemLibrary/images/video-16px.png
new file mode 100644
index 0000000000..caf9c16a61
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/video-16px.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/video-24px.png b/share/qtcreator/qmldesigner/itemLibrary/images/video-24px.png
new file mode 100644
index 0000000000..df1b84e5c9
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/video-24px.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/video-24px@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/video-24px@2x.png
new file mode 100644
index 0000000000..4b9f31faf3
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/video-24px@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/video-output-16px.png b/share/qtcreator/qmldesigner/itemLibrary/images/video-output-16px.png
new file mode 100644
index 0000000000..f00afc52e9
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/video-output-16px.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/video-output-24px.png b/share/qtcreator/qmldesigner/itemLibrary/images/video-output-24px.png
new file mode 100644
index 0000000000..fd3c89c081
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/video-output-24px.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/video-output-24px@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/video-output-24px@2x.png
new file mode 100644
index 0000000000..0f651a1013
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/video-output-24px@2x.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/webview-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/webview-icon.png
new file mode 100644
index 0000000000..22904f2f8b
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/webview-icon.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/webview-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/webview-icon16.png
new file mode 100644
index 0000000000..ac7be01bb7
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/images/webview-icon16.png
diff --git a/share/qtcreator/qmldesigner/itemLibrary/multimedia.metainfo b/share/qtcreator/qmldesigner/itemLibrary/multimedia.metainfo
new file mode 100644
index 0000000000..2e3616aa4b
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/multimedia.metainfo
@@ -0,0 +1,84 @@
+MetaInfo {
+    Type {
+        name: "QtMultimedia.MediaPlayer"
+        icon: "images/media-player-16px.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeContainer: false
+        }
+
+        ItemLibraryEntry {
+            name: "Media Player"
+            category: "f.Qt Quick - Multimedia"
+            libraryIcon: "images/media-player-24px.png"
+            version: "6.0"
+            requiredImport: "QtMultimedia"
+        }
+    }
+
+    Type {
+        name: "QtMultimedia.AudioOutput"
+        icon: "images/audio-output-16px.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeContainer: false
+        }
+
+        ItemLibraryEntry {
+            name: "Audio Output"
+            category: "f.Qt Quick - Multimedia"
+            libraryIcon: "images/audio-output-24px.png"
+            version: "6.0"
+            requiredImport: "QtMultimedia"
+        }
+    }
+
+    Type {
+        name: "QtMultimedia.VideoOutput"
+        icon: "images/video-output-16px.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeContainer: false
+        }
+
+        ItemLibraryEntry {
+            name: "Video Output"
+            category: "f.Qt Quick - Multimedia"
+            libraryIcon: "images/video-output-24px.png"
+            version: "6.0"
+            requiredImport: "QtMultimedia"
+        }
+    }
+
+    Type {
+        name: "QtMultimedia.Video"
+        icon: "images/video-16px.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: true
+            canBeContainer: false
+        }
+
+        ItemLibraryEntry {
+            name: "Video"
+            category: "f.Qt Quick - Multimedia"
+            libraryIcon: "images/video-24px.png"
+            version: "6.0"
+            requiredImport: "QtMultimedia"
+
+            Property { name: "width"; type: "int"; value: 200; }
+            Property { name: "height"; type: "int"; value: 200; }
+        }
+    }
+}
diff --git a/share/qtcreator/qmldesigner/itemLibrary/qml.metainfo b/share/qtcreator/qmldesigner/itemLibrary/qml.metainfo
new file mode 100644
index 0000000000..4bef02ddd3
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/qml.metainfo
@@ -0,0 +1,53 @@
+MetaInfo {
+
+    Type {
+        name: "QML.Component"
+        icon: "images/component-icon16.png"
+
+        Hints {
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+        }
+
+        ItemLibraryEntry {
+            name: "Component"
+            category: "e.Qt Quick - Instancers"
+            libraryIcon: "images/component-icon.png"
+            version: "1.0"
+
+            QmlSource { source: "source/component.qml" }
+            toolTip: qsTr("Allows you to define components inline, within a QML document.")
+        }
+
+        ItemLibraryEntry {
+            name: "Component 3D"
+            category: "Instancers"
+            libraryIcon: "images/component-icon.png"
+            version: "1.0"
+            requiredImport: "QtQuick3D"
+
+            QmlSource { source: "source/component3d.qml" }
+            toolTip: qsTr("Allows you to define 3D components inline, within a QML document.")
+        }
+    }
+
+Type {
+    name: "QtQml.Base.Timer"
+    icon: "images/timer-16px.png"
+
+    Hints {
+        visibleInNavigator: true
+        canBeDroppedInNavigator: true
+        canBeDroppedInFormEditor: false
+        canBeContainer: false
+    }
+
+    ItemLibraryEntry {
+        name: "Timer"
+        category: "d.Qt Quick - Animation"
+        libraryIcon: "images/timer-24px.png"
+        version: "2.0"
+        toolTip: qsTr(" Triggers an action at a given time.")
+    }
+}
+}
diff --git a/share/qtcreator/qmldesigner/itemLibrary/qtquickcontrols2.metainfo b/share/qtcreator/qmldesigner/itemLibrary/qtquickcontrols2.metainfo
new file mode 100644
index 0000000000..cd4165957d
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/qtquickcontrols2.metainfo
@@ -0,0 +1,575 @@
+MetaInfo {
+    Type {
+        name: "QtQuick.Controls.Basic.BusyIndicator"
+        icon: "images/busyindicator-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Busy Indicator"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/busyindicator-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("Indicates activity while, for example, content is being loaded.")
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.Basic.Button"
+        icon: "images/button-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Button"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/button-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("A button with text.")
+
+            Property { name: "text"; type: "binding"; value: "qsTr(\"Button\")" }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.Basic.CheckBox"
+        icon: "images/checkbox-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Check Box"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/checkbox-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("A checkbox with a text label.")
+
+            Property { name: "text"; type: "binding"; value: "qsTr(\"Check Box\")" }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.Basic.CheckDelegate"
+        icon: "images/checkbox-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Check Delegate"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/checkbox-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("Presents items from a model as checkboxes.")
+
+            Property { name: "text"; type: "binding"; value: "qsTr(\"Check Delegate\")" }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.Basic.ComboBox"
+        icon: "images/combobox-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Combo Box"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/combobox-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("An editable drop-down list.")
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.Basic.Control"
+        icon: "images/control-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Control"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/control-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("An abstract base type for UI controls.")
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.Basic.DelayButton"
+        icon: "images/button-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Delay Button"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/delaybutton-icon.png"
+            version: "2.2"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("A button with a delay preventing accidental presses.")
+
+            Property { name: "text"; type: "binding"; value: "qsTr(\"Delay Button\")" }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.Basic.Dial"
+        icon: "images/dial-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Dial"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/dial-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+
+            toolTip: qsTr("A circular dial that is rotated to set a value.")
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.Basic.Frame"
+        icon: "images/frame-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Frame"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/frame-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("An untitled container for a group of controls.")
+
+            Property { name: "width"; type: "int"; value: 200 }
+            Property { name: "height"; type: "int"; value: 200 }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.Basic.GroupBox"
+        icon: "images/groupbox-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Group Box"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/groupbox-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("A titled container for a group of controls.")
+
+            Property { name: "width"; type: "int"; value: 200 }
+            Property { name: "height"; type: "int"; value: 200 }
+            Property { name: "title"; type: "binding"; value: "qsTr(\"Group Box\")" }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.Basic.ItemDelegate"
+        icon: "images/itemdelegate-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Item Delegate"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/itemdelegate-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("Presents a standard view item. It can be used as a delegate in various views and controls, such as ListView and ComboBox.")
+
+            Property { name: "text"; type: "binding"; value: "qsTr(\"Item Delegate\")" }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.Basic.Label"
+        icon: "images/label-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Label"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/label-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("A text label.")
+
+            Property { name: "text"; type: "binding"; value: "qsTr(\"Label\")" }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.Basic.Page"
+        icon: "images/page-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Page"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/page-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("A page with header and footer.")
+
+            Property { name: "width"; type: "int"; value: 200 }
+            Property { name: "height"; type: "int"; value: 200 }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.Basic.PageIndicator"
+        icon: "images/pageindicator-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Page Indicator"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/pageindicator-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("Indicates the currently active page.")
+
+            Property { name: "count"; type: "int"; value: 3 }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.Basic.Pane"
+        icon: "images/pane-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Pane"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/pane-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("Provides a background matching the application style and theme.")
+
+            Property { name: "width"; type: "int"; value: 200 }
+            Property { name: "height"; type: "int"; value: 200 }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.Basic.ProgressBar"
+        icon: "images/progressbar-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Progress Bar"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/progressbar-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("A bar indicating the progress of an operation.")
+
+            Property { name: "value"; type: "real"; value: 0.5 }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.Basic.RadioButton"
+        icon: "images/radiobutton-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Radio Button"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/radiobutton-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("An option button that you can toggle on or off.")
+
+            Property { name: "text"; type: "binding"; value: "qsTr(\"Radio Button\")" }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.Basic.RadioDelegate"
+        icon: "images/radiobutton-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Radio Delegate"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/radiobutton-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("Presents items from a model as radio buttons.")
+
+            Property { name: "text"; type: "binding"; value: "qsTr(\"Radio Delegate\")" }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.Basic.RangeSlider"
+        icon: "images/rangeslider-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Range Slider"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/rangeslider-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("A bar with adjustable start and end points.")
+
+            Property { name: "first.value"; type: "real"; value: 0.25 }
+            Property { name: "second.value"; type: "real"; value: 0.75 }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.Basic.RoundButton"
+        icon: "images/roundbutton-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Round Button"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/roundbutton-icon.png"
+            version: "2.1"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("A round button with text.")
+
+            Property { name: "text"; type: "string"; value: "+" }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.Basic.Slider"
+        icon: "images/slider-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Slider"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/slider-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("An adjustable slider.")
+
+            Property { name: "value"; type: "real"; value: 0.5 }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.Basic.SpinBox"
+        icon: "images/spinbox-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Spin Box"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/spinbox-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("A box with an adjustable number.")
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.Basic.ScrollView"
+        icon: "images/scrollview-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Scroll View"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/scrollview-icon.png"
+            version: "2.2"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("A scrollable area.")
+
+            Property { name: "width"; type: "int"; value: 200 }
+            Property { name: "height"; type: "int"; value: 200 }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.Basic.StackView"
+        icon: "images/stackview-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Stack View"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/stackview-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("Provides a stack-based navigation for a set of pages.")
+
+            Property { name: "width"; type: "int"; value: 200 }
+            Property { name: "height"; type: "int"; value: 200 }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.Basic.SwipeDelegate"
+        icon: "images/itemdelegate-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Swipe Delegate"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/itemdelegate-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("Presents items from a model as items that you can swipe to expose more options.")
+
+            Property { name: "text"; type: "binding"; value: "qsTr(\"Swipe Delegate\")" }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.Basic.SwipeView"
+        icon: "images/swipeview-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Swipe View"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/swipeview-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("Provides a view where you can navigate pages by swiping.")
+
+            Property { name: "width"; type: "int"; value: 200 }
+            Property { name: "height"; type: "int"; value: 200 }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.Basic.Switch"
+        icon: "images/switch-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Switch"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/switch-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("A button that you can toggle on and off.")
+
+            Property { name: "text"; type: "binding"; value: "qsTr(\"Switch\")" }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.Basic.SwitchDelegate"
+        icon: "images/switch-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Switch Delegate"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/switch-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("Presents items from a model as toggle switches.")
+
+            Property { name: "text"; type: "binding"; value: "qsTr(\"Switch Delegate\")" }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.Basic.TabBar"
+        icon: "images/toolbar-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Tab Bar"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/toolbar-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("A tab-based navigation model.")
+
+            Property { name: "width"; type: "int"; value: 240 }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.Basic.TabButton"
+        icon: "images/toolbutton-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Tab Button"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/toolbutton-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("A button suitable for a tab bar.")
+
+            Property { name: "text"; type: "binding"; value: "qsTr(\"Tab Button\")" }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.Basic.TextArea"
+        icon: "images/textarea-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Text Area"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/textarea-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("A multi-line text box.")
+
+            Property { name: "placeholderText"; type: "binding"; value: "qsTr(\"Text Area\")" }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.Basic.TextField"
+        icon: "images/textfield-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Text Field"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/textfield-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("A single-line text box.")
+
+            Property { name: "placeholderText"; type: "binding"; value: "qsTr(\"Text Field\")" }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.Basic.ToolBar"
+        icon: "images/toolbar-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Tool Bar"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/toolbar-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("A row that can hold actions and buttons.")
+
+            Property { name: "width"; type: "int"; value: 360 }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.Basic.ToolButton"
+        icon: "images/toolbutton-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Tool Button"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/toolbutton-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("A button suitable for a tool bar.")
+
+            Property { name: "text"; type: "binding"; value: "qsTr(\"Tool Button\")" }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.Basic.ToolSeparator"
+        icon: "images/toolseparator-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Tool Separator"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/toolseparator-icon.png"
+            version: "2.1"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("A line to separate sections in a tool bar.")
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.Basic.Tumbler"
+        icon: "images/tumbler-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Tumbler"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/tumbler-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("A spinnable wheel of selectable items.")
+
+            Property { name: "model"; type: "int"; value: "10" }
+        }
+    }
+}
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/quick.metainfo b/share/qtcreator/qmldesigner/itemLibrary/quick.metainfo
index f390f72260..98e5684bdc 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/quick.metainfo
+++ b/share/qtcreator/qmldesigner/itemLibrary/quick.metainfo
@@ -2,7 +2,7 @@ MetaInfo {
 
     Type {
         name: "QtQuick.Item"
-        icon: ":/qtquickplugin/images/item-icon16.png"
+        icon: "images/item-icon16.png"
 
        Hints {
            visibleNonDefaultProperties: "layer.effect"
@@ -11,7 +11,7 @@ MetaInfo {
         ItemLibraryEntry {
             name: "Item"
             category: "a.Qt Quick - Basic"
-            libraryIcon: ":/qtquickplugin/images/item-icon.png"
+            libraryIcon: "images/item-icon.png"
             version: "2.0"
 
             Property { name: "width"; type: "int"; value: 200; }
@@ -22,12 +22,12 @@ MetaInfo {
 
     Type {
         name: "QtQuick.Rectangle"
-        icon: ":/qtquickplugin/images/rect-icon16.png"
+        icon: "images/rect-icon16.png"
 
         ItemLibraryEntry {
             name: "Rectangle"
             category: "a.Qt Quick - Basic"
-            libraryIcon: ":/qtquickplugin/images/rect-icon.png"
+            libraryIcon: "images/rect-icon.png"
             version: "2.0"
 
             Property { name: "width"; type: "int"; value: 200; }
@@ -39,12 +39,12 @@ MetaInfo {
 
     Type {
         name: "QtQuick.Text"
-        icon: ":/qtquickplugin/images/text-icon16.png"
+        icon: "images/text-icon16.png"
 
         ItemLibraryEntry {
             name: "Text"
             category: "a.Qt Quick - Basic"
-            libraryIcon: ":/qtquickplugin/images/text-icon.png"
+            libraryIcon: "images/text-icon.png"
             version: "2.0"
 
             Property { name: "font.pixelSize"; type: "int"; value: 12; }
@@ -55,12 +55,12 @@ MetaInfo {
 
     Type {
         name: "QtQuick.TextEdit"
-        icon: ":/qtquickplugin/images/text-edit-icon16.png"
+        icon: "images/text-edit-icon16.png"
 
         ItemLibraryEntry {
             name: "Text Edit"
             category: "a.Qt Quick - Basic"
-            libraryIcon: ":/qtquickplugin/images/text-edit-icon.png"
+            libraryIcon: "images/text-edit-icon.png"
             version: "2.0"
 
             Property { name: "width"; type: "int"; value: 80; }
@@ -73,12 +73,12 @@ MetaInfo {
 
     Type {
         name: "QtQuick.TextInput"
-        icon: ":/qtquickplugin/images/text-input-icon16.png"
+        icon: "images/text-input-icon16.png"
 
         ItemLibraryEntry {
             name: "Text Input"
             category: "a.Qt Quick - Basic"
-            libraryIcon: ":/qtquickplugin/images/text-input-icon.png"
+            libraryIcon: "images/text-input-icon.png"
             version: "2.0"
 
             Property { name: "width"; type: "int"; value: 80; }
@@ -91,12 +91,12 @@ MetaInfo {
 
     Type {
         name: "QtQuick.MouseArea"
-        icon: ":/qtquickplugin/images/mouse-area-icon16.png"
+        icon: "images/mouse-area-icon16.png"
 
         ItemLibraryEntry {
             name: "Mouse Area"
             category: "a.Qt Quick - Basic"
-            libraryIcon: ":/qtquickplugin/images/mouse-area-icon.png"
+            libraryIcon: "images/mouse-area-icon.png"
             version: "2.0"
 
             Property { name: "width"; type: "int"; value: 100; }
@@ -107,17 +107,17 @@ MetaInfo {
 
     Type {
         name: "QtQuick.Image"
-        icon: ":/qtquickplugin/images/image-icon16.png"
+        icon: "images/image-icon16.png"
 
         ItemLibraryEntry {
             name: "Image"
             category: "a.Qt Quick - Basic"
-            libraryIcon: ":/qtquickplugin/images/image-icon.png"
+            libraryIcon: "images/image-icon.png"
             version: "2.0"
 
             Property { name: "width"; type: "int"; value: 100; }
             Property { name: "height"; type: "int"; value: 100; }
-            Property { name: "source"; type: "QUrl"; value:"qrc:/qtquickplugin/images/template_image.png"; }
+            Property { name: "source"; type: "QUrl"; value:"qrcimages/template_image.png"; }
             Property { name: "fillMode"; type: "enum"; value: "Image.PreserveAspectFit"; }
             toolTip: qsTr("Displays an image.")
         }
@@ -125,29 +125,29 @@ MetaInfo {
 
     Type {
         name: "QtQuick.AnimatedImage"
-        icon: ":/qtquickplugin/images/animated-image-icon16.png"
+        icon: "images/animated-image-icon16.png"
 
         ItemLibraryEntry {
             name: "Animated Image"
             category: "a.Qt Quick - Basic"
-            libraryIcon: ":/qtquickplugin/images/animated-image-icon.png"
+            libraryIcon: "images/animated-image-icon.png"
             version: "2.0"
 
             Property { name: "width"; type: "int"; value: 100; }
             Property { name: "height"; type: "int"; value: 100; }
-            Property { name: "source"; type: "QUrl"; value:"qrc:/qtquickplugin/images/template_image.png"; }
+            Property { name: "source"; type: "QUrl"; value:"qrcimages/template_image.png"; }
             toolTip: qsTr("Animates a series of images.")
         }
     }
 
     Type {
         name: "QtQuick.AnimatedSprite"
-        icon: ":/qtquickplugin/images/animated-image-icon16.png"
+        icon: "images/animated-image-icon16.png"
 
         ItemLibraryEntry {
             name: "Animated Sprite"
             category: "a.Qt Quick - Basic"
-            libraryIcon: ":/qtquickplugin/images/animated-image-icon.png"
+            libraryIcon: "images/animated-image-icon.png"
             version: "2.0"
 
             Property { name: "frameWidth"; type: "int"; value: 64; }
@@ -155,36 +155,36 @@ MetaInfo {
             Property { name: "frameCount"; type: "int"; value: 4; }
             Property { name: "frameDuration"; type: "int"; value: 500; }
             Property { name: "source"; type: "QUrl"; value:"animatedsprite-loading.png"; }
-            ExtraFile { source: ":/qtquickplugin/images/animatedsprite-loading.png" }
+            ExtraFile { source: "images/animatedsprite-loading.png" }
             toolTip: qsTr("Draws a sprite animation.")
         }
     }
 
     Type {
         name: "QtQuick.BorderImage"
-        icon: ":/qtquickplugin/images/border-image-icon16.png"
+        icon: "images/border-image-icon16.png"
 
         ItemLibraryEntry {
             name: "Border Image"
             category: "a.Qt Quick - Basic"
-            libraryIcon: ":/qtquickplugin/images/border-image-icon.png"
+            libraryIcon: "images/border-image-icon.png"
             version: "2.0"
 
             Property { name: "width"; type: "int"; value: 100; }
             Property { name: "height"; type: "int"; value: 100; }
-            Property { name: "source"; type: "QUrl"; value:"qrc:/qtquickplugin/images/template_image.png"; }
+            Property { name: "source"; type: "QUrl"; value:"qrcimages/template_image.png"; }
             toolTip: qsTr("A responsive border based on an image.")
         }
     }
 
     Type {
         name: "QtQuick.Flickable"
-        icon: ":/qtquickplugin/images/flickable-icon16.png"
+        icon: "images/flickable-icon16.png"
 
         ItemLibraryEntry {
             name: "Flickable"
             category: "a.Qt Quick - Basic"
-            libraryIcon: ":/qtquickplugin/images/flickable-icon.png"
+            libraryIcon: "images/flickable-icon.png"
             version: "2.0"
 
             Property { name: "width"; type: "int"; value: 300; }
@@ -195,57 +195,57 @@ MetaInfo {
 
     Type {
         name: "QtQuick.GridView"
-        icon: ":/qtquickplugin/images/gridview-icon16.png"
+        icon: "images/gridview-icon16.png"
 
         ItemLibraryEntry {
             name: "Grid View"
             category: "b.Qt Quick - Views"
-            libraryIcon: ":/qtquickplugin/images/gridview-icon.png"
+            libraryIcon: "images/gridview-icon.png"
             version: "2.0"
 
-            QmlSource { source: ":/qtquickplugin/source/gridviewv2.qml" }
+            QmlSource { source: "source/gridviewv2.qml" }
             toolTip: qsTr("Organizes dynamic data sets in a grid.")
         }
     }
 
     Type {
         name: "QtQuick.ListView"
-        icon: ":/qtquickplugin/images/listview-icon16.png"
+        icon: "images/listview-icon16.png"
 
         ItemLibraryEntry {
             name: "List View"
             category: "b.Qt Quick - Views"
-            libraryIcon: ":/qtquickplugin/images/listview-icon.png"
+            libraryIcon: "images/listview-icon.png"
             version: "2.0"
 
-            QmlSource { source: ":/qtquickplugin/source/listviewv2.qml" }
+            QmlSource { source: "source/listviewv2.qml" }
             toolTip: qsTr("Organizes dynamic data sets in a list.")
         }
     }
 
     Type {
         name: "QtQuick.PathView"
-        icon: ":/qtquickplugin/images/pathview-icon16.png"
+        icon: "images/pathview-icon16.png"
 
         ItemLibraryEntry {
             name: "Path View"
             category: "b.Qt Quick - Views"
-            libraryIcon: ":/qtquickplugin/images/pathview-icon.png"
+            libraryIcon: "images/pathview-icon.png"
             version: "2.0"
 
-            QmlSource { source: ":/qtquickplugin/source/pathviewv2.qml" }
+            QmlSource { source: "source/pathviewv2.qml" }
             toolTip: qsTr("Organizes dynamic data sets along a path.")
         }
     }
 
     Type {
         name: "QtQuick.FocusScope"
-        icon: ":/qtquickplugin/images/focusscope-icon16.png"
+        icon: "images/focusscope-icon16.png"
 
         ItemLibraryEntry {
             name: "Focus Scope"
             category: "a.Qt Quick - Basic"
-            libraryIcon: ":/qtquickplugin/images/focusscope-icon.png"
+            libraryIcon: "images/focusscope-icon.png"
             version: "2.0"
 
             Property { name: "width"; type: "int"; value: 100; }
@@ -256,12 +256,12 @@ MetaInfo {
 
     Type {
         name: "QtQuick.Column"
-        icon: ":/qtquickplugin/images/column-positioner-icon-16px.png"
+        icon: "images/column-positioner-icon-16px.png"
 
         ItemLibraryEntry {
             name: "Column"
             category: "c.Qt Quick - Positioner"
-            libraryIcon: ":/qtquickplugin/images/column-positioner-icon.png"
+            libraryIcon: "images/column-positioner-icon.png"
             version: "2.0"
 
             Property { name: "width"; type: "int"; value: 200; }
@@ -273,12 +273,12 @@ MetaInfo {
 
     Type {
         name: "QtQuick.Row"
-        icon: ":/qtquickplugin/images/row-positioner-icon-16px.png"
+        icon: "images/row-positioner-icon-16px.png"
 
         ItemLibraryEntry {
             name: "Row"
             category: "c.Qt Quick - Positioner"
-            libraryIcon: ":/qtquickplugin/images/row-positioner-icon.png"
+            libraryIcon: "images/row-positioner-icon.png"
             version: "2.0"
             toolTip: qsTr("Organizes items in a row.")
 
@@ -289,12 +289,12 @@ MetaInfo {
 
     Type {
         name: "QtQuick.Grid"
-        icon: ":/qtquickplugin/images/grid-positioner-icon-16px.png"
+        icon: "images/grid-positioner-icon-16px.png"
 
         ItemLibraryEntry {
             name: "Grid"
             category: "c.Qt Quick - Positioner"
-            libraryIcon: ":/qtquickplugin/images/grid-positioner-icon.png"
+            libraryIcon: "images/grid-positioner-icon.png"
             version: "2.0"
 
             Property { name: "width"; type: "int"; value: 400; }
@@ -305,12 +305,12 @@ MetaInfo {
 
     Type {
         name: "QtQuick.Flow"
-        icon: ":/qtquickplugin/images/flow-positioner-icon-16px.png"
+        icon: "images/flow-positioner-icon-16px.png"
 
         ItemLibraryEntry {
             name: "Flow"
             category: "c.Qt Quick - Positioner"
-            libraryIcon: ":/qtquickplugin/images/flow-positioner-icon.png"
+            libraryIcon: "images/flow-positioner-icon.png"
             version: "2.0"
 
             Property { name: "width"; type: "int"; value: 400; }
@@ -321,7 +321,7 @@ MetaInfo {
 
     Type {
         name: "QtQuick.Timeline.Timeline"
-        icon: ":/qtquickplugin/images/timeline-16px.png"
+        icon: "images/timeline-16px.png"
 
         Hints {
             visibleNonDefaultProperties: "animations"
@@ -337,7 +337,7 @@ MetaInfo {
 
     Type {
         name: "QtQuick.Timeline.TimelineAnimation"
-        icon: ":/qtquickplugin/images/timeline-animation-16px.png"
+        icon: "images/timeline-animation-16px.png"
 
         Hints {
             visibleInLibrary: false
@@ -352,7 +352,7 @@ MetaInfo {
 
     Type {
         name: "QtQuick.Timeline.Keyframe"
-        icon: ":/qtquickplugin/images/keyframe-16px.png"
+        icon: "images/keyframe-16px.png"
 
         ItemLibraryEntry {
             name: "Keyframe"
@@ -364,7 +364,7 @@ MetaInfo {
 
     Type {
         name: "QtQuick.Timeline.KeyframeGroup"
-        icon: ":/qtquickplugin/images/keyframe-16px.png"
+        icon: "images/keyframe-16px.png"
 
         ItemLibraryEntry {
             name: "KeyframeGroup"
@@ -376,7 +376,7 @@ MetaInfo {
 
     Type {
         name: "QtQuick.PropertyAnimation"
-        icon: ":/qtquickplugin/images/item-icon16.png"
+        icon: "images/item-icon16.png"
 
         Hints {
            visibleInNavigator: true
@@ -388,7 +388,7 @@ MetaInfo {
         ItemLibraryEntry {
             name: "Property Animation"
             category: "d.Qt Quick - Animation"
-            libraryIcon: ":/qtquickplugin/images/item-icon.png"
+            libraryIcon: "images/item-icon.png"
             version: "2.0"
             toolTip: qsTr("Animates changes in property values.")
         }
@@ -396,7 +396,7 @@ MetaInfo {
 
     Type {
         name: "QtQuick.PauseAnimation"
-        icon: ":/qtquickplugin/images/item-icon16.png"
+        icon: "images/item-icon16.png"
 
     Hints {
            visibleInNavigator: true
@@ -408,7 +408,7 @@ MetaInfo {
         ItemLibraryEntry {
             name: "Pause Animation"
             category: "d.Qt Quick - Animation"
-            libraryIcon: ":/qtquickplugin/images/item-icon.png"
+            libraryIcon: "images/item-icon.png"
             version: "2.0"
             toolTip: qsTr("Provides a pause between animations.")
         }
@@ -416,7 +416,7 @@ MetaInfo {
 
     Type {
         name: "QtQuick.SequentialAnimation"
-        icon: ":/qtquickplugin/images/item-icon16.png"
+        icon: "images/item-icon16.png"
 
         Hints {
            visibleInNavigator: true
@@ -427,7 +427,7 @@ MetaInfo {
         ItemLibraryEntry {
             name: "Sequential Animation"
             category: "d.Qt Quick - Animation"
-            libraryIcon: ":/qtquickplugin/images/item-icon.png"
+            libraryIcon: "images/item-icon.png"
             version: "2.0"
             toolTip: qsTr("Runs animations one after the other.")
         }
@@ -435,7 +435,7 @@ MetaInfo {
 
     Type {
         name: "QtQuick.ParallelAnimation"
-        icon: ":/qtquickplugin/images/item-icon16.png"
+        icon: "images/item-icon16.png"
 
         Hints {
            visibleInNavigator: true
@@ -446,7 +446,7 @@ MetaInfo {
         ItemLibraryEntry {
             name: "Parallel Animation"
             category: "d.Qt Quick - Animation"
-            libraryIcon: ":/qtquickplugin/images/item-icon.png"
+            libraryIcon: "images/item-icon.png"
             version: "2.0"
             toolTip: qsTr("Runs animations together at the same time.")
         }
@@ -454,7 +454,7 @@ MetaInfo {
 
     Type {
         name: "QtQuick.PropertyAction"
-        icon: ":/qtquickplugin/images/item-icon16.png"
+        icon: "images/item-icon16.png"
 
         Hints {
            visibleInNavigator: true
@@ -466,7 +466,7 @@ MetaInfo {
         ItemLibraryEntry {
             name: "Property Action"
             category: "d.Qt Quick - Animation"
-            libraryIcon: ":/qtquickplugin/images/item-icon.png"
+            libraryIcon: "images/item-icon.png"
             version: "2.0"
             toolTip: qsTr("Provides an immediate property change during animations.")
         }
@@ -474,7 +474,7 @@ MetaInfo {
 
     Type {
         name: "QtQuick.ScriptAction"
-        icon: ":/qtquickplugin/images/item-icon16.png"
+        icon: "images/item-icon16.png"
 
         Hints {
            visibleInNavigator: true
@@ -486,7 +486,7 @@ MetaInfo {
         ItemLibraryEntry {
             name: "Script Action"
             category: "d.Qt Quick - Animation"
-            libraryIcon: ":/qtquickplugin/images/item-icon.png"
+            libraryIcon: "images/item-icon.png"
             version: "2.0"
             toolTip: qsTr("Runs a script during animation.")
         }
@@ -494,7 +494,7 @@ MetaInfo {
 
     Type {
         name: "QtQuick.ColorAnimation"
-        icon: ":/qtquickplugin/images/item-icon16.png"
+        icon: "images/item-icon16.png"
 
         Hints {
            visibleInNavigator: true
@@ -506,7 +506,7 @@ MetaInfo {
         ItemLibraryEntry {
             name: "Color Animation"
             category: "d.Qt Quick - Animation"
-            libraryIcon: ":/qtquickplugin/images/item-icon.png"
+            libraryIcon: "images/item-icon.png"
             version: "2.0"
             toolTip: qsTr("Animates the color of an item.")
         }
@@ -514,7 +514,7 @@ MetaInfo {
 
     Type {
         name: "QtQuick.NumberAnimation"
-        icon: ":/qtquickplugin/images/item-icon16.png"
+        icon: "images/item-icon16.png"
 
         Hints {
             visibleInNavigator: true
@@ -526,7 +526,7 @@ MetaInfo {
         ItemLibraryEntry {
             name: "Number Animation"
             category: "d.Qt Quick - Animation"
-            libraryIcon: ":/qtquickplugin/images/item-icon.png"
+            libraryIcon: "images/item-icon.png"
             version: "2.0"
             Property { name: "to"; type: "int"; value: 0; }
             Property { name: "from"; type: "int"; value: 0; }
@@ -535,74 +535,13 @@ MetaInfo {
     }
 
     Type {
-        name: "QtQml.Timer"
-        icon: ":/qtquickplugin/images/timer-16px.png"
-
-        Hints {
-            visibleInNavigator: true
-            canBeDroppedInNavigator: true
-            canBeDroppedInFormEditor: false
-            canBeContainer: false
-        }
-
-        ItemLibraryEntry {
-            name: "Timer"
-            category: "d.Qt Quick - Animation"
-            libraryIcon: ":/qtquickplugin/images/timer-24px.png"
-            version: "2.0"
-            toolTip: qsTr(" Triggers an action at a given time.")
-        }
-    }
-
-    Type {
-        name: "QML.Component"
-        icon: ":/qtquickplugin/images/component-icon16.png"
-
-        Hints {
-            canBeDroppedInNavigator: true
-            canBeDroppedInFormEditor: false
-        }
-
-        ItemLibraryEntry {
-            name: "Component"
-            category: "e.Qt Quick - Instancers"
-            libraryIcon: ":/qtquickplugin/images/component-icon.png"
-            version: "1.0"
-
-            QmlSource { source: ":/qtquickplugin/source/component.qml" }
-            toolTip: qsTr("Allows you to define components inline, within a QML document.")
-        }
-    }
-
-    Type {
-        name: "QML.Component"
-        icon: ":/qtquickplugin/images/component-icon16.png"
-
-        Hints {
-            canBeDroppedInNavigator: true
-            canBeDroppedInFormEditor: false
-        }
-
-        ItemLibraryEntry {
-            name: "Component 3D"
-            category: "Instancers"
-            libraryIcon: ":/qtquickplugin/images/component-icon.png"
-            version: "1.0"
-            requiredImport: "QtQuick3D"
-
-            QmlSource { source: ":/qtquickplugin/source/component3d.qml" }
-            toolTip: qsTr("Allows you to define 3D components inline, within a QML document.")
-        }
-    }
-
-    Type {
         name: "QtQuick.Loader"
-        icon: ":/qtquickplugin/images/loader-icon16.png"
+        icon: "images/loader-icon16.png"
 
         ItemLibraryEntry {
             name: "Loader"
             category: "e.Qt Quick - Instancers"
-            libraryIcon: ":/qtquickplugin/images/loader-icon.png"
+            libraryIcon: "images/loader-icon.png"
             version: "2.0"
             Property { name: "width"; type: "int"; value: 200; }
             Property { name: "height"; type: "int"; value: 200; }
@@ -612,7 +551,7 @@ MetaInfo {
 
     Type {
         name: "QtQuick.Repeater"
-        icon: ":/qtquickplugin/images/repeater-icon16.png"
+        icon: "images/repeater-icon16.png"
 
         Hints {
             canBeDroppedInFormEditor: false
@@ -622,216 +561,9 @@ MetaInfo {
         ItemLibraryEntry {
             name: "Repeater"
             category: "e.Qt Quick - Instancers"
-            libraryIcon: ":/qtquickplugin/images/repeater-icon.png"
+            libraryIcon: "images/repeater-icon.png"
             version: "2.0"
             toolTip: qsTr("Creates a number of copies of the same item.")
         }
     }
-
-    Type {
-        name: "QtMultimedia.MediaPlayer"
-        icon: ":/qtquickplugin/images/media-player-16px.png"
-
-        Hints {
-            visibleInNavigator: true
-            canBeDroppedInNavigator: true
-            canBeDroppedInFormEditor: false
-            canBeContainer: false
-        }
-
-        ItemLibraryEntry {
-            name: "Media Player"
-            category: "f.Qt Quick - Multimedia"
-            libraryIcon: ":/qtquickplugin/images/media-player-24px.png"
-            version: "6.0"
-            requiredImport: "QtMultimedia"
-        }
-    }
-
-    Type {
-        name: "QtMultimedia.AudioOutput"
-        icon: ":/qtquickplugin/images/audio-output-16px.png"
-
-        Hints {
-            visibleInNavigator: true
-            canBeDroppedInNavigator: true
-            canBeDroppedInFormEditor: false
-            canBeContainer: false
-        }
-
-        ItemLibraryEntry {
-            name: "Audio Output"
-            category: "f.Qt Quick - Multimedia"
-            libraryIcon: ":/qtquickplugin/images/audio-output-24px.png"
-            version: "6.0"
-            requiredImport: "QtMultimedia"
-        }
-    }
-
-    Type {
-        name: "QtMultimedia.VideoOutput"
-        icon: ":/qtquickplugin/images/video-output-16px.png"
-
-        Hints {
-            visibleInNavigator: true
-            canBeDroppedInNavigator: true
-            canBeDroppedInFormEditor: false
-            canBeContainer: false
-        }
-
-        ItemLibraryEntry {
-            name: "Video Output"
-            category: "f.Qt Quick - Multimedia"
-            libraryIcon: ":/qtquickplugin/images/video-output-24px.png"
-            version: "6.0"
-            requiredImport: "QtMultimedia"
-        }
-    }
-
-    Type {
-        name: "QtMultimedia.Video"
-        icon: ":/qtquickplugin/images/video-16px.png"
-
-        Hints {
-            visibleInNavigator: true
-            canBeDroppedInNavigator: true
-            canBeDroppedInFormEditor: true
-            canBeContainer: false
-        }
-
-        ItemLibraryEntry {
-            name: "Video"
-            category: "f.Qt Quick - Multimedia"
-            libraryIcon: ":/qtquickplugin/images/video-24px.png"
-            version: "6.0"
-            requiredImport: "QtMultimedia"
-
-            Property { name: "width"; type: "int"; value: 200; }
-            Property { name: "height"; type: "int"; value: 200; }
-        }
-    }
-
-    Type {
-        name: "QtQuick3D.SpatialAudio.AmbientSound"
-        icon: ":/qtquickplugin/images/ambient-sound-16.png"
-
-        Hints {
-            canBeDroppedInNavigator: true
-            canBeDroppedInFormEditor: false
-            canBeDroppedInView3D: false
-            canBeContainer: false
-        }
-
-        ItemLibraryEntry {
-            name: "Ambient Sound"
-            category: "Spatial Audio"
-            libraryIcon: ":/qtquickplugin/images/ambient-sound-24.png"
-            version: "6.0"
-            requiredImport: "QtQuick3D.SpatialAudio"
-            toolTip: qsTr("An ambient background sound.")
-        }
-    }
-
-    Type {
-        name: "QtQuick3D.SpatialAudio.AudioEngine"
-        icon: ":/qtquickplugin/images/audio-engine-16.png"
-
-        Hints {
-            canBeDroppedInNavigator: true
-            canBeDroppedInFormEditor: false
-            canBeDroppedInView3D: false
-            canBeContainer: false
-        }
-
-        ItemLibraryEntry {
-            name: "Audio Engine"
-            category: "Spatial Audio"
-            libraryIcon: ":/qtquickplugin/images/audio-engine-24.png"
-            version: "6.0"
-            requiredImport: "QtQuick3D.SpatialAudio"
-            toolTip: qsTr("Manages sound objects inside a 3D scene.")
-        }
-    }
-
-    Type {
-        name: "QtQuick3D.SpatialAudio.AudioListener"
-        icon: ":/qtquickplugin/images/audio-listener-16.png"
-
-        Hints {
-            canBeDroppedInNavigator: true
-            canBeDroppedInFormEditor: false
-            canBeDroppedInView3D: true
-        }
-
-        ItemLibraryEntry {
-            name: "Audio Listener"
-            category: "Spatial Audio"
-            libraryIcon: ":/qtquickplugin/images/audio-listener-24.png"
-            version: "6.0"
-            requiredImport: "QtQuick3D.SpatialAudio"
-            toolTip: qsTr("Sets the position and orientation of listening.")
-        }
-    }
-
-    Type {
-        name: "QtQuick3D.SpatialAudio.AudioRoom"
-        icon: ":/qtquickplugin/images/audio-room-16.png"
-
-        Hints {
-            canBeDroppedInNavigator: true
-            canBeDroppedInFormEditor: false
-            canBeDroppedInView3D: true
-        }
-
-        ItemLibraryEntry {
-            name: "Audio Room"
-            category: "Spatial Audio"
-            libraryIcon: ":/qtquickplugin/images/audio-room-24.png"
-            version: "6.0"
-            requiredImport: "QtQuick3D.SpatialAudio"
-            toolTip: qsTr("Sets up a room for the spatial audio engine.")
-        }
-    }
-
-    Type {
-        name: "QtQuick3D.SpatialAudio.SpatialSound"
-        icon: ":/qtquickplugin/images/spatial-audio-16.png"
-
-        Hints {
-            canBeDroppedInNavigator: true
-            canBeDroppedInFormEditor: false
-            canBeDroppedInView3D: true
-        }
-
-        ItemLibraryEntry {
-            name: "Spatial Sound"
-            category: "Spatial Audio"
-            libraryIcon: ":/qtquickplugin/images/spatial-audio-24.png"
-            version: "6.0"
-            requiredImport: "QtQuick3D.SpatialAudio"
-            toolTip: qsTr("A sound object in 3D space.")
-        }
-    }
-
-    Type {
-        name: "QtQuick3D.BakedLightmap"
-        icon: ":/ItemLibrary/images/item-default-icon.png"
-
-        Hints {
-            canBeDroppedInNavigator: true
-            canBeDroppedInFormEditor: false
-            canBeDroppedInView3D: false
-        }
-
-        ItemLibraryEntry {
-            name: "Baked Lightmap"
-            category: "Components"
-            libraryIcon: ":/ItemLibrary/images/item-default-icon.png"
-            version: "6.5"
-            requiredImport: "QtQuick3D"
-            toolTip: qsTr("An object to specify details about baked lightmap of a model.")
-
-            Property { name: "loadPrefix"; type: "string"; value: "lightmaps"; }
-        }
-    }
 }
diff --git a/share/qtcreator/qmldesigner/itemLibrary/quick3d.metainfo b/share/qtcreator/qmldesigner/itemLibrary/quick3d.metainfo
new file mode 100644
index 0000000000..8f00613966
--- /dev/null
+++ b/share/qtcreator/qmldesigner/itemLibrary/quick3d.metainfo
@@ -0,0 +1,125 @@
+MetaInfo {
+    Type {
+        name: "QtQuick3D.SpatialAudio.AmbientSound"
+        icon: "images/ambient-sound-16.png"
+
+        Hints {
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: false
+            canBeContainer: false
+        }
+
+        ItemLibraryEntry {
+            name: "Ambient Sound"
+            category: "Spatial Audio"
+            libraryIcon: "images/ambient-sound-24.png"
+            version: "6.0"
+            requiredImport: "QtQuick3D.SpatialAudio"
+            toolTip: qsTr("An ambient background sound.")
+        }
+    }
+
+    Type {
+        name: "QtQuick3D.SpatialAudio.AudioEngine"
+        icon: "images/audio-engine-16.png"
+
+        Hints {
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: false
+            canBeContainer: false
+        }
+
+        ItemLibraryEntry {
+            name: "Audio Engine"
+            category: "Spatial Audio"
+            libraryIcon: "images/audio-engine-24.png"
+            version: "6.0"
+            requiredImport: "QtQuick3D.SpatialAudio"
+            toolTip: qsTr("Manages sound objects inside a 3D scene.")
+        }
+    }
+
+    Type {
+        name: "QtQuick3D.SpatialAudio.AudioListener"
+        icon: "images/audio-listener-16.png"
+
+        Hints {
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+        }
+
+        ItemLibraryEntry {
+            name: "Audio Listener"
+            category: "Spatial Audio"
+            libraryIcon: "images/audio-listener-24.png"
+            version: "6.0"
+            requiredImport: "QtQuick3D.SpatialAudio"
+            toolTip: qsTr("Sets the position and orientation of listening.")
+        }
+    }
+
+    Type {
+        name: "QtQuick3D.SpatialAudio.AudioRoom"
+        icon: "images/audio-room-16.png"
+
+        Hints {
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+        }
+
+        ItemLibraryEntry {
+            name: "Audio Room"
+            category: "Spatial Audio"
+            libraryIcon: "images/audio-room-24.png"
+            version: "6.0"
+            requiredImport: "QtQuick3D.SpatialAudio"
+            toolTip: qsTr("Sets up a room for the spatial audio engine.")
+        }
+    }
+
+    Type {
+        name: "QtQuick3D.SpatialAudio.SpatialSound"
+        icon: "images/spatial-audio-16.png"
+
+        Hints {
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+        }
+
+        ItemLibraryEntry {
+            name: "Spatial Sound"
+            category: "Spatial Audio"
+            libraryIcon: "images/spatial-audio-24.png"
+            version: "6.0"
+            requiredImport: "QtQuick3D.SpatialAudio"
+            toolTip: qsTr("A sound object in 3D space.")
+        }
+    }
+
+    Type {
+        name: "QtQuick3D.BakedLightmap"
+        icon: ":/ItemLibrary/images/item-default-icon.png"
+
+        Hints {
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: false
+        }
+
+        ItemLibraryEntry {
+            name: "Baked Lightmap"
+            category: "Components"
+            libraryIcon: ":/ItemLibrary/images/item-default-icon.png"
+            version: "6.5"
+            requiredImport: "QtQuick3D"
+            toolTip: qsTr("An object to specify details about baked lightmap of a model.")
+
+            Property { name: "loadPrefix"; type: "string"; value: "lightmaps"; }
+        }
+    }
+}
diff --git a/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowserContextMenu.qml b/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowserContextMenu.qml
index f72d21b35b..b01aa7d2a3 100644
--- a/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowserContextMenu.qml
+++ b/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowserContextMenu.qml
@@ -127,4 +127,13 @@ StudioControls.Menu {
 
         onTriggered: materialBrowserModel.addNewMaterial()
     }
+
+    Component.onCompleted: {
+        if (MaterialBrowserBackend.rootView.userBundleEnabled()) {
+            var menuItem = Qt.createQmlObject("import StudioControls as StudioControls; StudioControls.MenuItem {}", root)
+            menuItem.text = qsTr("Add to Content Library")
+            menuItem.onTriggered.connect(MaterialBrowserBackend.rootView.addMaterialToContentLibrary)
+            root.addItem(menuItem)
+        }
+    }
 }
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AdvancedSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AdvancedSection.qml
index f88defbff5..1b626623ea 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AdvancedSection.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AdvancedSection.qml
@@ -33,7 +33,7 @@ Section {
 
         PropertyLabel {
             text: qsTr("Smooth")
-            tooltip: qsTr("Toggles if the smoothing is performed using linear interpolation method. Keeping it unchecked would follow non-smooth method using nearest neighbor. It is mostly applicable on image based items. ")
+            tooltip: qsTr("Toggles if the smoothing is performed using linear interpolation method. Keeping it unchecked would follow non-smooth method using nearest neighbor. It is mostly applicable on image based items.")
             blockedByTemplate: !backendValues.smooth.isAvailable
         }
 
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/EffectsSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/EffectsSection.qml
new file mode 100644
index 0000000000..2b7543f1d9
--- /dev/null
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/EffectsSection.qml
@@ -0,0 +1,509 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+import QtQuick
+import QtQuick.Layouts
+import HelperWidgets
+import StudioTheme as StudioTheme
+import StudioControls as StudioControls
+
+Section {
+    id: root
+
+    property bool hasDesignerEffect: false
+    property var model
+    property var effectNode
+    property var effectNodeWrapper
+
+    // Draggging
+    property Item draggedSec: null
+    property var secsY: []
+    property int moveFromIdx: 0
+    property int moveToIdx: 0
+
+    function invalidate() {
+        root.effectNode = null
+        root.model = null
+
+        var effect = modelNodeBackend.allChildrenOfType("DesignEffect")
+        root.effectNode = effect
+        root.effectNodeWrapper = modelNodeBackend.registerSubSelectionWrapper(effect)
+        root.hasDesignerEffect = effect.length === 1
+
+        if (!root.hasDesignerEffect)
+            return
+
+        root.model = modelNodeBackend.allChildren(effect[0]) //ids for all effects
+    }
+
+    leftPadding: 0
+    anchors.left: parent.left
+    anchors.right: parent.right
+    caption: qsTr('Effects <a style="color:%1;">[beta]</a>').arg(StudioTheme.Values.themeInteraction)
+    visible: backendValues.layer_effect.isAvailable
+
+    property Connections connection: Connections {
+        target: modelNodeBackend
+
+        function onSelectionChanged() { root.invalidate() }
+        function onSelectionToBeChanged() { root.model = [] }
+    }
+
+    SectionLayout {
+        PropertyLabel {}
+
+        SecondColumnLayout {
+            Spacer { implicitWidth: StudioTheme.Values.actionIndicatorWidth }
+
+            AbstractButton {
+                id: effectButton
+                implicitWidth: StudioTheme.Values.singleControlColumnWidth
+                width: StudioTheme.Values.singleControlColumnWidth
+                buttonIcon: root.hasDesignerEffect ? qsTr("Remove Effects") : qsTr("Add Effects")
+                iconFont: StudioTheme.Constants.font
+                tooltip: qsTr("Adds a note with a title to explain the component.")
+                onClicked: {
+                    if (root.hasDesignerEffect) {
+                         root.effectNodeWrapper.deleteModelNode()
+                    } else {
+                        modelNodeBackend.createModelNode(-1, "data", "DesignEffect", "QtQuick.Studio.DesignEffects")
+                        var effectNode = modelNodeBackend.allChildrenOfType("DesignEffect")
+                        modelNodeBackend.createModelNode(effectNode, "effects", "DesignDropShadow")
+                    }
+                    root.invalidate()
+                }
+            }
+        }
+
+        PropertyLabel {
+            text: qsTr("Visible")
+            visible: root.hasDesignerEffect
+        }
+
+        SecondColumnLayout {
+            visible: root.hasDesignerEffect
+
+            CheckBox {
+                implicitWidth: StudioTheme.Values.twoControlColumnWidth
+                               + StudioTheme.Values.actionIndicatorWidth
+                backendValue: root.effectNodeWrapper.properties.visible
+            }
+
+            ExpandingSpacer {}
+        }
+    }
+
+    Item {
+        visible: root.hasDesignerEffect
+        width: 1
+        height: StudioTheme.Values.sectionHeadSpacerHeight
+    }
+
+    function handleDragMove() {
+        root.dragTimer.stop()
+        if (root.secsY.length === 0) {
+            for (let i = 0; i < repeater.count; ++i)
+                root.secsY[i] = repeater.itemAt(i).y
+        }
+
+        let scrollView = Controller.mainScrollView
+
+        let oldContentY = scrollView.contentY
+        if (root.draggedSec.y < scrollView.dragScrollMargin + scrollView.contentY
+                && scrollView.contentY > 0) {
+            scrollView.contentY -= scrollView.dragScrollMargin / 2
+        } else if (root.draggedSec.y > scrollView.contentY + scrollView.height - scrollView.dragScrollMargin
+                    && scrollView.contentY < scrollView.contentHeight - scrollView.height) {
+            scrollView.contentY += scrollView.dragScrollMargin / 2
+            if (scrollView.contentY > scrollView.contentHeight - scrollView.height)
+                scrollView.contentY = scrollView.contentHeight - scrollView.height
+        }
+
+        if (scrollView.contentY < 0)
+            scrollView.contentY = 0
+
+        if (oldContentY !== scrollView.contentY) {
+            // Changing dragged section position in drag handler doesn't seem to stick
+            // when triggered by mouse move, so do it again async
+            root.dragTimer.targetY = root.draggedSec.y - oldContentY + scrollView.contentY
+            root.dragTimer.restart()
+            root.dragConnection.enabled = false
+            root.draggedSec.y = root.dragTimer.targetY
+            root.dragConnection.enabled = true
+        }
+
+        root.moveToIdx = root.moveFromIdx
+        for (let i = 0; i < repeater.count; ++i) {
+            let currItem = repeater.itemAt(i)
+            if (i > root.moveFromIdx) {
+                if (root.draggedSec.y > currItem.y) {
+                    currItem.y = root.secsY[i] - root.draggedSec.height - nodesCol.spacing
+                    root.moveToIdx = i
+                } else {
+                    currItem.y = root.secsY[i]
+                }
+            } else if (i < root.moveFromIdx) {
+                if (root.draggedSec.y < currItem.y) {
+                    currItem.y = root.secsY[i] + root.draggedSec.height + nodesCol.spacing
+                    root.moveToIdx = Math.min(root.moveToIdx, i)
+                } else {
+                    currItem.y = root.secsY[i]
+                }
+            }
+        }
+    }
+
+    property Connections dragConnection: Connections {
+        target: root.draggedSec
+
+        function onYChanged() { root.handleDragMove() }
+    }
+
+    property Timer dragTimer: Timer {
+        running: false
+        interval: 16
+        repeat: false
+
+        property real targetY: -1
+
+        onTriggered: {
+            // Ensure we get position change triggers even if user holds mouse still to
+            // make scrolling smooth
+            root.draggedSec.y = targetY
+            root.handleDragMove()
+        }
+    }
+
+    Column {
+        id: nodesCol
+        anchors.left: parent.left
+        anchors.right: parent.right
+        spacing: 1
+
+        Section {
+            sectionHeight: 37
+            anchors.left: parent.left
+            anchors.right: parent.right
+            caption: qsTr("Layer Blur")
+            labelCapitalization: Font.MixedCase
+            visible: root.hasDesignerEffect
+            category: "DesignEffects"
+            expanded: false
+
+            SectionLayout {
+
+                PropertyLabel { text: qsTr("Visible") }
+
+                SecondColumnLayout {
+                    CheckBox {
+                        implicitWidth: StudioTheme.Values.twoControlColumnWidth
+                                       + StudioTheme.Values.actionIndicatorWidth
+                        backendValue: root.effectNodeWrapper.properties.layerBlurVisible
+                    }
+
+                    ExpandingSpacer {}
+                }
+
+                PropertyLabel { text: qsTr("Blur") }
+
+                SecondColumnLayout {
+                    SpinBox {
+                        implicitWidth: StudioTheme.Values.twoControlColumnWidth
+                                       + StudioTheme.Values.actionIndicatorWidth
+                        backendValue: root.effectNodeWrapper.properties.layerBlurRadius
+                        minimumValue: 0
+                        maximumValue: 250
+                    }
+
+                    ExpandingSpacer {}
+                }
+            }
+        }
+
+        Section {
+            sectionHeight: 37
+            anchors.left: parent.left
+            anchors.right: parent.right
+            caption: qsTr("Background Blur")
+            labelCapitalization: Font.MixedCase
+            visible: root.hasDesignerEffect
+            category: "DesignEffects"
+            expanded: false
+
+            SectionLayout {
+
+                PropertyLabel { text: qsTr("Visible") }
+
+                SecondColumnLayout {
+                    CheckBox {
+                        implicitWidth: StudioTheme.Values.twoControlColumnWidth
+                                       + StudioTheme.Values.actionIndicatorWidth
+                        backendValue: root.effectNodeWrapper.properties.backgroundBlurVisible
+                    }
+
+                    ExpandingSpacer {}
+                }
+
+                PropertyLabel { text: qsTr("Blur") }
+
+                SecondColumnLayout {
+                    SpinBox {
+                        implicitWidth: StudioTheme.Values.twoControlColumnWidth
+                                       + StudioTheme.Values.actionIndicatorWidth
+                        backendValue: root.effectNodeWrapper.properties.backgroundBlurRadius
+                        minimumValue: 0
+                        maximumValue: 250
+                    }
+
+                    ExpandingSpacer {}
+                }
+
+                PropertyLabel { text: qsTr("Background") }
+
+                SecondColumnLayout {
+                    ItemFilterComboBox {
+                        implicitWidth: StudioTheme.Values.singleControlColumnWidth
+                                       + StudioTheme.Values.actionIndicatorWidth
+                        width: implicitWidth
+                        typeFilter: "QtQuick.Item"
+                        backendValue: root.effectNodeWrapper.properties.backgroundLayer
+                    }
+
+                    ExpandingSpacer {}
+                }
+            }
+        }
+
+        Repeater {
+            id: repeater
+            model: root.model
+
+            Section {
+                id: delegate
+
+                property QtObject wrapper: modelNodeBackend.registerSubSelectionWrapper(modelData)
+                property bool wasExpanded: false
+
+                Behavior on y {
+                    id: dragAnimation
+
+                    PropertyAnimation {
+                        duration: 300
+                        easing.type: Easing.InOutQuad
+                    }
+                }
+
+                onStartDrag: function(section) {
+                    root.draggedSec = section
+                    root.moveFromIdx = index
+                    // We only need to animate non-dragged sections
+                    dragAnimation.enabled = false
+                    delegate.wasExpanded = delegate.expanded
+                    delegate.expanded = false
+                    delegate.highlightBorder = true
+                    root.secsY = []
+                }
+
+                onStopDrag: {
+                    if (root.secsY.length !== 0) {
+                        if (root.moveFromIdx === root.moveToIdx)
+                            root.draggedSec.y = root.secsY[root.moveFromIdx]
+                        else
+                            modelNodeBackend.moveNode(root.effectNode, "effects", root.moveFromIdx, root.moveToIdx)
+                    }
+
+                    delegate.highlightBorder = false
+                    root.draggedSec = null
+                    delegate.expanded = delegate.wasExpanded
+                    dragAnimation.enabled = true
+
+                    Qt.callLater(root.invalidate)
+                }
+
+                sectionHeight: 37
+                anchors.left: parent.left
+                anchors.right: parent.right
+                category: "DesignEffects"
+                fillBackground: true
+                expanded: false
+
+                draggable: true
+                showCloseButton: true
+
+                content: StudioControls.ComboBox {
+                    id: shadowComboBox
+                    actionIndicatorVisible: false
+                    width: 200
+                    textRole: "text"
+                    valueRole: "value"
+                    model: [
+                        { value: "DesignDropShadow", text: qsTr("Drop Shadow") },
+                        { value: "DesignInnerShadow", text: qsTr("Inner Shadow") }
+                    ]
+                    anchors.verticalCenter: parent.verticalCenter
+
+                    // When an item is selected, update the backend.
+                    onActivated: {
+                        delegate.wrapper.properties.showBehind.resetValue()
+                        modelNodeBackend.changeType(modelData, shadowComboBox.currentValue)
+                    }
+                    // Set the initial currentIndex to the value stored in the backend.
+                    Component.onCompleted: {
+                        shadowComboBox.currentIndex = shadowComboBox.indexOfValue(modelNodeBackend.simplifiedTypeName(modelData))
+                    }
+                }
+
+                onCloseButtonClicked: {
+                    delegate.wrapper.deleteModelNode()
+                    Qt.callLater(root.invalidate)
+                }
+
+                SectionLayout {
+                    id: controlContainer
+                    property bool isDropShadow: shadowComboBox.currentValue === "DesignDropShadow"
+
+                    PropertyLabel { text: qsTr("Visible") }
+
+                    SecondColumnLayout {
+                        CheckBox {
+                            implicitWidth: StudioTheme.Values.twoControlColumnWidth
+                                           + StudioTheme.Values.actionIndicatorWidth
+                            backendValue: delegate.wrapper.properties.visible
+                        }
+
+                        ExpandingSpacer {}
+                    }
+
+                    PropertyLabel { text: qsTr("Blur") }
+
+                    SecondColumnLayout {
+                        SpinBox {
+                            implicitWidth: StudioTheme.Values.twoControlColumnWidth
+                                           + StudioTheme.Values.actionIndicatorWidth
+                            backendValue: delegate.wrapper.properties.blur
+                            minimumValue: 0
+                            maximumValue: 250
+                        }
+
+                        ExpandingSpacer {}
+                    }
+
+                    PropertyLabel {
+                        text: qsTr("Spread")
+                        enabled: modelNodeBackend.isInstanceOf("Rectangle")
+                    }
+
+                    SecondColumnLayout {
+                        SpinBox {
+                            implicitWidth: StudioTheme.Values.twoControlColumnWidth
+                                           + StudioTheme.Values.actionIndicatorWidth
+                            backendValue: delegate.wrapper.properties.spread
+                            enabled: modelNodeBackend.isInstanceOf("Rectangle")
+                            minimumValue: -2048
+                            maximumValue: 2048
+                        }
+
+                        ExpandingSpacer {}
+                    }
+
+                    PropertyLabel {
+                        text: qsTr("Color")
+                        tooltip: qsTr("Sets the color.")
+                    }
+
+                    ColorEditor {
+                        backendValue: delegate.wrapper.properties.color
+                        supportGradient: false
+                    }
+
+                    PropertyLabel { text: qsTr("Offset") }
+
+                    SecondColumnLayout {
+                        SpinBox {
+                            implicitWidth: StudioTheme.Values.twoControlColumnWidth
+                                           + StudioTheme.Values.actionIndicatorWidth
+                            backendValue: delegate.wrapper.properties.offsetX
+                            minimumValue: -0xffff
+                            maximumValue: 0xffff
+                        }
+
+                        Spacer { implicitWidth: StudioTheme.Values.controlLabelGap }
+
+                        ControlLabel {
+                            text: "X"
+                            tooltip: qsTr("X-coordinate")
+                        }
+
+                        Spacer { implicitWidth: StudioTheme.Values.controlGap }
+
+                        SpinBox {
+                            implicitWidth: StudioTheme.Values.twoControlColumnWidth
+                                           + StudioTheme.Values.actionIndicatorWidth
+                            backendValue: delegate.wrapper.properties.offsetY
+                            minimumValue: -0xffff
+                            maximumValue: 0xffff
+                        }
+
+                        Spacer { implicitWidth: StudioTheme.Values.controlLabelGap }
+
+                        ControlLabel {
+                            text: "Y"
+                            tooltip: qsTr("Y-coordinate")
+                        }
+
+                        ExpandingSpacer {}
+                    }
+
+
+                    PropertyLabel {
+                        visible: controlContainer.isDropShadow
+                        text: qsTr("Show behind")
+                    }
+
+                    SecondColumnLayout {
+                        visible: controlContainer.isDropShadow
+
+                        CheckBox {
+                            implicitWidth: StudioTheme.Values.twoControlColumnWidth
+                                           + StudioTheme.Values.actionIndicatorWidth
+                            backendValue: delegate.wrapper.properties.showBehind
+                        }
+
+                        ExpandingSpacer {}
+                    }
+                }
+            }
+        }
+    }
+
+    Item {
+        visible: root.hasDesignerEffect
+        width: 1
+        height: StudioTheme.Values.sectionHeadSpacerHeight
+    }
+
+    SectionLayout {
+        visible: root.hasDesignerEffect
+
+        PropertyLabel {}
+
+        SecondColumnLayout {
+            Spacer { implicitWidth: StudioTheme.Values.actionIndicatorWidth }
+
+            AbstractButton {
+                id: addShadowEffectButton
+                implicitWidth: StudioTheme.Values.singleControlColumnWidth
+                width: StudioTheme.Values.singleControlColumnWidth
+                buttonIcon: qsTr("Add Shadow Effect")
+                iconFont: StudioTheme.Constants.font
+                tooltip: qsTr("Adds a Design Drop Shadow.")
+                onClicked: {
+                    modelNodeBackend.createModelNode(root.effectNode,
+                                                     "effects",
+                                                     "DesignDropShadow")
+                    root.invalidate()
+                }
+            }
+        }
+    }
+}
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ItemPane.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ItemPane.qml
index 60bd415a6a..aeef8a9598 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ItemPane.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ItemPane.qml
@@ -133,6 +133,10 @@ PropertyEditorPane {
                 visible: specificsOne.source.toString() !== ""
             }
 
+            EffectsSection {
+                expanded: false
+            }
+
             AdvancedSection {
                 expanded: false
             }
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Layouts/ColumnLayoutSpecifics.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Layouts/ColumnLayoutSpecifics.qml
index 2072f13a8e..aeaeacbd4e 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Layouts/ColumnLayoutSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Layouts/ColumnLayoutSpecifics.qml
@@ -12,7 +12,10 @@ Section {
     caption: qsTr("Column Layout")
 
     SectionLayout {
-        PropertyLabel { text: qsTr("Column spacing") }
+        PropertyLabel {
+            text: qsTr("Column spacing")
+            tooltip: qsTr("Sets the space between the items in pixels in the <b>Column Layout</b>.")
+        }
 
         SecondColumnLayout {
             SpinBox {
@@ -30,6 +33,7 @@ Section {
         PropertyLabel {
             text: qsTr("Layout direction")
             blockedByTemplate: !backendValues.layoutDirection.isAvailable
+            tooltip: qsTr("Sets the direction of the item flow in the <b>Column Layout</b>.")
         }
 
         SecondColumnLayout {
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Layouts/GridLayoutSpecifics.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Layouts/GridLayoutSpecifics.qml
index 8eea143542..e6606ffe00 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Layouts/GridLayoutSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Layouts/GridLayoutSpecifics.qml
@@ -12,7 +12,10 @@ Section {
     caption: qsTr("Grid Layout")
 
     SectionLayout {
-        PropertyLabel { text: qsTr("Columns & Rows") }
+        PropertyLabel {
+            text: qsTr("Columns & Rows")
+            tooltip: qsTr("Sets the number of columns and rows in the <b>Grid Layout</b>.")
+        }
 
         SecondColumnLayout {
             SpinBox {
@@ -49,7 +52,10 @@ Section {
             ExpandingSpacer {}
         }
 
-        PropertyLabel { text: qsTr("Spacing") }
+        PropertyLabel {
+            text: qsTr("Spacing")
+            tooltip: qsTr("Sets the space between the items in pixels in the rows and columns in the <b>Grid Layout</b>.")
+        }
 
         SecondColumnLayout {
             SpinBox {
@@ -86,7 +92,10 @@ Section {
             ExpandingSpacer {}
         }
 
-        PropertyLabel { text: qsTr("Flow") }
+        PropertyLabel {
+            text: qsTr("Flow")
+            tooltip: qsTr("Set the direction of dynamic items to flow in rows or columns in the <b>Grid Layout</b>.")
+        }
 
         SecondColumnLayout {
             ComboBox {
@@ -100,7 +109,11 @@ Section {
             ExpandingSpacer {}
         }
 
-        PropertyLabel { text: qsTr("Layout direction") }
+        PropertyLabel {
+            text: qsTr("Layout direction")
+            tooltip: qsTr("Sets the direction of the dynamic items left to right or right to left in the <b>Grid Layout</b>.")
+
+        }
 
         SecondColumnLayout {
             ComboBox {
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Layouts/RowLayoutSpecifics.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Layouts/RowLayoutSpecifics.qml
index b4a2ced1cd..726b3783fb 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Layouts/RowLayoutSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Layouts/RowLayoutSpecifics.qml
@@ -12,7 +12,10 @@ Section {
     caption: qsTr("Row Layout")
 
     SectionLayout {
-        PropertyLabel { text: qsTr("Row spacing") }
+        PropertyLabel {
+            text: qsTr("Row spacing")
+            tooltip: qsTr("Sets the space between the items in pixels in the <b>Row Layout</b>.")
+        }
 
         SecondColumnLayout {
             SpinBox {
@@ -30,6 +33,7 @@ Section {
         PropertyLabel {
             text: qsTr("Layout direction")
             blockedByTemplate: !backendValues.layoutDirection.isAvailable
+            tooltip: qsTr("Sets the direction of the item flow in the <b>Row Layout</b>.")
         }
 
         SecondColumnLayout {
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Layouts/StackLayoutSpecifics.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Layouts/StackLayoutSpecifics.qml
index 110a8cbf1a..dc865bf128 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Layouts/StackLayoutSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Layouts/StackLayoutSpecifics.qml
@@ -12,7 +12,10 @@ Section {
     caption: qsTr("Stack Layout")
 
     SectionLayout {
-        PropertyLabel { text: qsTr("Current index") }
+        PropertyLabel {
+            text: qsTr("Current index")
+            tooltip: qsTr("Sets the index of the child item currently visible in the <b>Stack Layout</b>.")
+        }
 
         SecondColumnLayout {
             SpinBox {
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/CheckBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/CheckBox.qml
index 95788a9ec6..7f1e6f5d46 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/CheckBox.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/CheckBox.qml
@@ -22,17 +22,25 @@ StudioControls.CheckBox {
 
     labelColor: colorLogic.textColor
 
+    property bool __block: false
+
     ColorLogic {
         id: colorLogic
         backendValue: checkBox.backendValue
         onValueFromBackendChanged: {
+            checkBox.__block = true
             if (colorLogic.valueFromBackend !== undefined
                     && checkBox.checked !== colorLogic.valueFromBackend)
                 checkBox.checked = colorLogic.valueFromBackend
+            checkBox.__block = false
         }
+
     }
 
     onCheckedChanged: {
+        if (checkBox.__block)
+            return
+
         if (backendValue.value !== checkBox.checked)
             backendValue.value = checkBox.checked
     }
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/DoubleSpinBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/DoubleSpinBox.qml
index a44e8c690b..11ce0e1e75 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/DoubleSpinBox.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/DoubleSpinBox.qml
@@ -53,5 +53,6 @@ Item {
         decimals: 2
 
         onRealValueModified: wrapper.valueModified()
+        onCompressedRealValueModified: wrapper.valueModified()
     }
 }
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/DynamicPropertiesSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/DynamicPropertiesSection.qml
index 39176ca82a..88a0debae8 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/DynamicPropertiesSection.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/DynamicPropertiesSection.qml
@@ -291,53 +291,64 @@ Section {
             property int vecSize: 0
             property var proxyValues: []
             property var spinBoxes: [boxX, boxY, boxZ, boxW]
+            property bool block: false
 
             signal remove
 
-            onVecSizeChanged: updateProxyValues()
+            onVecSizeChanged: layoutVector.updateProxyValues()
 
-            spacing: StudioTheme.Values.sectionRowSpacing / 2
+            spacing: StudioTheme.Values.sectionRowSpacing
 
             function isValidValue(v) {
                 return !(v === undefined || isNaN(v))
             }
 
-            function updateExpression() {
+            function updateExpressionFromExpression() {
+                if (layoutVector.block)
+                    return
+
+                layoutVector.backendValue.expression = layoutVector.proxyValues[0].expression
+                // Only the first proxy value has an expression editor enabled
+            }
+
+            function updateExpressionFromValue() {
+                if (layoutVector.block)
+                    return
+
                 for (let i = 0; i < vecSize; ++i) {
-                    if (!isValidValue(proxyValues[i].value))
+                    if (!layoutVector.isValidValue(layoutVector.proxyValues[i].value))
                         return
                 }
 
-                let expStr = "Qt.vector" + vecSize + "d("+proxyValues[0].value
-                for (let j=1; j < vecSize; ++j)
-                    expStr += ", " + proxyValues[j].value
+                let expStr = "Qt.vector" + layoutVector.vecSize + "d(" + layoutVector.proxyValues[0].value
+                for (let j=1; j < layoutVector.vecSize; ++j)
+                    expStr += ", " + layoutVector.proxyValues[j].value
                 expStr += ")"
 
                 layoutVector.backendValue.expression = expStr
             }
 
             function updateProxyValues() {
-                if (!backendValue)
+                if (!layoutVector.backendValue)
                     return;
 
-                const startIndex = backendValue.expression.indexOf('(')
-                const endIndex = backendValue.expression.indexOf(')')
-                if (startIndex === -1 || endIndex === -1 || endIndex < startIndex)
-                    return
-                const numberStr = backendValue.expression.slice(startIndex + 1, endIndex)
-                const numbers = numberStr.split(",")
-                if (!Array.isArray(numbers) || numbers.length !== vecSize)
-                    return
+                let vals = layoutVector.backendValue.getExpressionAsVector()
 
-                let vals = []
-                for (let i = 0; i < vecSize; ++i) {
-                    vals[i] = parseFloat(numbers[i])
-                    if (!isValidValue(vals[i]))
-                        return
+                layoutVector.block = true
+
+                if (layoutVector.vecSize === vals.length) {
+                    for (let j = 0; j < layoutVector.vecSize; ++j) {
+                        layoutVector.proxyValues[j].setForceBound(false)
+                        layoutVector.proxyValues[j].value = vals[j]
+                    }
+                } else {
+                    for (let j = 0; j < layoutVector.vecSize; ++j) {
+                        layoutVector.proxyValues[j].setForceBound(true) // Required since the backendValue is just proxied
+                        layoutVector.proxyValues[j].expression = layoutVector.backendValue.expression
+                    }
                 }
 
-                for (let j = 0; j < vecSize; ++j)
-                    proxyValues[j].value = vals[j]
+                layoutVector.block = false
             }
 
             SecondColumnLayout {
@@ -357,15 +368,18 @@ Section {
                     tooltip: "X"
                 }
 
-                Spacer { implicitWidth: StudioTheme.Values.controlGap }
+                Spacer {
+                    implicitWidth: StudioTheme.Values.controlGap
+                                   + StudioTheme.Values.actionIndicatorWidth
+                }
 
                 SpinBox {
                     id: boxY
+                    actionIndicatorVisible: false
                     minimumValue: -9999999
                     maximumValue: 9999999
                     decimals: 2
                     implicitWidth: StudioTheme.Values.twoControlColumnWidth
-                                   + StudioTheme.Values.actionIndicatorWidth
                 }
 
                 Spacer { implicitWidth: StudioTheme.Values.controlLabelGap }
@@ -386,14 +400,16 @@ Section {
             }
 
             SecondColumnLayout {
-                visible: vecSize > 2
+                visible: layoutVector.vecSize > 2
+                Spacer { implicitWidth: StudioTheme.Values.actionIndicatorWidth }
+
                 SpinBox {
                     id: boxZ
+                    actionIndicatorVisible: false
                     minimumValue: -9999999
                     maximumValue: 9999999
                     decimals: 2
                     implicitWidth: StudioTheme.Values.twoControlColumnWidth
-                                   + StudioTheme.Values.actionIndicatorWidth
                 }
 
                 Spacer { implicitWidth: StudioTheme.Values.controlLabelGap }
@@ -401,19 +417,22 @@ Section {
                 ControlLabel {
                     text: "Z"
                     tooltip: "Z"
-                    visible: vecSize > 2
+                    visible: layoutVector.vecSize > 2
                 }
 
-                Spacer { implicitWidth: StudioTheme.Values.controlGap }
+                Spacer {
+                    implicitWidth: StudioTheme.Values.controlGap
+                                   + StudioTheme.Values.actionIndicatorWidth
+                }
 
                 SpinBox {
                     id: boxW
+                    actionIndicatorVisible: false
                     minimumValue: -9999999
                     maximumValue: 9999999
                     decimals: 2
                     implicitWidth: StudioTheme.Values.twoControlColumnWidth
-                                   + StudioTheme.Values.actionIndicatorWidth
-                    visible: vecSize > 3
+                    visible: layoutVector.vecSize > 3
                 }
 
                 Spacer { implicitWidth: StudioTheme.Values.controlLabelGap }
@@ -421,7 +440,7 @@ Section {
                 ControlLabel {
                     text: "W"
                     tooltip: "W"
-                    visible: vecSize > 3
+                    visible: layoutVector.vecSize > 3
                 }
 
                 Spacer { implicitWidth: StudioTheme.Values.controlGap }
@@ -430,7 +449,7 @@ Section {
                     height: 10
                     implicitWidth: StudioTheme.Values.twoControlColumnWidth
                                   + StudioTheme.Values.actionIndicatorWidth
-                    visible: vecSize === 2 // Placeholder for last spinbox
+                    visible: layoutVector.vecSize === 2 // Placeholder for last spinbox
                 }
 
                 Spacer { implicitWidth: StudioTheme.Values.twoControlColumnGap }
@@ -486,9 +505,12 @@ Section {
                     model: root.propertiesModel
                     row: index
                 }
+
                 PropertyLabel {
                     text: propertyName
                     tooltip: propertyType
+                    Layout.alignment: Qt.AlignTop
+                    Layout.topMargin: 6
                 }
 
                 Loader {
@@ -540,7 +562,8 @@ Section {
                             for (let i = 0; i < vecSize; ++i) {
                                 var newProxyValue = propertyRow.createProxyBackendValue()
                                 loader.item.proxyValues.push(newProxyValue)
-                                newProxyValue.valueChangedQml.connect(loader.item.updateExpression)
+                                newProxyValue.valueChangedQml.connect(loader.item.updateExpressionFromValue)
+                                newProxyValue.expressionChangedQml.connect(loader.item.updateExpressionFromExpression)
                                 loader.item.spinBoxes[i].backendValue = newProxyValue
                             }
                             propertyRow.backendValue.expressionChanged.connect(loader.item.updateProxyValues)
@@ -685,7 +708,7 @@ Section {
                     StudioControls.ComboBox {
                         id: comboBox
                         actionIndicator.visible: false
-                        model: ["int", "real", "color", "string", "bool", "url", "alias",
+                        model: ["int", "real", "color", "string", "bool", "url", "alias", "signal",
                                 "TextureInput", "vector2d", "vector3d", "vector4d"]
                         width: cePopup.itemWidth
                     }
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FlagsComboBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FlagsComboBox.qml
index 46c98f25c5..edf17374e2 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FlagsComboBox.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FlagsComboBox.qml
@@ -132,6 +132,8 @@ StudioControls.CustomComboBox {
     ExtendedFunctionLogic {
         id: extFuncLogic
         backendValue: root.backendValue
+
+        onMenuVisibleChanged: root.popup.visible = false
     }
 
     actionIndicator.icon.color: extFuncLogic.color
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/IconButton.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/IconButton.qml
index 008320cb92..4534d3fe7d 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/IconButton.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/IconButton.qml
@@ -8,9 +8,9 @@ import StudioTheme as StudioTheme
 Rectangle {
     id: root
 
-    signal clicked()
-    signal pressed()
-    signal released()
+    signal clicked(mouse: var)
+    signal pressed(mouse: var)
+    signal released(mouse: var)
 
     property alias icon: icon.text
     property alias tooltip: toolTip.text
@@ -30,18 +30,17 @@ Rectangle {
     property color hoverColor: root.transparentBg ? "transparent" : StudioTheme.Values.themeControlBackgroundHover
     property color pressColor: root.transparentBg ? "transparent" : StudioTheme.Values.themeControlBackgroundInteraction
 
-    width: buttonSize
-    height: buttonSize
+    width: root.buttonSize
+    height: root.buttonSize
 
-    color: !enabled ? normalColor
-                    : mouseArea.pressed ? pressColor
-                                        : mouseArea.containsMouse ? hoverColor
-                                                                  : normalColor
+    color: !root.enabled ? root.normalColor
+                         : mouseArea.pressed ? root.pressColor
+                                             : mouseArea.containsMouse ? root.hoverColor
+                                                                       : root.normalColor
 
     Text {
         id: icon
         anchors.centerIn: root
-
         color: root.enabled ? StudioTheme.Values.themeTextColor : StudioTheme.Values.themeTextColorDisabled
         font.family: StudioTheme.Constants.iconFont.family
         font.pixelSize: StudioTheme.Values.baseIconFontSize
@@ -49,30 +48,29 @@ Rectangle {
 
     MouseArea {
         id: mouseArea
-
         anchors.fill: parent
         hoverEnabled: root.visible
-        onClicked: {
+        onClicked: function(mouse) {
             // We need to keep mouse area enabled even when button is disabled to make tooltip work
             if (root.enabled)
-                root.clicked()
+                root.clicked(mouse)
         }
 
-        onPressed: {
+        onPressed: function(mouse) {
             if (root.enabled)
-                root.pressed()
+                root.pressed(mouse)
         }
 
-        onReleased: {
+        onReleased: function(mouse) {
             if (root.enabled)
-                root.released()
+                root.released(mouse)
         }
     }
 
     ToolTip {
         id: toolTip
 
-        visible: mouseArea.containsMouse && text !== ""
+        visible: mouseArea.containsMouse && toolTip.text !== ""
         delay: 1000
     }
 }
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Section.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Section.qml
index dbbb200f73..245b8506a2 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Section.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Section.qml
@@ -9,11 +9,13 @@ import StudioTheme as StudioTheme
 
 Item {
     id: section
-    property alias caption: label.text
-    property alias labelColor: label.color
+
+    property string caption: "Title"
+    property color labelColor: StudioTheme.Values.themeTextColor
+    property int labelCapitalization: Font.AllUppercase
     property alias sectionHeight: header.height
     property alias sectionBackgroundColor: header.color
-    property alias sectionFontSize: label.font.pixelSize
+    property int sectionFontSize: StudioTheme.Values.myFontSize
     property alias showTopSeparator: topSeparator.visible
     property alias showArrow: arrow.visible
     property alias showLeftBorder: leftBorder.visible
@@ -26,6 +28,17 @@ Item {
     property alias fillBackground: sectionBackground.visible
     property alias highlightBorder: sectionBorder.visible
 
+    property Item content: Controls.Label {
+        id: label
+        text: section.caption
+        color: section.labelColor
+        elide: Text.ElideRight
+        font.pixelSize: section.sectionFontSize
+        font.capitalization: section.labelCapitalization
+        anchors.verticalCenter: parent?.verticalCenter
+        textFormat: Text.RichText
+    }
+
     property int leftPadding: StudioTheme.Values.sectionLeftPadding
     property int rightPadding: 0
     property int topPadding: StudioTheme.Values.sectionHeadSpacerHeight
@@ -59,7 +72,7 @@ Item {
     Connections {
         target: Controller
         function onCollapseAll(cat) {
-            if (collapsible && cat === section.category) {
+            if (section.collapsible && cat === section.category) {
                 if (section.expandOnClick)
                     section.expanded = false
                 else
@@ -106,6 +119,22 @@ Item {
         onExited: section.dropExit()
     }
 
+    StudioControls.Menu {
+        id: contextMenu
+
+        StudioControls.MenuItem {
+            text: qsTr("Expand All")
+            onTriggered: Controller.expandAll(section.category)
+        }
+
+        StudioControls.MenuItem {
+            text: qsTr("Collapse All")
+            onTriggered: Controller.collapseAll(section.category)
+        }
+
+        onOpenedChanged: Controller.contextMenuOpened = contextMenu.opened
+    }
+
     Rectangle {
         id: header
         height: section.hideHeader ? 0 : StudioTheme.Values.sectionHeadHeight
@@ -116,43 +145,6 @@ Item {
                                  : Qt.lighter(StudioTheme.Values.themeSectionHeadBackground, 1.0
                                               + (0.2 * section.level))
 
-        Item {
-            StudioControls.Menu {
-                id: contextMenu
-
-                StudioControls.MenuItem {
-                    text: qsTr("Expand All")
-                    onTriggered: Controller.expandAll(section.category)
-                }
-
-                StudioControls.MenuItem {
-                    text: qsTr("Collapse All")
-                    onTriggered: Controller.collapseAll(section.category)
-                }
-
-                onOpenedChanged: Controller.contextMenuOpened = contextMenu.opened
-            }
-        }
-
-        Image {
-            id: arrow
-            width: 8
-            height: 4
-            source: "image://icons/down-arrow"
-            anchors.left: parent.left
-            anchors.leftMargin: 4 + (section.level * section.levelShift) + (section.draggable ? 20 : 0) + (section.showEyeButton ? 25 : 0)
-            anchors.verticalCenter: parent.verticalCenter
-        }
-
-        Controls.Label {
-            id: label
-            anchors.verticalCenter: parent.verticalCenter
-            color: StudioTheme.Values.themeTextColor
-            x: arrow.x + 18
-            font.pixelSize: StudioTheme.Values.myFontSize
-            font.capitalization: Font.AllUppercase
-        }
-
         MouseArea {
             id: mouseArea
             anchors.fill: parent
@@ -173,58 +165,102 @@ Item {
             }
         }
 
-        IconButton {
-            id: closeButton
+        RowLayout {
+            spacing: 1
+            anchors.fill: parent
 
-            icon: StudioTheme.Constants.closeCross
-            buttonSize: 22
-            iconScale: containsMouse ? 1.2 : 1
-            transparentBg: true
-            anchors.right: parent.right
-            anchors.rightMargin: 10
-            visible: false
+            IconButton {
+                id: dragButton
+                visible: false
+                icon: StudioTheme.Constants.dragmarks
+                buttonSize: 21
+                iconScale: dragButton.enabled && dragButton.containsMouse ? 1.2 : 1
+                transparentBg: true
 
-            onClicked: root.closeButtonClicked()
-        }
+                Layout.alignment: Qt.AlignVCenter
+                Layout.preferredWidth: dragButton.width
+                Layout.maximumWidth: dragButton.width
+
+                drag.target: dragButton.enabled ? section : null
+                drag.axis: Drag.YAxis
+
+                onPressed: {
+                    section.startDrag(section)
+                    section.z = ++section.parent.z // put the dragged section on top
+                }
 
-        IconButton {
-            id: dragButton
+                onReleased: {
+                    section.stopDrag()
+                }
+            }
 
-            icon: StudioTheme.Constants.dragmarks
-            buttonSize: 22
-            iconScale: dragButton.enabled && dragButton.containsMouse ? 1.2 : 1
-            transparentBg: true
+            IconButton {
+                id: eyeButton
 
-            visible: false
-            drag.target: dragButton.enabled ? section : null
-            drag.axis: Drag.YAxis
+                visible: false
+                icon: section.eyeEnabled ? StudioTheme.Constants.visible_small
+                                         : StudioTheme.Constants.invisible_small
+                buttonSize: 21
+                iconScale: eyeButton.containsMouse ? 1.2 : 1
+                transparentBg: true
 
-            onPressed: {
-                section.startDrag(section)
+                Layout.alignment: Qt.AlignVCenter
+                Layout.preferredWidth: eyeButton.width
+                Layout.maximumWidth: eyeButton.width
 
-                section.z = ++section.parent.z // put the dragged section on top
+                onClicked: {
+                    section.eyeEnabled = !section.eyeEnabled
+                    section.eyeButtonClicked()
+                }
             }
 
-            onReleased: {
-                section.stopDrag()
+            IconButton {
+                id: arrow
+                icon: StudioTheme.Constants.sectionToggle
+                transparentBg: true
+
+                buttonSize: 21
+                iconSize: StudioTheme.Values.smallIconFontSize
+                iconColor: StudioTheme.Values.themeTextColor
+
+                Layout.alignment: Qt.AlignVCenter
+                Layout.preferredWidth: arrow.width
+                Layout.maximumWidth: arrow.width
+
+                onClicked: function(mouse) {
+                    if (!section.collapsible && section.expanded)
+                        return
+
+                    transition.enabled = true
+                    if (section.expandOnClick)
+                        section.expanded = !section.expanded
+                    else
+                        section.toggleExpand()
+                }
             }
-        }
 
-        IconButton {
-            id: eyeButton
+            Item {
+                id: headerContent
+                height: header.height
+                Layout.fillWidth: true
+                children: [ section.content ]
+            }
 
-            anchors.left: dragButton.right
+            IconButton {
+                id: closeButton
 
-            icon: section.eyeEnabled ? StudioTheme.Constants.visible_small : StudioTheme.Constants.invisible_small
-            buttonSize: 22
-            iconScale: eyeButton.containsMouse ? 1.2 : 1
-            transparentBg: true
+                visible: false
+                icon: StudioTheme.Constants.closeCross
+                buttonSize: 21
+                iconScale: closeButton.containsMouse ? 1.2 : 1
+                transparentBg: true
 
-            visible: false
+                Layout.alignment: Qt.AlignVCenter
+                Layout.preferredWidth: closeButton.width
+                Layout.maximumWidth: closeButton.width
+                Layout.rightMargin: 10
 
-            onClicked: {
-                section.eyeEnabled = !section.eyeEnabled
-                root.eyeButtonClicked()
+                onClicked: section.closeButtonClicked()
             }
         }
     }
@@ -266,6 +302,7 @@ Item {
         border.width: 1
         visible: false
     }
+
     Item {
         id: topSpacer
         height: section.addTopPadding && column.height > 0 ? section.topPadding : 0
@@ -285,7 +322,7 @@ Item {
         id: leftBorder
         visible: false
         width: 1
-        height: parent.height - bottomPadding
+        height: parent.height - section.bottomPadding
         color: header.color
     }
 
@@ -320,8 +357,8 @@ Item {
         }
 
         onRunningChanged: {
-            if (!running)
-                enabled = false
+            if (!transition.running)
+                transition.enabled = false
         }
     }
 }
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SpinBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SpinBox.qml
index f125c459c5..04cbb78f35 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SpinBox.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SpinBox.qml
@@ -22,6 +22,9 @@ Item {
     property alias realDragRange: spinBox.realDragRange
     property alias pixelsPerUnit: spinBox.pixelsPerUnit
 
+    property alias actionIndicatorEnabled: spinBox.actionIndicator.enabled
+    property alias actionIndicatorVisible: spinBox.actionIndicatorVisible
+
     width: 96
     implicitHeight: spinBox.height
 
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/UrlChooser.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/UrlChooser.qml
index c73e736ef4..0e42515c76 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/UrlChooser.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/UrlChooser.qml
@@ -448,9 +448,10 @@ Row {
         for (var j = 0; j < myModel.length; ++j) {
             let item = myModel[j]
             if (root.hideDuplicates && nameMap.has(item.fileName)) {
-                // Prefer hiding imported asset files rather than other project files
+                // Prefer hiding generated component files rather than other project files
                 let listIndex = nameMap.get(item.fileName)
-                if (comboBox.listModel.get(listIndex).absoluteFilePath.includes("/asset_imports/")) {
+                let absPath = comboBox.listModel.get(listIndex).absoluteFilePath
+                if (absPath.includes("/GeneratedComponents/") || absPath.includes("/asset_imports/")) {
                     comboBox.listModel.set(listIndex, {
                         absoluteFilePath: item.absoluteFilePath,
                         relativeFilePath: item.relativeFilePath,
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml
index ee2df02e04..3c74243f68 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml
@@ -75,309 +75,310 @@ QtObject {
     readonly property string binding_medium: "\u005C"
     readonly property string bounds_small: "\u005D"
     readonly property string branch_medium: "\u005E"
-    readonly property string camera_medium: "\u005F"
-    readonly property string camera_small: "\u0060"
-    readonly property string centerHorizontal: "\u0061"
-    readonly property string centerVertical: "\u0062"
-    readonly property string cleanLogs_medium: "\u0063"
-    readonly property string clearList_large: "\u0064"
-    readonly property string clearList_medium: "\u0065"
-    readonly property string closeCross: "\u0066"
-    readonly property string closeFile_large: "\u0067"
-    readonly property string closeLink: "\u0068"
-    readonly property string close_small: "\u0069"
-    readonly property string code: "\u006A"
-    readonly property string codeEditor_medium: "\u006B"
-    readonly property string codeview_medium: "\u006C"
-    readonly property string colorPopupClose: "\u006D"
-    readonly property string colorSelection_medium: "\u006E"
-    readonly property string columnsAndRows: "\u006F"
-    readonly property string comboBox_medium: "\u0070"
-    readonly property string cone_medium: "\u0071"
-    readonly property string cone_small: "\u0072"
-    readonly property string connection_small: "\u0073"
-    readonly property string connections_medium: "\u0074"
-    readonly property string copyLink: "\u0075"
-    readonly property string copyStyle: "\u0076"
-    readonly property string copy_small: "\u0077"
-    readonly property string cornerA: "\u0078"
-    readonly property string cornerB: "\u0079"
-    readonly property string cornersAll: "\u007A"
-    readonly property string createComponent_large: "\u007B"
-    readonly property string createComponent_small: "\u007C"
-    readonly property string createObject_medium: "\u007D"
-    readonly property string create_medium: "\u007E"
-    readonly property string create_small: "\u007F"
-    readonly property string cube_medium: "\u0080"
-    readonly property string cube_small: "\u0081"
-    readonly property string curveDesigner: "\u0082"
-    readonly property string curveDesigner_medium: "\u0083"
-    readonly property string curveEditor: "\u0084"
-    readonly property string customMaterialEditor: "\u0085"
-    readonly property string cylinder_medium: "\u0086"
-    readonly property string cylinder_small: "\u0087"
-    readonly property string decisionNode: "\u0088"
-    readonly property string deleteColumn: "\u0089"
-    readonly property string deleteMaterial: "\u008A"
-    readonly property string deleteRow: "\u008B"
-    readonly property string deleteTable: "\u008C"
-    readonly property string delete_medium: "\u008D"
-    readonly property string delete_small: "\u008E"
-    readonly property string deletecolumn_medium: "\u008F"
-    readonly property string deletepermanently_medium: "\u0090"
-    readonly property string deleterow_medium: "\u0091"
-    readonly property string designMode_large: "\u0092"
-    readonly property string detach: "\u0093"
-    readonly property string directionalLight_small: "\u0094"
-    readonly property string distributeBottom: "\u0095"
-    readonly property string distributeCenterHorizontal: "\u0096"
-    readonly property string distributeCenterVertical: "\u0097"
-    readonly property string distributeLeft: "\u0098"
-    readonly property string distributeOriginBottomRight: "\u0099"
-    readonly property string distributeOriginCenter: "\u009A"
-    readonly property string distributeOriginNone: "\u009B"
-    readonly property string distributeOriginTopLeft: "\u009D"
-    readonly property string distributeRight: "\u009E"
-    readonly property string distributeSpacingHorizontal: "\u009F"
-    readonly property string distributeSpacingVertical: "\u00A0"
-    readonly property string distributeTop: "\u00A1"
-    readonly property string download: "\u00A2"
-    readonly property string downloadUnavailable: "\u00A3"
-    readonly property string downloadUpdate: "\u00A4"
-    readonly property string downloaded: "\u00A5"
-    readonly property string dragmarks: "\u00A6"
-    readonly property string duplicate_small: "\u00A7"
-    readonly property string edit: "\u00A8"
-    readonly property string editComponent_large: "\u00A9"
-    readonly property string editComponent_small: "\u00AA"
-    readonly property string editLightOff_medium: "\u00AB"
-    readonly property string editLightOn_medium: "\u00AC"
-    readonly property string edit_medium: "\u00AE"
-    readonly property string edit_small: "\u00AF"
-    readonly property string effects: "\u00B0"
-    readonly property string events_small: "\u00B1"
-    readonly property string export_medium: "\u00B2"
-    readonly property string eyeDropper: "\u00B3"
-    readonly property string favorite: "\u00B4"
-    readonly property string fitAll_medium: "\u00B5"
-    readonly property string fitSelected_small: "\u00B6"
-    readonly property string fitSelection_medium: "\u00B7"
-    readonly property string fitToView_medium: "\u00B8"
-    readonly property string flowAction: "\u00B9"
-    readonly property string flowTransition: "\u00BA"
-    readonly property string fontStyleBold: "\u00BB"
-    readonly property string fontStyleItalic: "\u00BC"
-    readonly property string fontStyleStrikethrough: "\u00BD"
-    readonly property string fontStyleUnderline: "\u00BE"
-    readonly property string forward_medium: "\u00BF"
-    readonly property string globalOrient_medium: "\u00C0"
-    readonly property string gradient: "\u00C1"
-    readonly property string gridView: "\u00C2"
-    readonly property string grid_medium: "\u00C3"
-    readonly property string group_small: "\u00C4"
-    readonly property string help: "\u00C5"
-    readonly property string home_large: "\u00C6"
-    readonly property string idAliasOff: "\u00C7"
-    readonly property string idAliasOn: "\u00C8"
-    readonly property string import_medium: "\u00C9"
-    readonly property string imported: "\u00CA"
-    readonly property string importedModels_small: "\u00CB"
-    readonly property string infinity: "\u00CC"
-    readonly property string invisible_medium: "\u00CD"
-    readonly property string invisible_small: "\u00CE"
-    readonly property string jumpToCode_medium: "\u00CF"
-    readonly property string jumpToCode_small: "\u00D0"
-    readonly property string keyframe: "\u00D1"
-    readonly property string languageList_medium: "\u00D2"
-    readonly property string layouts_small: "\u00D3"
-    readonly property string lights_small: "\u00D4"
-    readonly property string linear_medium: "\u00D5"
-    readonly property string linkTriangle: "\u00D6"
-    readonly property string linked: "\u00D7"
-    readonly property string listView: "\u00D8"
-    readonly property string listView_medium: "\u00D9"
-    readonly property string list_medium: "\u00DA"
-    readonly property string localOrient_medium: "\u00DB"
-    readonly property string lockOff: "\u00DC"
-    readonly property string lockOn: "\u00DD"
-    readonly property string loopPlayback_medium: "\u00DE"
-    readonly property string materialBrowser_medium: "\u00DF"
-    readonly property string materialPreviewEnvironment: "\u00E0"
-    readonly property string materialPreviewModel: "\u00E1"
-    readonly property string material_medium: "\u00E2"
-    readonly property string maxBar_small: "\u00E3"
-    readonly property string mergeCells: "\u00E4"
-    readonly property string merge_small: "\u00E5"
-    readonly property string minus: "\u00E6"
-    readonly property string mirror: "\u00E7"
-    readonly property string more_medium: "\u00E8"
-    readonly property string mouseArea_small: "\u00E9"
-    readonly property string moveDown_medium: "\u00EA"
-    readonly property string moveInwards_medium: "\u00EB"
-    readonly property string moveUp_medium: "\u00EC"
-    readonly property string moveUpwards_medium: "\u00ED"
-    readonly property string move_medium: "\u00EE"
-    readonly property string newMaterial: "\u00EF"
-    readonly property string nextFile_large: "\u00F0"
-    readonly property string normalBar_small: "\u00F1"
-    readonly property string openLink: "\u00F2"
-    readonly property string openMaterialBrowser: "\u00F3"
-    readonly property string orientation: "\u00F4"
-    readonly property string orthCam_medium: "\u00F5"
-    readonly property string orthCam_small: "\u00F6"
-    readonly property string paddingEdge: "\u00F7"
-    readonly property string paddingFrame: "\u00F8"
-    readonly property string particleAnimation_medium: "\u00F9"
-    readonly property string pasteStyle: "\u00FA"
-    readonly property string paste_small: "\u00FB"
-    readonly property string pause: "\u00FC"
-    readonly property string pause_medium: "\u00FD"
-    readonly property string perspectiveCam_medium: "\u00FE"
-    readonly property string perspectiveCam_small: "\u00FF"
-    readonly property string pin: "\u0100"
-    readonly property string plane_medium: "\u0101"
-    readonly property string plane_small: "\u0102"
-    readonly property string play: "\u0103"
-    readonly property string playFill_medium: "\u0104"
-    readonly property string playOutline_medium: "\u0105"
-    readonly property string plus: "\u0106"
-    readonly property string pointLight_small: "\u0107"
-    readonly property string positioners_small: "\u0108"
-    readonly property string previewEnv_medium: "\u0109"
-    readonly property string previousFile_large: "\u010A"
-    readonly property string promote: "\u010B"
-    readonly property string properties_medium: "\u010C"
-    readonly property string readOnly: "\u010D"
-    readonly property string recent_medium: "\u010E"
-    readonly property string recordFill_medium: "\u010F"
-    readonly property string recordOutline_medium: "\u0110"
-    readonly property string redo: "\u0111"
-    readonly property string reload_medium: "\u0112"
-    readonly property string remove_medium: "\u0113"
-    readonly property string remove_small: "\u0114"
-    readonly property string rename_small: "\u0115"
-    readonly property string replace_small: "\u0116"
-    readonly property string resetView_small: "\u0117"
-    readonly property string restartParticles_medium: "\u0118"
-    readonly property string reverseOrder_medium: "\u0119"
-    readonly property string roatate_medium: "\u011A"
-    readonly property string rotationFill: "\u011B"
-    readonly property string rotationOutline: "\u011C"
-    readonly property string runProjFill_large: "\u011D"
-    readonly property string runProjOutline_large: "\u011E"
-    readonly property string s_anchors: "\u011F"
-    readonly property string s_annotations: "\u0120"
-    readonly property string s_arrange: "\u0121"
-    readonly property string s_boundingBox: "\u0122"
-    readonly property string s_component: "\u0123"
-    readonly property string s_connections: "\u0124"
-    readonly property string s_edit: "\u0125"
-    readonly property string s_enterComponent: "\u0126"
-    readonly property string s_eventList: "\u0127"
-    readonly property string s_group: "\u0128"
-    readonly property string s_layouts: "\u0129"
-    readonly property string s_merging: "\u012A"
-    readonly property string s_mouseArea: "\u012B"
-    readonly property string s_positioners: "\u012C"
-    readonly property string s_selection: "\u012D"
-    readonly property string s_snapping: "\u012E"
-    readonly property string s_timeline: "\u012F"
-    readonly property string s_visibility: "\u0130"
-    readonly property string saveAs_medium: "\u0131"
-    readonly property string saveLogs_medium: "\u0132"
-    readonly property string save_medium: "\u0133"
-    readonly property string scale_medium: "\u0134"
-    readonly property string search: "\u0135"
-    readonly property string search_small: "\u0136"
-    readonly property string sectionToggle: "\u0137"
-    readonly property string selectFill_medium: "\u0138"
-    readonly property string selectOutline_medium: "\u0139"
-    readonly property string selectParent_small: "\u013A"
-    readonly property string selection_small: "\u013B"
-    readonly property string settings_medium: "\u013C"
-    readonly property string signal_small: "\u013D"
-    readonly property string snapping_conf_medium: "\u013E"
-    readonly property string snapping_medium: "\u013F"
-    readonly property string snapping_small: "\u0140"
-    readonly property string sortascending_medium: "\u0141"
-    readonly property string sortdescending_medium: "\u0142"
-    readonly property string sphere_medium: "\u0143"
-    readonly property string sphere_small: "\u0144"
-    readonly property string splitColumns: "\u0145"
-    readonly property string splitRows: "\u0146"
-    readonly property string splitScreen_medium: "\u0147"
-    readonly property string spotLight_small: "\u0148"
-    readonly property string stackedContainer_small: "\u0149"
-    readonly property string startNode: "\u014A"
-    readonly property string step_medium: "\u014B"
-    readonly property string stop_medium: "\u014C"
-    readonly property string tableView_medium: "\u014D"
-    readonly property string testIcon: "\u014E"
-    readonly property string textAlignBottom: "\u014F"
-    readonly property string textAlignCenter: "\u0150"
-    readonly property string textAlignJustified: "\u0151"
-    readonly property string textAlignLeft: "\u0152"
-    readonly property string textAlignMiddle: "\u0153"
-    readonly property string textAlignRight: "\u0154"
-    readonly property string textAlignTop: "\u0155"
-    readonly property string textBulletList: "\u0156"
-    readonly property string textFullJustification: "\u0157"
-    readonly property string textNumberedList: "\u0158"
-    readonly property string textures_medium: "\u0159"
-    readonly property string tickIcon: "\u015A"
-    readonly property string tickMark_small: "\u015B"
-    readonly property string timeline_small: "\u015C"
-    readonly property string toEndFrame_medium: "\u015D"
-    readonly property string toNextFrame_medium: "\u015E"
-    readonly property string toPrevFrame_medium: "\u015F"
-    readonly property string toStartFrame_medium: "\u0160"
-    readonly property string topToolbar_annotations: "\u0161"
-    readonly property string topToolbar_closeFile: "\u0162"
-    readonly property string topToolbar_designMode: "\u0163"
-    readonly property string topToolbar_enterComponent: "\u0164"
-    readonly property string topToolbar_home: "\u0165"
-    readonly property string topToolbar_makeComponent: "\u0166"
-    readonly property string topToolbar_navFile: "\u0167"
-    readonly property string topToolbar_runProject: "\u0168"
-    readonly property string translationCreateFiles: "\u0169"
-    readonly property string translationCreateReport: "\u016A"
-    readonly property string translationExport: "\u016B"
-    readonly property string translationImport: "\u016C"
-    readonly property string translationSelectLanguages: "\u016D"
-    readonly property string translationTest: "\u016E"
-    readonly property string transparent: "\u016F"
-    readonly property string triState: "\u0170"
-    readonly property string triangleArcA: "\u0171"
-    readonly property string triangleArcB: "\u0172"
-    readonly property string triangleCornerA: "\u0173"
-    readonly property string triangleCornerB: "\u0174"
-    readonly property string unLinked: "\u0175"
-    readonly property string undo: "\u0176"
-    readonly property string unify_medium: "\u0177"
-    readonly property string unpin: "\u0178"
-    readonly property string upDownIcon: "\u0179"
-    readonly property string upDownSquare2: "\u017A"
-    readonly property string updateAvailable_medium: "\u017B"
-    readonly property string updateContent_medium: "\u017C"
-    readonly property string visibilityOff: "\u017D"
-    readonly property string visibilityOn: "\u017E"
-    readonly property string visible_medium: "\u017F"
-    readonly property string visible_small: "\u0180"
-    readonly property string warning_medium: "\u0181"
-    readonly property string wildcard: "\u0182"
-    readonly property string wizardsAutomotive: "\u0183"
-    readonly property string wizardsDesktop: "\u0184"
-    readonly property string wizardsGeneric: "\u0185"
-    readonly property string wizardsMcuEmpty: "\u0186"
-    readonly property string wizardsMcuGraph: "\u0187"
-    readonly property string wizardsMobile: "\u0188"
-    readonly property string wizardsUnknown: "\u0189"
-    readonly property string zoomAll: "\u018A"
-    readonly property string zoomIn: "\u018B"
-    readonly property string zoomIn_medium: "\u018C"
-    readonly property string zoomOut: "\u018D"
-    readonly property string zoomOut_medium: "\u018E"
-    readonly property string zoomSelection: "\u018F"
+    readonly property string cameraSpeed_medium: "\u005F"
+    readonly property string camera_medium: "\u0060"
+    readonly property string camera_small: "\u0061"
+    readonly property string centerHorizontal: "\u0062"
+    readonly property string centerVertical: "\u0063"
+    readonly property string cleanLogs_medium: "\u0064"
+    readonly property string clearList_large: "\u0065"
+    readonly property string clearList_medium: "\u0066"
+    readonly property string closeCross: "\u0067"
+    readonly property string closeFile_large: "\u0068"
+    readonly property string closeLink: "\u0069"
+    readonly property string close_small: "\u006A"
+    readonly property string code: "\u006B"
+    readonly property string codeEditor_medium: "\u006C"
+    readonly property string codeview_medium: "\u006D"
+    readonly property string colorPopupClose: "\u006E"
+    readonly property string colorSelection_medium: "\u006F"
+    readonly property string columnsAndRows: "\u0070"
+    readonly property string comboBox_medium: "\u0071"
+    readonly property string cone_medium: "\u0072"
+    readonly property string cone_small: "\u0073"
+    readonly property string connection_small: "\u0074"
+    readonly property string connections_medium: "\u0075"
+    readonly property string copyLink: "\u0076"
+    readonly property string copyStyle: "\u0077"
+    readonly property string copy_small: "\u0078"
+    readonly property string cornerA: "\u0079"
+    readonly property string cornerB: "\u007A"
+    readonly property string cornersAll: "\u007B"
+    readonly property string createComponent_large: "\u007C"
+    readonly property string createComponent_small: "\u007D"
+    readonly property string createObject_medium: "\u007E"
+    readonly property string create_medium: "\u007F"
+    readonly property string create_small: "\u0080"
+    readonly property string cube_medium: "\u0081"
+    readonly property string cube_small: "\u0082"
+    readonly property string curveDesigner: "\u0083"
+    readonly property string curveDesigner_medium: "\u0084"
+    readonly property string curveEditor: "\u0085"
+    readonly property string customMaterialEditor: "\u0086"
+    readonly property string cylinder_medium: "\u0087"
+    readonly property string cylinder_small: "\u0088"
+    readonly property string decisionNode: "\u0089"
+    readonly property string deleteColumn: "\u008A"
+    readonly property string deleteMaterial: "\u008B"
+    readonly property string deleteRow: "\u008C"
+    readonly property string deleteTable: "\u008D"
+    readonly property string delete_medium: "\u008E"
+    readonly property string delete_small: "\u008F"
+    readonly property string deletecolumn_medium: "\u0090"
+    readonly property string deletepermanently_medium: "\u0091"
+    readonly property string deleterow_medium: "\u0092"
+    readonly property string designMode_large: "\u0093"
+    readonly property string detach: "\u0094"
+    readonly property string directionalLight_small: "\u0095"
+    readonly property string distributeBottom: "\u0096"
+    readonly property string distributeCenterHorizontal: "\u0097"
+    readonly property string distributeCenterVertical: "\u0098"
+    readonly property string distributeLeft: "\u0099"
+    readonly property string distributeOriginBottomRight: "\u009A"
+    readonly property string distributeOriginCenter: "\u009B"
+    readonly property string distributeOriginNone: "\u009D"
+    readonly property string distributeOriginTopLeft: "\u009E"
+    readonly property string distributeRight: "\u009F"
+    readonly property string distributeSpacingHorizontal: "\u00A0"
+    readonly property string distributeSpacingVertical: "\u00A1"
+    readonly property string distributeTop: "\u00A2"
+    readonly property string download: "\u00A3"
+    readonly property string downloadUnavailable: "\u00A4"
+    readonly property string downloadUpdate: "\u00A5"
+    readonly property string downloaded: "\u00A6"
+    readonly property string dragmarks: "\u00A7"
+    readonly property string duplicate_small: "\u00A8"
+    readonly property string edit: "\u00A9"
+    readonly property string editComponent_large: "\u00AA"
+    readonly property string editComponent_small: "\u00AB"
+    readonly property string editLightOff_medium: "\u00AC"
+    readonly property string editLightOn_medium: "\u00AE"
+    readonly property string edit_medium: "\u00AF"
+    readonly property string edit_small: "\u00B0"
+    readonly property string effects: "\u00B1"
+    readonly property string events_small: "\u00B2"
+    readonly property string export_medium: "\u00B3"
+    readonly property string eyeDropper: "\u00B4"
+    readonly property string favorite: "\u00B5"
+    readonly property string fitAll_medium: "\u00B6"
+    readonly property string fitSelected_small: "\u00B7"
+    readonly property string fitSelection_medium: "\u00B8"
+    readonly property string fitToView_medium: "\u00B9"
+    readonly property string flowAction: "\u00BA"
+    readonly property string flowTransition: "\u00BB"
+    readonly property string fontStyleBold: "\u00BC"
+    readonly property string fontStyleItalic: "\u00BD"
+    readonly property string fontStyleStrikethrough: "\u00BE"
+    readonly property string fontStyleUnderline: "\u00BF"
+    readonly property string forward_medium: "\u00C0"
+    readonly property string globalOrient_medium: "\u00C1"
+    readonly property string gradient: "\u00C2"
+    readonly property string gridView: "\u00C3"
+    readonly property string grid_medium: "\u00C4"
+    readonly property string group_small: "\u00C5"
+    readonly property string help: "\u00C6"
+    readonly property string home_large: "\u00C7"
+    readonly property string idAliasOff: "\u00C8"
+    readonly property string idAliasOn: "\u00C9"
+    readonly property string import_medium: "\u00CA"
+    readonly property string imported: "\u00CB"
+    readonly property string importedModels_small: "\u00CC"
+    readonly property string infinity: "\u00CD"
+    readonly property string invisible_medium: "\u00CE"
+    readonly property string invisible_small: "\u00CF"
+    readonly property string jumpToCode_medium: "\u00D0"
+    readonly property string jumpToCode_small: "\u00D1"
+    readonly property string keyframe: "\u00D2"
+    readonly property string languageList_medium: "\u00D3"
+    readonly property string layouts_small: "\u00D4"
+    readonly property string lights_small: "\u00D5"
+    readonly property string linear_medium: "\u00D6"
+    readonly property string linkTriangle: "\u00D7"
+    readonly property string linked: "\u00D8"
+    readonly property string listView: "\u00D9"
+    readonly property string listView_medium: "\u00DA"
+    readonly property string list_medium: "\u00DB"
+    readonly property string localOrient_medium: "\u00DC"
+    readonly property string lockOff: "\u00DD"
+    readonly property string lockOn: "\u00DE"
+    readonly property string loopPlayback_medium: "\u00DF"
+    readonly property string materialBrowser_medium: "\u00E0"
+    readonly property string materialPreviewEnvironment: "\u00E1"
+    readonly property string materialPreviewModel: "\u00E2"
+    readonly property string material_medium: "\u00E3"
+    readonly property string maxBar_small: "\u00E4"
+    readonly property string mergeCells: "\u00E5"
+    readonly property string merge_small: "\u00E6"
+    readonly property string minus: "\u00E7"
+    readonly property string mirror: "\u00E8"
+    readonly property string more_medium: "\u00E9"
+    readonly property string mouseArea_small: "\u00EA"
+    readonly property string moveDown_medium: "\u00EB"
+    readonly property string moveInwards_medium: "\u00EC"
+    readonly property string moveUp_medium: "\u00ED"
+    readonly property string moveUpwards_medium: "\u00EE"
+    readonly property string move_medium: "\u00EF"
+    readonly property string newMaterial: "\u00F0"
+    readonly property string nextFile_large: "\u00F1"
+    readonly property string normalBar_small: "\u00F2"
+    readonly property string openLink: "\u00F3"
+    readonly property string openMaterialBrowser: "\u00F4"
+    readonly property string orientation: "\u00F5"
+    readonly property string orthCam_medium: "\u00F6"
+    readonly property string orthCam_small: "\u00F7"
+    readonly property string paddingEdge: "\u00F8"
+    readonly property string paddingFrame: "\u00F9"
+    readonly property string particleAnimation_medium: "\u00FA"
+    readonly property string pasteStyle: "\u00FB"
+    readonly property string paste_small: "\u00FC"
+    readonly property string pause: "\u00FD"
+    readonly property string pause_medium: "\u00FE"
+    readonly property string perspectiveCam_medium: "\u00FF"
+    readonly property string perspectiveCam_small: "\u0100"
+    readonly property string pin: "\u0101"
+    readonly property string plane_medium: "\u0102"
+    readonly property string plane_small: "\u0103"
+    readonly property string play: "\u0104"
+    readonly property string playFill_medium: "\u0105"
+    readonly property string playOutline_medium: "\u0106"
+    readonly property string plus: "\u0107"
+    readonly property string pointLight_small: "\u0108"
+    readonly property string positioners_small: "\u0109"
+    readonly property string previewEnv_medium: "\u010A"
+    readonly property string previousFile_large: "\u010B"
+    readonly property string promote: "\u010C"
+    readonly property string properties_medium: "\u010D"
+    readonly property string readOnly: "\u010E"
+    readonly property string recent_medium: "\u010F"
+    readonly property string recordFill_medium: "\u0110"
+    readonly property string recordOutline_medium: "\u0111"
+    readonly property string redo: "\u0112"
+    readonly property string reload_medium: "\u0113"
+    readonly property string remove_medium: "\u0114"
+    readonly property string remove_small: "\u0115"
+    readonly property string rename_small: "\u0116"
+    readonly property string replace_small: "\u0117"
+    readonly property string resetView_small: "\u0118"
+    readonly property string restartParticles_medium: "\u0119"
+    readonly property string reverseOrder_medium: "\u011A"
+    readonly property string roatate_medium: "\u011B"
+    readonly property string rotationFill: "\u011C"
+    readonly property string rotationOutline: "\u011D"
+    readonly property string runProjFill_large: "\u011E"
+    readonly property string runProjOutline_large: "\u011F"
+    readonly property string s_anchors: "\u0120"
+    readonly property string s_annotations: "\u0121"
+    readonly property string s_arrange: "\u0122"
+    readonly property string s_boundingBox: "\u0123"
+    readonly property string s_component: "\u0124"
+    readonly property string s_connections: "\u0125"
+    readonly property string s_edit: "\u0126"
+    readonly property string s_enterComponent: "\u0127"
+    readonly property string s_eventList: "\u0128"
+    readonly property string s_group: "\u0129"
+    readonly property string s_layouts: "\u012A"
+    readonly property string s_merging: "\u012B"
+    readonly property string s_mouseArea: "\u012C"
+    readonly property string s_positioners: "\u012D"
+    readonly property string s_selection: "\u012E"
+    readonly property string s_snapping: "\u012F"
+    readonly property string s_timeline: "\u0130"
+    readonly property string s_visibility: "\u0131"
+    readonly property string saveAs_medium: "\u0132"
+    readonly property string saveLogs_medium: "\u0133"
+    readonly property string save_medium: "\u0134"
+    readonly property string scale_medium: "\u0135"
+    readonly property string search: "\u0136"
+    readonly property string search_small: "\u0137"
+    readonly property string sectionToggle: "\u0138"
+    readonly property string selectFill_medium: "\u0139"
+    readonly property string selectOutline_medium: "\u013A"
+    readonly property string selectParent_small: "\u013B"
+    readonly property string selection_small: "\u013C"
+    readonly property string settings_medium: "\u013D"
+    readonly property string signal_small: "\u013E"
+    readonly property string snapping_conf_medium: "\u013F"
+    readonly property string snapping_medium: "\u0140"
+    readonly property string snapping_small: "\u0141"
+    readonly property string sortascending_medium: "\u0142"
+    readonly property string sortdescending_medium: "\u0143"
+    readonly property string sphere_medium: "\u0144"
+    readonly property string sphere_small: "\u0145"
+    readonly property string splitColumns: "\u0146"
+    readonly property string splitRows: "\u0147"
+    readonly property string splitScreen_medium: "\u0148"
+    readonly property string spotLight_small: "\u0149"
+    readonly property string stackedContainer_small: "\u014A"
+    readonly property string startNode: "\u014B"
+    readonly property string step_medium: "\u014C"
+    readonly property string stop_medium: "\u014D"
+    readonly property string tableView_medium: "\u014E"
+    readonly property string testIcon: "\u014F"
+    readonly property string textAlignBottom: "\u0150"
+    readonly property string textAlignCenter: "\u0151"
+    readonly property string textAlignJustified: "\u0152"
+    readonly property string textAlignLeft: "\u0153"
+    readonly property string textAlignMiddle: "\u0154"
+    readonly property string textAlignRight: "\u0155"
+    readonly property string textAlignTop: "\u0156"
+    readonly property string textBulletList: "\u0157"
+    readonly property string textFullJustification: "\u0158"
+    readonly property string textNumberedList: "\u0159"
+    readonly property string textures_medium: "\u015A"
+    readonly property string tickIcon: "\u015B"
+    readonly property string tickMark_small: "\u015C"
+    readonly property string timeline_small: "\u015D"
+    readonly property string toEndFrame_medium: "\u015E"
+    readonly property string toNextFrame_medium: "\u015F"
+    readonly property string toPrevFrame_medium: "\u0160"
+    readonly property string toStartFrame_medium: "\u0161"
+    readonly property string topToolbar_annotations: "\u0162"
+    readonly property string topToolbar_closeFile: "\u0163"
+    readonly property string topToolbar_designMode: "\u0164"
+    readonly property string topToolbar_enterComponent: "\u0165"
+    readonly property string topToolbar_home: "\u0166"
+    readonly property string topToolbar_makeComponent: "\u0167"
+    readonly property string topToolbar_navFile: "\u0168"
+    readonly property string topToolbar_runProject: "\u0169"
+    readonly property string translationCreateFiles: "\u016A"
+    readonly property string translationCreateReport: "\u016B"
+    readonly property string translationExport: "\u016C"
+    readonly property string translationImport: "\u016D"
+    readonly property string translationSelectLanguages: "\u016E"
+    readonly property string translationTest: "\u016F"
+    readonly property string transparent: "\u0170"
+    readonly property string triState: "\u0171"
+    readonly property string triangleArcA: "\u0172"
+    readonly property string triangleArcB: "\u0173"
+    readonly property string triangleCornerA: "\u0174"
+    readonly property string triangleCornerB: "\u0175"
+    readonly property string unLinked: "\u0176"
+    readonly property string undo: "\u0177"
+    readonly property string unify_medium: "\u0178"
+    readonly property string unpin: "\u0179"
+    readonly property string upDownIcon: "\u017A"
+    readonly property string upDownSquare2: "\u017B"
+    readonly property string updateAvailable_medium: "\u017C"
+    readonly property string updateContent_medium: "\u017D"
+    readonly property string visibilityOff: "\u017E"
+    readonly property string visibilityOn: "\u017F"
+    readonly property string visible_medium: "\u0180"
+    readonly property string visible_small: "\u0181"
+    readonly property string warning_medium: "\u0182"
+    readonly property string wildcard: "\u0183"
+    readonly property string wizardsAutomotive: "\u0184"
+    readonly property string wizardsDesktop: "\u0185"
+    readonly property string wizardsGeneric: "\u0186"
+    readonly property string wizardsMcuEmpty: "\u0187"
+    readonly property string wizardsMcuGraph: "\u0188"
+    readonly property string wizardsMobile: "\u0189"
+    readonly property string wizardsUnknown: "\u018A"
+    readonly property string zoomAll: "\u018B"
+    readonly property string zoomIn: "\u018C"
+    readonly property string zoomIn_medium: "\u018D"
+    readonly property string zoomOut: "\u018E"
+    readonly property string zoomOut_medium: "\u018F"
+    readonly property string zoomSelection: "\u0190"
 
     readonly property font iconFont: Qt.font({
                                                  "family": controlIcons.name,
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml
index 59030cd126..1a04c8ebc3 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml
@@ -251,6 +251,7 @@ QtObject {
     property real collectionTableVerticalMargin: 10
     property real collectionCellMinimumWidth: 60
     property real collectionCellMinimumHeight: 20
+    property real smallStatusIndicatorDiameter: 6
 
     // NEW NEW NEW
     readonly property int flowMargin: 7
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf
index 714cd4b753..cdce3eeefd 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf
diff --git a/share/qtcreator/qmldesigner/studio_templates/files/qtquickfile/file.qml.tpl b/share/qtcreator/qmldesigner/studio_templates/files/qtquickfile/file.qml.tpl
index f77f7d99c9..996d474208 100644
--- a/share/qtcreator/qmldesigner/studio_templates/files/qtquickfile/file.qml.tpl
+++ b/share/qtcreator/qmldesigner/studio_templates/files/qtquickfile/file.qml.tpl
@@ -7,6 +7,7 @@ import %{ApplicationImport}
 @endif
 
 %{RootItem} {
+  id: root
 @if %{UseImport}
     width: Constants.width
     height: Constants.height
diff --git a/share/qtcreator/qmldesigner/studio_templates/files/qtuiquickfile/file.qml.tpl b/share/qtcreator/qmldesigner/studio_templates/files/qtuiquickfile/file.qml.tpl
index 47ca3af299..e7e86e9ffa 100644
--- a/share/qtcreator/qmldesigner/studio_templates/files/qtuiquickfile/file.qml.tpl
+++ b/share/qtcreator/qmldesigner/studio_templates/files/qtuiquickfile/file.qml.tpl
@@ -14,6 +14,7 @@ import %{ApplicationImport}
 @endif
 
 %{RootItem} {
+  id: root
 @if %{UseImport}
     width: Constants.width
     height: Constants.height
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/application-3d/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/application-3d/wizard.json
index 42d0bf748c..a5d0d7539c 100644
--- a/share/qtcreator/qmldesigner/studio_templates/projects/application-3d/wizard.json
+++ b/share/qtcreator/qmldesigner/studio_templates/projects/application-3d/wizard.json
@@ -18,6 +18,8 @@
         { "key": "ProjectPluginClassName", "value": "%{ProjectName}Plugin" },
         { "key": "QmlProjectFileName", "value": "%{JS: Util.fileName('%{ProjectName}', 'qmlproject')}" },
         { "key": "IsQt6Project", "value": "%{JS: value('QtQuickVersion') !== '2.15' }" },
+        { "key": "AssetDir", "value": "GeneratedComponents" },
+        { "key": "ContentDir", "value": "%{ProjectName}Content" },
         { "key": "ImportModuleName", "value": "%{ProjectName}" },
         { "key": "UIClassName", "value": "Screen01" },
         { "key": "UIClassFileName", "value": "%{JS: Util.fileName('%{UIClassName}', 'ui.qml')}" },
@@ -236,7 +238,7 @@
                     "type": "ComboBox",
                     "data":
                     {
-                        "index": 3,
+                        "index": 5,
                         "items":
                             [
                             {
@@ -278,6 +280,14 @@
                                     'TargetQuickVersion': '6.6',
                                     'TargetQuick3DVersion': '6.6'
                                 })"
+                            },
+                            {
+                                "trKey": "Qt 6.7",
+                                "value":
+                                "({
+                                    'TargetQuickVersion': '6.7',
+                                    'TargetQuick3DVersion': '6.7'
+                                })"
                             }
                         ]
                     }
@@ -298,98 +308,49 @@
                     "openAsProject": true
                 },
                 {
-                    "source": "../common/CMakeLists.main.txt.tpl",
-                    "target": "%{ProjectDirectory}/CMakeLists.txt"
-                },
-                {
-                    "source": "../common/qmlmodules.tpl",
-                    "target": "%{ProjectDirectory}/qmlmodules"
-                },
-                {
-                    "source": "../common/qmlcomponents.tpl",
-                    "target": "%{ProjectDirectory}/qmlcomponents"
-                },
-                {
-                    "source": "../common/insight.tpl",
-                    "target": "%{ProjectDirectory}/insight"
-                },
-                {
-                    "source": "../common/main.qml",
-                    "target": "%{ProjectDirectory}/main.qml"
-                },
-                {
                     "source": "../common/qtquickcontrols2.conf.tpl",
                     "target": "%{ProjectDirectory}/qtquickcontrols2.conf"
                 },
                 {
-                    "source": "../common/main.cpp.tpl",
-                    "target": "%{ProjectDirectory}/src/main.cpp"
-                },
-                {
-                    "source": "../common/app_environment.h.tpl",
-                    "target": "%{ProjectDirectory}/src/app_environment.h"
-                },
-                {
-                    "source": "../common/import_qml_plugins.h.tpl",
-                    "target": "%{ProjectDirectory}/src/import_qml_plugins.h"
-                },
-                {
-                    "source": "../common/import_qml_components_plugins.h.tpl",
-                    "target": "%{ProjectDirectory}/src/import_qml_components_plugins.h"
-                },
-
-                {
-                    "source": "../common/CMakeLists.content.txt.tpl",
-                    "target": "%{ProjectDirectory}/content/CMakeLists.txt"
-                },
-                {
                     "source": "../common/App.qml.tpl",
-                    "target": "%{ProjectDirectory}/content/App.qml"
+                    "target": "%{ProjectDirectory}/%{ContentDir}/App.qml"
                 },
                 {
                     "source": "Screen01.ui.qml.tpl",
-                    "target": "%{ProjectDirectory}/content/Screen01.ui.qml",
+                    "target": "%{ProjectDirectory}/%{ContentDir}/Screen01.ui.qml",
                     "openInEditor": true
                 },
                 {
                     "source": "../common/fonts.txt",
-                    "target": "%{ProjectDirectory}/content/fonts/fonts.txt"
+                    "target": "%{ProjectDirectory}/%{ContentDir}/fonts/fonts.txt"
                 },
                 {
                     "source": "../common/asset_imports.txt",
-                    "target": "%{ProjectDirectory}/asset_imports/asset_imports.txt"
-                },
-                {
-                    "source": "../common/CMakeLists.imports.txt.tpl",
-                    "target": "%{ProjectDirectory}/imports/CMakeLists.txt"
-                },
-                {
-                    "source": "../shared-plugin/name/CMakeLists.importmodule.txt.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/CMakeLists.txt"
+                    "target": "%{ProjectDirectory}/%{AssetDir}/%{AssetDir}.txt"
                 },
                 {
                     "source": "../shared-plugin/name/importmodule.qmldir.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/qmldir"
+                    "target": "%{ProjectDirectory}/%{ImportModuleName}/qmldir"
                 },
                 {
                     "source": "../shared-plugin/name/Constants.qml.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/Constants.qml"
+                    "target": "%{ProjectDirectory}/%{ImportModuleName}/Constants.qml"
                 },
                 {
                     "source": "../shared-plugin/name/DirectoryFontLoader.qml.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/DirectoryFontLoader.qml"
+                    "target": "%{ProjectDirectory}/%{ImportModuleName}/DirectoryFontLoader.qml"
                 },
                 {
                     "source": "../shared-plugin/name/EventListModel.qml.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/EventListModel.qml"
+                    "target": "%{ProjectDirectory}/%{ImportModuleName}/EventListModel.qml"
                 },
                 {
                     "source": "../shared-plugin/name/EventListSimulator.qml.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/EventListSimulator.qml"
+                    "target": "%{ProjectDirectory}/%{ImportModuleName}/EventListSimulator.qml"
                 },
                 {
                     "source": "../shared-plugin/name/designer/plugin.metainfo",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/designer/plugin.metainfo"
+                    "target": "%{ProjectDirectory}/%{ImportModuleName}/designer/plugin.metainfo"
                 }
             ]
         }
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/application-extended-3d/Screen01.ui.qml.tpl b/share/qtcreator/qmldesigner/studio_templates/projects/application-extended-3d/Screen01.ui.qml.tpl
index 2b26fe3f0c..41d562fb53 100644
--- a/share/qtcreator/qmldesigner/studio_templates/projects/application-extended-3d/Screen01.ui.qml.tpl
+++ b/share/qtcreator/qmldesigner/studio_templates/projects/application-extended-3d/Screen01.ui.qml.tpl
@@ -19,7 +19,7 @@ Rectangle {
     color: Constants.backgroundColor
 
     View3D {
-        id: view3D
+        id: extendedView3D
         anchors.fill: parent
 
         environment: sceneEnvironment
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/application-extended-3d/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/application-extended-3d/wizard.json
index 101d5c6903..5f2e5bfcaf 100644
--- a/share/qtcreator/qmldesigner/studio_templates/projects/application-extended-3d/wizard.json
+++ b/share/qtcreator/qmldesigner/studio_templates/projects/application-extended-3d/wizard.json
@@ -18,6 +18,8 @@
         { "key": "ProjectPluginClassName", "value": "%{ProjectName}Plugin" },
         { "key": "QmlProjectFileName", "value": "%{JS: Util.fileName('%{ProjectName}', 'qmlproject')}" },
         { "key": "IsQt6Project", "value": "%{JS: value('QtQuickVersion') !== '2.15' }" },
+        { "key": "AssetDir", "value": "GeneratedComponents" },
+        { "key": "ContentDir", "value": "%{ProjectName}Content" },
         { "key": "ImportModuleName", "value": "%{ProjectName}" },
         { "key": "UIClassName", "value": "Screen01" },
         { "key": "UIClassFileName", "value": "%{JS: Util.fileName('%{UIClassName}', 'ui.qml')}" },
@@ -236,34 +238,10 @@
                     "type": "ComboBox",
                     "data":
                     {
-                        "index": 3,
+                        "index": 2,
                         "items":
                             [
                             {
-                                "trKey": "Qt 6.2",
-                                "value":
-                                "({
-                                    'TargetQuickVersion': '6.2',
-                                    'TargetQuick3DVersion': '6.2'
-                                })"
-                            },
-                            {
-                                "trKey": "Qt 6.3",
-                                "value":
-                                "({
-                                    'TargetQuickVersion': '6.3',
-                                    'TargetQuick3DVersion': '6.3'
-                                })"
-                            },
-                            {
-                                "trKey": "Qt 6.4",
-                                "value":
-                                "({
-                                    'TargetQuickVersion': '6.4',
-                                    'TargetQuick3DVersion': '6.4'
-                                })"
-                            },
-                            {
                                 "trKey": "Qt 6.5",
                                 "value":
                                 "({
@@ -278,6 +256,14 @@
                                     'TargetQuickVersion': '6.6',
                                     'TargetQuick3DVersion': '6.6'
                                 })"
+                            },
+                            {
+                                "trKey": "Qt 6.7",
+                                "value":
+                                "({
+                                    'TargetQuickVersion': '6.7',
+                                    'TargetQuick3DVersion': '6.7'
+                                })"
                             }
                         ]
                     }
@@ -298,98 +284,49 @@
                     "openAsProject": true
                 },
                 {
-                    "source": "../common/CMakeLists.main.txt.tpl",
-                    "target": "%{ProjectDirectory}/CMakeLists.txt"
-                },
-                {
-                    "source": "../common/qmlmodules.tpl",
-                    "target": "%{ProjectDirectory}/qmlmodules"
-                },
-                {
-                    "source": "../common/qmlcomponents.tpl",
-                    "target": "%{ProjectDirectory}/qmlcomponents"
-                },
-                {
-                    "source": "../common/insight.tpl",
-                    "target": "%{ProjectDirectory}/insight"
-                },
-                {
-                    "source": "../common/main.qml",
-                    "target": "%{ProjectDirectory}/main.qml"
-                },
-                {
                     "source": "../common/qtquickcontrols2.conf.tpl",
                     "target": "%{ProjectDirectory}/qtquickcontrols2.conf"
                 },
                 {
-                    "source": "../common/main.cpp.tpl",
-                    "target": "%{ProjectDirectory}/src/main.cpp"
-                },
-                {
-                    "source": "../common/app_environment.h.tpl",
-                    "target": "%{ProjectDirectory}/src/app_environment.h"
-                },
-                {
-                    "source": "../common/import_qml_plugins.h.tpl",
-                    "target": "%{ProjectDirectory}/src/import_qml_plugins.h"
-                },
-                {
-                    "source": "../common/import_qml_components_plugins.h.tpl",
-                    "target": "%{ProjectDirectory}/src/import_qml_components_plugins.h"
-                },
-
-                {
-                    "source": "../common/CMakeLists.content.txt.tpl",
-                    "target": "%{ProjectDirectory}/content/CMakeLists.txt"
-                },
-                {
                     "source": "../common/App.qml.tpl",
-                    "target": "%{ProjectDirectory}/content/App.qml"
+                    "target": "%{ProjectDirectory}/%{ContentDir}/App.qml"
                 },
                 {
                     "source": "Screen01.ui.qml.tpl",
-                    "target": "%{ProjectDirectory}/content/Screen01.ui.qml",
+                    "target": "%{ProjectDirectory}/%{ContentDir}/Screen01.ui.qml",
                     "openInEditor": true
                 },
                 {
                     "source": "../common/fonts.txt",
-                    "target": "%{ProjectDirectory}/content/fonts/fonts.txt"
+                    "target": "%{ProjectDirectory}/%{ContentDir}/fonts/fonts.txt"
                 },
                 {
                     "source": "../common/asset_imports.txt",
-                    "target": "%{ProjectDirectory}/asset_imports/asset_imports.txt"
-                },
-                {
-                    "source": "../common/CMakeLists.imports.txt.tpl",
-                    "target": "%{ProjectDirectory}/imports/CMakeLists.txt"
-                },
-                {
-                    "source": "../shared-plugin/name/CMakeLists.importmodule.txt.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/CMakeLists.txt"
+                    "target": "%{ProjectDirectory}/%{AssetDir}/%{AssetDir}.txt"
                 },
                 {
                     "source": "../shared-plugin/name/importmodule.qmldir.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/qmldir"
+                    "target": "%{ProjectDirectory}/%{ImportModuleName}/qmldir"
                 },
                 {
                     "source": "../shared-plugin/name/Constants.qml.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/Constants.qml"
+                    "target": "%{ProjectDirectory}/%{ImportModuleName}/Constants.qml"
                 },
                 {
                     "source": "../shared-plugin/name/DirectoryFontLoader.qml.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/DirectoryFontLoader.qml"
+                    "target": "%{ProjectDirectory}/%{ImportModuleName}/DirectoryFontLoader.qml"
                 },
                 {
                     "source": "../shared-plugin/name/EventListModel.qml.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/EventListModel.qml"
+                    "target": "%{ProjectDirectory}/%{ImportModuleName}/EventListModel.qml"
                 },
                 {
                     "source": "../shared-plugin/name/EventListSimulator.qml.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/EventListSimulator.qml"
+                    "target": "%{ProjectDirectory}/%{ImportModuleName}/EventListSimulator.qml"
                 },
                 {
                     "source": "../shared-plugin/name/designer/plugin.metainfo",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/designer/plugin.metainfo"
+                    "target": "%{ProjectDirectory}/%{ImportModuleName}/designer/plugin.metainfo"
                 }
             ]
         }
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/application/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/application/wizard.json
index c8b74dec49..41fe2df289 100644
--- a/share/qtcreator/qmldesigner/studio_templates/projects/application/wizard.json
+++ b/share/qtcreator/qmldesigner/studio_templates/projects/application/wizard.json
@@ -17,6 +17,8 @@
         { "key": "ProjectPluginName", "value": "%{ProjectName}plugin" },
         { "key": "ProjectPluginClassName", "value": "%{ProjectName}Plugin" },
         { "key": "QmlProjectFileName", "value": "%{JS: Util.fileName('%{ProjectName}', 'qmlproject')}" },
+        { "key": "AssetDir", "value": "GeneratedComponents" },
+        { "key": "ContentDir", "value": "%{ProjectName}Content" },
         { "key": "ImportModuleName", "value": "%{ProjectName}" },
         { "key": "UIClassName", "value": "Screen01" },
         { "key": "UIClassFileName", "value": "%{JS: Util.fileName('%{UIClassName}', 'ui.qml')}" },
@@ -236,7 +238,7 @@
                     "type": "ComboBox",
                     "data":
                     {
-                        "index": 4,
+                        "index": 6,
                         "items":
                             [
                             {
@@ -280,6 +282,13 @@
                                 "({
                                     'TargetQuickVersion': '6.6'
                                 })"
+                            },
+                            {
+                                "trKey": "Qt 6.7",
+                                "value":
+                                "({
+                                    'TargetQuickVersion': '6.7'
+                                })"
                             }
                         ]
                     }
@@ -300,108 +309,48 @@
                     "openAsProject": true
                 },
                 {
-                    "source": "../common/CMakeLists.main.txt.tpl",
-                    "target": "%{ProjectDirectory}/CMakeLists.txt",
-                    "condition": "%{IsQt6Project}"
-                },
-                {
-                    "source": "../common/qmlmodules.tpl",
-                    "target": "%{ProjectDirectory}/qmlmodules",
-                    "condition": "%{IsQt6Project}"
-                },
-                {
-                    "source": "../common/qmlcomponents.tpl",
-                    "target": "%{ProjectDirectory}/qmlcomponents",
-                    "condition": "%{IsQt6Project}"
-                },
-                {
-                    "source": "../common/insight.tpl",
-                    "target": "%{ProjectDirectory}/insight",
-                    "condition": "%{IsQt6Project}"
-                },
-                {
-                    "source": "../common/main.qml",
-                    "target": "%{ProjectDirectory}/main.qml",
-                    "condition": "%{IsQt6Project}"
-                },
-                {
                     "source": "../common/qtquickcontrols2.conf.tpl",
                     "target": "%{ProjectDirectory}/qtquickcontrols2.conf"
                 },
                 {
-                    "source": "../common/main.cpp.tpl",
-                    "target": "%{ProjectDirectory}/src/main.cpp",
-                    "condition": "%{IsQt6Project}"
-                },
-                {
-                    "source": "../common/app_environment.h.tpl",
-                    "target": "%{ProjectDirectory}/src/app_environment.h",
-                    "condition": "%{IsQt6Project}"
-                },
-                {
-                    "source": "../common/import_qml_plugins.h.tpl",
-                    "target": "%{ProjectDirectory}/src/import_qml_plugins.h",
-                    "condition": "%{IsQt6Project}"
-                },
-                {
-                    "source": "../common/import_qml_components_plugins.h.tpl",
-                    "target": "%{ProjectDirectory}/src/import_qml_components_plugins.h",
-                    "condition": "%{IsQt6Project}"
-                },
-                {
-                    "source": "../common/CMakeLists.content.txt.tpl",
-                    "target": "%{ProjectDirectory}/content/CMakeLists.txt",
-                    "condition": "%{IsQt6Project}"
-                },
-                {
                     "source": "../common/App.qml.tpl",
-                    "target": "%{ProjectDirectory}/content/App.qml"
+                    "target": "%{ProjectDirectory}/%{ContentDir}/App.qml"
                 },
                 {
                     "source": "Screen01.ui.qml.tpl",
-                    "target": "%{ProjectDirectory}/content/Screen01.ui.qml"
+                    "target": "%{ProjectDirectory}/%{ContentDir}/Screen01.ui.qml"
                 },
                 {
                     "source": "../common/fonts.txt",
-                    "target": "%{ProjectDirectory}/content/fonts/fonts.txt"
+                    "target": "%{ProjectDirectory}/%{ContentDir}/fonts/fonts.txt"
                 },
                 {
                     "source": "../common/asset_imports.txt",
-                    "target": "%{ProjectDirectory}/asset_imports/asset_imports.txt"
-                },
-                {
-                    "source": "../common/CMakeLists.imports.txt.tpl",
-                    "target": "%{ProjectDirectory}/imports/CMakeLists.txt",
-                    "condition": "%{IsQt6Project}"
-                },
-                {
-                    "source": "../shared-plugin/name/CMakeLists.importmodule.txt.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/CMakeLists.txt",
-                    "condition": "%{IsQt6Project}"
+                    "target": "%{ProjectDirectory}/%{AssetDir}/Quick3DAssets.txt"
                 },
                 {
                     "source": "../shared-plugin/name/importmodule.qmldir.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/qmldir"
+                    "target": "%{ProjectDirectory}/%{ImportModuleName}/qmldir"
                 },
                 {
                     "source": "../shared-plugin/name/Constants.qml.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/Constants.qml"
+                    "target": "%{ProjectDirectory}/%{ImportModuleName}/Constants.qml"
                 },
                 {
                     "source": "../shared-plugin/name/DirectoryFontLoader.qml.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/DirectoryFontLoader.qml"
+                    "target": "%{ProjectDirectory}/%{ImportModuleName}/DirectoryFontLoader.qml"
                 },
                 {
                     "source": "../shared-plugin/name/EventListModel.qml.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/EventListModel.qml"
+                    "target": "%{ProjectDirectory}/%{ImportModuleName}/EventListModel.qml"
                 },
                 {
                     "source": "../shared-plugin/name/EventListSimulator.qml.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/EventListSimulator.qml"
+                    "target": "%{ProjectDirectory}/%{ImportModuleName}/EventListSimulator.qml"
                 },
                 {
                     "source": "../shared-plugin/name/designer/plugin.metainfo",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/designer/plugin.metainfo"
+                    "target": "%{ProjectDirectory}/%{ImportModuleName}/designer/plugin.metainfo"
                 }
             ]
         }
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/common/CMakeLists.content.txt.tpl b/share/qtcreator/qmldesigner/studio_templates/projects/common/CMakeLists.content.txt.tpl
deleted file mode 100644
index a5a4360e3f..0000000000
--- a/share/qtcreator/qmldesigner/studio_templates/projects/common/CMakeLists.content.txt.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-### This file is automatically generated by Qt Design Studio.
-### Do not change
-
-qt_add_library(content STATIC)
-qt6_add_qml_module(content
-    URI "content"
-    VERSION 1.0
-    RESOURCE_PREFIX "/qt/qml"
-    QML_FILES
-        App.qml
-        %{UIClassFileName}
-    RESOURCES
-        fonts/fonts.txt
-)
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/common/CMakeLists.imports.txt.tpl b/share/qtcreator/qmldesigner/studio_templates/projects/common/CMakeLists.imports.txt.tpl
deleted file mode 100644
index 418f6d7719..0000000000
--- a/share/qtcreator/qmldesigner/studio_templates/projects/common/CMakeLists.imports.txt.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-### This file is automatically generated by Qt Design Studio.
-### Do not change
-
-add_subdirectory(%{ImportModuleName})
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/common/CMakeLists.main.txt.tpl b/share/qtcreator/qmldesigner/studio_templates/projects/common/CMakeLists.main.txt.tpl
deleted file mode 100644
index eb621ef219..0000000000
--- a/share/qtcreator/qmldesigner/studio_templates/projects/common/CMakeLists.main.txt.tpl
+++ /dev/null
@@ -1,56 +0,0 @@
-cmake_minimum_required(VERSION 3.21.1)
-
-option(LINK_INSIGHT "Link Qt Insight Tracker library" ON)
-option(BUILD_QDS_COMPONENTS "Build design studio components" ON)
-
-project(%{ProjectName}App LANGUAGES CXX)
-
-set(CMAKE_AUTOMOC ON)
-
-find_package(Qt6 6.2 REQUIRED COMPONENTS Core Gui Qml Quick)
-
-if (Qt6_VERSION VERSION_GREATER_EQUAL 6.3)
-    qt_standard_project_setup()
-endif()
-
-qt_add_executable(%{ProjectName}App src/main.cpp)
-
-qt_add_resources(%{ProjectName}App "configuration"
-    PREFIX "/"
-    FILES
-        qtquickcontrols2.conf
-)
-
-target_link_libraries(%{ProjectName}App PRIVATE
-    Qt6::Core
-    Qt6::Gui
-    Qt6::Qml
-    Qt6::Quick
-)
-
-set(QT_QML_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/qml)
-set(QML_IMPORT_PATH ${QT_QML_OUTPUT_DIRECTORY}
-    CACHE STRING "Import paths for Qt Creator's code model"
-    FORCE
-)
-
-if (BUILD_QDS_COMPONENTS)
-    include(${CMAKE_CURRENT_SOURCE_DIR}/qmlcomponents)
-endif()
-
-include(${CMAKE_CURRENT_SOURCE_DIR}/qmlmodules)
-
-if (LINK_INSIGHT)
-    include(${CMAKE_CURRENT_SOURCE_DIR}/insight)
-endif ()
-
-include(GNUInstallDirs)
-install(TARGETS %{ProjectName}App
-    BUNDLE DESTINATION .
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-)
-
-# make IDEs aware of the QML import path
-set(QML_IMPORT_PATH ${PROJECT_BINARY_DIR}/qml CACHE PATH
-    "Path to the custom QML components defined by the project")
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/common/app.qmlproject.tpl b/share/qtcreator/qmldesigner/studio_templates/projects/common/app.qmlproject.tpl
index 75aeae6714..6d346818e4 100644
--- a/share/qtcreator/qmldesigner/studio_templates/projects/common/app.qmlproject.tpl
+++ b/share/qtcreator/qmldesigner/studio_templates/projects/common/app.qmlproject.tpl
@@ -5,32 +5,36 @@ import QmlProject 1.1
 @endif
 
 Project {
-    mainFile: "content/App.qml"
-    mainUiFile: "content/Screen01.ui.qml"
+    mainFile: "%{ContentDir}/App.qml"
+    mainUiFile: "%{ContentDir}/Screen01.ui.qml"
 
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
-        directory: "content"
+        directory: "%{ProjectName}"
     }
 
     QmlFiles {
-        directory: "imports"
+        directory: "%{ContentDir}"
+    }
+
+    QmlFiles {
+        directory: "%{AssetDir}"
     }
 
     JavaScriptFiles {
-        directory: "content"
+        directory: "%{ProjectName}"
     }
 
     JavaScriptFiles {
-        directory: "imports"
+        directory: "%{ProjectName}"
     }
 
     ImageFiles {
-        directory: "content"
+        directory: "%{ContentDir}"
     }
     
     ImageFiles {
-        directory: "asset_imports"
+        directory: "%{AssetDir}"
     }
 
     Files {
@@ -69,17 +73,12 @@ Project {
 
     Files {
         filter: "*.mesh"
-        directory: "asset_imports"
+        directory: "%{AssetDir}"
     }
 
     Files {
         filter: "*.qad"
-        directory: "asset_imports"
-    }
-
-    Files {
-        filter: "*.qml"
-        directory: "asset_imports"
+        directory: "%{AssetDir}"
     }
 
     Environment {
@@ -109,7 +108,7 @@ Project {
 @endif
 
     /* List of plugin directories passed to QML runtime */
-    importPaths: [ "imports", "asset_imports" ]
+    importPaths: [ "." ]
 
     /* Required for deployment */
     targetDirectory: "/opt/%{ProjectName}"
@@ -125,10 +124,10 @@ Project {
     /* args: Specifies command line arguments for qsb tool to generate shaders.
        files: Specifies target files for qsb tool. If path is included, it must be relative to this file.
               Wildcard '*' can be used in the file name part of the path.
-              e.g. files: [ "content/shaders/*.vert", "*.frag" ]  */
+              e.g. files: [ "%{ContentDir}/shaders/*.vert", "*.frag" ]  */
     ShaderTool {
         args: "-s --glsl \\\"100 es,120,150\\\" --hlsl 50 --msl 12"
-        files: [ "content/shaders/*" ]
+        files: [ "%{ContentDir}/shaders/*" ]
     }
 @endif
 
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/common/app_environment.h.tpl b/share/qtcreator/qmldesigner/studio_templates/projects/common/app_environment.h.tpl
deleted file mode 100644
index e1f7ec2e23..0000000000
--- a/share/qtcreator/qmldesigner/studio_templates/projects/common/app_environment.h.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * This file is automatically generated by Qt Design Studio.
- * Do not change.
-*/
-
-#include <QGuiApplication>
-
-void set_qt_environment()
-{
-@if %{UseVirtualKeyboard}
-    qputenv("QT_IM_MODULE", "qtvirtualkeyboard");
-    qputenv("QT_VIRTUALKEYBOARD_DESKTOP_DISABLE", "1");
-@endif
-    qputenv("QT_AUTO_SCREEN_SCALE_FACTOR", "1");
-    qputenv("QT_ENABLE_HIGHDPI_SCALING", "0");
-    qputenv("QT_LOGGING_RULES", "qt.qml.connections=false");
-    qputenv("QT_QUICK_CONTROLS_CONF", ":/qtquickcontrols2.conf");
-    qputenv("QML_COMPAT_RESOLVE_URLS_ON_ASSIGNMENT", "1");
-}
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/common/contentmodule.main.qml.tpl b/share/qtcreator/qmldesigner/studio_templates/projects/common/contentmodule.main.qml.tpl
deleted file mode 100644
index ac0b0b28c0..0000000000
--- a/share/qtcreator/qmldesigner/studio_templates/projects/common/contentmodule.main.qml.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-import QtQuick %{QtQuickVersion}
-@if !%{IsQt6Project}
-import QtQuick.Window %{QtQuickVersion}
-@endif
-import %{ApplicationImport}
-
-Window {
-    width: Constants.width
-    height: Constants.height
-
-    visible: true
-
-    Screen01 {
-        width: parent.width
-        height: parent.height
-    }
-}
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/common/import_qml_plugins.h.tpl b/share/qtcreator/qmldesigner/studio_templates/projects/common/import_qml_plugins.h.tpl
deleted file mode 100644
index f9700ff452..0000000000
--- a/share/qtcreator/qmldesigner/studio_templates/projects/common/import_qml_plugins.h.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * This file is automatically generated by Qt Design Studio.
- * Do not change.
-*/
-
-#include <QtQml/qqmlextensionplugin.h>
-
-Q_IMPORT_QML_PLUGIN(contentPlugin)
-Q_IMPORT_QML_PLUGIN(%{ProjectPluginClassName})
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/common/main.cpp.tpl b/share/qtcreator/qmldesigner/studio_templates/projects/common/main.cpp.tpl
deleted file mode 100644
index 915d08462e..0000000000
--- a/share/qtcreator/qmldesigner/studio_templates/projects/common/main.cpp.tpl
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (C) 2021 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
-
-#include <QGuiApplication>
-#include <QQmlApplicationEngine>
-
-#include "app_environment.h"
-#include "import_qml_components_plugins.h"
-#include "import_qml_plugins.h"
-
-int main(int argc, char *argv[])
-{
-    set_qt_environment();
-
-    QGuiApplication app(argc, argv);
-
-    QQmlApplicationEngine engine;
-    const QUrl url(u"qrc:/qt/qml/Main/main.qml"_qs);
-    QObject::connect(
-        &engine, &QQmlApplicationEngine::objectCreated, &app,
-        [url](QObject *obj, const QUrl &objUrl) {
-            if (!obj && url == objUrl)
-                QCoreApplication::exit(-1);
-        },
-        Qt::QueuedConnection);
-
-    engine.addImportPath(QCoreApplication::applicationDirPath() + "/qml");
-    engine.addImportPath(":/");
-
-    engine.load(url);
-
-    if (engine.rootObjects().isEmpty()) {
-        return -1;
-    }
-
-    return app.exec();
-}
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/common/main.qml b/share/qtcreator/qmldesigner/studio_templates/projects/common/main.qml
deleted file mode 100644
index 2c4f857df3..0000000000
--- a/share/qtcreator/qmldesigner/studio_templates/projects/common/main.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-/* This file is generated and only relevant for integrating the project into a Qt 6 and cmake based
-C++ project. */
-
-import QtQuick
-import content
-
-App {
-}
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/common/qmlmodules.tpl b/share/qtcreator/qmldesigner/studio_templates/projects/common/qmlmodules.tpl
deleted file mode 100644
index 5a22661b5a..0000000000
--- a/share/qtcreator/qmldesigner/studio_templates/projects/common/qmlmodules.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-### This file is automatically generated by Qt Design Studio.
-### Do not change
-
-qt6_add_qml_module(${CMAKE_PROJECT_NAME}
-    URI "Main"
-    VERSION 1.0
-    RESOURCE_PREFIX "/qt/qml"
-    NO_PLUGIN
-    QML_FILES main.qml
-)
-
-add_subdirectory(content)
-add_subdirectory(imports)
-
-target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE
-    contentplugin
-    %{ProjectPluginName}
-)
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/common/qtquickcontrols2.conf b/share/qtcreator/qmldesigner/studio_templates/projects/common/qtquickcontrols2.conf
deleted file mode 100644
index 9c7633fb0a..0000000000
--- a/share/qtcreator/qmldesigner/studio_templates/projects/common/qtquickcontrols2.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-; This file can be edited to change the style of the application
-; Read "Qt Quick Controls 2 Configuration File" for details:
-; http://doc.qt.io/qt-5/qtquickcontrols2-configuration.html
-
-[Controls]
-Style=%{QtQuickControlsStyle}
-@if '%{QtQuickControlsStyle}' == 'Universal'
-
-[Universal]
-Theme=%{QtQuickControlsStyleTheme}
-;Accent=Steel
-;Foreground=Brown
-;Background=Steel
-@endif
-@if '%{QtQuickControlsStyle}' == 'Material'
-
-[Material]
-Theme=%{QtQuickControlsStyleTheme}
-;Accent=BlueGrey
-;Primary=BlueGray
-;Foreground=Brown
-;Background=Grey
-@endif
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/desktop-launcher/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/desktop-launcher/wizard.json
index 01a603eb9d..ddaf502154 100644
--- a/share/qtcreator/qmldesigner/studio_templates/projects/desktop-launcher/wizard.json
+++ b/share/qtcreator/qmldesigner/studio_templates/projects/desktop-launcher/wizard.json
@@ -17,6 +17,8 @@
         { "key": "ProjectPluginName", "value": "%{ProjectName}plugin" },
         { "key": "ProjectPluginClassName", "value": "%{ProjectName}Plugin" },
         { "key": "QmlProjectFileName", "value": "%{JS: Util.fileName('%{ProjectName}', 'qmlproject')}" },
+        { "key": "AssetDir", "value": "GeneratedComponents" },
+        { "key": "ContentDir", "value": "%{ProjectName}Content" },
         { "key": "ImportModuleName", "value": "%{ProjectName}" },
         { "key": "UIClassName", "value": "Screen01" },
         { "key": "UIClassFileName", "value": "%{JS: Util.fileName('%{UIClassName}', 'ui.qml')}" },
@@ -298,97 +300,49 @@
                     "openAsProject": true
                 },
                 {
-                    "source": "../common/CMakeLists.main.txt.tpl",
-                    "target": "%{ProjectDirectory}/CMakeLists.txt"
-                },
-                {
-                    "source": "../common/qmlmodules.tpl",
-                    "target": "%{ProjectDirectory}/qmlmodules"
-                },
-                {
-                    "source": "../common/qmlcomponents.tpl",
-                    "target": "%{ProjectDirectory}/qmlcomponents"
-                },
-                {
-                    "source": "../common/insight.tpl",
-                    "target": "%{ProjectDirectory}/insight"
-                },
-                {
-                    "source": "../common/main.qml",
-                    "target": "%{ProjectDirectory}/main.qml"
-                },
-                {
                     "source": "../common/qtquickcontrols2.conf.tpl",
                     "target": "%{ProjectDirectory}/qtquickcontrols2.conf"
                 },
                 {
-                    "source": "../common/main.cpp.tpl",
-                    "target": "%{ProjectDirectory}/src/main.cpp"
-                },
-                {
-                    "source": "../common/app_environment.h.tpl",
-                    "target": "%{ProjectDirectory}/src/app_environment.h"
-                },
-                {
-                    "source": "../common/import_qml_plugins.h.tpl",
-                    "target": "%{ProjectDirectory}/src/import_qml_plugins.h"
-                },
-                {
-                    "source": "../common/import_qml_components_plugins.h.tpl",
-                    "target": "%{ProjectDirectory}/src/import_qml_components_plugins.h"
-                },
-                {
-                    "source": "../common/CMakeLists.content.txt.tpl",
-                    "target": "%{ProjectDirectory}/content/CMakeLists.txt"
-                },
-                {
                     "source": "../common/App.qml.tpl",
-                    "target": "%{ProjectDirectory}/content/App.qml"
+                    "target": "%{ProjectDirectory}/%{ContentDir}/App.qml"
                 },
                 {
                     "source": "Screen01.ui.qml.tpl",
-                    "target": "%{ProjectDirectory}/content/Screen01.ui.qml",
+                    "target": "%{ProjectDirectory}/%{ContentDir}/Screen01.ui.qml",
                     "openInEditor": true
                 },
                 {
                     "source": "../common/fonts.txt",
-                    "target": "%{ProjectDirectory}/content/fonts/fonts.txt"
+                    "target": "%{ProjectDirectory}/%{ContentDir}/fonts/fonts.txt"
                 },
                 {
                     "source": "../common/asset_imports.txt",
-                    "target": "%{ProjectDirectory}/asset_imports/asset_imports.txt"
-                },
-                {
-                    "source": "../common/CMakeLists.imports.txt.tpl",
-                    "target": "%{ProjectDirectory}/imports/CMakeLists.txt"
-                },
-                {
-                    "source": "../shared-plugin/name/CMakeLists.importmodule.txt.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/CMakeLists.txt"
+                    "target": "%{ProjectDirectory}/%{AssetDir}/%{AssetDir}.txt"
                 },
                 {
                     "source": "../shared-plugin/name/importmodule.qmldir.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/qmldir"
+                    "target": "%{ProjectDirectory}/%{ImportModuleName}/qmldir"
                 },
                 {
                     "source": "../shared-plugin/name/Constants.qml.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/Constants.qml"
+                    "target": "%{ProjectDirectory}/%{ImportModuleName}/Constants.qml"
                 },
                 {
                     "source": "../shared-plugin/name/DirectoryFontLoader.qml.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/DirectoryFontLoader.qml"
+                    "target": "%{ProjectDirectory}/%{ImportModuleName}/DirectoryFontLoader.qml"
                 },
                 {
                     "source": "../shared-plugin/name/EventListModel.qml.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/EventListModel.qml"
+                    "target": "%{ProjectDirectory}/%{ImportModuleName}/EventListModel.qml"
                 },
                 {
                     "source": "../shared-plugin/name/EventListSimulator.qml.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/EventListSimulator.qml"
+                    "target": "%{ProjectDirectory}/%{ImportModuleName}/EventListSimulator.qml"
                 },
                 {
                     "source": "../shared-plugin/name/designer/plugin.metainfo",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/designer/plugin.metainfo"
+                    "target": "%{ProjectDirectory}/%{ImportModuleName}/designer/plugin.metainfo"
                 }
             ]
         }
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/mobile-scroll/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/mobile-scroll/wizard.json
index d521cc201e..585a73aa90 100644
--- a/share/qtcreator/qmldesigner/studio_templates/projects/mobile-scroll/wizard.json
+++ b/share/qtcreator/qmldesigner/studio_templates/projects/mobile-scroll/wizard.json
@@ -17,6 +17,8 @@
         { "key": "ProjectPluginName", "value": "%{ProjectName}plugin" },
         { "key": "ProjectPluginClassName", "value": "%{ProjectName}Plugin" },
         { "key": "QmlProjectFileName", "value": "%{JS: Util.fileName('%{ProjectName}', 'qmlproject')}" },
+        { "key": "AssetDir", "value": "GeneratedComponents" },
+        { "key": "ContentDir", "value": "%{ProjectName}Content" },
         { "key": "ImportModuleName", "value": "%{ProjectName}" },
         { "key": "UIClassName", "value": "Screen01" },
         { "key": "UIClassFileName", "value": "%{JS: Util.fileName('%{UIClassName}', 'ui.qml')}" },
@@ -193,7 +195,7 @@
                     "type": "ComboBox",
                     "data":
                     {
-                        "index": 4,
+                        "index": 6,
                         "items":
                             [
                             {
@@ -237,6 +239,13 @@
                                 "({
                                     'TargetQuickVersion': '6.6'
                                 })"
+                            },
+                            {
+                                "trKey": "Qt 6.7",
+                                "value":
+                                "({
+                                    'TargetQuickVersion': '6.7'
+                                })"
                             }
                         ]
                     }
@@ -257,97 +266,49 @@
                     "openAsProject": true
                 },
                 {
-                    "source": "../common/CMakeLists.main.txt.tpl",
-                    "target": "%{ProjectDirectory}/CMakeLists.txt"
-                },
-                {
-                    "source": "../common/qmlmodules.tpl",
-                    "target": "%{ProjectDirectory}/qmlmodules"
-                },
-                {
-                    "source": "../common/qmlcomponents.tpl",
-                    "target": "%{ProjectDirectory}/qmlcomponents"
-                },
-                {
-                    "source": "../common/insight.tpl",
-                    "target": "%{ProjectDirectory}/insight"
-                },
-                {
-                    "source": "../common/main.qml",
-                    "target": "%{ProjectDirectory}/main.qml"
-                },
-                {
                     "source": "../common/qtquickcontrols2.conf.tpl",
                     "target": "%{ProjectDirectory}/qtquickcontrols2.conf"
                 },
                 {
-                    "source": "../common/main.cpp.tpl",
-                    "target": "%{ProjectDirectory}/src/main.cpp"
-                },
-                {
-                    "source": "../common/app_environment.h.tpl",
-                    "target": "%{ProjectDirectory}/src/app_environment.h"
-                },
-                {
-                    "source": "../common/import_qml_plugins.h.tpl",
-                    "target": "%{ProjectDirectory}/src/import_qml_plugins.h"
-                },
-                {
-                    "source": "../common/import_qml_components_plugins.h.tpl",
-                    "target": "%{ProjectDirectory}/src/import_qml_components_plugins.h"
-                },
-                {
-                    "source": "../common/CMakeLists.content.txt.tpl",
-                    "target": "%{ProjectDirectory}/content/CMakeLists.txt"
-                },
-                {
                     "source": "../common/App.qml.tpl",
-                    "target": "%{ProjectDirectory}/content/App.qml"
+                    "target": "%{ProjectDirectory}/%{ContentDir}/App.qml"
                 },
                 {
                     "source": "Screen01.ui.qml.tpl",
-                    "target": "%{ProjectDirectory}/content/Screen01.ui.qml",
+                    "target": "%{ProjectDirectory}/%{ContentDir}/Screen01.ui.qml",
                     "openInEditor": true
                 },
                 {
                     "source": "../common/fonts.txt",
-                    "target": "%{ProjectDirectory}/content/fonts/fonts.txt"
+                    "target": "%{ProjectDirectory}/%{ContentDir}/fonts/fonts.txt"
                 },
                 {
                     "source": "../common/asset_imports.txt",
-                    "target": "%{ProjectDirectory}/asset_imports/asset_imports.txt"
-                },
-                {
-                    "source": "../common/CMakeLists.imports.txt.tpl",
-                    "target": "%{ProjectDirectory}/imports/CMakeLists.txt"
-                },
-                {
-                    "source": "../shared-plugin/name/CMakeLists.importmodule.txt.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/CMakeLists.txt"
+                    "target": "%{ProjectDirectory}/%{AssetDir}/%{AssetDir}.txt"
                 },
                 {
                     "source": "../shared-plugin/name/importmodule.qmldir.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/qmldir"
+                    "target": "%{ProjectDirectory}/%{ImportModuleName}/qmldir"
                 },
                 {
                     "source": "../shared-plugin/name/Constants.qml.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/Constants.qml"
+                    "target": "%{ProjectDirectory}/%{ImportModuleName}/Constants.qml"
                 },
                 {
                     "source": "../shared-plugin/name/DirectoryFontLoader.qml.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/DirectoryFontLoader.qml"
+                    "target": "%{ProjectDirectory}/%{ImportModuleName}/DirectoryFontLoader.qml"
                 },
                 {
                     "source": "../shared-plugin/name/EventListModel.qml.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/EventListModel.qml"
+                    "target": "%{ProjectDirectory}/%{ImportModuleName}/EventListModel.qml"
                 },
                 {
                     "source": "../shared-plugin/name/EventListSimulator.qml.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/EventListSimulator.qml"
+                    "target": "%{ProjectDirectory}/%{ImportModuleName}/EventListSimulator.qml"
                 },
                 {
                     "source": "../shared-plugin/name/designer/plugin.metainfo",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/designer/plugin.metainfo"
+                    "target": "%{ProjectDirectory}/%{ImportModuleName}/designer/plugin.metainfo"
                 }
             ]
         }
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/mobile-stack/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/mobile-stack/wizard.json
index 17cd30d507..a44a1429be 100644
--- a/share/qtcreator/qmldesigner/studio_templates/projects/mobile-stack/wizard.json
+++ b/share/qtcreator/qmldesigner/studio_templates/projects/mobile-stack/wizard.json
@@ -17,6 +17,8 @@
         { "key": "ProjectPluginName", "value": "%{ProjectName}plugin" },
         { "key": "ProjectPluginClassName", "value": "%{ProjectName}Plugin" },
         { "key": "QmlProjectFileName", "value": "%{JS: Util.fileName('%{ProjectName}', 'qmlproject')}" },
+        { "key": "AssetDir", "value": "GeneratedComponents" },
+        { "key": "ContentDir", "value": "%{ProjectName}Content" },
         { "key": "ImportModuleName", "value": "%{ProjectName}" },
         { "key": "IsQt6Project", "value": "%{JS: value('QtQuickVersion') !== '2.15' }" },
         { "key": "QtQuickVersion", "value": "%{JS: %{TargetQtVersion}.TargetQuickVersion}" },
@@ -191,7 +193,7 @@
                     "type": "ComboBox",
                     "data":
                     {
-                        "index": 4,
+                        "index": 6,
                         "items":
                             [
                             {
@@ -235,6 +237,13 @@
                                 "({
                                     'TargetQuickVersion': '6.6'
                                 })"
+                            },
+                            {
+                                "trKey": "Qt 6.7",
+                                "value":
+                                "({
+                                    'TargetQuickVersion': '6.7'
+                                })"
                             }
                         ]
                     }
@@ -254,102 +263,54 @@
                     "openAsProject": true
                 },
                 {
-                    "source": "../common/CMakeLists.main.txt.tpl",
-                    "target": "%{ProjectDirectory}/CMakeLists.txt"
-                },
-                {
-                    "source": "../common/qmlmodules.tpl",
-                    "target": "%{ProjectDirectory}/qmlmodules"
-                },
-                {
-                    "source": "../common/qmlcomponents.tpl",
-                    "target": "%{ProjectDirectory}/qmlcomponents"
-                },
-                {
-                    "source": "../common/insight.tpl",
-                    "target": "%{ProjectDirectory}/insight"
-                },
-                {
-                    "source": "../common/main.qml",
-                    "target": "%{ProjectDirectory}/main.qml"
-                },
-                {
                     "source": "../common/qtquickcontrols2.conf.tpl",
                     "target": "%{ProjectDirectory}/qtquickcontrols2.conf"
                 },
                 {
-                    "source": "../common/main.cpp.tpl",
-                    "target": "%{ProjectDirectory}/src/main.cpp"
-                },
-                {
-                    "source": "../common/app_environment.h.tpl",
-                    "target": "%{ProjectDirectory}/src/app_environment.h"
-                },
-                {
-                    "source": "../common/import_qml_plugins.h.tpl",
-                    "target": "%{ProjectDirectory}/src/import_qml_plugins.h"
-                },
-                {
-                    "source": "../common/import_qml_components_plugins.h.tpl",
-                    "target": "%{ProjectDirectory}/src/import_qml_components_plugins.h"
-                },
-                {
-                    "source": "CMakeLists.content.txt.tpl",
-                    "target": "%{ProjectDirectory}/content/CMakeLists.txt"
-                },
-                {
                     "source": "App.qml.tpl",
-                    "target": "%{ProjectDirectory}/content/App.qml"
+                    "target": "%{ProjectDirectory}/%{ContentDir}/App.qml"
                 },
                 {
                     "source": "Screen01.ui.qml.tpl",
-                    "target": "%{ProjectDirectory}/content/Screen01.ui.qml",
+                    "target": "%{ProjectDirectory}/%{ContentDir}/Screen01.ui.qml",
                     "openInEditor": true
                 },
                 {
                     "source": "Screen02.ui.qml.tpl",
-                    "target": "%{ProjectDirectory}/content/Screen02.ui.qml",
+                    "target": "%{ProjectDirectory}/%{ContentDir}/Screen02.ui.qml",
                     "openInEditor": true
                 },
                 {
                     "source": "../common/fonts.txt",
-                    "target": "%{ProjectDirectory}/content/fonts/fonts.txt"
+                    "target": "%{ProjectDirectory}/%{ContentDir}/fonts/fonts.txt"
                 },
                 {
                     "source": "../common/asset_imports.txt",
-                    "target": "%{ProjectDirectory}/asset_imports/asset_imports.txt"
-                },
-                {
-                    "source": "../common/CMakeLists.imports.txt.tpl",
-                    "target": "%{ProjectDirectory}/imports/CMakeLists.txt"
-                },
-                {
-                    "source": "../shared-plugin/name/CMakeLists.importmodule.txt.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/CMakeLists.txt"
+                    "target": "%{ProjectDirectory}/%{AssetDir}/%{AssetDir}.txt"
                 },
                 {
                     "source": "../shared-plugin/name/importmodule.qmldir.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/qmldir"
+                    "target": "%{ProjectDirectory}/%{ImportModuleName}/qmldir"
                 },
                 {
                     "source": "../shared-plugin/name/Constants.qml.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/Constants.qml"
+                    "target": "%{ProjectDirectory}/%{ImportModuleName}/Constants.qml"
                 },
                 {
                     "source": "../shared-plugin/name/DirectoryFontLoader.qml.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/DirectoryFontLoader.qml"
+                    "target": "%{ProjectDirectory}/%{ImportModuleName}/DirectoryFontLoader.qml"
                 },
                 {
                     "source": "../shared-plugin/name/EventListModel.qml.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/EventListModel.qml"
+                    "target": "%{ProjectDirectory}/%{ImportModuleName}/EventListModel.qml"
                 },
                 {
                     "source": "../shared-plugin/name/EventListSimulator.qml.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/EventListSimulator.qml"
+                    "target": "%{ProjectDirectory}/%{ImportModuleName}/EventListSimulator.qml"
                 },
                 {
                     "source": "../shared-plugin/name/designer/plugin.metainfo",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/designer/plugin.metainfo"
+                    "target": "%{ProjectDirectory}/%{ImportModuleName}/designer/plugin.metainfo"
                 }
             ]
         }
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/mobile-swipe/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/mobile-swipe/wizard.json
index 37710ae91d..b3f70a8b79 100644
--- a/share/qtcreator/qmldesigner/studio_templates/projects/mobile-swipe/wizard.json
+++ b/share/qtcreator/qmldesigner/studio_templates/projects/mobile-swipe/wizard.json
@@ -17,6 +17,8 @@
         { "key": "ProjectPluginName", "value": "%{ProjectName}plugin" },
         { "key": "ProjectPluginClassName", "value": "%{ProjectName}Plugin" },
         { "key": "QmlProjectFileName", "value": "%{JS: Util.fileName('%{ProjectName}', 'qmlproject')}" },
+        { "key": "AssetDir", "value": "GeneratedComponents" },
+        { "key": "ContentDir", "value": "%{ProjectName}Content" },
         { "key": "ImportModuleName", "value": "%{ProjectName}" },
         { "key": "IsQt6Project", "value": "%{JS: value('QtQuickVersion') !== '2.15' }" },
         { "key": "QtQuickVersion", "value": "%{JS: %{TargetQtVersion}.TargetQuickVersion}" },
@@ -191,7 +193,7 @@
                     "type": "ComboBox",
                     "data":
                     {
-                        "index": 4,
+                        "index": 6,
                         "items":
                             [
                             {
@@ -235,6 +237,13 @@
                                 "({
                                     'TargetQuickVersion': '6.6'
                                 })"
+                            },
+                            {
+                                "trKey": "Qt 6.7",
+                                "value":
+                                "({
+                                    'TargetQuickVersion': '6.7'
+                                })"
                             }
                         ]
                     }
@@ -254,102 +263,54 @@
                     "openAsProject": true
                 },
                 {
-                    "source": "../common/CMakeLists.main.txt.tpl",
-                    "target": "%{ProjectDirectory}/CMakeLists.txt"
-                },
-                {
-                    "source": "../common/qmlmodules.tpl",
-                    "target": "%{ProjectDirectory}/qmlmodules"
-                },
-                {
-                    "source": "../common/qmlcomponents.tpl",
-                    "target": "%{ProjectDirectory}/qmlcomponents"
-                },
-                {
-                    "source": "../common/insight.tpl",
-                    "target": "%{ProjectDirectory}/insight"
-                },
-                {
-                    "source": "../common/main.qml",
-                    "target": "%{ProjectDirectory}/main.qml"
-                },
-                {
                     "source": "../common/qtquickcontrols2.conf.tpl",
                     "target": "%{ProjectDirectory}/qtquickcontrols2.conf"
                 },
                 {
-                    "source": "../common/main.cpp.tpl",
-                    "target": "%{ProjectDirectory}/src/main.cpp"
-                },
-                {
-                    "source": "../common/app_environment.h.tpl",
-                    "target": "%{ProjectDirectory}/src/app_environment.h"
-                },
-                {
-                    "source": "../common/import_qml_plugins.h.tpl",
-                    "target": "%{ProjectDirectory}/src/import_qml_plugins.h"
-                },
-                {
-                    "source": "../common/import_qml_components_plugins.h.tpl",
-                    "target": "%{ProjectDirectory}/src/import_qml_components_plugins.h"
-                },
-                {
-                    "source": "CMakeLists.content.txt.tpl",
-                    "target": "%{ProjectDirectory}/content/CMakeLists.txt"
-                },
-                {
                     "source": "App.qml.tpl",
-                    "target": "%{ProjectDirectory}/content/App.qml"
+                    "target": "%{ProjectDirectory}/%{ContentDir}/App.qml"
                 },
                 {
                     "source": "Screen01.ui.qml.tpl",
-                    "target": "%{ProjectDirectory}/content/Screen01.ui.qml",
+                    "target": "%{ProjectDirectory}/%{ContentDir}/Screen01.ui.qml",
                     "openInEditor": true
                 },
                 {
                     "source": "Screen02.ui.qml.tpl",
-                    "target": "%{ProjectDirectory}/content/Screen02.ui.qml",
+                    "target": "%{ProjectDirectory}/%{ContentDir}/Screen02.ui.qml",
                     "openInEditor": true
                 },
                 {
                     "source": "../common/fonts.txt",
-                    "target": "%{ProjectDirectory}/content/fonts/fonts.txt"
+                    "target": "%{ProjectDirectory}/%{ContentDir}/fonts/fonts.txt"
                 },
                 {
                     "source": "../common/asset_imports.txt",
-                    "target": "%{ProjectDirectory}/asset_imports/asset_imports.txt"
-                },
-                {
-                    "source": "../common/CMakeLists.imports.txt.tpl",
-                    "target": "%{ProjectDirectory}/imports/CMakeLists.txt"
-                },
-                {
-                    "source": "../shared-plugin/name/CMakeLists.importmodule.txt.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/CMakeLists.txt"
+                    "target": "%{ProjectDirectory}/%{AssetDir}/%{AssetDir}.txt"
                 },
                 {
                     "source": "../shared-plugin/name/importmodule.qmldir.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/qmldir"
+                    "target": "%{ProjectDirectory}/%{ImportModuleName}/qmldir"
                 },
                 {
                     "source": "../shared-plugin/name/Constants.qml.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/Constants.qml"
+                    "target": "%{ProjectDirectory}/%{ImportModuleName}/Constants.qml"
                 },
                 {
                     "source": "../shared-plugin/name/DirectoryFontLoader.qml.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/DirectoryFontLoader.qml"
+                    "target": "%{ProjectDirectory}/%{ImportModuleName}/DirectoryFontLoader.qml"
                 },
                 {
                     "source": "../shared-plugin/name/EventListModel.qml.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/EventListModel.qml"
+                    "target": "%{ProjectDirectory}/%{ImportModuleName}/EventListModel.qml"
                 },
                 {
                     "source": "../shared-plugin/name/EventListSimulator.qml.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/EventListSimulator.qml"
+                    "target": "%{ProjectDirectory}/%{ImportModuleName}/EventListSimulator.qml"
                 },
                 {
                     "source": "../shared-plugin/name/designer/plugin.metainfo",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/designer/plugin.metainfo"
+                    "target": "%{ProjectDirectory}/%{ImportModuleName}/designer/plugin.metainfo"
                 }
             ]
         }
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/Constants.qml.tpl b/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/Constants.qml.tpl
index cc5da7be55..35aa48896b 100644
--- a/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/Constants.qml.tpl
+++ b/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/Constants.qml.tpl
@@ -26,7 +26,7 @@ QtObject {
 
 @if %{IsQt6Project}
     property StudioApplication application: StudioApplication {
-        fontPath: Qt.resolvedUrl("../../content/" + relativeFontDirectory)
+        fontPath: Qt.resolvedUrl("../../%{ContentDir}/" + relativeFontDirectory)
     }
 @else
     property DirectoryFontLoader directoryFontLoader: DirectoryFontLoader {
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/DirectoryFontLoader.qml.tpl b/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/DirectoryFontLoader.qml.tpl
index 677fe05428..56ecc9f2f8 100644
--- a/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/DirectoryFontLoader.qml.tpl
+++ b/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/DirectoryFontLoader.qml.tpl
@@ -7,7 +7,7 @@ import Qt.labs.folderlistmodel %{QtQuickVersion}
 QtObject {
     id: loader
 
-    property url fontDirectory: Qt.resolvedUrl("../../content/" + relativeFontDirectory)
+    property url fontDirectory: Qt.resolvedUrl("../../%{ContentDir}/" + relativeFontDirectory)
     property string relativeFontDirectory: "fonts"
 
     function loadFont(url) {
diff --git a/share/qtcreator/qmldesigner/toolbar/Main.qml b/share/qtcreator/qmldesigner/toolbar/Main.qml
index 7235028df6..88a9bd744a 100644
--- a/share/qtcreator/qmldesigner/toolbar/Main.qml
+++ b/share/qtcreator/qmldesigner/toolbar/Main.qml
@@ -190,6 +190,26 @@ Rectangle {
             onActivated: backend.openFileByIndex(index)
         }
 
+        Text {
+            parent:currentFile.contentItem
+            visible: backend.isDocumentDirty
+
+            anchors.right: parent.right
+            anchors.rightMargin: parent.width - metric.textWidth - 18
+            color: StudioTheme.Values.themeTextColor
+            text: StudioTheme.Constants.wildcard
+            font.family: StudioTheme.Constants.iconFont.family
+            font.pixelSize: StudioTheme.Values.smallIconFont
+            anchors.verticalCenter: parent.verticalCenter
+            anchors.verticalCenterOffset: -4
+
+            FontMetrics {
+                id: metric
+                font: currentFile.font
+                property int textWidth: metric.boundingRect(currentFile.currentText).width
+            }
+        }
+
         ToolbarButton {
             id: backButton
             anchors.verticalCenter: parent.verticalCenter
diff --git a/share/qtcreator/qmldesigner/welcomepage/MainGridStack.qml b/share/qtcreator/qmldesigner/welcomepage/MainGridStack.qml
index 73b023bddc..555596223b 100644
--- a/share/qtcreator/qmldesigner/welcomepage/MainGridStack.qml
+++ b/share/qtcreator/qmldesigner/welcomepage/MainGridStack.qml
@@ -88,7 +88,17 @@ Item {
                 Layout.fillWidth: true
                 Layout.fillHeight: true
                 hover: hoverHandler.hovered
-                model: ExamplesModel { id: examplesModel}
+
+                Component.onCompleted: {
+                    // remove items with old versions from the examples model
+                    for (let i = examplesModel.count - 1; i >= 0; --i) {
+                        if (!projectModel.exampleVersionOk(examplesModel.get(i).minQDSVersion))
+                            examplesModel.remove(i)
+                    }
+                }
+
+                model: ExamplesModelV2 { id: examplesModel }
+
                 delegate: ThumbnailDelegate {
                     type: ThumbnailDelegate.Type.Example
                     downloadable: showDownload
diff --git a/share/qtcreator/themes/dark.creatortheme b/share/qtcreator/themes/dark.creatortheme
index c2846fa094..463204fd51 100644
--- a/share/qtcreator/themes/dark.creatortheme
+++ b/share/qtcreator/themes/dark.creatortheme
@@ -502,7 +502,6 @@ DrawSearchResultWidgetFrame=false
 DrawTargetSelectorBottom=false
 DrawToolBarHighlights=true
 DrawToolBarBorders=false
-ApplyThemePaletteGlobally=true
 FlatToolBars=true
 FlatSideBarIcons=true
 FlatProjectsMode=true
diff --git a/share/qtcreator/themes/dark.figmatokens b/share/qtcreator/themes/dark.figmatokens
index 8937a3cc2d..194ce7fab2 100644
--- a/share/qtcreator/themes/dark.figmatokens
+++ b/share/qtcreator/themes/dark.figmatokens
@@ -20,7 +20,13 @@ Token_Foreground_Subtle=ff2A2A2A
 Token_Text_Default=ffF8F8F8
 Token_Text_Muted=ffAEAEAE
 Token_Text_Subtle=ff595959
-Token_Text_Accent=ff23B26A
+
+; Token_Text_Accent value from Figma is still too dark. Therefore, it is modified, here.
+; Text (consisting of thin lines) needs to be substantially brighter than accent colors used for
+; larger-area elements like the filled button.
+
+; Token_Text_Accent=ff23B26A
+Token_Text_Accent=ff30C06A
 
 Token_Stroke_Strong=ffeeeeee
 Token_Stroke_Muted=ff727272
diff --git a/share/qtcreator/themes/default.creatortheme b/share/qtcreator/themes/default.creatortheme
index f2c4c7f7a4..e6cdab1bc3 100644
--- a/share/qtcreator/themes/default.creatortheme
+++ b/share/qtcreator/themes/default.creatortheme
@@ -1,5 +1,5 @@
 [General]
-Includes=light.figmatokens
+Includes=light.figmatokens, light-palette.inc
 ThemeName=Classic
 PreferredStyles=
 
@@ -465,13 +465,12 @@ TerminalAnsi15=e5e5e6
 
 [Flags]
 ComboBoxDrawTextShadow=true
-DerivePaletteFromTheme=false
+DerivePaletteFromThemeIfNeeded=true
 DrawIndicatorBranch=false
 DrawSearchResultWidgetFrame=true
 DrawTargetSelectorBottom=true
 DrawToolBarHighlights=true
 DrawToolBarBorders=false
-ApplyThemePaletteGlobally=false
 FlatToolBars=false
 FlatSideBarIcons=false
 FlatProjectsMode=false
diff --git a/share/qtcreator/themes/design-light.creatortheme b/share/qtcreator/themes/design-light.creatortheme
index 41a9f07ba8..5271d5fc57 100644
--- a/share/qtcreator/themes/design-light.creatortheme
+++ b/share/qtcreator/themes/design-light.creatortheme
@@ -513,7 +513,6 @@ DrawSearchResultWidgetFrame=false
 DrawTargetSelectorBottom=false
 DrawToolBarHighlights=false
 DrawToolBarBorders=true
-ApplyThemePaletteGlobally=true
 FlatToolBars=true
 FlatSideBarIcons=true
 FlatProjectsMode=false
diff --git a/share/qtcreator/themes/design.creatortheme b/share/qtcreator/themes/design.creatortheme
index 11022bd7e5..874c5116e0 100644
--- a/share/qtcreator/themes/design.creatortheme
+++ b/share/qtcreator/themes/design.creatortheme
@@ -562,7 +562,6 @@ DrawSearchResultWidgetFrame=false
 DrawTargetSelectorBottom=false
 DrawToolBarHighlights=false
 DrawToolBarBorders=false
-ApplyThemePaletteGlobally=true
 FlatToolBars=true
 FlatSideBarIcons=true
 FlatProjectsMode=true
diff --git a/share/qtcreator/themes/flat-dark.creatortheme b/share/qtcreator/themes/flat-dark.creatortheme
index 9737e9cd53..bdf46614b0 100644
--- a/share/qtcreator/themes/flat-dark.creatortheme
+++ b/share/qtcreator/themes/flat-dark.creatortheme
@@ -506,7 +506,6 @@ DrawSearchResultWidgetFrame=false
 DrawTargetSelectorBottom=false
 DrawToolBarHighlights=false
 DrawToolBarBorders=false
-ApplyThemePaletteGlobally=true
 FlatToolBars=true
 FlatSideBarIcons=true
 FlatProjectsMode=true
diff --git a/share/qtcreator/themes/flat-light.creatortheme b/share/qtcreator/themes/flat-light.creatortheme
index 1ff8a7a3ff..a85d3654d8 100644
--- a/share/qtcreator/themes/flat-light.creatortheme
+++ b/share/qtcreator/themes/flat-light.creatortheme
@@ -1,25 +1,28 @@
 [General]
-Includes=light.figmatokens
+Includes=light.figmatokens, light-palette.inc
 ThemeName=Flat Light
 PreferredStyles=
 
 [Palette]
-shadowBackground=ffe4e4e4
-text=ff000000
-textDisabled=55000000
+shadowBackground=PaletteDark
+text=PaletteWindowText
+textDisabled=PaletteTextDisabled
 toolBarItem=a0010508
 toolBarItemDisabled=38000000
 fancyBarsNormalTextColor=ff000000
 fancyBarsBoldTextColor=a0010508
 hoverBackground=1a000000
 selectedBackground=a8ffffff
-normalBackground=ffffffff
-alternateBackground=ff515151
+normalBackground=PaletteWindow
+alternateBackground=PaletteAlternateBase
 stop_error=ffec7373
 run_success=ff52c23b
 splitter=ffbdbebf
 error=ffdf4f4f
 warning=ffecbc1c
+textColorLink=PaletteLink
+textColorLinkVisited=PaletteLinkVisited
+backgroundColorDisabled=PaletteWindowDisabled
 qmlDesignerButtonColor=fff8f8f8
 
 ;DS Theme Palette START
@@ -474,13 +477,12 @@ TerminalAnsi15=e5e5e6
 
 [Flags]
 ComboBoxDrawTextShadow=false
-DerivePaletteFromTheme=false
+DerivePaletteFromThemeIfNeeded=true
 DrawIndicatorBranch=true
 DrawSearchResultWidgetFrame=false
 DrawTargetSelectorBottom=false
 DrawToolBarHighlights=false
 DrawToolBarBorders=true
-ApplyThemePaletteGlobally=false
 FlatToolBars=true
 FlatSideBarIcons=true
 FlatProjectsMode=false
diff --git a/share/qtcreator/themes/flat.creatortheme b/share/qtcreator/themes/flat.creatortheme
index f479077889..7fd222e168 100644
--- a/share/qtcreator/themes/flat.creatortheme
+++ b/share/qtcreator/themes/flat.creatortheme
@@ -1,23 +1,26 @@
 [General]
-Includes=light.figmatokens
+Includes=light.figmatokens, light-palette.inc
 ThemeName=Flat
 PreferredStyles=
 
 [Palette]
 shadowBackground=ff404142
-text=ff000000
-textDisabled=55000000
+text=PaletteWindowText
+textDisabled=PaletteTextDisabled
 toolBarItem=bcfbfdff
 toolBarItemDisabled=56a5a6a7
 fancyBarsNormalTextColor=ffffffff
 fancyBarsBoldTextColor=b6fbfdff
 hoverBackground=28ffffff
 selectedBackground=7a000000
-normalBackground=ffffffff
-alternateBackground=ff515151
+normalBackground=PaletteWindow
+alternateBackground=PaletteAlternateBase
 error=ffdf4f4f
 warning=ffecbc1c
 splitter=ff313131
+textColorLink=PaletteLink
+textColorLinkVisited=PaletteLinkVisited
+backgroundColorDisabled=PaletteWindowDisabled
 qmlDesignerButtonColor=ff4c4e50
 
 ;DS Theme Palette START
@@ -472,13 +475,12 @@ TerminalAnsi15=e5e5e6
 
 [Flags]
 ComboBoxDrawTextShadow=false
-DerivePaletteFromTheme=false
+DerivePaletteFromThemeIfNeeded=true
 DrawIndicatorBranch=true
 DrawSearchResultWidgetFrame=false
 DrawTargetSelectorBottom=false
 DrawToolBarHighlights=false
 DrawToolBarBorders=false
-ApplyThemePaletteGlobally=false
 FlatToolBars=true
 FlatSideBarIcons=true
 FlatProjectsMode=false
diff --git a/share/qtcreator/themes/light-palette.inc b/share/qtcreator/themes/light-palette.inc
new file mode 100644
index 0000000000..99fe763a8b
--- /dev/null
+++ b/share/qtcreator/themes/light-palette.inc
@@ -0,0 +1,41 @@
+[Palette]
+PaletteWindow=ffffffff
+PaletteWindowDisabled=ffececec
+PaletteWindowText=ff000000
+PaletteWindowTextDisabled=PaletteTextDisabled
+PaletteBase=PaletteWindow
+PaletteBaseDisabled=PaletteWindowDisabled
+PaletteAlternateBase=ff515151
+;PaletteAlternateBaseDisabled
+PaletteToolTipBase=PaletteDark
+;PaletteToolTipBaseDisabled
+PaletteToolTipText=PaletteWindowText
+;PaletteToolTipTextDisabled
+PaletteText=PaletteWindowText
+PaletteTextDisabled=55000000
+PaletteButton=PaletteDark
+;PaletteButtonDisabled
+PaletteButtonText=PaletteWindowText
+PaletteButtonTextDisabled=PaletteTextDisabled
+PaletteBrightText=ffffffff
+;PaletteBrightTextDisabled
+PaletteHighlight=ffa5cdff
+;PaletteHighlightDisabled
+PaletteHighlightedText=ff000000
+;PaletteHighlightedTextDisabled
+PaletteLink=ff0000ff
+;PaletteLinkDisabled
+PaletteLinkVisited=ff800080
+;PaletteLinkVisitedDisabled
+;PaletteLight
+;PaletteLightDisabled
+;PaletteMidlight
+;PaletteMidlightDisabled
+PaletteDark=ffe4e4e4
+;PaletteDarkDisabled
+PaletteMid=ffa9a9a9
+;PaletteMidDisabled
+;PaletteShadow
+;PaletteShadowDisabled
+PalettePlaceholderText=3f000000
+;PalettePlaceholderTextDisabled
diff --git a/share/qtcreator/themes/light.figmatokens b/share/qtcreator/themes/light.figmatokens
index 6ef243d17d..138ad74afd 100644
--- a/share/qtcreator/themes/light.figmatokens
+++ b/share/qtcreator/themes/light.figmatokens
@@ -10,7 +10,12 @@ Token_Accent_Muted=ff1f9b5d
 Token_Accent_Subtle=ff1a8550
 
 Token_Background_Default=fffcfcfc
-Token_Background_Muted=ffF2F2F2
+
+; Token_Background_Muted value from Figma is too dark to ensure proper contrast when used as
+; text bachground. Therefore, it is modified, here.
+
+;Token_Background_Muted=ffF2F2F2
+Token_Background_Muted=ffF6F6F6
 Token_Background_Subtle=ffe7e7e7
 
 Token_Foreground_Default=ffD8D8D8
@@ -20,7 +25,7 @@ Token_Foreground_Subtle=ffEFEFEF
 Token_Text_Default=ff393939
 Token_Text_Muted=ff6a6a6a
 Token_Text_Subtle=ffbebebe
-Token_Text_Accent=ff28C878
+Token_Text_Accent=ff1F9B5D
 
 Token_Stroke_Strong=ff464646
 Token_Stroke_Muted=ff727272
diff --git a/share/qtcreator/translations/qtcreator_da.ts b/share/qtcreator/translations/qtcreator_da.ts
index 43f2146846..ca9e8e47a4 100644
--- a/share/qtcreator/translations/qtcreator_da.ts
+++ b/share/qtcreator/translations/qtcreator_da.ts
@@ -24002,52 +24002,36 @@ Brug det kun hvis du prototyper. Du kan ikke oprette et fuldt program med dette.
         <translation>Page med typeId&apos;et &quot;%1&quot; har ugyldigt &quot;index&quot;.</translation>
     </message>
     <message>
-        <source>Path &quot;%1&quot; does not exist when checking Json wizard search paths.
-</source>
-        <translation>Stien &quot;%1&quot; findes ikke under tjek af Json-assistentens søgestier.
-</translation>
+        <source>Path &quot;%1&quot; does not exist when checking JSON wizard search paths.</source>
+        <translation>Stien &quot;%1&quot; findes ikke under tjek af JSON-assistentens søgestier.</translation>
     </message>
     <message>
-        <source>Checking &quot;%1&quot; for %2.
-</source>
-        <translation>Tjekker &quot;%1&quot; for %2.
-</translation>
+        <source>Checking &quot;%1&quot; for %2.</source>
+        <translation>Tjekker &quot;%1&quot; for %2.</translation>
     </message>
     <message>
-        <source>* Failed to parse &quot;%1&quot;:%2:%3: %4
-</source>
-        <translation>* Kunne ikke parse &quot;%1&quot;:%2:%3: %4
-</translation>
+        <source>* Failed to parse &quot;%1&quot;:%2:%3: %4</source>
+        <translation>* Kunne ikke parse &quot;%1&quot;:%2:%3: %4</translation>
     </message>
     <message>
-        <source>* Did not find a JSON object in &quot;%1&quot;.
-</source>
-        <translation>* Fandt ikke et JSON-objekt i &quot;%1&quot;.
-</translation>
+        <source>* Did not find a JSON object in &quot;%1&quot;.</source>
+        <translation>* Fandt ikke et JSON-objekt i &quot;%1&quot;.</translation>
     </message>
     <message>
-        <source>* Configuration found and parsed.
-</source>
-        <translation>* Konfiguration fundet og parset.
-</translation>
+        <source>* Configuration found and parsed.</source>
+        <translation>* Konfiguration fundet og parset.</translation>
     </message>
     <message>
-        <source>* Version %1 not supported.
-</source>
-        <translation>* Version %1 understøttes ikke.
-</translation>
+        <source>* Version %1 not supported.</source>
+        <translation>* Version %1 understøttes ikke.</translation>
     </message>
     <message>
-        <source>* Failed to create: %1
-</source>
-        <translation>* Kunne ikke oprette: %1
-</translation>
+        <source>* Failed to create: %1</source>
+        <translation>* Kunne ikke oprette: %1</translation>
     </message>
     <message>
-        <source>JsonWizard: &quot;%1&quot; not found
-</source>
-        <translation>JsonWizard: &quot;%1&quot; ikke fundet
-</translation>
+        <source>JsonWizard: &quot;%1&quot; not found.</source>
+        <translation>JsonWizard: &quot;%1&quot; ikke fundet.</translation>
     </message>
     <message>
         <source>key not found.</source>
diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts
index 2fbbc514c4..888a8bb765 100644
--- a/share/qtcreator/translations/qtcreator_de.ts
+++ b/share/qtcreator/translations/qtcreator_de.ts
@@ -110,7 +110,7 @@
     </message>
     <message>
         <source>Frequently used signals</source>
-        <translation>Häufig benutzte Signale</translation>
+        <translation>Häufig verwendete Signale</translation>
     </message>
     <message>
         <source>Property changes</source>
@@ -140,7 +140,7 @@
         <translation>Erweitert</translation>
     </message>
     <message>
-        <source>Toggles if the smoothing is performed using linear interpolation method. Keeping it unchecked would follow non-smooth method using nearest neighbor. It is mostly applicable on image based items. </source>
+        <source>Toggles if the smoothing is performed using linear interpolation method. Keeping it unchecked would follow non-smooth method using nearest neighbor. It is mostly applicable on image based items.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7772,11 +7772,11 @@ Exporting assets: %2</source>
     </message>
     <message>
         <source>If you select this radio button, Qt Quick Designer always uses the QML emulation layer (QML Puppet) located at the following path.</source>
-        <translation>Wenn Sie diesen Radiobutton auswählen, benutzt der Qt Quick Designer immer die QML-Emulationsschicht (QML Puppet) im folgenden Pfad.</translation>
+        <translation>Wenn Sie diesen Radiobutton auswählen, verwendet der Qt Quick Designer immer die QML-Emulationsschicht (QML Puppet) im folgenden Pfad.</translation>
     </message>
     <message>
         <source>Use fallback QML emulation layer</source>
-        <translation>Fallback QML-Emulationsschicht benutzen</translation>
+        <translation>Fallback QML-Emulationsschicht verwenden</translation>
     </message>
     <message>
         <source>Path:</source>
@@ -7840,7 +7840,7 @@ Exporting assets: %2</source>
     </message>
     <message>
         <source>Warn about using .qml files instead of .ui.qml files</source>
-        <translation>Bei der Benutzung von .qml-Dateien statt .ui.qml-Dateien warnen</translation>
+        <translation>Bei der Verwendung von .qml-Dateien statt .ui.qml-Dateien warnen</translation>
     </message>
     <message>
         <source>Width:</source>
@@ -7856,7 +7856,7 @@ Exporting assets: %2</source>
     </message>
     <message>
         <source>Use QML emulation layer that is built with the selected Qt</source>
-        <translation>Mit dem gewählten Qt erstellte QML-Emulationsschicht benutzen</translation>
+        <translation>Mit dem gewählten Qt erstellte QML-Emulationsschicht verwenden</translation>
     </message>
     <message>
         <source>qsTranslate()</source>
@@ -8393,7 +8393,7 @@ Locked components cannot be modified or selected.</source>
     </message>
     <message>
         <source>Do not show this dialog again</source>
-        <translation>Diesen Dialog nicht noch einmal anzeigen</translation>
+        <translation>Diesen Dialog nicht erneut anzeigen</translation>
     </message>
     <message>
         <source>Cancel</source>
@@ -9544,7 +9544,7 @@ Locked components cannot be modified or selected.</source>
     </message>
     <message>
         <source>Edit</source>
-        <translation>Editieren</translation>
+        <translation>Bearbeiten</translation>
     </message>
     <message>
         <source>Anchors</source>
@@ -10360,7 +10360,7 @@ Locked components cannot be modified or selected.</source>
     </message>
     <message>
         <source>Retype password:</source>
-        <translation>Passwort noch einmal eingeben:</translation>
+        <translation>Passwort erneut eingeben:</translation>
     </message>
     <message>
         <source>Show password</source>
@@ -10612,23 +10612,23 @@ Locked components cannot be modified or selected.</source>
     </message>
     <message>
         <source>The selected path does not exist or is not readable.</source>
-        <translation type="unfinished"></translation>
+        <translation>Der ausgewählte Pfad existiert nicht oder ist nicht lesbar.</translation>
     </message>
     <message>
         <source>Could not find &quot;%1&quot; in the selected path.</source>
-        <translation type="unfinished"></translation>
+        <translation>&quot;%1&quot; konnte im ausgewählten Pfad nicht gefunden werden.</translation>
     </message>
     <message>
         <source>The selected path does not contain a valid JDK. (%1 failed: %2)</source>
-        <translation type="unfinished"></translation>
+        <translation>Der ausgewählte Pfad enthält kein gültiges JDK. (%1 ist fehlgeschlagen: %2)</translation>
     </message>
     <message>
         <source>Unexpected output from &quot;%1&quot;: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Unerwartete Ausgabe von &quot;%1&quot;: %2</translation>
     </message>
     <message>
         <source>Unsupported JDK version (needs to be %1): %2 (parsed: %3)</source>
-        <translation type="unfinished"></translation>
+        <translation>JDK-Version wird nicht unterstützt (muss %1 sein): %2 (erkannt: %3)</translation>
     </message>
     <message>
         <source>OpenSSL path exists.</source>
@@ -10763,7 +10763,7 @@ in the system&apos;s browser for manual download.</source>
 Diese Bibliotheken können mit Ihrer Anwendung weitergegeben werden, falls
 diese SSL-Funktionen verwendet. Sie finden eine Checkbox unter &quot;Projekte &gt; Erstellen &gt;
 Schritte zum Erstellen &gt; Android-APK erstellen &gt; Zusätzliche Bibliotheken&quot;.
-Falls das automatische Herunterladen scheitert, wird Qt Creator vorschlagen, die URL zum
+Falls das automatische Herunterladen fehlschlägt, wird Qt Creator vorschlagen, die URL zum
 manuellen Herunterladen im Browser des System zu öffnen.</translation>
     </message>
     <message>
@@ -11148,11 +11148,11 @@ Dies kann nicht rückgängig gemacht werden.</translation>
     </message>
     <message>
         <source>Package deploy: Failed to pull &quot;%1&quot; to &quot;%2&quot;.</source>
-        <translation>Paket-Deployment: &quot;pull&quot; von &quot;%1&quot; nach &quot;%2&quot; scheiterte.</translation>
+        <translation>Paket-Deployment: &quot;pull&quot; von &quot;%1&quot; nach &quot;%2&quot; ist fehlgeschlagen.</translation>
     </message>
     <message>
         <source>Install failed</source>
-        <translation>Installation gescheitert</translation>
+        <translation>Installation fehlgeschlagen</translation>
     </message>
     <message>
         <source>Android package (*.apk)</source>
@@ -11240,7 +11240,7 @@ Das Kit unterstützt &quot;%2&quot;, aber das Gerät verwendet &quot;%3&quot;.</
         <source>Deployment failed with the following errors:
 
 </source>
-        <translation>Das Deployment ist mit den folgenden Fehlern gescheitert:
+        <translation>Das Deployment ist mit den folgenden Fehlern fehlgeschlagen:
 
 </translation>
     </message>
@@ -11365,7 +11365,7 @@ Der vom Kit mindestens benötigte API-Level ist %1.</translation>
     <message>
         <source>Android package installation failed.
 %1</source>
-        <translation>Android-Paketinstallation gescheitert.
+        <translation>Android-Paketinstallation fehlgeschlagen.
 %1</translation>
     </message>
     <message>
@@ -11639,7 +11639,7 @@ Breche ausstehende Operationen ab...
     </message>
     <message>
         <source>The operation requires user interaction. Use the &quot;sdkmanager&quot; command-line tool.</source>
-        <translation>Die Operation benötigt Benutzereingaben. Benutzen Sie das Kommandozeilenwerkzeug &quot;sdkmanager&quot;.</translation>
+        <translation>Die Operation benötigt Benutzereingaben. Verwenden Sie das Kommandozeilenwerkzeug &quot;sdkmanager&quot;.</translation>
     </message>
     <message>
         <source>License command failed.</source>
@@ -12131,7 +12131,7 @@ Rufen Sie QtAndroid::hideSplashScreen() auf, um einen Startbildschirm zu verstec
     </message>
     <message>
         <source>Select master image to use.</source>
-        <translation>Wählen Sie das zu benutzende Hauptbild aus.</translation>
+        <translation>Wählen Sie das zu verwendende Hauptbild aus.</translation>
     </message>
     <message>
         <source>Master image:</source>
@@ -12181,7 +12181,7 @@ Rufen Sie QtAndroid::hideSplashScreen() auf, um einen Startbildschirm zu verstec
         <source>An image is used for the splashscreen. Qt Creator manages
 splashscreen by using a different method which requires changing
 the manifest file by overriding your settings. Allow override?</source>
-        <translation>Für den Startbildschirm wird ein Bild benutzt. Qt Creator verwaltet
+        <translation>Für den Startbildschirm wird ein Bild verwendet. Qt Creator verwaltet
 Startbildschirme auf andere Weise, was eine Änderung der Manifest-Datei
 und das Überschreiben Ihrer Einstellungen erfordert. Das Überschreiben erlauben?</translation>
     </message>
@@ -12294,7 +12294,7 @@ und das Überschreiben Ihrer Einstellungen erfordert. Das Überschreiben erlaube
     </message>
     <message>
         <source>Using: %1.</source>
-        <translation>Benutze: %1.</translation>
+        <translation>Verwende: %1.</translation>
     </message>
     <message>
         <source>Cannot debug: Only QML and native applications are supported.</source>
@@ -12353,7 +12353,7 @@ und das Überschreiben Ihrer Einstellungen erfordert. Das Überschreiben erlaube
     </message>
     <message>
         <source>Number of worker threads used when scanning for tests.</source>
-        <translation>Anzahl der Threads, die zum Suchen nach Tests benutzt werden.</translation>
+        <translation>Anzahl der Threads, die zum Suchen nach Tests verwendet werden.</translation>
     </message>
     <message>
         <source>Omit run configuration warnings</source>
@@ -12365,7 +12365,7 @@ und das Überschreiben Ihrer Einstellungen erfordert. Das Überschreiben erlaube
     </message>
     <message>
         <source>Limit result description:</source>
-        <translation>Beschreibung der Resultate begrenzen:</translation>
+        <translation>Beschreibung der Ergebnisse begrenzen:</translation>
     </message>
     <message>
         <source>Limit number of lines shown in test result tooltip and description.</source>
@@ -12397,7 +12397,7 @@ und das Überschreiben Ihrer Einstellungen erfordert. Das Überschreiben erlaube
     </message>
     <message>
         <source>Timeout used when executing each test case.</source>
-        <translation>Zeitlimit für jeden Testfall benutzen.</translation>
+        <translation>Zeitlimit, das während der Ausführung für jeden Testfall verwendet wird.</translation>
     </message>
     <message>
         <source>Scan threads:</source>
@@ -12483,7 +12483,7 @@ Warnung: Dies ist eine experimentelle Funktion und könnte dazu führen, dass di
     </message>
     <message>
         <source>Only for unsuccessful test runs</source>
-        <translation>Nur bei gescheiterten Tests</translation>
+        <translation>Nur bei fehlgeschlagenen Tests</translation>
     </message>
     <message>
         <source>Automatically run</source>
@@ -12617,7 +12617,7 @@ Warnung: Dies ist eine experimentelle Funktion und könnte dazu führen, dass di
         <source>Running tests failed.
  %1
 Executable: %2</source>
-        <translation>Ausführung von Tests gescheitert.
+        <translation>Ausführung von Tests fehlgeschlagen.
  %1
 Ausführbare Datei: %2</translation>
     </message>
@@ -12659,7 +12659,7 @@ Ausführbare Datei: %2</translation>
     </message>
     <message>
         <source>Expected Fail</source>
-        <translation>Erwartetes Scheitern</translation>
+        <translation>Erwartetes Fehlschlagen</translation>
     </message>
     <message>
         <source>Unexpected Pass</source>
@@ -12873,7 +12873,7 @@ Dies könnte Probleme während der Ausführung verursachen.
     </message>
     <message>
         <source>Unable to display test results when using CDB.</source>
-        <translation>Wenn CDB benutzt wird, können keine Testergebnisse angezeigt werden.</translation>
+        <translation>Wenn CDB verwendet wird, können keine Testergebnisse angezeigt werden.</translation>
     </message>
     <message>
         <source>Build failed. Canceling test run.</source>
@@ -12929,11 +12929,11 @@ Dies könnte Probleme während der Ausführung verursachen.
     </message>
     <message>
         <source>Number of resamples used for statistical bootstrapping.</source>
-        <translation>Anzahl der für statistisches Bootstrapping benutzten Resamples.</translation>
+        <translation>Anzahl der für statistisches Bootstrapping verwendeten Resamples.</translation>
     </message>
     <message>
         <source>Confidence interval used for statistical bootstrapping.</source>
-        <translation>Für das statistische Bootstrapping benutzte Konfidenzinterval.</translation>
+        <translation>Konfidenzinterval, das für statistisches Bootstrapping verwendet wird.</translation>
     </message>
     <message>
         <source>Benchmark confidence interval</source>
@@ -13125,7 +13125,7 @@ Dies könnte Probleme während der Ausführung verursachen.
     </message>
     <message>
         <source>A seed of 0 means no randomization. A value of 1 uses the current time, any other value is used as random seed generator.</source>
-        <translation>Ein Startwert von 0 bedeutet keine Randomisierung. Ein Wert von 1 benutzt die aktuelle Zeit, jeder andere Wert wird als Startwert für Zufallszahlen benutzt.</translation>
+        <translation>Ein Startwert von 0 bedeutet keine Randomisierung. Ein Wert von 1 verwendet die aktuelle Zeit, jeder andere Wert wird als Startwert für Zufallszahlen verwendet.</translation>
     </message>
     <message>
         <source>Randomize</source>
@@ -13247,7 +13247,7 @@ Weitere Informationen über GTest-Filter finden Sie in der Dokumenation von Goog
     </message>
     <message>
         <source>Uses tick counter when executing benchmarks.</source>
-        <translation>Den Tickzähler bei der Benchmarkausführung benutzen.</translation>
+        <translation>Den Tickzähler bei der Benchmarkausführung verwenden.</translation>
     </message>
     <message>
         <source>Tick counter</source>
@@ -13255,7 +13255,7 @@ Weitere Informationen über GTest-Filter finden Sie in der Dokumenation von Goog
     </message>
     <message>
         <source>Uses event counter when executing benchmarks.</source>
-        <translation>Ereigniszähler bei der Benchmarkausführung benutzen.</translation>
+        <translation>Ereigniszähler bei der Benchmarkausführung verwenden.</translation>
     </message>
     <message>
         <source>Event counter</source>
@@ -13263,15 +13263,15 @@ Weitere Informationen über GTest-Filter finden Sie in der Dokumenation von Goog
     </message>
     <message>
         <source>Uses Valgrind Callgrind when executing benchmarks (it must be installed).</source>
-        <translation>&quot;Valgrind Callgrind&quot; zur Benchmarkausführung benutzen (dazu muss es installiert sein).</translation>
+        <translation>&quot;Valgrind Callgrind&quot; zur Benchmarkausführung verwenden (dazu muss es installiert sein).</translation>
     </message>
     <message>
         <source>Find user-defined locations</source>
-        <translation type="unfinished"></translation>
+        <translation>Benutzerdefinierte Positionen finden</translation>
     </message>
     <message>
         <source>Parse messages for the following pattern and use it as location information:&lt;pre&gt;file://filepath:line&lt;/pre&gt;where &quot;:line&quot; is optional.&lt;p&gt;Warning: If the patterns are used in code, the location information for debug messages and other messages might improve,at the risk of some incorrect locations and lower performance.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wertet Nachrichten nach den folgenden Mustern aus und verwendet sie als Positionsinformation:&lt;pre&gt;file://dateipfad:zeile&lt;/pre&gt;wobei &quot;:zeile&quot; optional ist.&lt;p&gt;Achtung: Wenn diese Muster im Code verwendet werden, können sich die Positionsinformationen für Debug- und andere Nachrichten verbessern, es besteht aber die Gefahr falscher Positionen und verringerter Leistung.</translation>
     </message>
     <message>
         <source>Callgrind</source>
@@ -13279,7 +13279,7 @@ Weitere Informationen über GTest-Filter finden Sie in der Dokumenation von Goog
     </message>
     <message>
         <source>Uses Perf when executing benchmarks (it must be installed).</source>
-        <translation>&quot;Perf&quot; zur Benchmarkausführung benutzen (dazu muss es installiert sein).</translation>
+        <translation>&quot;Perf&quot; zur Benchmarkausführung verwenden (dazu muss es installiert sein).</translation>
     </message>
     <message>
         <source>Perf</source>
@@ -13387,7 +13387,7 @@ Weitere Informationen über GTest-Filter finden Sie in der Dokumenation von Goog
     </message>
     <message>
         <source>Run Test Under Cursor</source>
-        <translation>Test unter Cursor ausführen</translation>
+        <translation>Test unter Einfügemarke ausführen</translation>
     </message>
     <message>
         <source>&amp;Run Test</source>
@@ -13636,11 +13636,11 @@ Siehe auch die Einstellungen für Google Test.</translation>
     </message>
     <message>
         <source>Locate Qt Test data tags</source>
-        <translation type="unfinished"></translation>
+        <translation>Qt Test Data Tags finden</translation>
     </message>
     <message>
         <source>Locates Qt Test data tags found inside the active project.</source>
-        <translation type="unfinished"></translation>
+        <translation>Findet Qt Test Data Tags im aktiven Projekt.</translation>
     </message>
 </context>
 <context>
@@ -14038,7 +14038,7 @@ Wollen Sie &quot;%1&quot; mit der Standardanwendung öffnen?</translation>
     </message>
     <message>
         <source>Use GDB target extended-remote</source>
-        <translation>GDB &quot;target extended-remote&quot; benutzen</translation>
+        <translation>GDB &quot;target extended-remote&quot; verwenden</translation>
     </message>
     <message>
         <source>Extended mode:</source>
@@ -14101,13 +14101,13 @@ Wollen Sie &quot;%1&quot; mit der Standardanwendung öffnen?</translation>
         <source>GDB compatible provider engine
 (used together with the GDB debuggers).</source>
         <translation>GDB-kompatible Provider-Engine
-(wird zusammen mit GDB-Debuggern benutzt).</translation>
+(wird zusammen mit GDB-Debuggern verwendet).</translation>
     </message>
     <message>
         <source>UVSC compatible provider engine
 (used together with the KEIL uVision).</source>
         <translation>UVSC-kompatible Provider-Engine
-(wird zusammen mit KEIL uVision benutzt).</translation>
+(wird zusammen mit KEIL uVision verwendet).</translation>
     </message>
     <message>
         <source>Name</source>
@@ -14127,7 +14127,7 @@ Wollen Sie &quot;%1&quot; mit der Standardanwendung öffnen?</translation>
     </message>
     <message>
         <source>The following providers were already configured:&lt;br&gt;&amp;nbsp;%1&lt;br&gt;They were not configured again.</source>
-        <translation>Die folgenden Provider wurden bereits konfiguriert:&lt;br&gt;&amp;nbsp;%1&lt;br&gt;Sie wurden nicht noch einmal konfiguriert.</translation>
+        <translation>Die folgenden Provider wurden bereits konfiguriert:&lt;br&gt;&amp;nbsp;%1&lt;br&gt;Sie wurden nicht erneut konfiguriert.</translation>
     </message>
     <message>
         <source>Add</source>
@@ -14199,7 +14199,7 @@ Wollen Sie &quot;%1&quot; mit der Standardanwendung öffnen?</translation>
     </message>
     <message>
         <source>Do not use EBlink flash cache.</source>
-        <translation>EBlink-Flash-Cache nicht benutzen.</translation>
+        <translation>EBlink-Flash-Cache nicht verwenden.</translation>
     </message>
     <message>
         <source>Disable cache:</source>
@@ -14636,15 +14636,15 @@ Lokale Commits werden nicht zum Master-Branch gepusht, bis ein normaler Commit e
     </message>
     <message>
         <source>User</source>
-        <translation>Nutzer</translation>
+        <translation>Benutzer</translation>
     </message>
     <message>
         <source>Username to use by default on commit.</source>
-        <translation>Nutzername für Commit.</translation>
+        <translation>Benutzername für Commit.</translation>
     </message>
     <message>
         <source>Default username:</source>
-        <translation>Vorgabe für Nutzernamen:</translation>
+        <translation>Vorgabe für Benutzernamen:</translation>
     </message>
     <message>
         <source>Email to use by default on commit.</source>
@@ -15559,7 +15559,7 @@ Zum Beispiel bewirkt die Angabe &quot;Revision: 15&quot; dass der Branch auf Rev
     </message>
     <message>
         <source>Enter one CMake &lt;a href=&quot;variable&quot;&gt;variable&lt;/a&gt; per line.&lt;br/&gt;To set or change a variable, use -D&amp;lt;variable&amp;gt;:&amp;lt;type&amp;gt;=&amp;lt;value&amp;gt;.&lt;br/&gt;&amp;lt;type&amp;gt; can have one of the following values: FILEPATH, PATH, BOOL, INTERNAL, or STRING.&lt;br/&gt;To unset a variable, use -U&amp;lt;variable&amp;gt;.&lt;br/&gt;</source>
-        <translation>Geben Sie eine CMake-&lt;a href=&quot;variable&quot;&gt;Variable&lt;/a&gt; pro Zeile ein.&lt;br/&gt;Um eine Variable zu setzen oder zu ändern, benutzen Sie -D&amp;lt;Variable&amp;gt;:&amp;lt;Typ&amp;gt;=&amp;lt;Wert&amp;gt;.&lt;br/&gt;&amp;lt;Typ&amp;gt; kann einer der folgenden Werte sein: FILEPATH, PATH, BOOL, INTERNAL oder STRING.&lt;br/&gt;Um eine Variable zurückzusetzen, benutzen Sie -U&amp;lt;Variable&amp;gt;.&lt;br/&gt;</translation>
+        <translation>Geben Sie eine CMake-&lt;a href=&quot;variable&quot;&gt;Variable&lt;/a&gt; pro Zeile ein.&lt;br/&gt;Um eine Variable zu setzen oder zu ändern, verwenden Sie -D&amp;lt;Variable&amp;gt;:&amp;lt;Typ&amp;gt;=&amp;lt;Wert&amp;gt;.&lt;br/&gt;&amp;lt;Typ&amp;gt; kann einer der folgenden Werte sein: FILEPATH, PATH, BOOL, INTERNAL oder STRING.&lt;br/&gt;Um eine Variable zurückzusetzen, verwenden Sie -U&amp;lt;Variable&amp;gt;.&lt;br/&gt;</translation>
     </message>
     <message>
         <source>Re-configure with Initial Parameters</source>
@@ -15967,7 +15967,7 @@ Zum Beispiel bewirkt die Angabe &quot;Revision: 15&quot; dass der Branch auf Rev
     </message>
     <message>
         <source>Show subfolders inside source group folders</source>
-        <translation>Unterverzeichnisse in Sourcegruppen anzeigen</translation>
+        <translation>Unterverzeichnisse in Quelltext-Gruppenverzeichnissen anzeigen</translation>
     </message>
     <message>
         <source>Show advanced options by default</source>
@@ -15975,11 +15975,11 @@ Zum Beispiel bewirkt die Angabe &quot;Revision: 15&quot; dass der Branch auf Rev
     </message>
     <message>
         <source>Use junctions for CMake configuration and build operations</source>
-        <translation type="unfinished"></translation>
+        <translation>Junctions für die CMake-Konfiguration und das Erstellen verwenden</translation>
     </message>
     <message>
         <source>Create and use junctions for the source and build directories to overcome issues with long paths on Windows.&lt;br&gt;&lt;br&gt;Junctions are stored under &lt;tt&gt;C:\ProgramData\QtCreator\Links&lt;/tt&gt; (overridable via the &lt;tt&gt;QTC_CMAKE_JUNCTIONS_DIR&lt;/tt&gt; environment variable).&lt;br&gt;&lt;br&gt;With &lt;tt&gt;QTC_CMAKE_JUNCTIONS_HASH_LENGTH&lt;/tt&gt;, you can shorten the MD5 hash key length to a value smaller than the default length value of 32.&lt;br&gt;&lt;br&gt;Junctions are used for CMake configure, build and install operations.</source>
-        <translation type="unfinished"></translation>
+        <translation>Erstellt und verwendet Junctions für die Quell- und Build-Verzeichnisse, um Probleme mit langen Pfaden auf Windows zu umgehen.&lt;br&gt;&lt;br&gt;Junctions werden unter &lt;tt&gt;C:\ProgramData\QtCreator\Links&lt;/tt&gt; gespeichert (überschreibbar mit der Umgebungsvariable &lt;tt&gt;QTC_CMAKE_JUNCTIONS_DIR&lt;/tt&gt;).&lt;br&gt;&lt;br&gt;Sie können mit der Umgebungsvariable &lt;tt&gt;QTC_CMAKE_JUNCTIONS_HASH_LENGTH&lt;/tt&gt; die Länge des MD5-Hashschlüssels auf einen kleineren Wert als die Voreinstellung 32 verkürzen.&lt;br&gt;&lt;br&gt;Junctions werden für das Konfigurieren mit CMake, das Erstellen und die Installation verwendet.</translation>
     </message>
     <message>
         <source>General</source>
@@ -16119,7 +16119,7 @@ Zum Beispiel bewirkt die Angabe &quot;Revision: 15&quot; dass der Branch auf Rev
     </message>
     <message>
         <source>&lt;Use Default Generator&gt;</source>
-        <translation>&lt;Benutze Standardgenerator&gt;</translation>
+        <translation>&lt;Verwende Standardgenerator&gt;</translation>
     </message>
     <message>
         <source>Generator: %1&lt;br&gt;Extra generator: %2</source>
@@ -16147,7 +16147,7 @@ Zum Beispiel bewirkt die Angabe &quot;Revision: 15&quot; dass der Branch auf Rev
     </message>
     <message>
         <source>Enter one CMake &lt;a href=&quot;variable&quot;&gt;variable&lt;/a&gt; per line.&lt;br/&gt;To set a variable, use -D&amp;lt;variable&amp;gt;:&amp;lt;type&amp;gt;=&amp;lt;value&amp;gt;.&lt;br/&gt;&amp;lt;type&amp;gt; can have one of the following values: FILEPATH, PATH, BOOL, INTERNAL, or STRING.</source>
-        <translation>Geben Sie eine CMake-&lt;a href=&quot;variable&quot;&gt;Variable&lt;/a&gt; pro Zeile ein.&lt;br/&gt;Um eine Variable zu setzen, benutzen Sie -D&amp;lt;Variable&amp;gt;:&amp;lt;Typ&amp;gt;=&amp;lt;Wert&amp;gt;.&lt;br/&gt;&amp;lt;Typ&amp;gt; kann einer der folgenden Werte sein: FILEPATH, PATH, BOOL, INTERNAL oder STRING.</translation>
+        <translation>Geben Sie eine CMake-&lt;a href=&quot;variable&quot;&gt;Variable&lt;/a&gt; pro Zeile ein.&lt;br/&gt;Um eine Variable zu setzen, verwenden Sie -D&amp;lt;Variable&amp;gt;:&amp;lt;Typ&amp;gt;=&amp;lt;Wert&amp;gt;.&lt;br/&gt;&amp;lt;Typ&amp;gt; kann einer der folgenden Werte sein: FILEPATH, PATH, BOOL, INTERNAL oder STRING.</translation>
     </message>
     <message>
         <source>CMake Configuration</source>
@@ -16942,8 +16942,8 @@ Stellen Sie sicher, dass der Wert der CMAKE_BUILD_TYPE-Variable derselbe wie der
         <translation>Aktuelle ClangFormat-Version: %1.</translation>
     </message>
     <message>
-        <source>Warning: </source>
-        <translation>Warnung: </translation>
+        <source>Warning:</source>
+        <translation>Warnung:</translation>
     </message>
     <message>
         <source>The current ClangFormat (C++ &gt; Code Style &gt; ClangFormat) settings are not valid. Are you sure you want to apply them?</source>
@@ -16981,7 +16981,7 @@ Das integrierte Codemodell übernimmt das Einrücken.</translation>
     </message>
     <message>
         <source>Use built-in indenter</source>
-        <translation>Integriertes Codemodell für das Einrücken benutzen</translation>
+        <translation>Integriertes Codemodell für das Einrücken verwenden</translation>
     </message>
     <message>
         <source>Use global settings</source>
@@ -16989,7 +16989,7 @@ Das integrierte Codemodell übernimmt das Einrücken.</translation>
     </message>
     <message>
         <source>Please note that the current project includes a .clang-format file, which will be used for code indenting and formatting.</source>
-        <translation>Beachten Sie, dass das aktuelle Projekt eine .clang-format-Datei enthält, welche für das Einrücken und die Formatierung von Code benutzt werden wird.</translation>
+        <translation>Beachten Sie, dass das aktuelle Projekt eine .clang-format-Datei enthält, welche für das Einrücken und die Formatierung von Code verwendet werden wird.</translation>
     </message>
     <message>
         <source>ClangFormat settings:</source>
@@ -17009,7 +17009,7 @@ Das integrierte Codemodell übernimmt das Einrücken.</translation>
     </message>
     <message>
         <source>When this option is enabled, ClangFormat will use a user-specified configuration from the widget below, instead of the project .clang-format file. You can customize the formatting options for your code by adjusting the settings in the widget. Note that any changes made there will only affect the current configuration, and will not modify the project .clang-format file.</source>
-        <translation>Wenn diese Einstellung aktiviert ist, wird statt der .clang-format-Datei des Projekts die benutzerdefinierte Einstellung unten benutzt. Beachten Sie, dass die unten durchgeführten Einstellungen nur die aktuelle Konfiguration beeinflussen und die .clang-format-Datei des Projekts nicht verändert wird.</translation>
+        <translation>Wenn diese Einstellung aktiviert ist, wird statt der .clang-format-Datei des Projekts die benutzerdefinierte Einstellung unten verwendet. Beachten Sie, dass die unten durchgeführten Einstellungen nur die aktuelle Konfiguration beeinflussen und die .clang-format-Datei des Projekts nicht verändert wird.</translation>
     </message>
     <message>
         <source>ClangFormat</source>
@@ -17266,7 +17266,7 @@ Setzen Sie erst eine gültige ausführbare Datei.</translation>
     </message>
     <message>
         <source>Clang-Tidy and Clazy use a customized Clang executable from the Clang project to search for diagnostics.</source>
-        <translation>Clang-Tidy und Clazy benutzen eine angepasste Version der Anwendung Clang vom Clang-Projekt, um nach Problemen zu suchen.</translation>
+        <translation>Clang-Tidy und Clazy verwenden eine angepasste Version der Anwendung Clang vom Clang-Projekt, um nach Problemen zu suchen.</translation>
     </message>
     <message>
         <source>Release</source>
@@ -17278,11 +17278,11 @@ Setzen Sie erst eine gültige ausführbare Datei.</translation>
     </message>
     <message>
         <source>You are trying to run the tool &quot;%1&quot; on an application in %2 mode. The tool is designed to be used in Debug mode since enabled assertions can reduce the number of false positives.</source>
-        <translation>Sie versuchen das Werkzeug &quot;%1&quot; auf eine Applikation im %2-Modus anzuwenden. Das Werkzeug sollte im Debug-Modus benutzt werden, da eingeschaltete Assertions die Zahl der False-Positives verringern können.</translation>
+        <translation>Sie versuchen das Werkzeug &quot;%1&quot; auf eine Applikation im %2-Modus anzuwenden. Das Werkzeug sollte im Debug-Modus verwendet werden, da eingeschaltete Assertions die Zahl der False-Positives verringern können.</translation>
     </message>
     <message>
         <source>Do you want to continue and run the tool in %1 mode?</source>
-        <translation>Wollen Sie fortfahren und das Werkzeug im %1-Modus benutzen?</translation>
+        <translation>Wollen Sie fortfahren und das Werkzeug im %1-Modus verwenden?</translation>
     </message>
     <message>
         <source>Analyze Project with %1...</source>
@@ -17338,7 +17338,7 @@ Setzen Sie erst eine gültige ausführbare Datei.</translation>
     </message>
     <message>
         <source>Failed to start the analyzer.</source>
-        <translation>Das Analyse-Werkzeug konnte nicht gestartet werden.</translation>
+        <translation>Das Analysewerkzeug konnte nicht gestartet werden.</translation>
     </message>
     <message>
         <source>All Files</source>
@@ -18261,11 +18261,11 @@ Setzen Sie erst eine gültige ausführbare Datei.</translation>
     </message>
     <message>
         <source>&amp;Username:</source>
-        <translation>&amp;Nutzername:</translation>
+        <translation>&amp;Benutzername:</translation>
     </message>
     <message>
         <source>&lt;Username&gt;</source>
-        <translation>&lt;Nutzername&gt;</translation>
+        <translation>&lt;Benutzername&gt;</translation>
     </message>
     <message>
         <source>&amp;Description:</source>
@@ -18293,7 +18293,7 @@ Setzen Sie erst eine gültige ausführbare Datei.</translation>
     </message>
     <message>
         <source>Username:</source>
-        <translation>Nutzername:</translation>
+        <translation>Benutzername:</translation>
     </message>
     <message>
         <source>Default protocol:</source>
@@ -18331,7 +18331,7 @@ Setzen Sie erst eine gültige ausführbare Datei.</translation>
     </message>
     <message>
         <source>Reset used libraries</source>
-        <translation>Benutzte Bibliotheken zurücksetzen</translation>
+        <translation>Verwendete Bibliotheken zurücksetzen</translation>
     </message>
     <message>
         <source>No libraries selected</source>
@@ -18371,7 +18371,7 @@ Setzen Sie erst eine gültige ausführbare Datei.</translation>
     </message>
     <message>
         <source>No source code added yet. Add some using the button below.</source>
-        <translation>Es wurde noch kein Quelltext hinzugefügt. Benutzen Sie die Schaltfläche unten, um einen Code-Editor hinzuzufügen.</translation>
+        <translation>Es wurde noch kein Quelltext hinzugefügt. Verwenden Sie die Schaltfläche unten, um einen Code-Editor hinzuzufügen.</translation>
     </message>
     <message>
         <source>Add Source</source>
@@ -18447,7 +18447,7 @@ Setzen Sie erst eine gültige ausführbare Datei.</translation>
     </message>
     <message>
         <source>URL of the Compiler Explorer instance to use.</source>
-        <translation>URL der zu benutzenden Compiler Explorer-Instanz.</translation>
+        <translation>URL der zu verwendenden Compiler Explorer-Instanz.</translation>
     </message>
 </context>
 <context>
@@ -18532,7 +18532,7 @@ Ansonsten müssen Sie den Pfad zur Datei %2 aus dem Copilot-Plugin für Neovim a
     </message>
     <message>
         <source>Request Copilot suggestion at the current editor&apos;s cursor position.</source>
-        <translation>Fordert Vorschläge für die Cursorposition des aktuellen Editors von Copilot an.</translation>
+        <translation>Fordert Vorschläge für die Einfügemarke des aktuellen Editors von Copilot an.</translation>
     </message>
     <message>
         <source>Show Next Copilot Suggestion</source>
@@ -18580,7 +18580,7 @@ Ansonsten müssen Sie den Pfad zur Datei %2 aus dem Copilot-Plugin für Neovim a
     </message>
     <message>
         <source>Do not ask again. This will disable Copilot for now.</source>
-        <translation>Nicht noch einmal nachfragen. Dies deaktiviert Copilot.</translation>
+        <translation>Nicht erneut nachfragen. Dies deaktiviert Copilot.</translation>
     </message>
     <message>
         <source>Enables the Copilot integration.</source>
@@ -18710,7 +18710,7 @@ Ansonsten müssen Sie den Pfad zur Datei %2 aus dem Copilot-Plugin für Neovim a
     </message>
     <message>
         <source>Automatically request suggestions for the current text cursor position after changes to the document.</source>
-        <translation>Fordert Vorschläge für die aktuelle Cursorposition nach Änderungen am Dokument automatisch an.</translation>
+        <translation>Fordert Vorschläge für die aktuelle Einfügemarke nach Änderungen am Dokument automatisch an.</translation>
     </message>
 </context>
 <context>
@@ -18845,7 +18845,7 @@ Trotzdem fortfahren?</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation>Editieren</translation>
+        <translation>Bearbeiten</translation>
     </message>
     <message>
         <source>&lt;System Language&gt;</source>
@@ -18861,12 +18861,13 @@ Trotzdem fortfahren?</translation>
     </message>
     <message>
         <source>Override cursors for views</source>
-        <translation type="unfinished"></translation>
+        <translation>Mauszeiger für Ansichten überschreiben</translation>
     </message>
     <message>
         <source>Provide cursors for resizing views.
 If the system cursors for resizing views are not displayed properly, you can use the cursors provided by %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Verwendet separate Mauszeiger für das Verändern der Größe von Ansichten.
+Wenn die Systemzeiger für das Verändern der Größe von Ansichten nicht korrekt dargestellt werden, können von %1 bereitgestellte Zeiger verwendet werden.</translation>
     </message>
     <message>
         <source>Toolbar style:</source>
@@ -18898,11 +18899,11 @@ If the system cursors for resizing views are not displayed properly, you can use
     </message>
     <message>
         <source>The following environment variables are set and can influence the UI scaling behavior of %1:</source>
-        <translation type="unfinished"></translation>
+        <translation>Die folgenden Umgebungsvariablen sind gesetzt und können das Skalierungsverhalten der Benutzeroberfläche von %1 beeinflussen:</translation>
     </message>
     <message>
         <source>Environment influences UI scaling behavior.</source>
-        <translation type="unfinished"></translation>
+        <translation>Die Umgebung beeinflusst das Skalierungsverhalten der Benutzeroberfläche.</translation>
     </message>
     <message>
         <source>Text codec for tools:</source>
@@ -18960,7 +18961,7 @@ If the system cursors for resizing views are not displayed properly, you can use
     </message>
     <message>
         <source>Re-enable warnings that were suppressed by selecting &quot;Do Not Show Again&quot; (for example, missing highlighter).</source>
-        <translation>Alle Warnungen wieder aktivieren, die durch &quot;Nicht noch einmal anzeigen&quot; unterdrückt wurden (zum Beispiel fehlende Syntaxhervorhebung).</translation>
+        <translation>Alle Warnungen wieder aktivieren, die durch &quot;Nicht erneut anzeigen&quot; unterdrückt wurden (zum Beispiel fehlende Syntaxhervorhebung).</translation>
     </message>
     <message>
         <source>Theme:</source>
@@ -19124,7 +19125,7 @@ If the system cursors for resizing views are not displayed properly, you can use
     </message>
     <message>
         <source>&lt;p&gt;Qt Creator developers can be reached at the Qt Creator mailing list:&lt;/p&gt;%1&lt;p&gt;or the #qt-creator channel on Libera.Chat IRC:&lt;/p&gt;%2&lt;p&gt;Our bug tracker is located at %3.&lt;/p&gt;&lt;p&gt;Please use %4 for bigger chunks of text.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Sie können die Qt Creator-Entwickler auf dem E-Mail-Verteiler&lt;/p&gt;%1&lt;p&gt;oder dem IRC Kanal #qt-creator auf Libera.Chat&lt;/p&gt;%2&lt;p&gt;erreichen. Unseren Bugtracker finden Sie unter %3.&lt;/p&gt;&lt;p&gt;Bitte benutzen Sie %4 für längere Texte.&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;Sie können die Qt Creator-Entwickler auf dem E-Mail-Verteiler&lt;/p&gt;%1&lt;p&gt;oder dem IRC Kanal #qt-creator auf Libera.Chat&lt;/p&gt;%2&lt;p&gt;erreichen. Unseren Bugtracker finden Sie unter %3.&lt;/p&gt;&lt;p&gt;Bitte verwenden Sie %4 für längere Texte.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Minimize</source>
@@ -19148,7 +19149,7 @@ If the system cursors for resizing views are not displayed properly, you can use
     </message>
     <message>
         <source>This will hide the menu bar completely. You can show it again by typing %1.&lt;br&gt;&lt;br&gt;Or, trigger the &quot;%2&quot; action from the &quot;%3&quot; locator filter (%4).</source>
-        <translation type="unfinished"></translation>
+        <translation>Dies versteckt die Menüleiste vollständig. Sie können sie mit der Tastenkombination %1 wieder anzeigen.&lt;br&gt;&lt;br&gt;Oder führen Sie die Aktion &quot;%2&quot; über den Locator-Filter &quot;%3&quot; aus (%4).</translation>
     </message>
     <message>
         <source>Change Log...</source>
@@ -19471,7 +19472,7 @@ If the system cursors for resizing views are not displayed properly, you can use
     </message>
     <message>
         <source>Copy and Close</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopieren und schließen</translation>
     </message>
     <message>
         <source>&lt;br/&gt;From revision %1&lt;br/&gt;</source>
@@ -20260,7 +20261,7 @@ konnte nicht unter Versionsverwaltung (%2) gestellt werden
     </message>
     <message>
         <source>Locates files from a custom set of directories. Append &quot;+&lt;number&gt;&quot; or &quot;:&lt;number&gt;&quot; to jump to the given line number. Append another &quot;+&lt;number&gt;&quot; or &quot;:&lt;number&gt;&quot; to jump to the column number as well.</source>
-        <translation>Findet Dateien aus vom Benutzer gewählten Pfaden. Fügen Sie &quot;+&lt;Zahl&gt;&quot; oder &quot;:&lt;Zahl&gt;&quot; an, um zur angegebenen Zeile zu springen. Fügen Sie noch einmal &quot;+&lt;Zahl&gt;&quot; oder &quot;:&lt;Zahl&gt;&quot; an, um auch zur angegebenen Spalte zu springen.</translation>
+        <translation>Findet Dateien aus vom Benutzer gewählten Pfaden. Fügen Sie &quot;+&lt;Zahl&gt;&quot; oder &quot;:&lt;Zahl&gt;&quot; an, um zur angegebenen Zeile zu springen. Fügen Sie erneut &quot;+&lt;Zahl&gt;&quot; oder &quot;:&lt;Zahl&gt;&quot; an, um auch zur angegebenen Spalte zu springen.</translation>
     </message>
     <message>
         <source>Add...</source>
@@ -20349,7 +20350,7 @@ konnte nicht unter Versionsverwaltung (%2) gestellt werden
     </message>
     <message>
         <source>Use re&amp;gular expressions</source>
-        <translation>Benutze &amp;reguläre Ausdrücke</translation>
+        <translation>Verwende &amp;reguläre Ausdrücke</translation>
     </message>
     <message>
         <source>Sco&amp;pe:</source>
@@ -20395,11 +20396,11 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeiche
     </message>
     <message>
         <source>Cannot Create File</source>
-        <translation type="unfinished"></translation>
+        <translation>Datei konnte nicht erstellt werden</translation>
     </message>
     <message>
         <source>Cannot create file &quot;%1&quot;.</source>
-        <translation type="unfinished"></translation>
+        <translation>Die Datei &quot;%1&quot; konnte nicht erstellt werden.</translation>
     </message>
     <message>
         <source>Create Directory</source>
@@ -20587,7 +20588,7 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeiche
     </message>
     <message>
         <source>&amp;Search Again</source>
-        <translation>Noch einmal &amp;suchen</translation>
+        <translation>Erneut &amp;suchen</translation>
     </message>
     <message>
         <source>Repla&amp;ce with:</source>
@@ -20649,11 +20650,11 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeiche
     </message>
     <message>
         <source>Show Paths in Relation to Active Project</source>
-        <translation type="unfinished"></translation>
+        <translation>Pfade in Bezug auf das aktive Projekt anzeigen</translation>
     </message>
     <message>
         <source>Filter Results</source>
-        <translation>Resultate filtern</translation>
+        <translation>Ergebnisse filtern</translation>
     </message>
     <message>
         <source>%1 %2</source>
@@ -20665,7 +20666,7 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeiche
     </message>
     <message>
         <source>Show Full Paths</source>
-        <translation type="unfinished"></translation>
+        <translation>Vollständigen Pfad anzeigen</translation>
     </message>
     <message>
         <source>Search Results</source>
@@ -20735,7 +20736,7 @@ Möchten Sie es beenden?</translation>
     </message>
     <message>
         <source>Include the filter when not using a prefix for searches.</source>
-        <translation>Diesen Filter einschließen, wenn kein Präfix benutzt wird.</translation>
+        <translation>Diesen Filter einschließen, wenn kein Präfix verwendet wird.</translation>
     </message>
     <message>
         <source>Prefix:</source>
@@ -20833,11 +20834,11 @@ Möchten Sie es beenden?</translation>
     </message>
     <message>
         <source>Proxy Authentication Required</source>
-        <translation type="unfinished"></translation>
+        <translation>Proxy-Authentifizierung erforderlich</translation>
     </message>
     <message>
         <source>Do not ask again.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nicht erneut nachfragen.</translation>
     </message>
     <message>
         <source>No themes found in installation.</source>
@@ -20921,7 +20922,7 @@ Möchten Sie es beenden?</translation>
     </message>
     <message>
         <source>Convert string to pure ASCII.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeichenkette in reines ASCII umwandeln.</translation>
     </message>
     <message>
         <source>Create Folder</source>
@@ -20969,7 +20970,7 @@ Sie werden wahrscheinlich auf weitere Probleme mit dieser Instanz von %3 stoßen
     </message>
     <message>
         <source>%1 uses Google Crashpad for collecting crashes and sending them to our backend for processing. Crashpad may capture arbitrary contents from crashed process’ memory, including user sensitive information, URLs, and whatever other content users have trusted %1 with. The collected crash reports are however only used for the sole purpose of fixing bugs.</source>
-        <translation>%1 nutzt Google Crashpad, um Absturzberichte zu sammeln und diese zur Verarbeitung an unsere Server zu senden. Crashpad kann beliebige Inhalte des Speichers des abgestürzten Prozesses erfassen. Dies beinhaltet persönliche Daten, URLs und welche Inhalte auch immer der Nutzer %1 anvertraut hat. Die gesammelten Absturzberichte werden allerdings nur zum Zweck der Fehlerbehebung genutzt.</translation>
+        <translation>%1 nutzt Google Crashpad, um Absturzberichte zu sammeln und diese zur Verarbeitung an unsere Server zu senden. Crashpad kann beliebige Inhalte des Speichers des abgestürzten Prozesses erfassen. Dies beinhaltet persönliche Daten, URLs und welche Inhalte auch immer der Benutzer %1 anvertraut hat. Die gesammelten Absturzberichte werden allerdings nur zum Zweck der Fehlerbehebung genutzt.</translation>
     </message>
     <message>
         <source>More information:</source>
@@ -21598,7 +21599,7 @@ provided they were unmodified before the refactoring.</source>
     </message>
     <message>
         <source>Locates files from a global file system index (Spotlight, Locate, Everything). Append &quot;+&lt;number&gt;&quot; or &quot;:&lt;number&gt;&quot; to jump to the given line number. Append another &quot;+&lt;number&gt;&quot; or &quot;:&lt;number&gt;&quot; to jump to the column number as well.</source>
-        <translation>Findet Dateien aus einem globalen Dateisystemindex (Spotlight, Locate, Everything). Fügen Sie &quot;+&lt;Zahl&gt;&quot; oder &quot;:&lt;Zahl&gt;&quot; an, um zur angegebenen Zeile zu springen. Fügen Sie noch einmal &quot;+&lt;Zahl&gt;&quot; oder &quot;:&lt;Zahl&gt;&quot; an, um auch zur angegebenen Spalte zu springen.</translation>
+        <translation>Findet Dateien aus einem globalen Dateisystemindex (Spotlight, Locate, Everything). Fügen Sie &quot;+&lt;Zahl&gt;&quot; oder &quot;:&lt;Zahl&gt;&quot; an, um zur angegebenen Zeile zu springen. Fügen Sie erneut &quot;+&lt;Zahl&gt;&quot; oder &quot;:&lt;Zahl&gt;&quot; an, um auch zur angegebenen Spalte zu springen.</translation>
     </message>
     <message>
         <source>Sort results</source>
@@ -21755,11 +21756,11 @@ Doppelklicken Sie einen Eintrag um ihn zu ändern.</translation>
     </message>
     <message>
         <source>Use &quot;Cmd&quot;, &quot;Opt&quot;, &quot;Ctrl&quot;, and &quot;Shift&quot; for modifier keys. Use &quot;Escape&quot;, &quot;Backspace&quot;, &quot;Delete&quot;, &quot;Insert&quot;, &quot;Home&quot;, and so on, for special keys. Combine individual keys with &quot;+&quot;, and combine multiple shortcuts to a shortcut sequence with &quot;,&quot;. For example, if the user must hold the Ctrl and Shift modifier keys while pressing Escape, and then release and press A, enter &quot;Ctrl+Shift+Escape,A&quot;.</source>
-        <translation>Benutzen Sie &quot;Cmd&quot;, &quot;Opt&quot;, &quot;Ctrl&quot;, und &quot;Shift&quot; für Hilfstasten. Benutzen Sie &quot;Escape&quot;, &quot;Backspace&quot;, &quot;Delete&quot;, &quot;Insert&quot;, &quot;Home&quot; und so weiter für Sondertasten. Kombinieren Sie einzelne Tasten mit &quot;+&quot; und kombinieren Sie mehrere Tastenkombinationen mit &quot;,&quot; zu einer Tastenfolge. Wenn der Benutzer etwa die Strg- und Umschalttasten gedrückt halten muss, während er Escape drückt, um danach alle Tasten zu lösen und A zu drücken, geben Sie &quot;Ctrl+Shift+Escape,A&quot; ein.</translation>
+        <translation>Verwenden Sie &quot;Cmd&quot;, &quot;Opt&quot;, &quot;Ctrl&quot;, und &quot;Shift&quot; für Hilfstasten. Verwenden Sie &quot;Escape&quot;, &quot;Backspace&quot;, &quot;Delete&quot;, &quot;Insert&quot;, &quot;Home&quot; und so weiter für Sondertasten. Kombinieren Sie einzelne Tasten mit &quot;+&quot; und kombinieren Sie mehrere Tastenkombinationen mit &quot;,&quot; zu einer Tastenfolge. Wenn der Benutzer etwa die Strg- und Umschalttasten gedrückt halten muss, während er Escape drückt, um danach alle Tasten zu lösen und A zu drücken, geben Sie &quot;Ctrl+Shift+Escape,A&quot; ein.</translation>
     </message>
     <message>
         <source>Use &quot;Ctrl&quot;, &quot;Alt&quot;, &quot;Meta&quot;, and &quot;Shift&quot; for modifier keys. Use &quot;Escape&quot;, &quot;Backspace&quot;, &quot;Delete&quot;, &quot;Insert&quot;, &quot;Home&quot;, and so on, for special keys. Combine individual keys with &quot;+&quot;, and combine multiple shortcuts to a shortcut sequence with &quot;,&quot;. For example, if the user must hold the Ctrl and Shift modifier keys while pressing Escape, and then release and press A, enter &quot;Ctrl+Shift+Escape,A&quot;.</source>
-        <translation>Benutzen Sie &quot;Ctrl&quot;, &quot;Alt&quot;, &quot;Meta&quot;, und &quot;Shift&quot; für Hilfstasten. Benutzen Sie &quot;Escape&quot;, &quot;Backspace&quot;, &quot;Delete&quot;, &quot;Insert&quot;, &quot;Home&quot; und so weiter für Sondertasten. Kombinieren Sie einzelne Tasten mit &quot;+&quot; und kombinieren Sie mehrere Tastenkombinationen mit &quot;,&quot; zu einer Tastenfolge. Wenn der Benutzer etwa die Strg- und Umschalttasten gedrückt halten muss, während er Escape drückt, um danach alle Tasten zu lösen und A zu drücken, geben Sie &quot;Ctrl+Shift+Escape,A&quot; ein.</translation>
+        <translation>Verwenden Sie &quot;Ctrl&quot;, &quot;Alt&quot;, &quot;Meta&quot;, und &quot;Shift&quot; für Hilfstasten. Verwenden Sie &quot;Escape&quot;, &quot;Backspace&quot;, &quot;Delete&quot;, &quot;Insert&quot;, &quot;Home&quot; und so weiter für Sondertasten. Kombinieren Sie einzelne Tasten mit &quot;+&quot; und kombinieren Sie mehrere Tastenkombinationen mit &quot;,&quot; zu einer Tastenfolge. Wenn der Benutzer etwa die Strg- und Umschalttasten gedrückt halten muss, während er Escape drückt, um danach alle Tasten zu lösen und A zu drücken, geben Sie &quot;Ctrl+Shift+Escape,A&quot; ein.</translation>
     </message>
     <message>
         <source>Enter key sequence as text</source>
@@ -21823,7 +21824,7 @@ Doppelklicken Sie einen Eintrag um ihn zu ändern.</translation>
     </message>
     <message>
         <source>The plugin will be available to all compatible %1 installations, but only for the current user.</source>
-        <translation>Das Plugin wird für alle kompatiblen Installationen von %1 verfügbar sein, aber nur für den aktuellen Nutzer.</translation>
+        <translation>Das Plugin wird für alle kompatiblen Installationen von %1 verfügbar sein, aber nur für den aktuellen Benutzer.</translation>
     </message>
     <message>
         <source>%1 installation</source>
@@ -21831,7 +21832,7 @@ Doppelklicken Sie einen Eintrag um ihn zu ändern.</translation>
     </message>
     <message>
         <source>The plugin will be available only to this %1 installation, but for all users that can access it.</source>
-        <translation>Das Plugin wird nur für diese Installation von %1 verfügbar sein, aber für alle Nutzer, die diese Ausführen können.</translation>
+        <translation>Das Plugin wird nur für diese Installation von %1 verfügbar sein, aber für alle Benutzer, die diese Ausführen können.</translation>
     </message>
     <message>
         <source>Summary</source>
@@ -22827,7 +22828,7 @@ Doppelklicken Sie einen Eintrag um ihn zu ändern.</translation>
     </message>
     <message>
         <source>Convert to Stack Variable</source>
-        <translation>In Stack-Variable umwandeln</translation>
+        <translation>In Stackvariable umwandeln</translation>
     </message>
     <message>
         <source>Convert to Pointer</source>
@@ -23053,7 +23054,7 @@ ausgerichtet werden würden</translation>
    int (*pa)[2] = ...;
 
 &lt;/pre&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;Dies bezieht sich nicht auf die Stern- und Referenzsymbole in Zeigern auf / Referenzen zu Funktionen und Feldern, zum Beispiel:
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;Dies bezieht sich nicht auf die Stern- und Referenzsymbole in Zeigern auf / Referenzen zu Funktionen und Arrays, zum Beispiel:
 &lt;pre&gt;   int (&amp;rf)() = ...;
    int (*pf)() = ...;
 
@@ -23296,7 +23297,7 @@ Diese Präfixe werden zusätzlich zum Dateinamen beim Wechseln zwischen Header-
     </message>
     <message>
         <source>Use type &quot;auto&quot; when creating new variables</source>
-        <translation>Typ &quot;auto&quot; beim Erstellen von neuen Variablen benutzen</translation>
+        <translation>Typ &quot;auto&quot; beim Erstellen von neuen Variablen verwenden</translation>
     </message>
     <message>
         <source>Custom Getter Setter Templates</source>
@@ -23581,11 +23582,11 @@ z.B. name = &quot;m_test_foo_&quot;:
     </message>
     <message>
         <source>Use Built-in Only</source>
-        <translation>Nur integriertes Backend benutzen</translation>
+        <translation>Nur integriertes Backend verwenden</translation>
     </message>
     <message>
         <source>Use Clangd Only</source>
-        <translation>Nur Clangd benutzen</translation>
+        <translation>Nur Clangd verwenden</translation>
     </message>
     <message>
         <source>Try Both</source>
@@ -23629,11 +23630,11 @@ z.B. name = &quot;m_test_foo_&quot;:
     </message>
     <message>
         <source>Use built-in preprocessor to show pre-processed files</source>
-        <translation>Den integrierten Präprozessor zum Anzeigen von vorverarbeiteten Dateien benutzen</translation>
+        <translation>Den integrierten Präprozessor zum Anzeigen von vorverarbeiteten Dateien verwenden</translation>
     </message>
     <message>
         <source>Uncheck this to invoke the actual compiler to show a pre-processed source file in the editor.</source>
-        <translation>Wählen Sie dies ab, um den Compiler zum Anzeigen von vorverarbeiteten Dateien zu benutzen.</translation>
+        <translation>Wählen Sie dies ab, um den Compiler zum Anzeigen von vorverarbeiteten Dateien zu verwenden.</translation>
     </message>
     <message>
         <source>Code Model</source>
@@ -23641,19 +23642,19 @@ z.B. name = &quot;m_test_foo_&quot;:
     </message>
     <message>
         <source>&lt;p&gt;If background indexing is enabled, global symbol searches will yield more accurate results, at the cost of additional CPU load when the project is first opened. The indexing result is persisted in the project&apos;s build directory. If you disable background indexing, a faster, but less accurate, built-in indexer is used instead. The thread priority for building the background index can be adjusted since clangd 15.&lt;/p&gt;&lt;p&gt;Background Priority: Minimum priority, runs on idle CPUs. May leave &apos;performance&apos; cores unused.&lt;/p&gt;&lt;p&gt;Normal Priority: Reduced priority compared to interactive work.&lt;/p&gt;&lt;p&gt;Low Priority: Same priority as other clangd work.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Wenn sie das globale Indizieren aktivieren, liefert die globale Symbolsuche genauere Resultate, es erhöht aber die CPU-Last beim ersten Öffnen von Projekten. Das Resultat der Indizierung wird im Build-Verzeichnis des Projekts gespeichert. Wenn sie das globale Indizieren deaktivieren, wird stattdessen ein schnellerer, aber weniger genauer, integrierter Indexer benutzt. Seit Clangd 15 können Sie die Priorität für die Indizierungs-Threads anpassen.&lt;/p&gt;&lt;p&gt;Hintergrund-Priorität: Niedrigste Priorität, läuft nur auf leerlaufenden CPUs. Kann &quot;Performance&quot;-Kerne ungenutzt lassen.&lt;/p&gt;&lt;p&gt;Normale Priorität: Geringere Priorität im Vergleich zu interaktiven Aktivitäten.&lt;/p&gt;&lt;p&gt;Niedrige Priorität: Dieselbe Priorität wie andere Clangd-Aktivitäten.&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;Wenn Sie das globale Indizieren aktivieren, liefert die globale Symbolsuche genauere Ergebnisse, es erhöht aber die CPU-Last beim ersten Öffnen von Projekten. Das Ergebnis der Indizierung wird im Build-Verzeichnis des Projekts gespeichert. Wenn Sie das globale Indizieren deaktivieren, wird stattdessen ein schnellerer, aber weniger genauer, integrierter Indexer verwendet. Seit Clangd 15 können Sie die Priorität für die Indizierungs-Threads anpassen.&lt;/p&gt;&lt;p&gt;Hintergrund-Priorität: Niedrigste Priorität, läuft nur auf leerlaufenden CPUs. Kann &quot;Performance&quot;-Kerne ungenutzt lassen.&lt;/p&gt;&lt;p&gt;Normale Priorität: Geringere Priorität im Vergleich zu interaktiven Aktivitäten.&lt;/p&gt;&lt;p&gt;Niedrige Priorität: Dieselbe Priorität wie andere Clangd-Aktivitäten.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;The C/C++ backend to use for switching between header and source files.&lt;/p&gt;&lt;p&gt;While the clangd implementation has more capabilities than the built-in code model, it tends to find false positives.&lt;/p&gt;&lt;p&gt;When &quot;Try Both&quot; is selected, clangd is used only if the built-in variant does not find anything.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Bestimmt, welches C/C++-Backend zum Wechseln zwischen Header- und Quelldatei benutzt wird.&lt;/p&gt;&lt;p&gt;Die Clangd-Implementation hat mehr Fähigkeiten, aber auch einige Fehler, die nicht in der integrierten Variante vorhanden sind.&lt;/p&gt;&lt;p&gt;Wenn &quot;Beide versuchen&quot; ausgewählt ist, wird Clangd nur benutzt, wenn die integrierte Variant nichts findet.&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;Bestimmt, welches C/C++-Backend zum Wechseln zwischen Header- und Quelldatei verwendet wird.&lt;/p&gt;&lt;p&gt;Die Clangd-Implementation hat mehr Fähigkeiten, aber auch einige Fehler, die nicht in der integrierten Variante vorhanden sind.&lt;/p&gt;&lt;p&gt;Wenn &quot;Beide versuchen&quot; ausgewählt ist, wird Clangd nur verwendet, wenn die integrierte Variant nichts findet.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Which model clangd should use to rank possible completions.&lt;/p&gt;&lt;p&gt;This determines the order of candidates in the combo box when doing code completion.&lt;/p&gt;&lt;p&gt;The &quot;%1&quot; model used by default results from (pre-trained) machine learning and provides superior results on average.&lt;/p&gt;&lt;p&gt;If you feel that its suggestions stray too much from your expectations for your code base, you can try switching to the hand-crafted &quot;%2&quot; model.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Das Modell, das Clangd für die Rangfolge der möglichen Vervollständigungen benutzen soll.&lt;/p&gt;&lt;p&gt;Dies bestimmt die Reihenfolge der Kandidaten im Drop-Down-Menü der Code-Vervollständigung.&lt;/p&gt;&lt;p&gt;Das voreingestellte Modell &quot;%1&quot; wurde durch maschinelles Lernen trainiert und bietet im Schnitt die besten Ergebnisse.&lt;/p&gt;&lt;p&gt;Falls dies für Ihren Code zu sehr von Ihren Erwartungen abweicht, können Sie auf das manuell erstellte Modell &quot;%2&quot; umstellen.&lt;p&gt;</translation>
+        <translation>&lt;p&gt;Das Modell, das Clangd für die Rangfolge der möglichen Vervollständigungen verwenden soll.&lt;/p&gt;&lt;p&gt;Dies bestimmt die Reihenfolge der Kandidaten im Drop-Down-Menü der Code-Vervollständigung.&lt;/p&gt;&lt;p&gt;Das voreingestellte Modell &quot;%1&quot; wurde durch maschinelles Lernen trainiert und bietet im Schnitt die besten Ergebnisse.&lt;/p&gt;&lt;p&gt;Falls dies für Ihren Code zu sehr von Ihren Erwartungen abweicht, können Sie auf das manuell erstellte Modell &quot;%2&quot; umstellen.&lt;p&gt;</translation>
     </message>
     <message>
         <source>Number of worker threads used by clangd. Background indexing also uses this many worker threads.</source>
-        <translation>Anzahl der Threads, die von Clangd benutzt werden. Die globale Indizierung nutzt auch diese Anzahl Threads.</translation>
+        <translation>Anzahl der Threads, die von Clangd verwendet werden. Die globale Indizierung nutzt auch diese Anzahl Threads.</translation>
     </message>
     <message>
         <source>Controls whether clangd may insert header files as part of symbol completion.</source>
@@ -23663,7 +23664,7 @@ z.B. name = &quot;m_test_foo_&quot;:
         <source>Defines the amount of time %1 waits before sending document changes to the server.
 If the document changes again while waiting, this timeout resets.</source>
         <translation>Bestimmt die Zeit, die %1 vor dem Senden von Dokumentänderungen an den Server wartet.
-Falls sich das Dokument innerhalb dieser Zeit wieder ändert, wird erneut die volle Zeit gewartet.</translation>
+Falls sich das Dokument innerhalb dieser Zeit erneut ändert, wird nochmal die volle Zeit gewartet.</translation>
     </message>
     <message>
         <source>Files greater than this will not be opened as documents in clangd.
@@ -23673,11 +23674,11 @@ Das integrierte Codemodell übernimmt Syntaxhervorhebung, Code-Vervollständigun
     </message>
     <message>
         <source>The maximum number of completion results returned by clangd.</source>
-        <translation>Die maximale Anzahl Resultate die von Clangd für die Code-Vervollständigung zurück gegeben werden.</translation>
+        <translation>Die maximale Anzahl Ergebnisse, die von Clangd für die Code-Vervollständigung zurückgegeben werden.</translation>
     </message>
     <message>
         <source>Use clangd</source>
-        <translation>Clangd benutzen</translation>
+        <translation>Clangd verwenden</translation>
     </message>
     <message>
         <source>Insert header files on completion</source>
@@ -23693,7 +23694,7 @@ Das integrierte Codemodell übernimmt Syntaxhervorhebung, Code-Vervollständigun
     </message>
     <message>
         <source>Completion results:</source>
-        <translation>Anzahl der Resultate der Code-Vervollständigung:</translation>
+        <translation>Anzahl der Ergebnisse der Code-Vervollständigung:</translation>
     </message>
     <message>
         <source>No limit</source>
@@ -23972,7 +23973,7 @@ Ziehen Sie Eintrage mit der Maus, um die Reihenfolge der Parameter zu ändern.</
     </message>
     <message>
         <source>Quick Fix settings are saved in a file. Existing settings file &quot;%1&quot; found. Should this file be used or a new one be created?</source>
-        <translation>Einstellungen für Quick Fixes werden in einer Datei gespeichert. Es wurde eine existierende Einstellungs-Datei &quot;%1&quot; gefunden. Soll diese Datei benutzt, oder eine neue Datei erstellt werden?</translation>
+        <translation>Einstellungen für Quick Fixes werden in einer Datei gespeichert. Es wurde eine existierende Einstellungs-Datei &quot;%1&quot; gefunden. Soll diese Datei verwendet oder eine neue Datei erstellt werden?</translation>
     </message>
     <message>
         <source>Switch Back to Global Settings</source>
@@ -23980,7 +23981,7 @@ Ziehen Sie Eintrage mit der Maus, um die Reihenfolge der Parameter zu ändern.</
     </message>
     <message>
         <source>Use Existing</source>
-        <translation>Existierende benutzen</translation>
+        <translation>Existierende verwenden</translation>
     </message>
     <message>
         <source>Create New</source>
@@ -23988,7 +23989,7 @@ Ziehen Sie Eintrage mit der Maus, um die Reihenfolge der Parameter zu ändern.</
     </message>
     <message>
         <source>Custom settings are saved in a file. If you use the global settings, you can delete that file.</source>
-        <translation>Benutzerdefinierte Einstellungen werden in einer Datei gespeichert. Wenn Sie die globalen Einstellungen benutzen, können Sie diese Datei löschen.</translation>
+        <translation>Benutzerdefinierte Einstellungen werden in einer Datei gespeichert. Wenn Sie die globalen Einstellungen verwenden, können Sie diese Datei löschen.</translation>
     </message>
     <message>
         <source>Delete Custom Settings File</source>
@@ -24065,7 +24066,7 @@ Flags: %3</translation>
     </message>
     <message>
         <source>Locates files that are included by C++ files of any open project. Append &quot;+&lt;number&gt;&quot; or &quot;:&lt;number&gt;&quot; to jump to the given line number. Append another &quot;+&lt;number&gt;&quot; or &quot;:&lt;number&gt;&quot; to jump to the column number as well.</source>
-        <translation>Findet alle Dateien die von allen C++-Dateien aller Projekte eingebunden werden. Fügen Sie &quot;+&lt;Zahl&gt;&quot; oder &quot;:&lt;Zahl&gt;&quot; an, um zur angegebenen Zeile zu springen. Fügen Sie noch einmal &quot;+&lt;Zahl&gt;&quot; oder &quot;:&lt;Zahl&gt;&quot; an, um auch zur angegebenen Spalte zu springen.</translation>
+        <translation>Findet alle Dateien die von allen C++-Dateien aller Projekte eingebunden werden. Fügen Sie &quot;+&lt;Zahl&gt;&quot; oder &quot;:&lt;Zahl&gt;&quot; an, um zur angegebenen Zeile zu springen. Fügen Sie erneut &quot;+&lt;Zahl&gt;&quot; oder &quot;:&lt;Zahl&gt;&quot; an, um auch zur angegebenen Spalte zu springen.</translation>
     </message>
     <message>
         <source>collecting overrides...</source>
@@ -24144,7 +24145,7 @@ Flags: %3</translation>
     </message>
     <message>
         <source>Can find missing includes but makes checking slower. Use only when needed.</source>
-        <translation>Kann fehlende Includes finden, verlangsamt aber die Prüfung. Benutzen Sie dies nur, wenn es nötig ist.</translation>
+        <translation>Kann fehlende Includes finden, verlangsamt aber die Prüfung. Verwenden Sie dies nur, wenn es nötig ist.</translation>
     </message>
     <message>
         <source>Like C++ standard and language.</source>
@@ -24231,7 +24232,7 @@ Flags: %3</translation>
     </message>
     <message>
         <source>Stack Level %1</source>
-        <translation>Stack-Level %1</translation>
+        <translation>Stacklevel %1</translation>
     </message>
     <message>
         <source>Value</source>
@@ -24352,7 +24353,7 @@ Flags: %3</translation>
     <message>
         <source>The trace contains threads with stack depth &gt; 512.
 Do you want to display them anyway?</source>
-        <translation>Die Trace-Daten enthalten Threads mit einer Stack-Tiefe größer als 512.
+        <translation>Die Trace-Daten enthalten Threads mit einer Stacktiefe größer als 512.
 Möchten Sie die Daten trotzdem anzeigen?</translation>
     </message>
     <message>
@@ -24919,7 +24920,7 @@ Möchten Sie die Daten trotzdem anzeigen?</translation>
     </message>
     <message>
         <source>Configure Symbol paths that are used to locate debug symbol files.</source>
-        <translation>Symbolpfade konfigurieren, die benutzt werden, um Debug-Symboldateien zu finden.</translation>
+        <translation>Symbolpfade konfigurieren, die verwendet werden, um Debug-Symboldateien zu finden.</translation>
     </message>
     <message>
         <source>Log Time Stamps</source>
@@ -24979,7 +24980,7 @@ Möchten Sie die Daten trotzdem anzeigen?</translation>
     </message>
     <message>
         <source>Displays the objectName property of QObject based items. Note that this can negatively impact debugger performance even if no QObjects are present.</source>
-        <translation>Zeigt die objectName-Eigenschaft von QObject basierten Elementen an. Dies kann die Debugger-Geschwindigkeit verschlechtern, selbst wenn keine QObjects benutzt werden.</translation>
+        <translation>Zeigt die objectName-Eigenschaft von QObject basierten Elementen an. Dies kann die Debugger-Geschwindigkeit verschlechtern, selbst wenn keine QObjects verwendet werden.</translation>
     </message>
     <message>
         <source>Sort Members of Classes and Structs Alphabetically</source>
@@ -24991,7 +24992,7 @@ Möchten Sie die Daten trotzdem anzeigen?</translation>
     </message>
     <message>
         <source>Use Debugging Helpers</source>
-        <translation>Ausgabe-Hilfsbibliothek benutzen</translation>
+        <translation>Ausgabe-Hilfsbibliothek verwenden</translation>
     </message>
     <message>
         <source>Use code model</source>
@@ -24999,7 +25000,7 @@ Möchten Sie die Daten trotzdem anzeigen?</translation>
     </message>
     <message>
         <source>Selecting this causes the C++ Code Model being asked for variable scope information. This might result in slightly faster debugger operation but may fail for optimized code.</source>
-        <translation>Benutzt das Codemodell, um Informationen bezüglich des Gültigkeitsbereiches von Variablen zu erhalten. Dies kann eine etwas schnellere Anzeige der Werte bewirken, aber bei optimiertem Code auch fehlschlagen.</translation>
+        <translation>Verwendet das Codemodell, um Informationen bezüglich des Gültigkeitsbereiches von Variablen zu erhalten. Dies kann eine etwas schnellere Anzeige der Werte bewirken, aber bei optimiertem Code auch fehlschlagen.</translation>
     </message>
     <message>
         <source>Displays names of QThread based threads.</source>
@@ -25059,7 +25060,7 @@ Möchten Sie die Daten trotzdem anzeigen?</translation>
     </message>
     <message>
         <source>Use Tooltips in Stack View when Debugging</source>
-        <translation>Tooltips für Stack-Anzeige beim Debuggen</translation>
+        <translation>Tooltips für Stackanzeige beim Debuggen</translation>
     </message>
     <message>
         <source>Skip Known Frames</source>
@@ -25083,7 +25084,7 @@ Möchten Sie die Daten trotzdem anzeigen?</translation>
     </message>
     <message>
         <source>Use tooltips in main editor when debugging</source>
-        <translation>Tooltips im Haupt-Editor beim Debuggen benutzen</translation>
+        <translation>Tooltips im Haupt-Editor beim Debuggen verwenden</translation>
     </message>
     <message>
         <source>Configure Debugger...</source>
@@ -25197,7 +25198,7 @@ Sie haben die Wahl zu warten oder das Debuggen abzubrechen.</numerusform>
     </message>
     <message>
         <source>Retrieving data for stack view thread %1...</source>
-        <translation>Daten der Stack-Anzeige für Thread %1 werden empfangen...</translation>
+        <translation>Daten der Stackanzeige für Thread %1 werden empfangen...</translation>
     </message>
     <message>
         <source>Application started.</source>
@@ -25297,7 +25298,7 @@ Sie haben die Wahl zu warten oder das Debuggen abzubrechen.</numerusform>
     </message>
     <message>
         <source>Retrieving data for stack view...</source>
-        <translation>Daten der Stack-Anzeige werden empfangen...</translation>
+        <translation>Daten der Stackanzeige werden empfangen...</translation>
     </message>
     <message>
         <source>The gdb process failed to start.</source>
@@ -25523,12 +25524,12 @@ was generated. In such situations the breakpoint is shifted to the
 next source code line for which code was actually generated.
 This option reflects such temporary change by moving the breakpoint
 markers in the source code editor.</source>
-        <translation>Nicht alle Quellcode-Zeilen bewirken die Erzeugung von ausführbarem Code. Wenn man dort einen Haltepunkt setzt, verhält er sich so, als ob er auf die nächste Zeile gesetzt worden wäre. Das Aktivieren der Einstellung &apos;Positionen der Haltepunkte korrigieren&apos; bewirkt, dass der Haltepunkt-Marker in so einem Fall auf die Stelle des resultierenden Haltepunkts verschoben wird.</translation>
+        <translation>Nicht alle Quelltext-Zeilen bewirken die Erzeugung von ausführbarem Code. Wenn man dort einen Haltepunkt setzt, verhält er sich so, als ob er auf die nächste Zeile gesetzt worden wäre. Das Aktivieren der Einstellung &apos;Positionen der Haltepunkte korrigieren&apos; bewirkt, dass der Haltepunkt-Marker in so einem Fall auf die Stelle des resultierenden Haltepunkts verschoben wird.</translation>
     </message>
     <message>
         <source>Allows or inhibits reading the user&apos;s default
 .gdbinit file on debugger startup.</source>
-        <translation>Gestattet oder unterdrückt das Lesen der Vorgabe-.gdbinit-Datei des Nutzers beim Starten des Debuggers.</translation>
+        <translation>Gestattet oder unterdrückt das Lesen der Vorgabe-.gdbinit-Datei des Benutzers beim Starten des Debuggers.</translation>
     </message>
     <message>
         <source>Load system GDB pretty printers</source>
@@ -25560,7 +25561,7 @@ markers in the source code editor.</source>
     </message>
     <message>
         <source>Uses the default GDB pretty printers installed in your system or linked to the libraries your application uses.</source>
-        <translation>Verwendet die GDB-Pretty-Printers, die im System installiert sind oder gegen die Bibliotheken gelinkt sind, die die Anwendung benutzt.</translation>
+        <translation>Verwendet die GDB-Pretty-Printers, die im System installiert sind oder gegen die Bibliotheken gelinkt sind, die die Anwendung verwendet.</translation>
     </message>
     <message>
         <source>The options below give access to advanced&lt;br&gt;or experimental functions of GDB.&lt;p&gt;Enabling them may negatively impact&lt;br&gt;your debugging experience.</source>
@@ -25764,11 +25765,11 @@ markers in the source code editor.</source>
     </message>
     <message>
         <source>Memory at Frame #%1 (%2) 0x%3</source>
-        <translation>Speicher bei Stack-Frame #%1 (%2) 0x%3</translation>
+        <translation>Speicher bei Stackframe #%1 (%2) 0x%3</translation>
     </message>
     <message>
         <source>Frame #%1 (%2)</source>
-        <translation>Stack-Frame #%1 (%2)</translation>
+        <translation>Stackframe #%1 (%2)</translation>
     </message>
     <message>
         <source>Open Disassembler at 0x%1</source>
@@ -25832,15 +25833,15 @@ markers in the source code editor.</source>
     </message>
     <message>
         <source>Sources for this frame are available.&lt;br&gt;Double-click on the file name to open an editor.</source>
-        <translation>Für diesen Stack-Frame ist Quellcode vorhanden&lt;br&gt;Doppelklicken Sie auf den Dateinamen, um einen Editor zu öffnen.</translation>
+        <translation>Für diesen Stackframe ist Quelltext vorhanden&lt;br&gt;Doppelklicken Sie auf den Dateinamen, um einen Editor zu öffnen.</translation>
     </message>
     <message>
         <source>Binary debug information is not accessible for this frame. This either means the core was not compiled with debug information, or the debug information is not accessible.</source>
-        <translation>Für diesen Stack-Frame ist keine binäre Debuginformation verfügbar. Entweder stammt die Core-Datei von einer ohne Debuginformation erstellten Anwendung oder es kann nicht auf die Debuginformation zugegriffen werden.</translation>
+        <translation>Für diesen Stackframe ist keine binäre Debuginformation verfügbar. Entweder stammt die Core-Datei von einer ohne Debuginformation erstellten Anwendung oder es kann nicht auf die Debuginformation zugegriffen werden.</translation>
     </message>
     <message>
         <source>Binary debug information is accessible for this frame. However, matching sources have not been found.</source>
-        <translation>Für diesen Stack-Frame ist binäre Debuginformation verfügbar. Es konnte aber kein passender Quellcode gefunden werden.</translation>
+        <translation>Für diesen Stackframe ist binäre Debuginformation verfügbar. Es konnte aber kein passender Quelltext gefunden werden.</translation>
     </message>
     <message>
         <source>Note that most distributions ship debug information in separate packages.</source>
@@ -26075,7 +26076,7 @@ markers in the source code editor.</source>
     </message>
     <message>
         <source>Cannot Display Stack Layout</source>
-        <translation>Das Stack-Layout kann nicht angezeigt werden</translation>
+        <translation>Das Stacklayout kann nicht angezeigt werden</translation>
     </message>
     <message>
         <source>Could not determine a suitable address range.</source>
@@ -26203,7 +26204,7 @@ markers in the source code editor.</source>
     </message>
     <message>
         <source>Open Memory View Showing Stack Layout</source>
-        <translation>Speicheranzeige an Adresse des Stack-Frames öffnen</translation>
+        <translation>Speicheranzeige an Adresse des Stackframes öffnen</translation>
     </message>
     <message>
         <source>Open Memory Editor at Object&apos;s Address (0x%1)</source>
@@ -26223,7 +26224,7 @@ markers in the source code editor.</source>
     </message>
     <message>
         <source>Open Memory Editor Showing Stack Layout</source>
-        <translation>Speichereditor an Adresse des Stack-Frames öffnen</translation>
+        <translation>Speichereditor an Adresse des Stackframes öffnen</translation>
     </message>
     <message>
         <source>Open Memory Editor...</source>
@@ -26380,8 +26381,8 @@ markers in the source code editor.</source>
     <message numerus="yes">
         <source>Array of %n items</source>
         <translation>
-            <numerusform>Feld aus einem Element</numerusform>
-            <numerusform>Feld aus %n Elementen</numerusform>
+            <numerusform>Array aus einem Element</numerusform>
+            <numerusform>Array aus %n Elementen</numerusform>
         </translation>
     </message>
     <message>
@@ -26470,7 +26471,7 @@ If you have updated %2 via Maintenance Tool, you may need to rerun the Tool and
 If you build %2 from sources and want to use a CDB executable with another bitness than your %2 build, you will need to build a separate CDB extension with the same bitness as the CDB you want to use.</source>
         <translation>Interner Fehler: Die Erweiterung %1 wurde nicht gefunden.
 Wenn Sie %2 mit dem Maintenance Tool aktualisiert haben, müssen Sie dieses vielleicht erneut ausführen, &quot;Komponenten hinzufügen oder entfernen&quot; auswählen und die Komponente Qt &gt; Tools &gt; Qt Creator CDB Debugger Support auswählen.
-Wenn Sie %2 aus den Quelltexten erstellen und eine ausführbare CDB-Datei mit einer anderen Architektur (32 Bit, 64 Bit) verwenden wollen als %2, müssen Sie eine separate CDB-Erweiterung mit der gleichen Architektur wie diese CDB-Datei erstellen.</translation>
+Wenn Sie %2 aus dem Quelltext erstellen und eine ausführbare CDB-Datei mit einer anderen Architektur (32 Bit, 64 Bit) verwenden wollen als %2, müssen Sie eine separate CDB-Erweiterung mit der gleichen Architektur wie diese CDB-Datei erstellen.</translation>
     </message>
     <message>
         <source>Trace point %1 in thread %2 triggered.</source>
@@ -26587,14 +26588,14 @@ Installieren Sie das Paket &quot;Qt Debug Information Files&quot; für diese Qt-
 You may be asked to share the contents of this log when reporting bugs related to debugger operation. In this case, make sure your submission does not contain data you do not want to or you are not allowed to share.
 
 </source>
-        <translation>Hinweis: Dieses Log enhält möglicherweise vertrauliche Informationen über Ihren Computer, Umgebungsvariablen, Speicherinhalte der untersuchten Prozesse oder weiteres. Es wird von %1 nie über das Internet übertragen und nur auf der Festplatte gespeichert, wenn Sie die entsprechende Option aus dem Kontextmenü aufrufen, oder durch Abläufe, die das Debugger-Plugin von %1 nicht beeinflussen kann, bespielsweise Auslagerungsdateien or andere Plugins, die Sie vielleicht benutzen.
+        <translation>Hinweis: Dieses Log enhält möglicherweise vertrauliche Informationen über Ihren Computer, Umgebungsvariablen, Speicherinhalte der untersuchten Prozesse oder weiteres. Es wird von %1 nie über das Internet übertragen und nur auf der Festplatte gespeichert, wenn Sie die entsprechende Option aus dem Kontextmenü aufrufen, oder durch Abläufe, die das Debugger-Plugin von %1 nicht beeinflussen kann, bespielsweise Auslagerungsdateien or andere Plugins, die Sie vielleicht verwenden.
 Sie werden möglicherweise gebeten, den Inhalt dieses Logs mitzuteilen, wenn Sie über Fehlfunktionen des Debugger berichten. In diesem Fall achten Sie darauf, dass Ihre Einsendung nur Daten enthält, die Sie weitergeben wollen und dürfen.
 
 </translation>
     </message>
     <message>
         <source>User commands are not accepted in the current state.</source>
-        <translation>Die Eingabe von Nutzerkommandos ist in diesem Zustand nicht möglich.</translation>
+        <translation>Die Eingabe von Benutzerkommandos ist in diesem Zustand nicht möglich.</translation>
     </message>
     <message>
         <source>Log File</source>
@@ -27010,7 +27011,7 @@ Sie werden möglicherweise gebeten, den Inhalt dieses Logs mitzuteilen, wenn Sie
         <source>Could not connect to the in-process QML debugger.
 Do you want to retry?</source>
         <translation>Konnte keine Verbindung zur Debuggerkomponente im Prozess herstellen.
-Soll es noch einmal versucht werden?</translation>
+Soll es erneut versucht werden?</translation>
     </message>
     <message>
         <source>Starting %1</source>
@@ -27018,7 +27019,7 @@ Soll es noch einmal versucht werden?</translation>
     </message>
     <message>
         <source>Cannot evaluate %1 in current stack frame.</source>
-        <translation>%1 kann im aktuellen Stack-Frame nicht ausgewertet werden.</translation>
+        <translation>%1 kann im aktuellen Stackframe nicht ausgewertet werden.</translation>
     </message>
     <message>
         <source>Context:</source>
@@ -27030,7 +27031,7 @@ Soll es noch einmal versucht werden?</translation>
     </message>
     <message>
         <source>QML Debugger: Connection failed.</source>
-        <translation>QML-Debugger: Verbindung gescheitert.</translation>
+        <translation>QML-Debugger: Verbindung fehlgeschlagen.</translation>
     </message>
     <message>
         <source>JS Source for %1</source>
@@ -27082,7 +27083,7 @@ Soll es noch einmal versucht werden?</translation>
     </message>
     <message>
         <source>&lt;p&gt;Add a mapping for Qt&apos;s source folders when using an unpatched version of Qt.</source>
-        <translation>&lt;p&gt;Fügt eine Umsetzung für die Qt-Quellen hinzu, wenn eine nicht gepatchte Version von Qt benutzt wird.</translation>
+        <translation>&lt;p&gt;Fügt eine Umsetzung für die Qt-Quellen hinzu, wenn eine nicht gepatchte Version von Qt verwendet wird.</translation>
     </message>
     <message>
         <source>&lt;p&gt;The source path contained in the debug information of the executable as reported by the debugger</source>
@@ -27098,7 +27099,7 @@ Soll es noch einmal versucht werden?</translation>
     </message>
     <message>
         <source>&lt;p&gt;Mappings of source file folders to be used in the debugger can be entered here.&lt;/p&gt;&lt;p&gt;This is useful when using a copy of the source tree at a location different from the one at which the modules where built, for example, while doing remote debugging.&lt;/p&gt;&lt;p&gt;If source is specified as a regular expression by starting it with an open parenthesis, the paths in the ELF are matched with the regular expression to automatically determine the source path.&lt;/p&gt;&lt;p&gt;Example: &lt;b&gt;(/home/.*/Project)/KnownSubDir -&gt; D:\Project&lt;/b&gt; will substitute ELF built by any user to your local project directory.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Hier können Zuordnungen für die beim Debuggen benutzten Quelldateien festgelegt werden.&lt;/p&gt;&lt;p&gt;Das ist nützlich, wenn eine lokale Kopie des Quelldateibaums verwendet wird, der sich von der beim Erstellen der Module verwendeten unterscheidet, zum Beispiel beim Remote-Debuggen.&lt;/p&gt;&lt;p&gt;Wenn die Zuordnung durch eine öffnende Klammer am Anfang als regulärer Ausdruck angegeben wird, werden die passenden Pfade im ELF verwendet um den Quellpfad automatisch zu bestimmen.&lt;/p&gt;&lt;p&gt;Beispiel: &lt;b&gt;(/home/.*/Projekt)/BekanntesUnterverzeichnis -&gt; D:\Projekt&lt;/b&gt; wird ein von einem beliebigen Benutzer erstelltes ELF in Ihr lokales Projektverzeichnis umleiten.&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;Hier können Zuordnungen für die beim Debuggen verwendeten Quelldateien festgelegt werden.&lt;/p&gt;&lt;p&gt;Das ist nützlich, wenn eine lokale Kopie des Quelldateibaums verwendet wird, der sich von der beim Erstellen der Module verwendeten unterscheidet, zum Beispiel beim Remote-Debuggen.&lt;/p&gt;&lt;p&gt;Wenn die Zuordnung durch eine öffnende Klammer am Anfang als regulärer Ausdruck angegeben wird, werden die passenden Pfade im ELF verwendet um den Quellpfad automatisch zu bestimmen.&lt;/p&gt;&lt;p&gt;Beispiel: &lt;b&gt;(/home/.*/Projekt)/BekanntesUnterverzeichnis -&gt; D:\Projekt&lt;/b&gt; wird ein von einem beliebigen Benutzer erstelltes ELF in Ihr lokales Projektverzeichnis umleiten.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&amp;Target path:</source>
@@ -27150,7 +27151,7 @@ Soll es noch einmal versucht werden?</translation>
     </message>
     <message>
         <source>&amp;Username:</source>
-        <translation>&amp;Nutzername:</translation>
+        <translation>&amp;Benutzername:</translation>
     </message>
     <message>
         <source>&amp;Password:</source>
@@ -27391,7 +27392,7 @@ Einzelschritte in das Modul und das Setzen von Haltepunkten nach Datei und Zeile
     </message>
     <message>
         <source>Base path for external debug information and debug sources. If empty, $SYSROOT/usr/lib/debug will be chosen.</source>
-        <translation>Basispfad für Debuginformationen und Quellen. Als Vorgabe wird $SYSROOT/usr/lib/debug benutzt.</translation>
+        <translation>Basispfad für Debuginformationen und Quellen. Als Vorgabe wird $SYSROOT/usr/lib/debug verwendet.</translation>
     </message>
     <message>
         <source>&amp;Kit:</source>
@@ -27465,7 +27466,7 @@ Sie können hier eine andere Verbindung wählen, beispielsweise eine serielle Ve
     </message>
     <message>
         <source>Use additional startup commands.</source>
-        <translation>Benutze zusätzliche Kommandos beim Start.</translation>
+        <translation>Verwende zusätzliche Kommandos beim Start.</translation>
     </message>
     <message>
         <source>C++ debugger:</source>
@@ -27537,7 +27538,7 @@ Sie können hier eine andere Verbindung wählen, beispielsweise eine serielle Ve
     </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The debugger is not configured to use the public Microsoft Symbol Server.&lt;br/&gt;This is recommended for retrieval of the symbols of the operating system libraries.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Note:&lt;/span&gt; It is recommended, that if you use the Microsoft Symbol Server, to also use a local symbol cache.&lt;br/&gt;A fast internet connection is required for this to work smoothly,&lt;br/&gt;and a delay might occur when connecting for the first time and caching the symbols.&lt;/p&gt;&lt;p&gt;What would you like to set up?&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Der Debugger ist nicht zur Benutzung des öffentlichen Microsoft Symbol Servers eingerichtet.&lt;br/&gt;Dies wird zur Anzeige der Symbole der Betriebssystem-Bibliotheken empfohlen.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Hinweis:&lt;/span&gt; Bei der Verwendung des Microsoft Symbol Servers wird zusätzlich die Benutzung eines lokalen Zwischenspeichers für Symbole empfohlen.&lt;br/&gt;Allerdings ist dabei eine schnelle Internetverbindung für flüssiges Arbeiten erforderlich&lt;br/&gt;und bei der ersten Verbindung zum Zwischenspeichern der Symbole können Verzögerungen auftreten.&lt;/p&gt;&lt;p&gt;Was möchten Sie einrichten?&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Der Debugger ist nicht zur Verwendung des öffentlichen Microsoft Symbol Servers eingerichtet.&lt;br/&gt;Dies wird zur Anzeige der Symbole der Betriebssystem-Bibliotheken empfohlen.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Hinweis:&lt;/span&gt; Bei der Verwendung des Microsoft Symbol Servers wird zusätzlich der Einsatz eines lokalen Zwischenspeichers für Symbole empfohlen.&lt;br/&gt;Allerdings ist dabei eine schnelle Internetverbindung für flüssiges Arbeiten erforderlich&lt;br/&gt;und bei der ersten Verbindung zum Zwischenspeichern der Symbole können Verzögerungen auftreten.&lt;/p&gt;&lt;p&gt;Was möchten Sie einrichten?&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <source>Set up Symbol Paths</source>
@@ -27663,11 +27664,11 @@ Sie können hier eine andere Verbindung wählen, beispielsweise eine serielle Ve
     </message>
     <message>
         <source>Reopen dialog when application finishes</source>
-        <translation>Dialog nach Beendigung der Anwendung wieder öffnen</translation>
+        <translation>Dialog nach Beendigung der Anwendung erneut öffnen</translation>
     </message>
     <message>
         <source>Reopens this dialog when application finishes.</source>
-        <translation>Öffnet den Dialog nach Beendigung der Anwendung wieder.</translation>
+        <translation>Öffnet den Dialog nach Beendigung der Anwendung erneut.</translation>
     </message>
     <message>
         <source>Continue on attach</source>
@@ -27711,7 +27712,7 @@ Sie können hier eine andere Verbindung wählen, beispielsweise eine serielle Ve
     </message>
     <message>
         <source>The debugging helpers are used to produce a nice display of objects of certain types like QString or std::map in the &amp;quot;Locals&amp;quot; and &amp;quot;Expressions&amp;quot; views.</source>
-        <translation>Die Ausgabe-Hilfsbibliothek wird benutzt um bestimmte Datentypen wie QString oder std::map in &amp;quot;Lokale Variablen&amp;quot; und &amp;quot;Ausdrücke&amp;quot; ansprechend anzuzeigen.</translation>
+        <translation>Die Ausgabe-Hilfsbibliothek wird verwendet um bestimmte Datentypen wie QString oder std::map in &amp;quot;Lokale Variablen&amp;quot; und &amp;quot;Ausdrücke&amp;quot; ansprechend anzuzeigen.</translation>
     </message>
     <message>
         <source>Extra Debugging Helper</source>
@@ -28033,7 +28034,7 @@ Bitte wählen Sie einen 64-bit-Debugger in den Kit-Einstellungen für dieses Kit
     </message>
     <message>
         <source>Reverse-execution history exhausted. Going forward again.</source>
-        <translation>Keine weiteren rückwärts ausführbaren Schritte vorhanden. Führe sie wieder vorwärts aus.</translation>
+        <translation>Keine weiteren rückwärts ausführbaren Schritte vorhanden. Führe sie erneut vorwärts aus.</translation>
     </message>
     <message>
         <source>Attempting to interrupt.</source>
@@ -28050,7 +28051,7 @@ Bitte wählen Sie einen 64-bit-Debugger in den Kit-Einstellungen für dieses Kit
     </message>
     <message>
         <source>This debugger cannot handle user input.</source>
-        <translation>Dieser Debugger kann keine Nutzereingaben verarbeiten.</translation>
+        <translation>Dieser Debugger kann keine Benutzereingaben verarbeiten.</translation>
     </message>
     <message>
         <source>Stopped: &quot;%1&quot;.</source>
@@ -28180,7 +28181,7 @@ Für dieses Binärformat wären GDB oder LLDB besser als Debugger geeignet.</tra
     </message>
     <message>
         <source>Reverse-execution recording failed.</source>
-        <translation>Aufzeichnung für Rückwärtsausführung gescheitert.</translation>
+        <translation>Aufzeichnung für Rückwärtsausführung fehlgeschlagen.</translation>
     </message>
     <message>
         <source>Found.</source>
@@ -28483,7 +28484,7 @@ Das Setzen von Haltepunkten anhand von Dateinamen und Zeilennummern könnte fehl
     </message>
     <message>
         <source>Use alternating row colors in debug views</source>
-        <translation>Alternierende Farben für Zeilen in Debug-Ansichten benutzen</translation>
+        <translation>Alternierende Farben für Zeilen in Debug-Ansichten verwenden</translation>
     </message>
     <message>
         <source>Changes the font size in the debugger views when the font size in the main editor changes.</source>
@@ -28495,7 +28496,7 @@ Das Setzen von Haltepunkten anhand von Dateinamen und Zeilennummern könnte fehl
     </message>
     <message>
         <source>Not all source code lines generate executable code. Putting a breakpoint on such a line acts as if the breakpoint was set on the next line that generated code. Selecting &apos;Adjust Breakpoint Locations&apos; shifts the red breakpoint markers in such cases to the location of the true breakpoint.</source>
-        <translation>Nicht aus allen Quellcode-Zeilen wird ausführbarer Code erzeugt. Wenn man dort einen Haltepunkt setzt, verhält er sich so, als ob er auf die nächste Zeile gesetzt worden wäre, aus der Maschinencode erzeugt wurde. Das Aktivieren der Einstellung &apos;Positionen der Haltepunkte korrigieren&apos; bewirkt, dass der Haltepunkt-Marker in so einem Fall an die Stelle des resultierenden Haltepunkts verschoben wird.</translation>
+        <translation>Nicht aus allen Quelltext-Zeilen wird ausführbarer Code erzeugt. Wenn man dort einen Haltepunkt setzt, verhält er sich so, als ob er auf die nächste Zeile gesetzt worden wäre, aus der Maschinencode erzeugt wurde. Das Aktivieren der Einstellung &apos;Positionen der Haltepunkte korrigieren&apos; bewirkt, dass der Haltepunkt-Marker in so einem Fall an die Stelle des resultierenden Haltepunkts verschoben wird.</translation>
     </message>
     <message>
         <source>Stopping and stepping in the debugger will automatically open views associated with the current location.</source>
@@ -28531,7 +28532,7 @@ Das Setzen von Haltepunkten anhand von Dateinamen und Zeilennummern könnte fehl
     </message>
     <message>
         <source>Use annotations in main editor when debugging</source>
-        <translation>Annotationen im Haupt-Editor beim Debuggen benutzen</translation>
+        <translation>Annotationen im Haupt-Editor beim Debuggen verwenden</translation>
     </message>
     <message>
         <source>Shows simple variable values as annotations in the main editor during debugging.</source>
@@ -28619,7 +28620,7 @@ Das Setzen von Haltepunkten anhand von Dateinamen und Zeilennummern könnte fehl
     </message>
     <message>
         <source>Maximum stack depth:</source>
-        <translation>Maximale Stack-Tiefe:</translation>
+        <translation>Maximale Stacktiefe:</translation>
     </message>
     <message>
         <source>&lt;unlimited&gt;</source>
@@ -29730,7 +29731,7 @@ Versuchen Sie, das Projekt neu zu erstellen.</translation>
     </message>
     <message>
         <source>Exchange Cursor and Mark</source>
-        <translation>Textmarke und Markierung austauschen</translation>
+        <translation>Einfügemarke und Markierung austauschen</translation>
     </message>
     <message>
         <source>Copy</source>
@@ -29868,7 +29869,7 @@ Versuchen Sie, das Projekt neu zu erstellen.</translation>
     </message>
     <message>
         <source>Plugin Details of %1</source>
-        <translation type="unfinished">Beschreibung zu %1</translation>
+        <translation>Beschreibung zu %1</translation>
     </message>
     <message>
         <source>Group:</source>
@@ -30044,11 +30045,11 @@ Grund: %3</translation>
     </message>
     <message>
         <source>Value for key &quot;%1&quot; is not an array of objects</source>
-        <translation>Wert des Schlüssels &quot;%1&quot; ist kein Feld von Objekten</translation>
+        <translation>Wert des Schlüssels &quot;%1&quot; ist kein Array von Objekten</translation>
     </message>
     <message>
         <source>Value for key &quot;%1&quot; is not a string and not an array of strings</source>
-        <translation>Wert des Schlüssels &quot;%1&quot; ist keine Zeichenkette und auch kein Feld von Zeichenketten</translation>
+        <translation>Wert des Schlüssels &quot;%1&quot; ist keine Zeichenkette und auch kein Array von Zeichenketten</translation>
     </message>
     <message>
         <source>Value &quot;%2&quot; for key &quot;%1&quot; has invalid format</source>
@@ -30137,7 +30138,7 @@ Grund: %3</translation>
     <message>
         <source>%1 (deprecated)</source>
         <extracomment>%1 is a plugin name</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>%1 (veraltet)</translation>
     </message>
     <message>
         <source>%1 (experimental)</source>
@@ -30212,7 +30213,7 @@ zu deaktivieren, deaktiviert auch die folgenden Plugins:
     </message>
     <message>
         <source>Details</source>
-        <translation type="unfinished">Details</translation>
+        <translation>Details</translation>
     </message>
     <message>
         <source>The following plugins have errors and cannot be loaded:</source>
@@ -30228,7 +30229,7 @@ zu deaktivieren, deaktiviert auch die folgenden Plugins:
     </message>
     <message>
         <source>Multiple versions of the same plugin have been found.</source>
-        <translation type="unfinished"></translation>
+        <translation>Es wurden mehrere Versionen des gleichen Plugins gefunden.</translation>
     </message>
     <message>
         <source>%1 &gt; About Plugins</source>
@@ -30259,7 +30260,7 @@ zu deaktivieren, deaktiviert auch die folgenden Plugins:
     <name>QtC::FakeVim</name>
     <message>
         <source>Use FakeVim</source>
-        <translation>FakeVim benutzen</translation>
+        <translation>FakeVim verwenden</translation>
     </message>
     <message>
         <source>Read .vimrc from location:</source>
@@ -30347,7 +30348,7 @@ zu deaktivieren, deaktiviert auch die folgenden Plugins:
     </message>
     <message>
         <source>Use system encoding for :source</source>
-        <translation>System-Zeichenkodierung für :source benutzen</translation>
+        <translation>System-Zeichenkodierung für :source verwenden</translation>
     </message>
     <message>
         <source>Scroll offset:</source>
@@ -30387,7 +30388,7 @@ zu deaktivieren, deaktiviert auch die folgenden Plugins:
     </message>
     <message>
         <source>Use Vim-style Editing</source>
-        <translation>Vim benutzen</translation>
+        <translation>Vim verwenden</translation>
     </message>
     <message>
         <source>Mark &quot;%1&quot; not set.</source>
@@ -30412,11 +30413,11 @@ zu deaktivieren, deaktiviert auch die folgenden Plugins:
     <message>
         <source>Type Control-Shift-Y, Control-Shift-Y to quit FakeVim mode.</source>
         <translatorcomment>These are the names of the actual keys on my german Apple keyboard https://support.apple.com/de-de/HT201236</translatorcomment>
-        <translation>Benutzen sie Control-Umschalt-Y, Control-Umschalt-Y, um den FakeVim-Modus zu verlassen.</translation>
+        <translation>Verwenden sie Control-Umschalt-Y, Control-Umschalt-Y, um den FakeVim-Modus zu verlassen.</translation>
     </message>
     <message>
         <source>Type Alt-Y, Alt-Y to quit FakeVim mode.</source>
-        <translation>Benutzen Sie Alt-Y, Alt-Y, um den FakeVim-Modus zu verlassen.</translation>
+        <translation>Verwenden Sie Alt-Y, Alt-Y, um den FakeVim-Modus zu verlassen.</translation>
     </message>
     <message>
         <source>Unknown option:</source>
@@ -30674,7 +30675,7 @@ zu deaktivieren, deaktiviert auch die folgenden Plugins:
     </message>
     <message>
         <source>SSL/TLS client identity key to use if requested by the server.</source>
-        <translation>SSL/TLS Client Identity Key, der benutzt werden soll, wenn der Server diesen anfordert.</translation>
+        <translation>Der SSL/TLS Client Identity Key, der auf Anforderung des Servers verwendet werden soll.</translation>
     </message>
     <message>
         <source>Disable auto-sync</source>
@@ -30690,7 +30691,7 @@ zu deaktivieren, deaktiviert auch die folgenden Plugins:
     </message>
     <message>
         <source>User:</source>
-        <translation>Nutzer:</translation>
+        <translation>Benutzer:</translation>
     </message>
     <message>
         <source>Repository Settings</source>
@@ -31102,7 +31103,7 @@ zu deaktivieren, deaktiviert auch die folgenden Plugins:
     </message>
     <message>
         <source>User</source>
-        <translation>Nutzer</translation>
+        <translation>Benutzer</translation>
     </message>
     <message>
         <source>Miscellaneous</source>
@@ -31161,7 +31162,7 @@ zu deaktivieren, deaktiviert auch die folgenden Plugins:
     </message>
     <message>
         <source>Imports existing projects that do not use qmake, CMake, Qbs, Meson, or Autotools. This allows you to use %1 as a code editor.</source>
-        <translation>Importiert bereits existierende Projekte, die weder qmake, CMake, Qbs, Meson oder Autotools verwenden. Dadurch kann %1 als Code-Editor benutzt werden.</translation>
+        <translation>Importiert bereits existierende Projekte, die weder qmake, CMake, Qbs, Meson oder Autotools verwenden. Dadurch kann %1 als Code-Editor verwendet werden.</translation>
     </message>
     <message>
         <source>Project Name and Location</source>
@@ -31340,7 +31341,7 @@ Jetzt Commit ausführen?</translation>
     </message>
     <message>
         <source>Rebase, merge or am is in progress. Finish or abort it and then try again.</source>
-        <translation>Es ist eine Rebase-, Merge- oder am-Operation aktiv. Bitte beenden oder brechen Sie sie ab und versuchen Sie es noch einmal.</translation>
+        <translation>Es ist eine Rebase-, Merge- oder am-Operation aktiv. Bitte beenden oder brechen Sie sie ab und versuchen Sie es erneut.</translation>
     </message>
     <message>
         <source>Stash local changes and pop when %1 finishes.</source>
@@ -32359,7 +32360,7 @@ Möchten Sie ihn beenden?</translation>
     </message>
     <message>
         <source>&amp;User:</source>
-        <translation>&amp;Nutzer:</translation>
+        <translation>&amp;Benutzer:</translation>
     </message>
     <message>
         <source>&amp;ssh:</source>
@@ -32403,7 +32404,7 @@ nicht konfiguriert ist.</translation>
     </message>
     <message>
         <source>Invalid Gerrit configuration. Host, user and ssh binary are mandatory.</source>
-        <translation>Ungültige Gerrit-Konfiguration. Host, Nutzer und ausführbare SSH-Datei müssen angegeben werden.</translation>
+        <translation>Ungültige Gerrit-Konfiguration. Host, Benutzer und ausführbare SSH-Datei müssen angegeben werden.</translation>
     </message>
     <message>
         <source>Git is not available.</source>
@@ -32789,8 +32790,8 @@ Leer lassen, um das Dateisystem zu durchsuchen.</translation>
     <message numerus="yes">
         <source>Include branches and tags that have not been active for %n days.</source>
         <translation>
-            <numerusform>Branches und Tags einschließen, die seit einem Tag nicht benutzt wurden.</numerusform>
-            <numerusform>Branches und Tags einschließen, die seit %n Tagen nicht benutzt wurden.</numerusform>
+            <numerusform>Branches und Tags einschließen, die seit einem Tag nicht verwendet wurden.</numerusform>
+            <numerusform>Branches und Tags einschließen, die seit %n Tagen nicht verwendet wurden.</numerusform>
         </translation>
     </message>
     <message>
@@ -33501,7 +33502,7 @@ Hinweis: Dies macht Sie anfällig für Man-in-the-middle-Angriffe.</translation>
     </message>
     <message>
         <source>Using project access token.</source>
-        <translation>Benutze das Zugriffstoken des Projekts.</translation>
+        <translation>Verwende das Zugriffstoken des Projekts.</translation>
     </message>
     <message>
         <source>Logged in as %1</source>
@@ -34089,7 +34090,7 @@ Hinweis: Dies macht Sie anfällig für Man-in-the-middle-Angriffe.</translation>
     </message>
     <message>
         <source>Open in Edit Mode</source>
-        <translation>Im Editieren-Modus öffnen</translation>
+        <translation>Im Bearbeiten-Modus öffnen</translation>
     </message>
     <message>
         <source>Open in New Page</source>
@@ -34485,8 +34486,8 @@ Möchten Sie sie überschreiben?</translation>
         <translation>Geben Sie die entsprechenden Argumente für das Erstellkommando ein.</translation>
     </message>
     <message>
-        <source>Make sure the build command&apos;s multi-job parameter value is large enough (such as -j200 for the JOM or Make build tools)</source>
-        <translation>Stellen Sie sicher, dass der Wert für die Anzahl paralleler Jobs im Erstellkommando groß genug ist (wie zum Beispiel -j200 für JOM oder Make)</translation>
+        <source>Make sure the build command&apos;s multi-job parameter value is large enough (such as -j200 for the JOM or Make build tools).</source>
+        <translation>Stellen Sie sicher, dass der Wert für die Anzahl paralleler Jobs im Erstellkommando groß genug ist (wie zum Beispiel -j200 für JOM oder Make).</translation>
     </message>
     <message>
         <source>Keep original jobs number:</source>
@@ -34506,7 +34507,7 @@ Möchten Sie sie überschreiben?</translation>
     </message>
     <message>
         <source>Defines how Automatic Interception Interface should handle the various processes involved in a distributed job. It is not necessary for &quot;Visual Studio&quot; or &quot;Make and Build tools&quot; builds, but can be used to provide configuration options if those builds use additional processes that are not included in those packages. It is required to configure distributable processes in &quot;Dev Tools&quot; builds.</source>
-        <translation>Bestimmt, wie das Automatic Interception Interface die in einem verteilten Job involvierten Prozesse behandelt. Benötigt, um verteilte Prozesse in Kompilierungen mit &quot;Dev Tools&quot; zu konfigurieren. Nicht für Kompilierungen mit &quot;Visual Studio&quot; oder &quot;Make and Build tools&quot; benötigt, kann aber zur Konfiguration zusätzlicher Prozesse benutzt werden, die nicht in diesen Paketen enthalten sind.</translation>
+        <translation>Bestimmt, wie das Automatic Interception Interface die in einem verteilten Job involvierten Prozesse behandelt. Benötigt, um verteilte Prozesse in Kompilierungen mit &quot;Dev Tools&quot; zu konfigurieren. Nicht für Kompilierungen mit &quot;Visual Studio&quot; oder &quot;Make and Build tools&quot; benötigt, kann aber zur Konfiguration zusätzlicher Prozesse verwendet werden, die nicht in diesen Paketen enthalten sind.</translation>
     </message>
     <message>
         <source>Avoid local task execution:</source>
@@ -34518,7 +34519,7 @@ Möchten Sie sie überschreiben?</translation>
     </message>
     <message>
         <source>Determines the maximum number of CPU cores that can be used in a build, regardless of the number of available Agents. It takes into account both local and remote cores, even if the Avoid Task Execution on Local Machine option is selected.</source>
-        <translation>Bestimmt unabhängig von der Anzahl verfügbarer Agents die maximale Anzahl CPU-Kerne, die beim Erstellen benutzt werden. Berücksichtigt sowohl lokale als auch entfernte Kerne, auch wenn die Option &quot;Lokales Ausführen von Aufgaben vermeiden&quot; ausgewählt ist.</translation>
+        <translation>Bestimmt unabhängig von der Anzahl verfügbarer Agents die maximale Anzahl CPU-Kerne, die beim Erstellen verwendet werden. Berücksichtigt sowohl lokale als auch entfernte Kerne, auch wenn die Option &quot;Lokales Ausführen von Aufgaben vermeiden&quot; ausgewählt ist.</translation>
     </message>
     <message>
         <source>Maximum CPUs to utilize in the build:</source>
@@ -34550,7 +34551,7 @@ Möchten Sie sie überschreiben?</translation>
     </message>
     <message>
         <source>Specifies a custom header line which will be displayed in the beginning of the build output text. This title will also be used for the Build History and Build Monitor displays.</source>
-        <translation>Gibt eine benutzerdefinierte Kopfzeile an, die vor der Ausgabe der Kompilierung angezeigt wird. Dieser Titel wird auch für die Anzeigen &quot;Build History&quot; und &quot;Build Monitor&quot; benutzt.</translation>
+        <translation>Gibt eine benutzerdefinierte Kopfzeile an, die vor der Ausgabe der Kompilierung angezeigt wird. Dieser Titel wird auch für die Anzeigen &quot;Build History&quot; und &quot;Build Monitor&quot; verwendet.</translation>
     </message>
     <message>
         <source>Save IncrediBuild monitor file:</source>
@@ -34558,7 +34559,7 @@ Möchten Sie sie überschreiben?</translation>
     </message>
     <message>
         <source>Writes a copy of the build progress file (.ib_mon) to the specified location. If only a folder name is given, a generated GUID will serve as the file name. The full path of the saved Build Monitor will be written to the end of the build output.</source>
-        <translation>Schreibt eine Kopie der Monitor-Datei (.ib_mon) an den angegebenen Ort. Wenn nur ein Verzeichnisname angegeben ist, wird eine generierte GUID als Dateiname benutzt. Der vollständige Pfad der gespeicherten Monitor-Datei wird am Ende der Ausgabe der Kompilierung angezeigt.</translation>
+        <translation>Schreibt eine Kopie der Monitor-Datei (.ib_mon) an den angegebenen Ort. Wenn nur ein Verzeichnisname angegeben ist, wird eine generierte GUID als Dateiname verwendet. Der vollständige Pfad der gespeicherten Monitor-Datei wird am Ende der Ausgabe der Kompilierung angezeigt.</translation>
     </message>
     <message>
         <source>Suppress STDOUT:</source>
@@ -34582,7 +34583,7 @@ Möchten Sie sie überschreiben?</translation>
     </message>
     <message>
         <source>Shows, for each file built, the command-line used by IncrediBuild to build the file.</source>
-        <translation>Zeigt für jede Datei die Kommandozeile, die von IncrediBuild zum Erstellen der Datei benutzt wird.</translation>
+        <translation>Zeigt für jede Datei die Kommandozeile, die von IncrediBuild zum Erstellen der Datei verwendet wird.</translation>
     </message>
     <message>
         <source>Show Agents in output:</source>
@@ -34590,7 +34591,7 @@ Möchten Sie sie überschreiben?</translation>
     </message>
     <message>
         <source>Shows the Agent used to build each file.</source>
-        <translation>Zeigt für jede Datei den Agent, der zum Erstellen der Datei benutzt wird.</translation>
+        <translation>Zeigt für jede Datei den Agent, der zum Erstellen der Datei verwendet wird.</translation>
     </message>
     <message>
         <source>Show Time in output:</source>
@@ -34605,16 +34606,16 @@ Möchten Sie sie überschreiben?</translation>
         <translation>IncrediBuilds Kopfzeile in der Ausgabe verstecken:</translation>
     </message>
     <message>
-        <source>Suppresses IncrediBuild&apos;s header in the build output</source>
-        <translation>Unterdrückt die Kopfzeile von IncrediBuild in der Ausgabe der Kompilierung</translation>
+        <source>Suppresses IncrediBuild&apos;s header in the build output.</source>
+        <translation>Unterdrückt die Kopfzeile von IncrediBuild in der Ausgabe der Kompilierung.</translation>
     </message>
     <message>
         <source>Internal IncrediBuild logging level:</source>
         <translation>Stufe der internen IncrediBuild-Protokollierung:</translation>
     </message>
     <message>
-        <source>Overrides the internal Incredibuild logging level for this build. Does not affect output or any user accessible logging. Used mainly to troubleshoot issues with the help of IncrediBuild support</source>
-        <translation>Überschreibt die Stufe der internen Protokollierung von IncrediBuild für diese Kompilierung. Beeinflusst weder die Ausgabe noch die dem Benutzer zugängliche Protokollierung. Wird hauptsächlich zur Fehlerbehebung mit Hilfe des Supports von IncrediBuild benutzt</translation>
+        <source>Overrides the internal Incredibuild logging level for this build. Does not affect output or any user accessible logging. Used mainly to troubleshoot issues with the help of IncrediBuild support.</source>
+        <translation>Überschreibt die Stufe der internen Protokollierung von IncrediBuild für diese Kompilierung. Beeinflusst weder die Ausgabe noch die dem Benutzer zugängliche Protokollierung. Wird hauptsächlich zur Fehlerbehebung mit Hilfe des Supports von IncrediBuild verwendet.</translation>
     </message>
     <message>
         <source>Miscellaneous</source>
@@ -34633,16 +34634,16 @@ Möchten Sie sie überschreiben?</translation>
         <translation>Bei Fehler anhalten:</translation>
     </message>
     <message>
-        <source>When specified, the execution will stop as soon as an error is encountered. This is the default behavior in &quot;Visual Studio&quot; builds, but not the default for &quot;Make and Build tools&quot; or &quot;Dev Tools&quot; builds</source>
-        <translation>Wenn angegeben, wird die Ausführung angehalten sobald ein Fehler auftritt. Dies ist das voreingestellte Verhalten bei Kompilierungen mit &quot;Visual Studio&quot;, aber nicht für Kompilierungen mit &quot;Make and Build tools&quot; oder &quot;Dev Tools&quot;</translation>
+        <source>When specified, the execution will stop as soon as an error is encountered. This is the default behavior in &quot;Visual Studio&quot; builds, but not the default for &quot;Make and Build tools&quot; or &quot;Dev Tools&quot; builds.</source>
+        <translation>Wenn angegeben, wird die Ausführung angehalten sobald ein Fehler auftritt. Dies ist das voreingestellte Verhalten bei Kompilierungen mit &quot;Visual Studio&quot;, aber nicht für Kompilierungen mit &quot;Make and Build tools&quot; oder &quot;Dev Tools&quot;.</translation>
     </message>
     <message>
         <source>Additional Arguments:</source>
         <translation>Zusätzliche Argumente:</translation>
     </message>
     <message>
-        <source>Add additional buildconsole arguments manually. The value of this field will be concatenated to the final buildconsole command line</source>
-        <translation>Fügt zusätzliche Argumente für buildconsole manuell hinzu. Der Inhalt dieses Eingabefelds wird an die finale Kommandozeile für buildconsole angefügt</translation>
+        <source>Add additional buildconsole arguments manually. The value of this field will be concatenated to the final buildconsole command line.</source>
+        <translation>Fügt zusätzliche Argumente für buildconsole manuell hinzu. Der Inhalt dieses Eingabefelds wird an die finale Kommandozeile für buildconsole angefügt.</translation>
     </message>
     <message>
         <source>Open Build Monitor:</source>
@@ -34666,11 +34667,11 @@ Möchten Sie sie überschreiben?</translation>
     </message>
     <message>
         <source>Force remote:</source>
-        <translation>&quot;--force-remote&quot; benutzen:</translation>
+        <translation>&quot;--force-remote&quot; verwenden:</translation>
     </message>
     <message>
         <source>Alternate tasks preference:</source>
-        <translation>&quot;--alternate&quot; benutzen:</translation>
+        <translation>&quot;--alternate&quot; verwenden:</translation>
     </message>
     <message>
         <source>CMake</source>
@@ -34782,7 +34783,7 @@ Möchten Sie sie überschreiben?</translation>
     </message>
     <message>
         <source>The provisioning profile &quot;%1&quot; (%2) used to sign the application does not cover the device %3 (%4). Deployment to it will fail.</source>
-        <translation>Das zum Signieren der Anwendung verwendete Provisioning-Profil &quot;%1&quot; (%2) deckt das Gerät %3 (%4) nicht ab. Deployment auf dieses wird scheitern.</translation>
+        <translation>Das zum Signieren der Anwendung verwendete Provisioning-Profil &quot;%1&quot; (%2) deckt das Gerät %3 (%4) nicht ab. Deployment auf dieses wird fehlschlagen.</translation>
     </message>
     <message>
         <source>Deploy to iOS device</source>
@@ -34880,7 +34881,7 @@ Möchten Sie sie überschreiben?</translation>
     </message>
     <message>
         <source>To use this device you need to enable developer mode on it.</source>
-        <translation>Um dieses Gerät zu benutzen, müssen Sie darauf den Entwicklungsmodus aktivieren.</translation>
+        <translation>Um dieses Gerät zu verwenden, müssen Sie darauf den Entwicklungsmodus aktivieren.</translation>
     </message>
     <message>
         <source>%1 is not connected. Select %2?</source>
@@ -34912,11 +34913,11 @@ Möchten Sie sie überschreiben?</translation>
     </message>
     <message>
         <source>Application install on simulator failed. Simulator not running.</source>
-        <translation>Die Installation der Anwendung im Simulator ist gescheitert. Der Simulator läuft nicht.</translation>
+        <translation>Die Installation der Anwendung im Simulator ist fehlgeschlagen. Der Simulator läuft nicht.</translation>
     </message>
     <message>
         <source>Application launch on simulator failed. Invalid bundle path %1</source>
-        <translation>Der Start der Anwendung im Simulator ist gescheitert. Der Bundle-Pfad %1 ist ungültig</translation>
+        <translation>Der Start der Anwendung im Simulator ist fehlgeschlagen. Der Bundle-Pfad %1 ist ungültig</translation>
     </message>
     <message>
         <source>Application launch on simulator failed. Simulator not running. %1</source>
@@ -34924,7 +34925,7 @@ Möchten Sie sie überschreiben?</translation>
     </message>
     <message>
         <source>Application install on simulator failed. %1</source>
-        <translation>Die Installation der Anwendung im Simulator ist gescheitert. %1</translation>
+        <translation>Die Installation der Anwendung im Simulator ist fehlgeschlagen. %1</translation>
     </message>
     <message>
         <source>Cannot capture console output from %1. Error redirecting output to %2.*</source>
@@ -34936,7 +34937,7 @@ Möchten Sie sie überschreiben?</translation>
     </message>
     <message>
         <source>Application launch on simulator failed. %1</source>
-        <translation>Der Start der Anwendung im Simulator ist gescheitert. %1</translation>
+        <translation>Der Start der Anwendung im Simulator ist fehlgeschlagen. %1</translation>
     </message>
     <message>
         <source>Invalid simulator response. Device Id mismatch. Device Id = %1 Response Id = %2</source>
@@ -35282,7 +35283,7 @@ Ablaufdatum: %3</translation>
     </message>
     <message>
         <source>Using default development team and provisioning profile.</source>
-        <translation>Die Vorgaben für Entwicklerteam und Provisioning-Profil werden benutzt.</translation>
+        <translation>Die Vorgaben für Entwicklerteam und Provisioning-Profil werden verwendet.</translation>
     </message>
     <message>
         <source>Development team: %1 (%2)</source>
@@ -35294,7 +35295,7 @@ Ablaufdatum: %3</translation>
     </message>
     <message>
         <source>%1 not configured. Use Xcode and Apple developer account to configure the provisioning profiles and teams.</source>
-        <translation>%1 sind nicht konfiguriert. Benutzen Sie Xcode und Ihr Apple-Entwicklerkonto, um die Provisioning-Profile und Teams zu konfigurieren.</translation>
+        <translation>%1 sind nicht konfiguriert. Verwenden Sie Xcode und Ihr Apple-Entwicklerkonto, um die Provisioning-Profile und Teams zu konfigurieren.</translation>
     </message>
     <message>
         <source>Development teams</source>
@@ -35565,7 +35566,7 @@ Beispiel: *.cpp%1*.h</translation>
         <source>Additional JSON configuration sent to all running language servers for this project.
 See the documentation of the specific language server for valid settings.</source>
         <translation>Zusätzliche JSON-Konfiguration, die an alle laufenden Language Server für dieses Projekt gesendet wird.
-Für gültige Einstellungen schauen Sie in die Dokumentation des benutzten Language Servers.</translation>
+Für gültige Einstellungen schauen Sie in die Dokumentation des verwendeten Language Servers.</translation>
     </message>
     <message>
         <source>&amp;Add</source>
@@ -36491,15 +36492,15 @@ Für gültige Einstellungen schauen Sie in die Dokumentation des benutzten Langu
     </message>
     <message>
         <source>User</source>
-        <translation>Nutzer</translation>
+        <translation>Benutzer</translation>
     </message>
     <message>
         <source>Username to use by default on commit.</source>
-        <translation>Nutzername für Commit.</translation>
+        <translation>Benutzername für Commit.</translation>
     </message>
     <message>
         <source>Default username:</source>
-        <translation>Vorgabe für Nutzernamen:</translation>
+        <translation>Vorgabe für Benutzernamen:</translation>
     </message>
     <message>
         <source>Email to use by default on commit.</source>
@@ -36539,7 +36540,7 @@ Für gültige Einstellungen schauen Sie in die Dokumentation des benutzten Langu
     </message>
     <message>
         <source>Prompt for credentials</source>
-        <translation>Nutzerdaten abfragen</translation>
+        <translation>Benutzerdaten abfragen</translation>
     </message>
     <message>
         <source>For example: &quot;https://[user[:pass]@]host[:port]/[path]&quot;.</source>
@@ -37033,7 +37034,7 @@ Dies ist hilfreich, wenn das Build-Verzeichnis beschädigt ist oder das Projekt
     </message>
     <message>
         <source>Edit Element Properties</source>
-        <translation>Elementeigenschaften editieren</translation>
+        <translation>Elementeigenschaften bearbeiten</translation>
     </message>
     <message>
         <source>Shift+Return</source>
@@ -37041,7 +37042,7 @@ Dies ist hilfreich, wenn das Build-Verzeichnis beschädigt ist oder das Projekt
     </message>
     <message>
         <source>Edit Item on Diagram</source>
-        <translation>Element auf Diagramm editieren</translation>
+        <translation>Element auf Diagramm bearbeiten</translation>
     </message>
     <message>
         <source>Return</source>
@@ -37346,7 +37347,7 @@ Dies ist hilfreich, wenn das Build-Verzeichnis beschädigt ist oder das Projekt
     <name>QtC::PerfProfiler</name>
     <message>
         <source>Stack snapshot size (kB):</source>
-        <translation>Größe des Stack-Abbilds (kB):</translation>
+        <translation>Größe des Stackabbilds (kB):</translation>
     </message>
     <message>
         <source>Call graph mode:</source>
@@ -37963,7 +37964,7 @@ Weitere Erklärungen sind möglicherweise in &quot;Ausgabe der Anwendung&quot; z
     </message>
     <message>
         <source>Edit File</source>
-        <translation>Datei zum Editieren anfordern</translation>
+        <translation>Datei zum Bearbeiten anfordern</translation>
     </message>
     <message>
         <source>Add</source>
@@ -38315,15 +38316,15 @@ Weitere Erklärungen sind möglicherweise in &quot;Ausgabe der Anwendung&quot; z
     </message>
     <message>
         <source>P4 client:</source>
-        <translation>P4 Client:</translation>
+        <translation>P4-Client:</translation>
     </message>
     <message>
         <source>P4 user:</source>
-        <translation>P4 Nutzer:</translation>
+        <translation>P4-Benutzer:</translation>
     </message>
     <message>
         <source>P4 port:</source>
-        <translation>P4 Port-Nummer:</translation>
+        <translation>P4-Port:</translation>
     </message>
     <message>
         <source>Environment Variables</source>
@@ -38343,7 +38344,7 @@ Weitere Erklärungen sind möglicherweise in &quot;Ausgabe der Anwendung&quot; z
     </message>
     <message>
         <source>User:</source>
-        <translation>Nutzer:</translation>
+        <translation>Benutzer:</translation>
     </message>
     <message>
         <source>No executable specified</source>
@@ -38600,7 +38601,7 @@ Weitere Erklärungen sind möglicherweise in &quot;Ausgabe der Anwendung&quot; z
     </message>
     <message>
         <source>Locates files of all open projects. Append &quot;+&lt;number&gt;&quot; or &quot;:&lt;number&gt;&quot; to jump to the given line number. Append another &quot;+&lt;number&gt;&quot; or &quot;:&lt;number&gt;&quot; to jump to the column number as well.</source>
-        <translation>Findet Dateien in allen geöffneten Projekten. Fügen Sie &quot;+&lt;Zahl&gt;&quot; oder &quot;:&lt;Zahl&gt;&quot; an, um zur angegebenen Zeile zu springen. Fügen Sie noch einmal &quot;+&lt;Zahl&gt;&quot; oder &quot;:&lt;Zahl&gt;&quot; an, um auch zur angegebenen Spalte zu springen.</translation>
+        <translation>Findet Dateien in allen geöffneten Projekten. Fügen Sie &quot;+&lt;Zahl&gt;&quot; oder &quot;:&lt;Zahl&gt;&quot; an, um zur angegebenen Zeile zu springen. Fügen Sie erneut &quot;+&lt;Zahl&gt;&quot; oder &quot;:&lt;Zahl&gt;&quot; an, um auch zur angegebenen Spalte zu springen.</translation>
     </message>
     <message>
         <source>All Projects</source>
@@ -38700,7 +38701,7 @@ Außer: %2
     </message>
     <message>
         <source>Locates files from the current document&apos;s project. Append &quot;+&lt;number&gt;&quot; or &quot;:&lt;number&gt;&quot; to jump to the given line number. Append another &quot;+&lt;number&gt;&quot; or &quot;:&lt;number&gt;&quot; to jump to the column number as well.</source>
-        <translation>Findet Dateien im Projekt des aktuellen Dokuments. Fügen Sie &quot;+&lt;Zahl&gt;&quot; oder &quot;:&lt;Zahl&gt;&quot; an, um zur angegebenen Zeile zu springen. Fügen Sie noch einmal &quot;+&lt;Zahl&gt;&quot; oder &quot;:&lt;Zahl&gt;&quot; an, um auch zur angegebenen Spalte zu springen.</translation>
+        <translation>Findet Dateien im Projekt des aktuellen Dokuments. Fügen Sie &quot;+&lt;Zahl&gt;&quot; oder &quot;:&lt;Zahl&gt;&quot; an, um zur angegebenen Zeile zu springen. Fügen Sie erneut &quot;+&lt;Zahl&gt;&quot; oder &quot;:&lt;Zahl&gt;&quot; an, um auch zur angegebenen Spalte zu springen.</translation>
     </message>
     <message>
         <source>Project &quot;%1&quot;</source>
@@ -38763,7 +38764,7 @@ konnte dem Projekt &quot;%2&quot; nicht hinzugefügt werden.</translation>
     </message>
     <message>
         <source>Hide Source and Header Groups</source>
-        <translation>Source- und Headergruppen ausblenden</translation>
+        <translation>Quelltext- und Header-Gruppenverzeichnisse ausblenden</translation>
     </message>
     <message>
         <source>Synchronize with Editor</source>
@@ -39334,7 +39335,7 @@ Bitte versuchen Sie es erneut.</translation>
     </message>
     <message>
         <source>Expand</source>
-        <translation>Erweitern</translation>
+        <translation>Aufklappen</translation>
     </message>
     <message>
         <source>Ctrl+T</source>
@@ -39450,7 +39451,7 @@ Bitte versuchen Sie es erneut.</translation>
     </message>
     <message>
         <source>Locates files from all project directories. Append &quot;+&lt;number&gt;&quot; or &quot;:&lt;number&gt;&quot; to jump to the given line number. Append another &quot;+&lt;number&gt;&quot; or &quot;:&lt;number&gt;&quot; to jump to the column number as well.</source>
-        <translation>Findet Dateien in allen Projektverzeichnissen. Fügen Sie &quot;+&lt;Zahl&gt;&quot; oder &quot;:&lt;Zahl&gt;&quot; an, um zur angegebenen Zeile zu springen. Fügen Sie noch einmal &quot;+&lt;Zahl&gt;&quot; oder &quot;:&lt;Zahl&gt;&quot; an, um auch zur angegebenen Spalte zu springen.</translation>
+        <translation>Findet Dateien in allen Projektverzeichnissen. Fügen Sie &quot;+&lt;Zahl&gt;&quot; oder &quot;:&lt;Zahl&gt;&quot; an, um zur angegebenen Zeile zu springen. Fügen Sie erneut &quot;+&lt;Zahl&gt;&quot; oder &quot;:&lt;Zahl&gt;&quot; an, um auch zur angegebenen Spalte zu springen.</translation>
     </message>
     <message>
         <source>Run Run Configuration</source>
@@ -39462,11 +39463,11 @@ Bitte versuchen Sie es erneut.</translation>
     </message>
     <message>
         <source>Debug Run Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausführungskonfiguration debuggen</translation>
     </message>
     <message>
         <source>Starts debugging a run configuration of the active project.</source>
-        <translation type="unfinished"></translation>
+        <translation>Startet das Debuggen einer Ausführungskonfiguration des aktiven Projekts.</translation>
     </message>
     <message>
         <source>Switch Run Configuration</source>
@@ -40108,7 +40109,7 @@ The name of the build configuration created by default for a generic project.</e
     </message>
     <message>
         <source>Remote process did not finish in time. Connectivity lost?</source>
-        <translation type="unfinished"></translation>
+        <translation>Der entfernte Prozess wurde nicht rechtzeitig beendet. Verbindung verloren?</translation>
     </message>
     <message>
         <source>Starting %1...</source>
@@ -40248,11 +40249,11 @@ Aktivieren Sie dies, wenn Sie 32bit-x86-Binärdateien erstellen wollen, ohne ein
     </message>
     <message>
         <source>The following compiler was already configured:&lt;br&gt;&amp;nbsp;%1&lt;br&gt;It was not configured again.</source>
-        <translation>Der folgende Compiler ist bereits konfiguriert:&lt;br&gt;&amp;nbsp;%1&lt;br&gt;Er wurde nicht noch einmal konfiguriert.</translation>
+        <translation>Der folgende Compiler ist bereits konfiguriert:&lt;br&gt;&amp;nbsp;%1&lt;br&gt;Er wurde nicht erneut konfiguriert.</translation>
     </message>
     <message>
         <source>The following compilers were already configured:&lt;br&gt;&amp;nbsp;%1&lt;br&gt;They were not configured again.</source>
-        <translation>Die folgenden Compiler wurden bereits konfiguriert:&lt;br&gt;&amp;nbsp;%1&lt;br&gt;Sie wurden nicht noch einmal konfiguriert.</translation>
+        <translation>Die folgenden Compiler wurden bereits konfiguriert:&lt;br&gt;&amp;nbsp;%1&lt;br&gt;Sie wurden nicht erneut konfiguriert.</translation>
     </message>
     <message>
         <source>Clone of %1</source>
@@ -40587,7 +40588,7 @@ Aktivieren Sie dies, wenn Sie 32bit-x86-Binärdateien erstellen wollen, ohne ein
     </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The name of the kit suitable for generating directory names. This value is used for the variable &lt;i&gt;%1&lt;/i&gt;, which for example determines the name of the shadow build directory.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Der Name des Kits, der zum Erzeugen von Verzeichnisnamen geeignet ist. Dieser Wert wird für die Variable &lt;i&gt;%1&lt;/i&gt; benutzt, die zum Beispiel den Namen des Shadow-Build-Verzeichnisses bestimmt.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Der Name des Kits, der zum Erzeugen von Verzeichnisnamen geeignet ist. Dieser Wert wird für die Variable &lt;i&gt;%1&lt;/i&gt; verwendet, die zum Beispiel den Namen des Shadow-Build-Verzeichnisses bestimmt.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <source>File system name:</source>
@@ -40871,7 +40872,7 @@ Aktivieren Sie dies, wenn Sie 32bit-x86-Binärdateien erstellen wollen, ohne ein
     <message>
         <source>The process cannot access the file because it is being used by another process.
 Please close all running instances of your application before starting a build.</source>
-        <translation>Der Prozess kann nicht auf die Datei zugreifen, da sie von einem anderen Prozess benutzt wird.
+        <translation>Der Prozess kann nicht auf die Datei zugreifen, da sie von einem anderen Prozess verwendet wird.
 Bitte schließen Sie alle laufenden Instanzen Ihrer Anwendung vor dem Erstellen.</translation>
     </message>
     <message>
@@ -41051,11 +41052,11 @@ Bitte schließen Sie alle laufenden Instanzen Ihrer Anwendung vor dem Erstellen.
     </message>
     <message>
         <source>File Generation Failed</source>
-        <translation>Dateierzeugung gescheitert</translation>
+        <translation>Dateierzeugung fehlgeschlagen</translation>
     </message>
     <message>
         <source>The wizard failed to generate files.&lt;br&gt;The error message was: &quot;%1&quot;.</source>
-        <translation>Der Wizard scheiterte beim Erzeugen von Dateien.&lt;br&gt;Die Fehlermeldung war: &quot;%1&quot;.</translation>
+        <translation>Der Wizard konnte Dateien nicht erzeugen.&lt;br&gt;Die Fehlermeldung war: &quot;%1&quot;.</translation>
     </message>
     <message>
         <source>Failed to Overwrite Files</source>
@@ -41075,7 +41076,7 @@ Bitte schließen Sie alle laufenden Instanzen Ihrer Anwendung vor dem Erstellen.
     </message>
     <message>
         <source>Failed to Polish Files</source>
-        <translation>&quot;Polish&quot; von Dateien gescheitert</translation>
+        <translation>&quot;Polish&quot; von Dateien fehlgeschlagen</translation>
     </message>
     <message>
         <source>Failed to Open Files</source>
@@ -41317,7 +41318,7 @@ Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern verfügbar
 Use this &quot;compat&quot; version if you want to use other build systems than CMake or Qt versions lower than 6.</source>
         <translation>Erstellt eine Qt Quick-Anwendung, die ein leeres Fenster enthält.
 
-Nutzen Sie diese &quot;Kompatibilitätsversion&quot;, falls Sie andere Buildsysteme als CMake oder frühere Qt-Versionen als Qt 6 benutzen wollen.</translation>
+Nutzen Sie diese &quot;Kompatibilitätsversion&quot;, falls Sie andere Buildsysteme als CMake oder frühere Qt-Versionen als Qt 6 verwenden wollen.</translation>
     </message>
     <message>
         <source>Qt Quick Application (compat)</source>
@@ -41451,7 +41452,7 @@ Wahlweise können Sie ein Projekt erstellen, das in Qt Design Studio geöffnet w
         <source>You must tell Qt Creator which test framework is used inside the project.
 
 You should not mix multiple test frameworks in a project.</source>
-        <translation>Sie müssen Qt Creator mitteilen, welches Test-Framework im Projekt benutzt wird.
+        <translation>Sie müssen Qt Creator mitteilen, welches Test-Framework im Projekt verwendet wird.
 
 Sie sollten nicht mehrere Test-Frameworks im selben Projekt mischen.</translation>
     </message>
@@ -41823,7 +41824,7 @@ Sie sollten nicht mehrere Test-Frameworks im selben Projekt mischen.</translatio
     </message>
     <message>
         <source>Specify basic information about the classes for which you want to generate skeleton source code files.</source>
-        <translation>Geben Sie Informationen bezüglich der Klassen ein, für die Sie Quelltexte generieren wollen.</translation>
+        <translation>Geben Sie Informationen bezüglich der Klassen ein, für die Sie Quelltext generieren wollen.</translation>
     </message>
     <message>
         <source>Fully qualified name, including namespaces</source>
@@ -41915,7 +41916,7 @@ Sie sollten nicht mehrere Test-Frameworks im selben Projekt mischen.</translatio
     </message>
     <message>
         <source>Include QQuickItem</source>
-        <translation type="unfinished"></translation>
+        <translation>QQuickItem einbinden</translation>
     </message>
     <message>
         <source>Qt 6.2</source>
@@ -42047,7 +42048,7 @@ Sie sollten nicht mehrere Test-Frameworks im selben Projekt mischen.</translatio
     </message>
     <message>
         <source>The minimum version of Qt you want to build the application for</source>
-        <translation>Die niedrigste Qt-Version, die Sie zum Bauen der Anwendung benutzen wollen</translation>
+        <translation>Die niedrigste Qt-Version, die Sie zum Bauen der Anwendung verwenden wollen</translation>
     </message>
     <message>
         <source>This wizard creates a simple unit test project using Boost.</source>
@@ -42143,23 +42144,23 @@ Sie sollten nicht mehrere Test-Frameworks im selben Projekt mischen.</translatio
     </message>
     <message>
         <source>Creates a translation file that you can add to a Qt project.</source>
-        <translation type="unfinished"></translation>
+        <translation>Erzeugt eine Übersetzungsdatei, die Sie zu einem Qt-Projekt hinzufügen können.</translation>
     </message>
     <message>
         <source>Qt Translation File</source>
-        <translation type="unfinished"></translation>
+        <translation>Qt Übersetzungsdatei</translation>
     </message>
     <message>
         <source>2.x</source>
-        <translation type="unfinished"></translation>
+        <translation>2.x</translation>
     </message>
     <message>
         <source>3.x</source>
-        <translation type="unfinished"></translation>
+        <translation>3.x</translation>
     </message>
     <message>
         <source>Catch2 version:</source>
-        <translation type="unfinished"></translation>
+        <translation>Catch2-Version:</translation>
     </message>
     <message>
         <source>Creates a CMake-based test project for which a code snippet can be entered.</source>
@@ -42650,45 +42651,32 @@ Sie sollten nicht mehrere Test-Frameworks im selben Projekt mischen.</translatio
         <translation>Page mit typeId &quot;%1&quot; hat ungültigen &quot;index&quot;.</translation>
     </message>
     <message>
-        <source>Path &quot;%1&quot; does not exist when checking Json wizard search paths.
-</source>
-        <translation>Pfad &quot;%1&quot; existiert nicht in Json-Wizard Suchpfaden.
-</translation>
+        <source>Path &quot;%1&quot; does not exist when checking JSON wizard search paths.</source>
+        <translation>Pfad &quot;%1&quot; existiert nicht in JSON-Wizard Suchpfaden.</translation>
     </message>
     <message>
-        <source>Checking &quot;%1&quot; for %2.
-</source>
-        <translation>Prüfe &quot;%1&quot; für %2.
-</translation>
+        <source>Checking &quot;%1&quot; for %2.</source>
+        <translation>Prüfe &quot;%1&quot; für %2.</translation>
     </message>
     <message>
-        <source>* Failed to parse &quot;%1&quot;:%2:%3: %4
-</source>
-        <translation>* Konnte &quot;%1&quot; nicht auswerten: %2:%3: %4
-</translation>
+        <source>* Failed to parse &quot;%1&quot;:%2:%3: %4</source>
+        <translation>* Konnte &quot;%1&quot; nicht auswerten: %2:%3: %4</translation>
     </message>
     <message>
-        <source>* Did not find a JSON object in &quot;%1&quot;.
-</source>
-        <translation>* Kein JSON-Objekt in &quot;%1&quot; gefunden.
-</translation>
+        <source>* Did not find a JSON object in &quot;%1&quot;.</source>
+        <translation>* Kein JSON-Objekt in &quot;%1&quot; gefunden.</translation>
     </message>
     <message>
-        <source>* Configuration found and parsed.
-</source>
-        <translation>* Konfiguration gefunden und ausgewertet.
-</translation>
+        <source>* Configuration found and parsed.</source>
+        <translation>* Konfiguration gefunden und ausgewertet.</translation>
     </message>
     <message>
-        <source>* Version %1 not supported.
-</source>
-        <translation>* Version %1 nicht unterstützt.
-</translation>
+        <source>* Version %1 not supported.</source>
+        <translation>* Version %1 nicht unterstützt.</translation>
     </message>
     <message>
-        <source>* Failed to create: %1
-</source>
-        <translation type="unfinished"></translation>
+        <source>* Failed to create: %1</source>
+        <translation>* Erstellen fehlgeschlagen: %1</translation>
     </message>
     <message>
         <source>The platform selected for the wizard.</source>
@@ -42719,10 +42707,8 @@ Sie sollten nicht mehrere Test-Frameworks im selben Projekt mischen.</translatio
         <translation>Bilddatei &quot;%1&quot; nicht gefunden.</translation>
     </message>
     <message>
-        <source>JsonWizard: &quot;%1&quot; not found
-</source>
-        <translation>JsonWizard: &quot;%1&quot; nicht gefunden
-</translation>
+        <source>JsonWizard: &quot;%1&quot; not found.</source>
+        <translation>JsonWizard: &quot;%1&quot; nicht gefunden.</translation>
     </message>
     <message>
         <source>key not found.</source>
@@ -42820,7 +42806,7 @@ Sie sollten nicht mehrere Test-Frameworks im selben Projekt mischen.</translatio
     </message>
     <message>
         <source>Project &quot;%1&quot; was configured for kit &quot;%2&quot; with id %3, which does not exist anymore. You can create a new kit or copy the steps of the vanished kit to another kit in %4 mode.</source>
-        <translation type="unfinished"></translation>
+        <translation>Das Projekt &quot;%1&quot; wurde für das Kit &quot;%2&quot; mit ID %3 konfiguriert, das nicht mehr existiert. Sie können im %4-Modus ein neues Kit erstellen oder die Schritte des verschwundenen Kits in ein anderes Kit kopieren.</translation>
     </message>
     <message>
         <source>Could not find any qml_*.qm file at &quot;%1&quot;</source>
@@ -43072,40 +43058,40 @@ Sie werden erhalten.</numerusform>
     </message>
     <message>
         <source>The project was configured for kits that no longer exist. Select one of the following options in the context menu to restore the project&apos;s settings:</source>
-        <translation type="unfinished"></translation>
+        <translation>Das Projekt wurde für Kits konfiguriert, die nicht mehr existieren. Wählen Sie eine der folgenden Optionen aus dem Kontextmenü, um die Projekteinstellungen wiederherzustellen:</translation>
     </message>
     <message>
         <source>Create a new kit with the same name for the same device type, with the original build, deploy, and run steps. Other kit settings are not restored.</source>
-        <translation type="unfinished"></translation>
+        <translation>Erstelle ein neues Kit mit demselben Namen und für denselben Gerätetyp mit den ursprünglichen Schritten zum Erstellen, Deployment und Ausführen. Andere Einstellungen des Kits werden nicht wiederhergestellt.</translation>
     </message>
     <message>
         <source>Copy the build, deploy, and run steps to another kit.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopiere die Schritte zum Erstellen, Deployment und Ausführen in ein anderes Kit.</translation>
     </message>
     <message>
         <source>%1 (%2)</source>
         <extracomment>vanished target display role: vanished target name (device type name)</extracomment>
-        <translation type="unfinished">%1 (%2)</translation>
+        <translation>%1 (%2)</translation>
     </message>
     <message>
         <source>Create a New Kit</source>
-        <translation type="unfinished"></translation>
+        <translation>Ein neues Kit erstellen</translation>
     </message>
     <message>
         <source>Copy Steps to Another Kit</source>
-        <translation type="unfinished"></translation>
+        <translation>Schritte in ein anderes Kit kopieren</translation>
     </message>
     <message>
         <source>Remove Vanished Target &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>Verschwundenes Ziel &quot;%1&quot; entfernen</translation>
     </message>
     <message>
         <source>Remove All Vanished Targets</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle verschwundenen Ziele entfernen</translation>
     </message>
     <message>
         <source>Vanished Targets</source>
-        <translation type="unfinished"></translation>
+        <translation>Verschwundene Ziele</translation>
     </message>
     <message>
         <source>Project Settings</source>
@@ -43338,7 +43324,7 @@ Was soll %1 tun?</translation>
     </message>
     <message>
         <source>A version control operation failed for the following files. Please check your repository.</source>
-        <translation>Für die folgenden Dateien ist eine Versionskontroll-Operation gescheitert. Bitte prüfen Sie Ihr Repository.</translation>
+        <translation>Für die folgenden Dateien ist eine Versionskontroll-Operation fehlgeschlagen. Bitte prüfen Sie Ihr Repository.</translation>
     </message>
     <message>
         <source>Failure Updating Project</source>
@@ -43442,15 +43428,15 @@ Was soll %1 tun?</translation>
     </message>
     <message>
         <source>Overriding &lt;code&gt;MAKEFLAGS&lt;/code&gt; environment variable.</source>
-        <translation type="unfinished"></translation>
+        <translation>Überschreibe die &lt;code&gt;MAKEFLAGS&lt;/code&gt; Umgebungsvariable.</translation>
     </message>
     <message>
         <source>&lt;code&gt;MAKEFLAGS&lt;/code&gt; specifies a conflicting job count.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;code&gt;MAKEFLAGS&lt;/code&gt; gibt eine zu den Einstellungen widersprüchliche Anzahl Jobs an.</translation>
     </message>
     <message>
         <source>No conflict with &lt;code&gt;MAKEFLAGS&lt;/code&gt; environment variable.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kein Konflikt mit der &lt;code&gt;MAKEFLAGS&lt;/code&gt; Umgebungsvariable.</translation>
     </message>
     <message>
         <source>Enable connection sharing:</source>
@@ -43560,11 +43546,11 @@ Was soll %1 tun?</translation>
     </message>
     <message>
         <source>Build directory contains potentially problematic character &quot;%1&quot;.</source>
-        <translation type="unfinished"></translation>
+        <translation>Das Build-Verzeichnis enthält das möglicherweise problematische Zeichen &quot;%1&quot;.</translation>
     </message>
     <message>
-        <source> This warning can be suppressed &lt;a href=&quot;dummy&quot;&gt;here&lt;/a&gt;.</source>
-        <translation type="unfinished"></translation>
+        <source>This warning can be suppressed &lt;a href=&quot;dummy&quot;&gt;here&lt;/a&gt;.</source>
+        <translation>Diese Warnung kann &lt;a href=&quot;dummy&quot;&gt;hier&lt;/a&gt; unterdrückt werden.</translation>
     </message>
     <message>
         <source>The project is currently being parsed.</source>
@@ -43740,11 +43726,11 @@ Was soll %1 tun?</translation>
     </message>
     <message>
         <source>Either switches MSVC to English or keeps the language and just forces UTF-8 output (may vary depending on the used MSVC compiler).</source>
-        <translation>Stellt MSVC entweder auf Englisch um oder behält die Sprache bei und erzwingt UTF-8-Ausgabe (abhängig vom benutzen MSVC-Compiler).</translation>
+        <translation>Stellt MSVC entweder auf Englisch um oder behält die Sprache bei und erzwingt UTF-8-Ausgabe (abhängig vom verwendeten MSVC-Compiler).</translation>
     </message>
     <message>
         <source>Additional build environment settings when using this kit.</source>
-        <translation>Zusätzliche Build-Umgebungseinstellungen bei Benutzung dieses Kits.</translation>
+        <translation>Zusätzliche Build-Umgebungseinstellungen bei Verwendung dieses Kits.</translation>
     </message>
     <message>
         <source>The environment setting value is invalid.</source>
@@ -43804,7 +43790,7 @@ Was soll %1 tun?</translation>
     </message>
     <message>
         <source>Use parsers from kit:</source>
-        <translation>Parser vom Kit benutzen:</translation>
+        <translation>Parser vom Kit verwenden:</translation>
     </message>
     <message>
         <source>Cannot Parse</source>
@@ -43877,11 +43863,11 @@ Was soll %1 tun?</translation>
     </message>
     <message>
         <source>Warn against build directories with spaces or non-ASCII characters</source>
-        <translation type="unfinished"></translation>
+        <translation>Warne vor Build-Verzeichnissen mit Leerzeichen oder nicht-ASCII-Zeichen</translation>
     </message>
     <message>
         <source>Some legacy build tools do not deal well with paths that contain &quot;special&quot; characters such as spaces, potentially resulting in spurious build errors.&lt;p&gt;Uncheck this option if you do not work with such tools.</source>
-        <translation type="unfinished"></translation>
+        <translation>Einige ältere Erstellwerkzeuge kommen nicht gut mit Verzeichnissen zurecht, die &quot;spezielle&quot; Zeichen wie Leerzeichen enthalten. Dies kann zu Fehlern beim Erstellen führen.&lt;p&gt;Wählen Sie diese Option ab, wenn Sie nicht mit solchen Werkzeugen arbeiten.</translation>
     </message>
     <message>
         <source>Do Not Build Anything</source>
@@ -43929,11 +43915,11 @@ Was soll %1 tun?</translation>
     </message>
     <message>
         <source>Environment changes to apply to run configurations, but not build configurations.</source>
-        <translation type="unfinished"></translation>
+        <translation>Änderungen der Umgebung, die auf Ausführungskonfigurationen, aber nicht auf Build-Konfigurationen angewendet werden sollen.</translation>
     </message>
     <message>
         <source>Application environment:</source>
-        <translation type="unfinished"></translation>
+        <translation>Anwendungsumgebung:</translation>
     </message>
     <message>
         <source>Projects Directory</source>
@@ -44049,7 +44035,7 @@ Was soll %1 tun?</translation>
     </message>
     <message>
         <source>Use Project Default</source>
-        <translation>Projekt-Vorgabe benutzen</translation>
+        <translation>Projekt-Vorgabe verwenden</translation>
     </message>
     <message>
         <source>Default build directory:</source>
@@ -44061,7 +44047,7 @@ Was soll %1 tun?</translation>
     </message>
     <message>
         <source>Use qmlcachegen:</source>
-        <translation>qmlcachegen benutzen:</translation>
+        <translation>qmlcachegen verwenden:</translation>
     </message>
     <message>
         <source>Default Build Properties</source>
@@ -44128,7 +44114,7 @@ Was soll %1 tun?</translation>
     </message>
     <message>
         <source>If available, use a different margin. For example, the ColumnLimit from the ClangFormat plugin.</source>
-        <translation>Benutzt unterschiedlichen Rand abhängig vom Kontext, falls verfügbar. Zum Beispiel das ColumnLimit vom ClangFormat Plugin.</translation>
+        <translation>Verwendet unterschiedlichen Rand abhängig vom Kontext, falls verfügbar. Zum Beispiel das ColumnLimit vom ClangFormat Plugin.</translation>
     </message>
     <message>
         <source>Files in All Project Directories</source>
@@ -44193,7 +44179,7 @@ fails because Clang does not understand the target architecture.</source>
     </message>
     <message>
         <source>User requested stop. Shutting down...</source>
-        <translation>Abbruch auf Nutzeranforderung...</translation>
+        <translation>Abbruch auf Benutzeranforderung...</translation>
     </message>
     <message>
         <source>Cannot run: No command given.</source>
@@ -44217,7 +44203,7 @@ fails because Clang does not understand the target architecture.</source>
     </message>
     <message>
         <source>Imports existing projects that do not use qmake, CMake, Qbs, Meson, or Autotools.&lt;p&gt;This creates a project file that allows you to use %1 as a code editor and as a launcher for debugging and analyzing tools. If you want to build the project, you might need to edit the generated project file.</source>
-        <translation>Importiert ein existierendes Projekt, dass nicht qmake, CMake, Qbs, Meson oder Autotools benutzt.&lt;p&gt;Dies erstellt eine Projektdatei, die Ihnen erlaubt, %1 als Code-Editor und zum Starten des Debuggers und von Analysewerkzeugen zu benutzen. Wenn Sie das Projekt bauen wollen, müssen Sie die generierte Datei möglicherweise anpassen.</translation>
+        <translation>Importiert ein existierendes Projekt, dass nicht qmake, CMake, Qbs, Meson oder Autotools verwendet.&lt;p&gt;Dies erstellt eine Projektdatei, die Ihnen erlaubt, %1 als Code-Editor und zum Starten des Debuggers und von Analysewerkzeugen zu verwenden. Wenn Sie das Projekt bauen wollen, müssen Sie die generierte Datei möglicherweise anpassen.</translation>
     </message>
     <message>
         <source>Unknown build system &quot;%1&quot;</source>
@@ -44359,7 +44345,7 @@ fails because Clang does not understand the target architecture.</source>
     </message>
     <message>
         <source>Use Python Language Server</source>
-        <translation>Python Language Server benutzen</translation>
+        <translation>Python Language Server verwenden</translation>
     </message>
     <message>
         <source>For a complete list of available options, consult the [Python LSP Server configuration documentation](%1).</source>
@@ -44407,7 +44393,7 @@ fails because Clang does not understand the target architecture.</source>
     </message>
     <message>
         <source>You can install PySide from PyPi (Community OSS version) or from your Qt installation location, if you are using the Qt Installer and have a commercial license.</source>
-        <translation>Sie können PySide von PyPI (Community OSS-Version) oder, falls Sie den Qt-Installer benutzen und eine kommerzielle Lizenz besitzen, von Ihrer Qt-Installation installieren.</translation>
+        <translation>Sie können PySide von PyPI (Community OSS-Version) oder, falls Sie den Qt-Installer verwenden und eine kommerzielle Lizenz besitzen, von Ihrer Qt-Installation installieren.</translation>
     </message>
     <message>
         <source>Select which version to install:</source>
@@ -44556,7 +44542,7 @@ fails because Clang does not understand the target architecture.</source>
     </message>
     <message>
         <source>An item of Python wizard page data expects a &quot;trKey&quot; field containing the UI visible string for that Python version and a &quot;value&quot; field containing an object with a &quot;PySideVersion&quot; field used for import statements in the Python files.</source>
-        <translation>Ein Eintrag in den &quot;items&quot; im Feld &quot;data&quot; einer Python-Assistenzseite erwartet ein Feld &quot;trKey&quot;, das den Anzeigenamen für diese Python-Version enthält, und ein Feld &quot;value&quot;, das ein Objekt mit einem Feld &quot;PySideVersion&quot; enthält, das für import-Anweisungen in den Python-Dateien benutzt wird.</translation>
+        <translation>Ein Eintrag in den &quot;items&quot; im Feld &quot;data&quot; einer Python-Assistenzseite erwartet ein Feld &quot;trKey&quot;, das den Anzeigenamen für diese Python-Version enthält, und ein Feld &quot;value&quot;, das ein Objekt mit einem Feld &quot;PySideVersion&quot; enthält, das für import-Anweisungen in den Python-Dateien verwendet wird.</translation>
     </message>
     <message>
         <source>PySide version:</source>
@@ -44572,7 +44558,7 @@ fails because Clang does not understand the target architecture.</source>
     </message>
     <message>
         <source>The interpreter used for Python based projects.</source>
-        <translation>Der für Python-basierte Projekte benutzte Interpreter.</translation>
+        <translation>Der für Python-basierte Projekte verwendete Interpreter.</translation>
     </message>
     <message>
         <source>No Python setup.</source>
@@ -44588,7 +44574,7 @@ fails because Clang does not understand the target architecture.</source>
     </message>
     <message>
         <source>Python &quot;%1&quot; does not contain a usable pip. pip is needed to install Python packages from the Python Package Index, like PySide and the Python language server. To use any of that functionality ensure that pip is installed for that Python.</source>
-        <translation>Python &quot;%1&quot; enthält kein verwendbares pip. pip wird für das Installieren von Python-Paketen wie PySide und dem Python Language Server vom Python Package Index benötigt. Um diese Funktionen benutzen zu können, stellen Sie sicher, dass pip für dieses Python installiert ist.</translation>
+        <translation>Python &quot;%1&quot; enthält kein verwendbares pip. pip wird für das Installieren von Python-Paketen wie PySide und dem Python Language Server vom Python Package Index benötigt. Um diese Funktionen verwenden zu können, stellen Sie sicher, dass pip für dieses Python installiert ist.</translation>
     </message>
     <message>
         <source>Python &quot;%1&quot; does not contain a usable venv. venv is the recommended way to isolate a development environment for a project from the globally installed Python.</source>
@@ -44603,8 +44589,8 @@ fails because Clang does not understand the target architecture.</source>
         <translation>Pfad zum Python-Interpreter</translation>
     </message>
     <message>
-        <source>No Python interpreter set for kit &quot;%1&quot;</source>
-        <translation>Kein Python-Interpreter für das Kit &quot;%1&quot; eingerichtet</translation>
+        <source>No Python interpreter set for kit &quot;%1&quot;.</source>
+        <translation>Kein Python-Interpreter für das Kit &quot;%1&quot; eingerichtet.</translation>
     </message>
 </context>
 <context>
@@ -44898,7 +44884,7 @@ fails because Clang does not understand the target architecture.</source>
     <message>
         <source>Use %1 settings directory for Qbs</source>
         <extracomment>%1 == &quot;Qt Creator&quot; or &quot;Qt Design Studio&quot;</extracomment>
-        <translation>Das Verzeichnis für Einstellungen von %1 auch für Qbs benutzen</translation>
+        <translation>Das Verzeichnis für Einstellungen von %1 auch für Qbs verwenden</translation>
     </message>
     <message>
         <source>Path to qbs executable:</source>
@@ -44975,7 +44961,7 @@ Die betroffenen Dateien sind:
     </message>
     <message>
         <source>Qbs Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>Qbs-Editor</translation>
     </message>
 </context>
 <context>
@@ -45974,7 +45960,7 @@ Bitte aktualisieren Sie Ihr Kit (%3) oder wählen Sie eine mkspec für qmake, di
     </message>
     <message>
         <source>Checking this option avoids unwanted side effects, but may result in inexact parsing results.</source>
-        <translation>Diese Einstellung verhindert ungewollte Nebeneffekte, kann aber zu ungenauen Resultaten beim Auswerten führen.</translation>
+        <translation>Diese Einstellung verhindert ungewollte Nebeneffekte, kann aber zu ungenauen Ergebnissen beim Auswerten führen.</translation>
     </message>
     <message>
         <source>Qmake</source>
@@ -46023,7 +46009,7 @@ Bitte aktualisieren Sie Ihr Kit (%3) oder wählen Sie eine mkspec für qmake, di
     </message>
     <message>
         <source>Debug connection failed.</source>
-        <translation>Debug-Verbindung gescheitert.</translation>
+        <translation>Debug-Verbindung fehlgeschlagen.</translation>
     </message>
 </context>
 <context>
@@ -46259,9 +46245,9 @@ For qmlRegister... calls, make sure that you define the Module URI as a string l
 Import-Verzeichnisse:
 %2
 
-Für qmake-Projekte benutzen Sie die Variable QML_IMPORT_PATH, um Importpfade hinzuzufügen.
+Für qmake-Projekte verwenden Sie die Variable QML_IMPORT_PATH, um Importpfade hinzuzufügen.
 Für Qbs-Projekte geben Sie eine qmlImportPaths-Eigenschaft in Ihrem Produkt an, um Importpfade hinzuzufügen.
-Für qmlproject-Projekte benutzen Sie die importPaths-Eigenschaft, um Importpfade hinzuzufügen.
+Für qmlproject-Projekte verwenden Sie die importPaths-Eigenschaft, um Importpfade hinzuzufügen.
 Für CMake-Projekte stellen Sie sicher, dass die Variable QML_IMPORT_PATH in CMakeCache.txt steht.
 Für qmlRegister...-Aufrufe stellen Sie sicher, dass Sie den Modul-URI als Zeichenkettenliteral definieren.
 </translation>
@@ -46286,9 +46272,9 @@ For CMake projects, make sure QML_IMPORT_PATH variable is in CMakeCache.txt.
 Importpfade:
 %3
 
-Für qmake-Projekte benutzen Sie die Variable QML_IMPORT_PATH, um Importpfade hinzuzufügen.
+Für qmake-Projekte verwenden Sie die Variable QML_IMPORT_PATH, um Importpfade hinzuzufügen.
 Für Qbs-Projekte geben Sie eine qmlImportPaths-Eigenschaft in Ihrem Produkt an, um Importpfade hinzuzufügen.
-Für qmlproject-Projekte benutzen Sie die Eigenschaft importPaths, um Importpfade hinzuzufügen.
+Für qmlproject-Projekte verwenden Sie die Eigenschaft importPaths, um Importpfade hinzuzufügen.
 Für CMake-Projekte stellen Sie sicher, dass die Variable QML_IMPORT_PATH in CMakeCache.txt steht.
 </translation>
     </message>
@@ -46386,11 +46372,11 @@ Für CMake-Projekte stellen Sie sicher, dass die Variable QML_IMPORT_PATH in CMa
     </message>
     <message>
         <source>Expected array of strings after colon.</source>
-        <translation>Nach dem Doppelpunkt wird ein Feld von Zeichenketten erwartet.</translation>
+        <translation>Nach dem Doppelpunkt wird ein Array von Zeichenketten erwartet.</translation>
     </message>
     <message>
         <source>Expected array literal with only string literal members.</source>
-        <translation>Es wird ein nur aus Zeichenketten bestehendes Feldliteral erwartet.</translation>
+        <translation>Es wird ein nur aus Zeichenketten bestehendes Arrayliteral erwartet.</translation>
     </message>
     <message>
         <source>Expected string literal to contain &apos;Package/Name major.minor&apos; or &apos;Name major.minor&apos;.</source>
@@ -46398,11 +46384,11 @@ Für CMake-Projekte stellen Sie sicher, dass die Variable QML_IMPORT_PATH in CMa
     </message>
     <message>
         <source>Expected array of numbers after colon.</source>
-        <translation>Nach dem Doppelpunkt wird ein aus Zahlen bestehendes Feld erwartet.</translation>
+        <translation>Nach dem Doppelpunkt wird ein aus Zahlen bestehendes Array erwartet.</translation>
     </message>
     <message>
         <source>Expected array literal with only number literal members.</source>
-        <translation>Es wird ein nur aus Zahlenliteralen bestehendes Feldliteral erwartet.</translation>
+        <translation>Es wird ein nur aus Zahlenliteralen bestehendes Arrayliteral erwartet.</translation>
     </message>
     <message>
         <source>Meta object revision without matching export.</source>
@@ -46714,7 +46700,7 @@ Weitere Informationen finden Sie auf der Dokumentationsseite &quot;Checking Code
     </message>
     <message>
         <source>var &quot;%1&quot; is used before its declaration.</source>
-        <translation>Variable &quot;%1&quot; wird vor Deklaration benutzt.</translation>
+        <translation>Variable &quot;%1&quot; wird vor Deklaration verwendet.</translation>
     </message>
     <message>
         <source>&quot;%1&quot; already is a var.</source>
@@ -46726,7 +46712,7 @@ Weitere Informationen finden Sie auf der Dokumentationsseite &quot;Checking Code
     </message>
     <message>
         <source>Function &quot;%1&quot; is used before its declaration.</source>
-        <translation>Funktion &quot;%1&quot; wird vor ihrer Deklaration benutzt.</translation>
+        <translation>Funktion &quot;%1&quot; wird vor ihrer Deklaration verwendet.</translation>
     </message>
     <message>
         <source>Could not resolve the prototype &quot;%1&quot; of &quot;%2&quot;.</source>
@@ -46754,7 +46740,7 @@ Weitere Informationen finden Sie auf der Dokumentationsseite &quot;Checking Code
     </message>
     <message>
         <source>Array value expected.</source>
-        <translation>Feld erwartet.</translation>
+        <translation>Array erwartet.</translation>
     </message>
     <message>
         <source>%1 value expected.</source>
@@ -46790,7 +46776,7 @@ Weitere Informationen finden Sie auf der Dokumentationsseite &quot;Checking Code
     </message>
     <message>
         <source>%1 elements expected in array value.</source>
-        <translation>Das Feld benötigt %1 Werte.</translation>
+        <translation>Das Array benötigt %1 Werte.</translation>
     </message>
     <message>
         <source>Parsing QML Files</source>
@@ -47039,7 +47025,7 @@ Sie können eine Annotation &quot;// @uri My.Module.Uri&quot; hinzufügen, um de
     </message>
     <message>
         <source>Use custom command instead of built-in formatter</source>
-        <translation>Benutzerdefiniertes Kommando anstatt des integrierten Formatierers benutzen</translation>
+        <translation>Benutzerdefiniertes Kommando anstatt des integrierten Formatierers verwenden</translation>
     </message>
     <message>
         <source>Command:</source>
@@ -47071,7 +47057,7 @@ Sie können eine Annotation &quot;// @uri My.Module.Uri&quot; hinzufügen, um de
     </message>
     <message>
         <source>Use customized static analyzer</source>
-        <translation>Angepasste statische Analyse benutzen</translation>
+        <translation>Angepasste statische Analyse verwenden</translation>
     </message>
     <message>
         <source>Enabled</source>
@@ -47119,11 +47105,11 @@ Sie können eine Annotation &quot;// @uri My.Module.Uri&quot; hinzufügen, um de
     </message>
     <message>
         <source>Use QML Language Server advanced features (renaming, find usages and co.) (EXPERIMENTAL!)</source>
-        <translation>Fortgeschrittene Funktionen vom QML Language Server benutzen (umbenennen, Verweise finden und weiteres) (EXPERIMENTELL!)</translation>
+        <translation>Fortgeschrittene Funktionen vom QML Language Server verwenden (umbenennen, Verweise finden und weiteres) (EXPERIMENTELL!)</translation>
     </message>
     <message>
         <source>Use QML Language Server from latest Qt version</source>
-        <translation>QML Language Server der neuesten Qt-Version benutzen</translation>
+        <translation>QML Language Server der neuesten Qt-Version verwenden</translation>
     </message>
     <message>
         <source>Features</source>
@@ -47311,7 +47297,7 @@ Sie können eine Annotation &quot;// @uri My.Module.Uri&quot; hinzufügen, um de
         <source>Could not connect to the in-process QML profiler within %1 s.
 Do you want to retry and wait %2 s?</source>
         <translation>Innerhalb von %1 s konnte keine Verbindung zum QML-Profiler im Prozess hergestellt werden.
-Wollen Sie es noch einmal versuchen und %2 s warten?</translation>
+Wollen Sie es erneut versuchen und %2 s warten?</translation>
     </message>
     <message>
         <source>%1 s</source>
@@ -48821,7 +48807,7 @@ wirklich löschen?</translation>
     </message>
     <message>
         <source> (on %1)</source>
-        <translation type="unfinished"></translation>
+        <translation> (auf %1)</translation>
     </message>
     <message>
         <source>Qt version is not properly installed, please run make install</source>
@@ -49297,7 +49283,7 @@ wirklich löschen?</translation>
     </message>
     <message>
         <source>The Qt library to use for all projects using this kit.&lt;br&gt;A Qt version is required for qmake-based projects and optional when using other build systems.</source>
-        <translation>Die für alle Projekte, die dieses Kit verwenden, zu benutzende Qt-Bibliothek.&lt;br&gt;Für qmake-basierende Projekte ist diese Angabe erforderlich, für andere Build-Systeme optional.</translation>
+        <translation>Die zu verwendende Qt-Bibliothek für alle Projekte, die dieses Kit verwenden.&lt;br&gt;Für qmake-basierende Projekte ist diese Angabe erforderlich, für andere Build-Systeme optional.</translation>
     </message>
     <message>
         <source>None</source>
@@ -49333,11 +49319,11 @@ wirklich löschen?</translation>
     </message>
     <message>
         <source>Select a language for which a corresponding translation (.ts) file will be generated for you.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wählen Sie eine Sprache, für die eine Übersetzungsdatei (.ts) erstellt werden soll.</translation>
     </message>
     <message>
         <source>If you plan to provide translations for your project&apos;s user interface via the Qt Linguist tool, select a language here. A corresponding translation (.ts) file will be generated for you.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wenn Sie planen, mit Qt Linguist Übersetzungen der Benutzeroberfläche Ihres Projekts anzubieten, wählen Sie hier eine Sprache. Eine entsprechende Übersetzungsdatei (.ts) wird dann für Sie erstellt.</translation>
     </message>
     <message>
         <source>&lt;none&gt;</source>
@@ -49573,16 +49559,15 @@ Zusätzlich wird die Verbindung zum Gerät getestet.</translation>
     </message>
     <message>
         <source>Connecting to device...</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbinde zu Gerät...</translation>
     </message>
     <message>
-        <source>Connected. Now doing extended checks.
-</source>
-        <translation type="unfinished"></translation>
+        <source>Connected. Now doing extended checks.</source>
+        <translation>Verbunden. Führe erweiterte Überprüfungen aus.</translation>
     </message>
     <message>
         <source>Basic connectivity test failed, device is considered unusable.</source>
-        <translation type="unfinished"></translation>
+        <translation>Grundlegender Verbindungstest ist fehlgeschlagen, das Gerät wird als unbrauchbar eingestuft.</translation>
     </message>
     <message>
         <source>Device replied to echo with unexpected contents: &quot;%1&quot;</source>
@@ -49622,7 +49607,7 @@ Zusätzlich wird die Verbindung zum Gerät getestet.</translation>
     </message>
     <message>
         <source>&quot;%1&quot; will be used for deployment, because &quot;%2&quot; and &quot;%3&quot; are not available.</source>
-        <translation>&quot;%1&quot; wird für das Deployment benutzt, da &quot;%2&quot; und &quot;%3&quot; nicht verfügbar sind.</translation>
+        <translation>&quot;%1&quot; wird für das Deployment verwendet, da &quot;%2&quot; und &quot;%3&quot; nicht verfügbar sind.</translation>
     </message>
     <message>
         <source>Checking if required commands are available...</source>
@@ -49766,7 +49751,7 @@ Zusätzlich wird die Verbindung zum Gerät getestet.</translation>
     </message>
     <message>
         <source>The username to log into the device:</source>
-        <translation>Nutzername für Geräte-Login:</translation>
+        <translation>Benutzername für Geräte-Login:</translation>
     </message>
     <message>
         <source>Authentication type:</source>
@@ -49807,7 +49792,7 @@ Zusätzlich wird die Verbindung zum Gerät getestet.</translation>
     </message>
     <message>
         <source>&amp;Username:</source>
-        <translation>&amp;Nutzername:</translation>
+        <translation>&amp;Benutzername:</translation>
     </message>
     <message>
         <source>QML runtime executable:</source>
@@ -49886,7 +49871,7 @@ Zusätzlich wird die Verbindung zum Gerät getestet.</translation>
         <source>Cannot establish SSH connection.
 Control process failed to start.</source>
         <translation>SSH-Verbindung kann nicht hergestellt werden.
-Der Kontrollprozess konnte nicht gestartet werden.</translation>
+Der Steuerprozess konnte nicht gestartet werden.</translation>
     </message>
     <message>
         <source>SSH connection failure.</source>
@@ -49898,11 +49883,11 @@ Der Kontrollprozess konnte nicht gestartet werden.</translation>
     </message>
     <message>
         <source>Device is disconnected.</source>
-        <translation type="unfinished"></translation>
+        <translation>Gerät ist nicht verbunden.</translation>
     </message>
     <message>
         <source>Can&apos;t send control signal to the %1 device. The device might have been disconnected.</source>
-        <translation type="unfinished"></translation>
+        <translation>Senden des Steuersignals zum Gerät %1 ist fehlgeschlagen. Das Gerät ist möglicherweise nicht verbunden.</translation>
     </message>
     <message>
         <source>Remote Linux</source>
@@ -49914,15 +49899,15 @@ Der Kontrollprozess konnte nicht gestartet werden.</translation>
     </message>
     <message>
         <source>Establishing initial connection to device &quot;%1&quot;. This might take a moment.</source>
-        <translation type="unfinished"></translation>
+        <translation>Stelle die erste Verbindung zum Gerät &quot;%1&quot; her. Dies kann einen Moment dauern.</translation>
     </message>
     <message>
         <source>Device &quot;%1&quot; is currently marked as disconnected.</source>
-        <translation type="unfinished"></translation>
+        <translation>Das Gerät &quot;%1&quot; ist zur Zeit als nicht verbunden markiert.</translation>
     </message>
     <message>
         <source>The device was not available when trying to connect previously.&lt;br&gt;No further connection attempts will be made until the device is manually reset by running a successful connection test via the &lt;a href=&quot;dummy&quot;&gt;settings page&lt;/a&gt;.</source>
-        <translation type="unfinished"></translation>
+        <translation>Das Gerät war bei einem vorherigen Verbindungsversuch nicht erreichbar.&lt;br&gt;Es werden keine weiteren Verbindungsversuche unternommen, bis das Gerät manuell über einen erfolgreichen Verbindungstest in den &lt;a href=&quot;dummy&quot;&gt;Einstellungen&lt;/a&gt; zurückgesetzt wurde.</translation>
     </message>
     <message>
         <source>Failed: %1</source>
@@ -49930,7 +49915,7 @@ Der Kontrollprozess konnte nicht gestartet werden.</translation>
     </message>
     <message>
         <source>Device is considered unconnected. Re-run device test to reset state.</source>
-        <translation type="unfinished"></translation>
+        <translation>Das Gerät ist als nicht verbunden eingestuft. Führen Sie die Gerätetests erneut aus, um die Einstufung zurückzusetzen.</translation>
     </message>
     <message>
         <source>Remote Linux Device</source>
@@ -50068,19 +50053,19 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
     </message>
     <message>
         <source>Use sftp if available. Otherwise use default transfer.</source>
-        <translation>Benutze SFTP, sofern verfügbar. Sonst Standardmethode verwenden.</translation>
+        <translation>Verwende SFTP, sofern verfügbar. Sonst verwende Standardmethode.</translation>
     </message>
     <message>
         <source>Use default transfer. This might be slow.</source>
-        <translation>Benutze Standardmethode. Dies könnte langsam sein.</translation>
+        <translation>Verwende Standardmethode. Dies könnte langsam sein.</translation>
     </message>
     <message>
-        <source>Unknown error occurred while trying to create remote directories</source>
-        <translation>Beim Erstellen von entfernten Verzeichnissen ist ein unbekannter Fehler aufgetreten</translation>
+        <source>Unknown error occurred while trying to create remote directories.</source>
+        <translation>Beim Erstellen von entfernten Verzeichnissen ist ein unbekannter Fehler aufgetreten.</translation>
     </message>
     <message>
         <source>Transfer method was downgraded from &quot;%1&quot; to &quot;%2&quot;. If this is unexpected, please re-test device &quot;%3&quot;.</source>
-        <translation type="unfinished"></translation>
+        <translation>Die Übertragungsmethode wurde von &quot;%1&quot; auf &quot;%2&quot; zurückgestuft. Falls dies unerwartet auftritt, führen Sie bitte die Gerätetests für &quot;%3&quot; erneut aus.</translation>
     </message>
     <message>
         <source>rsync failed to start: %1</source>
@@ -50092,7 +50077,7 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
     </message>
     <message>
         <source>rsync failed with exit code %1.</source>
-        <translation>rsync scheiterte mit dem Rückgabewert %1.</translation>
+        <translation>rsync ist mit dem Rückgabewert %1 fehlgeschlagen.</translation>
     </message>
     <message>
         <source>Deploy files</source>
@@ -50104,7 +50089,7 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
     </message>
     <message>
         <source>Use rsync or sftp if available, but prefer rsync. Otherwise use default transfer.</source>
-        <translation type="unfinished"></translation>
+        <translation>Verwende rsync oder sftp, sofern verfügbar, bevorzuge aber rsync. Sonst verwende Standardmethode.</translation>
     </message>
     <message>
         <source>rsync is only supported for transfers between different devices.</source>
@@ -50633,7 +50618,7 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
     </message>
     <message>
         <source>Last used colors</source>
-        <translation>Zuletzt benutzte Farben</translation>
+        <translation>Zuletzt verwendete Farben</translation>
     </message>
     <message>
         <source>Create New Color Theme</source>
@@ -50717,7 +50702,7 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
     </message>
     <message>
         <source>SCXML Generation Failed</source>
-        <translation>SCXML-Erzeugung gescheitert</translation>
+        <translation>SCXML-Erzeugung fehlgeschlagen</translation>
     </message>
     <message>
         <source>Loading document...</source>
@@ -50761,7 +50746,7 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
     </message>
     <message>
         <source>Export Failed</source>
-        <translation>Export gescheitert</translation>
+        <translation>Export fehlgeschlagen</translation>
     </message>
     <message>
         <source>Could not export to image.</source>
@@ -50773,7 +50758,7 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
     </message>
     <message>
         <source>Saving Failed</source>
-        <translation>Speichern gescheitert</translation>
+        <translation>Speichern fehlgeschlagen</translation>
     </message>
     <message>
         <source>Could not save the screenshot.</source>
@@ -51410,7 +51395,7 @@ Zeile: %4, Spalte: %5
     </message>
     <message>
         <source>The Symbolic Name &lt;span style=&apos;white-space: nowrap&apos;&gt;&quot;%1&quot;&lt;/span&gt; you want to remove is used in Multi Property Names. Select the action to apply to references in these Multi Property Names.</source>
-        <translation>Der symbolische Name &lt;span style=&apos;white-space: nowrap&apos;&gt;&quot;%1&quot;&lt;/span&gt;, den Sie entfernen wollen, wird in Multi-Property-Namen benutzt. Wählen Sie die Aktion, die Sie auf Referenzen in diesen Multi-Property-Namen anwenden wollen.</translation>
+        <translation>Der symbolische Name &lt;span style=&apos;white-space: nowrap&apos;&gt;&quot;%1&quot;&lt;/span&gt;, den Sie entfernen wollen, wird in Multi-Property-Namen verwendet. Wählen Sie die Aktion, die Sie auf Referenzen in diesen Multi-Property-Namen anwenden wollen.</translation>
     </message>
     <message>
         <source>Failed to write &quot;%1&quot;</source>
@@ -51474,7 +51459,7 @@ Zeile: %4, Spalte: %5
     </message>
     <message>
         <source>The properties of the Multi Property Name associated with the selected Symbolic Name. (use \\ for a literal \ in the value)</source>
-        <translation>Die Eigenschaften des Multi-Property-Namens, der mit dem ausgewählten symbolischen Namen assoziiert ist. (Benutzen Sie \\ für ein \-Literal im Wert)</translation>
+        <translation>Die Eigenschaften des Multi-Property-Namens, der mit dem ausgewählten symbolischen Namen assoziiert ist. (Verwenden Sie \\ für ein \-Literal im Wert)</translation>
     </message>
     <message>
         <source>The Hierarchical Name associated with the selected Symbolic Name.</source>
@@ -51695,19 +51680,19 @@ Testfall &quot;%2&quot; wird nicht aufgezeichnet.</translation>
     </message>
     <message>
         <source>Do you really want to delete &quot;%1&quot; permanently?</source>
-        <translation type="unfinished"></translation>
+        <translation>Möchten Sie &quot;%1&quot; wirklich endgültig löschen?</translation>
     </message>
     <message>
         <source>Remove Shared File</source>
-        <translation type="unfinished"></translation>
+        <translation>Gemeinsame Datei löschen</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished">Abbrechen</translation>
+        <translation>Abbrechen</translation>
     </message>
     <message>
         <source>Failed to remove &quot;%1&quot;.</source>
-        <translation type="unfinished"></translation>
+        <translation>&quot;%1&quot; konnte nicht gelöscht werden.</translation>
     </message>
     <message>
         <source>Remove &quot;%1&quot; from the list of shared folders?</source>
@@ -52139,7 +52124,7 @@ Warten Sie, bis er beendet ist, und versuchen Sie es dann erneut.</translation>
     </message>
     <message>
         <source>Invalid Squish settings. Configure Squish installation path inside Preferences... &gt; Squish &gt; General to use this wizard.</source>
-        <translation>Ungültige Squish-Einstellungen. Stellen Sie in Einstellungen... &gt; Squish &gt; Allgemein den Squish-Installationspfad ein, um diesen Assistenten zu benutzen.</translation>
+        <translation>Ungültige Squish-Einstellungen. Stellen Sie in Einstellungen... &gt; Squish &gt; Allgemein den Squish-Installationspfad ein, um diesen Assistenten zu verwenden.</translation>
     </message>
     <message>
         <source>Available languages:</source>
@@ -52493,7 +52478,7 @@ Die Datei &quot;%1&quot; konnte nicht geöffnet werden.</translation>
     </message>
     <message>
         <source>The color used for %1.</source>
-        <translation>Die für &quot;%1&quot; benutzte Farbe.</translation>
+        <translation>Die für &quot;%1&quot; verwendete Farbe.</translation>
     </message>
     <message>
         <source>Failed to open file.</source>
@@ -52517,11 +52502,11 @@ Die Datei &quot;%1&quot; konnte nicht geöffnet werden.</translation>
     </message>
     <message>
         <source>Use internal terminal</source>
-        <translation>Integriertes Terminal benutzen</translation>
+        <translation>Integriertes Terminal verwenden</translation>
     </message>
     <message>
         <source>Uses the internal terminal when &quot;Run In Terminal&quot; is enabled and for &quot;Open Terminal here&quot;.</source>
-        <translation>Benutzt das integrierte Terminal, wenn &quot;Im Terminal ausführen&quot; aktiviert ist und für &quot;Terminalfenster hier öffnen&quot;.</translation>
+        <translation>Verwendet das integrierte Terminal, wenn &quot;Im Terminal ausführen&quot; aktiviert ist und für &quot;Terminalfenster hier öffnen&quot;.</translation>
     </message>
     <message>
         <source>Family:</source>
@@ -52529,7 +52514,7 @@ Die Datei &quot;%1&quot; konnte nicht geöffnet werden.</translation>
     </message>
     <message>
         <source>The font family used in the terminal.</source>
-        <translation>Der Name der Zeichensatz-Familie, die im Terminal benutzt wird.</translation>
+        <translation>Der Name der Zeichensatz-Familie, die im Terminal verwendet wird.</translation>
     </message>
     <message>
         <source>Size:</source>
@@ -52537,15 +52522,15 @@ Die Datei &quot;%1&quot; konnte nicht geöffnet werden.</translation>
     </message>
     <message>
         <source>The font size used in the terminal (in points).</source>
-        <translation>Die Größe des Zeichensatzes, der im Terminal benutzt wird (in Punkten).</translation>
+        <translation>Die Größe des Zeichensatzes, der im Terminal verwendet wird (in Punkten).</translation>
     </message>
     <message>
         <source>Allow blinking cursor</source>
-        <translation>Blinkenden Cursor erlauben</translation>
+        <translation>Blinkende Einfügemarke erlauben</translation>
     </message>
     <message>
         <source>Allow the cursor to blink.</source>
-        <translation>Erlaubt dem Cursor zu blinken.</translation>
+        <translation>Erlaubt der Einfügemarke zu blinken.</translation>
     </message>
     <message>
         <source>Shell path:</source>
@@ -52656,12 +52641,12 @@ Die Datei &quot;%1&quot; konnte nicht geöffnet werden.</translation>
         <translation>&quot;%1&quot; ist nicht ausführbar.</translation>
     </message>
     <message>
-        <source>Terminal process exited with code %1</source>
-        <translation>Der Terminalprozess wurde mit dem Rückgabewert %1 beendet</translation>
+        <source>Terminal process exited with code %1.</source>
+        <translation>Der Terminalprozess wurde mit dem Rückgabewert %1 beendet.</translation>
     </message>
     <message>
-        <source>Process exited with code: %1</source>
-        <translation>Prozess wurde mit dem Rückgabewert %1 beendet</translation>
+        <source>Process exited with code: %1.</source>
+        <translation>Prozess wurde mit dem Rückgabewert %1 beendet.</translation>
     </message>
     <message>
         <source>Copy</source>
@@ -52673,7 +52658,7 @@ Die Datei &quot;%1&quot; konnte nicht geöffnet werden.</translation>
     </message>
     <message>
         <source>Select All</source>
-        <translation type="unfinished"></translation>
+        <translation>Alles auswählen</translation>
     </message>
     <message>
         <source>Clear Selection</source>
@@ -52685,11 +52670,11 @@ Die Datei &quot;%1&quot; konnte nicht geöffnet werden.</translation>
     </message>
     <message>
         <source>Move Cursor Word Left</source>
-        <translation>Cursor ein Wort nach links bewegen</translation>
+        <translation>Einfügemarke ein Wort nach links bewegen</translation>
     </message>
     <message>
         <source>Move Cursor Word Right</source>
-        <translation>Cursor ein Wort nach rechts bewegen</translation>
+        <translation>Einfügemarke ein Wort nach rechts bewegen</translation>
     </message>
     <message>
         <source>Close Terminal</source>
@@ -53167,11 +53152,11 @@ Werte kleiner als 100% können überlappende und falsch ausgerichtete Darstellun
     </message>
     <message>
         <source>Line number of the text cursor position in current document (starts with 1).</source>
-        <translation>Zeilennummer der Cursorposition des aktuellen Dokuments (beginnend bei 1).</translation>
+        <translation>Zeilennummer der Einfügemarke des aktuellen Dokuments (beginnend bei 1).</translation>
     </message>
     <message>
         <source>Column number of the text cursor position in current document (starts with 0).</source>
-        <translation>Spaltennummer der Cursorposition des aktuellen Dokuments (beginnend bei 0).</translation>
+        <translation>Spaltennummer der Einfügemarke des aktuellen Dokuments (beginnend bei 0).</translation>
     </message>
     <message>
         <source>Number of lines visible in current document.</source>
@@ -53244,7 +53229,7 @@ Werte kleiner als 100% können überlappende und falsch ausgerichtete Darstellun
     </message>
     <message>
         <source>Cannot create user snippet directory %1</source>
-        <translation>Das Snippet-Verzeichnis des Nutzers konnte nicht erstellt werden: %1</translation>
+        <translation>Das Snippet-Verzeichnis des Benutzers konnte nicht erstellt werden: %1</translation>
     </message>
     <message>
         <source>Remove</source>
@@ -53645,7 +53630,7 @@ Gibt an, wie sich die Rücktaste bezüglich Einrückung verhält.
     </message>
     <message>
         <source>Center &amp;cursor on scroll</source>
-        <translation>Cursor beim Scrollen in der &amp;Mitte halten</translation>
+        <translation>Einfügemarke beim Scrollen in der &amp;Mitte halten</translation>
     </message>
     <message>
         <source>Enable text &amp;wrapping</source>
@@ -53689,7 +53674,7 @@ Gibt an, wie sich die Rücktaste bezüglich Einrückung verhält.
     </message>
     <message>
         <source>If available, use a different margin. For example, the ColumnLimit from the ClangFormat plugin.</source>
-        <translation>Benutzt einen anderen Rand, falls verfügbar. Zum Beispiel das ColumnLimit vom ClangFormat Plugin.</translation>
+        <translation>Verwendet einen anderen Rand, falls verfügbar. Zum Beispiel das ColumnLimit vom ClangFormat Plugin.</translation>
     </message>
     <message>
         <source>Animate navigation within file</source>
@@ -53891,7 +53876,7 @@ Bestimmt das Verhalten bezüglich der Einrückung von Fortsetzungszeilen.
 &lt;/pre&gt;
 &lt;/li&gt;
 
-&lt;li&gt;Normale Einrückung: Benutze Tabulatoren oder Leerzeichen entsprechend obiger Konfiguration.
+&lt;li&gt;Normale Einrückung: Verwende Tabulatoren oder Leerzeichen entsprechend obiger Konfiguration.
 &lt;pre&gt;
 (tab)int i = foo(a, b
 (tab)(tab)(tab)  c, d);
@@ -53909,7 +53894,7 @@ Bestimmt das Verhalten bezüglich der Einrückung von Fortsetzungszeilen.
     </message>
     <message>
         <source>With Regular Indent</source>
-        <translation>Benutze normale Einrückung</translation>
+        <translation>Verwende normale Einrückung</translation>
     </message>
     <message>
         <source>The text editor indentation setting is used for non-code files only. See the C++ and Qt Quick coding style settings to configure indentation for code files.</source>
@@ -54740,10 +54725,10 @@ Drücken Sie zusätzlich die Umschalttaste, wird ein Escape-Zeichen an der aktue
     <message>
         <source>Doxygen allows &quot;@&quot; and &quot;\&quot; to start commands.
 By default, &quot;@&quot; is used if the surrounding comment starts with &quot;/**&quot; or &quot;///&quot;, and &quot;\&quot; is used
-if the comment starts with &quot;/*!&quot; or &quot;//!</source>
+if the comment starts with &quot;/*!&quot; or &quot;//!&quot;.</source>
         <translation>Doxygen erlaubt es, Befehle mit &quot;@&quot; und &quot;\&quot; zu beginnen.
 Die Vorgabe ist, mit &quot;@&quot; zu beginnen, wenn der umgebende Kommentar mit &quot;/**&quot; oder &quot;///&quot; anfängt,
-und &quot;\&quot; zu benutzen, wenn der Kommentar mit &quot;/*!&quot; oder &quot;//!&quot;.</translation>
+und &quot;\&quot; zu verwenden, wenn der Kommentar mit &quot;/*!&quot; oder &quot;//!&quot;.</translation>
     </message>
     <message>
         <source>Generate brief description</source>
@@ -54819,7 +54804,7 @@ Wird auf Zeichen angewendet, sofern keine andere Regel zutrifft.</translation>
         <source>Highlighted search results inside the editor.
 Used to mark read accesses to C++ symbols.</source>
         <translation>Hervorgehobene Suchergebnisse im Editor.
-Wird benutzt, um Lesezugriffe eines C++-Symbols zu markieren.</translation>
+Wird verwendet, um Lesezugriffe eines C++-Symbols zu markieren.</translation>
     </message>
     <message>
         <source>Search Result (Alternative 2)</source>
@@ -54829,7 +54814,7 @@ Wird benutzt, um Lesezugriffe eines C++-Symbols zu markieren.</translation>
         <source>Highlighted search results inside the editor.
 Used to mark write accesses to C++ symbols.</source>
         <translation>Hervorgehobene Suchergebnisse im Editor.
-Wird benutzt, um Schreibzugriffe eines C++-Symbols zu markieren.</translation>
+Wird verwendet, um Schreibzugriffe eines C++-Symbols zu markieren.</translation>
     </message>
     <message>
         <source>Search Result Containing function</source>
@@ -54839,7 +54824,7 @@ Wird benutzt, um Schreibzugriffe eines C++-Symbols zu markieren.</translation>
         <source>Highlighted search results inside the editor.
 Used to mark containing function of the symbol usage.</source>
         <translation>Hervorgehobene Suchergebnisse im Editor.
-Wird benutzt um die Funktion zu markieren, die ein gesuchtes Symbol benutzt.</translation>
+Wird verwendet um die Funktion zu markieren, die ein gesuchtes Symbol verwendet.</translation>
     </message>
     <message>
         <source>Search Scope</source>
@@ -54897,7 +54882,7 @@ Wird benutzt um die Funktion zu markieren, die ein gesuchtes Symbol benutzt.</tr
         <source>Occurrences of the symbol under the cursor.
 (Only the background will be applied.)</source>
         <translation>Vorkommen des unter der Einfügemarke befindlichen Symbols.
-(Nur der Hintergrund wird benutzt.)</translation>
+(Nur der Hintergrund wird verwendet.)</translation>
     </message>
     <message>
         <source>Unused Occurrence</source>
@@ -55139,7 +55124,7 @@ Wird benutzt um die Funktion zu markieren, die ein gesuchtes Symbol benutzt.</tr
         <source>Non user-defined language operators.
 To style user-defined operators, use Overloaded Operator.</source>
         <translation>Nicht benutzerdefinierte Sprachoperatoren.
-Um den Stil von benutzerdefinierten Operatoren festzulegen, benutzen Sie &quot;Überladene Operatoren&quot;.</translation>
+Um den Stil von benutzerdefinierten Operatoren festzulegen, verwenden Sie &quot;Überladene Operatoren&quot;.</translation>
     </message>
     <message>
         <source>Preprocessor</source>
@@ -56030,11 +56015,11 @@ Die Trace-Daten sind verloren.</translation>
     <name>QtC::Utils</name>
     <message>
         <source>Do not &amp;ask again</source>
-        <translation>Nicht noch einmal nach&amp;fragen</translation>
+        <translation>Nicht erneut nach&amp;fragen</translation>
     </message>
     <message>
         <source>Do not &amp;show again</source>
-        <translation>Nicht noch einmal an&amp;zeigen</translation>
+        <translation>Nicht erneut an&amp;zeigen</translation>
     </message>
     <message>
         <source>The class name must not contain namespace delimiters.</source>
@@ -56353,7 +56338,7 @@ Die Trace-Daten sind verloren.</translation>
     </message>
     <message>
         <source>The command &quot;%1&quot; was canceled after %2 ms.</source>
-        <translation type="unfinished"></translation>
+        <translation>Das Kommando &quot;%1&quot; wurde nach %2 ms abgebrochen.</translation>
     </message>
     <message>
         <source>Invalid command</source>
@@ -56397,7 +56382,7 @@ Die Trace-Daten sind verloren.</translation>
     </message>
     <message>
         <source>Failed to start terminal process. The stub exited before the inferior was started.</source>
-        <translation type="unfinished"></translation>
+        <translation>Der Terminalprozess konnte nicht gestartet werden. Der Kontrollprozess wurde beendet, bevor der Unterprozess gestartet werden konnte.</translation>
     </message>
     <message>
         <source>Cannot set permissions on temporary directory &quot;%1&quot;: %2</source>
@@ -56437,7 +56422,7 @@ Die Trace-Daten sind verloren.</translation>
     </message>
     <message>
         <source>Refusing to remove the standard directory &quot;%1&quot;.</source>
-        <translation type="unfinished"></translation>
+        <translation>Das Standardverzeichnis &quot;%1&quot; kann nicht entfernt werden.</translation>
     </message>
     <message>
         <source>Refusing to remove root directory.</source>
@@ -56445,7 +56430,7 @@ Die Trace-Daten sind verloren.</translation>
     </message>
     <message>
         <source>Refusing to remove your home directory.</source>
-        <translation>Das Nutzerverzeichnis (Home) kann nicht entfernt werden.</translation>
+        <translation>Das Benutzerverzeichnis (Home) kann nicht entfernt werden.</translation>
     </message>
     <message>
         <source>Failed to remove directory &quot;%1&quot;.</source>
@@ -56496,7 +56481,7 @@ Die Trace-Daten sind verloren.</translation>
     </message>
     <message>
         <source>Device is not connected</source>
-        <translation type="unfinished"></translation>
+        <translation>Gerät ist nicht verbunden</translation>
     </message>
     <message>
         <source>Failed reading file &quot;%1&quot;: %2</source>
@@ -56552,7 +56537,7 @@ Die Trace-Daten sind verloren.</translation>
     </message>
     <message>
         <source>Cannot create temporary file %1: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Die temporäre Datei &quot;%1&quot; konnte nicht erstellt werden: %2</translation>
     </message>
     <message>
         <source>Overwrite File?</source>
@@ -56721,7 +56706,7 @@ Die Trace-Daten sind verloren.</translation>
     </message>
     <message>
         <source>&lt;p&gt;No valid settings file could be found.&lt;/p&gt;&lt;p&gt;All settings files found in directory &quot;%1&quot; were unsuitable for the current version of %2, for instance because they were written by an incompatible version of %2, or because a different settings path was used.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Es konnte keine gültige Einstellungsdatei gefunden werden.&lt;/p&gt;&lt;p&gt;Alle im Verzeichnis &quot;%1&quot; gefundenen Einstellungsdateien sind für die aktuelle Version von %2 ungeeignet, zum Beispiel weil sie von einer inkompatiblen Version von %2 geschrieben wurden oder weil ein anderes Einstellungsverzeichnis benutzt wurde.&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;Es konnte keine gültige Einstellungsdatei gefunden werden.&lt;/p&gt;&lt;p&gt;Alle im Verzeichnis &quot;%1&quot; gefundenen Einstellungsdateien sind für die aktuelle Version von %2 ungeeignet, zum Beispiel weil sie von einer inkompatiblen Version von %2 geschrieben wurden oder weil ein anderes Einstellungsverzeichnis verwendet wurde.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;No valid settings file could be found.&lt;/p&gt;&lt;p&gt;All settings files found in directory &quot;%1&quot; were either too new or too old to be read.&lt;/p&gt;</source>
@@ -56796,9 +56781,9 @@ Existing variables can be referenced in a VALUE with ${OTHER}.
 To clear a variable, put its name on a line with nothing else on it.
 To disable a variable, prefix the line with &quot;#&quot;.</source>
         <translation>Geben Sie eine Umgebungsvariable pro Zeile ein.
-Um eine Variable zu setzen oder zu ändern, benutzen Sie VARIABLE=WERT.
-Um einen Wert an eine Variable anzufügen, benutzen Sie VARIABLE+=WERT.
-Um einen Wert einer Variable voranzustellen, benutzen Sie VARIABLE=+WERT.
+Um eine Variable zu setzen oder zu ändern, verwenden Sie VARIABLE=WERT.
+Um einen Wert an eine Variable anzufügen, verwenden Sie VARIABLE+=WERT.
+Um einen Wert einer Variable voranzustellen, verwenden Sie VARIABLE=+WERT.
 Existierende Variablen können in einem WERT mit ${ANDERE} verwendet werden.
 Um eine Variable zu leeren, schreiben Sie nichts als ihren Namen in eine Zeile.
 Um eine Variable zu deaktivieren, stellen Sie der Zeile &quot;#&quot; voran.</translation>
@@ -56896,7 +56881,7 @@ Um eine Variable zu deaktivieren, stellen Sie der Zeile &quot;#&quot; voran.</tr
     </message>
     <message>
         <source>Do Not Show Again</source>
-        <translation>Nicht noch einmal anzeigen</translation>
+        <translation>Nicht erneut anzeigen</translation>
     </message>
     <message>
         <source>Close</source>
@@ -57119,7 +57104,7 @@ in &quot;%2&quot; aus.
     </message>
     <message>
         <source>User:</source>
-        <translation>Nutzer:</translation>
+        <translation>Benutzer:</translation>
     </message>
     <message>
         <source>Password:</source>
@@ -57282,7 +57267,7 @@ in &quot;%2&quot; aus.
     </message>
     <message>
         <source>Backtrace frame count:</source>
-        <translation>Stack-Frames:</translation>
+        <translation>Stackframes:</translation>
     </message>
     <message>
         <source>Suppression files:</source>
@@ -57570,7 +57555,7 @@ Mit Cache-Simulation werden weitere Ereigniszähler aktiviert:
     </message>
     <message>
         <source>Use of Uninitialized Memory</source>
-        <translation>Benutzung von nicht initialisiertem Speicher</translation>
+        <translation>Verwendung von nicht initialisiertem Speicher</translation>
     </message>
     <message>
         <source>Show issues originating outside currently opened projects.</source>
@@ -57614,7 +57599,7 @@ Mit Cache-Simulation werden weitere Ereigniszähler aktiviert:
     </message>
     <message>
         <source>Valgrind Analyze Memory uses the Memcheck tool to find memory leaks.</source>
-        <translation>Die Speicheranalyse von Valgrind benutzt das Programm &quot;memcheck&quot;, um Speicherlecks zu finden.</translation>
+        <translation>Die Speicheranalyse von Valgrind verwendet das Programm &quot;memcheck&quot;, um Speicherlecks zu finden.</translation>
     </message>
     <message>
         <source>Valgrind Memory Analyzer</source>
@@ -57627,7 +57612,7 @@ Mit Cache-Simulation werden weitere Ereigniszähler aktiviert:
     <message>
         <source>Valgrind Analyze Memory with GDB uses the Memcheck tool to find memory leaks.
 When a problem is detected, the application is interrupted and can be debugged.</source>
-        <translation>Die Speicheranalyse mit Valgrind und GDB benutzt das Programm &quot;memcheck&quot;, um Speicherlecks zu finden.
+        <translation>Die Speicheranalyse mit Valgrind und GDB verwendet das Programm &quot;memcheck&quot;, um Speicherlecks zu finden.
 Wird ein Problem gefunden, dann wird die Anwendung angehalten und kann untersucht werden.</translation>
     </message>
     <message>
@@ -57839,7 +57824,7 @@ Wird ein Problem gefunden, dann wird die Anwendung angehalten und kann untersuch
     </message>
     <message>
         <source>Go back one step in history. This will select the previously selected item.</source>
-        <translation>Gehe einen Schritt im Verlauf zurück. Das vorher ausgewählte Element wird wieder ausgewählt.</translation>
+        <translation>Gehe einen Schritt im Verlauf zurück. Das vorher ausgewählte Element wird erneut ausgewählt.</translation>
     </message>
     <message>
         <source>Go forward one step in history.</source>
@@ -58804,17 +58789,17 @@ Check settings or ensure Valgrind is installed and available in PATH.</source>
     </message>
     <message>
         <source>User/&amp;alias configuration file:</source>
-        <translation>Nutzer/&amp;Alias-Konfigurationsdatei:</translation>
+        <translation>Benutzer/&amp;Alias-Konfigurationsdatei:</translation>
     </message>
     <message>
         <source>A file listing nicknames in a 4-column mailmap format:
 &apos;name &lt;email&gt; alias &lt;email&gt;&apos;.</source>
-        <translation>Eine Datei, die Nutzernamen in einem vierspaltigen Format (mailmap) enthält:
+        <translation>Eine Datei, die Benutzernamen in einem vierspaltigen Format (mailmap) enthält:
 &apos;Name &lt;E-Mail&gt; Alias &lt;E-Mail&gt;&apos;.</translation>
     </message>
     <message>
         <source>User &amp;fields configuration file:</source>
-        <translation>Nutzer&amp;feld-Konfigurationsdatei:</translation>
+        <translation>Benutzer&amp;feld-Konfigurationsdatei:</translation>
     </message>
     <message>
         <source>A simple file containing lines with field names like &quot;Reviewed-By:&quot; which will be added below the submit editor.</source>
@@ -58930,7 +58915,7 @@ should a repository require SSH-authentication (see documentation on SSH and the
     <message>
         <source>The activated version %1 is not supported by %2. Activate version %3 or higher.</source>
         <translatorcomment>%1=sdkVersion, %2=QtC-Version, %3=minVersion</translatorcomment>
-        <translation>Die aktivierte Version %1 wird von %2 nicht unterstützt. Benutzen Sie Version %3 oder höher.</translation>
+        <translation>Die aktivierte Version %1 wird von %2 nicht unterstützt. Verwenden Sie Version %3 oder höher.</translation>
     </message>
     <message>
         <source>Activated version: %1</source>
@@ -58991,7 +58976,7 @@ should a repository require SSH-authentication (see documentation on SSH and the
     </message>
     <message>
         <source>Welcome to %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Willkommen bei %1</translation>
     </message>
     <message>
         <source>Create Project...</source>
@@ -59003,7 +58988,7 @@ should a repository require SSH-authentication (see documentation on SSH and the
     </message>
     <message>
         <source>Explore more</source>
-        <translation type="unfinished"></translation>
+        <translation>Erfahre mehr</translation>
     </message>
     <message>
         <source>Get Started</source>
@@ -59031,7 +59016,7 @@ should a repository require SSH-authentication (see documentation on SSH and the
     </message>
     <message>
         <source>Would you like to take a quick UI tour? This tour highlights important user interface elements and shows how they are used. To take the tour later, select Help &gt; UI Tour.</source>
-        <translation>Wollen Sie sich kurz die Oberfläche vorführen lassen? Dabei wird gezeigt, wo die wichtigsten Bedienelemente sind und wie man sie benutzt. Sie können die Vorführung auch später über &quot;Hilfe&quot; &gt; &quot;Oberfläche vorführen&quot; starten.</translation>
+        <translation>Wollen Sie sich kurz die Oberfläche vorführen lassen? Dabei wird gezeigt, wo die wichtigsten Bedienelemente sind und wie man sie verwendet. Sie können die Vorführung auch später über &quot;Hilfe&quot; &gt; &quot;Oberfläche vorführen&quot; starten.</translation>
     </message>
     <message>
         <source>Take UI Tour</source>
@@ -59047,7 +59032,7 @@ should a repository require SSH-authentication (see documentation on SSH and the
     </message>
     <message>
         <source>&lt;p style=&quot;margin-top: 30px&quot;&gt;&lt;table&gt;&lt;tr&gt;&lt;td style=&quot;padding-right: 20px&quot;&gt;Welcome:&lt;/td&gt;&lt;td&gt;Open examples, tutorials, and recent sessions and projects.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Edit:&lt;/td&gt;&lt;td&gt;Work with code and navigate your project.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Design:&lt;/td&gt;&lt;td&gt;Visually edit Widget-based user interfaces, state charts and UML models.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Debug:&lt;/td&gt;&lt;td&gt;Analyze your application with a debugger or other analyzers.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Projects:&lt;/td&gt;&lt;td&gt;Manage project settings.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Help:&lt;/td&gt;&lt;td&gt;Browse the help database.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;</source>
-        <translation>&lt;p style=&quot;margin-top: 30px&quot;&gt;&lt;table&gt;&lt;tr&gt;&lt;td style=&quot;padding-right: 20px&quot;&gt;Willkommen:&lt;/td&gt;&lt;td&gt;Öffnen Sie Beispiele, Anleitungen, sowie kürzlich verwendete Sitzungen und Projekte.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Editieren:&lt;/td&gt;&lt;td&gt;Arbeiten Sie am Quelltext und navigieren Sie im Projekt.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Design:&lt;/td&gt;&lt;td&gt;Bearbeiten Sie Oberflächendesigns für Qt Widgets, State Charts und UML-Modelle.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Debug:&lt;/td&gt;&lt;td&gt;Analysieren Sie Ihre Anwendung mit einem Debugger oder anderen Werkzeugen.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Projekte:&lt;/td&gt;&lt;td&gt;Verwalten Sie Projekteinstellungen.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Hilfe:&lt;/td&gt;&lt;td&gt;Durchsuchen Sie die Hilfedatenbank.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;</translation>
+        <translation>&lt;p style=&quot;margin-top: 30px&quot;&gt;&lt;table&gt;&lt;tr&gt;&lt;td style=&quot;padding-right: 20px&quot;&gt;Willkommen:&lt;/td&gt;&lt;td&gt;Öffnen Sie Beispiele, Anleitungen, sowie kürzlich verwendete Sitzungen und Projekte.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Bearbeiten:&lt;/td&gt;&lt;td&gt;Arbeiten Sie am Quelltext und navigieren Sie im Projekt.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Design:&lt;/td&gt;&lt;td&gt;Bearbeiten Sie Oberflächendesigns für Qt Widgets, State Charts und UML-Modelle.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Debug:&lt;/td&gt;&lt;td&gt;Analysieren Sie Ihre Anwendung mit einem Debugger oder anderen Werkzeugen.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Projekte:&lt;/td&gt;&lt;td&gt;Verwalten Sie Projekteinstellungen.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Hilfe:&lt;/td&gt;&lt;td&gt;Durchsuchen Sie die Hilfedatenbank.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Kit Selector</source>
@@ -61495,7 +61480,7 @@ This is used for calculating the total implicit size.</source>
     </message>
     <message>
         <source>Auto scroll</source>
-        <translation>Automatisch rollen</translation>
+        <translation>Automatisch scrollen</translation>
     </message>
     <message>
         <source>Toggles if the text scrolls when it exceeds its boundary.</source>
diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts
index 8e802d897c..c7057fc09e 100644
--- a/share/qtcreator/translations/qtcreator_fr.ts
+++ b/share/qtcreator/translations/qtcreator_fr.ts
@@ -152,8 +152,8 @@
         <translation>Lissage</translation>
     </message>
     <message>
-        <source>Toggles if the smoothing is performed using linear interpolation method. Keeping it unchecked would follow non-smooth method using nearest neighbor. It is mostly applicable on image based items. </source>
-        <translation>Active/désactive l&apos;utilisation de l&apos;interpolation linéaire pour le lissage. Lorsque décoché, la méthode du plus proche voisin sera utilisée. Cela s&apos;applique principalement aux éléments images. </translation>
+        <source>Toggles if the smoothing is performed using linear interpolation method. Keeping it unchecked would follow non-smooth method using nearest neighbor. It is mostly applicable on image based items.</source>
+        <translation>Active/désactive l&apos;utilisation de l&apos;interpolation linéaire pour le lissage. Lorsque décoché, la méthode du plus proche voisin sera utilisée. Cela s&apos;applique principalement aux éléments images.</translation>
     </message>
     <message>
         <source>Antialiasing</source>
@@ -34341,8 +34341,8 @@ Souhaitez-vous les écraser&#xa0;?</translation>
         <translation>Entrez les arguments appropriés pour votre commande de construction.</translation>
     </message>
     <message>
-        <source>Make sure the build command&apos;s multi-job parameter value is large enough (such as -j200 for the JOM or Make build tools)</source>
-        <translation>Assurez vous que le paramètre multi-job de la commande de construction est assez grande (telle que -j200  pour les outils de compilation comme JOM ou Make)</translation>
+        <source>Make sure the build command&apos;s multi-job parameter value is large enough (such as -j200 for the JOM or Make build tools).</source>
+        <translation>Assurez vous que le paramètre multi-job de la commande de construction est assez grande (telle que -j200  pour les outils de compilation comme JOM ou Make).</translation>
     </message>
     <message>
         <source>Keep original jobs number:</source>
@@ -34461,16 +34461,16 @@ Souhaitez-vous les écraser&#xa0;?</translation>
         <translation>Cacher l&apos;entête IncrediBuild dans la sortie&#xa0;:</translation>
     </message>
     <message>
-        <source>Suppresses IncrediBuild&apos;s header in the build output</source>
-        <translation>Supprimer l&apos;entête d&apos;IncrediBuild de la sortie de construction</translation>
+        <source>Suppresses IncrediBuild&apos;s header in the build output.</source>
+        <translation>Supprimer l&apos;entête d&apos;IncrediBuild de la sortie de construction.</translation>
     </message>
     <message>
         <source>Internal IncrediBuild logging level:</source>
         <translation>Niveau de journalisation interne d&apos;IncrediBuild&#xa0;:</translation>
     </message>
     <message>
-        <source>Overrides the internal Incredibuild logging level for this build. Does not affect output or any user accessible logging. Used mainly to troubleshoot issues with the help of IncrediBuild support</source>
-        <translation>Écrase le niveau interne de journalisation d&apos;IncrediBuild pour cette construction. N&apos;affecte pas la sortie ou un quelconque journal accessible par l&apos;utilisateur. Utilisé principalement pour comprendre les problèmes avec l&apos;aide du support d&apos;IncrediBuild</translation>
+        <source>Overrides the internal Incredibuild logging level for this build. Does not affect output or any user accessible logging. Used mainly to troubleshoot issues with the help of IncrediBuild support.</source>
+        <translation>Écrase le niveau interne de journalisation d&apos;IncrediBuild pour cette construction. N&apos;affecte pas la sortie ou un quelconque journal accessible par l&apos;utilisateur. Utilisé principalement pour comprendre les problèmes avec l&apos;aide du support d&apos;IncrediBuild.</translation>
     </message>
     <message>
         <source>Miscellaneous</source>
@@ -34489,16 +34489,16 @@ Souhaitez-vous les écraser&#xa0;?</translation>
         <translation>Arrêter en cas d&apos;erreur&#xa0;:</translation>
     </message>
     <message>
-        <source>When specified, the execution will stop as soon as an error is encountered. This is the default behavior in &quot;Visual Studio&quot; builds, but not the default for &quot;Make and Build tools&quot; or &quot;Dev Tools&quot; builds</source>
-        <translation>Lorsque spécifié, l&apos;exécution s&apos;arrête dès qu&apos;une erreur est rencontrée. C&apos;est le comportement par défaut dans les constructions «&#xa0;Visual Studio&#xa0;», mais ce n&apos;est pas le cas pour les constructions avec «&#xa0;Make et les outils de compilation&#xa0;» ou les «&#xa0;outils de développeur&#xa0;»</translation>
+        <source>When specified, the execution will stop as soon as an error is encountered. This is the default behavior in &quot;Visual Studio&quot; builds, but not the default for &quot;Make and Build tools&quot; or &quot;Dev Tools&quot; builds.</source>
+        <translation>Lorsque spécifié, l&apos;exécution s&apos;arrête dès qu&apos;une erreur est rencontrée. C&apos;est le comportement par défaut dans les constructions «&#xa0;Visual Studio&#xa0;», mais ce n&apos;est pas le cas pour les constructions avec «&#xa0;Make et les outils de compilation&#xa0;» ou les «&#xa0;outils de développeur&#xa0;».</translation>
     </message>
     <message>
         <source>Additional Arguments:</source>
         <translation>Arguments supplémentaires&#xa0;:</translation>
     </message>
     <message>
-        <source>Add additional buildconsole arguments manually. The value of this field will be concatenated to the final buildconsole command line</source>
-        <translation>Ajouter manuellement des arguments pour buildconsole. La valeur de ce champ est concaténé à la ligne de commande finale de buildconsole</translation>
+        <source>Add additional buildconsole arguments manually. The value of this field will be concatenated to the final buildconsole command line.</source>
+        <translation>Ajouter manuellement des arguments pour buildconsole. La valeur de ce champ est concaténé à la ligne de commande finale de buildconsole.</translation>
     </message>
     <message>
         <source>Open Build Monitor:</source>
@@ -43130,8 +43130,8 @@ Activez cette option si vous envisagez de créer des binaires x86 32 bits sans u
         <translation>Le répertoire de compilation contient des caractères potentiellement problématiques «&#xa0;%1&#xa0;».</translation>
     </message>
     <message>
-        <source> This warning can be suppressed &lt;a href=&quot;dummy&quot;&gt;here&lt;/a&gt;.</source>
-        <translation> Cet avertissement peut être supprimé &lt;a href=&quot;dummy&quot;&gt;ici&lt;/a&gt;.</translation>
+        <source>This warning can be suppressed &lt;a href=&quot;dummy&quot;&gt;here&lt;/a&gt;.</source>
+        <translation>Cet avertissement peut être supprimé &lt;a href=&quot;dummy&quot;&gt;ici&lt;/a&gt;.</translation>
     </message>
     <message>
         <source>Separate debug info:</source>
@@ -43548,39 +43548,28 @@ au projet «&#xa0;%2&#xa0;».</translation>
         <translation>Le typeId «&#xa0;%1&#xa0;» du générateur est inconnu. Les typesIds pris en charge sont : «&#xa0;%2&#xa0;».</translation>
     </message>
     <message>
-        <source>Path &quot;%1&quot; does not exist when checking Json wizard search paths.
-</source>
-        <translation>Le chemin «&#xa0;%1&#xa0;» n’existe pas lors de la vérification des chemins de recherche de l’assistant Json.</translation>
+        <source>Path &quot;%1&quot; does not exist when checking JSON wizard search paths.</source>
+        <translation>Le chemin «&#xa0;%1&#xa0;» n’existe pas lors de la vérification des chemins de recherche de l’assistant JSON.</translation>
     </message>
     <message>
-        <source>Checking &quot;%1&quot; for %2.
-</source>
-        <translation>Vérification de «&#xa0;%1&#xa0;» pour %2.
-</translation>
+        <source>Checking &quot;%1&quot; for %2.</source>
+        <translation>Vérification de «&#xa0;%1&#xa0;» pour %2.</translation>
     </message>
     <message>
-        <source>* Failed to parse &quot;%1&quot;:%2:%3: %4
-</source>
-        <translation>* Échec de l’analyse de «&#xa0;%1&#xa0;»:%2:%3 : %4
-</translation>
+        <source>* Failed to parse &quot;%1&quot;:%2:%3: %4</source>
+        <translation>* Échec de l’analyse de «&#xa0;%1&#xa0;»:%2:%3 : %4</translation>
     </message>
     <message>
-        <source>* Did not find a JSON object in &quot;%1&quot;.
-</source>
-        <translation>* N’a pas trouvé d’objet JSON dans «&#xa0;%1&#xa0;».
-</translation>
+        <source>* Did not find a JSON object in &quot;%1&quot;.</source>
+        <translation>* N’a pas trouvé d’objet JSON dans «&#xa0;%1&#xa0;».</translation>
     </message>
     <message>
-        <source>* Configuration found and parsed.
-</source>
-        <translation>* La configuration a été trouvée et analysée.
-</translation>
+        <source>* Configuration found and parsed.</source>
+        <translation>* La configuration a été trouvée et analysée.</translation>
     </message>
     <message>
-        <source>JsonWizard: &quot;%1&quot; not found
-</source>
-        <translation>Assistant Json : «&#xa0;%1&#xa0;» introuvable
-</translation>
+        <source>JsonWizard: &quot;%1&quot; not found</source>
+        <translation>Assistant Json : «&#xa0;%1&#xa0;» introuvable.</translation>
     </message>
     <message>
         <source>Page is not an object.</source>
@@ -43599,16 +43588,12 @@ au projet «&#xa0;%2&#xa0;».</translation>
         <translation>La page avec le typeId «&#xa0;%1&#xa0;» a un «&#xa0;index&#xa0;» invalide.</translation>
     </message>
     <message>
-        <source>* Version %1 not supported.
-</source>
-        <translation>* La version %1 n’est pas prise en charge.
-</translation>
+        <source>* Version %1 not supported.</source>
+        <translation>* La version %1 n’est pas prise en charge.</translation>
     </message>
     <message>
-        <source>* Failed to create: %1
-</source>
-        <translation>* Impossible de créer&#xa0;: %1
-</translation>
+        <source>* Failed to create: %1</source>
+        <translation>* Impossible de créer&#xa0;: %1</translation>
     </message>
     <message>
         <source>key not found.</source>
@@ -44461,8 +44446,8 @@ Ces fichiers sont préservés.</numerusform>
         <translation>Chemin de l&apos;interpréteur Python</translation>
     </message>
     <message>
-        <source>No Python interpreter set for kit &quot;%1&quot;</source>
-        <translation>Aucun interpréteur Python n&apos;est défini pour le kit «&#xa0;%1&#xa0;»</translation>
+        <source>No Python interpreter set for kit &quot;%1&quot;.</source>
+        <translation>Aucun interpréteur Python n&apos;est défini pour le kit «&#xa0;%1&#xa0;».</translation>
     </message>
 </context>
 <context>
@@ -49563,10 +49548,8 @@ Le processus de contrôle n&apos;a pas pu démarrer.</translation>
         <translation>Connexion au périphérique…</translation>
     </message>
     <message>
-        <source>Connected. Now doing extended checks.
-</source>
-        <translation>Connecté. Exécution des tests étendus.
-</translation>
+        <source>Connected. Now doing extended checks.</source>
+        <translation>Connecté. Exécution des tests étendus.</translation>
     </message>
     <message>
         <source>Basic connectivity test failed, device is considered unusable.</source>
@@ -49893,8 +49876,8 @@ Le processus de contrôle n&apos;a pas pu démarrer.</translation>
         <translation>Utiliser le transfert par défaut. Cela peut être lent.</translation>
     </message>
     <message>
-        <source>Unknown error occurred while trying to create remote directories</source>
-        <translation>Une erreur inconnue s&apos;est produite lors de la création des répertoires distants</translation>
+        <source>Unknown error occurred while trying to create remote directories.</source>
+        <translation>Une erreur inconnue s&apos;est produite lors de la création des répertoires distants.</translation>
     </message>
     <message>
         <source>Transfer method was downgraded from &quot;%1&quot; to &quot;%2&quot;. If this is unexpected, please re-test device &quot;%3&quot;.</source>
@@ -52415,12 +52398,12 @@ Impossible d&apos;ouvrir le fichier «&#xa0;%1&#xa0;».</translation>
         <translation>«&#xa0;%1&#xa0;» n&apos;est pas un exécutable.</translation>
     </message>
     <message>
-        <source>Terminal process exited with code %1</source>
-        <translation>Le processus du terminal s&apos;est terminé avec le code %1</translation>
+        <source>Terminal process exited with code %1.</source>
+        <translation>Le processus du terminal s&apos;est terminé avec le code %1.</translation>
     </message>
     <message>
-        <source>Process exited with code: %1</source>
-        <translation>Le processus s&apos;est terminé avec le code&#xa0;: %1</translation>
+        <source>Process exited with code: %1.</source>
+        <translation>Le processus s&apos;est terminé avec le code&#xa0;: %1.</translation>
     </message>
     <message>
         <source>Copy</source>
@@ -52708,10 +52691,10 @@ En outre, Maj+Entrée insère un caractère d’échappement à la position du c
     <message>
         <source>Doxygen allows &quot;@&quot; and &quot;\&quot; to start commands.
 By default, &quot;@&quot; is used if the surrounding comment starts with &quot;/**&quot; or &quot;///&quot;, and &quot;\&quot; is used
-if the comment starts with &quot;/*!&quot; or &quot;//!</source>
+if the comment starts with &quot;/*!&quot; or &quot;//!&quot;.</source>
         <translation>Doxygen permet d&apos;utiliser «&#xa0;@&#xa0;» et «&#xa0;\&#xa0;» pour démarrer une commande.
 Par défaut, «&#xa0;@&#xa0;» est utilisé si le commentaire l&apos;englobant commence avec «&#xa0;/**&#xa0;» ou «&#xa0;///&#xa0;» et «&#xa0;\&#xa0;» est utilisé
-si le commentaire débute avec «&#xa0;/*!&#xa0;» ou «&#xa0;//!&#xa0;»</translation>
+si le commentaire débute avec «&#xa0;/*!&#xa0;» ou «&#xa0;//!&#xa0;».</translation>
     </message>
     <message>
         <source>Documentation Comments</source>
diff --git a/share/qtcreator/translations/qtcreator_hr.ts b/share/qtcreator/translations/qtcreator_hr.ts
index 6d69f112ad..ad756fc8ef 100644
--- a/share/qtcreator/translations/qtcreator_hr.ts
+++ b/share/qtcreator/translations/qtcreator_hr.ts
@@ -27563,43 +27563,35 @@ to project &quot;%2&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Path &quot;%1&quot; does not exist when checking Json wizard search paths.
-</source>
+        <source>Path &quot;%1&quot; does not exist when checking JSON wizard search paths.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Checking &quot;%1&quot; for %2.
-</source>
+        <source>Checking &quot;%1&quot; for %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>* Failed to parse &quot;%1&quot;:%2:%3: %4
-</source>
+        <source>* Failed to parse &quot;%1&quot;:%2:%3: %4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>* Did not find a JSON object in &quot;%1&quot;.
-</source>
+        <source>* Did not find a JSON object in &quot;%1&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>* Configuration found and parsed.
-</source>
+        <source>* Configuration found and parsed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>* Version %1 not supported.
-</source>
+        <source>* Version %1 not supported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>* Failed to create: %1
-</source>
+        <source>* Failed to create: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>JsonWizard: &quot;%1&quot; not found
-</source>
+        <source>JsonWizard: &quot;%1&quot; not found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts
index 71665c23d5..74f505017d 100644
--- a/share/qtcreator/translations/qtcreator_ja.ts
+++ b/share/qtcreator/translations/qtcreator_ja.ts
@@ -39137,40 +39137,28 @@ Would you like to overwrite it?</source>
         <translation>typeId が &quot;%1&quot; のページの &quot;index&quot; が無効です。</translation>
     </message>
     <message>
-        <source>Path &quot;%1&quot; does not exist when checking Json wizard search paths.
-</source>
-        <translation>Json ウィザードの検索パスを確認しましたが、パス &quot;%1&quot; は存在しません。
-</translation>
+        <source>Path &quot;%1&quot; does not exist when checking JSON wizard search paths.</source>
+        <translation>JSON ウィザードの検索パスを確認しましたが、パス &quot;%1&quot; は存在しません。</translation>
     </message>
     <message>
-        <source>Checking &quot;%1&quot; for %2.
-</source>
-        <translation>%2 向けに &quot;%1&quot; を確認しています。
-</translation>
+        <source>Checking &quot;%1&quot; for %2.</source>
+        <translation>%2 向けに &quot;%1&quot; を確認しています。</translation>
     </message>
     <message>
-        <source>* Failed to parse &quot;%1&quot;:%2:%3: %4
-</source>
-        <translation>・&quot;%1&quot; の解析に失敗しました:%2:%3: %4
-</translation>
+        <source>* Failed to parse &quot;%1&quot;:%2:%3: %4</source>
+        <translation>・&quot;%1&quot; の解析に失敗しました:%2:%3: %4</translation>
     </message>
     <message>
-        <source>* Did not find a JSON object in &quot;%1&quot;.
-</source>
-        <translation>・&quot;%1&quot; に JSON オブジェクトが見つかりませんでした。
-</translation>
+        <source>* Did not find a JSON object in &quot;%1&quot;.</source>
+        <translation>・&quot;%1&quot; に JSON オブジェクトが見つかりませんでした。</translation>
     </message>
     <message>
-        <source>* Configuration found and parsed.
-</source>
-        <translation>・設定が見つかり、解析しました。
-</translation>
+        <source>* Configuration found and parsed.</source>
+        <translation>・設定が見つかり、解析しました。</translation>
     </message>
     <message>
-        <source>* Version %1 not supported.
-</source>
-        <translation>・バージョン %1 には未対応です。
-</translation>
+        <source>* Version %1 not supported.</source>
+        <translation>・バージョン %1 には未対応です。</translation>
     </message>
     <message>
         <source>The platform selected for the wizard.</source>
@@ -39201,16 +39189,12 @@ Would you like to overwrite it?</source>
         <translation>画像ファイル &quot;%1&quot; が見つかりません。</translation>
     </message>
     <message>
-        <source>* Failed to create: %1
-</source>
-        <translation>・作成に失敗しました: %1
-</translation>
+        <source>* Failed to create: %1</source>
+        <translation>・作成に失敗しました: %1</translation>
     </message>
     <message>
-        <source>JsonWizard: &quot;%1&quot; not found
-</source>
-        <translation>JsonWizard: &quot;%1&quot; が見つかりません
-</translation>
+        <source>JsonWizard: &quot;%1&quot; not found.</source>
+        <translation>JsonWizard: &quot;%1&quot; が見つかりません。</translation>
     </message>
     <message>
         <source>key not found.</source>
diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts
index a59ebcb424..465f3f32d3 100644
--- a/share/qtcreator/translations/qtcreator_pl.ts
+++ b/share/qtcreator/translations/qtcreator_pl.ts
@@ -151,7 +151,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Toggles if the smoothing is performed using linear interpolation method. Keeping it unchecked would follow non-smooth method using nearest neighbor. It is mostly applicable on image based items. </source>
+        <source>Toggles if the smoothing is performed using linear interpolation method. Keeping it unchecked would follow non-smooth method using nearest neighbor. It is mostly applicable on image based items.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -33297,7 +33297,7 @@ Czy nadpisać je?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Make sure the build command&apos;s multi-job parameter value is large enough (such as -j200 for the JOM or Make build tools)</source>
+        <source>Make sure the build command&apos;s multi-job parameter value is large enough (such as -j200 for the JOM or Make build tools).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -33425,7 +33425,7 @@ Czy nadpisać je?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Suppresses IncrediBuild&apos;s header in the build output</source>
+        <source>Suppresses IncrediBuild&apos;s header in the build output.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -33433,7 +33433,7 @@ Czy nadpisać je?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Overrides the internal Incredibuild logging level for this build. Does not affect output or any user accessible logging. Used mainly to troubleshoot issues with the help of IncrediBuild support</source>
+        <source>Overrides the internal Incredibuild logging level for this build. Does not affect output or any user accessible logging. Used mainly to troubleshoot issues with the help of IncrediBuild support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -33449,7 +33449,7 @@ Czy nadpisać je?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When specified, the execution will stop as soon as an error is encountered. This is the default behavior in &quot;Visual Studio&quot; builds, but not the default for &quot;Make and Build tools&quot; or &quot;Dev Tools&quot; builds</source>
+        <source>When specified, the execution will stop as soon as an error is encountered. This is the default behavior in &quot;Visual Studio&quot; builds, but not the default for &quot;Make and Build tools&quot; or &quot;Dev Tools&quot; builds.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -33457,7 +33457,7 @@ Czy nadpisać je?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add additional buildconsole arguments manually. The value of this field will be concatenated to the final buildconsole command line</source>
+        <source>Add additional buildconsole arguments manually. The value of this field will be concatenated to the final buildconsole command line.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -41748,40 +41748,28 @@ To develop a full application, create a Qt Quick Application project instead.</s
         <translation>Strona z typeid &quot;%1&quot; posiada niepoprawny &quot;index&quot;.</translation>
     </message>
     <message>
-        <source>Path &quot;%1&quot; does not exist when checking Json wizard search paths.
-</source>
-        <translation>Ścieżka &quot;%1&quot; nie istnieje podczas sprawdzania ścieżek poszukiwań kreatora Json.
-</translation>
+        <source>Path &quot;%1&quot; does not exist when checking JSON wizard search paths.</source>
+        <translation>Ścieżka &quot;%1&quot; nie istnieje podczas sprawdzania ścieżek poszukiwań kreatora JSON.</translation>
     </message>
     <message>
-        <source>Checking &quot;%1&quot; for %2.
-</source>
-        <translation>Sprawdzanie &quot;%1&quot; dla &quot;%2&quot;.
-</translation>
+        <source>Checking &quot;%1&quot; for %2.</source>
+        <translation>Sprawdzanie &quot;%1&quot; dla &quot;%2&quot;.</translation>
     </message>
     <message>
-        <source>* Failed to parse &quot;%1&quot;:%2:%3: %4
-</source>
-        <translation>* Nie można sparsować &quot;%1&quot;:%2:%3: %4
-</translation>
+        <source>* Failed to parse &quot;%1&quot;:%2:%3: %4</source>
+        <translation>* Nie można sparsować &quot;%1&quot;:%2:%3: %4</translation>
     </message>
     <message>
-        <source>* Did not find a JSON object in &quot;%1&quot;.
-</source>
-        <translation>* Nie odnaleziono obiektu JSON w &quot;%1&quot;.
-</translation>
+        <source>* Did not find a JSON object in &quot;%1&quot;.</source>
+        <translation>* Nie odnaleziono obiektu JSON w &quot;%1&quot;.</translation>
     </message>
     <message>
-        <source>* Configuration found and parsed.
-</source>
-        <translation>* Konfiguracja odnaleziona i przeparsowana.
-</translation>
+        <source>* Configuration found and parsed.</source>
+        <translation>* Konfiguracja odnaleziona i przeparsowana.</translation>
     </message>
     <message>
-        <source>* Version %1 not supported.
-</source>
-        <translation>* Wersja %1 nieobsługiwana.
-</translation>
+        <source>* Version %1 not supported.</source>
+        <translation>* Wersja %1 nieobsługiwana.</translation>
     </message>
     <message>
         <source>The platform selected for the wizard.</source>
@@ -41812,10 +41800,8 @@ To develop a full application, create a Qt Quick Application project instead.</s
         <translation>Brak pliku graficznego &quot;%1&quot;.</translation>
     </message>
     <message>
-        <source>JsonWizard: &quot;%1&quot; not found
-</source>
-        <translation>JsonWizard: Nie znaleziono &quot;%1&quot;
-</translation>
+        <source>JsonWizard: &quot;%1&quot; not found.</source>
+        <translation>JsonWizard: Nie znaleziono &quot;%1&quot;.</translation>
     </message>
     <message>
         <source>key not found.</source>
@@ -48594,7 +48580,7 @@ Błąd uruchamiania procesu kontrolnego.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unknown error occurred while trying to create remote directories</source>
+        <source>Unknown error occurred while trying to create remote directories.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -51127,11 +51113,11 @@ Nie można otworzyć pliku &quot;%1&quot;.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Terminal process exited with code %1</source>
+        <source>Terminal process exited with code %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Process exited with code: %1</source>
+        <source>Process exited with code: %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -53843,7 +53829,7 @@ po naciśnięciu klawisza backspace</translation>
     <message>
         <source>Doxygen allows &quot;@&quot; and &quot;\&quot; to start commands.
 By default, &quot;@&quot; is used if the surrounding comment starts with &quot;/**&quot; or &quot;///&quot;, and &quot;\&quot; is used
-if the comment starts with &quot;/*!&quot; or &quot;//!</source>
+if the comment starts with &quot;/*!&quot; or &quot;//!&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts
index ac9a564f8b..8b7bfee3dc 100644
--- a/share/qtcreator/translations/qtcreator_ru.ts
+++ b/share/qtcreator/translations/qtcreator_ru.ts
@@ -22415,8 +22415,8 @@ Would you like to overwrite them?</source>
         <translation>Максимальное количество ЦП для сборки:</translation>
     </message>
     <message>
-        <source>When specified, the execution will stop as soon as an error is encountered.  This is the default behavior in &apos;Visual Studio&apos; builds, but not the default for &apos;Make and Build tools&apos; or &apos;Dev Tools&apos; builds</source>
-        <translation>Включение остановки выполнения при возникновении ошибки. Это поведение по умолчанию в сборках «Visual Studio», но не по умолчанию для сборок «Make and Build tools» или «Dev Tools»</translation>
+        <source>When specified, the execution will stop as soon as an error is encountered.  This is the default behavior in &apos;Visual Studio&apos; builds, but not the default for &apos;Make and Build tools&apos; or &apos;Dev Tools&apos; builds.</source>
+        <translation>Включение остановки выполнения при возникновении ошибки. Это поведение по умолчанию в сборках «Visual Studio», но не по умолчанию для сборок «Make and Build tools» или «Dev Tools».</translation>
     </message>
     <message>
         <source>Stop On Errors</source>
@@ -22467,7 +22467,7 @@ Would you like to overwrite them?</source>
         <translation type="unfinished">Помощник запуска:</translation>
     </message>
     <message>
-        <source>Add additional buildconsole arguments manually. The value of this field will be concatenated to the final buildconsole command line</source>
+        <source>Add additional buildconsole arguments manually. The value of this field will be concatenated to the final buildconsole command line.</source>
         <translation>Дополнительные параметры buildconsole. Значение поля будет добавлено к итоговой командной строке buildconsole.</translation>
     </message>
     <message>
@@ -22495,7 +22495,7 @@ Would you like to overwrite them?</source>
         <translation>Исходное число задач</translation>
     </message>
     <message>
-        <source>Overrides the internal Incredibuild logging level for this build. Does not affect output or any user accessible logging. Used mainly to troubleshoot issues with the help of IncrediBuild support</source>
+        <source>Overrides the internal Incredibuild logging level for this build. Does not affect output or any user accessible logging. Used mainly to troubleshoot issues with the help of IncrediBuild support.</source>
         <translation>Меняет для этой сборки уровень ведения внутреннего журнала Incredibuild. Не влияет на вывод или любые доступные пользователю журналы. В основном используется для устранения проблем через службу поддержки IncrediBuild.</translation>
     </message>
     <message>
@@ -30999,40 +30999,28 @@ Preselects a desktop Qt for building the application if available.</source>
         <translation>У страницы с typeId «%1» неверный «index».</translation>
     </message>
     <message>
-        <source>Path &quot;%1&quot; does not exist when checking Json wizard search paths.
-</source>
-        <translation>При проверке путей мастера Json: путь «%1» не существует.
-</translation>
+        <source>Path &quot;%1&quot; does not exist when checking JSON wizard search paths.</source>
+        <translation>При проверке путей мастера JSON: путь «%1» не существует.</translation>
     </message>
     <message>
-        <source>Checking &quot;%1&quot; for %2.
-</source>
-        <translation>Проверяется «%1» у %2.
-</translation>
+        <source>Checking &quot;%1&quot; for %2.</source>
+        <translation>Проверяется «%1» у %2.</translation>
     </message>
     <message>
-        <source>* Failed to parse &quot;%1&quot;:%2:%3: %4
-</source>
-        <translation>* Не удалось разобрать «%1»:%2:%3: %4
-</translation>
+        <source>* Failed to parse &quot;%1&quot;:%2:%3: %4</source>
+        <translation>* Не удалось разобрать «%1»:%2:%3: %4</translation>
     </message>
     <message>
-        <source>* Did not find a JSON object in &quot;%1&quot;.
-</source>
-        <translation>* Объект JSON не был найден в «%1».
-</translation>
+        <source>* Did not find a JSON object in &quot;%1&quot;.</source>
+        <translation>* Объект JSON не был найден в «%1».</translation>
     </message>
     <message>
-        <source>* Configuration found and parsed.
-</source>
-        <translation>* Конфигурация обнаружена и разобрана.
-</translation>
+        <source>* Configuration found and parsed.</source>
+        <translation>* Конфигурация обнаружена и разобрана.</translation>
     </message>
     <message>
-        <source>* Version %1 not supported.
-</source>
-        <translation>* Версия %1 не поддерживается.
-</translation>
+        <source>* Version %1 not supported.</source>
+        <translation>* Версия %1 не поддерживается.</translation>
     </message>
     <message>
         <source>The platform selected for the wizard.</source>
@@ -31063,16 +31051,12 @@ Preselects a desktop Qt for building the application if available.</source>
         <translation>Файл изображения «%1» не найден.</translation>
     </message>
     <message>
-        <source>* Failed to create: %1
-</source>
-        <translation>* Не удалось создать: %1
-</translation>
+        <source>* Failed to create: %1</source>
+        <translation>* Не удалось создать: %1</translation>
     </message>
     <message>
-        <source>JsonWizard: &quot;%1&quot; not found
-</source>
-        <translation>JsonWizard: «%1» не найден
-</translation>
+        <source>JsonWizard: &quot;%1&quot; not found.</source>
+        <translation>JsonWizard: «%1» не найден.</translation>
     </message>
     <message>
         <source>key not found.</source>
diff --git a/share/qtcreator/translations/qtcreator_sl.ts b/share/qtcreator/translations/qtcreator_sl.ts
index e5b3b87b02..9dba0e365a 100644
--- a/share/qtcreator/translations/qtcreator_sl.ts
+++ b/share/qtcreator/translations/qtcreator_sl.ts
@@ -7757,14 +7757,6 @@ Preselects a desktop Qt for building the application if available.</source>
         <translation>oznakaTežave</translation>
     </message>
     <message>
-        <source>Error: </source>
-        <translation type="obsolete">Napaka: </translation>
-    </message>
-    <message>
-        <source>Warning: </source>
-        <translation type="obsolete">Opozorilo: </translation>
-    </message>
-    <message>
         <source>Configuration name:</source>
         <translation type="obsolete">Ime nastavitev:</translation>
     </message>
diff --git a/share/qtcreator/translations/qtcreator_uk.ts b/share/qtcreator/translations/qtcreator_uk.ts
index 432f5ab3a2..bf9deb0e7f 100644
--- a/share/qtcreator/translations/qtcreator_uk.ts
+++ b/share/qtcreator/translations/qtcreator_uk.ts
@@ -38747,40 +38747,28 @@ Preselects a desktop Qt for building the application if available.</source>
         <translation>Сторінка з &quot;%1&quot; має неправильний &quot;index&quot;.</translation>
     </message>
     <message>
-        <source>Path &quot;%1&quot; does not exist when checking Json wizard search paths.
-</source>
-        <translation>Перевірка шляхів пошуків майстра Json: шлях &quot;%1&quot; не існує.
-</translation>
+        <source>Path &quot;%1&quot; does not exist when checking JSON wizard search paths.</source>
+        <translation>Перевірка шляхів пошуків майстра JSON: шлях &quot;%1&quot; не існує.</translation>
     </message>
     <message>
-        <source>Checking &quot;%1&quot; for %2.
-</source>
-        <translation>Перевірка &quot;%1&quot; для %2.
-</translation>
+        <source>Checking &quot;%1&quot; for %2.</source>
+        <translation>Перевірка &quot;%1&quot; для %2.</translation>
     </message>
     <message>
-        <source>* Failed to parse &quot;%1&quot;:%2:%3: %4
-</source>
-        <translation>* Збій розбору &quot;%1&quot;:%2:%3: %4
-</translation>
+        <source>* Failed to parse &quot;%1&quot;:%2:%3: %4</source>
+        <translation>* Збій розбору &quot;%1&quot;:%2:%3: %4</translation>
     </message>
     <message>
-        <source>* Did not find a JSON object in &quot;%1&quot;.
-</source>
-        <translation>* Не знайдено об&apos;єкт JSON в &quot;%1&quot;.
-</translation>
+        <source>* Did not find a JSON object in &quot;%1&quot;.</source>
+        <translation>* Не знайдено об&apos;єкт JSON в &quot;%1&quot;.</translation>
     </message>
     <message>
-        <source>* Configuration found and parsed.
-</source>
-        <translation>* Конфігурацію знайдено та розібрано.
-</translation>
+        <source>* Configuration found and parsed.</source>
+        <translation>* Конфігурацію знайдено та розібрано.</translation>
     </message>
     <message>
-        <source>* Version %1 not supported.
-</source>
-        <translation>* Версія %1 не підтримується.
-</translation>
+        <source>* Version %1 not supported.</source>
+        <translation>* Версія %1 не підтримується.</translation>
     </message>
     <message>
         <source>The platform selected for the wizard.</source>
@@ -38817,16 +38805,12 @@ Preselects a desktop Qt for building the application if available.</source>
 </translation>
     </message>
     <message>
-        <source>* Failed to create: %1
-</source>
-        <translation>* Збій створення: %1
-</translation>
+        <source>* Failed to create: %1</source>
+        <translation>* Збій створення: %1</translation>
     </message>
     <message>
-        <source>JsonWizard: &quot;%1&quot; not found
-</source>
-        <translation>JsonWizard: &quot;%1&quot; не знайдено
-</translation>
+        <source>JsonWizard: &quot;%1&quot; not found.</source>
+        <translation>JsonWizard: &quot;%1&quot; не знайдено.</translation>
     </message>
     <message>
         <source>key not found.</source>
diff --git a/share/qtcreator/translations/qtcreator_zh_CN.ts b/share/qtcreator/translations/qtcreator_zh_CN.ts
index 7526f78c96..3a1b29ef6a 100644
--- a/share/qtcreator/translations/qtcreator_zh_CN.ts
+++ b/share/qtcreator/translations/qtcreator_zh_CN.ts
@@ -22584,7 +22584,7 @@ Would you like to overwrite them?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Make sure the build command&apos;s multi-job parameter value is large enough (such as -j200 for the JOM or Make build tools)</source>
+        <source>Make sure the build command&apos;s multi-job parameter value is large enough (such as -j200 for the JOM or Make build tools).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -22704,7 +22704,7 @@ Would you like to overwrite them?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Suppresses IncrediBuild&apos;s header in the build output</source>
+        <source>Suppresses IncrediBuild&apos;s header in the build output.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -22712,7 +22712,7 @@ Would you like to overwrite them?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Overrides the internal Incredibuild logging level for this build. Does not affect output or any user accessible logging. Used mainly to troubleshoot issues with the help of IncrediBuild support</source>
+        <source>Overrides the internal Incredibuild logging level for this build. Does not affect output or any user accessible logging. Used mainly to troubleshoot issues with the help of IncrediBuild support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -22732,7 +22732,7 @@ Would you like to overwrite them?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When specified, the execution will stop as soon as an error is encountered. This is the default behavior in &quot;Visual Studio&quot; builds, but not the default for &quot;Make and Build tools&quot; or &quot;Dev Tools&quot; builds</source>
+        <source>When specified, the execution will stop as soon as an error is encountered. This is the default behavior in &quot;Visual Studio&quot; builds, but not the default for &quot;Make and Build tools&quot; or &quot;Dev Tools&quot; builds.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -22740,7 +22740,7 @@ Would you like to overwrite them?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add additional buildconsole arguments manually. The value of this field will be concatenated to the final buildconsole command line</source>
+        <source>Add additional buildconsole arguments manually. The value of this field will be concatenated to the final buildconsole command line.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -28771,33 +28771,27 @@ Enable this if you plan to create 32-bit x86 binaries without using a dedicated
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Path &quot;%1&quot; does not exist when checking Json wizard search paths.
-</source>
+        <source>Path &quot;%1&quot; does not exist when checking JSON wizard search paths.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Checking &quot;%1&quot; for %2.
-</source>
+        <source>Checking &quot;%1&quot; for %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>* Failed to parse &quot;%1&quot;:%2:%3: %4
-</source>
+        <source>* Failed to parse &quot;%1&quot;:%2:%3: %4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>* Did not find a JSON object in &quot;%1&quot;.
-</source>
+        <source>* Did not find a JSON object in &quot;%1&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>* Configuration found and parsed.
-</source>
+        <source>* Configuration found and parsed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>JsonWizard: &quot;%1&quot; not found
-</source>
+        <source>JsonWizard: &quot;%1&quot; not found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -28817,8 +28811,7 @@ Enable this if you plan to create 32-bit x86 binaries without using a dedicated
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>* Version %1 not supported.
-</source>
+        <source>* Version %1 not supported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/src/app/main.cpp b/src/app/main.cpp
index 6c5fb9a306..5ebb3ff4d7 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -583,11 +583,6 @@ int main(int argc, char **argv)
         QApplication::setAttribute(Qt::AA_DontUseNativeMenuBar);
     }
 
-    if (Utils::HostOsInfo::isLinuxHost() && !qEnvironmentVariableIsSet("GTK_THEME"))
-        // Work around QTCREATORBUG-28497:
-        // Prevent Qt's GTK3 platform theme plugin from enforcing a dark palette
-        qputenv("GTK_THEME", ":light");
-
 #if defined(QTC_FORCE_XCB)
     if (Utils::HostOsInfo::isLinuxHost() && !qEnvironmentVariableIsSet("QT_QPA_PLATFORM")) {
         // Enforce XCB on Linux/Gnome, if the user didn't override via QT_QPA_PLATFORM
@@ -684,10 +679,12 @@ int main(int argc, char **argv)
     setPixmapCacheLimit();
     loadFonts();
 
-    if (Utils::HostOsInfo::isWindowsHost() && !qFuzzyCompare(qApp->devicePixelRatio(), 1.0)
-        && !hasStyleOption) {
+    // On 100% or 200% scaling we can use the default 'Vista' style on Windows
+    qreal tmp;
+    const bool fractionalDpi = !qFuzzyIsNull(std::modf(qApp->devicePixelRatio(), &tmp));
+    if (Utils::HostOsInfo::isWindowsHost() && fractionalDpi && !hasStyleOption)
         QApplication::setStyle(QLatin1String("fusion"));
-    }
+
     const int threadCount = QThreadPool::globalInstance()->maxThreadCount();
     QThreadPool::globalInstance()->setMaxThreadCount(qMax(4, 2 * threadCount));
 
@@ -768,7 +765,7 @@ int main(int argc, char **argv)
     // Load
     const QStringList pluginPaths = getPluginPaths() + installPluginPaths
                                     + options.customPluginPaths;
-    PluginManager::setPluginPaths(pluginPaths);
+    PluginManager::setPluginPaths(Utils::transform(pluginPaths, &Utils::FilePath::fromUserInput));
     QMap<QString, QString> foundAppOptions;
     if (pluginArguments.size() > 1) {
         QMap<QString, bool> appOptions;
diff --git a/src/libs/3rdparty/CMakeLists.txt b/src/libs/3rdparty/CMakeLists.txt
index 8445a0d01b..364c9a425e 100644
--- a/src/libs/3rdparty/CMakeLists.txt
+++ b/src/libs/3rdparty/CMakeLists.txt
@@ -4,6 +4,8 @@ add_subdirectory(libvterm)
 add_subdirectory(libptyqt)
 add_subdirectory(qrcodegen)
 add_subdirectory(qtkeychain)
+add_subdirectory(lua)
+add_subdirectory(sol2)
 
 if(WIN32)
     add_subdirectory(winpty)
diff --git a/src/libs/3rdparty/googletest b/src/libs/3rdparty/googletest
-Subproject b796f7d44681514f58a683a3a71ff17c94edb0c
+Subproject f8d7d77c06936315286eb55f8de22cd23c18857
diff --git a/src/libs/3rdparty/lua/CMakeLists.txt b/src/libs/3rdparty/lua/CMakeLists.txt
new file mode 100644
index 0000000000..4501f540c8
--- /dev/null
+++ b/src/libs/3rdparty/lua/CMakeLists.txt
@@ -0,0 +1,75 @@
+
+add_qtc_library(lua546
+  PROPERTIES QT_COMPILE_OPTIONS_DISABLE_WARNINGS ON
+  PUBLIC_INCLUDES src
+  STATIC
+  SOURCES
+    src/lapi.c
+    src/lapi.h
+    src/lauxlib.c
+    src/lauxlib.h
+    src/lbaselib.c
+    src/lcode.c
+    src/lcode.h
+    src/lcorolib.c
+    src/lctype.c
+    src/lctype.h
+    src/ldblib.c
+    src/ldebug.c
+    src/ldebug.h
+    src/ldo.c
+    src/ldo.h
+    src/ldump.c
+    src/lfunc.c
+    src/lfunc.h
+    src/lgc.c
+    src/lgc.h
+    src/linit.c
+    src/liolib.c
+    src/llex.c
+    src/llex.h
+    src/lmathlib.c
+    src/lmem.c
+    src/lmem.h
+    src/loadlib.c
+    src/lobject.c
+    src/lobject.h
+    src/lopcodes.c
+    src/lopcodes.h
+    src/loslib.c
+    src/lparser.c
+    src/lparser.h
+    src/lstate.c
+    src/lstate.h
+    src/lstring.c
+    src/lstring.h
+    src/lstrlib.c
+    src/ltable.c
+    src/ltable.h
+    src/ltablib.c
+    src/ltm.c
+    src/ltm.h
+    src/lua.c
+    src/lua.h
+    src/luaconf.h
+    src/lundump.c
+    src/lundump.h
+    src/lutf8lib.c
+    src/lvm.c
+    src/lvm.h
+    src/lzio.c
+    src/lzio.h
+)
+
+extend_qtc_library(lua546
+  CONDITION LINUX
+  PUBLIC_DEFINES LUA_USE_LINUX
+)
+extend_qtc_library(lua546
+  CONDITION WIN32
+  PUBLIC_DEFINES LUA_USE_WINDOWS
+)
+extend_qtc_library(lua546
+  CONDITION APPLE
+  PUBLIC_DEFINES LUA_USE_MACOSX
+)
diff --git a/src/libs/3rdparty/lua/LICENSE b/src/libs/3rdparty/lua/LICENSE
new file mode 100644
index 0000000000..441cc1981c
--- /dev/null
+++ b/src/libs/3rdparty/lua/LICENSE
@@ -0,0 +1,16 @@
+Copyright © 1994–2023 Lua.org, PUC-Rio.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
+associated documentation files (the "Software"), to deal in the Software without restriction,
+including without limitation the rights to use, copy, modify, merge, publish, distribute,
+sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial
+portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
+BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/src/libs/3rdparty/lua/README b/src/libs/3rdparty/lua/README
new file mode 100644
index 0000000000..1ae97165ba
--- /dev/null
+++ b/src/libs/3rdparty/lua/README
@@ -0,0 +1,6 @@
+
+This is Lua 5.4.6, released on 02 May 2023.
+
+For installation instructions, license details, and
+further information about Lua, see doc/readme.html.
+
diff --git a/src/libs/3rdparty/lua/doc/contents.html b/src/libs/3rdparty/lua/doc/contents.html
new file mode 100644
index 0000000000..1231e6d248
--- /dev/null
+++ b/src/libs/3rdparty/lua/doc/contents.html
@@ -0,0 +1,678 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<HTML>
+<HEAD>
+<TITLE>Lua 5.4 Reference Manual - contents</TITLE>
+<LINK REL="stylesheet" TYPE="text/css" HREF="lua.css">
+<LINK REL="stylesheet" TYPE="text/css" HREF="index.css">
+<META HTTP-EQUIV="content-type" CONTENT="text/html; charset=iso-8859-1">
+</HEAD>
+
+<BODY>
+
+<H1>
+<A HREF="http://www.lua.org/"><IMG SRC="logo.gif" ALT="Lua"></A>
+Lua 5.4 Reference Manual
+</H1>
+
+<P>
+The reference manual is the official definition of the Lua language.
+<BR>
+For a complete introduction to Lua programming, see the book
+<A HREF="http://www.lua.org/pil/">Programming in Lua</A>.
+
+<DIV CLASS="menubar">
+<A HREF="manual.html">start</A>
+&middot;
+<A HREF="#contents">contents</A>
+&middot;
+<A HREF="#index">index</A>
+&middot;
+<A HREF="http://www.lua.org/manual/">other versions</A>
+</DIV>
+
+<P>
+<SMALL>
+Copyright &copy; 2020&ndash;2023 Lua.org, PUC-Rio.
+Freely available under the terms of the
+<A HREF="http://www.lua.org/license.html">Lua license</A>.
+</SMALL>
+
+<H2><A NAME="contents">Contents</A></H2>
+<UL CLASS="contents menubar">
+<LI><A HREF="manual.html">1 &ndash; Introduction</A>
+<P>
+<LI><A HREF="manual.html#2">2 &ndash; Basic Concepts</A>
+<UL>
+<LI><A HREF="manual.html#2.1">2.1 &ndash; Values and Types</A>
+<LI><A HREF="manual.html#2.2">2.2 &ndash; Environments and the Global Environment</A>
+<LI><A HREF="manual.html#2.3">2.3 &ndash; Error Handling</A>
+<LI><A HREF="manual.html#2.4">2.4 &ndash; Metatables and Metamethods</A>
+<LI><A HREF="manual.html#2.5">2.5 &ndash; Garbage Collection</A>
+<UL>
+<LI><A HREF="manual.html#2.5.1">2.5.1 &ndash; Incremental Garbage Collection</A>
+<LI><A HREF="manual.html#2.5.2">2.5.2 &ndash; Generational Garbage Collection</A>
+<LI><A HREF="manual.html#2.5.3">2.5.3 &ndash; Garbage-Collection Metamethods</A>
+<LI><A HREF="manual.html#2.5.4">2.5.4 &ndash; Weak Tables</A>
+</UL>
+<LI><A HREF="manual.html#2.6">2.6 &ndash; Coroutines</A>
+</UL>
+<P>
+<LI><A HREF="manual.html#3">3 &ndash; The Language</A>
+<UL>
+<LI><A HREF="manual.html#3.1">3.1 &ndash; Lexical Conventions</A>
+<LI><A HREF="manual.html#3.2">3.2 &ndash; Variables</A>
+<LI><A HREF="manual.html#3.3">3.3 &ndash; Statements</A>
+<UL>
+<LI><A HREF="manual.html#3.3.1">3.3.1 &ndash; Blocks</A>
+<LI><A HREF="manual.html#3.3.2">3.3.2 &ndash; Chunks</A>
+<LI><A HREF="manual.html#3.3.3">3.3.3 &ndash; Assignment</A>
+<LI><A HREF="manual.html#3.3.4">3.3.4 &ndash; Control Structures</A>
+<LI><A HREF="manual.html#3.3.5">3.3.5 &ndash; For Statement</A>
+<LI><A HREF="manual.html#3.3.6">3.3.6 &ndash; Function Calls as Statements</A>
+<LI><A HREF="manual.html#3.3.7">3.3.7 &ndash; Local Declarations</A>
+<LI><A HREF="manual.html#3.3.8">3.3.8 &ndash; To-be-closed Variables</A>
+</UL>
+<LI><A HREF="manual.html#3.4">3.4 &ndash; Expressions</A>
+<UL>
+<LI><A HREF="manual.html#3.4.1">3.4.1 &ndash; Arithmetic Operators</A>
+<LI><A HREF="manual.html#3.4.2">3.4.2 &ndash; Bitwise Operators</A>
+<LI><A HREF="manual.html#3.4.3">3.4.3 &ndash; Coercions and Conversions</A>
+<LI><A HREF="manual.html#3.4.4">3.4.4 &ndash; Relational Operators</A>
+<LI><A HREF="manual.html#3.4.5">3.4.5 &ndash; Logical Operators</A>
+<LI><A HREF="manual.html#3.4.6">3.4.6 &ndash; Concatenation</A>
+<LI><A HREF="manual.html#3.4.7">3.4.7 &ndash; The Length Operator</A>
+<LI><A HREF="manual.html#3.4.8">3.4.8 &ndash; Precedence</A>
+<LI><A HREF="manual.html#3.4.9">3.4.9 &ndash; Table Constructors</A>
+<LI><A HREF="manual.html#3.4.10">3.4.10 &ndash; Function Calls</A>
+<LI><A HREF="manual.html#3.4.11">3.4.11 &ndash; Function Definitions</A>
+<LI><A HREF="manual.html#3.4.12">3.4.12 &ndash; Lists of expressions, multiple results, and adjustment<A>
+
+</UL>
+<LI><A HREF="manual.html#3.5">3.5 &ndash; Visibility Rules</A>
+</UL>
+<P>
+<LI><A HREF="manual.html#4">4 &ndash; The Application Program Interface</A>
+<UL>
+<LI><A HREF="manual.html#4.1">4.1 &ndash; The Stack</A>
+<UL>
+<LI><A HREF="manual.html#4.1.1">4.1.1 &ndash; Stack Size</A>
+<LI><A HREF="manual.html#4.1.2">4.1.2 &ndash; Valid and Acceptable Indices</A>
+<LI><A HREF="manual.html#4.1.3">4.1.3 &ndash; Pointers to strings</A>
+</UL>
+<LI><A HREF="manual.html#4.2">4.2 &ndash; C Closures</A>
+<LI><A HREF="manual.html#4.3">4.3 &ndash; Registry</A>
+<LI><A HREF="manual.html#4.4">4.4 &ndash; Error Handling in C</A>
+<UL>
+<LI><A HREF="manual.html#4.4.1">4.4.1 &ndash; Status Codes</A>
+</UL>
+<LI><A HREF="manual.html#4.5">4.5 &ndash; Handling Yields in C</A>
+<LI><A HREF="manual.html#4.6">4.6 &ndash; Functions and Types</A>
+<LI><A HREF="manual.html#4.7">4.7 &ndash; The Debug Interface</A>
+</UL>
+<P>
+<LI><A HREF="manual.html#5">5 &ndash; The Auxiliary Library</A>
+<UL>
+<LI><A HREF="manual.html#5.1">5.1 &ndash; Functions and Types</A>
+</UL>
+<P>
+<LI><A HREF="manual.html#6">6 &ndash; The Standard Libraries</A>
+<UL>
+<LI><A HREF="manual.html#6.1">6.1 &ndash; Basic Functions</A>
+<LI><A HREF="manual.html#6.2">6.2 &ndash; Coroutine Manipulation</A>
+<LI><A HREF="manual.html#6.3">6.3 &ndash; Modules</A>
+<LI><A HREF="manual.html#6.4">6.4 &ndash; String Manipulation</A>
+<UL>
+<LI><A HREF="manual.html#6.4.1">6.4.1 &ndash; Patterns</A>
+<LI><A HREF="manual.html#6.4.2">6.4.2 &ndash; Format Strings for Pack and Unpack</A>
+</UL>
+<LI><A HREF="manual.html#6.5">6.5 &ndash; UTF-8 Support</A>
+<LI><A HREF="manual.html#6.6">6.6 &ndash; Table Manipulation</A>
+<LI><A HREF="manual.html#6.7">6.7 &ndash; Mathematical Functions</A>
+<LI><A HREF="manual.html#6.8">6.8 &ndash; Input and Output Facilities</A>
+<LI><A HREF="manual.html#6.9">6.9 &ndash; Operating System Facilities</A>
+<LI><A HREF="manual.html#6.10">6.10 &ndash; The Debug Library</A>
+</UL>
+<P>
+<LI><A HREF="manual.html#7">7 &ndash; Lua Standalone</A>
+<P>
+<LI><A HREF="manual.html#8">8 &ndash; Incompatibilities with the Previous Version</A>
+<UL>
+<LI><A HREF="manual.html#8.1">8.1 &ndash; Incompatibilities in the Language</A>
+<LI><A HREF="manual.html#8.2">8.2 &ndash; Incompatibilities in the Libraries</A>
+<LI><A HREF="manual.html#8.3">8.3 &ndash; Incompatibilities in the API</A>
+</UL>
+<P>
+<LI><A HREF="manual.html#9">9 &ndash; The Complete Syntax of Lua</A>
+</UL>
+
+<H2><A NAME="index">Index</A></H2>
+<TABLE CLASS="menubar" WIDTH="100%">
+<TR>
+<TD>
+<H3><A NAME="functions">Lua functions</A></H3>
+<P>
+<A HREF="manual.html#6.1">basic</A><BR>
+<A HREF="manual.html#pdf-_G">_G</A><BR>
+<A HREF="manual.html#pdf-_VERSION">_VERSION</A><BR>
+<A HREF="manual.html#pdf-assert">assert</A><BR>
+<A HREF="manual.html#pdf-collectgarbage">collectgarbage</A><BR>
+<A HREF="manual.html#pdf-dofile">dofile</A><BR>
+<A HREF="manual.html#pdf-error">error</A><BR>
+<A HREF="manual.html#pdf-getmetatable">getmetatable</A><BR>
+<A HREF="manual.html#pdf-ipairs">ipairs</A><BR>
+<A HREF="manual.html#pdf-load">load</A><BR>
+<A HREF="manual.html#pdf-loadfile">loadfile</A><BR>
+<A HREF="manual.html#pdf-next">next</A><BR>
+<A HREF="manual.html#pdf-pairs">pairs</A><BR>
+<A HREF="manual.html#pdf-pcall">pcall</A><BR>
+<A HREF="manual.html#pdf-print">print</A><BR>
+<A HREF="manual.html#pdf-rawequal">rawequal</A><BR>
+<A HREF="manual.html#pdf-rawget">rawget</A><BR>
+<A HREF="manual.html#pdf-rawlen">rawlen</A><BR>
+<A HREF="manual.html#pdf-rawset">rawset</A><BR>
+<A HREF="manual.html#pdf-require">require</A><BR>
+<A HREF="manual.html#pdf-select">select</A><BR>
+<A HREF="manual.html#pdf-setmetatable">setmetatable</A><BR>
+<A HREF="manual.html#pdf-tonumber">tonumber</A><BR>
+<A HREF="manual.html#pdf-tostring">tostring</A><BR>
+<A HREF="manual.html#pdf-type">type</A><BR>
+<A HREF="manual.html#pdf-warn">warn</A><BR>
+<A HREF="manual.html#pdf-xpcall">xpcall</A><BR>
+
+<P>
+<A HREF="manual.html#6.2">coroutine</A><BR>
+<A HREF="manual.html#pdf-coroutine.close">coroutine.close</A><BR>
+<A HREF="manual.html#pdf-coroutine.create">coroutine.create</A><BR>
+<A HREF="manual.html#pdf-coroutine.isyieldable">coroutine.isyieldable</A><BR>
+<A HREF="manual.html#pdf-coroutine.resume">coroutine.resume</A><BR>
+<A HREF="manual.html#pdf-coroutine.running">coroutine.running</A><BR>
+<A HREF="manual.html#pdf-coroutine.status">coroutine.status</A><BR>
+<A HREF="manual.html#pdf-coroutine.wrap">coroutine.wrap</A><BR>
+<A HREF="manual.html#pdf-coroutine.yield">coroutine.yield</A><BR>
+
+<P>
+<A HREF="manual.html#6.10">debug</A><BR>
+<A HREF="manual.html#pdf-debug.debug">debug.debug</A><BR>
+<A HREF="manual.html#pdf-debug.gethook">debug.gethook</A><BR>
+<A HREF="manual.html#pdf-debug.getinfo">debug.getinfo</A><BR>
+<A HREF="manual.html#pdf-debug.getlocal">debug.getlocal</A><BR>
+<A HREF="manual.html#pdf-debug.getmetatable">debug.getmetatable</A><BR>
+<A HREF="manual.html#pdf-debug.getregistry">debug.getregistry</A><BR>
+<A HREF="manual.html#pdf-debug.getupvalue">debug.getupvalue</A><BR>
+<A HREF="manual.html#pdf-debug.getuservalue">debug.getuservalue</A><BR>
+<A HREF="manual.html#pdf-debug.sethook">debug.sethook</A><BR>
+<A HREF="manual.html#pdf-debug.setlocal">debug.setlocal</A><BR>
+<A HREF="manual.html#pdf-debug.setmetatable">debug.setmetatable</A><BR>
+<A HREF="manual.html#pdf-debug.setupvalue">debug.setupvalue</A><BR>
+<A HREF="manual.html#pdf-debug.setuservalue">debug.setuservalue</A><BR>
+<A HREF="manual.html#pdf-debug.traceback">debug.traceback</A><BR>
+<A HREF="manual.html#pdf-debug.upvalueid">debug.upvalueid</A><BR>
+<A HREF="manual.html#pdf-debug.upvaluejoin">debug.upvaluejoin</A><BR>
+
+<P>
+<A HREF="manual.html#6.8">io</A><BR>
+<A HREF="manual.html#pdf-io.close">io.close</A><BR>
+<A HREF="manual.html#pdf-io.flush">io.flush</A><BR>
+<A HREF="manual.html#pdf-io.input">io.input</A><BR>
+<A HREF="manual.html#pdf-io.lines">io.lines</A><BR>
+<A HREF="manual.html#pdf-io.open">io.open</A><BR>
+<A HREF="manual.html#pdf-io.output">io.output</A><BR>
+<A HREF="manual.html#pdf-io.popen">io.popen</A><BR>
+<A HREF="manual.html#pdf-io.read">io.read</A><BR>
+<A HREF="manual.html#pdf-io.stderr">io.stderr</A><BR>
+<A HREF="manual.html#pdf-io.stdin">io.stdin</A><BR>
+<A HREF="manual.html#pdf-io.stdout">io.stdout</A><BR>
+<A HREF="manual.html#pdf-io.tmpfile">io.tmpfile</A><BR>
+<A HREF="manual.html#pdf-io.type">io.type</A><BR>
+<A HREF="manual.html#pdf-io.write">io.write</A><BR>
+
+<A HREF="manual.html#pdf-file:close">file:close</A><BR>
+<A HREF="manual.html#pdf-file:flush">file:flush</A><BR>
+<A HREF="manual.html#pdf-file:lines">file:lines</A><BR>
+<A HREF="manual.html#pdf-file:read">file:read</A><BR>
+<A HREF="manual.html#pdf-file:seek">file:seek</A><BR>
+<A HREF="manual.html#pdf-file:setvbuf">file:setvbuf</A><BR>
+<A HREF="manual.html#pdf-file:write">file:write</A><BR>
+
+</TD>
+<TD>
+<H3>&nbsp;</H3>
+<P>
+<A HREF="manual.html#6.7">math</A><BR>
+<A HREF="manual.html#pdf-math.abs">math.abs</A><BR>
+<A HREF="manual.html#pdf-math.acos">math.acos</A><BR>
+<A HREF="manual.html#pdf-math.asin">math.asin</A><BR>
+<A HREF="manual.html#pdf-math.atan">math.atan</A><BR>
+<A HREF="manual.html#pdf-math.ceil">math.ceil</A><BR>
+<A HREF="manual.html#pdf-math.cos">math.cos</A><BR>
+<A HREF="manual.html#pdf-math.deg">math.deg</A><BR>
+<A HREF="manual.html#pdf-math.exp">math.exp</A><BR>
+<A HREF="manual.html#pdf-math.floor">math.floor</A><BR>
+<A HREF="manual.html#pdf-math.fmod">math.fmod</A><BR>
+<A HREF="manual.html#pdf-math.huge">math.huge</A><BR>
+<A HREF="manual.html#pdf-math.log">math.log</A><BR>
+<A HREF="manual.html#pdf-math.max">math.max</A><BR>
+<A HREF="manual.html#pdf-math.maxinteger">math.maxinteger</A><BR>
+<A HREF="manual.html#pdf-math.min">math.min</A><BR>
+<A HREF="manual.html#pdf-math.mininteger">math.mininteger</A><BR>
+<A HREF="manual.html#pdf-math.modf">math.modf</A><BR>
+<A HREF="manual.html#pdf-math.pi">math.pi</A><BR>
+<A HREF="manual.html#pdf-math.rad">math.rad</A><BR>
+<A HREF="manual.html#pdf-math.random">math.random</A><BR>
+<A HREF="manual.html#pdf-math.randomseed">math.randomseed</A><BR>
+<A HREF="manual.html#pdf-math.sin">math.sin</A><BR>
+<A HREF="manual.html#pdf-math.sqrt">math.sqrt</A><BR>
+<A HREF="manual.html#pdf-math.tan">math.tan</A><BR>
+<A HREF="manual.html#pdf-math.tointeger">math.tointeger</A><BR>
+<A HREF="manual.html#pdf-math.type">math.type</A><BR>
+<A HREF="manual.html#pdf-math.ult">math.ult</A><BR>
+
+<P>
+<A HREF="manual.html#6.9">os</A><BR>
+<A HREF="manual.html#pdf-os.clock">os.clock</A><BR>
+<A HREF="manual.html#pdf-os.date">os.date</A><BR>
+<A HREF="manual.html#pdf-os.difftime">os.difftime</A><BR>
+<A HREF="manual.html#pdf-os.execute">os.execute</A><BR>
+<A HREF="manual.html#pdf-os.exit">os.exit</A><BR>
+<A HREF="manual.html#pdf-os.getenv">os.getenv</A><BR>
+<A HREF="manual.html#pdf-os.remove">os.remove</A><BR>
+<A HREF="manual.html#pdf-os.rename">os.rename</A><BR>
+<A HREF="manual.html#pdf-os.setlocale">os.setlocale</A><BR>
+<A HREF="manual.html#pdf-os.time">os.time</A><BR>
+<A HREF="manual.html#pdf-os.tmpname">os.tmpname</A><BR>
+
+<P>
+<A HREF="manual.html#6.3">package</A><BR>
+<A HREF="manual.html#pdf-package.config">package.config</A><BR>
+<A HREF="manual.html#pdf-package.cpath">package.cpath</A><BR>
+<A HREF="manual.html#pdf-package.loaded">package.loaded</A><BR>
+<A HREF="manual.html#pdf-package.loadlib">package.loadlib</A><BR>
+<A HREF="manual.html#pdf-package.path">package.path</A><BR>
+<A HREF="manual.html#pdf-package.preload">package.preload</A><BR>
+<A HREF="manual.html#pdf-package.searchers">package.searchers</A><BR>
+<A HREF="manual.html#pdf-package.searchpath">package.searchpath</A><BR>
+
+<P>
+<A HREF="manual.html#6.4">string</A><BR>
+<A HREF="manual.html#pdf-string.byte">string.byte</A><BR>
+<A HREF="manual.html#pdf-string.char">string.char</A><BR>
+<A HREF="manual.html#pdf-string.dump">string.dump</A><BR>
+<A HREF="manual.html#pdf-string.find">string.find</A><BR>
+<A HREF="manual.html#pdf-string.format">string.format</A><BR>
+<A HREF="manual.html#pdf-string.gmatch">string.gmatch</A><BR>
+<A HREF="manual.html#pdf-string.gsub">string.gsub</A><BR>
+<A HREF="manual.html#pdf-string.len">string.len</A><BR>
+<A HREF="manual.html#pdf-string.lower">string.lower</A><BR>
+<A HREF="manual.html#pdf-string.match">string.match</A><BR>
+<A HREF="manual.html#pdf-string.pack">string.pack</A><BR>
+<A HREF="manual.html#pdf-string.packsize">string.packsize</A><BR>
+<A HREF="manual.html#pdf-string.rep">string.rep</A><BR>
+<A HREF="manual.html#pdf-string.reverse">string.reverse</A><BR>
+<A HREF="manual.html#pdf-string.sub">string.sub</A><BR>
+<A HREF="manual.html#pdf-string.unpack">string.unpack</A><BR>
+<A HREF="manual.html#pdf-string.upper">string.upper</A><BR>
+
+<P>
+<A HREF="manual.html#6.6">table</A><BR>
+<A HREF="manual.html#pdf-table.concat">table.concat</A><BR>
+<A HREF="manual.html#pdf-table.insert">table.insert</A><BR>
+<A HREF="manual.html#pdf-table.move">table.move</A><BR>
+<A HREF="manual.html#pdf-table.pack">table.pack</A><BR>
+<A HREF="manual.html#pdf-table.remove">table.remove</A><BR>
+<A HREF="manual.html#pdf-table.sort">table.sort</A><BR>
+<A HREF="manual.html#pdf-table.unpack">table.unpack</A><BR>
+
+<P>
+<A HREF="manual.html#6.5">utf8</A><BR>
+<A HREF="manual.html#pdf-utf8.char">utf8.char</A><BR>
+<A HREF="manual.html#pdf-utf8.charpattern">utf8.charpattern</A><BR>
+<A HREF="manual.html#pdf-utf8.codepoint">utf8.codepoint</A><BR>
+<A HREF="manual.html#pdf-utf8.codes">utf8.codes</A><BR>
+<A HREF="manual.html#pdf-utf8.len">utf8.len</A><BR>
+<A HREF="manual.html#pdf-utf8.offset">utf8.offset</A><BR>
+
+<H3><A NAME="metamethods">metamethods</A></H3>
+<P>
+<A HREF="manual.html#2.4">__add</A><BR>
+<A HREF="manual.html#2.4">__band</A><BR>
+<A HREF="manual.html#2.4">__bnot</A><BR>
+<A HREF="manual.html#2.4">__bor</A><BR>
+<A HREF="manual.html#2.4">__bxor</A><BR>
+<A HREF="manual.html#2.4">__call</A><BR>
+<A HREF="manual.html#3.3.8">__close</A><BR>
+<A HREF="manual.html#2.4">__concat</A><BR>
+<A HREF="manual.html#2.4">__div</A><BR>
+<A HREF="manual.html#2.4">__eq</A><BR>
+<A HREF="manual.html#2.5.3">__gc</A><BR>
+<A HREF="manual.html#2.4">__idiv</A><BR>
+<A HREF="manual.html#2.4">__index</A><BR>
+<A HREF="manual.html#2.4">__le</A><BR>
+<A HREF="manual.html#2.4">__len</A><BR>
+<A HREF="manual.html#2.4">__lt</A><BR>
+<A HREF="manual.html#pdf-getmetatable">__metatable</A><BR>
+<A HREF="manual.html#2.4">__mod</A><BR>
+<A HREF="manual.html#2.5.4">__mode</A><BR>
+<A HREF="manual.html#2.4">__mul</A><BR>
+<A HREF="manual.html#luaL_newmetatable">__name</A><BR>
+<A HREF="manual.html#2.4">__newindex</A><BR>
+<A HREF="manual.html#pdf-pairs">__pairs</A><BR>
+<A HREF="manual.html#2.4">__pow</A><BR>
+<A HREF="manual.html#2.4">__shl</A><BR>
+<A HREF="manual.html#2.4">__shr</A><BR>
+<A HREF="manual.html#2.4">__sub</A><BR>
+<A HREF="manual.html#pdf-tostring">__tostring</A><BR>
+<A HREF="manual.html#2.4">__unm</A><BR>
+
+<H3><A NAME="env">environment<BR>variables</A></H3>
+<P>
+<A HREF="manual.html#pdf-LUA_CPATH">LUA_CPATH</A><BR>
+<A HREF="manual.html#pdf-LUA_CPATH_5_4">LUA_CPATH_5_4</A><BR>
+<A HREF="manual.html#pdf-LUA_INIT">LUA_INIT</A><BR>
+<A HREF="manual.html#pdf-LUA_INIT_5_4">LUA_INIT_5_4</A><BR>
+<A HREF="manual.html#pdf-LUA_PATH">LUA_PATH</A><BR>
+<A HREF="manual.html#pdf-LUA_PATH_5_4">LUA_PATH_5_4</A><BR>
+
+</TD>
+<TD>
+<H3><A NAME="api">C API</A></H3>
+<P>
+<A HREF="manual.html#lua_Alloc">lua_Alloc</A><BR>
+<A HREF="manual.html#lua_CFunction">lua_CFunction</A><BR>
+<A HREF="manual.html#lua_Debug">lua_Debug</A><BR>
+<A HREF="manual.html#lua_Hook">lua_Hook</A><BR>
+<A HREF="manual.html#lua_Integer">lua_Integer</A><BR>
+<A HREF="manual.html#lua_KContext">lua_KContext</A><BR>
+<A HREF="manual.html#lua_KFunction">lua_KFunction</A><BR>
+<A HREF="manual.html#lua_Number">lua_Number</A><BR>
+<A HREF="manual.html#lua_Reader">lua_Reader</A><BR>
+<A HREF="manual.html#lua_State">lua_State</A><BR>
+<A HREF="manual.html#lua_Unsigned">lua_Unsigned</A><BR>
+<A HREF="manual.html#lua_WarnFunction">lua_WarnFunction</A><BR>
+<A HREF="manual.html#lua_Writer">lua_Writer</A><BR>
+
+<P>
+<A HREF="manual.html#lua_absindex">lua_absindex</A><BR>
+<A HREF="manual.html#lua_arith">lua_arith</A><BR>
+<A HREF="manual.html#lua_atpanic">lua_atpanic</A><BR>
+<A HREF="manual.html#lua_call">lua_call</A><BR>
+<A HREF="manual.html#lua_callk">lua_callk</A><BR>
+<A HREF="manual.html#lua_checkstack">lua_checkstack</A><BR>
+<A HREF="manual.html#lua_close">lua_close</A><BR>
+<A HREF="manual.html#lua_closeslot">lua_closeslot</A><BR>
+<A HREF="manual.html#lua_compare">lua_compare</A><BR>
+<A HREF="manual.html#lua_concat">lua_concat</A><BR>
+<A HREF="manual.html#lua_copy">lua_copy</A><BR>
+<A HREF="manual.html#lua_createtable">lua_createtable</A><BR>
+<A HREF="manual.html#lua_dump">lua_dump</A><BR>
+<A HREF="manual.html#lua_error">lua_error</A><BR>
+<A HREF="manual.html#lua_gc">lua_gc</A><BR>
+<A HREF="manual.html#lua_getallocf">lua_getallocf</A><BR>
+<A HREF="manual.html#lua_getextraspace">lua_getextraspace</A><BR>
+<A HREF="manual.html#lua_getfield">lua_getfield</A><BR>
+<A HREF="manual.html#lua_getglobal">lua_getglobal</A><BR>
+<A HREF="manual.html#lua_gethook">lua_gethook</A><BR>
+<A HREF="manual.html#lua_gethookcount">lua_gethookcount</A><BR>
+<A HREF="manual.html#lua_gethookmask">lua_gethookmask</A><BR>
+<A HREF="manual.html#lua_geti">lua_geti</A><BR>
+<A HREF="manual.html#lua_getinfo">lua_getinfo</A><BR>
+<A HREF="manual.html#lua_getiuservalue">lua_getiuservalue</A><BR>
+<A HREF="manual.html#lua_getlocal">lua_getlocal</A><BR>
+<A HREF="manual.html#lua_getmetatable">lua_getmetatable</A><BR>
+<A HREF="manual.html#lua_getstack">lua_getstack</A><BR>
+<A HREF="manual.html#lua_gettable">lua_gettable</A><BR>
+<A HREF="manual.html#lua_gettop">lua_gettop</A><BR>
+<A HREF="manual.html#lua_getupvalue">lua_getupvalue</A><BR>
+<A HREF="manual.html#lua_insert">lua_insert</A><BR>
+<A HREF="manual.html#lua_isboolean">lua_isboolean</A><BR>
+<A HREF="manual.html#lua_iscfunction">lua_iscfunction</A><BR>
+<A HREF="manual.html#lua_isfunction">lua_isfunction</A><BR>
+<A HREF="manual.html#lua_isinteger">lua_isinteger</A><BR>
+<A HREF="manual.html#lua_islightuserdata">lua_islightuserdata</A><BR>
+<A HREF="manual.html#lua_isnil">lua_isnil</A><BR>
+<A HREF="manual.html#lua_isnone">lua_isnone</A><BR>
+<A HREF="manual.html#lua_isnoneornil">lua_isnoneornil</A><BR>
+<A HREF="manual.html#lua_isnumber">lua_isnumber</A><BR>
+<A HREF="manual.html#lua_isstring">lua_isstring</A><BR>
+<A HREF="manual.html#lua_istable">lua_istable</A><BR>
+<A HREF="manual.html#lua_isthread">lua_isthread</A><BR>
+<A HREF="manual.html#lua_isuserdata">lua_isuserdata</A><BR>
+<A HREF="manual.html#lua_isyieldable">lua_isyieldable</A><BR>
+<A HREF="manual.html#lua_len">lua_len</A><BR>
+<A HREF="manual.html#lua_load">lua_load</A><BR>
+<A HREF="manual.html#lua_newstate">lua_newstate</A><BR>
+<A HREF="manual.html#lua_newtable">lua_newtable</A><BR>
+<A HREF="manual.html#lua_newthread">lua_newthread</A><BR>
+<A HREF="manual.html#lua_newuserdatauv">lua_newuserdatauv</A><BR>
+<A HREF="manual.html#lua_next">lua_next</A><BR>
+<A HREF="manual.html#lua_numbertointeger">lua_numbertointeger</A><BR>
+<A HREF="manual.html#lua_pcall">lua_pcall</A><BR>
+<A HREF="manual.html#lua_pcallk">lua_pcallk</A><BR>
+<A HREF="manual.html#lua_pop">lua_pop</A><BR>
+<A HREF="manual.html#lua_pushboolean">lua_pushboolean</A><BR>
+<A HREF="manual.html#lua_pushcclosure">lua_pushcclosure</A><BR>
+<A HREF="manual.html#lua_pushcfunction">lua_pushcfunction</A><BR>
+<A HREF="manual.html#lua_pushfstring">lua_pushfstring</A><BR>
+<A HREF="manual.html#lua_pushglobaltable">lua_pushglobaltable</A><BR>
+<A HREF="manual.html#lua_pushinteger">lua_pushinteger</A><BR>
+<A HREF="manual.html#lua_pushlightuserdata">lua_pushlightuserdata</A><BR>
+<A HREF="manual.html#lua_pushliteral">lua_pushliteral</A><BR>
+<A HREF="manual.html#lua_pushlstring">lua_pushlstring</A><BR>
+<A HREF="manual.html#lua_pushnil">lua_pushnil</A><BR>
+<A HREF="manual.html#lua_pushnumber">lua_pushnumber</A><BR>
+<A HREF="manual.html#lua_pushstring">lua_pushstring</A><BR>
+<A HREF="manual.html#lua_pushthread">lua_pushthread</A><BR>
+<A HREF="manual.html#lua_pushvalue">lua_pushvalue</A><BR>
+<A HREF="manual.html#lua_pushvfstring">lua_pushvfstring</A><BR>
+<A HREF="manual.html#lua_rawequal">lua_rawequal</A><BR>
+<A HREF="manual.html#lua_rawget">lua_rawget</A><BR>
+<A HREF="manual.html#lua_rawgeti">lua_rawgeti</A><BR>
+<A HREF="manual.html#lua_rawgetp">lua_rawgetp</A><BR>
+<A HREF="manual.html#lua_rawlen">lua_rawlen</A><BR>
+<A HREF="manual.html#lua_rawset">lua_rawset</A><BR>
+<A HREF="manual.html#lua_rawseti">lua_rawseti</A><BR>
+<A HREF="manual.html#lua_rawsetp">lua_rawsetp</A><BR>
+<A HREF="manual.html#lua_register">lua_register</A><BR>
+<A HREF="manual.html#lua_remove">lua_remove</A><BR>
+<A HREF="manual.html#lua_replace">lua_replace</A><BR>
+<A HREF="manual.html#lua_resetthread">lua_resetthread</A><BR>
+<A HREF="manual.html#lua_resume">lua_resume</A><BR>
+<A HREF="manual.html#lua_rotate">lua_rotate</A><BR>
+<A HREF="manual.html#lua_setallocf">lua_setallocf</A><BR>
+<A HREF="manual.html#lua_setfield">lua_setfield</A><BR>
+<A HREF="manual.html#lua_setglobal">lua_setglobal</A><BR>
+<A HREF="manual.html#lua_sethook">lua_sethook</A><BR>
+<A HREF="manual.html#lua_seti">lua_seti</A><BR>
+<A HREF="manual.html#lua_setiuservalue">lua_setiuservalue</A><BR>
+<A HREF="manual.html#lua_setlocal">lua_setlocal</A><BR>
+<A HREF="manual.html#lua_setmetatable">lua_setmetatable</A><BR>
+<A HREF="manual.html#lua_settable">lua_settable</A><BR>
+<A HREF="manual.html#lua_settop">lua_settop</A><BR>
+<A HREF="manual.html#lua_setupvalue">lua_setupvalue</A><BR>
+<A HREF="manual.html#lua_setwarnf">lua_setwarnf</A><BR>
+<A HREF="manual.html#lua_status">lua_status</A><BR>
+<A HREF="manual.html#lua_stringtonumber">lua_stringtonumber</A><BR>
+<A HREF="manual.html#lua_toboolean">lua_toboolean</A><BR>
+<A HREF="manual.html#lua_tocfunction">lua_tocfunction</A><BR>
+<A HREF="manual.html#lua_toclose">lua_toclose</A><BR>
+<A HREF="manual.html#lua_tointeger">lua_tointeger</A><BR>
+<A HREF="manual.html#lua_tointegerx">lua_tointegerx</A><BR>
+<A HREF="manual.html#lua_tolstring">lua_tolstring</A><BR>
+<A HREF="manual.html#lua_tonumber">lua_tonumber</A><BR>
+<A HREF="manual.html#lua_tonumberx">lua_tonumberx</A><BR>
+<A HREF="manual.html#lua_topointer">lua_topointer</A><BR>
+<A HREF="manual.html#lua_tostring">lua_tostring</A><BR>
+<A HREF="manual.html#lua_tothread">lua_tothread</A><BR>
+<A HREF="manual.html#lua_touserdata">lua_touserdata</A><BR>
+<A HREF="manual.html#lua_type">lua_type</A><BR>
+<A HREF="manual.html#lua_typename">lua_typename</A><BR>
+<A HREF="manual.html#lua_upvalueid">lua_upvalueid</A><BR>
+<A HREF="manual.html#lua_upvalueindex">lua_upvalueindex</A><BR>
+<A HREF="manual.html#lua_upvaluejoin">lua_upvaluejoin</A><BR>
+<A HREF="manual.html#lua_version">lua_version</A><BR>
+<A HREF="manual.html#lua_warning">lua_warning</A><BR>
+<A HREF="manual.html#lua_xmove">lua_xmove</A><BR>
+<A HREF="manual.html#lua_yield">lua_yield</A><BR>
+<A HREF="manual.html#lua_yieldk">lua_yieldk</A><BR>
+
+</TD>
+<TD>
+<H3><A NAME="auxlib">auxiliary library</A></H3>
+<P>
+<A HREF="manual.html#luaL_Buffer">luaL_Buffer</A><BR>
+<A HREF="manual.html#luaL_Reg">luaL_Reg</A><BR>
+<A HREF="manual.html#luaL_Stream">luaL_Stream</A><BR>
+
+<P>
+<A HREF="manual.html#luaL_addchar">luaL_addchar</A><BR>
+<A HREF="manual.html#luaL_addgsub">luaL_addgsub</A><BR>
+<A HREF="manual.html#luaL_addlstring">luaL_addlstring</A><BR>
+<A HREF="manual.html#luaL_addsize">luaL_addsize</A><BR>
+<A HREF="manual.html#luaL_addstring">luaL_addstring</A><BR>
+<A HREF="manual.html#luaL_addvalue">luaL_addvalue</A><BR>
+<A HREF="manual.html#luaL_argcheck">luaL_argcheck</A><BR>
+<A HREF="manual.html#luaL_argerror">luaL_argerror</A><BR>
+<A HREF="manual.html#luaL_argexpected">luaL_argexpected</A><BR>
+<A HREF="manual.html#luaL_buffaddr">luaL_buffaddr</A><BR>
+<A HREF="manual.html#luaL_buffinit">luaL_buffinit</A><BR>
+<A HREF="manual.html#luaL_buffinitsize">luaL_buffinitsize</A><BR>
+<A HREF="manual.html#luaL_bufflen">luaL_bufflen</A><BR>
+<A HREF="manual.html#luaL_buffsub">luaL_buffsub</A><BR>
+<A HREF="manual.html#luaL_callmeta">luaL_callmeta</A><BR>
+<A HREF="manual.html#luaL_checkany">luaL_checkany</A><BR>
+<A HREF="manual.html#luaL_checkinteger">luaL_checkinteger</A><BR>
+<A HREF="manual.html#luaL_checklstring">luaL_checklstring</A><BR>
+<A HREF="manual.html#luaL_checknumber">luaL_checknumber</A><BR>
+<A HREF="manual.html#luaL_checkoption">luaL_checkoption</A><BR>
+<A HREF="manual.html#luaL_checkstack">luaL_checkstack</A><BR>
+<A HREF="manual.html#luaL_checkstring">luaL_checkstring</A><BR>
+<A HREF="manual.html#luaL_checktype">luaL_checktype</A><BR>
+<A HREF="manual.html#luaL_checkudata">luaL_checkudata</A><BR>
+<A HREF="manual.html#luaL_checkversion">luaL_checkversion</A><BR>
+<A HREF="manual.html#luaL_dofile">luaL_dofile</A><BR>
+<A HREF="manual.html#luaL_dostring">luaL_dostring</A><BR>
+<A HREF="manual.html#luaL_error">luaL_error</A><BR>
+<A HREF="manual.html#luaL_execresult">luaL_execresult</A><BR>
+<A HREF="manual.html#luaL_fileresult">luaL_fileresult</A><BR>
+<A HREF="manual.html#luaL_getmetafield">luaL_getmetafield</A><BR>
+<A HREF="manual.html#luaL_getmetatable">luaL_getmetatable</A><BR>
+<A HREF="manual.html#luaL_getsubtable">luaL_getsubtable</A><BR>
+<A HREF="manual.html#luaL_gsub">luaL_gsub</A><BR>
+<A HREF="manual.html#luaL_len">luaL_len</A><BR>
+<A HREF="manual.html#luaL_loadbuffer">luaL_loadbuffer</A><BR>
+<A HREF="manual.html#luaL_loadbufferx">luaL_loadbufferx</A><BR>
+<A HREF="manual.html#luaL_loadfile">luaL_loadfile</A><BR>
+<A HREF="manual.html#luaL_loadfilex">luaL_loadfilex</A><BR>
+<A HREF="manual.html#luaL_loadstring">luaL_loadstring</A><BR>
+<A HREF="manual.html#luaL_newlib">luaL_newlib</A><BR>
+<A HREF="manual.html#luaL_newlibtable">luaL_newlibtable</A><BR>
+<A HREF="manual.html#luaL_newmetatable">luaL_newmetatable</A><BR>
+<A HREF="manual.html#luaL_newstate">luaL_newstate</A><BR>
+<A HREF="manual.html#luaL_openlibs">luaL_openlibs</A><BR>
+<A HREF="manual.html#luaL_opt">luaL_opt</A><BR>
+<A HREF="manual.html#luaL_optinteger">luaL_optinteger</A><BR>
+<A HREF="manual.html#luaL_optlstring">luaL_optlstring</A><BR>
+<A HREF="manual.html#luaL_optnumber">luaL_optnumber</A><BR>
+<A HREF="manual.html#luaL_optstring">luaL_optstring</A><BR>
+<A HREF="manual.html#luaL_prepbuffer">luaL_prepbuffer</A><BR>
+<A HREF="manual.html#luaL_prepbuffsize">luaL_prepbuffsize</A><BR>
+<A HREF="manual.html#luaL_pushfail">luaL_pushfail</A><BR>
+<A HREF="manual.html#luaL_pushresult">luaL_pushresult</A><BR>
+<A HREF="manual.html#luaL_pushresultsize">luaL_pushresultsize</A><BR>
+<A HREF="manual.html#luaL_ref">luaL_ref</A><BR>
+<A HREF="manual.html#luaL_requiref">luaL_requiref</A><BR>
+<A HREF="manual.html#luaL_setfuncs">luaL_setfuncs</A><BR>
+<A HREF="manual.html#luaL_setmetatable">luaL_setmetatable</A><BR>
+<A HREF="manual.html#luaL_testudata">luaL_testudata</A><BR>
+<A HREF="manual.html#luaL_tolstring">luaL_tolstring</A><BR>
+<A HREF="manual.html#luaL_traceback">luaL_traceback</A><BR>
+<A HREF="manual.html#luaL_typeerror">luaL_typeerror</A><BR>
+<A HREF="manual.html#luaL_typename">luaL_typename</A><BR>
+<A HREF="manual.html#luaL_unref">luaL_unref</A><BR>
+<A HREF="manual.html#luaL_where">luaL_where</A><BR>
+
+<H3><A NAME="library">standard library</A></H3>
+<P>
+<A HREF="manual.html#pdf-luaopen_base">luaopen_base</A><BR>
+<A HREF="manual.html#pdf-luaopen_coroutine">luaopen_coroutine</A><BR>
+<A HREF="manual.html#pdf-luaopen_debug">luaopen_debug</A><BR>
+<A HREF="manual.html#pdf-luaopen_io">luaopen_io</A><BR>
+<A HREF="manual.html#pdf-luaopen_math">luaopen_math</A><BR>
+<A HREF="manual.html#pdf-luaopen_os">luaopen_os</A><BR>
+<A HREF="manual.html#pdf-luaopen_package">luaopen_package</A><BR>
+<A HREF="manual.html#pdf-luaopen_string">luaopen_string</A><BR>
+<A HREF="manual.html#pdf-luaopen_table">luaopen_table</A><BR>
+<A HREF="manual.html#pdf-luaopen_utf8">luaopen_utf8</A><BR>
+
+<H3><A NAME="constants">constants</A></H3>
+<P>
+<A HREF="manual.html#pdf-LUA_ERRERR">LUA_ERRERR</A><BR>
+<A HREF="manual.html#pdf-LUA_ERRFILE">LUA_ERRFILE</A><BR>
+<A HREF="manual.html#pdf-LUA_ERRMEM">LUA_ERRMEM</A><BR>
+<A HREF="manual.html#pdf-LUA_ERRRUN">LUA_ERRRUN</A><BR>
+<A HREF="manual.html#pdf-LUA_ERRSYNTAX">LUA_ERRSYNTAX</A><BR>
+<A HREF="manual.html#pdf-LUA_HOOKCALL">LUA_HOOKCALL</A><BR>
+<A HREF="manual.html#pdf-LUA_HOOKCOUNT">LUA_HOOKCOUNT</A><BR>
+<A HREF="manual.html#pdf-LUA_HOOKLINE">LUA_HOOKLINE</A><BR>
+<A HREF="manual.html#pdf-LUA_HOOKRET">LUA_HOOKRET</A><BR>
+<A HREF="manual.html#pdf-LUA_HOOKTAILCALL">LUA_HOOKTAILCALL</A><BR>
+<A HREF="manual.html#pdf-LUA_LOADED_TABLE">LUA_LOADED_TABLE</A><BR>
+<A HREF="manual.html#pdf-LUA_MASKCALL">LUA_MASKCALL</A><BR>
+<A HREF="manual.html#pdf-LUA_MASKCOUNT">LUA_MASKCOUNT</A><BR>
+<A HREF="manual.html#pdf-LUA_MASKLINE">LUA_MASKLINE</A><BR>
+<A HREF="manual.html#pdf-LUA_MASKRET">LUA_MASKRET</A><BR>
+<A HREF="manual.html#pdf-LUA_MAXINTEGER">LUA_MAXINTEGER</A><BR>
+<A HREF="manual.html#pdf-LUA_MININTEGER">LUA_MININTEGER</A><BR>
+<A HREF="manual.html#pdf-LUA_MINSTACK">LUA_MINSTACK</A><BR>
+<A HREF="manual.html#pdf-LUA_MULTRET">LUA_MULTRET</A><BR>
+<A HREF="manual.html#pdf-LUA_NOREF">LUA_NOREF</A><BR>
+<A HREF="manual.html#pdf-LUA_OK">LUA_OK</A><BR>
+<A HREF="manual.html#pdf-LUA_OPADD">LUA_OPADD</A><BR>
+<A HREF="manual.html#pdf-LUA_OPBAND">LUA_OPBAND</A><BR>
+<A HREF="manual.html#pdf-LUA_OPBNOT">LUA_OPBNOT</A><BR>
+<A HREF="manual.html#pdf-LUA_OPBOR">LUA_OPBOR</A><BR>
+<A HREF="manual.html#pdf-LUA_OPBXOR">LUA_OPBXOR</A><BR>
+<A HREF="manual.html#pdf-LUA_OPDIV">LUA_OPDIV</A><BR>
+<A HREF="manual.html#pdf-LUA_OPEQ">LUA_OPEQ</A><BR>
+<A HREF="manual.html#pdf-LUA_OPIDIV">LUA_OPIDIV</A><BR>
+<A HREF="manual.html#pdf-LUA_OPLE">LUA_OPLE</A><BR>
+<A HREF="manual.html#pdf-LUA_OPLT">LUA_OPLT</A><BR>
+<A HREF="manual.html#pdf-LUA_OPMOD">LUA_OPMOD</A><BR>
+<A HREF="manual.html#pdf-LUA_OPMUL">LUA_OPMUL</A><BR>
+<A HREF="manual.html#pdf-LUA_OPPOW">LUA_OPPOW</A><BR>
+<A HREF="manual.html#pdf-LUA_OPSHL">LUA_OPSHL</A><BR>
+<A HREF="manual.html#pdf-LUA_OPSHR">LUA_OPSHR</A><BR>
+<A HREF="manual.html#pdf-LUA_OPSUB">LUA_OPSUB</A><BR>
+<A HREF="manual.html#pdf-LUA_OPUNM">LUA_OPUNM</A><BR>
+<A HREF="manual.html#pdf-LUA_PRELOAD_TABLE">LUA_PRELOAD_TABLE</A><BR>
+<A HREF="manual.html#pdf-LUA_REFNIL">LUA_REFNIL</A><BR>
+<A HREF="manual.html#pdf-LUA_REGISTRYINDEX">LUA_REGISTRYINDEX</A><BR>
+<A HREF="manual.html#pdf-LUA_RIDX_GLOBALS">LUA_RIDX_GLOBALS</A><BR>
+<A HREF="manual.html#pdf-LUA_RIDX_MAINTHREAD">LUA_RIDX_MAINTHREAD</A><BR>
+<A HREF="manual.html#pdf-LUA_TBOOLEAN">LUA_TBOOLEAN</A><BR>
+<A HREF="manual.html#pdf-LUA_TFUNCTION">LUA_TFUNCTION</A><BR>
+<A HREF="manual.html#pdf-LUA_TLIGHTUSERDATA">LUA_TLIGHTUSERDATA</A><BR>
+<A HREF="manual.html#pdf-LUA_TNIL">LUA_TNIL</A><BR>
+<A HREF="manual.html#pdf-LUA_TNONE">LUA_TNONE</A><BR>
+<A HREF="manual.html#pdf-LUA_TNUMBER">LUA_TNUMBER</A><BR>
+<A HREF="manual.html#pdf-LUA_TSTRING">LUA_TSTRING</A><BR>
+<A HREF="manual.html#pdf-LUA_TTABLE">LUA_TTABLE</A><BR>
+<A HREF="manual.html#pdf-LUA_TTHREAD">LUA_TTHREAD</A><BR>
+<A HREF="manual.html#pdf-LUA_TUSERDATA">LUA_TUSERDATA</A><BR>
+<A HREF="manual.html#pdf-LUA_USE_APICHECK">LUA_USE_APICHECK</A><BR>
+<A HREF="manual.html#pdf-LUA_YIELD">LUA_YIELD</A><BR>
+<A HREF="manual.html#pdf-LUAL_BUFFERSIZE">LUAL_BUFFERSIZE</A><BR>
+
+</TD>
+</TR>
+</TABLE>
+
+<P CLASS="footer">
+Last update:
+Sat Apr  1 17:57:05 UTC 2023
+</P>
+<!--
+Last change: revised for Lua 5.4.5
+-->
+
+</BODY>
+</HTML>
diff --git a/src/libs/3rdparty/lua/doc/index.css b/src/libs/3rdparty/lua/doc/index.css
new file mode 100644
index 0000000000..c961835731
--- /dev/null
+++ b/src/libs/3rdparty/lua/doc/index.css
@@ -0,0 +1,21 @@
+ul {
+	list-style-type: none ;
+}
+
+ul.contents {
+	padding: 0 ;
+}
+
+table {
+	border: none ;
+	border-spacing: 0 ;
+	border-collapse: collapse ;
+}
+
+td {
+	vertical-align: top ;
+	padding: 0 ;
+	text-align: left ;
+	line-height: 1.25 ;
+	width: 15% ;
+}
diff --git a/src/libs/3rdparty/lua/doc/logo.gif b/src/libs/3rdparty/lua/doc/logo.gif
new file mode 100644
index 0000000000..5c77eacc3b
--- /dev/null
+++ b/src/libs/3rdparty/lua/doc/logo.gif
diff --git a/src/libs/3rdparty/lua/doc/lua.1 b/src/libs/3rdparty/lua/doc/lua.1
new file mode 100644
index 0000000000..3f472fd81f
--- /dev/null
+++ b/src/libs/3rdparty/lua/doc/lua.1
@@ -0,0 +1,155 @@
+.\" $Id: lua.man,v 1.14 2022/09/23 09:06:36 lhf Exp $
+.TH LUA 1 "$Date: 2022/09/23 09:06:36 $"
+.SH NAME
+lua \- Lua interpreter
+.SH SYNOPSIS
+.B lua
+[
+.I options
+]
+[
+.I script
+[
+.I args
+]
+]
+.SH DESCRIPTION
+.B lua
+is the standalone Lua interpreter.
+It loads and executes Lua programs,
+either in textual source form or
+in precompiled binary form.
+(Precompiled binaries are output by
+.BR luac ,
+the Lua compiler.)
+.B lua
+can be used as a batch interpreter and also interactively.
+.LP
+After handling the
+.IR options ,
+the Lua program in file
+.I script
+is loaded and executed.
+The
+.I args
+are available to
+.I script
+as strings in a global table named
+.B arg
+and also as arguments to its main function.
+When called without arguments,
+.B lua
+behaves as
+.B "lua \-v \-i"
+if the standard input is a terminal,
+and as
+.B "lua \-"
+otherwise.
+.LP
+In interactive mode,
+.B lua
+prompts the user,
+reads lines from the standard input,
+and executes them as they are read.
+If the line contains an expression,
+then the line is evaluated and the result is printed.
+If a line does not contain a complete statement,
+then a secondary prompt is displayed and
+lines are read until a complete statement is formed or
+a syntax error is found.
+.LP
+Before handling command line options and scripts,
+.B lua
+checks the contents of the environment variables
+.B LUA_INIT_5_4
+and
+.BR LUA_INIT ,
+in that order.
+If the contents are of the form
+.RI '@ filename ',
+then
+.I filename
+is executed.
+Otherwise, the contents are assumed to be a Lua statement and is executed.
+When
+.B LUA_INIT_5_4
+is defined,
+.B LUA_INIT
+is ignored.
+.SH OPTIONS
+.TP
+.BI \-e " stat"
+execute statement
+.IR stat .
+.TP
+.B \-i
+enter interactive mode after executing
+.IR script .
+.TP
+.BI \-l " mod"
+require library
+.I mod
+into global
+.IR mod .
+.TP
+.BI \-l " g=mod"
+require library
+.I mod
+into global
+.IR g .
+.TP
+.B \-v
+show version information.
+.TP
+.B \-E
+ignore environment variables.
+.TP
+.B \-W
+turn warnings on.
+.TP
+.B \-\-
+stop handling options.
+.TP
+.B \-
+stop handling options and execute the standard input as a file.
+.SH ENVIRONMENT VARIABLES
+The following environment variables affect the execution of
+.BR lua .
+When defined,
+the version-specific variants take priority
+and the version-neutral variants are ignored.
+.TP
+.B LUA_INIT, LUA_INIT_5_4
+Code to be executed before command line options and scripts.
+.TP
+.B LUA_PATH, LUA_PATH_5_4
+Initial value of package.cpath,
+the path used by require to search for Lua loaders.
+.TP
+.B LUA_CPATH, LUA_CPATH_5_4
+Initial value of package.cpath,
+the path used by require to search for C loaders.
+.SH EXIT STATUS
+If a script calls os.exit,
+then
+.B lua
+exits with the given exit status.
+Otherwise,
+.B lua
+exits
+with EXIT_SUCCESS (0 on POSIX systems) if there were no errors
+and
+with EXIT_FAILURE (1 on POSIX systems) if there were errors.
+Errors raised in interactive mode do not cause exits.
+.SH DIAGNOSTICS
+Error messages should be self explanatory.
+.SH "SEE ALSO"
+.BR luac (1)
+.br
+The documentation at lua.org,
+especially section 7 of the reference manual.
+.SH AUTHORS
+R. Ierusalimschy,
+L. H. de Figueiredo,
+W. Celes
+.\" EOF
diff --git a/src/libs/3rdparty/lua/doc/lua.css b/src/libs/3rdparty/lua/doc/lua.css
new file mode 100644
index 0000000000..cbd0799d15
--- /dev/null
+++ b/src/libs/3rdparty/lua/doc/lua.css
@@ -0,0 +1,161 @@
+html {
+	background-color: #F8F8F8 ;
+}
+
+body {
+	background-color: #FFFFFF ;
+	color: #000000 ;
+	font-family: Helvetica, Arial, sans-serif ;
+	text-align: justify ;
+	line-height: 1.25 ;
+	margin: 16px auto ;
+	padding: 32px ;
+	border: solid #ccc 1px ;
+	border-radius: 20px ;
+	max-width: 70em ;
+	width: 90% ;
+}
+
+h1, h2, h3, h4 {
+	color: #000080 ;
+	font-family: Verdana, Geneva, sans-serif ;
+	font-weight: normal ;
+	font-style: normal ;
+	text-align: left ;
+}
+
+h1 {
+	font-size: 28pt ;
+}
+
+h1 img {
+	vertical-align: text-bottom ;
+}
+
+h2:before {
+	content: "\2756" ;
+	padding-right: 0.5em ;
+}
+
+a {
+	text-decoration: none ;
+}
+
+a:link {
+	color: #000080 ;
+}
+
+a:link:hover, a:visited:hover {
+	background-color: #D0D0FF ;
+	color: #000080 ;
+	border-radius: 4px ;
+}
+
+a:link:active, a:visited:active {
+	color: #FF0000 ;
+}
+
+div.menubar {
+	padding-bottom: 0.5em ;
+}
+
+p.menubar {
+	margin-left: 2.5em ;
+}
+
+.menubar a:hover  {
+	margin: -3px -3px -3px -3px ;
+	padding: 3px  3px  3px  3px ;
+	border-radius: 4px ;
+}
+
+:target {
+	background-color: #F0F0F0 ;
+	margin: -8px ;
+	padding: 8px ;
+	border-radius: 8px ;
+	outline: none ;
+}
+
+hr {
+	display: none ;
+}
+
+table hr {
+	background-color: #a0a0a0 ;
+	color: #a0a0a0 ;
+	border: 0 ;
+	height: 1px ;
+	display: block ;
+}
+
+.footer {
+	color: gray ;
+	font-size: x-small ;
+	text-transform: lowercase ;
+}
+
+input[type=text] {
+	border: solid #a0a0a0 2px ;
+	border-radius: 2em ;
+	background-image: url('images/search.png') ;
+	background-repeat: no-repeat ;
+	background-position: 4px center ;
+	padding-left: 20px ;
+	height: 2em ;
+}
+
+pre.session {
+	background-color: #F8F8F8 ;
+	padding: 1em ;
+	border-radius: 8px ;
+}
+
+table {
+	border: none ;
+	border-spacing: 0 ;
+	border-collapse: collapse ;
+}
+
+td {
+	padding: 0 ;
+	margin: 0 ;
+}
+
+td.gutter {
+	width: 4% ;
+}
+
+table.columns td {
+	vertical-align: top ;
+	padding-bottom: 1em ;
+	text-align: justify ;
+	line-height: 1.25 ;
+}
+
+table.book td {
+	vertical-align: top ;
+}
+
+table.book td.cover {
+	padding-right: 1em ;
+}
+
+table.book img {
+	border: solid #000080 1px ;
+}
+
+table.book span {
+	font-size: small ;
+	text-align: left ;
+	display: block ;
+	margin-top: 0.25em ;
+}
+
+p.logos a:link:hover, p.logos a:visited:hover {
+	background-color: inherit ;
+}
+
+img {
+	background-color: white ;
+}
diff --git a/src/libs/3rdparty/lua/doc/luac.1 b/src/libs/3rdparty/lua/doc/luac.1
new file mode 100644
index 0000000000..33a4ed00ac
--- /dev/null
+++ b/src/libs/3rdparty/lua/doc/luac.1
@@ -0,0 +1,118 @@
+.\" $Id: luac.man,v 1.29 2011/11/16 13:53:40 lhf Exp $
+.TH LUAC 1 "$Date: 2011/11/16 13:53:40 $"
+.SH NAME
+luac \- Lua compiler
+.SH SYNOPSIS
+.B luac
+[
+.I options
+] [
+.I filenames
+]
+.SH DESCRIPTION
+.B luac
+is the Lua compiler.
+It translates programs written in the Lua programming language
+into binary files containing precompiled chunks
+that can be later loaded and executed.
+.LP
+The main advantages of precompiling chunks are:
+faster loading,
+protecting source code from accidental user changes,
+and
+off-line syntax checking.
+Precompiling does not imply faster execution
+because in Lua chunks are always compiled into bytecodes before being executed.
+.B luac
+simply allows those bytecodes to be saved in a file for later execution.
+Precompiled chunks are not necessarily smaller than the corresponding source.
+The main goal in precompiling is faster loading.
+.LP
+In the command line,
+you can mix
+text files containing Lua source and
+binary files containing precompiled chunks.
+.B luac
+produces a single output file containing the combined bytecodes
+for all files given.
+Executing the combined file is equivalent to executing the given files.
+By default,
+the output file is named
+.BR luac.out ,
+but you can change this with the
+.B \-o
+option.
+.LP
+Precompiled chunks are
+.I not
+portable across different architectures.
+Moreover,
+the internal format of precompiled chunks
+is likely to change when a new version of Lua is released.
+Make sure you save the source files of all Lua programs that you precompile.
+.LP
+.SH OPTIONS
+.TP
+.B \-l
+produce a listing of the compiled bytecode for Lua's virtual machine.
+Listing bytecodes is useful to learn about Lua's virtual machine.
+If no files are given, then
+.B luac
+loads
+.B luac.out
+and lists its contents.
+Use
+.B \-l \-l
+for a full listing.
+.TP
+.BI \-o " file"
+output to
+.IR file ,
+instead of the default
+.BR luac.out .
+(You can use
+.B "'\-'"
+for standard output,
+but not on platforms that open standard output in text mode.)
+The output file may be one of the given files because
+all files are loaded before the output file is written.
+Be careful not to overwrite precious files.
+.TP
+.B \-p
+load files but do not generate any output file.
+Used mainly for syntax checking and for testing precompiled chunks:
+corrupted files will probably generate errors when loaded.
+If no files are given, then
+.B luac
+loads
+.B luac.out
+and tests its contents.
+No messages are displayed if the file loads without errors.
+.TP
+.B \-s
+strip debug information before writing the output file.
+This saves some space in very large chunks,
+but if errors occur when running a stripped chunk,
+then the error messages may not contain the full information they usually do.
+In particular,
+line numbers and names of local variables are lost.
+.TP
+.B \-v
+show version information.
+.TP
+.B \-\-
+stop handling options.
+.TP
+.B \-
+stop handling options and process standard input.
+.SH "SEE ALSO"
+.BR lua (1)
+.br
+The documentation at lua.org.
+.SH DIAGNOSTICS
+Error messages should be self explanatory.
+.SH AUTHORS
+R. Ierusalimschy,
+L. H. de Figueiredo,
+W. Celes
+.\" EOF
diff --git a/src/libs/3rdparty/lua/doc/manual.css b/src/libs/3rdparty/lua/doc/manual.css
new file mode 100644
index 0000000000..aa0e677dd5
--- /dev/null
+++ b/src/libs/3rdparty/lua/doc/manual.css
@@ -0,0 +1,21 @@
+h3 code {
+	font-family: inherit ;
+	font-size: inherit ;
+}
+
+pre, code {
+	font-size: 12pt ;
+}
+
+span.apii {
+	color: gray ;
+	float: right ;
+	font-family: inherit ;
+	font-style: normal ;
+	font-size: small ;
+}
+
+h2:before {
+	content: "" ;
+	padding-right: 0em ;
+}
diff --git a/src/libs/3rdparty/lua/doc/manual.html b/src/libs/3rdparty/lua/doc/manual.html
new file mode 100644
index 0000000000..0af688b343
--- /dev/null
+++ b/src/libs/3rdparty/lua/doc/manual.html
@@ -0,0 +1,12046 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<HTML>
+<HEAD>
+<TITLE>Lua 5.4 Reference Manual</TITLE>
+<LINK REL="stylesheet" TYPE="text/css" HREF="lua.css">
+<LINK REL="stylesheet" TYPE="text/css" HREF="manual.css">
+<META HTTP-EQUIV="content-type" CONTENT="text/html; charset=iso-8859-1">
+</HEAD>
+
+<BODY>
+
+<H1>
+<A HREF="http://www.lua.org/"><IMG SRC="logo.gif" ALT="Lua"></A>
+Lua 5.4 Reference Manual
+</H1>
+
+<P>
+by Roberto Ierusalimschy, Luiz Henrique de Figueiredo, Waldemar Celes
+
+<P>
+<SMALL>
+Copyright &copy; 2020&ndash;2023 Lua.org, PUC-Rio.
+Freely available under the terms of the
+<a href="http://www.lua.org/license.html">Lua license</a>.
+</SMALL>
+
+<DIV CLASS="menubar">
+<A HREF="contents.html#contents">contents</A>
+&middot;
+<A HREF="contents.html#index">index</A>
+&middot;
+<A HREF="http://www.lua.org/manual/">other versions</A>
+</DIV>
+
+<!-- ====================================================================== -->
+<p>
+
+<!-- $Id: manual.of $ -->
+
+
+
+
+<h1>1 &ndash; <a name="1">Introduction</a></h1>
+
+<p>
+Lua is a powerful, efficient, lightweight, embeddable scripting language.
+It supports procedural programming,
+object-oriented programming, functional programming,
+data-driven programming, and data description.
+
+
+<p>
+Lua combines simple procedural syntax with powerful data description
+constructs based on associative arrays and extensible semantics.
+Lua is dynamically typed,
+runs by interpreting bytecode with a register-based
+virtual machine,
+and has automatic memory management with
+a generational garbage collection,
+making it ideal for configuration, scripting,
+and rapid prototyping.
+
+
+<p>
+Lua is implemented as a library, written in <em>clean C</em>,
+the common subset of standard&nbsp;C and C++.
+The Lua distribution includes a host program called <code>lua</code>,
+which uses the Lua library to offer a complete,
+standalone Lua interpreter,
+for interactive or batch use.
+Lua is intended to be used both as a powerful, lightweight,
+embeddable scripting language for any program that needs one,
+and as a powerful but lightweight and efficient stand-alone language.
+
+
+<p>
+As an extension language, Lua has no notion of a "main" program:
+it works <em>embedded</em> in a host client,
+called the <em>embedding program</em> or simply the <em>host</em>.
+(Frequently, this host is the stand-alone <code>lua</code> program.)
+The host program can invoke functions to execute a piece of Lua code,
+can write and read Lua variables,
+and can register C&nbsp;functions to be called by Lua code.
+Through the use of C&nbsp;functions, Lua can be augmented to cope with
+a wide range of different domains,
+thus creating customized programming languages sharing a syntactical framework.
+
+
+<p>
+Lua is free software,
+and is provided as usual with no guarantees,
+as stated in its license.
+The implementation described in this manual is available
+at Lua's official web site, <code>www.lua.org</code>.
+
+
+<p>
+Like any other reference manual,
+this document is dry in places.
+For a discussion of the decisions behind the design of Lua,
+see the technical papers available at Lua's web site.
+For a detailed introduction to programming in Lua,
+see Roberto's book, <em>Programming in Lua</em>.
+
+
+
+<h1>2 &ndash; <a name="2">Basic Concepts</a></h1>
+
+
+
+<p>
+This section describes the basic concepts of the language.
+
+
+
+
+
+<h2>2.1 &ndash; <a name="2.1">Values and Types</a></h2>
+
+<p>
+Lua is a dynamically typed language.
+This means that
+variables do not have types; only values do.
+There are no type definitions in the language.
+All values carry their own type.
+
+
+<p>
+All values in Lua are first-class values.
+This means that all values can be stored in variables,
+passed as arguments to other functions, and returned as results.
+
+
+<p>
+There are eight basic types in Lua:
+<em>nil</em>, <em>boolean</em>, <em>number</em>,
+<em>string</em>, <em>function</em>, <em>userdata</em>,
+<em>thread</em>, and <em>table</em>.
+The type <em>nil</em> has one single value, <b>nil</b>,
+whose main property is to be different from any other value;
+it often represents the absence of a useful value.
+The type <em>boolean</em> has two values, <b>false</b> and <b>true</b>.
+Both <b>nil</b> and <b>false</b> make a condition false;
+they are collectively called <em>false values</em>.
+Any other value makes a condition true.
+Despite its name,
+<b>false</b> is frequently used as an alternative to <b>nil</b>,
+with the key difference that <b>false</b> behaves
+like a regular value in a table,
+while a <b>nil</b> in a table represents an absent key.
+
+
+<p>
+The type <em>number</em> represents both
+integer numbers and real (floating-point) numbers,
+using two subtypes: <em>integer</em> and <em>float</em>.
+Standard Lua uses 64-bit integers and double-precision (64-bit) floats,
+but you can also compile Lua so that it
+uses 32-bit integers and/or single-precision (32-bit) floats.
+The option with 32 bits for both integers and floats
+is particularly attractive
+for small machines and embedded systems.
+(See macro <code>LUA_32BITS</code> in file <code>luaconf.h</code>.)
+
+
+<p>
+Unless stated otherwise,
+any overflow when manipulating integer values <em>wrap around</em>,
+according to the usual rules of two-complement arithmetic.
+(In other words,
+the actual result is the unique representable integer
+that is equal modulo <em>2<sup>n</sup></em> to the mathematical result,
+where <em>n</em> is the number of bits of the integer type.)
+
+
+<p>
+Lua has explicit rules about when each subtype is used,
+but it also converts between them automatically as needed (see <a href="#3.4.3">&sect;3.4.3</a>).
+Therefore,
+the programmer may choose to mostly ignore the difference
+between integers and floats
+or to assume complete control over the representation of each number.
+
+
+<p>
+The type <em>string</em> represents immutable sequences of bytes.
+
+Lua is 8-bit clean:
+strings can contain any 8-bit value,
+including embedded zeros ('<code>\0</code>').
+Lua is also encoding-agnostic;
+it makes no assumptions about the contents of a string.
+The length of any string in Lua must fit in a Lua integer.
+
+
+<p>
+Lua can call (and manipulate) functions written in Lua and
+functions written in C (see <a href="#3.4.10">&sect;3.4.10</a>).
+Both are represented by the type <em>function</em>.
+
+
+<p>
+The type <em>userdata</em> is provided to allow arbitrary C&nbsp;data to
+be stored in Lua variables.
+A userdata value represents a block of raw memory.
+There are two kinds of userdata:
+<em>full userdata</em>,
+which is an object with a block of memory managed by Lua,
+and <em>light userdata</em>,
+which is simply a C&nbsp;pointer value.
+Userdata has no predefined operations in Lua,
+except assignment and identity test.
+By using <em>metatables</em>,
+the programmer can define operations for full userdata values
+(see <a href="#2.4">&sect;2.4</a>).
+Userdata values cannot be created or modified in Lua,
+only through the C&nbsp;API.
+This guarantees the integrity of data owned by
+the host program and C&nbsp;libraries.
+
+
+<p>
+The type <em>thread</em> represents independent threads of execution
+and it is used to implement coroutines (see <a href="#2.6">&sect;2.6</a>).
+Lua threads are not related to operating-system threads.
+Lua supports coroutines on all systems,
+even those that do not support threads natively.
+
+
+<p>
+The type <em>table</em> implements associative arrays,
+that is, arrays that can have as indices not only numbers,
+but any Lua value except <b>nil</b> and NaN.
+(<em>Not a Number</em> is a special floating-point value
+used by the IEEE 754 standard to represent
+undefined numerical results, such as <code>0/0</code>.)
+Tables can be <em>heterogeneous</em>;
+that is, they can contain values of all types (except <b>nil</b>).
+Any key associated to the value <b>nil</b> is not considered part of the table.
+Conversely, any key that is not part of a table has
+an associated value <b>nil</b>.
+
+
+<p>
+Tables are the sole data-structuring mechanism in Lua;
+they can be used to represent ordinary arrays, lists,
+symbol tables, sets, records, graphs, trees, etc.
+To represent records, Lua uses the field name as an index.
+The language supports this representation by
+providing <code>a.name</code> as syntactic sugar for <code>a["name"]</code>.
+There are several convenient ways to create tables in Lua
+(see <a href="#3.4.9">&sect;3.4.9</a>).
+
+
+<p>
+Like indices,
+the values of table fields can be of any type.
+In particular,
+because functions are first-class values,
+table fields can contain functions.
+Thus tables can also carry <em>methods</em> (see <a href="#3.4.11">&sect;3.4.11</a>).
+
+
+<p>
+The indexing of tables follows
+the definition of raw equality in the language.
+The expressions <code>a[i]</code> and <code>a[j]</code>
+denote the same table element
+if and only if <code>i</code> and <code>j</code> are raw equal
+(that is, equal without metamethods).
+In particular, floats with integral values
+are equal to their respective integers
+(e.g., <code>1.0 == 1</code>).
+To avoid ambiguities,
+any float used as a key that is equal to an integer
+is converted to that integer.
+For instance, if you write <code>a[2.0] = true</code>,
+the actual key inserted into the table will be the integer <code>2</code>.
+
+
+<p>
+Tables, functions, threads, and (full) userdata values are <em>objects</em>:
+variables do not actually <em>contain</em> these values,
+only <em>references</em> to them.
+Assignment, parameter passing, and function returns
+always manipulate references to such values;
+these operations do not imply any kind of copy.
+
+
+<p>
+The library function <a href="#pdf-type"><code>type</code></a> returns a string describing the type
+of a given value (see <a href="#pdf-type"><code>type</code></a>).
+
+
+
+
+
+<h2>2.2 &ndash; <a name="2.2">Environments and the Global Environment</a></h2>
+
+<p>
+As we will discuss further in <a href="#3.2">&sect;3.2</a> and <a href="#3.3.3">&sect;3.3.3</a>,
+any reference to a free name
+(that is, a name not bound to any declaration) <code>var</code>
+is syntactically translated to <code>_ENV.var</code>.
+Moreover, every chunk is compiled in the scope of
+an external local variable named <code>_ENV</code> (see <a href="#3.3.2">&sect;3.3.2</a>),
+so <code>_ENV</code> itself is never a free name in a chunk.
+
+
+<p>
+Despite the existence of this external <code>_ENV</code> variable and
+the translation of free names,
+<code>_ENV</code> is a completely regular name.
+In particular,
+you can define new variables and parameters with that name.
+Each reference to a free name uses the <code>_ENV</code> that is
+visible at that point in the program,
+following the usual visibility rules of Lua (see <a href="#3.5">&sect;3.5</a>).
+
+
+<p>
+Any table used as the value of <code>_ENV</code> is called an <em>environment</em>.
+
+
+<p>
+Lua keeps a distinguished environment called the <em>global environment</em>.
+This value is kept at a special index in the C registry (see <a href="#4.3">&sect;4.3</a>).
+In Lua, the global variable <a href="#pdf-_G"><code>_G</code></a> is initialized with this same value.
+(<a href="#pdf-_G"><code>_G</code></a> is never used internally,
+so changing its value will affect only your own code.)
+
+
+<p>
+When Lua loads a chunk,
+the default value for its <code>_ENV</code> variable
+is the global environment (see <a href="#pdf-load"><code>load</code></a>).
+Therefore, by default,
+free names in Lua code refer to entries in the global environment
+and, therefore, they are also called <em>global variables</em>.
+Moreover, all standard libraries are loaded in the global environment
+and some functions there operate on that environment.
+You can use <a href="#pdf-load"><code>load</code></a> (or <a href="#pdf-loadfile"><code>loadfile</code></a>)
+to load a chunk with a different environment.
+(In C, you have to load the chunk and then change the value
+of its first upvalue; see <a href="#lua_setupvalue"><code>lua_setupvalue</code></a>.)
+
+
+
+
+
+<h2>2.3 &ndash; <a name="2.3">Error Handling</a></h2>
+
+<p>
+Several operations in Lua can <em>raise</em> an error.
+An error interrupts the normal flow of the program,
+which can continue by <em>catching</em> the error.
+
+
+<p>
+Lua code can explicitly raise an error by calling the
+<a href="#pdf-error"><code>error</code></a> function.
+(This function never returns.)
+
+
+<p>
+To catch errors in Lua,
+you can do a <em>protected call</em>,
+using <a href="#pdf-pcall"><code>pcall</code></a> (or <a href="#pdf-xpcall"><code>xpcall</code></a>).
+The function <a href="#pdf-pcall"><code>pcall</code></a> calls a given function in <em>protected mode</em>.
+Any error while running the function stops its execution,
+and control returns immediately to <code>pcall</code>,
+which returns a status code.
+
+
+<p>
+Because Lua is an embedded extension language,
+Lua code starts running by a call
+from C&nbsp;code in the host program.
+(When you use Lua standalone,
+the <code>lua</code> application is the host program.)
+Usually, this call is protected;
+so, when an otherwise unprotected error occurs during
+the compilation or execution of a Lua chunk,
+control returns to the host,
+which can take appropriate measures,
+such as printing an error message.
+
+
+<p>
+Whenever there is an error,
+an <em>error object</em>
+is propagated with information about the error.
+Lua itself only generates errors whose error object is a string,
+but programs may generate errors with
+any value as the error object.
+It is up to the Lua program or its host to handle such error objects.
+For historical reasons,
+an error object is often called an <em>error message</em>,
+even though it does not have to be a string.
+
+
+<p>
+When you use <a href="#pdf-xpcall"><code>xpcall</code></a> (or <a href="#lua_pcall"><code>lua_pcall</code></a>, in C)
+you may give a <em>message handler</em>
+to be called in case of errors.
+This function is called with the original error object
+and returns a new error object.
+It is called before the error unwinds the stack,
+so that it can gather more information about the error,
+for instance by inspecting the stack and creating a stack traceback.
+This message handler is still protected by the protected call;
+so, an error inside the message handler
+will call the message handler again.
+If this loop goes on for too long,
+Lua breaks it and returns an appropriate message.
+The message handler is called only for regular runtime errors.
+It is not called for memory-allocation errors
+nor for errors while running finalizers or other message handlers.
+
+
+<p>
+Lua also offers a system of <em>warnings</em> (see <a href="#pdf-warn"><code>warn</code></a>).
+Unlike errors, warnings do not interfere
+in any way with program execution.
+They typically only generate a message to the user,
+although this behavior can be adapted from C (see <a href="#lua_setwarnf"><code>lua_setwarnf</code></a>).
+
+
+
+
+
+<h2>2.4 &ndash; <a name="2.4">Metatables and Metamethods</a></h2>
+
+<p>
+Every value in Lua can have a <em>metatable</em>.
+This <em>metatable</em> is an ordinary Lua table
+that defines the behavior of the original value
+under certain events.
+You can change several aspects of the behavior
+of a value by setting specific fields in its metatable.
+For instance, when a non-numeric value is the operand of an addition,
+Lua checks for a function in the field <code>__add</code> of the value's metatable.
+If it finds one,
+Lua calls this function to perform the addition.
+
+
+<p>
+The key for each event in a metatable is a string
+with the event name prefixed by two underscores;
+the corresponding value is called a <em>metavalue</em>.
+For most events, the metavalue must be a function,
+which is then called a <em>metamethod</em>.
+In the previous example, the key is the string "<code>__add</code>"
+and the metamethod is the function that performs the addition.
+Unless stated otherwise,
+a metamethod may in fact be any callable value,
+which is either a function or a value with a <code>__call</code> metamethod.
+
+
+<p>
+You can query the metatable of any value
+using the <a href="#pdf-getmetatable"><code>getmetatable</code></a> function.
+Lua queries metamethods in metatables using a raw access (see <a href="#pdf-rawget"><code>rawget</code></a>).
+
+
+<p>
+You can replace the metatable of tables
+using the <a href="#pdf-setmetatable"><code>setmetatable</code></a> function.
+You cannot change the metatable of other types from Lua code,
+except by using the debug library (<a href="#6.10">&sect;6.10</a>).
+
+
+<p>
+Tables and full userdata have individual metatables,
+although multiple tables and userdata can share their metatables.
+Values of all other types share one single metatable per type;
+that is, there is one single metatable for all numbers,
+one for all strings, etc.
+By default, a value has no metatable,
+but the string library sets a metatable for the string type (see <a href="#6.4">&sect;6.4</a>).
+
+
+<p>
+A detailed list of operations controlled by metatables is given next.
+Each event is identified by its corresponding key.
+By convention, all metatable keys used by Lua are composed by
+two underscores followed by lowercase Latin letters.
+
+
+
+<ul>
+
+<li><b><code>__add</code>: </b>
+the addition (<code>+</code>) operation.
+If any operand for an addition is not a number,
+Lua will try to call a metamethod.
+It starts by checking the first operand (even if it is a number);
+if that operand does not define a metamethod for <code>__add</code>,
+then Lua will check the second operand.
+If Lua can find a metamethod,
+it calls the metamethod with the two operands as arguments,
+and the result of the call
+(adjusted to one value)
+is the result of the operation.
+Otherwise, if no metamethod is found,
+Lua raises an error.
+</li>
+
+<li><b><code>__sub</code>: </b>
+the subtraction (<code>-</code>) operation.
+Behavior similar to the addition operation.
+</li>
+
+<li><b><code>__mul</code>: </b>
+the multiplication (<code>*</code>) operation.
+Behavior similar to the addition operation.
+</li>
+
+<li><b><code>__div</code>: </b>
+the division (<code>/</code>) operation.
+Behavior similar to the addition operation.
+</li>
+
+<li><b><code>__mod</code>: </b>
+the modulo (<code>%</code>) operation.
+Behavior similar to the addition operation.
+</li>
+
+<li><b><code>__pow</code>: </b>
+the exponentiation (<code>^</code>) operation.
+Behavior similar to the addition operation.
+</li>
+
+<li><b><code>__unm</code>: </b>
+the negation (unary <code>-</code>) operation.
+Behavior similar to the addition operation.
+</li>
+
+<li><b><code>__idiv</code>: </b>
+the floor division (<code>//</code>) operation.
+Behavior similar to the addition operation.
+</li>
+
+<li><b><code>__band</code>: </b>
+the bitwise AND (<code>&amp;</code>) operation.
+Behavior similar to the addition operation,
+except that Lua will try a metamethod
+if any operand is neither an integer
+nor a float coercible to an integer (see <a href="#3.4.3">&sect;3.4.3</a>).
+</li>
+
+<li><b><code>__bor</code>: </b>
+the bitwise OR (<code>|</code>) operation.
+Behavior similar to the bitwise AND operation.
+</li>
+
+<li><b><code>__bxor</code>: </b>
+the bitwise exclusive OR (binary <code>~</code>) operation.
+Behavior similar to the bitwise AND operation.
+</li>
+
+<li><b><code>__bnot</code>: </b>
+the bitwise NOT (unary <code>~</code>) operation.
+Behavior similar to the bitwise AND operation.
+</li>
+
+<li><b><code>__shl</code>: </b>
+the bitwise left shift (<code>&lt;&lt;</code>) operation.
+Behavior similar to the bitwise AND operation.
+</li>
+
+<li><b><code>__shr</code>: </b>
+the bitwise right shift (<code>&gt;&gt;</code>) operation.
+Behavior similar to the bitwise AND operation.
+</li>
+
+<li><b><code>__concat</code>: </b>
+the concatenation (<code>..</code>) operation.
+Behavior similar to the addition operation,
+except that Lua will try a metamethod
+if any operand is neither a string nor a number
+(which is always coercible to a string).
+</li>
+
+<li><b><code>__len</code>: </b>
+the length (<code>#</code>) operation.
+If the object is not a string,
+Lua will try its metamethod.
+If there is a metamethod,
+Lua calls it with the object as argument,
+and the result of the call
+(always adjusted to one value)
+is the result of the operation.
+If there is no metamethod but the object is a table,
+then Lua uses the table length operation (see <a href="#3.4.7">&sect;3.4.7</a>).
+Otherwise, Lua raises an error.
+</li>
+
+<li><b><code>__eq</code>: </b>
+the equal (<code>==</code>) operation.
+Behavior similar to the addition operation,
+except that Lua will try a metamethod only when the values
+being compared are either both tables or both full userdata
+and they are not primitively equal.
+The result of the call is always converted to a boolean.
+</li>
+
+<li><b><code>__lt</code>: </b>
+the less than (<code>&lt;</code>) operation.
+Behavior similar to the addition operation,
+except that Lua will try a metamethod only when the values
+being compared are neither both numbers nor both strings.
+Moreover, the result of the call is always converted to a boolean.
+</li>
+
+<li><b><code>__le</code>: </b>
+the less equal (<code>&lt;=</code>) operation.
+Behavior similar to the less than operation.
+</li>
+
+<li><b><code>__index</code>: </b>
+The indexing access operation <code>table[key]</code>.
+This event happens when <code>table</code> is not a table or
+when <code>key</code> is not present in <code>table</code>.
+The metavalue is looked up in the metatable of <code>table</code>.
+
+
+<p>
+The metavalue for this event can be either a function, a table,
+or any value with an <code>__index</code> metavalue.
+If it is a function,
+it is called with <code>table</code> and <code>key</code> as arguments,
+and the result of the call
+(adjusted to one value)
+is the result of the operation.
+Otherwise,
+the final result is the result of indexing this metavalue with <code>key</code>.
+This indexing is regular, not raw,
+and therefore can trigger another <code>__index</code> metavalue.
+</li>
+
+<li><b><code>__newindex</code>: </b>
+The indexing assignment <code>table[key] = value</code>.
+Like the index event,
+this event happens when <code>table</code> is not a table or
+when <code>key</code> is not present in <code>table</code>.
+The metavalue is looked up in the metatable of <code>table</code>.
+
+
+<p>
+Like with indexing,
+the metavalue for this event can be either a function, a table,
+or any value with an <code>__newindex</code> metavalue.
+If it is a function,
+it is called with <code>table</code>, <code>key</code>, and <code>value</code> as arguments.
+Otherwise,
+Lua repeats the indexing assignment over this metavalue
+with the same key and value.
+This assignment is regular, not raw,
+and therefore can trigger another <code>__newindex</code> metavalue.
+
+
+<p>
+Whenever a <code>__newindex</code> metavalue is invoked,
+Lua does not perform the primitive assignment.
+If needed,
+the metamethod itself can call <a href="#pdf-rawset"><code>rawset</code></a>
+to do the assignment.
+</li>
+
+<li><b><code>__call</code>: </b>
+The call operation <code>func(args)</code>.
+This event happens when Lua tries to call a non-function value
+(that is, <code>func</code> is not a function).
+The metamethod is looked up in <code>func</code>.
+If present,
+the metamethod is called with <code>func</code> as its first argument,
+followed by the arguments of the original call (<code>args</code>).
+All results of the call
+are the results of the operation.
+This is the only metamethod that allows multiple results.
+</li>
+
+</ul>
+
+<p>
+In addition to the previous list,
+the interpreter also respects the following keys in metatables:
+<code>__gc</code> (see <a href="#2.5.3">&sect;2.5.3</a>),
+<code>__close</code> (see <a href="#3.3.8">&sect;3.3.8</a>),
+<code>__mode</code> (see <a href="#2.5.4">&sect;2.5.4</a>),
+and <code>__name</code>.
+(The entry <code>__name</code>,
+when it contains a string,
+may be used by <a href="#pdf-tostring"><code>tostring</code></a> and in error messages.)
+
+
+<p>
+For the unary operators (negation, length, and bitwise NOT),
+the metamethod is computed and called with a dummy second operand,
+equal to the first one.
+This extra operand is only to simplify Lua's internals
+(by making these operators behave like a binary operation)
+and may be removed in future versions.
+For most uses this extra operand is irrelevant.
+
+
+<p>
+Because metatables are regular tables,
+they can contain arbitrary fields,
+not only the event names defined above.
+Some functions in the standard library
+(e.g., <a href="#pdf-tostring"><code>tostring</code></a>)
+use other fields in metatables for their own purposes.
+
+
+<p>
+It is a good practice to add all needed metamethods to a table
+before setting it as a metatable of some object.
+In particular, the <code>__gc</code> metamethod works only when this order
+is followed (see <a href="#2.5.3">&sect;2.5.3</a>).
+It is also a good practice to set the metatable of an object
+right after its creation.
+
+
+
+
+
+<h2>2.5 &ndash; <a name="2.5">Garbage Collection</a></h2>
+
+
+
+<p>
+Lua performs automatic memory management.
+This means that
+you do not have to worry about allocating memory for new objects
+or freeing it when the objects are no longer needed.
+Lua manages memory automatically by running
+a <em>garbage collector</em> to collect all <em>dead</em> objects.
+All memory used by Lua is subject to automatic management:
+strings, tables, userdata, functions, threads, internal structures, etc.
+
+
+<p>
+An object is considered <em>dead</em>
+as soon as the collector can be sure the object
+will not be accessed again in the normal execution of the program.
+("Normal execution" here excludes finalizers,
+which can resurrect dead objects (see <a href="#2.5.3">&sect;2.5.3</a>),
+and excludes also operations using the debug library.)
+Note that the time when the collector can be sure that an object
+is dead may not coincide with the programmer's expectations.
+The only guarantees are that Lua will not collect an object
+that may still be accessed in the normal execution of the program,
+and it will eventually collect an object
+that is inaccessible from Lua.
+(Here,
+<em>inaccessible from Lua</em> means that neither a variable nor
+another live object refer to the object.)
+Because Lua has no knowledge about C&nbsp;code,
+it never collects objects accessible through the registry (see <a href="#4.3">&sect;4.3</a>),
+which includes the global environment (see <a href="#2.2">&sect;2.2</a>).
+
+
+<p>
+The garbage collector (GC) in Lua can work in two modes:
+incremental and generational.
+
+
+<p>
+The default GC mode with the default parameters
+are adequate for most uses.
+However, programs that waste a large proportion of their time
+allocating and freeing memory can benefit from other settings.
+Keep in mind that the GC behavior is non-portable
+both across platforms and across different Lua releases;
+therefore, optimal settings are also non-portable.
+
+
+<p>
+You can change the GC mode and parameters by calling
+<a href="#lua_gc"><code>lua_gc</code></a> in&nbsp;C
+or <a href="#pdf-collectgarbage"><code>collectgarbage</code></a> in Lua.
+You can also use these functions to control
+the collector directly (e.g., to stop and restart it).
+
+
+
+
+
+<h3>2.5.1 &ndash; <a name="2.5.1">Incremental Garbage Collection</a></h3>
+
+<p>
+In incremental mode,
+each GC cycle performs a mark-and-sweep collection in small steps
+interleaved with the program's execution.
+In this mode,
+the collector uses three numbers to control its garbage-collection cycles:
+the <em>garbage-collector pause</em>,
+the <em>garbage-collector step multiplier</em>,
+and the <em>garbage-collector step size</em>.
+
+
+<p>
+The garbage-collector pause
+controls how long the collector waits before starting a new cycle.
+The collector starts a new cycle when the use of memory
+hits <em>n%</em> of the use after the previous collection.
+Larger values make the collector less aggressive.
+Values equal to or less than 100 mean the collector will not wait to
+start a new cycle.
+A value of 200 means that the collector waits for the total memory in use
+to double before starting a new cycle.
+The default value is 200; the maximum value is 1000.
+
+
+<p>
+The garbage-collector step multiplier
+controls the speed of the collector relative to
+memory allocation,
+that is,
+how many elements it marks or sweeps for each
+kilobyte of memory allocated.
+Larger values make the collector more aggressive but also increase
+the size of each incremental step.
+You should not use values less than 100,
+because they make the collector too slow and
+can result in the collector never finishing a cycle.
+The default value is 100;  the maximum value is 1000.
+
+
+<p>
+The garbage-collector step size controls the
+size of each incremental step,
+specifically how many bytes the interpreter allocates
+before performing a step.
+This parameter is logarithmic:
+A value of <em>n</em> means the interpreter will allocate <em>2<sup>n</sup></em>
+bytes between steps and perform equivalent work during the step.
+A large value (e.g., 60) makes the collector a stop-the-world
+(non-incremental) collector.
+The default value is 13,
+which means steps of approximately 8&nbsp;Kbytes.
+
+
+
+
+
+<h3>2.5.2 &ndash; <a name="2.5.2">Generational Garbage Collection</a></h3>
+
+<p>
+In generational mode,
+the collector does frequent <em>minor</em> collections,
+which traverses only objects recently created.
+If after a minor collection the use of memory is still above a limit,
+the collector does a stop-the-world <em>major</em> collection,
+which traverses all objects.
+The generational mode uses two parameters:
+the <em>minor multiplier</em> and the <em>the major multiplier</em>.
+
+
+<p>
+The minor multiplier controls the frequency of minor collections.
+For a minor multiplier <em>x</em>,
+a new minor collection will be done when memory
+grows <em>x%</em> larger than the memory in use after the previous major
+collection.
+For instance, for a multiplier of 20,
+the collector will do a minor collection when the use of memory
+gets 20% larger than the use after the previous major collection.
+The default value is 20; the maximum value is 200.
+
+
+<p>
+The major multiplier controls the frequency of major collections.
+For a major multiplier <em>x</em>,
+a new major collection will be done when memory
+grows <em>x%</em> larger than the memory in use after the previous major
+collection.
+For instance, for a multiplier of 100,
+the collector will do a major collection when the use of memory
+gets larger than twice the use after the previous collection.
+The default value is 100; the maximum value is 1000.
+
+
+
+
+
+<h3>2.5.3 &ndash; <a name="2.5.3">Garbage-Collection Metamethods</a></h3>
+
+<p>
+You can set garbage-collector metamethods for tables
+and, using the C&nbsp;API,
+for full userdata (see <a href="#2.4">&sect;2.4</a>).
+These metamethods, called <em>finalizers</em>,
+are called when the garbage collector detects that the
+corresponding table or userdata is dead.
+Finalizers allow you to coordinate Lua's garbage collection
+with external resource management such as closing files,
+network or database connections,
+or freeing your own memory.
+
+
+<p>
+For an object (table or userdata) to be finalized when collected,
+you must <em>mark</em> it for finalization.
+
+You mark an object for finalization when you set its metatable
+and the metatable has a <code>__gc</code> metamethod.
+Note that if you set a metatable without a <code>__gc</code> field
+and later create that field in the metatable,
+the object will not be marked for finalization.
+
+
+<p>
+When a marked object becomes dead,
+it is not collected immediately by the garbage collector.
+Instead, Lua puts it in a list.
+After the collection,
+Lua goes through that list.
+For each object in the list,
+it checks the object's <code>__gc</code> metamethod:
+If it is present,
+Lua calls it with the object as its single argument.
+
+
+<p>
+At the end of each garbage-collection cycle,
+the finalizers are called in
+the reverse order that the objects were marked for finalization,
+among those collected in that cycle;
+that is, the first finalizer to be called is the one associated
+with the object marked last in the program.
+The execution of each finalizer may occur at any point during
+the execution of the regular code.
+
+
+<p>
+Because the object being collected must still be used by the finalizer,
+that object (and other objects accessible only through it)
+must be <em>resurrected</em> by Lua.
+Usually, this resurrection is transient,
+and the object memory is freed in the next garbage-collection cycle.
+However, if the finalizer stores the object in some global place
+(e.g., a global variable),
+then the resurrection is permanent.
+Moreover, if the finalizer marks a finalizing object for finalization again,
+its finalizer will be called again in the next cycle where the
+object is dead.
+In any case,
+the object memory is freed only in a GC cycle where
+the object is dead and not marked for finalization.
+
+
+<p>
+When you close a state (see <a href="#lua_close"><code>lua_close</code></a>),
+Lua calls the finalizers of all objects marked for finalization,
+following the reverse order that they were marked.
+If any finalizer marks objects for collection during that phase,
+these marks have no effect.
+
+
+<p>
+Finalizers cannot yield nor run the garbage collector.
+Because they can run in unpredictable times,
+it is good practice to restrict each finalizer
+to the minimum necessary to properly release
+its associated resource.
+
+
+<p>
+Any error while running a finalizer generates a warning;
+the error is not propagated.
+
+
+
+
+
+<h3>2.5.4 &ndash; <a name="2.5.4">Weak Tables</a></h3>
+
+<p>
+A <em>weak table</em> is a table whose elements are
+<em>weak references</em>.
+A weak reference is ignored by the garbage collector.
+In other words,
+if the only references to an object are weak references,
+then the garbage collector will collect that object.
+
+
+<p>
+A weak table can have weak keys, weak values, or both.
+A table with weak values allows the collection of its values,
+but prevents the collection of its keys.
+A table with both weak keys and weak values allows the collection of
+both keys and values.
+In any case, if either the key or the value is collected,
+the whole pair is removed from the table.
+The weakness of a table is controlled by the
+<code>__mode</code> field of its metatable.
+This metavalue, if present, must be one of the following strings:
+"<code>k</code>", for a table with weak keys;
+"<code>v</code>", for a table with weak values;
+or "<code>kv</code>", for a table with both weak keys and values.
+
+
+<p>
+A table with weak keys and strong values
+is also called an <em>ephemeron table</em>.
+In an ephemeron table,
+a value is considered reachable only if its key is reachable.
+In particular,
+if the only reference to a key comes through its value,
+the pair is removed.
+
+
+<p>
+Any change in the weakness of a table may take effect only
+at the next collect cycle.
+In particular, if you change the weakness to a stronger mode,
+Lua may still collect some items from that table
+before the change takes effect.
+
+
+<p>
+Only objects that have an explicit construction
+are removed from weak tables.
+Values, such as numbers and light C&nbsp;functions,
+are not subject to garbage collection,
+and therefore are not removed from weak tables
+(unless their associated values are collected).
+Although strings are subject to garbage collection,
+they do not have an explicit construction and
+their equality is by value;
+they behave more like values than like objects.
+Therefore, they are not removed from weak tables.
+
+
+<p>
+Resurrected objects
+(that is, objects being finalized
+and objects accessible only through objects being finalized)
+have a special behavior in weak tables.
+They are removed from weak values before running their finalizers,
+but are removed from weak keys only in the next collection
+after running their finalizers, when such objects are actually freed.
+This behavior allows the finalizer to access properties
+associated with the object through weak tables.
+
+
+<p>
+If a weak table is among the resurrected objects in a collection cycle,
+it may not be properly cleared until the next cycle.
+
+
+
+
+
+
+
+<h2>2.6 &ndash; <a name="2.6">Coroutines</a></h2>
+
+<p>
+Lua supports coroutines,
+also called <em>collaborative multithreading</em>.
+A coroutine in Lua represents an independent thread of execution.
+Unlike threads in multithread systems, however,
+a coroutine only suspends its execution by explicitly calling
+a yield function.
+
+
+<p>
+You create a coroutine by calling <a href="#pdf-coroutine.create"><code>coroutine.create</code></a>.
+Its sole argument is a function
+that is the main function of the coroutine.
+The <code>create</code> function only creates a new coroutine and
+returns a handle to it (an object of type <em>thread</em>);
+it does not start the coroutine.
+
+
+<p>
+You execute a coroutine by calling <a href="#pdf-coroutine.resume"><code>coroutine.resume</code></a>.
+When you first call <a href="#pdf-coroutine.resume"><code>coroutine.resume</code></a>,
+passing as its first argument
+a thread returned by <a href="#pdf-coroutine.create"><code>coroutine.create</code></a>,
+the coroutine starts its execution by
+calling its main function.
+Extra arguments passed to <a href="#pdf-coroutine.resume"><code>coroutine.resume</code></a> are passed
+as arguments to that function.
+After the coroutine starts running,
+it runs until it terminates or <em>yields</em>.
+
+
+<p>
+A coroutine can terminate its execution in two ways:
+normally, when its main function returns
+(explicitly or implicitly, after the last instruction);
+and abnormally, if there is an unprotected error.
+In case of normal termination,
+<a href="#pdf-coroutine.resume"><code>coroutine.resume</code></a> returns <b>true</b>,
+plus any values returned by the coroutine main function.
+In case of errors, <a href="#pdf-coroutine.resume"><code>coroutine.resume</code></a> returns <b>false</b>
+plus the error object.
+In this case, the coroutine does not unwind its stack,
+so that it is possible to inspect it after the error
+with the debug API.
+
+
+<p>
+A coroutine yields by calling <a href="#pdf-coroutine.yield"><code>coroutine.yield</code></a>.
+When a coroutine yields,
+the corresponding <a href="#pdf-coroutine.resume"><code>coroutine.resume</code></a> returns immediately,
+even if the yield happens inside nested function calls
+(that is, not in the main function,
+but in a function directly or indirectly called by the main function).
+In the case of a yield, <a href="#pdf-coroutine.resume"><code>coroutine.resume</code></a> also returns <b>true</b>,
+plus any values passed to <a href="#pdf-coroutine.yield"><code>coroutine.yield</code></a>.
+The next time you resume the same coroutine,
+it continues its execution from the point where it yielded,
+with the call to <a href="#pdf-coroutine.yield"><code>coroutine.yield</code></a> returning any extra
+arguments passed to <a href="#pdf-coroutine.resume"><code>coroutine.resume</code></a>.
+
+
+<p>
+Like <a href="#pdf-coroutine.create"><code>coroutine.create</code></a>,
+the <a href="#pdf-coroutine.wrap"><code>coroutine.wrap</code></a> function also creates a coroutine,
+but instead of returning the coroutine itself,
+it returns a function that, when called, resumes the coroutine.
+Any arguments passed to this function
+go as extra arguments to <a href="#pdf-coroutine.resume"><code>coroutine.resume</code></a>.
+<a href="#pdf-coroutine.wrap"><code>coroutine.wrap</code></a> returns all the values returned by <a href="#pdf-coroutine.resume"><code>coroutine.resume</code></a>,
+except the first one (the boolean error code).
+Unlike <a href="#pdf-coroutine.resume"><code>coroutine.resume</code></a>,
+the function created by <a href="#pdf-coroutine.wrap"><code>coroutine.wrap</code></a>
+propagates any error to the caller.
+In this case,
+the function also closes the coroutine (see <a href="#pdf-coroutine.close"><code>coroutine.close</code></a>).
+
+
+<p>
+As an example of how coroutines work,
+consider the following code:
+
+<pre>
+     function foo (a)
+       print("foo", a)
+       return coroutine.yield(2*a)
+     end
+     
+     co = coroutine.create(function (a,b)
+           print("co-body", a, b)
+           local r = foo(a+1)
+           print("co-body", r)
+           local r, s = coroutine.yield(a+b, a-b)
+           print("co-body", r, s)
+           return b, "end"
+     end)
+     
+     print("main", coroutine.resume(co, 1, 10))
+     print("main", coroutine.resume(co, "r"))
+     print("main", coroutine.resume(co, "x", "y"))
+     print("main", coroutine.resume(co, "x", "y"))
+</pre><p>
+When you run it, it produces the following output:
+
+<pre>
+     co-body 1       10
+     foo     2
+     main    true    4
+     co-body r
+     main    true    11      -9
+     co-body x       y
+     main    true    10      end
+     main    false   cannot resume dead coroutine
+</pre>
+
+<p>
+You can also create and manipulate coroutines through the C API:
+see functions <a href="#lua_newthread"><code>lua_newthread</code></a>, <a href="#lua_resume"><code>lua_resume</code></a>,
+and <a href="#lua_yield"><code>lua_yield</code></a>.
+
+
+
+
+
+<h1>3 &ndash; <a name="3">The Language</a></h1>
+
+
+
+<p>
+This section describes the lexis, the syntax, and the semantics of Lua.
+In other words,
+this section describes
+which tokens are valid,
+how they can be combined,
+and what their combinations mean.
+
+
+<p>
+Language constructs will be explained using the usual extended BNF notation,
+in which
+{<em>a</em>}&nbsp;means&nbsp;0 or more <em>a</em>'s, and
+[<em>a</em>]&nbsp;means an optional <em>a</em>.
+Non-terminals are shown like non-terminal,
+keywords are shown like <b>kword</b>,
+and other terminal symbols are shown like &lsquo;<b>=</b>&rsquo;.
+The complete syntax of Lua can be found in <a href="#9">&sect;9</a>
+at the end of this manual.
+
+
+
+
+
+<h2>3.1 &ndash; <a name="3.1">Lexical Conventions</a></h2>
+
+<p>
+Lua is a free-form language.
+It ignores spaces and comments between lexical elements (tokens),
+except as delimiters between two tokens.
+In source code,
+Lua recognizes as spaces the standard ASCII whitespace
+characters space, form feed, newline,
+carriage return, horizontal tab, and vertical tab.
+
+
+<p>
+<em>Names</em>
+(also called <em>identifiers</em>)
+in Lua can be any string of Latin letters,
+Arabic-Indic digits, and underscores,
+not beginning with a digit and
+not being a reserved word.
+Identifiers are used to name variables, table fields, and labels.
+
+
+<p>
+The following <em>keywords</em> are reserved
+and cannot be used as names:
+
+
+<pre>
+     and       break     do        else      elseif    end
+     false     for       function  goto      if        in
+     local     nil       not       or        repeat    return
+     then      true      until     while
+</pre>
+
+<p>
+Lua is a case-sensitive language:
+<code>and</code> is a reserved word, but <code>And</code> and <code>AND</code>
+are two different, valid names.
+As a convention,
+programs should avoid creating
+names that start with an underscore followed by
+one or more uppercase letters (such as <a href="#pdf-_VERSION"><code>_VERSION</code></a>).
+
+
+<p>
+The following strings denote other tokens:
+
+<pre>
+     +     -     *     /     %     ^     #
+     &amp;     ~     |     &lt;&lt;    &gt;&gt;    //
+     ==    ~=    &lt;=    &gt;=    &lt;     &gt;     =
+     (     )     {     }     [     ]     ::
+     ;     :     ,     .     ..    ...
+</pre>
+
+<p>
+A <em>short literal string</em>
+can be delimited by matching single or double quotes,
+and can contain the following C-like escape sequences:
+'<code>\a</code>' (bell),
+'<code>\b</code>' (backspace),
+'<code>\f</code>' (form feed),
+'<code>\n</code>' (newline),
+'<code>\r</code>' (carriage return),
+'<code>\t</code>' (horizontal tab),
+'<code>\v</code>' (vertical tab),
+'<code>\\</code>' (backslash),
+'<code>\"</code>' (quotation mark [double quote]),
+and '<code>\'</code>' (apostrophe [single quote]).
+A backslash followed by a line break
+results in a newline in the string.
+The escape sequence '<code>\z</code>' skips the following span
+of whitespace characters,
+including line breaks;
+it is particularly useful to break and indent a long literal string
+into multiple lines without adding the newlines and spaces
+into the string contents.
+A short literal string cannot contain unescaped line breaks
+nor escapes not forming a valid escape sequence.
+
+
+<p>
+We can specify any byte in a short literal string,
+including embedded zeros,
+by its numeric value.
+This can be done
+with the escape sequence <code>\x<em>XX</em></code>,
+where <em>XX</em> is a sequence of exactly two hexadecimal digits,
+or with the escape sequence <code>\<em>ddd</em></code>,
+where <em>ddd</em> is a sequence of up to three decimal digits.
+(Note that if a decimal escape sequence is to be followed by a digit,
+it must be expressed using exactly three digits.)
+
+
+<p>
+The UTF-8 encoding of a Unicode character
+can be inserted in a literal string with
+the escape sequence <code>\u{<em>XXX</em>}</code>
+(with mandatory enclosing braces),
+where <em>XXX</em> is a sequence of one or more hexadecimal digits
+representing the character code point.
+This code point can be any value less than <em>2<sup>31</sup></em>.
+(Lua uses the original UTF-8 specification here,
+which is not restricted to valid Unicode code points.)
+
+
+<p>
+Literal strings can also be defined using a long format
+enclosed by <em>long brackets</em>.
+We define an <em>opening long bracket of level <em>n</em></em> as an opening
+square bracket followed by <em>n</em> equal signs followed by another
+opening square bracket.
+So, an opening long bracket of level&nbsp;0 is written as <code>[[</code>, 
+an opening long bracket of level&nbsp;1 is written as <code>[=[</code>, 
+and so on.
+A <em>closing long bracket</em> is defined similarly;
+for instance,
+a closing long bracket of level&nbsp;4 is written as  <code>]====]</code>.
+A <em>long literal</em> starts with an opening long bracket of any level and
+ends at the first closing long bracket of the same level.
+It can contain any text except a closing bracket of the same level.
+Literals in this bracketed form can run for several lines,
+do not interpret any escape sequences,
+and ignore long brackets of any other level.
+Any kind of end-of-line sequence
+(carriage return, newline, carriage return followed by newline,
+or newline followed by carriage return)
+is converted to a simple newline.
+When the opening long bracket is immediately followed by a newline,
+the newline is not included in the string.
+
+
+<p>
+As an example, in a system using ASCII
+(in which '<code>a</code>' is coded as&nbsp;97,
+newline is coded as&nbsp;10, and '<code>1</code>' is coded as&nbsp;49),
+the five literal strings below denote the same string:
+
+<pre>
+     a = 'alo\n123"'
+     a = "alo\n123\""
+     a = '\97lo\10\04923"'
+     a = [[alo
+     123"]]
+     a = [==[
+     alo
+     123"]==]
+</pre>
+
+<p>
+Any byte in a literal string not
+explicitly affected by the previous rules represents itself.
+However, Lua opens files for parsing in text mode,
+and the system's file functions may have problems with
+some control characters.
+So, it is safer to represent
+binary data as a quoted literal with
+explicit escape sequences for the non-text characters.
+
+
+<p>
+A <em>numeric constant</em> (or <em>numeral</em>)
+can be written with an optional fractional part
+and an optional decimal exponent,
+marked by a letter '<code>e</code>' or '<code>E</code>'.
+Lua also accepts hexadecimal constants,
+which start with <code>0x</code> or <code>0X</code>.
+Hexadecimal constants also accept an optional fractional part
+plus an optional binary exponent,
+marked by a letter '<code>p</code>' or '<code>P</code>' and written in decimal.
+(For instance, <code>0x1.fp10</code> denotes 1984,
+which is <em>0x1f / 16</em> multiplied by <em>2<sup>10</sup></em>.)
+
+
+<p>
+A numeric constant with a radix point or an exponent
+denotes a float;
+otherwise,
+if its value fits in an integer or it is a hexadecimal constant,
+it denotes an integer;
+otherwise (that is, a decimal integer numeral that overflows),
+it denotes a float.
+Hexadecimal numerals with neither a radix point nor an exponent
+always denote an integer value;
+if the value overflows, it <em>wraps around</em>
+to fit into a valid integer.
+
+
+<p>
+Examples of valid integer constants are
+
+<pre>
+     3   345   0xff   0xBEBADA
+</pre><p>
+Examples of valid float constants are
+
+<pre>
+     3.0     3.1416     314.16e-2     0.31416E1     34e1
+     0x0.1E  0xA23p-4   0X1.921FB54442D18P+1
+</pre>
+
+<p>
+A <em>comment</em> starts with a double hyphen (<code>--</code>)
+anywhere outside a string.
+If the text immediately after <code>--</code> is not an opening long bracket,
+the comment is a <em>short comment</em>,
+which runs until the end of the line.
+Otherwise, it is a <em>long comment</em>,
+which runs until the corresponding closing long bracket.
+
+
+
+
+
+<h2>3.2 &ndash; <a name="3.2">Variables</a></h2>
+
+<p>
+Variables are places that store values.
+There are three kinds of variables in Lua:
+global variables, local variables, and table fields.
+
+
+<p>
+A single name can denote a global variable or a local variable
+(or a function's formal parameter,
+which is a particular kind of local variable):
+
+<pre>
+	var ::= Name
+</pre><p>
+Name denotes identifiers (see <a href="#3.1">&sect;3.1</a>).
+
+
+<p>
+Any variable name is assumed to be global unless explicitly declared
+as a local (see <a href="#3.3.7">&sect;3.3.7</a>).
+Local variables are <em>lexically scoped</em>:
+local variables can be freely accessed by functions
+defined inside their scope (see <a href="#3.5">&sect;3.5</a>).
+
+
+<p>
+Before the first assignment to a variable, its value is <b>nil</b>.
+
+
+<p>
+Square brackets are used to index a table:
+
+<pre>
+	var ::= prefixexp &lsquo;<b>[</b>&rsquo; exp &lsquo;<b>]</b>&rsquo;
+</pre><p>
+The meaning of accesses to table fields can be changed via metatables
+(see <a href="#2.4">&sect;2.4</a>).
+
+
+<p>
+The syntax <code>var.Name</code> is just syntactic sugar for
+<code>var["Name"]</code>:
+
+<pre>
+	var ::= prefixexp &lsquo;<b>.</b>&rsquo; Name
+</pre>
+
+<p>
+An access to a global variable <code>x</code>
+is equivalent to <code>_ENV.x</code>.
+Due to the way that chunks are compiled,
+the variable <code>_ENV</code> itself is never global (see <a href="#2.2">&sect;2.2</a>).
+
+
+
+
+
+<h2>3.3 &ndash; <a name="3.3">Statements</a></h2>
+
+
+
+<p>
+Lua supports an almost conventional set of statements,
+similar to those in other conventional languages.
+This set includes
+blocks, assignments, control structures, function calls,
+and variable declarations.
+
+
+
+
+
+<h3>3.3.1 &ndash; <a name="3.3.1">Blocks</a></h3>
+
+<p>
+A block is a list of statements,
+which are executed sequentially:
+
+<pre>
+	block ::= {stat}
+</pre><p>
+Lua has <em>empty statements</em>
+that allow you to separate statements with semicolons,
+start a block with a semicolon
+or write two semicolons in sequence:
+
+<pre>
+	stat ::= &lsquo;<b>;</b>&rsquo;
+</pre>
+
+<p>
+Both function calls and assignments
+can start with an open parenthesis.
+This possibility leads to an ambiguity in Lua's grammar.
+Consider the following fragment:
+
+<pre>
+     a = b + c
+     (print or io.write)('done')
+</pre><p>
+The grammar could see this fragment in two ways:
+
+<pre>
+     a = b + c(print or io.write)('done')
+     
+     a = b + c; (print or io.write)('done')
+</pre><p>
+The current parser always sees such constructions
+in the first way,
+interpreting the open parenthesis
+as the start of the arguments to a call.
+To avoid this ambiguity,
+it is a good practice to always precede with a semicolon
+statements that start with a parenthesis:
+
+<pre>
+     ;(print or io.write)('done')
+</pre>
+
+<p>
+A block can be explicitly delimited to produce a single statement:
+
+<pre>
+	stat ::= <b>do</b> block <b>end</b>
+</pre><p>
+Explicit blocks are useful
+to control the scope of variable declarations.
+Explicit blocks are also sometimes used to
+add a <b>return</b> statement in the middle
+of another block (see <a href="#3.3.4">&sect;3.3.4</a>).
+
+
+
+
+
+<h3>3.3.2 &ndash; <a name="3.3.2">Chunks</a></h3>
+
+<p>
+The unit of compilation of Lua is called a <em>chunk</em>.
+Syntactically,
+a chunk is simply a block:
+
+<pre>
+	chunk ::= block
+</pre>
+
+<p>
+Lua handles a chunk as the body of an anonymous function
+with a variable number of arguments
+(see <a href="#3.4.11">&sect;3.4.11</a>).
+As such, chunks can define local variables,
+receive arguments, and return values.
+Moreover, such anonymous function is compiled as in the
+scope of an external local variable called <code>_ENV</code> (see <a href="#2.2">&sect;2.2</a>).
+The resulting function always has <code>_ENV</code> as its only external variable,
+even if it does not use that variable.
+
+
+<p>
+A chunk can be stored in a file or in a string inside the host program.
+To execute a chunk,
+Lua first <em>loads</em> it,
+precompiling the chunk's code into instructions for a virtual machine,
+and then Lua executes the compiled code
+with an interpreter for the virtual machine.
+
+
+<p>
+Chunks can also be precompiled into binary form;
+see the program <code>luac</code> and the function <a href="#pdf-string.dump"><code>string.dump</code></a> for details.
+Programs in source and compiled forms are interchangeable;
+Lua automatically detects the file type and acts accordingly (see <a href="#pdf-load"><code>load</code></a>).
+
+
+
+
+
+<h3>3.3.3 &ndash; <a name="3.3.3">Assignment</a></h3>
+
+<p>
+Lua allows multiple assignments.
+Therefore, the syntax for assignment
+defines a list of variables on the left side
+and a list of expressions on the right side.
+The elements in both lists are separated by commas:
+
+<pre>
+	stat ::= varlist &lsquo;<b>=</b>&rsquo; explist
+	varlist ::= var {&lsquo;<b>,</b>&rsquo; var}
+	explist ::= exp {&lsquo;<b>,</b>&rsquo; exp}
+</pre><p>
+Expressions are discussed in <a href="#3.4">&sect;3.4</a>.
+
+
+<p>
+Before the assignment,
+the list of values is <em>adjusted</em> to the length of
+the list of variables (see <a href="#3.4.12">&sect;3.4.12</a>).
+
+
+<p>
+If a variable is both assigned and read
+inside a multiple assignment,
+Lua ensures that all reads get the value of the variable
+before the assignment.
+Thus the code
+
+<pre>
+     i = 3
+     i, a[i] = i+1, 20
+</pre><p>
+sets <code>a[3]</code> to 20, without affecting <code>a[4]</code>
+because the <code>i</code> in <code>a[i]</code> is evaluated (to 3)
+before it is assigned&nbsp;4.
+Similarly, the line
+
+<pre>
+     x, y = y, x
+</pre><p>
+exchanges the values of <code>x</code> and <code>y</code>,
+and
+
+<pre>
+     x, y, z = y, z, x
+</pre><p>
+cyclically permutes the values of <code>x</code>, <code>y</code>, and <code>z</code>.
+
+
+<p>
+Note that this guarantee covers only accesses
+syntactically inside the assignment statement.
+If a function or a metamethod called during the assignment
+changes the value of a variable,
+Lua gives no guarantees about the order of that access.
+
+
+<p>
+An assignment to a global name <code>x = val</code>
+is equivalent to the assignment
+<code>_ENV.x = val</code> (see <a href="#2.2">&sect;2.2</a>).
+
+
+<p>
+The meaning of assignments to table fields and
+global variables (which are actually table fields, too)
+can be changed via metatables (see <a href="#2.4">&sect;2.4</a>).
+
+
+
+
+
+<h3>3.3.4 &ndash; <a name="3.3.4">Control Structures</a></h3><p>
+The control structures
+<b>if</b>, <b>while</b>, and <b>repeat</b> have the usual meaning and
+familiar syntax:
+
+
+
+
+<pre>
+	stat ::= <b>while</b> exp <b>do</b> block <b>end</b>
+	stat ::= <b>repeat</b> block <b>until</b> exp
+	stat ::= <b>if</b> exp <b>then</b> block {<b>elseif</b> exp <b>then</b> block} [<b>else</b> block] <b>end</b>
+</pre><p>
+Lua also has a <b>for</b> statement, in two flavors (see <a href="#3.3.5">&sect;3.3.5</a>).
+
+
+<p>
+The condition expression of a
+control structure can return any value.
+Both <b>false</b> and <b>nil</b> test false.
+All values different from <b>nil</b> and <b>false</b> test true.
+In particular, the number 0 and the empty string also test true.
+
+
+<p>
+In the <b>repeat</b>&ndash;<b>until</b> loop,
+the inner block does not end at the <b>until</b> keyword,
+but only after the condition.
+So, the condition can refer to local variables
+declared inside the loop block.
+
+
+<p>
+The <b>goto</b> statement transfers the program control to a label.
+For syntactical reasons,
+labels in Lua are considered statements too:
+
+
+
+<pre>
+	stat ::= <b>goto</b> Name
+	stat ::= label
+	label ::= &lsquo;<b>::</b>&rsquo; Name &lsquo;<b>::</b>&rsquo;
+</pre>
+
+<p>
+A label is visible in the entire block where it is defined,
+except inside nested functions.
+A goto may jump to any visible label as long as it does not
+enter into the scope of a local variable.
+A label should not be declared
+where a label with the same name is visible,
+even if this other label has been declared in an enclosing block.
+
+
+<p>
+The <b>break</b> statement terminates the execution of a
+<b>while</b>, <b>repeat</b>, or <b>for</b> loop,
+skipping to the next statement after the loop:
+
+
+<pre>
+	stat ::= <b>break</b>
+</pre><p>
+A <b>break</b> ends the innermost enclosing loop.
+
+
+<p>
+The <b>return</b> statement is used to return values
+from a function or a chunk
+(which is handled as an anonymous function).
+
+Functions can return more than one value,
+so the syntax for the <b>return</b> statement is
+
+<pre>
+	stat ::= <b>return</b> [explist] [&lsquo;<b>;</b>&rsquo;]
+</pre>
+
+<p>
+The <b>return</b> statement can only be written
+as the last statement of a block.
+If it is necessary to <b>return</b> in the middle of a block,
+then an explicit inner block can be used,
+as in the idiom <code>do return end</code>,
+because now <b>return</b> is the last statement in its (inner) block.
+
+
+
+
+
+<h3>3.3.5 &ndash; <a name="3.3.5">For Statement</a></h3>
+
+<p>
+
+The <b>for</b> statement has two forms:
+one numerical and one generic.
+
+
+
+<h4>The numerical <b>for</b> loop</h4>
+
+<p>
+The numerical <b>for</b> loop repeats a block of code while a
+control variable goes through an arithmetic progression.
+It has the following syntax:
+
+<pre>
+	stat ::= <b>for</b> Name &lsquo;<b>=</b>&rsquo; exp &lsquo;<b>,</b>&rsquo; exp [&lsquo;<b>,</b>&rsquo; exp] <b>do</b> block <b>end</b>
+</pre><p>
+The given identifier (Name) defines the control variable,
+which is a new variable local to the loop body (<em>block</em>).
+
+
+<p>
+The loop starts by evaluating once the three control expressions.
+Their values are called respectively
+the <em>initial value</em>, the <em>limit</em>, and the <em>step</em>.
+If the step is absent, it defaults to&nbsp;1.
+
+
+<p>
+If both the initial value and the step are integers,
+the loop is done with integers;
+note that the limit may not be an integer.
+Otherwise, the three values are converted to
+floats and the loop is done with floats.
+Beware of floating-point accuracy in this case.
+
+
+<p>
+After that initialization,
+the loop body is repeated with the value of the control variable
+going through an arithmetic progression,
+starting at the initial value,
+with a common difference given by the step.
+A negative step makes a decreasing sequence;
+a step equal to zero raises an error.
+The loop continues while the value is less than
+or equal to the limit
+(greater than or equal to for a negative step).
+If the initial value is already greater than the limit
+(or less than, if the step is negative),
+the body is not executed.
+
+
+<p>
+For integer loops,
+the control variable never wraps around;
+instead, the loop ends in case of an overflow.
+
+
+<p>
+You should not change the value of the control variable
+during the loop.
+If you need its value after the loop,
+assign it to another variable before exiting the loop.
+
+
+
+
+
+<h4>The generic <b>for</b> loop</h4>
+
+<p>
+The generic <b>for</b> statement works over functions,
+called <em>iterators</em>.
+On each iteration, the iterator function is called to produce a new value,
+stopping when this new value is <b>nil</b>.
+The generic <b>for</b> loop has the following syntax:
+
+<pre>
+	stat ::= <b>for</b> namelist <b>in</b> explist <b>do</b> block <b>end</b>
+	namelist ::= Name {&lsquo;<b>,</b>&rsquo; Name}
+</pre><p>
+A <b>for</b> statement like
+
+<pre>
+     for <em>var_1</em>, &middot;&middot;&middot;, <em>var_n</em> in <em>explist</em> do <em>body</em> end
+</pre><p>
+works as follows.
+
+
+<p>
+The names <em>var_i</em> declare loop variables local to the loop body.
+The first of these variables is the <em>control variable</em>.
+
+
+<p>
+The loop starts by evaluating <em>explist</em>
+to produce four values:
+an <em>iterator function</em>,
+a <em>state</em>,
+an initial value for the control variable,
+and a <em>closing value</em>.
+
+
+<p>
+Then, at each iteration,
+Lua calls the iterator function with two arguments:
+the state and the control variable.
+The results from this call are then assigned to the loop variables,
+following the rules of multiple assignments (see <a href="#3.3.3">&sect;3.3.3</a>).
+If the control variable becomes <b>nil</b>,
+the loop terminates.
+Otherwise, the body is executed and the loop goes
+to the next iteration.
+
+
+<p>
+The closing value behaves like a
+to-be-closed variable (see <a href="#3.3.8">&sect;3.3.8</a>),
+which can be used to release resources when the loop ends.
+Otherwise, it does not interfere with the loop.
+
+
+<p>
+You should not change the value of the control variable
+during the loop.
+
+
+
+
+
+
+
+<h3>3.3.6 &ndash; <a name="3.3.6">Function Calls as Statements</a></h3><p>
+To allow possible side-effects,
+function calls can be executed as statements:
+
+<pre>
+	stat ::= functioncall
+</pre><p>
+In this case, all returned values are thrown away.
+Function calls are explained in <a href="#3.4.10">&sect;3.4.10</a>.
+
+
+
+
+
+<h3>3.3.7 &ndash; <a name="3.3.7">Local Declarations</a></h3><p>
+Local variables can be declared anywhere inside a block.
+The declaration can include an initialization:
+
+<pre>
+	stat ::= <b>local</b> attnamelist [&lsquo;<b>=</b>&rsquo; explist]
+	attnamelist ::=  Name attrib {&lsquo;<b>,</b>&rsquo; Name attrib}
+</pre><p>
+If present, an initial assignment has the same semantics
+of a multiple assignment (see <a href="#3.3.3">&sect;3.3.3</a>).
+Otherwise, all variables are initialized with <b>nil</b>.
+
+
+<p>
+Each variable name may be postfixed by an attribute
+(a name between angle brackets):
+
+<pre>
+	attrib ::= [&lsquo;<b>&lt;</b>&rsquo; Name &lsquo;<b>&gt;</b>&rsquo;]
+</pre><p>
+There are two possible attributes:
+<code>const</code>, which declares a constant variable,
+that is, a variable that cannot be assigned to
+after its initialization;
+and <code>close</code>, which declares a to-be-closed variable (see <a href="#3.3.8">&sect;3.3.8</a>).
+A list of variables can contain at most one to-be-closed variable.
+
+
+<p>
+A chunk is also a block (see <a href="#3.3.2">&sect;3.3.2</a>),
+and so local variables can be declared in a chunk outside any explicit block.
+
+
+<p>
+The visibility rules for local variables are explained in <a href="#3.5">&sect;3.5</a>.
+
+
+
+
+
+<h3>3.3.8 &ndash; <a name="3.3.8">To-be-closed Variables</a></h3>
+
+<p>
+A to-be-closed variable behaves like a constant local variable,
+except that its value is <em>closed</em> whenever the variable
+goes out of scope, including normal block termination,
+exiting its block by <b>break</b>/<b>goto</b>/<b>return</b>,
+or exiting by an error.
+
+
+<p>
+Here, to <em>close</em> a value means
+to call its <code>__close</code> metamethod.
+When calling the metamethod,
+the value itself is passed as the first argument
+and the error object that caused the exit (if any)
+is passed as a second argument;
+if there was no error, the second argument is <b>nil</b>.
+
+
+<p>
+The value assigned to a to-be-closed variable
+must have a <code>__close</code> metamethod
+or be a false value.
+(<b>nil</b> and <b>false</b> are ignored as to-be-closed values.)
+
+
+<p>
+If several to-be-closed variables go out of scope at the same event,
+they are closed in the reverse order that they were declared.
+
+
+<p>
+If there is any error while running a closing method,
+that error is handled like an error in the regular code
+where the variable was defined.
+After an error,
+the other pending closing methods will still be called.
+
+
+<p>
+If a coroutine yields and is never resumed again,
+some variables may never go out of scope,
+and therefore they will never be closed.
+(These variables are the ones created inside the coroutine
+and in scope at the point where the coroutine yielded.)
+Similarly, if a coroutine ends with an error,
+it does not unwind its stack,
+so it does not close any variable.
+In both cases,
+you can either use finalizers
+or call <a href="#pdf-coroutine.close"><code>coroutine.close</code></a> to close the variables.
+However, if the coroutine was created
+through <a href="#pdf-coroutine.wrap"><code>coroutine.wrap</code></a>,
+then its corresponding function will close the coroutine
+in case of errors.
+
+
+
+
+
+
+
+<h2>3.4 &ndash; <a name="3.4">Expressions</a></h2>
+
+
+
+<p>
+The basic expressions in Lua are the following:
+
+<pre>
+	exp ::= prefixexp
+	exp ::= <b>nil</b> | <b>false</b> | <b>true</b>
+	exp ::= Numeral
+	exp ::= LiteralString
+	exp ::= functiondef
+	exp ::= tableconstructor
+	exp ::= &lsquo;<b>...</b>&rsquo;
+	exp ::= exp binop exp
+	exp ::= unop exp
+	prefixexp ::= var | functioncall | &lsquo;<b>(</b>&rsquo; exp &lsquo;<b>)</b>&rsquo;
+</pre>
+
+<p>
+Numerals and literal strings are explained in <a href="#3.1">&sect;3.1</a>;
+variables are explained in <a href="#3.2">&sect;3.2</a>;
+function definitions are explained in <a href="#3.4.11">&sect;3.4.11</a>;
+function calls are explained in <a href="#3.4.10">&sect;3.4.10</a>;
+table constructors are explained in <a href="#3.4.9">&sect;3.4.9</a>.
+Vararg expressions,
+denoted by three dots ('<code>...</code>'), can only be used when
+directly inside a variadic function;
+they are explained in <a href="#3.4.11">&sect;3.4.11</a>.
+
+
+<p>
+Binary operators comprise arithmetic operators (see <a href="#3.4.1">&sect;3.4.1</a>),
+bitwise operators (see <a href="#3.4.2">&sect;3.4.2</a>),
+relational operators (see <a href="#3.4.4">&sect;3.4.4</a>), logical operators (see <a href="#3.4.5">&sect;3.4.5</a>),
+and the concatenation operator (see <a href="#3.4.6">&sect;3.4.6</a>).
+Unary operators comprise the unary minus (see <a href="#3.4.1">&sect;3.4.1</a>),
+the unary bitwise NOT (see <a href="#3.4.2">&sect;3.4.2</a>),
+the unary logical <b>not</b> (see <a href="#3.4.5">&sect;3.4.5</a>),
+and the unary <em>length operator</em> (see <a href="#3.4.7">&sect;3.4.7</a>).
+
+
+
+
+
+<h3>3.4.1 &ndash; <a name="3.4.1">Arithmetic Operators</a></h3><p>
+Lua supports the following arithmetic operators:
+
+<ul>
+<li><b><code>+</code>: </b>addition</li>
+<li><b><code>-</code>: </b>subtraction</li>
+<li><b><code>*</code>: </b>multiplication</li>
+<li><b><code>/</code>: </b>float division</li>
+<li><b><code>//</code>: </b>floor division</li>
+<li><b><code>%</code>: </b>modulo</li>
+<li><b><code>^</code>: </b>exponentiation</li>
+<li><b><code>-</code>: </b>unary minus</li>
+</ul>
+
+<p>
+With the exception of exponentiation and float division,
+the arithmetic operators work as follows:
+If both operands are integers,
+the operation is performed over integers and the result is an integer.
+Otherwise, if both operands are numbers,
+then they are converted to floats,
+the operation is performed following the machine's rules
+for floating-point arithmetic
+(usually the IEEE 754 standard),
+and the result is a float.
+(The string library coerces strings to numbers in
+arithmetic operations; see <a href="#3.4.3">&sect;3.4.3</a> for details.)
+
+
+<p>
+Exponentiation and float division (<code>/</code>)
+always convert their operands to floats
+and the result is always a float.
+Exponentiation uses the ISO&nbsp;C function <code>pow</code>,
+so that it works for non-integer exponents too.
+
+
+<p>
+Floor division (<code>//</code>) is a division
+that rounds the quotient towards minus infinity,
+resulting in the floor of the division of its operands.
+
+
+<p>
+Modulo is defined as the remainder of a division
+that rounds the quotient towards minus infinity (floor division).
+
+
+<p>
+In case of overflows in integer arithmetic,
+all operations <em>wrap around</em>.
+
+
+
+<h3>3.4.2 &ndash; <a name="3.4.2">Bitwise Operators</a></h3><p>
+Lua supports the following bitwise operators:
+
+<ul>
+<li><b><code>&amp;</code>: </b>bitwise AND</li>
+<li><b><code>&#124;</code>: </b>bitwise OR</li>
+<li><b><code>~</code>: </b>bitwise exclusive OR</li>
+<li><b><code>&gt;&gt;</code>: </b>right shift</li>
+<li><b><code>&lt;&lt;</code>: </b>left shift</li>
+<li><b><code>~</code>: </b>unary bitwise NOT</li>
+</ul>
+
+<p>
+All bitwise operations convert its operands to integers
+(see <a href="#3.4.3">&sect;3.4.3</a>),
+operate on all bits of those integers,
+and result in an integer.
+
+
+<p>
+Both right and left shifts fill the vacant bits with zeros.
+Negative displacements shift to the other direction;
+displacements with absolute values equal to or higher than
+the number of bits in an integer
+result in zero (as all bits are shifted out).
+
+
+
+
+
+<h3>3.4.3 &ndash; <a name="3.4.3">Coercions and Conversions</a></h3><p>
+Lua provides some automatic conversions between some
+types and representations at run time.
+Bitwise operators always convert float operands to integers.
+Exponentiation and float division
+always convert integer operands to floats.
+All other arithmetic operations applied to mixed numbers
+(integers and floats) convert the integer operand to a float.
+The C API also converts both integers to floats and
+floats to integers, as needed.
+Moreover, string concatenation accepts numbers as arguments,
+besides strings.
+
+
+<p>
+In a conversion from integer to float,
+if the integer value has an exact representation as a float,
+that is the result.
+Otherwise,
+the conversion gets the nearest higher or
+the nearest lower representable value.
+This kind of conversion never fails.
+
+
+<p>
+The conversion from float to integer
+checks whether the float has an exact representation as an integer
+(that is, the float has an integral value and
+it is in the range of integer representation).
+If it does, that representation is the result.
+Otherwise, the conversion fails.
+
+
+<p>
+Several places in Lua coerce strings to numbers when necessary.
+In particular,
+the string library sets metamethods that try to coerce
+strings to numbers in all arithmetic operations.
+If the conversion fails,
+the library calls the metamethod of the other operand
+(if present) or it raises an error.
+Note that bitwise operators do not do this coercion.
+
+
+<p>
+It is always a good practice not to rely on the
+implicit coercions from strings to numbers,
+as they are not always applied;
+in particular, <code>"1"==1</code> is false and <code>"1"&lt;1</code> raises an error
+(see <a href="#3.4.4">&sect;3.4.4</a>).
+These coercions exist mainly for compatibility and may be removed
+in future versions of the language.
+
+
+<p>
+A string is converted to an integer or a float
+following its syntax and the rules of the Lua lexer.
+The string may have also leading and trailing whitespaces and a sign.
+All conversions from strings to numbers
+accept both a dot and the current locale mark
+as the radix character.
+(The Lua lexer, however, accepts only a dot.)
+If the string is not a valid numeral,
+the conversion fails.
+If necessary, the result of this first step is then converted
+to a specific number subtype following the previous rules
+for conversions between floats and integers.
+
+
+<p>
+The conversion from numbers to strings uses a
+non-specified human-readable format.
+To convert numbers to strings in any specific way,
+use the function <a href="#pdf-string.format"><code>string.format</code></a>.
+
+
+
+
+
+<h3>3.4.4 &ndash; <a name="3.4.4">Relational Operators</a></h3><p>
+Lua supports the following relational operators:
+
+<ul>
+<li><b><code>==</code>: </b>equality</li>
+<li><b><code>~=</code>: </b>inequality</li>
+<li><b><code>&lt;</code>: </b>less than</li>
+<li><b><code>&gt;</code>: </b>greater than</li>
+<li><b><code>&lt;=</code>: </b>less or equal</li>
+<li><b><code>&gt;=</code>: </b>greater or equal</li>
+</ul><p>
+These operators always result in <b>false</b> or <b>true</b>.
+
+
+<p>
+Equality (<code>==</code>) first compares the type of its operands.
+If the types are different, then the result is <b>false</b>.
+Otherwise, the values of the operands are compared.
+Strings are equal if they have the same byte content.
+Numbers are equal if they denote the same mathematical value.
+
+
+<p>
+Tables, userdata, and threads
+are compared by reference:
+two objects are considered equal only if they are the same object.
+Every time you create a new object
+(a table, a userdata, or a thread),
+this new object is different from any previously existing object.
+A function is always equal to itself.
+Functions with any detectable difference
+(different behavior, different definition) are always different.
+Functions created at different times but with no detectable differences
+may be classified as equal or not
+(depending on internal caching details).
+
+
+<p>
+You can change the way that Lua compares tables and userdata
+by using the <code>__eq</code> metamethod (see <a href="#2.4">&sect;2.4</a>).
+
+
+<p>
+Equality comparisons do not convert strings to numbers
+or vice versa.
+Thus, <code>"0"==0</code> evaluates to <b>false</b>,
+and <code>t[0]</code> and <code>t["0"]</code> denote different
+entries in a table.
+
+
+<p>
+The operator <code>~=</code> is exactly the negation of equality (<code>==</code>).
+
+
+<p>
+The order operators work as follows.
+If both arguments are numbers,
+then they are compared according to their mathematical values,
+regardless of their subtypes.
+Otherwise, if both arguments are strings,
+then their values are compared according to the current locale.
+Otherwise, Lua tries to call the <code>__lt</code> or the <code>__le</code>
+metamethod (see <a href="#2.4">&sect;2.4</a>).
+A comparison <code>a &gt; b</code> is translated to <code>b &lt; a</code>
+and <code>a &gt;= b</code> is translated to <code>b &lt;= a</code>.
+
+
+<p>
+Following the IEEE 754 standard,
+the special value NaN is considered neither less than,
+nor equal to, nor greater than any value, including itself.
+
+
+
+
+
+<h3>3.4.5 &ndash; <a name="3.4.5">Logical Operators</a></h3><p>
+The logical operators in Lua are
+<b>and</b>, <b>or</b>, and <b>not</b>.
+Like the control structures (see <a href="#3.3.4">&sect;3.3.4</a>),
+all logical operators consider both <b>false</b> and <b>nil</b> as false
+and anything else as true.
+
+
+<p>
+The negation operator <b>not</b> always returns <b>false</b> or <b>true</b>.
+The conjunction operator <b>and</b> returns its first argument
+if this value is <b>false</b> or <b>nil</b>;
+otherwise, <b>and</b> returns its second argument.
+The disjunction operator <b>or</b> returns its first argument
+if this value is different from <b>nil</b> and <b>false</b>;
+otherwise, <b>or</b> returns its second argument.
+Both <b>and</b> and <b>or</b> use short-circuit evaluation;
+that is,
+the second operand is evaluated only if necessary.
+Here are some examples:
+
+<pre>
+     10 or 20            --&gt; 10
+     10 or error()       --&gt; 10
+     nil or "a"          --&gt; "a"
+     nil and 10          --&gt; nil
+     false and error()   --&gt; false
+     false and nil       --&gt; false
+     false or nil        --&gt; nil
+     10 and 20           --&gt; 20
+</pre>
+
+
+
+
+<h3>3.4.6 &ndash; <a name="3.4.6">Concatenation</a></h3><p>
+The string concatenation operator in Lua is
+denoted by two dots ('<code>..</code>').
+If both operands are strings or numbers,
+then the numbers are converted to strings
+in a non-specified format (see <a href="#3.4.3">&sect;3.4.3</a>).
+Otherwise, the <code>__concat</code> metamethod is called (see <a href="#2.4">&sect;2.4</a>).
+
+
+
+
+
+<h3>3.4.7 &ndash; <a name="3.4.7">The Length Operator</a></h3>
+
+<p>
+The length operator is denoted by the unary prefix operator <code>#</code>.
+
+
+<p>
+The length of a string is its number of bytes.
+(That is the usual meaning of string length when each
+character is one byte.)
+
+
+<p>
+The length operator applied on a table
+returns a border in that table.
+A <em>border</em> in a table <code>t</code> is any non-negative integer
+that satisfies the following condition:
+
+<pre>
+     (border == 0 or t[border] ~= nil) and
+     (t[border + 1] == nil or border == math.maxinteger)
+</pre><p>
+In words,
+a border is any positive integer index present in the table
+that is followed by an absent index,
+plus two limit cases:
+zero, when index 1 is absent;
+and the maximum value for an integer, when that index is present.
+Note that keys that are not positive integers
+do not interfere with borders.
+
+
+<p>
+A table with exactly one border is called a <em>sequence</em>.
+For instance, the table <code>{10, 20, 30, 40, 50}</code> is a sequence,
+as it has only one border (5).
+The table <code>{10, 20, 30, nil, 50}</code> has two borders (3 and 5),
+and therefore it is not a sequence.
+(The <b>nil</b> at index 4 is called a <em>hole</em>.)
+The table <code>{nil, 20, 30, nil, nil, 60, nil}</code>
+has three borders (0, 3, and 6),
+so it is not a sequence, too.
+The table <code>{}</code> is a sequence with border 0.
+
+
+<p>
+When <code>t</code> is a sequence,
+<code>#t</code> returns its only border,
+which corresponds to the intuitive notion of the length of the sequence.
+When <code>t</code> is not a sequence,
+<code>#t</code> can return any of its borders.
+(The exact one depends on details of
+the internal representation of the table,
+which in turn can depend on how the table was populated and
+the memory addresses of its non-numeric keys.)
+
+
+<p>
+The computation of the length of a table
+has a guaranteed worst time of <em>O(log n)</em>,
+where <em>n</em> is the largest integer key in the table.
+
+
+<p>
+A program can modify the behavior of the length operator for
+any value but strings through the <code>__len</code> metamethod (see <a href="#2.4">&sect;2.4</a>).
+
+
+
+
+
+<h3>3.4.8 &ndash; <a name="3.4.8">Precedence</a></h3><p>
+Operator precedence in Lua follows the table below,
+from lower to higher priority:
+
+<pre>
+     or
+     and
+     &lt;     &gt;     &lt;=    &gt;=    ~=    ==
+     |
+     ~
+     &amp;
+     &lt;&lt;    &gt;&gt;
+     ..
+     +     -
+     *     /     //    %
+     unary operators (not   #     -     ~)
+     ^
+</pre><p>
+As usual,
+you can use parentheses to change the precedences of an expression.
+The concatenation ('<code>..</code>') and exponentiation ('<code>^</code>')
+operators are right associative.
+All other binary operators are left associative.
+
+
+
+
+
+<h3>3.4.9 &ndash; <a name="3.4.9">Table Constructors</a></h3><p>
+Table constructors are expressions that create tables.
+Every time a constructor is evaluated, a new table is created.
+A constructor can be used to create an empty table
+or to create a table and initialize some of its fields.
+The general syntax for constructors is
+
+<pre>
+	tableconstructor ::= &lsquo;<b>{</b>&rsquo; [fieldlist] &lsquo;<b>}</b>&rsquo;
+	fieldlist ::= field {fieldsep field} [fieldsep]
+	field ::= &lsquo;<b>[</b>&rsquo; exp &lsquo;<b>]</b>&rsquo; &lsquo;<b>=</b>&rsquo; exp | Name &lsquo;<b>=</b>&rsquo; exp | exp
+	fieldsep ::= &lsquo;<b>,</b>&rsquo; | &lsquo;<b>;</b>&rsquo;
+</pre>
+
+<p>
+Each field of the form <code>[exp1] = exp2</code> adds to the new table an entry
+with key <code>exp1</code> and value <code>exp2</code>.
+A field of the form <code>name = exp</code> is equivalent to
+<code>["name"] = exp</code>.
+Fields of the form <code>exp</code> are equivalent to
+<code>[i] = exp</code>, where <code>i</code> are consecutive integers
+starting with 1;
+fields in the other formats do not affect this counting.
+For example,
+
+<pre>
+     a = { [f(1)] = g; "x", "y"; x = 1, f(x), [30] = 23; 45 }
+</pre><p>
+is equivalent to
+
+<pre>
+     do
+       local t = {}
+       t[f(1)] = g
+       t[1] = "x"         -- 1st exp
+       t[2] = "y"         -- 2nd exp
+       t.x = 1            -- t["x"] = 1
+       t[3] = f(x)        -- 3rd exp
+       t[30] = 23
+       t[4] = 45          -- 4th exp
+       a = t
+     end
+</pre>
+
+<p>
+The order of the assignments in a constructor is undefined.
+(This order would be relevant only when there are repeated keys.)
+
+
+<p>
+If the last field in the list has the form <code>exp</code>
+and the expression is a multires expression,
+then all values returned by this expression enter the list consecutively
+(see <a href="#3.4.12">&sect;3.4.12</a>).
+
+
+<p>
+The field list can have an optional trailing separator,
+as a convenience for machine-generated code.
+
+
+
+
+
+<h3>3.4.10 &ndash; <a name="3.4.10">Function Calls</a></h3><p>
+A function call in Lua has the following syntax:
+
+<pre>
+	functioncall ::= prefixexp args
+</pre><p>
+In a function call,
+first prefixexp and args are evaluated.
+If the value of prefixexp has type <em>function</em>,
+then this function is called
+with the given arguments.
+Otherwise, if present,
+the prefixexp <code>__call</code> metamethod is called:
+its first argument is the value of prefixexp,
+followed by the original call arguments
+(see <a href="#2.4">&sect;2.4</a>).
+
+
+<p>
+The form
+
+<pre>
+	functioncall ::= prefixexp &lsquo;<b>:</b>&rsquo; Name args
+</pre><p>
+can be used to emulate methods.
+A call <code>v:name(<em>args</em>)</code>
+is syntactic sugar for <code>v.name(v,<em>args</em>)</code>,
+except that <code>v</code> is evaluated only once.
+
+
+<p>
+Arguments have the following syntax:
+
+<pre>
+	args ::= &lsquo;<b>(</b>&rsquo; [explist] &lsquo;<b>)</b>&rsquo;
+	args ::= tableconstructor
+	args ::= LiteralString
+</pre><p>
+All argument expressions are evaluated before the call.
+A call of the form <code>f{<em>fields</em>}</code> is
+syntactic sugar for <code>f({<em>fields</em>})</code>;
+that is, the argument list is a single new table.
+A call of the form <code>f'<em>string</em>'</code>
+(or <code>f"<em>string</em>"</code> or <code>f[[<em>string</em>]]</code>)
+is syntactic sugar for <code>f('<em>string</em>')</code>;
+that is, the argument list is a single literal string.
+
+
+<p>
+A call of the form <code>return <em>functioncall</em></code> not in the
+scope of a to-be-closed variable is called a <em>tail call</em>.
+Lua implements <em>proper tail calls</em>
+(or <em>proper tail recursion</em>):
+In a tail call,
+the called function reuses the stack entry of the calling function.
+Therefore, there is no limit on the number of nested tail calls that
+a program can execute.
+However, a tail call erases any debug information about the
+calling function.
+Note that a tail call only happens with a particular syntax,
+where the <b>return</b> has one single function call as argument,
+and it is outside the scope of any to-be-closed variable.
+This syntax makes the calling function return exactly
+the returns of the called function,
+without any intervening action.
+So, none of the following examples are tail calls:
+
+<pre>
+     return (f(x))        -- results adjusted to 1
+     return 2 * f(x)      -- result multiplied by 2
+     return x, f(x)       -- additional results
+     f(x); return         -- results discarded
+     return x or f(x)     -- results adjusted to 1
+</pre>
+
+
+
+
+<h3>3.4.11 &ndash; <a name="3.4.11">Function Definitions</a></h3>
+
+<p>
+The syntax for function definition is
+
+<pre>
+	functiondef ::= <b>function</b> funcbody
+	funcbody ::= &lsquo;<b>(</b>&rsquo; [parlist] &lsquo;<b>)</b>&rsquo; block <b>end</b>
+</pre>
+
+<p>
+The following syntactic sugar simplifies function definitions:
+
+<pre>
+	stat ::= <b>function</b> funcname funcbody
+	stat ::= <b>local</b> <b>function</b> Name funcbody
+	funcname ::= Name {&lsquo;<b>.</b>&rsquo; Name} [&lsquo;<b>:</b>&rsquo; Name]
+</pre><p>
+The statement
+
+<pre>
+     function f () <em>body</em> end
+</pre><p>
+translates to
+
+<pre>
+     f = function () <em>body</em> end
+</pre><p>
+The statement
+
+<pre>
+     function t.a.b.c.f () <em>body</em> end
+</pre><p>
+translates to
+
+<pre>
+     t.a.b.c.f = function () <em>body</em> end
+</pre><p>
+The statement
+
+<pre>
+     local function f () <em>body</em> end
+</pre><p>
+translates to
+
+<pre>
+     local f; f = function () <em>body</em> end
+</pre><p>
+not to
+
+<pre>
+     local f = function () <em>body</em> end
+</pre><p>
+(This only makes a difference when the body of the function
+contains references to <code>f</code>.)
+
+
+<p>
+A function definition is an executable expression,
+whose value has type <em>function</em>.
+When Lua precompiles a chunk,
+all its function bodies are precompiled too,
+but they are not created yet.
+Then, whenever Lua executes the function definition,
+the function is <em>instantiated</em> (or <em>closed</em>).
+This function instance, or <em>closure</em>,
+is the final value of the expression.
+
+
+<p>
+Parameters act as local variables that are
+initialized with the argument values:
+
+<pre>
+	parlist ::= namelist [&lsquo;<b>,</b>&rsquo; &lsquo;<b>...</b>&rsquo;] | &lsquo;<b>...</b>&rsquo;
+</pre><p>
+When a Lua function is called,
+it adjusts its list of arguments to
+the length of its list of parameters (see <a href="#3.4.12">&sect;3.4.12</a>),
+unless the function is a <em>variadic function</em>,
+which is indicated by three dots ('<code>...</code>')
+at the end of its parameter list.
+A variadic function does not adjust its argument list;
+instead, it collects all extra arguments and supplies them
+to the function through a <em>vararg expression</em>,
+which is also written as three dots.
+The value of this expression is a list of all actual extra arguments,
+similar to a function with multiple results (see <a href="#3.4.12">&sect;3.4.12</a>).
+
+
+<p>
+As an example, consider the following definitions:
+
+<pre>
+     function f(a, b) end
+     function g(a, b, ...) end
+     function r() return 1,2,3 end
+</pre><p>
+Then, we have the following mapping from arguments to parameters and
+to the vararg expression:
+
+<pre>
+     CALL             PARAMETERS
+     
+     f(3)             a=3, b=nil
+     f(3, 4)          a=3, b=4
+     f(3, 4, 5)       a=3, b=4
+     f(r(), 10)       a=1, b=10
+     f(r())           a=1, b=2
+     
+     g(3)             a=3, b=nil, ... --&gt;  (nothing)
+     g(3, 4)          a=3, b=4,   ... --&gt;  (nothing)
+     g(3, 4, 5, 8)    a=3, b=4,   ... --&gt;  5  8
+     g(5, r())        a=5, b=1,   ... --&gt;  2  3
+</pre>
+
+<p>
+Results are returned using the <b>return</b> statement (see <a href="#3.3.4">&sect;3.3.4</a>).
+If control reaches the end of a function
+without encountering a <b>return</b> statement,
+then the function returns with no results.
+
+
+<p>
+
+There is a system-dependent limit on the number of values
+that a function may return.
+This limit is guaranteed to be greater than 1000.
+
+
+<p>
+The <em>colon</em> syntax
+is used to emulate <em>methods</em>,
+adding an implicit extra parameter <code>self</code> to the function.
+Thus, the statement
+
+<pre>
+     function t.a.b.c:f (<em>params</em>) <em>body</em> end
+</pre><p>
+is syntactic sugar for
+
+<pre>
+     t.a.b.c.f = function (self, <em>params</em>) <em>body</em> end
+</pre>
+
+
+
+
+<h3>3.4.12 &ndash; <a name="3.4.12">Lists of expressions, multiple results,
+and adjustment</a></h3>
+
+<p>
+Both function calls and vararg expressions can result in multiple values.
+These expressions are called <em>multires expressions</em>.
+
+
+<p>
+When a multires expression is used as the last element
+of a list of expressions,
+all results from the expression are added to the
+list of values produced by the list of expressions.
+Note that a single expression
+in a place that expects a list of expressions
+is the last expression in that (singleton) list.
+
+
+<p>
+These are the places where Lua expects a list of expressions:
+
+<ul>
+
+<li>A <b>return</b> statement,
+for instance <code>return e1, e2, e3</code> (see <a href="#3.3.4">&sect;3.3.4</a>).</li>
+
+<li>A table constructor,
+for instance <code>{e1, e2, e3}</code> (see <a href="#3.4.9">&sect;3.4.9</a>).</li>
+
+<li>The arguments of a function call,
+for instance <code>foo(e1, e2, e3)</code> (see <a href="#3.4.10">&sect;3.4.10</a>).</li>
+
+<li>A multiple assignment,
+for instance <code>a , b, c = e1, e2, e3</code> (see <a href="#3.3.3">&sect;3.3.3</a>).</li>
+
+<li>A local declaration,
+for instance <code>local a , b, c = e1, e2, e3</code> (see <a href="#3.3.7">&sect;3.3.7</a>).</li>
+
+<li>The initial values in a generic <b>for</b> loop,
+for instance <code>for k in e1, e2, e3 do ... end</code> (see <a href="#3.3.5">&sect;3.3.5</a>).</li>
+
+</ul><p>
+In the last four cases,
+the list of values from the list of expressions
+must be <em>adjusted</em> to a specific length:
+the number of parameters in a call to a non-variadic function
+(see <a href="#3.4.11">&sect;3.4.11</a>),
+the number of variables in a multiple assignment or
+a local declaration,
+and exactly four values for a generic <b>for</b> loop.
+The <em>adjustment</em> follows these rules:
+If there are more values than needed,
+the extra values are thrown away;
+if there are fewer values than needed,
+the list is extended with <b>nil</b>'s.
+When the list of expressions ends with a multires expression,
+all results from that expression enter the list of values
+before the adjustment.
+
+
+<p>
+When a multires expression is used
+in a list of expressions without being the last element,
+or in a place where the syntax expects a single expression,
+Lua adjusts the result list of that expression to one element.
+As a particular case,
+the syntax expects a single expression inside a parenthesized expression;
+therefore, adding parentheses around a multires expression
+forces it to produce exactly one result.
+
+
+<p>
+We seldom need to use a vararg expression in a place
+where the syntax expects a single expression.
+(Usually it is simpler to add a regular parameter before
+the variadic part and use that parameter.)
+When there is such a need,
+we recommend assigning the vararg expression
+to a single variable and using that variable
+in its place.
+
+
+<p>
+Here are some examples of uses of mutlres expressions.
+In all cases, when the construction needs
+"the n-th result" and there is no such result,
+it uses a <b>nil</b>.
+
+<pre>
+     print(x, f())      -- prints x and all results from f().
+     print(x, (f()))    -- prints x and the first result from f().
+     print(f(), x)      -- prints the first result from f() and x.
+     print(1 + f())     -- prints 1 added to the first result from f().
+     local x = ...      -- x gets the first vararg argument.
+     x,y = ...          -- x gets the first vararg argument,
+                        -- y gets the second vararg argument.
+     x,y,z = w, f()     -- x gets w, y gets the first result from f(),
+                        -- z gets the second result from f().
+     x,y,z = f()        -- x gets the first result from f(),
+                        -- y gets the second result from f(),
+                        -- z gets the third result from f().
+     x,y,z = f(), g()   -- x gets the first result from f(),
+                        -- y gets the first result from g(),
+                        -- z gets the second result from g().
+     x,y,z = (f())      -- x gets the first result from f(), y and z get nil.
+     return f()         -- returns all results from f().
+     return x, ...      -- returns x and all received vararg arguments.
+     return x,y,f()     -- returns x, y, and all results from f().
+     {f()}              -- creates a list with all results from f().
+     {...}              -- creates a list with all vararg arguments.
+     {f(), 5}           -- creates a list with the first result from f() and 5.
+</pre>
+
+
+
+
+
+
+<h2>3.5 &ndash; <a name="3.5">Visibility Rules</a></h2>
+
+<p>
+
+Lua is a lexically scoped language.
+The scope of a local variable begins at the first statement after
+its declaration and lasts until the last non-void statement
+of the innermost block that includes the declaration.
+(<em>Void statements</em> are labels and empty statements.)
+Consider the following example:
+
+<pre>
+     x = 10                -- global variable
+     do                    -- new block
+       local x = x         -- new 'x', with value 10
+       print(x)            --&gt; 10
+       x = x+1
+       do                  -- another block
+         local x = x+1     -- another 'x'
+         print(x)          --&gt; 12
+       end
+       print(x)            --&gt; 11
+     end
+     print(x)              --&gt; 10  (the global one)
+</pre>
+
+<p>
+Notice that, in a declaration like <code>local x = x</code>,
+the new <code>x</code> being declared is not in scope yet,
+and so the second <code>x</code> refers to the outside variable.
+
+
+<p>
+Because of the lexical scoping rules,
+local variables can be freely accessed by functions
+defined inside their scope.
+A local variable used by an inner function is called an <em>upvalue</em>
+(or <em>external local variable</em>, or simply <em>external variable</em>)
+inside the inner function.
+
+
+<p>
+Notice that each execution of a <b>local</b> statement
+defines new local variables.
+Consider the following example:
+
+<pre>
+     a = {}
+     local x = 20
+     for i = 1, 10 do
+       local y = 0
+       a[i] = function () y = y + 1; return x + y end
+     end
+</pre><p>
+The loop creates ten closures
+(that is, ten instances of the anonymous function).
+Each of these closures uses a different <code>y</code> variable,
+while all of them share the same <code>x</code>.
+
+
+
+
+
+<h1>4 &ndash; <a name="4">The Application Program Interface</a></h1>
+
+
+
+<p>
+
+This section describes the C&nbsp;API for Lua, that is,
+the set of C&nbsp;functions available to the host program to communicate
+with Lua.
+All API functions and related types and constants
+are declared in the header file <a name="pdf-lua.h"><code>lua.h</code></a>.
+
+
+<p>
+Even when we use the term "function",
+any facility in the API may be provided as a macro instead.
+Except where stated otherwise,
+all such macros use each of their arguments exactly once
+(except for the first argument, which is always a Lua state),
+and so do not generate any hidden side-effects.
+
+
+<p>
+As in most C&nbsp;libraries,
+the Lua API functions do not check their arguments
+for validity or consistency.
+However, you can change this behavior by compiling Lua
+with the macro <a name="pdf-LUA_USE_APICHECK"><code>LUA_USE_APICHECK</code></a> defined.
+
+
+<p>
+The Lua library is fully reentrant:
+it has no global variables.
+It keeps all information it needs in a dynamic structure,
+called the <em>Lua state</em>.
+
+
+<p>
+Each Lua state has one or more threads,
+which correspond to independent, cooperative lines of execution.
+The type <a href="#lua_State"><code>lua_State</code></a> (despite its name) refers to a thread.
+(Indirectly, through the thread, it also refers to the
+Lua state associated to the thread.)
+
+
+<p>
+A pointer to a thread must be passed as the first argument to
+every function in the library, except to <a href="#lua_newstate"><code>lua_newstate</code></a>,
+which creates a Lua state from scratch and returns a pointer
+to the <em>main thread</em> in the new state.
+
+
+
+
+
+<h2>4.1 &ndash; <a name="4.1">The Stack</a></h2>
+
+
+
+<p>
+Lua uses a <em>virtual stack</em> to pass values to and from C.
+Each element in this stack represents a Lua value
+(<b>nil</b>, number, string, etc.).
+Functions in the API can access this stack through the
+Lua state parameter that they receive.
+
+
+<p>
+Whenever Lua calls C, the called function gets a new stack,
+which is independent of previous stacks and of stacks of
+C&nbsp;functions that are still active.
+This stack initially contains any arguments to the C&nbsp;function
+and it is where the C&nbsp;function can store temporary
+Lua values and must push its results
+to be returned to the caller (see <a href="#lua_CFunction"><code>lua_CFunction</code></a>).
+
+
+<p>
+For convenience,
+most query operations in the API do not follow a strict stack discipline.
+Instead, they can refer to any element in the stack
+by using an <em>index</em>:
+A positive index represents an absolute stack position,
+starting at&nbsp;1 as the bottom of the stack;
+a negative index represents an offset relative to the top of the stack.
+More specifically, if the stack has <em>n</em> elements,
+then index&nbsp;1 represents the first element
+(that is, the element that was pushed onto the stack first)
+and
+index&nbsp;<em>n</em> represents the last element;
+index&nbsp;-1 also represents the last element
+(that is, the element at the&nbsp;top)
+and index <em>-n</em> represents the first element.
+
+
+
+
+
+<h3>4.1.1 &ndash; <a name="4.1.1">Stack Size</a></h3>
+
+<p>
+When you interact with the Lua API,
+you are responsible for ensuring consistency.
+In particular,
+<em>you are responsible for controlling stack overflow</em>.
+When you call any API function,
+you must ensure the stack has enough room to accommodate the results.
+
+
+<p>
+There is one exception to the above rule:
+When you call a Lua function
+without a fixed number of results (see <a href="#lua_call"><code>lua_call</code></a>),
+Lua ensures that the stack has enough space for all results.
+However, it does not ensure any extra space.
+So, before pushing anything on the stack after such a call
+you should use <a href="#lua_checkstack"><code>lua_checkstack</code></a>.
+
+
+<p>
+Whenever Lua calls C,
+it ensures that the stack has space for
+at least <a name="pdf-LUA_MINSTACK"><code>LUA_MINSTACK</code></a> extra elements;
+that is, you can safely push up to <code>LUA_MINSTACK</code> values into it.
+<code>LUA_MINSTACK</code> is defined as 20,
+so that usually you do not have to worry about stack space
+unless your code has loops pushing elements onto the stack.
+Whenever necessary,
+you can use the function <a href="#lua_checkstack"><code>lua_checkstack</code></a>
+to ensure that the stack has enough space for pushing new elements.
+
+
+
+
+
+<h3>4.1.2 &ndash; <a name="4.1.2">Valid and Acceptable Indices</a></h3>
+
+<p>
+Any function in the API that receives stack indices
+works only with <em>valid indices</em> or <em>acceptable indices</em>.
+
+
+<p>
+A <em>valid index</em> is an index that refers to a
+position that stores a modifiable Lua value.
+It comprises stack indices between&nbsp;1 and the stack top
+(<code>1 &le; abs(index) &le; top</code>)
+
+plus <em>pseudo-indices</em>,
+which represent some positions that are accessible to C&nbsp;code
+but that are not in the stack.
+Pseudo-indices are used to access the registry (see <a href="#4.3">&sect;4.3</a>)
+and the upvalues of a C&nbsp;function (see <a href="#4.2">&sect;4.2</a>).
+
+
+<p>
+Functions that do not need a specific mutable position,
+but only a value (e.g., query functions),
+can be called with acceptable indices.
+An <em>acceptable index</em> can be any valid index,
+but it also can be any positive index after the stack top
+within the space allocated for the stack,
+that is, indices up to the stack size.
+(Note that 0 is never an acceptable index.)
+Indices to upvalues (see <a href="#4.2">&sect;4.2</a>) greater than the real number
+of upvalues in the current C&nbsp;function are also acceptable (but invalid).
+Except when noted otherwise,
+functions in the API work with acceptable indices.
+
+
+<p>
+Acceptable indices serve to avoid extra tests
+against the stack top when querying the stack.
+For instance, a C&nbsp;function can query its third argument
+without the need to check whether there is a third argument,
+that is, without the need to check whether 3 is a valid index.
+
+
+<p>
+For functions that can be called with acceptable indices,
+any non-valid index is treated as if it
+contains a value of a virtual type <a name="pdf-LUA_TNONE"><code>LUA_TNONE</code></a>,
+which behaves like a nil value.
+
+
+
+
+
+<h3>4.1.3 &ndash; <a name="4.1.3">Pointers to strings</a></h3>
+
+<p>
+Several functions in the API return pointers (<code>const char*</code>)
+to Lua strings in the stack.
+(See <a href="#lua_pushfstring"><code>lua_pushfstring</code></a>, <a href="#lua_pushlstring"><code>lua_pushlstring</code></a>,
+<a href="#lua_pushstring"><code>lua_pushstring</code></a>, and <a href="#lua_tolstring"><code>lua_tolstring</code></a>.
+See also <a href="#luaL_checklstring"><code>luaL_checklstring</code></a>, <a href="#luaL_checkstring"><code>luaL_checkstring</code></a>,
+and <a href="#luaL_tolstring"><code>luaL_tolstring</code></a> in the auxiliary library.)
+
+
+<p>
+In general,
+Lua's garbage collection can free or move internal memory
+and then invalidate pointers to internal strings.
+To allow a safe use of these pointers,
+the API guarantees that any pointer to a string in a stack index
+is valid while the string value at that index is not removed from the stack.
+(It can be moved to another index, though.)
+When the index is a pseudo-index (referring to an upvalue),
+the pointer is valid while the corresponding call is active and
+the corresponding upvalue is not modified.
+
+
+<p>
+Some functions in the debug interface
+also return pointers to strings,
+namely <a href="#lua_getlocal"><code>lua_getlocal</code></a>, <a href="#lua_getupvalue"><code>lua_getupvalue</code></a>,
+<a href="#lua_setlocal"><code>lua_setlocal</code></a>, and <a href="#lua_setupvalue"><code>lua_setupvalue</code></a>.
+For these functions, the pointer is guaranteed to
+be valid while the caller function is active and
+the given closure (if one was given) is in the stack.
+
+
+<p>
+Except for these guarantees,
+the garbage collector is free to invalidate
+any pointer to internal strings.
+
+
+
+
+
+
+
+<h2>4.2 &ndash; <a name="4.2">C Closures</a></h2>
+
+<p>
+When a C&nbsp;function is created,
+it is possible to associate some values with it,
+thus creating a <em>C&nbsp;closure</em>
+(see <a href="#lua_pushcclosure"><code>lua_pushcclosure</code></a>);
+these values are called <em>upvalues</em> and are
+accessible to the function whenever it is called.
+
+
+<p>
+Whenever a C&nbsp;function is called,
+its upvalues are located at specific pseudo-indices.
+These pseudo-indices are produced by the macro
+<a href="#lua_upvalueindex"><code>lua_upvalueindex</code></a>.
+The first upvalue associated with a function is at index
+<code>lua_upvalueindex(1)</code>, and so on.
+Any access to <code>lua_upvalueindex(<em>n</em>)</code>,
+where <em>n</em> is greater than the number of upvalues of the
+current function
+(but not greater than 256,
+which is one plus the maximum number of upvalues in a closure),
+produces an acceptable but invalid index.
+
+
+<p>
+A C&nbsp;closure can also change the values
+of its corresponding upvalues.
+
+
+
+
+
+<h2>4.3 &ndash; <a name="4.3">Registry</a></h2>
+
+<p>
+Lua provides a <em>registry</em>,
+a predefined table that can be used by any C&nbsp;code to
+store whatever Lua values it needs to store.
+The registry table is always accessible at pseudo-index
+<a name="pdf-LUA_REGISTRYINDEX"><code>LUA_REGISTRYINDEX</code></a>.
+Any C&nbsp;library can store data into this table,
+but it must take care to choose keys
+that are different from those used
+by other libraries, to avoid collisions.
+Typically, you should use as key a string containing your library name,
+or a light userdata with the address of a C&nbsp;object in your code,
+or any Lua object created by your code.
+As with variable names,
+string keys starting with an underscore followed by
+uppercase letters are reserved for Lua.
+
+
+<p>
+The integer keys in the registry are used
+by the reference mechanism (see <a href="#luaL_ref"><code>luaL_ref</code></a>)
+and by some predefined values.
+Therefore, integer keys in the registry
+must not be used for other purposes.
+
+
+<p>
+When you create a new Lua state,
+its registry comes with some predefined values.
+These predefined values are indexed with integer keys
+defined as constants in <code>lua.h</code>.
+The following constants are defined:
+
+<ul>
+<li><b><a name="pdf-LUA_RIDX_MAINTHREAD"><code>LUA_RIDX_MAINTHREAD</code></a>: </b> At this index the registry has
+the main thread of the state.
+(The main thread is the one created together with the state.)
+</li>
+
+<li><b><a name="pdf-LUA_RIDX_GLOBALS"><code>LUA_RIDX_GLOBALS</code></a>: </b> At this index the registry has
+the global environment.
+</li>
+</ul>
+
+
+
+
+<h2>4.4 &ndash; <a name="4.4">Error Handling in C</a></h2>
+
+
+
+<p>
+Internally, Lua uses the C <code>longjmp</code> facility to handle errors.
+(Lua will use exceptions if you compile it as C++;
+search for <code>LUAI_THROW</code> in the source code for details.)
+When Lua faces any error,
+such as a memory allocation error or a type error,
+it <em>raises</em> an error;
+that is, it does a long jump.
+A <em>protected environment</em> uses <code>setjmp</code>
+to set a recovery point;
+any error jumps to the most recent active recovery point.
+
+
+<p>
+Inside a C&nbsp;function you can raise an error explicitly
+by calling <a href="#lua_error"><code>lua_error</code></a>.
+
+
+<p>
+Most functions in the API can raise an error,
+for instance due to a memory allocation error.
+The documentation for each function indicates whether
+it can raise errors.
+
+
+<p>
+If an error happens outside any protected environment,
+Lua calls a <em>panic function</em> (see <a href="#lua_atpanic"><code>lua_atpanic</code></a>)
+and then calls <code>abort</code>,
+thus exiting the host application.
+Your panic function can avoid this exit by
+never returning
+(e.g., doing a long jump to your own recovery point outside Lua).
+
+
+<p>
+The panic function,
+as its name implies,
+is a mechanism of last resort.
+Programs should avoid it.
+As a general rule,
+when a C&nbsp;function is called by Lua with a Lua state,
+it can do whatever it wants on that Lua state,
+as it should be already protected.
+However,
+when C code operates on other Lua states
+(e.g., a Lua-state argument to the function,
+a Lua state stored in the registry, or
+the result of <a href="#lua_newthread"><code>lua_newthread</code></a>),
+it should use them only in API calls that cannot raise errors.
+
+
+<p>
+The panic function runs as if it were a message handler (see <a href="#2.3">&sect;2.3</a>);
+in particular, the error object is on the top of the stack.
+However, there is no guarantee about stack space.
+To push anything on the stack,
+the panic function must first check the available space (see <a href="#4.1.1">&sect;4.1.1</a>).
+
+
+
+
+
+<h3>4.4.1 &ndash; <a name="4.4.1">Status Codes</a></h3>
+
+<p>
+Several functions that report errors in the API use the following
+status codes to indicate different kinds of errors or other conditions:
+
+<ul>
+
+<li><b><a name="pdf-LUA_OK"><code>LUA_OK</code></a> (0): </b> no errors.</li>
+
+<li><b><a name="pdf-LUA_ERRRUN"><code>LUA_ERRRUN</code></a>: </b> a runtime error.</li>
+
+<li><b><a name="pdf-LUA_ERRMEM"><code>LUA_ERRMEM</code></a>: </b>
+memory allocation error.
+For such errors, Lua does not call the message handler.
+</li>
+
+<li><b><a name="pdf-LUA_ERRERR"><code>LUA_ERRERR</code></a>: </b> error while running the message handler.</li>
+
+<li><b><a name="pdf-LUA_ERRSYNTAX"><code>LUA_ERRSYNTAX</code></a>: </b> syntax error during precompilation.</li>
+
+<li><b><a name="pdf-LUA_YIELD"><code>LUA_YIELD</code></a>: </b> the thread (coroutine) yields.</li>
+
+<li><b><a name="pdf-LUA_ERRFILE"><code>LUA_ERRFILE</code></a>: </b> a file-related error;
+e.g., it cannot open or read the file.</li>
+
+</ul><p>
+These constants are defined in the header file <code>lua.h</code>.
+
+
+
+
+
+
+
+<h2>4.5 &ndash; <a name="4.5">Handling Yields in C</a></h2>
+
+<p>
+Internally, Lua uses the C <code>longjmp</code> facility to yield a coroutine.
+Therefore, if a C&nbsp;function <code>foo</code> calls an API function
+and this API function yields
+(directly or indirectly by calling another function that yields),
+Lua cannot return to <code>foo</code> any more,
+because the <code>longjmp</code> removes its frame from the C&nbsp;stack.
+
+
+<p>
+To avoid this kind of problem,
+Lua raises an error whenever it tries to yield across an API call,
+except for three functions:
+<a href="#lua_yieldk"><code>lua_yieldk</code></a>, <a href="#lua_callk"><code>lua_callk</code></a>, and <a href="#lua_pcallk"><code>lua_pcallk</code></a>.
+All those functions receive a <em>continuation function</em>
+(as a parameter named <code>k</code>) to continue execution after a yield.
+
+
+<p>
+We need to set some terminology to explain continuations.
+We have a C&nbsp;function called from Lua which we will call
+the <em>original function</em>.
+This original function then calls one of those three functions in the C API,
+which we will call the <em>callee function</em>,
+that then yields the current thread.
+This can happen when the callee function is <a href="#lua_yieldk"><code>lua_yieldk</code></a>,
+or when the callee function is either <a href="#lua_callk"><code>lua_callk</code></a> or <a href="#lua_pcallk"><code>lua_pcallk</code></a>
+and the function called by them yields.
+
+
+<p>
+Suppose the running thread yields while executing the callee function.
+After the thread resumes,
+it eventually will finish running the callee function.
+However,
+the callee function cannot return to the original function,
+because its frame in the C&nbsp;stack was destroyed by the yield.
+Instead, Lua calls a <em>continuation function</em>,
+which was given as an argument to the callee function.
+As the name implies,
+the continuation function should continue the task
+of the original function.
+
+
+<p>
+As an illustration, consider the following function:
+
+<pre>
+     int original_function (lua_State *L) {
+       ...     /* code 1 */
+       status = lua_pcall(L, n, m, h);  /* calls Lua */
+       ...     /* code 2 */
+     }
+</pre><p>
+Now we want to allow
+the Lua code being run by <a href="#lua_pcall"><code>lua_pcall</code></a> to yield.
+First, we can rewrite our function like here:
+
+<pre>
+     int k (lua_State *L, int status, lua_KContext ctx) {
+       ...  /* code 2 */
+     }
+     
+     int original_function (lua_State *L) {
+       ...     /* code 1 */
+       return k(L, lua_pcall(L, n, m, h), ctx);
+     }
+</pre><p>
+In the above code,
+the new function <code>k</code> is a
+<em>continuation function</em> (with type <a href="#lua_KFunction"><code>lua_KFunction</code></a>),
+which should do all the work that the original function
+was doing after calling <a href="#lua_pcall"><code>lua_pcall</code></a>.
+Now, we must inform Lua that it must call <code>k</code> if the Lua code
+being executed by <a href="#lua_pcall"><code>lua_pcall</code></a> gets interrupted in some way
+(errors or yielding),
+so we rewrite the code as here,
+replacing <a href="#lua_pcall"><code>lua_pcall</code></a> by <a href="#lua_pcallk"><code>lua_pcallk</code></a>:
+
+<pre>
+     int original_function (lua_State *L) {
+       ...     /* code 1 */
+       return k(L, lua_pcallk(L, n, m, h, ctx2, k), ctx1);
+     }
+</pre><p>
+Note the external, explicit call to the continuation:
+Lua will call the continuation only if needed, that is,
+in case of errors or resuming after a yield.
+If the called function returns normally without ever yielding,
+<a href="#lua_pcallk"><code>lua_pcallk</code></a> (and <a href="#lua_callk"><code>lua_callk</code></a>) will also return normally.
+(Of course, instead of calling the continuation in that case,
+you can do the equivalent work directly inside the original function.)
+
+
+<p>
+Besides the Lua state,
+the continuation function has two other parameters:
+the final status of the call and the context value (<code>ctx</code>) that
+was passed originally to <a href="#lua_pcallk"><code>lua_pcallk</code></a>.
+Lua does not use this context value;
+it only passes this value from the original function to the
+continuation function.
+For <a href="#lua_pcallk"><code>lua_pcallk</code></a>,
+the status is the same value that would be returned by <a href="#lua_pcallk"><code>lua_pcallk</code></a>,
+except that it is <a href="#pdf-LUA_YIELD"><code>LUA_YIELD</code></a> when being executed after a yield
+(instead of <a href="#pdf-LUA_OK"><code>LUA_OK</code></a>).
+For <a href="#lua_yieldk"><code>lua_yieldk</code></a> and <a href="#lua_callk"><code>lua_callk</code></a>,
+the status is always <a href="#pdf-LUA_YIELD"><code>LUA_YIELD</code></a> when Lua calls the continuation.
+(For these two functions,
+Lua will not call the continuation in case of errors,
+because they do not handle errors.)
+Similarly, when using <a href="#lua_callk"><code>lua_callk</code></a>,
+you should call the continuation function
+with <a href="#pdf-LUA_OK"><code>LUA_OK</code></a> as the status.
+(For <a href="#lua_yieldk"><code>lua_yieldk</code></a>, there is not much point in calling
+directly the continuation function,
+because <a href="#lua_yieldk"><code>lua_yieldk</code></a> usually does not return.)
+
+
+<p>
+Lua treats the continuation function as if it were the original function.
+The continuation function receives the same Lua stack
+from the original function,
+in the same state it would be if the callee function had returned.
+(For instance,
+after a <a href="#lua_callk"><code>lua_callk</code></a> the function and its arguments are
+removed from the stack and replaced by the results from the call.)
+It also has the same upvalues.
+Whatever it returns is handled by Lua as if it were the return
+of the original function.
+
+
+
+
+
+<h2>4.6 &ndash; <a name="4.6">Functions and Types</a></h2>
+
+<p>
+Here we list all functions and types from the C&nbsp;API in
+alphabetical order.
+Each function has an indicator like this:
+<span class="apii">[-o, +p, <em>x</em>]</span>
+
+
+<p>
+The first field, <code>o</code>,
+is how many elements the function pops from the stack.
+The second field, <code>p</code>,
+is how many elements the function pushes onto the stack.
+(Any function always pushes its results after popping its arguments.)
+A field in the form <code>x|y</code> means the function can push (or pop)
+<code>x</code> or <code>y</code> elements,
+depending on the situation;
+an interrogation mark '<code>?</code>' means that
+we cannot know how many elements the function pops/pushes
+by looking only at its arguments.
+(For instance, they may depend on what is in the stack.)
+The third field, <code>x</code>,
+tells whether the function may raise errors:
+'<code>-</code>' means the function never raises any error;
+'<code>m</code>' means the function may raise only out-of-memory errors;
+'<code>v</code>' means the function may raise the errors explained in the text;
+'<code>e</code>' means the function can run arbitrary Lua code,
+either directly or through metamethods,
+and therefore may raise any errors.
+
+
+
+<hr><h3><a name="lua_absindex"><code>lua_absindex</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_absindex (lua_State *L, int idx);</pre>
+
+<p>
+Converts the acceptable index <code>idx</code>
+into an equivalent absolute index
+(that is, one that does not depend on the stack size).
+
+
+
+
+
+<hr><h3><a name="lua_Alloc"><code>lua_Alloc</code></a></h3>
+<pre>typedef void * (*lua_Alloc) (void *ud,
+                             void *ptr,
+                             size_t osize,
+                             size_t nsize);</pre>
+
+<p>
+The type of the memory-allocation function used by Lua states.
+The allocator function must provide a
+functionality similar to <code>realloc</code>,
+but not exactly the same.
+Its arguments are
+<code>ud</code>, an opaque pointer passed to <a href="#lua_newstate"><code>lua_newstate</code></a>;
+<code>ptr</code>, a pointer to the block being allocated/reallocated/freed;
+<code>osize</code>, the original size of the block or some code about what
+is being allocated;
+and <code>nsize</code>, the new size of the block.
+
+
+<p>
+When <code>ptr</code> is not <code>NULL</code>,
+<code>osize</code> is the size of the block pointed by <code>ptr</code>,
+that is, the size given when it was allocated or reallocated.
+
+
+<p>
+When <code>ptr</code> is <code>NULL</code>,
+<code>osize</code> encodes the kind of object that Lua is allocating.
+<code>osize</code> is any of
+<a href="#pdf-LUA_TSTRING"><code>LUA_TSTRING</code></a>, <a href="#pdf-LUA_TTABLE"><code>LUA_TTABLE</code></a>, <a href="#pdf-LUA_TFUNCTION"><code>LUA_TFUNCTION</code></a>,
+<a href="#pdf-LUA_TUSERDATA"><code>LUA_TUSERDATA</code></a>, or <a href="#pdf-LUA_TTHREAD"><code>LUA_TTHREAD</code></a> when (and only when)
+Lua is creating a new object of that type.
+When <code>osize</code> is some other value,
+Lua is allocating memory for something else.
+
+
+<p>
+Lua assumes the following behavior from the allocator function:
+
+
+<p>
+When <code>nsize</code> is zero,
+the allocator must behave like <code>free</code>
+and then return <code>NULL</code>.
+
+
+<p>
+When <code>nsize</code> is not zero,
+the allocator must behave like <code>realloc</code>.
+In particular, the allocator returns <code>NULL</code>
+if and only if it cannot fulfill the request.
+
+
+<p>
+Here is a simple implementation for the allocator function.
+It is used in the auxiliary library by <a href="#luaL_newstate"><code>luaL_newstate</code></a>.
+
+<pre>
+     static void *l_alloc (void *ud, void *ptr, size_t osize,
+                                                size_t nsize) {
+       (void)ud;  (void)osize;  /* not used */
+       if (nsize == 0) {
+         free(ptr);
+         return NULL;
+       }
+       else
+         return realloc(ptr, nsize);
+     }
+</pre><p>
+Note that ISO&nbsp;C ensures
+that <code>free(NULL)</code> has no effect and that
+<code>realloc(NULL,size)</code> is equivalent to <code>malloc(size)</code>.
+
+
+
+
+
+<hr><h3><a name="lua_arith"><code>lua_arith</code></a></h3><p>
+<span class="apii">[-(2|1), +1, <em>e</em>]</span>
+<pre>void lua_arith (lua_State *L, int op);</pre>
+
+<p>
+Performs an arithmetic or bitwise operation over the two values
+(or one, in the case of negations)
+at the top of the stack,
+with the value on the top being the second operand,
+pops these values, and pushes the result of the operation.
+The function follows the semantics of the corresponding Lua operator
+(that is, it may call metamethods).
+
+
+<p>
+The value of <code>op</code> must be one of the following constants:
+
+<ul>
+
+<li><b><a name="pdf-LUA_OPADD"><code>LUA_OPADD</code></a>: </b> performs addition (<code>+</code>)</li>
+<li><b><a name="pdf-LUA_OPSUB"><code>LUA_OPSUB</code></a>: </b> performs subtraction (<code>-</code>)</li>
+<li><b><a name="pdf-LUA_OPMUL"><code>LUA_OPMUL</code></a>: </b> performs multiplication (<code>*</code>)</li>
+<li><b><a name="pdf-LUA_OPDIV"><code>LUA_OPDIV</code></a>: </b> performs float division (<code>/</code>)</li>
+<li><b><a name="pdf-LUA_OPIDIV"><code>LUA_OPIDIV</code></a>: </b> performs floor division (<code>//</code>)</li>
+<li><b><a name="pdf-LUA_OPMOD"><code>LUA_OPMOD</code></a>: </b> performs modulo (<code>%</code>)</li>
+<li><b><a name="pdf-LUA_OPPOW"><code>LUA_OPPOW</code></a>: </b> performs exponentiation (<code>^</code>)</li>
+<li><b><a name="pdf-LUA_OPUNM"><code>LUA_OPUNM</code></a>: </b> performs mathematical negation (unary <code>-</code>)</li>
+<li><b><a name="pdf-LUA_OPBNOT"><code>LUA_OPBNOT</code></a>: </b> performs bitwise NOT (<code>~</code>)</li>
+<li><b><a name="pdf-LUA_OPBAND"><code>LUA_OPBAND</code></a>: </b> performs bitwise AND (<code>&amp;</code>)</li>
+<li><b><a name="pdf-LUA_OPBOR"><code>LUA_OPBOR</code></a>: </b> performs bitwise OR (<code>|</code>)</li>
+<li><b><a name="pdf-LUA_OPBXOR"><code>LUA_OPBXOR</code></a>: </b> performs bitwise exclusive OR (<code>~</code>)</li>
+<li><b><a name="pdf-LUA_OPSHL"><code>LUA_OPSHL</code></a>: </b> performs left shift (<code>&lt;&lt;</code>)</li>
+<li><b><a name="pdf-LUA_OPSHR"><code>LUA_OPSHR</code></a>: </b> performs right shift (<code>&gt;&gt;</code>)</li>
+
+</ul>
+
+
+
+
+<hr><h3><a name="lua_atpanic"><code>lua_atpanic</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>lua_CFunction lua_atpanic (lua_State *L, lua_CFunction panicf);</pre>
+
+<p>
+Sets a new panic function and returns the old one (see <a href="#4.4">&sect;4.4</a>).
+
+
+
+
+
+<hr><h3><a name="lua_call"><code>lua_call</code></a></h3><p>
+<span class="apii">[-(nargs+1), +nresults, <em>e</em>]</span>
+<pre>void lua_call (lua_State *L, int nargs, int nresults);</pre>
+
+<p>
+Calls a function.
+Like regular Lua calls,
+<code>lua_call</code> respects the <code>__call</code> metamethod.
+So, here the word "function"
+means any callable value.
+
+
+<p>
+To do a call you must use the following protocol:
+first, the function to be called is pushed onto the stack;
+then, the arguments to the call are pushed
+in direct order;
+that is, the first argument is pushed first.
+Finally you call <a href="#lua_call"><code>lua_call</code></a>;
+<code>nargs</code> is the number of arguments that you pushed onto the stack.
+When the function returns,
+all arguments and the function value are popped
+and the call results are pushed onto the stack.
+The number of results is adjusted to <code>nresults</code>,
+unless <code>nresults</code> is <a name="pdf-LUA_MULTRET"><code>LUA_MULTRET</code></a>.
+In this case, all results from the function are pushed;
+Lua takes care that the returned values fit into the stack space,
+but it does not ensure any extra space in the stack.
+The function results are pushed onto the stack in direct order
+(the first result is pushed first),
+so that after the call the last result is on the top of the stack.
+
+
+<p>
+Any error while calling and running the function is propagated upwards
+(with a <code>longjmp</code>).
+
+
+<p>
+The following example shows how the host program can do the
+equivalent to this Lua code:
+
+<pre>
+     a = f("how", t.x, 14)
+</pre><p>
+Here it is in&nbsp;C:
+
+<pre>
+     lua_getglobal(L, "f");                  /* function to be called */
+     lua_pushliteral(L, "how");                       /* 1st argument */
+     lua_getglobal(L, "t");                    /* table to be indexed */
+     lua_getfield(L, -1, "x");        /* push result of t.x (2nd arg) */
+     lua_remove(L, -2);                  /* remove 't' from the stack */
+     lua_pushinteger(L, 14);                          /* 3rd argument */
+     lua_call(L, 3, 1);     /* call 'f' with 3 arguments and 1 result */
+     lua_setglobal(L, "a");                         /* set global 'a' */
+</pre><p>
+Note that the code above is <em>balanced</em>:
+at its end, the stack is back to its original configuration.
+This is considered good programming practice.
+
+
+
+
+
+<hr><h3><a name="lua_callk"><code>lua_callk</code></a></h3><p>
+<span class="apii">[-(nargs + 1), +nresults, <em>e</em>]</span>
+<pre>void lua_callk (lua_State *L,
+                int nargs,
+                int nresults,
+                lua_KContext ctx,
+                lua_KFunction k);</pre>
+
+<p>
+This function behaves exactly like <a href="#lua_call"><code>lua_call</code></a>,
+but allows the called function to yield (see <a href="#4.5">&sect;4.5</a>).
+
+
+
+
+
+<hr><h3><a name="lua_CFunction"><code>lua_CFunction</code></a></h3>
+<pre>typedef int (*lua_CFunction) (lua_State *L);</pre>
+
+<p>
+Type for C&nbsp;functions.
+
+
+<p>
+In order to communicate properly with Lua,
+a C&nbsp;function must use the following protocol,
+which defines the way parameters and results are passed:
+a C&nbsp;function receives its arguments from Lua in its stack
+in direct order (the first argument is pushed first).
+So, when the function starts,
+<code>lua_gettop(L)</code> returns the number of arguments received by the function.
+The first argument (if any) is at index 1
+and its last argument is at index <code>lua_gettop(L)</code>.
+To return values to Lua, a C&nbsp;function just pushes them onto the stack,
+in direct order (the first result is pushed first),
+and returns in C the number of results.
+Any other value in the stack below the results will be properly
+discarded by Lua.
+Like a Lua function, a C&nbsp;function called by Lua can also return
+many results.
+
+
+<p>
+As an example, the following function receives a variable number
+of numeric arguments and returns their average and their sum:
+
+<pre>
+     static int foo (lua_State *L) {
+       int n = lua_gettop(L);    /* number of arguments */
+       lua_Number sum = 0.0;
+       int i;
+       for (i = 1; i &lt;= n; i++) {
+         if (!lua_isnumber(L, i)) {
+           lua_pushliteral(L, "incorrect argument");
+           lua_error(L);
+         }
+         sum += lua_tonumber(L, i);
+       }
+       lua_pushnumber(L, sum/n);        /* first result */
+       lua_pushnumber(L, sum);         /* second result */
+       return 2;                   /* number of results */
+     }
+</pre>
+
+
+
+
+<hr><h3><a name="lua_checkstack"><code>lua_checkstack</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_checkstack (lua_State *L, int n);</pre>
+
+<p>
+Ensures that the stack has space for at least <code>n</code> extra elements,
+that is, that you can safely push up to <code>n</code> values into it.
+It returns false if it cannot fulfill the request,
+either because it would cause the stack
+to be greater than a fixed maximum size
+(typically at least several thousand elements) or
+because it cannot allocate memory for the extra space.
+This function never shrinks the stack;
+if the stack already has space for the extra elements,
+it is left unchanged.
+
+
+
+
+
+<hr><h3><a name="lua_close"><code>lua_close</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>void lua_close (lua_State *L);</pre>
+
+<p>
+Close all active to-be-closed variables in the main thread,
+release all objects in the given Lua state
+(calling the corresponding garbage-collection metamethods, if any),
+and frees all dynamic memory used by this state.
+
+
+<p>
+On several platforms, you may not need to call this function,
+because all resources are naturally released when the host program ends.
+On the other hand, long-running programs that create multiple states,
+such as daemons or web servers,
+will probably need to close states as soon as they are not needed.
+
+
+
+
+
+<hr><h3><a name="lua_closeslot"><code>lua_closeslot</code></a></h3><p>
+<span class="apii">[-0, +0, <em>e</em>]</span>
+<pre>void lua_closeslot (lua_State *L, int index);</pre>
+
+<p>
+Close the to-be-closed slot at the given index and set its value to <b>nil</b>.
+The index must be the last index previously marked to be closed
+(see <a href="#lua_toclose"><code>lua_toclose</code></a>) that is still active (that is, not closed yet).
+
+
+<p>
+A <code>__close</code> metamethod cannot yield
+when called through this function.
+
+
+<p>
+(This function was introduced in release&nbsp;5.4.3.)
+
+
+
+
+
+<hr><h3><a name="lua_closethread"><code>lua_closethread</code></a></h3><p>
+<span class="apii">[-0, +?, &ndash;]</span>
+<pre>int lua_closethread (lua_State *L, lua_State *from);</pre>
+
+<p>
+Resets a thread, cleaning its call stack and closing all pending
+to-be-closed variables.
+Returns a status code:
+<a href="#pdf-LUA_OK"><code>LUA_OK</code></a> for no errors in the thread
+(either the original error that stopped the thread or
+errors in closing methods),
+or an error status otherwise.
+In case of error,
+leaves the error object on the top of the stack.
+
+
+<p>
+The parameter <code>from</code> represents the coroutine that is resetting <code>L</code>.
+If there is no such coroutine,
+this parameter can be <code>NULL</code>.
+
+
+<p>
+(This function was introduced in release&nbsp;5.4.6.)
+
+
+
+
+
+<hr><h3><a name="lua_compare"><code>lua_compare</code></a></h3><p>
+<span class="apii">[-0, +0, <em>e</em>]</span>
+<pre>int lua_compare (lua_State *L, int index1, int index2, int op);</pre>
+
+<p>
+Compares two Lua values.
+Returns 1 if the value at index <code>index1</code> satisfies <code>op</code>
+when compared with the value at index <code>index2</code>,
+following the semantics of the corresponding Lua operator
+(that is, it may call metamethods).
+Otherwise returns&nbsp;0.
+Also returns&nbsp;0 if any of the indices is not valid.
+
+
+<p>
+The value of <code>op</code> must be one of the following constants:
+
+<ul>
+
+<li><b><a name="pdf-LUA_OPEQ"><code>LUA_OPEQ</code></a>: </b> compares for equality (<code>==</code>)</li>
+<li><b><a name="pdf-LUA_OPLT"><code>LUA_OPLT</code></a>: </b> compares for less than (<code>&lt;</code>)</li>
+<li><b><a name="pdf-LUA_OPLE"><code>LUA_OPLE</code></a>: </b> compares for less or equal (<code>&lt;=</code>)</li>
+
+</ul>
+
+
+
+
+<hr><h3><a name="lua_concat"><code>lua_concat</code></a></h3><p>
+<span class="apii">[-n, +1, <em>e</em>]</span>
+<pre>void lua_concat (lua_State *L, int n);</pre>
+
+<p>
+Concatenates the <code>n</code> values at the top of the stack,
+pops them, and leaves the result on the top.
+If <code>n</code>&nbsp;is&nbsp;1, the result is the single value on the stack
+(that is, the function does nothing);
+if <code>n</code> is 0, the result is the empty string.
+Concatenation is performed following the usual semantics of Lua
+(see <a href="#3.4.6">&sect;3.4.6</a>).
+
+
+
+
+
+<hr><h3><a name="lua_copy"><code>lua_copy</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>void lua_copy (lua_State *L, int fromidx, int toidx);</pre>
+
+<p>
+Copies the element at index <code>fromidx</code>
+into the valid index <code>toidx</code>,
+replacing the value at that position.
+Values at other positions are not affected.
+
+
+
+
+
+<hr><h3><a name="lua_createtable"><code>lua_createtable</code></a></h3><p>
+<span class="apii">[-0, +1, <em>m</em>]</span>
+<pre>void lua_createtable (lua_State *L, int narr, int nrec);</pre>
+
+<p>
+Creates a new empty table and pushes it onto the stack.
+Parameter <code>narr</code> is a hint for how many elements the table
+will have as a sequence;
+parameter <code>nrec</code> is a hint for how many other elements
+the table will have.
+Lua may use these hints to preallocate memory for the new table.
+This preallocation may help performance when you know in advance
+how many elements the table will have.
+Otherwise you can use the function <a href="#lua_newtable"><code>lua_newtable</code></a>.
+
+
+
+
+
+<hr><h3><a name="lua_dump"><code>lua_dump</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_dump (lua_State *L,
+                        lua_Writer writer,
+                        void *data,
+                        int strip);</pre>
+
+<p>
+Dumps a function as a binary chunk.
+Receives a Lua function on the top of the stack
+and produces a binary chunk that,
+if loaded again,
+results in a function equivalent to the one dumped.
+As it produces parts of the chunk,
+<a href="#lua_dump"><code>lua_dump</code></a> calls function <code>writer</code> (see <a href="#lua_Writer"><code>lua_Writer</code></a>)
+with the given <code>data</code>
+to write them.
+
+
+<p>
+If <code>strip</code> is true,
+the binary representation may not include all debug information
+about the function,
+to save space.
+
+
+<p>
+The value returned is the error code returned by the last
+call to the writer;
+0&nbsp;means no errors.
+
+
+<p>
+This function does not pop the Lua function from the stack.
+
+
+
+
+
+<hr><h3><a name="lua_error"><code>lua_error</code></a></h3><p>
+<span class="apii">[-1, +0, <em>v</em>]</span>
+<pre>int lua_error (lua_State *L);</pre>
+
+<p>
+Raises a Lua error,
+using the value on the top of the stack as the error object.
+This function does a long jump,
+and therefore never returns
+(see <a href="#luaL_error"><code>luaL_error</code></a>).
+
+
+
+
+
+<hr><h3><a name="lua_gc"><code>lua_gc</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_gc (lua_State *L, int what, ...);</pre>
+
+<p>
+Controls the garbage collector.
+
+
+<p>
+This function performs several tasks,
+according to the value of the parameter <code>what</code>.
+For options that need extra arguments,
+they are listed after the option.
+
+<ul>
+
+<li><b><code>LUA_GCCOLLECT</code>: </b>
+Performs a full garbage-collection cycle.
+</li>
+
+<li><b><code>LUA_GCSTOP</code>: </b>
+Stops the garbage collector.
+</li>
+
+<li><b><code>LUA_GCRESTART</code>: </b>
+Restarts the garbage collector.
+</li>
+
+<li><b><code>LUA_GCCOUNT</code>: </b>
+Returns the current amount of memory (in Kbytes) in use by Lua.
+</li>
+
+<li><b><code>LUA_GCCOUNTB</code>: </b>
+Returns the remainder of dividing the current amount of bytes of
+memory in use by Lua by 1024.
+</li>
+
+<li><b><code>LUA_GCSTEP</code> <code>(int stepsize)</code>: </b>
+Performs an incremental step of garbage collection,
+corresponding to the allocation of <code>stepsize</code> Kbytes.
+</li>
+
+<li><b><code>LUA_GCISRUNNING</code>: </b>
+Returns a boolean that tells whether the collector is running
+(i.e., not stopped).
+</li>
+
+<li><b><code>LUA_GCINC</code> (int pause, int stepmul, stepsize): </b>
+Changes the collector to incremental mode
+with the given parameters (see <a href="#2.5.1">&sect;2.5.1</a>).
+Returns the previous mode (<code>LUA_GCGEN</code> or <code>LUA_GCINC</code>).
+</li>
+
+<li><b><code>LUA_GCGEN</code> (int minormul, int majormul): </b>
+Changes the collector to generational mode
+with the given parameters (see <a href="#2.5.2">&sect;2.5.2</a>).
+Returns the previous mode (<code>LUA_GCGEN</code> or <code>LUA_GCINC</code>).
+</li>
+
+</ul><p>
+For more details about these options,
+see <a href="#pdf-collectgarbage"><code>collectgarbage</code></a>.
+
+
+<p>
+This function should not be called by a finalizer.
+
+
+
+
+
+<hr><h3><a name="lua_getallocf"><code>lua_getallocf</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>lua_Alloc lua_getallocf (lua_State *L, void **ud);</pre>
+
+<p>
+Returns the memory-allocation function of a given state.
+If <code>ud</code> is not <code>NULL</code>, Lua stores in <code>*ud</code> the
+opaque pointer given when the memory-allocator function was set.
+
+
+
+
+
+<hr><h3><a name="lua_getfield"><code>lua_getfield</code></a></h3><p>
+<span class="apii">[-0, +1, <em>e</em>]</span>
+<pre>int lua_getfield (lua_State *L, int index, const char *k);</pre>
+
+<p>
+Pushes onto the stack the value <code>t[k]</code>,
+where <code>t</code> is the value at the given index.
+As in Lua, this function may trigger a metamethod
+for the "index" event (see <a href="#2.4">&sect;2.4</a>).
+
+
+<p>
+Returns the type of the pushed value.
+
+
+
+
+
+<hr><h3><a name="lua_getextraspace"><code>lua_getextraspace</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>void *lua_getextraspace (lua_State *L);</pre>
+
+<p>
+Returns a pointer to a raw memory area associated with the
+given Lua state.
+The application can use this area for any purpose;
+Lua does not use it for anything.
+
+
+<p>
+Each new thread has this area initialized with a copy
+of the area of the main thread.
+
+
+<p>
+By default, this area has the size of a pointer to void,
+but you can recompile Lua with a different size for this area.
+(See <code>LUA_EXTRASPACE</code> in <code>luaconf.h</code>.)
+
+
+
+
+
+<hr><h3><a name="lua_getglobal"><code>lua_getglobal</code></a></h3><p>
+<span class="apii">[-0, +1, <em>e</em>]</span>
+<pre>int lua_getglobal (lua_State *L, const char *name);</pre>
+
+<p>
+Pushes onto the stack the value of the global <code>name</code>.
+Returns the type of that value.
+
+
+
+
+
+<hr><h3><a name="lua_geti"><code>lua_geti</code></a></h3><p>
+<span class="apii">[-0, +1, <em>e</em>]</span>
+<pre>int lua_geti (lua_State *L, int index, lua_Integer i);</pre>
+
+<p>
+Pushes onto the stack the value <code>t[i]</code>,
+where <code>t</code> is the value at the given index.
+As in Lua, this function may trigger a metamethod
+for the "index" event (see <a href="#2.4">&sect;2.4</a>).
+
+
+<p>
+Returns the type of the pushed value.
+
+
+
+
+
+<hr><h3><a name="lua_getmetatable"><code>lua_getmetatable</code></a></h3><p>
+<span class="apii">[-0, +(0|1), &ndash;]</span>
+<pre>int lua_getmetatable (lua_State *L, int index);</pre>
+
+<p>
+If the value at the given index has a metatable,
+the function pushes that metatable onto the stack and returns&nbsp;1.
+Otherwise,
+the function returns&nbsp;0 and pushes nothing on the stack.
+
+
+
+
+
+<hr><h3><a name="lua_gettable"><code>lua_gettable</code></a></h3><p>
+<span class="apii">[-1, +1, <em>e</em>]</span>
+<pre>int lua_gettable (lua_State *L, int index);</pre>
+
+<p>
+Pushes onto the stack the value <code>t[k]</code>,
+where <code>t</code> is the value at the given index
+and <code>k</code> is the value on the top of the stack.
+
+
+<p>
+This function pops the key from the stack,
+pushing the resulting value in its place.
+As in Lua, this function may trigger a metamethod
+for the "index" event (see <a href="#2.4">&sect;2.4</a>).
+
+
+<p>
+Returns the type of the pushed value.
+
+
+
+
+
+<hr><h3><a name="lua_gettop"><code>lua_gettop</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_gettop (lua_State *L);</pre>
+
+<p>
+Returns the index of the top element in the stack.
+Because indices start at&nbsp;1,
+this result is equal to the number of elements in the stack;
+in particular, 0&nbsp;means an empty stack.
+
+
+
+
+
+<hr><h3><a name="lua_getiuservalue"><code>lua_getiuservalue</code></a></h3><p>
+<span class="apii">[-0, +1, &ndash;]</span>
+<pre>int lua_getiuservalue (lua_State *L, int index, int n);</pre>
+
+<p>
+Pushes onto the stack the <code>n</code>-th user value associated with the
+full userdata at the given index and
+returns the type of the pushed value.
+
+
+<p>
+If the userdata does not have that value,
+pushes <b>nil</b> and returns <a href="#pdf-LUA_TNONE"><code>LUA_TNONE</code></a>.
+
+
+
+
+
+<hr><h3><a name="lua_insert"><code>lua_insert</code></a></h3><p>
+<span class="apii">[-1, +1, &ndash;]</span>
+<pre>void lua_insert (lua_State *L, int index);</pre>
+
+<p>
+Moves the top element into the given valid index,
+shifting up the elements above this index to open space.
+This function cannot be called with a pseudo-index,
+because a pseudo-index is not an actual stack position.
+
+
+
+
+
+<hr><h3><a name="lua_Integer"><code>lua_Integer</code></a></h3>
+<pre>typedef ... lua_Integer;</pre>
+
+<p>
+The type of integers in Lua.
+
+
+<p>
+By default this type is <code>long long</code>,
+(usually a 64-bit two-complement integer),
+but that can be changed to <code>long</code> or <code>int</code>
+(usually a 32-bit two-complement integer).
+(See <code>LUA_INT_TYPE</code> in <code>luaconf.h</code>.)
+
+
+<p>
+Lua also defines the constants
+<a name="pdf-LUA_MININTEGER"><code>LUA_MININTEGER</code></a> and <a name="pdf-LUA_MAXINTEGER"><code>LUA_MAXINTEGER</code></a>,
+with the minimum and the maximum values that fit in this type.
+
+
+
+
+
+<hr><h3><a name="lua_isboolean"><code>lua_isboolean</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_isboolean (lua_State *L, int index);</pre>
+
+<p>
+Returns 1 if the value at the given index is a boolean,
+and 0&nbsp;otherwise.
+
+
+
+
+
+<hr><h3><a name="lua_iscfunction"><code>lua_iscfunction</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_iscfunction (lua_State *L, int index);</pre>
+
+<p>
+Returns 1 if the value at the given index is a C&nbsp;function,
+and 0&nbsp;otherwise.
+
+
+
+
+
+<hr><h3><a name="lua_isfunction"><code>lua_isfunction</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_isfunction (lua_State *L, int index);</pre>
+
+<p>
+Returns 1 if the value at the given index is a function
+(either C or Lua), and 0&nbsp;otherwise.
+
+
+
+
+
+<hr><h3><a name="lua_isinteger"><code>lua_isinteger</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_isinteger (lua_State *L, int index);</pre>
+
+<p>
+Returns 1 if the value at the given index is an integer
+(that is, the value is a number and is represented as an integer),
+and 0&nbsp;otherwise.
+
+
+
+
+
+<hr><h3><a name="lua_islightuserdata"><code>lua_islightuserdata</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_islightuserdata (lua_State *L, int index);</pre>
+
+<p>
+Returns 1 if the value at the given index is a light userdata,
+and 0&nbsp;otherwise.
+
+
+
+
+
+<hr><h3><a name="lua_isnil"><code>lua_isnil</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_isnil (lua_State *L, int index);</pre>
+
+<p>
+Returns 1 if the value at the given index is <b>nil</b>,
+and 0&nbsp;otherwise.
+
+
+
+
+
+<hr><h3><a name="lua_isnone"><code>lua_isnone</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_isnone (lua_State *L, int index);</pre>
+
+<p>
+Returns 1 if the given index is not valid,
+and 0&nbsp;otherwise.
+
+
+
+
+
+<hr><h3><a name="lua_isnoneornil"><code>lua_isnoneornil</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_isnoneornil (lua_State *L, int index);</pre>
+
+<p>
+Returns 1 if the given index is not valid
+or if the value at this index is <b>nil</b>,
+and 0&nbsp;otherwise.
+
+
+
+
+
+<hr><h3><a name="lua_isnumber"><code>lua_isnumber</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_isnumber (lua_State *L, int index);</pre>
+
+<p>
+Returns 1 if the value at the given index is a number
+or a string convertible to a number,
+and 0&nbsp;otherwise.
+
+
+
+
+
+<hr><h3><a name="lua_isstring"><code>lua_isstring</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_isstring (lua_State *L, int index);</pre>
+
+<p>
+Returns 1 if the value at the given index is a string
+or a number (which is always convertible to a string),
+and 0&nbsp;otherwise.
+
+
+
+
+
+<hr><h3><a name="lua_istable"><code>lua_istable</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_istable (lua_State *L, int index);</pre>
+
+<p>
+Returns 1 if the value at the given index is a table,
+and 0&nbsp;otherwise.
+
+
+
+
+
+<hr><h3><a name="lua_isthread"><code>lua_isthread</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_isthread (lua_State *L, int index);</pre>
+
+<p>
+Returns 1 if the value at the given index is a thread,
+and 0&nbsp;otherwise.
+
+
+
+
+
+<hr><h3><a name="lua_isuserdata"><code>lua_isuserdata</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_isuserdata (lua_State *L, int index);</pre>
+
+<p>
+Returns 1 if the value at the given index is a userdata
+(either full or light), and 0&nbsp;otherwise.
+
+
+
+
+
+<hr><h3><a name="lua_isyieldable"><code>lua_isyieldable</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_isyieldable (lua_State *L);</pre>
+
+<p>
+Returns 1 if the given coroutine can yield,
+and 0&nbsp;otherwise.
+
+
+
+
+
+<hr><h3><a name="lua_KContext"><code>lua_KContext</code></a></h3>
+<pre>typedef ... lua_KContext;</pre>
+
+<p>
+The type for continuation-function contexts.
+It must be a numeric type.
+This type is defined as <code>intptr_t</code>
+when <code>intptr_t</code> is available,
+so that it can store pointers too.
+Otherwise, it is defined as <code>ptrdiff_t</code>.
+
+
+
+
+
+<hr><h3><a name="lua_KFunction"><code>lua_KFunction</code></a></h3>
+<pre>typedef int (*lua_KFunction) (lua_State *L, int status, lua_KContext ctx);</pre>
+
+<p>
+Type for continuation functions (see <a href="#4.5">&sect;4.5</a>).
+
+
+
+
+
+<hr><h3><a name="lua_len"><code>lua_len</code></a></h3><p>
+<span class="apii">[-0, +1, <em>e</em>]</span>
+<pre>void lua_len (lua_State *L, int index);</pre>
+
+<p>
+Returns the length of the value at the given index.
+It is equivalent to the '<code>#</code>' operator in Lua (see <a href="#3.4.7">&sect;3.4.7</a>) and
+may trigger a metamethod for the "length" event (see <a href="#2.4">&sect;2.4</a>).
+The result is pushed on the stack.
+
+
+
+
+
+<hr><h3><a name="lua_load"><code>lua_load</code></a></h3><p>
+<span class="apii">[-0, +1, &ndash;]</span>
+<pre>int lua_load (lua_State *L,
+              lua_Reader reader,
+              void *data,
+              const char *chunkname,
+              const char *mode);</pre>
+
+<p>
+Loads a Lua chunk without running it.
+If there are no errors,
+<code>lua_load</code> pushes the compiled chunk as a Lua
+function on top of the stack.
+Otherwise, it pushes an error message.
+
+
+<p>
+The <code>lua_load</code> function uses a user-supplied <code>reader</code> function
+to read the chunk (see <a href="#lua_Reader"><code>lua_Reader</code></a>).
+The <code>data</code> argument is an opaque value passed to the reader function.
+
+
+<p>
+The <code>chunkname</code> argument gives a name to the chunk,
+which is used for error messages and in debug information (see <a href="#4.7">&sect;4.7</a>).
+
+
+<p>
+<code>lua_load</code> automatically detects whether the chunk is text or binary
+and loads it accordingly (see program <code>luac</code>).
+The string <code>mode</code> works as in function <a href="#pdf-load"><code>load</code></a>,
+with the addition that
+a <code>NULL</code> value is equivalent to the string "<code>bt</code>".
+
+
+<p>
+<code>lua_load</code> uses the stack internally,
+so the reader function must always leave the stack
+unmodified when returning.
+
+
+<p>
+<code>lua_load</code> can return
+<a href="#pdf-LUA_OK"><code>LUA_OK</code></a>, <a href="#pdf-LUA_ERRSYNTAX"><code>LUA_ERRSYNTAX</code></a>, or <a href="#pdf-LUA_ERRMEM"><code>LUA_ERRMEM</code></a>.
+The function may also return other values corresponding to
+errors raised by the read function (see <a href="#4.4.1">&sect;4.4.1</a>).
+
+
+<p>
+If the resulting function has upvalues,
+its first upvalue is set to the value of the global environment
+stored at index <code>LUA_RIDX_GLOBALS</code> in the registry (see <a href="#4.3">&sect;4.3</a>).
+When loading main chunks,
+this upvalue will be the <code>_ENV</code> variable (see <a href="#2.2">&sect;2.2</a>).
+Other upvalues are initialized with <b>nil</b>.
+
+
+
+
+
+<hr><h3><a name="lua_newstate"><code>lua_newstate</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>lua_State *lua_newstate (lua_Alloc f, void *ud);</pre>
+
+<p>
+Creates a new independent state and returns its main thread.
+Returns <code>NULL</code> if it cannot create the state
+(due to lack of memory).
+The argument <code>f</code> is the allocator function;
+Lua will do all memory allocation for this state
+through this function (see <a href="#lua_Alloc"><code>lua_Alloc</code></a>).
+The second argument, <code>ud</code>, is an opaque pointer that Lua
+passes to the allocator in every call.
+
+
+
+
+
+<hr><h3><a name="lua_newtable"><code>lua_newtable</code></a></h3><p>
+<span class="apii">[-0, +1, <em>m</em>]</span>
+<pre>void lua_newtable (lua_State *L);</pre>
+
+<p>
+Creates a new empty table and pushes it onto the stack.
+It is equivalent to <code>lua_createtable(L, 0, 0)</code>.
+
+
+
+
+
+<hr><h3><a name="lua_newthread"><code>lua_newthread</code></a></h3><p>
+<span class="apii">[-0, +1, <em>m</em>]</span>
+<pre>lua_State *lua_newthread (lua_State *L);</pre>
+
+<p>
+Creates a new thread, pushes it on the stack,
+and returns a pointer to a <a href="#lua_State"><code>lua_State</code></a> that represents this new thread.
+The new thread returned by this function shares with the original thread
+its global environment,
+but has an independent execution stack.
+
+
+<p>
+Threads are subject to garbage collection,
+like any Lua object.
+
+
+
+
+
+<hr><h3><a name="lua_newuserdatauv"><code>lua_newuserdatauv</code></a></h3><p>
+<span class="apii">[-0, +1, <em>m</em>]</span>
+<pre>void *lua_newuserdatauv (lua_State *L, size_t size, int nuvalue);</pre>
+
+<p>
+This function creates and pushes on the stack a new full userdata,
+with <code>nuvalue</code> associated Lua values, called <code>user values</code>,
+plus an associated block of raw memory with <code>size</code> bytes.
+(The user values can be set and read with the functions
+<a href="#lua_setiuservalue"><code>lua_setiuservalue</code></a> and <a href="#lua_getiuservalue"><code>lua_getiuservalue</code></a>.)
+
+
+<p>
+The function returns the address of the block of memory.
+Lua ensures that this address is valid as long as
+the corresponding userdata is alive (see <a href="#2.5">&sect;2.5</a>).
+Moreover, if the userdata is marked for finalization (see <a href="#2.5.3">&sect;2.5.3</a>),
+its address is valid at least until the call to its finalizer.
+
+
+
+
+
+<hr><h3><a name="lua_next"><code>lua_next</code></a></h3><p>
+<span class="apii">[-1, +(2|0), <em>v</em>]</span>
+<pre>int lua_next (lua_State *L, int index);</pre>
+
+<p>
+Pops a key from the stack,
+and pushes a key&ndash;value pair from the table at the given index,
+the "next" pair after the given key.
+If there are no more elements in the table,
+then <a href="#lua_next"><code>lua_next</code></a> returns&nbsp;0 and pushes nothing.
+
+
+<p>
+A typical table traversal looks like this:
+
+<pre>
+     /* table is in the stack at index 't' */
+     lua_pushnil(L);  /* first key */
+     while (lua_next(L, t) != 0) {
+       /* uses 'key' (at index -2) and 'value' (at index -1) */
+       printf("%s - %s\n",
+              lua_typename(L, lua_type(L, -2)),
+              lua_typename(L, lua_type(L, -1)));
+       /* removes 'value'; keeps 'key' for next iteration */
+       lua_pop(L, 1);
+     }
+</pre>
+
+<p>
+While traversing a table,
+avoid calling <a href="#lua_tolstring"><code>lua_tolstring</code></a> directly on a key,
+unless you know that the key is actually a string.
+Recall that <a href="#lua_tolstring"><code>lua_tolstring</code></a> may change
+the value at the given index;
+this confuses the next call to <a href="#lua_next"><code>lua_next</code></a>.
+
+
+<p>
+This function may raise an error if the given key
+is neither <b>nil</b> nor present in the table.
+See function <a href="#pdf-next"><code>next</code></a> for the caveats of modifying
+the table during its traversal.
+
+
+
+
+
+<hr><h3><a name="lua_Number"><code>lua_Number</code></a></h3>
+<pre>typedef ... lua_Number;</pre>
+
+<p>
+The type of floats in Lua.
+
+
+<p>
+By default this type is double,
+but that can be changed to a single float or a long double.
+(See <code>LUA_FLOAT_TYPE</code> in <code>luaconf.h</code>.)
+
+
+
+
+
+<hr><h3><a name="lua_numbertointeger"><code>lua_numbertointeger</code></a></h3>
+<pre>int lua_numbertointeger (lua_Number n, lua_Integer *p);</pre>
+
+<p>
+Tries to convert a Lua float to a Lua integer;
+the float <code>n</code> must have an integral value.
+If that value is within the range of Lua integers,
+it is converted to an integer and assigned to <code>*p</code>.
+The macro results in a boolean indicating whether the
+conversion was successful.
+(Note that this range test can be tricky to do
+correctly without this macro, due to rounding.)
+
+
+<p>
+This macro may evaluate its arguments more than once.
+
+
+
+
+
+<hr><h3><a name="lua_pcall"><code>lua_pcall</code></a></h3><p>
+<span class="apii">[-(nargs + 1), +(nresults|1), &ndash;]</span>
+<pre>int lua_pcall (lua_State *L, int nargs, int nresults, int msgh);</pre>
+
+<p>
+Calls a function (or a callable object) in protected mode.
+
+
+<p>
+Both <code>nargs</code> and <code>nresults</code> have the same meaning as
+in <a href="#lua_call"><code>lua_call</code></a>.
+If there are no errors during the call,
+<a href="#lua_pcall"><code>lua_pcall</code></a> behaves exactly like <a href="#lua_call"><code>lua_call</code></a>.
+However, if there is any error,
+<a href="#lua_pcall"><code>lua_pcall</code></a> catches it,
+pushes a single value on the stack (the error object),
+and returns an error code.
+Like <a href="#lua_call"><code>lua_call</code></a>,
+<a href="#lua_pcall"><code>lua_pcall</code></a> always removes the function
+and its arguments from the stack.
+
+
+<p>
+If <code>msgh</code> is 0,
+then the error object returned on the stack
+is exactly the original error object.
+Otherwise, <code>msgh</code> is the stack index of a
+<em>message handler</em>.
+(This index cannot be a pseudo-index.)
+In case of runtime errors,
+this handler will be called with the error object
+and its return value will be the object
+returned on the stack by <a href="#lua_pcall"><code>lua_pcall</code></a>.
+
+
+<p>
+Typically, the message handler is used to add more debug
+information to the error object, such as a stack traceback.
+Such information cannot be gathered after the return of <a href="#lua_pcall"><code>lua_pcall</code></a>,
+since by then the stack has unwound.
+
+
+<p>
+The <a href="#lua_pcall"><code>lua_pcall</code></a> function returns one of the following status codes:
+<a href="#pdf-LUA_OK"><code>LUA_OK</code></a>, <a href="#pdf-LUA_ERRRUN"><code>LUA_ERRRUN</code></a>, <a href="#pdf-LUA_ERRMEM"><code>LUA_ERRMEM</code></a>, or <a href="#pdf-LUA_ERRERR"><code>LUA_ERRERR</code></a>.
+
+
+
+
+
+<hr><h3><a name="lua_pcallk"><code>lua_pcallk</code></a></h3><p>
+<span class="apii">[-(nargs + 1), +(nresults|1), &ndash;]</span>
+<pre>int lua_pcallk (lua_State *L,
+                int nargs,
+                int nresults,
+                int msgh,
+                lua_KContext ctx,
+                lua_KFunction k);</pre>
+
+<p>
+This function behaves exactly like <a href="#lua_pcall"><code>lua_pcall</code></a>,
+except that it allows the called function to yield (see <a href="#4.5">&sect;4.5</a>).
+
+
+
+
+
+<hr><h3><a name="lua_pop"><code>lua_pop</code></a></h3><p>
+<span class="apii">[-n, +0, <em>e</em>]</span>
+<pre>void lua_pop (lua_State *L, int n);</pre>
+
+<p>
+Pops <code>n</code> elements from the stack.
+It is implemented as a macro over <a href="#lua_settop"><code>lua_settop</code></a>.
+
+
+
+
+
+<hr><h3><a name="lua_pushboolean"><code>lua_pushboolean</code></a></h3><p>
+<span class="apii">[-0, +1, &ndash;]</span>
+<pre>void lua_pushboolean (lua_State *L, int b);</pre>
+
+<p>
+Pushes a boolean value with value <code>b</code> onto the stack.
+
+
+
+
+
+<hr><h3><a name="lua_pushcclosure"><code>lua_pushcclosure</code></a></h3><p>
+<span class="apii">[-n, +1, <em>m</em>]</span>
+<pre>void lua_pushcclosure (lua_State *L, lua_CFunction fn, int n);</pre>
+
+<p>
+Pushes a new C&nbsp;closure onto the stack.
+This function receives a pointer to a C&nbsp;function
+and pushes onto the stack a Lua value of type <code>function</code> that,
+when called, invokes the corresponding C&nbsp;function.
+The parameter <code>n</code> tells how many upvalues this function will have
+(see <a href="#4.2">&sect;4.2</a>).
+
+
+<p>
+Any function to be callable by Lua must
+follow the correct protocol to receive its parameters
+and return its results (see <a href="#lua_CFunction"><code>lua_CFunction</code></a>).
+
+
+<p>
+When a C&nbsp;function is created,
+it is possible to associate some values with it,
+the so called upvalues;
+these upvalues are then accessible to the function whenever it is called.
+This association is called a C&nbsp;closure (see <a href="#4.2">&sect;4.2</a>).
+To create a C&nbsp;closure,
+first the initial values for its upvalues must be pushed onto the stack.
+(When there are multiple upvalues, the first value is pushed first.)
+Then <a href="#lua_pushcclosure"><code>lua_pushcclosure</code></a>
+is called to create and push the C&nbsp;function onto the stack,
+with the argument <code>n</code> telling how many values will be
+associated with the function.
+<a href="#lua_pushcclosure"><code>lua_pushcclosure</code></a> also pops these values from the stack.
+
+
+<p>
+The maximum value for <code>n</code> is 255.
+
+
+<p>
+When <code>n</code> is zero,
+this function creates a <em>light C&nbsp;function</em>,
+which is just a pointer to the C&nbsp;function.
+In that case, it never raises a memory error.
+
+
+
+
+
+<hr><h3><a name="lua_pushcfunction"><code>lua_pushcfunction</code></a></h3><p>
+<span class="apii">[-0, +1, &ndash;]</span>
+<pre>void lua_pushcfunction (lua_State *L, lua_CFunction f);</pre>
+
+<p>
+Pushes a C&nbsp;function onto the stack.
+This function is equivalent to <a href="#lua_pushcclosure"><code>lua_pushcclosure</code></a> with no upvalues.
+
+
+
+
+
+<hr><h3><a name="lua_pushfstring"><code>lua_pushfstring</code></a></h3><p>
+<span class="apii">[-0, +1, <em>v</em>]</span>
+<pre>const char *lua_pushfstring (lua_State *L, const char *fmt, ...);</pre>
+
+<p>
+Pushes onto the stack a formatted string
+and returns a pointer to this string (see <a href="#4.1.3">&sect;4.1.3</a>).
+It is similar to the ISO&nbsp;C function <code>sprintf</code>,
+but has two important differences.
+First,
+you do not have to allocate space for the result;
+the result is a Lua string and Lua takes care of memory allocation
+(and deallocation, through garbage collection).
+Second,
+the conversion specifiers are quite restricted.
+There are no flags, widths, or precisions.
+The conversion specifiers can only be
+'<code>%%</code>' (inserts the character '<code>%</code>'),
+'<code>%s</code>' (inserts a zero-terminated string, with no size restrictions),
+'<code>%f</code>' (inserts a <a href="#lua_Number"><code>lua_Number</code></a>),
+'<code>%I</code>' (inserts a <a href="#lua_Integer"><code>lua_Integer</code></a>),
+'<code>%p</code>' (inserts a pointer),
+'<code>%d</code>' (inserts an <code>int</code>),
+'<code>%c</code>' (inserts an <code>int</code> as a one-byte character), and
+'<code>%U</code>' (inserts a <code>long int</code> as a UTF-8 byte sequence).
+
+
+<p>
+This function may raise errors due to memory overflow
+or an invalid conversion specifier.
+
+
+
+
+
+<hr><h3><a name="lua_pushglobaltable"><code>lua_pushglobaltable</code></a></h3><p>
+<span class="apii">[-0, +1, &ndash;]</span>
+<pre>void lua_pushglobaltable (lua_State *L);</pre>
+
+<p>
+Pushes the global environment onto the stack.
+
+
+
+
+
+<hr><h3><a name="lua_pushinteger"><code>lua_pushinteger</code></a></h3><p>
+<span class="apii">[-0, +1, &ndash;]</span>
+<pre>void lua_pushinteger (lua_State *L, lua_Integer n);</pre>
+
+<p>
+Pushes an integer with value <code>n</code> onto the stack.
+
+
+
+
+
+<hr><h3><a name="lua_pushlightuserdata"><code>lua_pushlightuserdata</code></a></h3><p>
+<span class="apii">[-0, +1, &ndash;]</span>
+<pre>void lua_pushlightuserdata (lua_State *L, void *p);</pre>
+
+<p>
+Pushes a light userdata onto the stack.
+
+
+<p>
+Userdata represent C&nbsp;values in Lua.
+A <em>light userdata</em> represents a pointer, a <code>void*</code>.
+It is a value (like a number):
+you do not create it, it has no individual metatable,
+and it is not collected (as it was never created).
+A light userdata is equal to "any"
+light userdata with the same C&nbsp;address.
+
+
+
+
+
+<hr><h3><a name="lua_pushliteral"><code>lua_pushliteral</code></a></h3><p>
+<span class="apii">[-0, +1, <em>m</em>]</span>
+<pre>const char *lua_pushliteral (lua_State *L, const char *s);</pre>
+
+<p>
+This macro is equivalent to <a href="#lua_pushstring"><code>lua_pushstring</code></a>,
+but should be used only when <code>s</code> is a literal string.
+(Lua may optimize this case.)
+
+
+
+
+
+<hr><h3><a name="lua_pushlstring"><code>lua_pushlstring</code></a></h3><p>
+<span class="apii">[-0, +1, <em>m</em>]</span>
+<pre>const char *lua_pushlstring (lua_State *L, const char *s, size_t len);</pre>
+
+<p>
+Pushes the string pointed to by <code>s</code> with size <code>len</code>
+onto the stack.
+Lua will make or reuse an internal copy of the given string,
+so the memory at <code>s</code> can be freed or reused immediately after
+the function returns.
+The string can contain any binary data,
+including embedded zeros.
+
+
+<p>
+Returns a pointer to the internal copy of the string (see <a href="#4.1.3">&sect;4.1.3</a>).
+
+
+
+
+
+<hr><h3><a name="lua_pushnil"><code>lua_pushnil</code></a></h3><p>
+<span class="apii">[-0, +1, &ndash;]</span>
+<pre>void lua_pushnil (lua_State *L);</pre>
+
+<p>
+Pushes a nil value onto the stack.
+
+
+
+
+
+<hr><h3><a name="lua_pushnumber"><code>lua_pushnumber</code></a></h3><p>
+<span class="apii">[-0, +1, &ndash;]</span>
+<pre>void lua_pushnumber (lua_State *L, lua_Number n);</pre>
+
+<p>
+Pushes a float with value <code>n</code> onto the stack.
+
+
+
+
+
+<hr><h3><a name="lua_pushstring"><code>lua_pushstring</code></a></h3><p>
+<span class="apii">[-0, +1, <em>m</em>]</span>
+<pre>const char *lua_pushstring (lua_State *L, const char *s);</pre>
+
+<p>
+Pushes the zero-terminated string pointed to by <code>s</code>
+onto the stack.
+Lua will make or reuse an internal copy of the given string,
+so the memory at <code>s</code> can be freed or reused immediately after
+the function returns.
+
+
+<p>
+Returns a pointer to the internal copy of the string (see <a href="#4.1.3">&sect;4.1.3</a>).
+
+
+<p>
+If <code>s</code> is <code>NULL</code>, pushes <b>nil</b> and returns <code>NULL</code>.
+
+
+
+
+
+<hr><h3><a name="lua_pushthread"><code>lua_pushthread</code></a></h3><p>
+<span class="apii">[-0, +1, &ndash;]</span>
+<pre>int lua_pushthread (lua_State *L);</pre>
+
+<p>
+Pushes the thread represented by <code>L</code> onto the stack.
+Returns 1 if this thread is the main thread of its state.
+
+
+
+
+
+<hr><h3><a name="lua_pushvalue"><code>lua_pushvalue</code></a></h3><p>
+<span class="apii">[-0, +1, &ndash;]</span>
+<pre>void lua_pushvalue (lua_State *L, int index);</pre>
+
+<p>
+Pushes a copy of the element at the given index
+onto the stack.
+
+
+
+
+
+<hr><h3><a name="lua_pushvfstring"><code>lua_pushvfstring</code></a></h3><p>
+<span class="apii">[-0, +1, <em>v</em>]</span>
+<pre>const char *lua_pushvfstring (lua_State *L,
+                              const char *fmt,
+                              va_list argp);</pre>
+
+<p>
+Equivalent to <a href="#lua_pushfstring"><code>lua_pushfstring</code></a>, except that it receives a <code>va_list</code>
+instead of a variable number of arguments.
+
+
+
+
+
+<hr><h3><a name="lua_rawequal"><code>lua_rawequal</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_rawequal (lua_State *L, int index1, int index2);</pre>
+
+<p>
+Returns 1 if the two values in indices <code>index1</code> and
+<code>index2</code> are primitively equal
+(that is, equal without calling the <code>__eq</code> metamethod).
+Otherwise returns&nbsp;0.
+Also returns&nbsp;0 if any of the indices are not valid.
+
+
+
+
+
+<hr><h3><a name="lua_rawget"><code>lua_rawget</code></a></h3><p>
+<span class="apii">[-1, +1, &ndash;]</span>
+<pre>int lua_rawget (lua_State *L, int index);</pre>
+
+<p>
+Similar to <a href="#lua_gettable"><code>lua_gettable</code></a>, but does a raw access
+(i.e., without metamethods).
+The value at <code>index</code> must be a table.
+
+
+
+
+
+<hr><h3><a name="lua_rawgeti"><code>lua_rawgeti</code></a></h3><p>
+<span class="apii">[-0, +1, &ndash;]</span>
+<pre>int lua_rawgeti (lua_State *L, int index, lua_Integer n);</pre>
+
+<p>
+Pushes onto the stack the value <code>t[n]</code>,
+where <code>t</code> is the table at the given index.
+The access is raw,
+that is, it does not use the <code>__index</code> metavalue.
+
+
+<p>
+Returns the type of the pushed value.
+
+
+
+
+
+<hr><h3><a name="lua_rawgetp"><code>lua_rawgetp</code></a></h3><p>
+<span class="apii">[-0, +1, &ndash;]</span>
+<pre>int lua_rawgetp (lua_State *L, int index, const void *p);</pre>
+
+<p>
+Pushes onto the stack the value <code>t[k]</code>,
+where <code>t</code> is the table at the given index and
+<code>k</code> is the pointer <code>p</code> represented as a light userdata.
+The access is raw;
+that is, it does not use the <code>__index</code> metavalue.
+
+
+<p>
+Returns the type of the pushed value.
+
+
+
+
+
+<hr><h3><a name="lua_rawlen"><code>lua_rawlen</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>lua_Unsigned lua_rawlen (lua_State *L, int index);</pre>
+
+<p>
+Returns the raw "length" of the value at the given index:
+for strings, this is the string length;
+for tables, this is the result of the length operator ('<code>#</code>')
+with no metamethods;
+for userdata, this is the size of the block of memory allocated
+for the userdata.
+For other values, this call returns&nbsp;0.
+
+
+
+
+
+<hr><h3><a name="lua_rawset"><code>lua_rawset</code></a></h3><p>
+<span class="apii">[-2, +0, <em>m</em>]</span>
+<pre>void lua_rawset (lua_State *L, int index);</pre>
+
+<p>
+Similar to <a href="#lua_settable"><code>lua_settable</code></a>, but does a raw assignment
+(i.e., without metamethods).
+The value at <code>index</code> must be a table.
+
+
+
+
+
+<hr><h3><a name="lua_rawseti"><code>lua_rawseti</code></a></h3><p>
+<span class="apii">[-1, +0, <em>m</em>]</span>
+<pre>void lua_rawseti (lua_State *L, int index, lua_Integer i);</pre>
+
+<p>
+Does the equivalent of <code>t[i] = v</code>,
+where <code>t</code> is the table at the given index
+and <code>v</code> is the value on the top of the stack.
+
+
+<p>
+This function pops the value from the stack.
+The assignment is raw,
+that is, it does not use the <code>__newindex</code> metavalue.
+
+
+
+
+
+<hr><h3><a name="lua_rawsetp"><code>lua_rawsetp</code></a></h3><p>
+<span class="apii">[-1, +0, <em>m</em>]</span>
+<pre>void lua_rawsetp (lua_State *L, int index, const void *p);</pre>
+
+<p>
+Does the equivalent of <code>t[p] = v</code>,
+where <code>t</code> is the table at the given index,
+<code>p</code> is encoded as a light userdata,
+and <code>v</code> is the value on the top of the stack.
+
+
+<p>
+This function pops the value from the stack.
+The assignment is raw,
+that is, it does not use the <code>__newindex</code> metavalue.
+
+
+
+
+
+<hr><h3><a name="lua_Reader"><code>lua_Reader</code></a></h3>
+<pre>typedef const char * (*lua_Reader) (lua_State *L,
+                                    void *data,
+                                    size_t *size);</pre>
+
+<p>
+The reader function used by <a href="#lua_load"><code>lua_load</code></a>.
+Every time <a href="#lua_load"><code>lua_load</code></a> needs another piece of the chunk,
+it calls the reader,
+passing along its <code>data</code> parameter.
+The reader must return a pointer to a block of memory
+with a new piece of the chunk
+and set <code>size</code> to the block size.
+The block must exist until the reader function is called again.
+To signal the end of the chunk,
+the reader must return <code>NULL</code> or set <code>size</code> to zero.
+The reader function may return pieces of any size greater than zero.
+
+
+
+
+
+<hr><h3><a name="lua_register"><code>lua_register</code></a></h3><p>
+<span class="apii">[-0, +0, <em>e</em>]</span>
+<pre>void lua_register (lua_State *L, const char *name, lua_CFunction f);</pre>
+
+<p>
+Sets the C&nbsp;function <code>f</code> as the new value of global <code>name</code>.
+It is defined as a macro:
+
+<pre>
+     #define lua_register(L,n,f) \
+            (lua_pushcfunction(L, f), lua_setglobal(L, n))
+</pre>
+
+
+
+
+<hr><h3><a name="lua_remove"><code>lua_remove</code></a></h3><p>
+<span class="apii">[-1, +0, &ndash;]</span>
+<pre>void lua_remove (lua_State *L, int index);</pre>
+
+<p>
+Removes the element at the given valid index,
+shifting down the elements above this index to fill the gap.
+This function cannot be called with a pseudo-index,
+because a pseudo-index is not an actual stack position.
+
+
+
+
+
+<hr><h3><a name="lua_replace"><code>lua_replace</code></a></h3><p>
+<span class="apii">[-1, +0, &ndash;]</span>
+<pre>void lua_replace (lua_State *L, int index);</pre>
+
+<p>
+Moves the top element into the given valid index
+without shifting any element
+(therefore replacing the value at that given index),
+and then pops the top element.
+
+
+
+
+
+<hr><h3><a name="lua_resetthread"><code>lua_resetthread</code></a></h3><p>
+<span class="apii">[-0, +?, &ndash;]</span>
+<pre>int lua_resetthread (lua_State *L);</pre>
+
+<p>
+This function is deprecated;
+it is equivalent to <a href="#lua_closethread"><code>lua_closethread</code></a> with
+<code>from</code> being <code>NULL</code>.
+
+
+
+
+
+<hr><h3><a name="lua_resume"><code>lua_resume</code></a></h3><p>
+<span class="apii">[-?, +?, &ndash;]</span>
+<pre>int lua_resume (lua_State *L, lua_State *from, int nargs,
+                          int *nresults);</pre>
+
+<p>
+Starts and resumes a coroutine in the given thread <code>L</code>.
+
+
+<p>
+To start a coroutine,
+you push the main function plus any arguments
+onto the empty stack of the thread.
+then you call <a href="#lua_resume"><code>lua_resume</code></a>,
+with <code>nargs</code> being the number of arguments.
+This call returns when the coroutine suspends or finishes its execution.
+When it returns,
+<code>*nresults</code> is updated and
+the top of the stack contains
+the <code>*nresults</code> values passed to <a href="#lua_yield"><code>lua_yield</code></a>
+or returned by the body function.
+<a href="#lua_resume"><code>lua_resume</code></a> returns
+<a href="#pdf-LUA_YIELD"><code>LUA_YIELD</code></a> if the coroutine yields,
+<a href="#pdf-LUA_OK"><code>LUA_OK</code></a> if the coroutine finishes its execution
+without errors,
+or an error code in case of errors (see <a href="#4.4.1">&sect;4.4.1</a>).
+In case of errors,
+the error object is on the top of the stack.
+
+
+<p>
+To resume a coroutine,
+you remove the <code>*nresults</code> yielded values from its stack,
+push the values to be passed as results from <code>yield</code>,
+and then call <a href="#lua_resume"><code>lua_resume</code></a>.
+
+
+<p>
+The parameter <code>from</code> represents the coroutine that is resuming <code>L</code>.
+If there is no such coroutine,
+this parameter can be <code>NULL</code>.
+
+
+
+
+
+<hr><h3><a name="lua_rotate"><code>lua_rotate</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>void lua_rotate (lua_State *L, int idx, int n);</pre>
+
+<p>
+Rotates the stack elements between the valid index <code>idx</code>
+and the top of the stack.
+The elements are rotated <code>n</code> positions in the direction of the top,
+for a positive <code>n</code>,
+or <code>-n</code> positions in the direction of the bottom,
+for a negative <code>n</code>.
+The absolute value of <code>n</code> must not be greater than the size
+of the slice being rotated.
+This function cannot be called with a pseudo-index,
+because a pseudo-index is not an actual stack position.
+
+
+
+
+
+<hr><h3><a name="lua_setallocf"><code>lua_setallocf</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>void lua_setallocf (lua_State *L, lua_Alloc f, void *ud);</pre>
+
+<p>
+Changes the allocator function of a given state to <code>f</code>
+with user data <code>ud</code>.
+
+
+
+
+
+<hr><h3><a name="lua_setfield"><code>lua_setfield</code></a></h3><p>
+<span class="apii">[-1, +0, <em>e</em>]</span>
+<pre>void lua_setfield (lua_State *L, int index, const char *k);</pre>
+
+<p>
+Does the equivalent to <code>t[k] = v</code>,
+where <code>t</code> is the value at the given index
+and <code>v</code> is the value on the top of the stack.
+
+
+<p>
+This function pops the value from the stack.
+As in Lua, this function may trigger a metamethod
+for the "newindex" event (see <a href="#2.4">&sect;2.4</a>).
+
+
+
+
+
+<hr><h3><a name="lua_setglobal"><code>lua_setglobal</code></a></h3><p>
+<span class="apii">[-1, +0, <em>e</em>]</span>
+<pre>void lua_setglobal (lua_State *L, const char *name);</pre>
+
+<p>
+Pops a value from the stack and
+sets it as the new value of global <code>name</code>.
+
+
+
+
+
+<hr><h3><a name="lua_seti"><code>lua_seti</code></a></h3><p>
+<span class="apii">[-1, +0, <em>e</em>]</span>
+<pre>void lua_seti (lua_State *L, int index, lua_Integer n);</pre>
+
+<p>
+Does the equivalent to <code>t[n] = v</code>,
+where <code>t</code> is the value at the given index
+and <code>v</code> is the value on the top of the stack.
+
+
+<p>
+This function pops the value from the stack.
+As in Lua, this function may trigger a metamethod
+for the "newindex" event (see <a href="#2.4">&sect;2.4</a>).
+
+
+
+
+
+<hr><h3><a name="lua_setiuservalue"><code>lua_setiuservalue</code></a></h3><p>
+<span class="apii">[-1, +0, &ndash;]</span>
+<pre>int lua_setiuservalue (lua_State *L, int index, int n);</pre>
+
+<p>
+Pops a value from the stack and sets it as
+the new <code>n</code>-th user value associated to the
+full userdata at the given index.
+Returns 0 if the userdata does not have that value.
+
+
+
+
+
+<hr><h3><a name="lua_setmetatable"><code>lua_setmetatable</code></a></h3><p>
+<span class="apii">[-1, +0, &ndash;]</span>
+<pre>int lua_setmetatable (lua_State *L, int index);</pre>
+
+<p>
+Pops a table or <b>nil</b> from the stack and
+sets that value as the new metatable for the value at the given index.
+(<b>nil</b> means no metatable.)
+
+
+<p>
+(For historical reasons, this function returns an <code>int</code>,
+which now is always 1.)
+
+
+
+
+
+<hr><h3><a name="lua_settable"><code>lua_settable</code></a></h3><p>
+<span class="apii">[-2, +0, <em>e</em>]</span>
+<pre>void lua_settable (lua_State *L, int index);</pre>
+
+<p>
+Does the equivalent to <code>t[k] = v</code>,
+where <code>t</code> is the value at the given index,
+<code>v</code> is the value on the top of the stack,
+and <code>k</code> is the value just below the top.
+
+
+<p>
+This function pops both the key and the value from the stack.
+As in Lua, this function may trigger a metamethod
+for the "newindex" event (see <a href="#2.4">&sect;2.4</a>).
+
+
+
+
+
+<hr><h3><a name="lua_settop"><code>lua_settop</code></a></h3><p>
+<span class="apii">[-?, +?, <em>e</em>]</span>
+<pre>void lua_settop (lua_State *L, int index);</pre>
+
+<p>
+Accepts any index, or&nbsp;0,
+and sets the stack top to this index.
+If the new top is greater than the old one,
+then the new elements are filled with <b>nil</b>.
+If <code>index</code> is&nbsp;0, then all stack elements are removed.
+
+
+<p>
+This function can run arbitrary code when removing an index
+marked as to-be-closed from the stack.
+
+
+
+
+
+<hr><h3><a name="lua_setwarnf"><code>lua_setwarnf</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>void lua_setwarnf (lua_State *L, lua_WarnFunction f, void *ud);</pre>
+
+<p>
+Sets the warning function to be used by Lua to emit warnings
+(see <a href="#lua_WarnFunction"><code>lua_WarnFunction</code></a>).
+The <code>ud</code> parameter sets the value <code>ud</code> passed to
+the warning function.
+
+
+
+
+
+<hr><h3><a name="lua_State"><code>lua_State</code></a></h3>
+<pre>typedef struct lua_State lua_State;</pre>
+
+<p>
+An opaque structure that points to a thread and indirectly
+(through the thread) to the whole state of a Lua interpreter.
+The Lua library is fully reentrant:
+it has no global variables.
+All information about a state is accessible through this structure.
+
+
+<p>
+A pointer to this structure must be passed as the first argument to
+every function in the library, except to <a href="#lua_newstate"><code>lua_newstate</code></a>,
+which creates a Lua state from scratch.
+
+
+
+
+
+<hr><h3><a name="lua_status"><code>lua_status</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_status (lua_State *L);</pre>
+
+<p>
+Returns the status of the thread <code>L</code>.
+
+
+<p>
+The status can be <a href="#pdf-LUA_OK"><code>LUA_OK</code></a> for a normal thread,
+an error code if the thread finished the execution
+of a <a href="#lua_resume"><code>lua_resume</code></a> with an error,
+or <a href="#pdf-LUA_YIELD"><code>LUA_YIELD</code></a> if the thread is suspended.
+
+
+<p>
+You can call functions only in threads with status <a href="#pdf-LUA_OK"><code>LUA_OK</code></a>.
+You can resume threads with status <a href="#pdf-LUA_OK"><code>LUA_OK</code></a>
+(to start a new coroutine) or <a href="#pdf-LUA_YIELD"><code>LUA_YIELD</code></a>
+(to resume a coroutine).
+
+
+
+
+
+<hr><h3><a name="lua_stringtonumber"><code>lua_stringtonumber</code></a></h3><p>
+<span class="apii">[-0, +1, &ndash;]</span>
+<pre>size_t lua_stringtonumber (lua_State *L, const char *s);</pre>
+
+<p>
+Converts the zero-terminated string <code>s</code> to a number,
+pushes that number into the stack,
+and returns the total size of the string,
+that is, its length plus one.
+The conversion can result in an integer or a float,
+according to the lexical conventions of Lua (see <a href="#3.1">&sect;3.1</a>).
+The string may have leading and trailing whitespaces and a sign.
+If the string is not a valid numeral,
+returns 0 and pushes nothing.
+(Note that the result can be used as a boolean,
+true if the conversion succeeds.)
+
+
+
+
+
+<hr><h3><a name="lua_toboolean"><code>lua_toboolean</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_toboolean (lua_State *L, int index);</pre>
+
+<p>
+Converts the Lua value at the given index to a C&nbsp;boolean
+value (0&nbsp;or&nbsp;1).
+Like all tests in Lua,
+<a href="#lua_toboolean"><code>lua_toboolean</code></a> returns true for any Lua value
+different from <b>false</b> and <b>nil</b>;
+otherwise it returns false.
+(If you want to accept only actual boolean values,
+use <a href="#lua_isboolean"><code>lua_isboolean</code></a> to test the value's type.)
+
+
+
+
+
+<hr><h3><a name="lua_tocfunction"><code>lua_tocfunction</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>lua_CFunction lua_tocfunction (lua_State *L, int index);</pre>
+
+<p>
+Converts a value at the given index to a C&nbsp;function.
+That value must be a C&nbsp;function;
+otherwise, returns <code>NULL</code>.
+
+
+
+
+
+<hr><h3><a name="lua_toclose"><code>lua_toclose</code></a></h3><p>
+<span class="apii">[-0, +0, <em>m</em>]</span>
+<pre>void lua_toclose (lua_State *L, int index);</pre>
+
+<p>
+Marks the given index in the stack as a
+to-be-closed slot (see <a href="#3.3.8">&sect;3.3.8</a>).
+Like a to-be-closed variable in Lua,
+the value at that slot in the stack will be closed
+when it goes out of scope.
+Here, in the context of a C function,
+to go out of scope means that the running function returns to Lua,
+or there is an error,
+or the slot is removed from the stack through
+<a href="#lua_settop"><code>lua_settop</code></a> or <a href="#lua_pop"><code>lua_pop</code></a>,
+or there is a call to <a href="#lua_closeslot"><code>lua_closeslot</code></a>.
+A slot marked as to-be-closed should not be removed from the stack
+by any other function in the API except <a href="#lua_settop"><code>lua_settop</code></a> or <a href="#lua_pop"><code>lua_pop</code></a>,
+unless previously deactivated by <a href="#lua_closeslot"><code>lua_closeslot</code></a>.
+
+
+<p>
+This function should not be called for an index
+that is equal to or below an active to-be-closed slot.
+
+
+<p>
+Note that, both in case of errors and of a regular return,
+by the time the <code>__close</code> metamethod runs,
+the C&nbsp;stack was already unwound,
+so that any automatic C&nbsp;variable declared in the calling function
+(e.g., a buffer) will be out of scope.
+
+
+
+
+
+<hr><h3><a name="lua_tointeger"><code>lua_tointeger</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>lua_Integer lua_tointeger (lua_State *L, int index);</pre>
+
+<p>
+Equivalent to <a href="#lua_tointegerx"><code>lua_tointegerx</code></a> with <code>isnum</code> equal to <code>NULL</code>.
+
+
+
+
+
+<hr><h3><a name="lua_tointegerx"><code>lua_tointegerx</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>lua_Integer lua_tointegerx (lua_State *L, int index, int *isnum);</pre>
+
+<p>
+Converts the Lua value at the given index
+to the signed integral type <a href="#lua_Integer"><code>lua_Integer</code></a>.
+The Lua value must be an integer,
+or a number or string convertible to an integer (see <a href="#3.4.3">&sect;3.4.3</a>);
+otherwise, <code>lua_tointegerx</code> returns&nbsp;0.
+
+
+<p>
+If <code>isnum</code> is not <code>NULL</code>,
+its referent is assigned a boolean value that
+indicates whether the operation succeeded.
+
+
+
+
+
+<hr><h3><a name="lua_tolstring"><code>lua_tolstring</code></a></h3><p>
+<span class="apii">[-0, +0, <em>m</em>]</span>
+<pre>const char *lua_tolstring (lua_State *L, int index, size_t *len);</pre>
+
+<p>
+Converts the Lua value at the given index to a C&nbsp;string.
+If <code>len</code> is not <code>NULL</code>,
+it sets <code>*len</code> with the string length.
+The Lua value must be a string or a number;
+otherwise, the function returns <code>NULL</code>.
+If the value is a number,
+then <code>lua_tolstring</code> also
+<em>changes the actual value in the stack to a string</em>.
+(This change confuses <a href="#lua_next"><code>lua_next</code></a>
+when <code>lua_tolstring</code> is applied to keys during a table traversal.)
+
+
+<p>
+<code>lua_tolstring</code> returns a pointer
+to a string inside the Lua state (see <a href="#4.1.3">&sect;4.1.3</a>).
+This string always has a zero ('<code>\0</code>')
+after its last character (as in&nbsp;C),
+but can contain other zeros in its body.
+
+
+
+
+
+<hr><h3><a name="lua_tonumber"><code>lua_tonumber</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>lua_Number lua_tonumber (lua_State *L, int index);</pre>
+
+<p>
+Equivalent to <a href="#lua_tonumberx"><code>lua_tonumberx</code></a> with <code>isnum</code> equal to <code>NULL</code>.
+
+
+
+
+
+<hr><h3><a name="lua_tonumberx"><code>lua_tonumberx</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>lua_Number lua_tonumberx (lua_State *L, int index, int *isnum);</pre>
+
+<p>
+Converts the Lua value at the given index
+to the C&nbsp;type <a href="#lua_Number"><code>lua_Number</code></a> (see <a href="#lua_Number"><code>lua_Number</code></a>).
+The Lua value must be a number or a string convertible to a number
+(see <a href="#3.4.3">&sect;3.4.3</a>);
+otherwise, <a href="#lua_tonumberx"><code>lua_tonumberx</code></a> returns&nbsp;0.
+
+
+<p>
+If <code>isnum</code> is not <code>NULL</code>,
+its referent is assigned a boolean value that
+indicates whether the operation succeeded.
+
+
+
+
+
+<hr><h3><a name="lua_topointer"><code>lua_topointer</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>const void *lua_topointer (lua_State *L, int index);</pre>
+
+<p>
+Converts the value at the given index to a generic
+C&nbsp;pointer (<code>void*</code>).
+The value can be a userdata, a table, a thread, a string, or a function;
+otherwise, <code>lua_topointer</code> returns <code>NULL</code>.
+Different objects will give different pointers.
+There is no way to convert the pointer back to its original value.
+
+
+<p>
+Typically this function is used only for hashing and debug information.
+
+
+
+
+
+<hr><h3><a name="lua_tostring"><code>lua_tostring</code></a></h3><p>
+<span class="apii">[-0, +0, <em>m</em>]</span>
+<pre>const char *lua_tostring (lua_State *L, int index);</pre>
+
+<p>
+Equivalent to <a href="#lua_tolstring"><code>lua_tolstring</code></a> with <code>len</code> equal to <code>NULL</code>.
+
+
+
+
+
+<hr><h3><a name="lua_tothread"><code>lua_tothread</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>lua_State *lua_tothread (lua_State *L, int index);</pre>
+
+<p>
+Converts the value at the given index to a Lua thread
+(represented as <code>lua_State*</code>).
+This value must be a thread;
+otherwise, the function returns <code>NULL</code>.
+
+
+
+
+
+<hr><h3><a name="lua_touserdata"><code>lua_touserdata</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>void *lua_touserdata (lua_State *L, int index);</pre>
+
+<p>
+If the value at the given index is a full userdata,
+returns its memory-block address.
+If the value is a light userdata,
+returns its value (a pointer).
+Otherwise, returns <code>NULL</code>.
+
+
+
+
+
+<hr><h3><a name="lua_type"><code>lua_type</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_type (lua_State *L, int index);</pre>
+
+<p>
+Returns the type of the value in the given valid index,
+or <code>LUA_TNONE</code> for a non-valid but acceptable index.
+The types returned by <a href="#lua_type"><code>lua_type</code></a> are coded by the following constants
+defined in <code>lua.h</code>:
+<a name="pdf-LUA_TNIL"><code>LUA_TNIL</code></a>,
+<a name="pdf-LUA_TNUMBER"><code>LUA_TNUMBER</code></a>,
+<a name="pdf-LUA_TBOOLEAN"><code>LUA_TBOOLEAN</code></a>,
+<a name="pdf-LUA_TSTRING"><code>LUA_TSTRING</code></a>,
+<a name="pdf-LUA_TTABLE"><code>LUA_TTABLE</code></a>,
+<a name="pdf-LUA_TFUNCTION"><code>LUA_TFUNCTION</code></a>,
+<a name="pdf-LUA_TUSERDATA"><code>LUA_TUSERDATA</code></a>,
+<a name="pdf-LUA_TTHREAD"><code>LUA_TTHREAD</code></a>,
+and
+<a name="pdf-LUA_TLIGHTUSERDATA"><code>LUA_TLIGHTUSERDATA</code></a>.
+
+
+
+
+
+<hr><h3><a name="lua_typename"><code>lua_typename</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>const char *lua_typename (lua_State *L, int tp);</pre>
+
+<p>
+Returns the name of the type encoded by the value <code>tp</code>,
+which must be one the values returned by <a href="#lua_type"><code>lua_type</code></a>.
+
+
+
+
+
+<hr><h3><a name="lua_Unsigned"><code>lua_Unsigned</code></a></h3>
+<pre>typedef ... lua_Unsigned;</pre>
+
+<p>
+The unsigned version of <a href="#lua_Integer"><code>lua_Integer</code></a>.
+
+
+
+
+
+<hr><h3><a name="lua_upvalueindex"><code>lua_upvalueindex</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_upvalueindex (int i);</pre>
+
+<p>
+Returns the pseudo-index that represents the <code>i</code>-th upvalue of
+the running function (see <a href="#4.2">&sect;4.2</a>).
+<code>i</code> must be in the range <em>[1,256]</em>.
+
+
+
+
+
+<hr><h3><a name="lua_version"><code>lua_version</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>lua_Number lua_version (lua_State *L);</pre>
+
+<p>
+Returns the version number of this core.
+
+
+
+
+
+<hr><h3><a name="lua_WarnFunction"><code>lua_WarnFunction</code></a></h3>
+<pre>typedef void (*lua_WarnFunction) (void *ud, const char *msg, int tocont);</pre>
+
+<p>
+The type of warning functions, called by Lua to emit warnings.
+The first parameter is an opaque pointer
+set by <a href="#lua_setwarnf"><code>lua_setwarnf</code></a>.
+The second parameter is the warning message.
+The third parameter is a boolean that
+indicates whether the message is
+to be continued by the message in the next call.
+
+
+<p>
+See <a href="#pdf-warn"><code>warn</code></a> for more details about warnings.
+
+
+
+
+
+<hr><h3><a name="lua_warning"><code>lua_warning</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>void lua_warning (lua_State *L, const char *msg, int tocont);</pre>
+
+<p>
+Emits a warning with the given message.
+A message in a call with <code>tocont</code> true should be
+continued in another call to this function.
+
+
+<p>
+See <a href="#pdf-warn"><code>warn</code></a> for more details about warnings.
+
+
+
+
+
+<hr><h3><a name="lua_Writer"><code>lua_Writer</code></a></h3>
+<pre>typedef int (*lua_Writer) (lua_State *L,
+                           const void* p,
+                           size_t sz,
+                           void* ud);</pre>
+
+<p>
+The type of the writer function used by <a href="#lua_dump"><code>lua_dump</code></a>.
+Every time <a href="#lua_dump"><code>lua_dump</code></a> produces another piece of chunk,
+it calls the writer,
+passing along the buffer to be written (<code>p</code>),
+its size (<code>sz</code>),
+and the <code>ud</code> parameter supplied to <a href="#lua_dump"><code>lua_dump</code></a>.
+
+
+<p>
+The writer returns an error code:
+0&nbsp;means no errors;
+any other value means an error and stops <a href="#lua_dump"><code>lua_dump</code></a> from
+calling the writer again.
+
+
+
+
+
+<hr><h3><a name="lua_xmove"><code>lua_xmove</code></a></h3><p>
+<span class="apii">[-?, +?, &ndash;]</span>
+<pre>void lua_xmove (lua_State *from, lua_State *to, int n);</pre>
+
+<p>
+Exchange values between different threads of the same state.
+
+
+<p>
+This function pops <code>n</code> values from the stack <code>from</code>,
+and pushes them onto the stack <code>to</code>.
+
+
+
+
+
+<hr><h3><a name="lua_yield"><code>lua_yield</code></a></h3><p>
+<span class="apii">[-?, +?, <em>v</em>]</span>
+<pre>int lua_yield (lua_State *L, int nresults);</pre>
+
+<p>
+This function is equivalent to <a href="#lua_yieldk"><code>lua_yieldk</code></a>,
+but it has no continuation (see <a href="#4.5">&sect;4.5</a>).
+Therefore, when the thread resumes,
+it continues the function that called
+the function calling <code>lua_yield</code>.
+To avoid surprises,
+this function should be called only in a tail call.
+
+
+
+
+
+<hr><h3><a name="lua_yieldk"><code>lua_yieldk</code></a></h3><p>
+<span class="apii">[-?, +?, <em>v</em>]</span>
+<pre>int lua_yieldk (lua_State *L,
+                int nresults,
+                lua_KContext ctx,
+                lua_KFunction k);</pre>
+
+<p>
+Yields a coroutine (thread).
+
+
+<p>
+When a C&nbsp;function calls <a href="#lua_yieldk"><code>lua_yieldk</code></a>,
+the running coroutine suspends its execution,
+and the call to <a href="#lua_resume"><code>lua_resume</code></a> that started this coroutine returns.
+The parameter <code>nresults</code> is the number of values from the stack
+that will be passed as results to <a href="#lua_resume"><code>lua_resume</code></a>.
+
+
+<p>
+When the coroutine is resumed again,
+Lua calls the given continuation function <code>k</code> to continue
+the execution of the C&nbsp;function that yielded (see <a href="#4.5">&sect;4.5</a>).
+This continuation function receives the same stack
+from the previous function,
+with the <code>n</code> results removed and
+replaced by the arguments passed to <a href="#lua_resume"><code>lua_resume</code></a>.
+Moreover,
+the continuation function receives the value <code>ctx</code>
+that was passed to <a href="#lua_yieldk"><code>lua_yieldk</code></a>.
+
+
+<p>
+Usually, this function does not return;
+when the coroutine eventually resumes,
+it continues executing the continuation function.
+However, there is one special case,
+which is when this function is called
+from inside a line or a count hook (see <a href="#4.7">&sect;4.7</a>).
+In that case, <code>lua_yieldk</code> should be called with no continuation
+(probably in the form of <a href="#lua_yield"><code>lua_yield</code></a>) and no results,
+and the hook should return immediately after the call.
+Lua will yield and,
+when the coroutine resumes again,
+it will continue the normal execution
+of the (Lua) function that triggered the hook.
+
+
+<p>
+This function can raise an error if it is called from a thread
+with a pending C call with no continuation function
+(what is called a <em>C-call boundary</em>),
+or it is called from a thread that is not running inside a resume
+(typically the main thread).
+
+
+
+
+
+
+
+<h2>4.7 &ndash; <a name="4.7">The Debug Interface</a></h2>
+
+<p>
+Lua has no built-in debugging facilities.
+Instead, it offers a special interface
+by means of functions and <em>hooks</em>.
+This interface allows the construction of different
+kinds of debuggers, profilers, and other tools
+that need "inside information" from the interpreter.
+
+
+
+<hr><h3><a name="lua_Debug"><code>lua_Debug</code></a></h3>
+<pre>typedef struct lua_Debug {
+  int event;
+  const char *name;           /* (n) */
+  const char *namewhat;       /* (n) */
+  const char *what;           /* (S) */
+  const char *source;         /* (S) */
+  size_t srclen;              /* (S) */
+  int currentline;            /* (l) */
+  int linedefined;            /* (S) */
+  int lastlinedefined;        /* (S) */
+  unsigned char nups;         /* (u) number of upvalues */
+  unsigned char nparams;      /* (u) number of parameters */
+  char isvararg;              /* (u) */
+  char istailcall;            /* (t) */
+  unsigned short ftransfer;   /* (r) index of first value transferred */
+  unsigned short ntransfer;   /* (r) number of transferred values */
+  char short_src[LUA_IDSIZE]; /* (S) */
+  /* private part */
+  <em>other fields</em>
+} lua_Debug;</pre>
+
+<p>
+A structure used to carry different pieces of
+information about a function or an activation record.
+<a href="#lua_getstack"><code>lua_getstack</code></a> fills only the private part
+of this structure, for later use.
+To fill the other fields of <a href="#lua_Debug"><code>lua_Debug</code></a> with useful information,
+you must call <a href="#lua_getinfo"><code>lua_getinfo</code></a> with an appropriate parameter.
+(Specifically, to get a field,
+you must add the letter between parentheses in the field's comment
+to the parameter <code>what</code> of <a href="#lua_getinfo"><code>lua_getinfo</code></a>.)
+
+
+<p>
+The fields of <a href="#lua_Debug"><code>lua_Debug</code></a> have the following meaning:
+
+<ul>
+
+<li><b><code>source</code>: </b>
+the source of the chunk that created the function.
+If <code>source</code> starts with a '<code>@</code>',
+it means that the function was defined in a file where
+the file name follows the '<code>@</code>'.
+If <code>source</code> starts with a '<code>=</code>',
+the remainder of its contents describes the source in a user-dependent manner.
+Otherwise,
+the function was defined in a string where
+<code>source</code> is that string.
+</li>
+
+<li><b><code>srclen</code>: </b>
+The length of the string <code>source</code>.
+</li>
+
+<li><b><code>short_src</code>: </b>
+a "printable" version of <code>source</code>, to be used in error messages.
+</li>
+
+<li><b><code>linedefined</code>: </b>
+the line number where the definition of the function starts.
+</li>
+
+<li><b><code>lastlinedefined</code>: </b>
+the line number where the definition of the function ends.
+</li>
+
+<li><b><code>what</code>: </b>
+the string <code>"Lua"</code> if the function is a Lua function,
+<code>"C"</code> if it is a C&nbsp;function,
+<code>"main"</code> if it is the main part of a chunk.
+</li>
+
+<li><b><code>currentline</code>: </b>
+the current line where the given function is executing.
+When no line information is available,
+<code>currentline</code> is set to -1.
+</li>
+
+<li><b><code>name</code>: </b>
+a reasonable name for the given function.
+Because functions in Lua are first-class values,
+they do not have a fixed name:
+some functions can be the value of multiple global variables,
+while others can be stored only in a table field.
+The <code>lua_getinfo</code> function checks how the function was
+called to find a suitable name.
+If it cannot find a name,
+then <code>name</code> is set to <code>NULL</code>.
+</li>
+
+<li><b><code>namewhat</code>: </b>
+explains the <code>name</code> field.
+The value of <code>namewhat</code> can be
+<code>"global"</code>, <code>"local"</code>, <code>"method"</code>,
+<code>"field"</code>, <code>"upvalue"</code>, or <code>""</code> (the empty string),
+according to how the function was called.
+(Lua uses the empty string when no other option seems to apply.)
+</li>
+
+<li><b><code>istailcall</code>: </b>
+true if this function invocation was called by a tail call.
+In this case, the caller of this level is not in the stack.
+</li>
+
+<li><b><code>nups</code>: </b>
+the number of upvalues of the function.
+</li>
+
+<li><b><code>nparams</code>: </b>
+the number of parameters of the function
+(always 0&nbsp;for C&nbsp;functions).
+</li>
+
+<li><b><code>isvararg</code>: </b>
+true if the function is a variadic function
+(always true for C&nbsp;functions).
+</li>
+
+<li><b><code>ftransfer</code>: </b>
+the index in the stack of the first value being "transferred",
+that is, parameters in a call or return values in a return.
+(The other values are in consecutive indices.)
+Using this index, you can access and modify these values
+through <a href="#lua_getlocal"><code>lua_getlocal</code></a> and <a href="#lua_setlocal"><code>lua_setlocal</code></a>.
+This field is only meaningful during a
+call hook, denoting the first parameter,
+or a return hook, denoting the first value being returned.
+(For call hooks, this value is always 1.)
+</li>
+
+<li><b><code>ntransfer</code>: </b>
+The number of values being transferred (see previous item).
+(For calls of Lua functions,
+this value is always equal to <code>nparams</code>.)
+</li>
+
+</ul>
+
+
+
+
+<hr><h3><a name="lua_gethook"><code>lua_gethook</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>lua_Hook lua_gethook (lua_State *L);</pre>
+
+<p>
+Returns the current hook function.
+
+
+
+
+
+<hr><h3><a name="lua_gethookcount"><code>lua_gethookcount</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_gethookcount (lua_State *L);</pre>
+
+<p>
+Returns the current hook count.
+
+
+
+
+
+<hr><h3><a name="lua_gethookmask"><code>lua_gethookmask</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_gethookmask (lua_State *L);</pre>
+
+<p>
+Returns the current hook mask.
+
+
+
+
+
+<hr><h3><a name="lua_getinfo"><code>lua_getinfo</code></a></h3><p>
+<span class="apii">[-(0|1), +(0|1|2), <em>m</em>]</span>
+<pre>int lua_getinfo (lua_State *L, const char *what, lua_Debug *ar);</pre>
+
+<p>
+Gets information about a specific function or function invocation.
+
+
+<p>
+To get information about a function invocation,
+the parameter <code>ar</code> must be a valid activation record that was
+filled by a previous call to <a href="#lua_getstack"><code>lua_getstack</code></a> or
+given as argument to a hook (see <a href="#lua_Hook"><code>lua_Hook</code></a>).
+
+
+<p>
+To get information about a function, you push it onto the stack
+and start the <code>what</code> string with the character '<code>&gt;</code>'.
+(In that case,
+<code>lua_getinfo</code> pops the function from the top of the stack.)
+For instance, to know in which line a function <code>f</code> was defined,
+you can write the following code:
+
+<pre>
+     lua_Debug ar;
+     lua_getglobal(L, "f");  /* get global 'f' */
+     lua_getinfo(L, "&gt;S", &amp;ar);
+     printf("%d\n", ar.linedefined);
+</pre>
+
+<p>
+Each character in the string <code>what</code>
+selects some fields of the structure <code>ar</code> to be filled or
+a value to be pushed on the stack.
+(These characters are also documented in the declaration of
+the structure <a href="#lua_Debug"><code>lua_Debug</code></a>,
+between parentheses in the comments following each field.)
+
+<ul>
+
+<li><b>'<code>f</code>': </b>
+pushes onto the stack the function that is
+running at the given level;
+</li>
+
+<li><b>'<code>l</code>': </b> fills in the field <code>currentline</code>;
+</li>
+
+<li><b>'<code>n</code>': </b> fills in the fields <code>name</code> and <code>namewhat</code>;
+</li>
+
+<li><b>'<code>r</code>': </b> fills in the fields <code>ftransfer</code> and <code>ntransfer</code>;
+</li>
+
+<li><b>'<code>S</code>': </b>
+fills in the fields <code>source</code>, <code>short_src</code>,
+<code>linedefined</code>, <code>lastlinedefined</code>, and <code>what</code>;
+</li>
+
+<li><b>'<code>t</code>': </b> fills in the field <code>istailcall</code>;
+</li>
+
+<li><b>'<code>u</code>': </b> fills in the fields
+<code>nups</code>, <code>nparams</code>, and <code>isvararg</code>;
+</li>
+
+<li><b>'<code>L</code>': </b>
+pushes onto the stack a table whose indices are
+the lines on the function with some associated code,
+that is, the lines where you can put a break point.
+(Lines with no code include empty lines and comments.)
+If this option is given together with option '<code>f</code>',
+its table is pushed after the function.
+This is the only option that can raise a memory error.
+</li>
+
+</ul>
+
+<p>
+This function returns 0 to signal an invalid option in <code>what</code>;
+even then the valid options are handled correctly.
+
+
+
+
+
+<hr><h3><a name="lua_getlocal"><code>lua_getlocal</code></a></h3><p>
+<span class="apii">[-0, +(0|1), &ndash;]</span>
+<pre>const char *lua_getlocal (lua_State *L, const lua_Debug *ar, int n);</pre>
+
+<p>
+Gets information about a local variable or a temporary value
+of a given activation record or a given function.
+
+
+<p>
+In the first case,
+the parameter <code>ar</code> must be a valid activation record that was
+filled by a previous call to <a href="#lua_getstack"><code>lua_getstack</code></a> or
+given as argument to a hook (see <a href="#lua_Hook"><code>lua_Hook</code></a>).
+The index <code>n</code> selects which local variable to inspect;
+see <a href="#pdf-debug.getlocal"><code>debug.getlocal</code></a> for details about variable indices
+and names.
+
+
+<p>
+<a href="#lua_getlocal"><code>lua_getlocal</code></a> pushes the variable's value onto the stack
+and returns its name.
+
+
+<p>
+In the second case, <code>ar</code> must be <code>NULL</code> and the function
+to be inspected must be on the top of the stack.
+In this case, only parameters of Lua functions are visible
+(as there is no information about what variables are active)
+and no values are pushed onto the stack.
+
+
+<p>
+Returns <code>NULL</code> (and pushes nothing)
+when the index is greater than
+the number of active local variables.
+
+
+
+
+
+<hr><h3><a name="lua_getstack"><code>lua_getstack</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_getstack (lua_State *L, int level, lua_Debug *ar);</pre>
+
+<p>
+Gets information about the interpreter runtime stack.
+
+
+<p>
+This function fills parts of a <a href="#lua_Debug"><code>lua_Debug</code></a> structure with
+an identification of the <em>activation record</em>
+of the function executing at a given level.
+Level&nbsp;0 is the current running function,
+whereas level <em>n+1</em> is the function that has called level <em>n</em>
+(except for tail calls, which do not count in the stack).
+When called with a level greater than the stack depth,
+<a href="#lua_getstack"><code>lua_getstack</code></a> returns 0;
+otherwise it returns 1.
+
+
+
+
+
+<hr><h3><a name="lua_getupvalue"><code>lua_getupvalue</code></a></h3><p>
+<span class="apii">[-0, +(0|1), &ndash;]</span>
+<pre>const char *lua_getupvalue (lua_State *L, int funcindex, int n);</pre>
+
+<p>
+Gets information about the <code>n</code>-th upvalue
+of the closure at index <code>funcindex</code>.
+It pushes the upvalue's value onto the stack
+and returns its name.
+Returns <code>NULL</code> (and pushes nothing)
+when the index <code>n</code> is greater than the number of upvalues.
+
+
+<p>
+See <a href="#pdf-debug.getupvalue"><code>debug.getupvalue</code></a> for more information about upvalues.
+
+
+
+
+
+<hr><h3><a name="lua_Hook"><code>lua_Hook</code></a></h3>
+<pre>typedef void (*lua_Hook) (lua_State *L, lua_Debug *ar);</pre>
+
+<p>
+Type for debugging hook functions.
+
+
+<p>
+Whenever a hook is called, its <code>ar</code> argument has its field
+<code>event</code> set to the specific event that triggered the hook.
+Lua identifies these events with the following constants:
+<a name="pdf-LUA_HOOKCALL"><code>LUA_HOOKCALL</code></a>, <a name="pdf-LUA_HOOKRET"><code>LUA_HOOKRET</code></a>,
+<a name="pdf-LUA_HOOKTAILCALL"><code>LUA_HOOKTAILCALL</code></a>, <a name="pdf-LUA_HOOKLINE"><code>LUA_HOOKLINE</code></a>,
+and <a name="pdf-LUA_HOOKCOUNT"><code>LUA_HOOKCOUNT</code></a>.
+Moreover, for line events, the field <code>currentline</code> is also set.
+To get the value of any other field in <code>ar</code>,
+the hook must call <a href="#lua_getinfo"><code>lua_getinfo</code></a>.
+
+
+<p>
+For call events, <code>event</code> can be <code>LUA_HOOKCALL</code>,
+the normal value, or <code>LUA_HOOKTAILCALL</code>, for a tail call;
+in this case, there will be no corresponding return event.
+
+
+<p>
+While Lua is running a hook, it disables other calls to hooks.
+Therefore, if a hook calls back Lua to execute a function or a chunk,
+this execution occurs without any calls to hooks.
+
+
+<p>
+Hook functions cannot have continuations,
+that is, they cannot call <a href="#lua_yieldk"><code>lua_yieldk</code></a>,
+<a href="#lua_pcallk"><code>lua_pcallk</code></a>, or <a href="#lua_callk"><code>lua_callk</code></a> with a non-null <code>k</code>.
+
+
+<p>
+Hook functions can yield under the following conditions:
+Only count and line events can yield;
+to yield, a hook function must finish its execution
+calling <a href="#lua_yield"><code>lua_yield</code></a> with <code>nresults</code> equal to zero
+(that is, with no values).
+
+
+
+
+
+<hr><h3><a name="lua_sethook"><code>lua_sethook</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>void lua_sethook (lua_State *L, lua_Hook f, int mask, int count);</pre>
+
+<p>
+Sets the debugging hook function.
+
+
+<p>
+Argument <code>f</code> is the hook function.
+<code>mask</code> specifies on which events the hook will be called:
+it is formed by a bitwise OR of the constants
+<a name="pdf-LUA_MASKCALL"><code>LUA_MASKCALL</code></a>,
+<a name="pdf-LUA_MASKRET"><code>LUA_MASKRET</code></a>,
+<a name="pdf-LUA_MASKLINE"><code>LUA_MASKLINE</code></a>,
+and <a name="pdf-LUA_MASKCOUNT"><code>LUA_MASKCOUNT</code></a>.
+The <code>count</code> argument is only meaningful when the mask
+includes <code>LUA_MASKCOUNT</code>.
+For each event, the hook is called as explained below:
+
+<ul>
+
+<li><b>The call hook: </b> is called when the interpreter calls a function.
+The hook is called just after Lua enters the new function.
+</li>
+
+<li><b>The return hook: </b> is called when the interpreter returns from a function.
+The hook is called just before Lua leaves the function.
+</li>
+
+<li><b>The line hook: </b> is called when the interpreter is about to
+start the execution of a new line of code,
+or when it jumps back in the code (even to the same line).
+This event only happens while Lua is executing a Lua function.
+</li>
+
+<li><b>The count hook: </b> is called after the interpreter executes every
+<code>count</code> instructions.
+This event only happens while Lua is executing a Lua function.
+</li>
+
+</ul>
+
+<p>
+Hooks are disabled by setting <code>mask</code> to zero.
+
+
+
+
+
+<hr><h3><a name="lua_setlocal"><code>lua_setlocal</code></a></h3><p>
+<span class="apii">[-(0|1), +0, &ndash;]</span>
+<pre>const char *lua_setlocal (lua_State *L, const lua_Debug *ar, int n);</pre>
+
+<p>
+Sets the value of a local variable of a given activation record.
+It assigns the value on the top of the stack
+to the variable and returns its name.
+It also pops the value from the stack.
+
+
+<p>
+Returns <code>NULL</code> (and pops nothing)
+when the index is greater than
+the number of active local variables.
+
+
+<p>
+Parameters <code>ar</code> and <code>n</code> are as in the function <a href="#lua_getlocal"><code>lua_getlocal</code></a>.
+
+
+
+
+
+<hr><h3><a name="lua_setupvalue"><code>lua_setupvalue</code></a></h3><p>
+<span class="apii">[-(0|1), +0, &ndash;]</span>
+<pre>const char *lua_setupvalue (lua_State *L, int funcindex, int n);</pre>
+
+<p>
+Sets the value of a closure's upvalue.
+It assigns the value on the top of the stack
+to the upvalue and returns its name.
+It also pops the value from the stack.
+
+
+<p>
+Returns <code>NULL</code> (and pops nothing)
+when the index <code>n</code> is greater than the number of upvalues.
+
+
+<p>
+Parameters <code>funcindex</code> and <code>n</code> are as in
+the function <a href="#lua_getupvalue"><code>lua_getupvalue</code></a>.
+
+
+
+
+
+<hr><h3><a name="lua_upvalueid"><code>lua_upvalueid</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>void *lua_upvalueid (lua_State *L, int funcindex, int n);</pre>
+
+<p>
+Returns a unique identifier for the upvalue numbered <code>n</code>
+from the closure at index <code>funcindex</code>.
+
+
+<p>
+These unique identifiers allow a program to check whether different
+closures share upvalues.
+Lua closures that share an upvalue
+(that is, that access a same external local variable)
+will return identical ids for those upvalue indices.
+
+
+<p>
+Parameters <code>funcindex</code> and <code>n</code> are as in
+the function <a href="#lua_getupvalue"><code>lua_getupvalue</code></a>,
+but <code>n</code> cannot be greater than the number of upvalues.
+
+
+
+
+
+<hr><h3><a name="lua_upvaluejoin"><code>lua_upvaluejoin</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>void lua_upvaluejoin (lua_State *L, int funcindex1, int n1,
+                                    int funcindex2, int n2);</pre>
+
+<p>
+Make the <code>n1</code>-th upvalue of the Lua closure at index <code>funcindex1</code>
+refer to the <code>n2</code>-th upvalue of the Lua closure at index <code>funcindex2</code>.
+
+
+
+
+
+
+
+<h1>5 &ndash; <a name="5">The Auxiliary Library</a></h1>
+
+
+
+<p>
+
+The <em>auxiliary library</em> provides several convenient functions
+to interface C with Lua.
+While the basic API provides the primitive functions for all
+interactions between C and Lua,
+the auxiliary library provides higher-level functions for some
+common tasks.
+
+
+<p>
+All functions and types from the auxiliary library
+are defined in header file <code>lauxlib.h</code> and
+have a prefix <code>luaL_</code>.
+
+
+<p>
+All functions in the auxiliary library are built on
+top of the basic API,
+and so they provide nothing that cannot be done with that API.
+Nevertheless, the use of the auxiliary library ensures
+more consistency to your code.
+
+
+<p>
+Several functions in the auxiliary library use internally some
+extra stack slots.
+When a function in the auxiliary library uses less than five slots,
+it does not check the stack size;
+it simply assumes that there are enough slots.
+
+
+<p>
+Several functions in the auxiliary library are used to
+check C&nbsp;function arguments.
+Because the error message is formatted for arguments
+(e.g., "<code>bad argument #1</code>"),
+you should not use these functions for other stack values.
+
+
+<p>
+Functions called <code>luaL_check*</code>
+always raise an error if the check is not satisfied.
+
+
+
+
+
+<h2>5.1 &ndash; <a name="5.1">Functions and Types</a></h2>
+
+<p>
+Here we list all functions and types from the auxiliary library
+in alphabetical order.
+
+
+
+<hr><h3><a name="luaL_addchar"><code>luaL_addchar</code></a></h3><p>
+<span class="apii">[-?, +?, <em>m</em>]</span>
+<pre>void luaL_addchar (luaL_Buffer *B, char c);</pre>
+
+<p>
+Adds the byte <code>c</code> to the buffer <code>B</code>
+(see <a href="#luaL_Buffer"><code>luaL_Buffer</code></a>).
+
+
+
+
+
+<hr><h3><a name="luaL_addgsub"><code>luaL_addgsub</code></a></h3><p>
+<span class="apii">[-?, +?, <em>m</em>]</span>
+<pre>const void luaL_addgsub (luaL_Buffer *B, const char *s,
+                         const char *p, const char *r);</pre>
+
+<p>
+Adds a copy of the string <code>s</code> to the buffer <code>B</code> (see <a href="#luaL_Buffer"><code>luaL_Buffer</code></a>),
+replacing any occurrence of the string <code>p</code>
+with the string <code>r</code>.
+
+
+
+
+
+<hr><h3><a name="luaL_addlstring"><code>luaL_addlstring</code></a></h3><p>
+<span class="apii">[-?, +?, <em>m</em>]</span>
+<pre>void luaL_addlstring (luaL_Buffer *B, const char *s, size_t l);</pre>
+
+<p>
+Adds the string pointed to by <code>s</code> with length <code>l</code> to
+the buffer <code>B</code>
+(see <a href="#luaL_Buffer"><code>luaL_Buffer</code></a>).
+The string can contain embedded zeros.
+
+
+
+
+
+<hr><h3><a name="luaL_addsize"><code>luaL_addsize</code></a></h3><p>
+<span class="apii">[-?, +?, &ndash;]</span>
+<pre>void luaL_addsize (luaL_Buffer *B, size_t n);</pre>
+
+<p>
+Adds to the buffer <code>B</code>
+a string of length <code>n</code> previously copied to the
+buffer area (see <a href="#luaL_prepbuffer"><code>luaL_prepbuffer</code></a>).
+
+
+
+
+
+<hr><h3><a name="luaL_addstring"><code>luaL_addstring</code></a></h3><p>
+<span class="apii">[-?, +?, <em>m</em>]</span>
+<pre>void luaL_addstring (luaL_Buffer *B, const char *s);</pre>
+
+<p>
+Adds the zero-terminated string pointed to by <code>s</code>
+to the buffer <code>B</code>
+(see <a href="#luaL_Buffer"><code>luaL_Buffer</code></a>).
+
+
+
+
+
+<hr><h3><a name="luaL_addvalue"><code>luaL_addvalue</code></a></h3><p>
+<span class="apii">[-?, +?, <em>m</em>]</span>
+<pre>void luaL_addvalue (luaL_Buffer *B);</pre>
+
+<p>
+Adds the value on the top of the stack
+to the buffer <code>B</code>
+(see <a href="#luaL_Buffer"><code>luaL_Buffer</code></a>).
+Pops the value.
+
+
+<p>
+This is the only function on string buffers that can (and must)
+be called with an extra element on the stack,
+which is the value to be added to the buffer.
+
+
+
+
+
+<hr><h3><a name="luaL_argcheck"><code>luaL_argcheck</code></a></h3><p>
+<span class="apii">[-0, +0, <em>v</em>]</span>
+<pre>void luaL_argcheck (lua_State *L,
+                    int cond,
+                    int arg,
+                    const char *extramsg);</pre>
+
+<p>
+Checks whether <code>cond</code> is true.
+If it is not, raises an error with a standard message (see <a href="#luaL_argerror"><code>luaL_argerror</code></a>).
+
+
+
+
+
+<hr><h3><a name="luaL_argerror"><code>luaL_argerror</code></a></h3><p>
+<span class="apii">[-0, +0, <em>v</em>]</span>
+<pre>int luaL_argerror (lua_State *L, int arg, const char *extramsg);</pre>
+
+<p>
+Raises an error reporting a problem with argument <code>arg</code>
+of the C&nbsp;function that called it,
+using a standard message
+that includes <code>extramsg</code> as a comment:
+
+<pre>
+     bad argument #<em>arg</em> to '<em>funcname</em>' (<em>extramsg</em>)
+</pre><p>
+This function never returns.
+
+
+
+
+
+<hr><h3><a name="luaL_argexpected"><code>luaL_argexpected</code></a></h3><p>
+<span class="apii">[-0, +0, <em>v</em>]</span>
+<pre>void luaL_argexpected (lua_State *L,
+                       int cond,
+                       int arg,
+                       const char *tname);</pre>
+
+<p>
+Checks whether <code>cond</code> is true.
+If it is not, raises an error about the type of the argument <code>arg</code>
+with a standard message (see <a href="#luaL_typeerror"><code>luaL_typeerror</code></a>).
+
+
+
+
+
+<hr><h3><a name="luaL_Buffer"><code>luaL_Buffer</code></a></h3>
+<pre>typedef struct luaL_Buffer luaL_Buffer;</pre>
+
+<p>
+Type for a <em>string buffer</em>.
+
+
+<p>
+A string buffer allows C&nbsp;code to build Lua strings piecemeal.
+Its pattern of use is as follows:
+
+<ul>
+
+<li>First declare a variable <code>b</code> of type <a href="#luaL_Buffer"><code>luaL_Buffer</code></a>.</li>
+
+<li>Then initialize it with a call <code>luaL_buffinit(L, &amp;b)</code>.</li>
+
+<li>
+Then add string pieces to the buffer calling any of
+the <code>luaL_add*</code> functions.
+</li>
+
+<li>
+Finish by calling <code>luaL_pushresult(&amp;b)</code>.
+This call leaves the final string on the top of the stack.
+</li>
+
+</ul>
+
+<p>
+If you know beforehand the maximum size of the resulting string,
+you can use the buffer like this:
+
+<ul>
+
+<li>First declare a variable <code>b</code> of type <a href="#luaL_Buffer"><code>luaL_Buffer</code></a>.</li>
+
+<li>Then initialize it and preallocate a space of
+size <code>sz</code> with a call <code>luaL_buffinitsize(L, &amp;b, sz)</code>.</li>
+
+<li>Then produce the string into that space.</li>
+
+<li>
+Finish by calling <code>luaL_pushresultsize(&amp;b, sz)</code>,
+where <code>sz</code> is the total size of the resulting string
+copied into that space (which may be less than or
+equal to the preallocated size).
+</li>
+
+</ul>
+
+<p>
+During its normal operation,
+a string buffer uses a variable number of stack slots.
+So, while using a buffer, you cannot assume that you know where
+the top of the stack is.
+You can use the stack between successive calls to buffer operations
+as long as that use is balanced;
+that is,
+when you call a buffer operation,
+the stack is at the same level
+it was immediately after the previous buffer operation.
+(The only exception to this rule is <a href="#luaL_addvalue"><code>luaL_addvalue</code></a>.)
+After calling <a href="#luaL_pushresult"><code>luaL_pushresult</code></a>,
+the stack is back to its level when the buffer was initialized,
+plus the final string on its top.
+
+
+
+
+
+<hr><h3><a name="luaL_buffaddr"><code>luaL_buffaddr</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>char *luaL_buffaddr (luaL_Buffer *B);</pre>
+
+<p>
+Returns the address of the current content of buffer <code>B</code>
+(see <a href="#luaL_Buffer"><code>luaL_Buffer</code></a>).
+Note that any addition to the buffer may invalidate this address.
+
+
+
+
+
+<hr><h3><a name="luaL_buffinit"><code>luaL_buffinit</code></a></h3><p>
+<span class="apii">[-0, +?, &ndash;]</span>
+<pre>void luaL_buffinit (lua_State *L, luaL_Buffer *B);</pre>
+
+<p>
+Initializes a buffer <code>B</code>
+(see <a href="#luaL_Buffer"><code>luaL_Buffer</code></a>).
+This function does not allocate any space;
+the buffer must be declared as a variable.
+
+
+
+
+
+<hr><h3><a name="luaL_bufflen"><code>luaL_bufflen</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>size_t luaL_bufflen (luaL_Buffer *B);</pre>
+
+<p>
+Returns the length of the current content of buffer <code>B</code>
+(see <a href="#luaL_Buffer"><code>luaL_Buffer</code></a>).
+
+
+
+
+
+<hr><h3><a name="luaL_buffinitsize"><code>luaL_buffinitsize</code></a></h3><p>
+<span class="apii">[-?, +?, <em>m</em>]</span>
+<pre>char *luaL_buffinitsize (lua_State *L, luaL_Buffer *B, size_t sz);</pre>
+
+<p>
+Equivalent to the sequence
+<a href="#luaL_buffinit"><code>luaL_buffinit</code></a>, <a href="#luaL_prepbuffsize"><code>luaL_prepbuffsize</code></a>.
+
+
+
+
+
+<hr><h3><a name="luaL_buffsub"><code>luaL_buffsub</code></a></h3><p>
+<span class="apii">[-?, +?, &ndash;]</span>
+<pre>void luaL_buffsub (luaL_Buffer *B, int n);</pre>
+
+<p>
+Removes <code>n</code> bytes from the buffer <code>B</code>
+(see <a href="#luaL_Buffer"><code>luaL_Buffer</code></a>).
+The buffer must have at least that many bytes.
+
+
+
+
+
+<hr><h3><a name="luaL_callmeta"><code>luaL_callmeta</code></a></h3><p>
+<span class="apii">[-0, +(0|1), <em>e</em>]</span>
+<pre>int luaL_callmeta (lua_State *L, int obj, const char *e);</pre>
+
+<p>
+Calls a metamethod.
+
+
+<p>
+If the object at index <code>obj</code> has a metatable and this
+metatable has a field <code>e</code>,
+this function calls this field passing the object as its only argument.
+In this case this function returns true and pushes onto the
+stack the value returned by the call.
+If there is no metatable or no metamethod,
+this function returns false without pushing any value on the stack.
+
+
+
+
+
+<hr><h3><a name="luaL_checkany"><code>luaL_checkany</code></a></h3><p>
+<span class="apii">[-0, +0, <em>v</em>]</span>
+<pre>void luaL_checkany (lua_State *L, int arg);</pre>
+
+<p>
+Checks whether the function has an argument
+of any type (including <b>nil</b>) at position <code>arg</code>.
+
+
+
+
+
+<hr><h3><a name="luaL_checkinteger"><code>luaL_checkinteger</code></a></h3><p>
+<span class="apii">[-0, +0, <em>v</em>]</span>
+<pre>lua_Integer luaL_checkinteger (lua_State *L, int arg);</pre>
+
+<p>
+Checks whether the function argument <code>arg</code> is an integer
+(or can be converted to an integer)
+and returns this integer.
+
+
+
+
+
+<hr><h3><a name="luaL_checklstring"><code>luaL_checklstring</code></a></h3><p>
+<span class="apii">[-0, +0, <em>v</em>]</span>
+<pre>const char *luaL_checklstring (lua_State *L, int arg, size_t *l);</pre>
+
+<p>
+Checks whether the function argument <code>arg</code> is a string
+and returns this string;
+if <code>l</code> is not <code>NULL</code> fills its referent
+with the string's length.
+
+
+<p>
+This function uses <a href="#lua_tolstring"><code>lua_tolstring</code></a> to get its result,
+so all conversions and caveats of that function apply here.
+
+
+
+
+
+<hr><h3><a name="luaL_checknumber"><code>luaL_checknumber</code></a></h3><p>
+<span class="apii">[-0, +0, <em>v</em>]</span>
+<pre>lua_Number luaL_checknumber (lua_State *L, int arg);</pre>
+
+<p>
+Checks whether the function argument <code>arg</code> is a number
+and returns this number converted to a <code>lua_Number</code>.
+
+
+
+
+
+<hr><h3><a name="luaL_checkoption"><code>luaL_checkoption</code></a></h3><p>
+<span class="apii">[-0, +0, <em>v</em>]</span>
+<pre>int luaL_checkoption (lua_State *L,
+                      int arg,
+                      const char *def,
+                      const char *const lst[]);</pre>
+
+<p>
+Checks whether the function argument <code>arg</code> is a string and
+searches for this string in the array <code>lst</code>
+(which must be NULL-terminated).
+Returns the index in the array where the string was found.
+Raises an error if the argument is not a string or
+if the string cannot be found.
+
+
+<p>
+If <code>def</code> is not <code>NULL</code>,
+the function uses <code>def</code> as a default value when
+there is no argument <code>arg</code> or when this argument is <b>nil</b>.
+
+
+<p>
+This is a useful function for mapping strings to C&nbsp;enums.
+(The usual convention in Lua libraries is
+to use strings instead of numbers to select options.)
+
+
+
+
+
+<hr><h3><a name="luaL_checkstack"><code>luaL_checkstack</code></a></h3><p>
+<span class="apii">[-0, +0, <em>v</em>]</span>
+<pre>void luaL_checkstack (lua_State *L, int sz, const char *msg);</pre>
+
+<p>
+Grows the stack size to <code>top + sz</code> elements,
+raising an error if the stack cannot grow to that size.
+<code>msg</code> is an additional text to go into the error message
+(or <code>NULL</code> for no additional text).
+
+
+
+
+
+<hr><h3><a name="luaL_checkstring"><code>luaL_checkstring</code></a></h3><p>
+<span class="apii">[-0, +0, <em>v</em>]</span>
+<pre>const char *luaL_checkstring (lua_State *L, int arg);</pre>
+
+<p>
+Checks whether the function argument <code>arg</code> is a string
+and returns this string.
+
+
+<p>
+This function uses <a href="#lua_tolstring"><code>lua_tolstring</code></a> to get its result,
+so all conversions and caveats of that function apply here.
+
+
+
+
+
+<hr><h3><a name="luaL_checktype"><code>luaL_checktype</code></a></h3><p>
+<span class="apii">[-0, +0, <em>v</em>]</span>
+<pre>void luaL_checktype (lua_State *L, int arg, int t);</pre>
+
+<p>
+Checks whether the function argument <code>arg</code> has type <code>t</code>.
+See <a href="#lua_type"><code>lua_type</code></a> for the encoding of types for <code>t</code>.
+
+
+
+
+
+<hr><h3><a name="luaL_checkudata"><code>luaL_checkudata</code></a></h3><p>
+<span class="apii">[-0, +0, <em>v</em>]</span>
+<pre>void *luaL_checkudata (lua_State *L, int arg, const char *tname);</pre>
+
+<p>
+Checks whether the function argument <code>arg</code> is a userdata
+of the type <code>tname</code> (see <a href="#luaL_newmetatable"><code>luaL_newmetatable</code></a>) and
+returns the userdata's memory-block address (see <a href="#lua_touserdata"><code>lua_touserdata</code></a>).
+
+
+
+
+
+<hr><h3><a name="luaL_checkversion"><code>luaL_checkversion</code></a></h3><p>
+<span class="apii">[-0, +0, <em>v</em>]</span>
+<pre>void luaL_checkversion (lua_State *L);</pre>
+
+<p>
+Checks whether the code making the call and the Lua library being called
+are using the same version of Lua and the same numeric types.
+
+
+
+
+
+<hr><h3><a name="luaL_dofile"><code>luaL_dofile</code></a></h3><p>
+<span class="apii">[-0, +?, <em>m</em>]</span>
+<pre>int luaL_dofile (lua_State *L, const char *filename);</pre>
+
+<p>
+Loads and runs the given file.
+It is defined as the following macro:
+
+<pre>
+     (luaL_loadfile(L, filename) || lua_pcall(L, 0, LUA_MULTRET, 0))
+</pre><p>
+It returns&nbsp;0 (<a href="#pdf-LUA_OK"><code>LUA_OK</code></a>) if there are no errors,
+or 1 in case of errors.
+
+
+
+
+
+<hr><h3><a name="luaL_dostring"><code>luaL_dostring</code></a></h3><p>
+<span class="apii">[-0, +?, &ndash;]</span>
+<pre>int luaL_dostring (lua_State *L, const char *str);</pre>
+
+<p>
+Loads and runs the given string.
+It is defined as the following macro:
+
+<pre>
+     (luaL_loadstring(L, str) || lua_pcall(L, 0, LUA_MULTRET, 0))
+</pre><p>
+It returns&nbsp;0 (<a href="#pdf-LUA_OK"><code>LUA_OK</code></a>) if there are no errors,
+or 1 in case of errors.
+
+
+
+
+
+<hr><h3><a name="luaL_error"><code>luaL_error</code></a></h3><p>
+<span class="apii">[-0, +0, <em>v</em>]</span>
+<pre>int luaL_error (lua_State *L, const char *fmt, ...);</pre>
+
+<p>
+Raises an error.
+The error message format is given by <code>fmt</code>
+plus any extra arguments,
+following the same rules of <a href="#lua_pushfstring"><code>lua_pushfstring</code></a>.
+It also adds at the beginning of the message the file name and
+the line number where the error occurred,
+if this information is available.
+
+
+<p>
+This function never returns,
+but it is an idiom to use it in C&nbsp;functions
+as <code>return luaL_error(<em>args</em>)</code>.
+
+
+
+
+
+<hr><h3><a name="luaL_execresult"><code>luaL_execresult</code></a></h3><p>
+<span class="apii">[-0, +3, <em>m</em>]</span>
+<pre>int luaL_execresult (lua_State *L, int stat);</pre>
+
+<p>
+This function produces the return values for
+process-related functions in the standard library
+(<a href="#pdf-os.execute"><code>os.execute</code></a> and <a href="#pdf-io.close"><code>io.close</code></a>).
+
+
+
+
+
+<hr><h3><a name="luaL_fileresult"><code>luaL_fileresult</code></a></h3><p>
+<span class="apii">[-0, +(1|3), <em>m</em>]</span>
+<pre>int luaL_fileresult (lua_State *L, int stat, const char *fname);</pre>
+
+<p>
+This function produces the return values for
+file-related functions in the standard library
+(<a href="#pdf-io.open"><code>io.open</code></a>, <a href="#pdf-os.rename"><code>os.rename</code></a>, <a href="#pdf-file:seek"><code>file:seek</code></a>, etc.).
+
+
+
+
+
+<hr><h3><a name="luaL_getmetafield"><code>luaL_getmetafield</code></a></h3><p>
+<span class="apii">[-0, +(0|1), <em>m</em>]</span>
+<pre>int luaL_getmetafield (lua_State *L, int obj, const char *e);</pre>
+
+<p>
+Pushes onto the stack the field <code>e</code> from the metatable
+of the object at index <code>obj</code> and returns the type of the pushed value.
+If the object does not have a metatable,
+or if the metatable does not have this field,
+pushes nothing and returns <code>LUA_TNIL</code>.
+
+
+
+
+
+<hr><h3><a name="luaL_getmetatable"><code>luaL_getmetatable</code></a></h3><p>
+<span class="apii">[-0, +1, <em>m</em>]</span>
+<pre>int luaL_getmetatable (lua_State *L, const char *tname);</pre>
+
+<p>
+Pushes onto the stack the metatable associated with the name <code>tname</code>
+in the registry (see <a href="#luaL_newmetatable"><code>luaL_newmetatable</code></a>),
+or <b>nil</b> if there is no metatable associated with that name.
+Returns the type of the pushed value.
+
+
+
+
+
+<hr><h3><a name="luaL_getsubtable"><code>luaL_getsubtable</code></a></h3><p>
+<span class="apii">[-0, +1, <em>e</em>]</span>
+<pre>int luaL_getsubtable (lua_State *L, int idx, const char *fname);</pre>
+
+<p>
+Ensures that the value <code>t[fname]</code>,
+where <code>t</code> is the value at index <code>idx</code>,
+is a table,
+and pushes that table onto the stack.
+Returns true if it finds a previous table there
+and false if it creates a new table.
+
+
+
+
+
+<hr><h3><a name="luaL_gsub"><code>luaL_gsub</code></a></h3><p>
+<span class="apii">[-0, +1, <em>m</em>]</span>
+<pre>const char *luaL_gsub (lua_State *L,
+                       const char *s,
+                       const char *p,
+                       const char *r);</pre>
+
+<p>
+Creates a copy of string <code>s</code>,
+replacing any occurrence of the string <code>p</code>
+with the string <code>r</code>.
+Pushes the resulting string on the stack and returns it.
+
+
+
+
+
+<hr><h3><a name="luaL_len"><code>luaL_len</code></a></h3><p>
+<span class="apii">[-0, +0, <em>e</em>]</span>
+<pre>lua_Integer luaL_len (lua_State *L, int index);</pre>
+
+<p>
+Returns the "length" of the value at the given index
+as a number;
+it is equivalent to the '<code>#</code>' operator in Lua (see <a href="#3.4.7">&sect;3.4.7</a>).
+Raises an error if the result of the operation is not an integer.
+(This case can only happen through metamethods.)
+
+
+
+
+
+<hr><h3><a name="luaL_loadbuffer"><code>luaL_loadbuffer</code></a></h3><p>
+<span class="apii">[-0, +1, &ndash;]</span>
+<pre>int luaL_loadbuffer (lua_State *L,
+                     const char *buff,
+                     size_t sz,
+                     const char *name);</pre>
+
+<p>
+Equivalent to <a href="#luaL_loadbufferx"><code>luaL_loadbufferx</code></a> with <code>mode</code> equal to <code>NULL</code>.
+
+
+
+
+
+<hr><h3><a name="luaL_loadbufferx"><code>luaL_loadbufferx</code></a></h3><p>
+<span class="apii">[-0, +1, &ndash;]</span>
+<pre>int luaL_loadbufferx (lua_State *L,
+                      const char *buff,
+                      size_t sz,
+                      const char *name,
+                      const char *mode);</pre>
+
+<p>
+Loads a buffer as a Lua chunk.
+This function uses <a href="#lua_load"><code>lua_load</code></a> to load the chunk in the
+buffer pointed to by <code>buff</code> with size <code>sz</code>.
+
+
+<p>
+This function returns the same results as <a href="#lua_load"><code>lua_load</code></a>.
+<code>name</code> is the chunk name,
+used for debug information and error messages.
+The string <code>mode</code> works as in the function <a href="#lua_load"><code>lua_load</code></a>.
+
+
+
+
+
+<hr><h3><a name="luaL_loadfile"><code>luaL_loadfile</code></a></h3><p>
+<span class="apii">[-0, +1, <em>m</em>]</span>
+<pre>int luaL_loadfile (lua_State *L, const char *filename);</pre>
+
+<p>
+Equivalent to <a href="#luaL_loadfilex"><code>luaL_loadfilex</code></a> with <code>mode</code> equal to <code>NULL</code>.
+
+
+
+
+
+<hr><h3><a name="luaL_loadfilex"><code>luaL_loadfilex</code></a></h3><p>
+<span class="apii">[-0, +1, <em>m</em>]</span>
+<pre>int luaL_loadfilex (lua_State *L, const char *filename,
+                                            const char *mode);</pre>
+
+<p>
+Loads a file as a Lua chunk.
+This function uses <a href="#lua_load"><code>lua_load</code></a> to load the chunk in the file
+named <code>filename</code>.
+If <code>filename</code> is <code>NULL</code>,
+then it loads from the standard input.
+The first line in the file is ignored if it starts with a <code>#</code>.
+
+
+<p>
+The string <code>mode</code> works as in the function <a href="#lua_load"><code>lua_load</code></a>.
+
+
+<p>
+This function returns the same results as <a href="#lua_load"><code>lua_load</code></a>
+or <a href="#pdf-LUA_ERRFILE"><code>LUA_ERRFILE</code></a> for file-related errors.
+
+
+<p>
+As <a href="#lua_load"><code>lua_load</code></a>, this function only loads the chunk;
+it does not run it.
+
+
+
+
+
+<hr><h3><a name="luaL_loadstring"><code>luaL_loadstring</code></a></h3><p>
+<span class="apii">[-0, +1, &ndash;]</span>
+<pre>int luaL_loadstring (lua_State *L, const char *s);</pre>
+
+<p>
+Loads a string as a Lua chunk.
+This function uses <a href="#lua_load"><code>lua_load</code></a> to load the chunk in
+the zero-terminated string <code>s</code>.
+
+
+<p>
+This function returns the same results as <a href="#lua_load"><code>lua_load</code></a>.
+
+
+<p>
+Also as <a href="#lua_load"><code>lua_load</code></a>, this function only loads the chunk;
+it does not run it.
+
+
+
+
+
+<hr><h3><a name="luaL_newlib"><code>luaL_newlib</code></a></h3><p>
+<span class="apii">[-0, +1, <em>m</em>]</span>
+<pre>void luaL_newlib (lua_State *L, const luaL_Reg l[]);</pre>
+
+<p>
+Creates a new table and registers there
+the functions in the list <code>l</code>.
+
+
+<p>
+It is implemented as the following macro:
+
+<pre>
+     (luaL_newlibtable(L,l), luaL_setfuncs(L,l,0))
+</pre><p>
+The array <code>l</code> must be the actual array,
+not a pointer to it.
+
+
+
+
+
+<hr><h3><a name="luaL_newlibtable"><code>luaL_newlibtable</code></a></h3><p>
+<span class="apii">[-0, +1, <em>m</em>]</span>
+<pre>void luaL_newlibtable (lua_State *L, const luaL_Reg l[]);</pre>
+
+<p>
+Creates a new table with a size optimized
+to store all entries in the array <code>l</code>
+(but does not actually store them).
+It is intended to be used in conjunction with <a href="#luaL_setfuncs"><code>luaL_setfuncs</code></a>
+(see <a href="#luaL_newlib"><code>luaL_newlib</code></a>).
+
+
+<p>
+It is implemented as a macro.
+The array <code>l</code> must be the actual array,
+not a pointer to it.
+
+
+
+
+
+<hr><h3><a name="luaL_newmetatable"><code>luaL_newmetatable</code></a></h3><p>
+<span class="apii">[-0, +1, <em>m</em>]</span>
+<pre>int luaL_newmetatable (lua_State *L, const char *tname);</pre>
+
+<p>
+If the registry already has the key <code>tname</code>,
+returns 0.
+Otherwise,
+creates a new table to be used as a metatable for userdata,
+adds to this new table the pair <code>__name = tname</code>,
+adds to the registry the pair <code>[tname] = new table</code>,
+and returns 1.
+
+
+<p>
+In both cases,
+the function pushes onto the stack the final value associated
+with <code>tname</code> in the registry.
+
+
+
+
+
+<hr><h3><a name="luaL_newstate"><code>luaL_newstate</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>lua_State *luaL_newstate (void);</pre>
+
+<p>
+Creates a new Lua state.
+It calls <a href="#lua_newstate"><code>lua_newstate</code></a> with an
+allocator based on the ISO&nbsp;C allocation functions
+and then sets a warning function and a panic function (see <a href="#4.4">&sect;4.4</a>)
+that print messages to the standard error output.
+
+
+<p>
+Returns the new state,
+or <code>NULL</code> if there is a memory allocation error.
+
+
+
+
+
+<hr><h3><a name="luaL_openlibs"><code>luaL_openlibs</code></a></h3><p>
+<span class="apii">[-0, +0, <em>e</em>]</span>
+<pre>void luaL_openlibs (lua_State *L);</pre>
+
+<p>
+Opens all standard Lua libraries into the given state.
+
+
+
+
+
+<hr><h3><a name="luaL_opt"><code>luaL_opt</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>T luaL_opt (L, func, arg, dflt);</pre>
+
+<p>
+This macro is defined as follows:
+
+<pre>
+     (lua_isnoneornil(L,(arg)) ? (dflt) : func(L,(arg)))
+</pre><p>
+In words, if the argument <code>arg</code> is nil or absent,
+the macro results in the default <code>dflt</code>.
+Otherwise, it results in the result of calling <code>func</code>
+with the state <code>L</code> and the argument index <code>arg</code> as
+arguments.
+Note that it evaluates the expression <code>dflt</code> only if needed.
+
+
+
+
+
+<hr><h3><a name="luaL_optinteger"><code>luaL_optinteger</code></a></h3><p>
+<span class="apii">[-0, +0, <em>v</em>]</span>
+<pre>lua_Integer luaL_optinteger (lua_State *L,
+                             int arg,
+                             lua_Integer d);</pre>
+
+<p>
+If the function argument <code>arg</code> is an integer
+(or it is convertible to an integer),
+returns this integer.
+If this argument is absent or is <b>nil</b>,
+returns <code>d</code>.
+Otherwise, raises an error.
+
+
+
+
+
+<hr><h3><a name="luaL_optlstring"><code>luaL_optlstring</code></a></h3><p>
+<span class="apii">[-0, +0, <em>v</em>]</span>
+<pre>const char *luaL_optlstring (lua_State *L,
+                             int arg,
+                             const char *d,
+                             size_t *l);</pre>
+
+<p>
+If the function argument <code>arg</code> is a string,
+returns this string.
+If this argument is absent or is <b>nil</b>,
+returns <code>d</code>.
+Otherwise, raises an error.
+
+
+<p>
+If <code>l</code> is not <code>NULL</code>,
+fills its referent with the result's length.
+If the result is <code>NULL</code>
+(only possible when returning <code>d</code> and <code>d == NULL</code>),
+its length is considered zero.
+
+
+<p>
+This function uses <a href="#lua_tolstring"><code>lua_tolstring</code></a> to get its result,
+so all conversions and caveats of that function apply here.
+
+
+
+
+
+<hr><h3><a name="luaL_optnumber"><code>luaL_optnumber</code></a></h3><p>
+<span class="apii">[-0, +0, <em>v</em>]</span>
+<pre>lua_Number luaL_optnumber (lua_State *L, int arg, lua_Number d);</pre>
+
+<p>
+If the function argument <code>arg</code> is a number,
+returns this number as a <code>lua_Number</code>.
+If this argument is absent or is <b>nil</b>,
+returns <code>d</code>.
+Otherwise, raises an error.
+
+
+
+
+
+<hr><h3><a name="luaL_optstring"><code>luaL_optstring</code></a></h3><p>
+<span class="apii">[-0, +0, <em>v</em>]</span>
+<pre>const char *luaL_optstring (lua_State *L,
+                            int arg,
+                            const char *d);</pre>
+
+<p>
+If the function argument <code>arg</code> is a string,
+returns this string.
+If this argument is absent or is <b>nil</b>,
+returns <code>d</code>.
+Otherwise, raises an error.
+
+
+
+
+
+<hr><h3><a name="luaL_prepbuffer"><code>luaL_prepbuffer</code></a></h3><p>
+<span class="apii">[-?, +?, <em>m</em>]</span>
+<pre>char *luaL_prepbuffer (luaL_Buffer *B);</pre>
+
+<p>
+Equivalent to <a href="#luaL_prepbuffsize"><code>luaL_prepbuffsize</code></a>
+with the predefined size <a name="pdf-LUAL_BUFFERSIZE"><code>LUAL_BUFFERSIZE</code></a>.
+
+
+
+
+
+<hr><h3><a name="luaL_prepbuffsize"><code>luaL_prepbuffsize</code></a></h3><p>
+<span class="apii">[-?, +?, <em>m</em>]</span>
+<pre>char *luaL_prepbuffsize (luaL_Buffer *B, size_t sz);</pre>
+
+<p>
+Returns an address to a space of size <code>sz</code>
+where you can copy a string to be added to buffer <code>B</code>
+(see <a href="#luaL_Buffer"><code>luaL_Buffer</code></a>).
+After copying the string into this space you must call
+<a href="#luaL_addsize"><code>luaL_addsize</code></a> with the size of the string to actually add
+it to the buffer.
+
+
+
+
+
+<hr><h3><a name="luaL_pushfail"><code>luaL_pushfail</code></a></h3><p>
+<span class="apii">[-0, +1, &ndash;]</span>
+<pre>void luaL_pushfail (lua_State *L);</pre>
+
+<p>
+Pushes the <b>fail</b> value onto the stack (see <a href="#6">&sect;6</a>).
+
+
+
+
+
+<hr><h3><a name="luaL_pushresult"><code>luaL_pushresult</code></a></h3><p>
+<span class="apii">[-?, +1, <em>m</em>]</span>
+<pre>void luaL_pushresult (luaL_Buffer *B);</pre>
+
+<p>
+Finishes the use of buffer <code>B</code> leaving the final string on
+the top of the stack.
+
+
+
+
+
+<hr><h3><a name="luaL_pushresultsize"><code>luaL_pushresultsize</code></a></h3><p>
+<span class="apii">[-?, +1, <em>m</em>]</span>
+<pre>void luaL_pushresultsize (luaL_Buffer *B, size_t sz);</pre>
+
+<p>
+Equivalent to the sequence <a href="#luaL_addsize"><code>luaL_addsize</code></a>, <a href="#luaL_pushresult"><code>luaL_pushresult</code></a>.
+
+
+
+
+
+<hr><h3><a name="luaL_ref"><code>luaL_ref</code></a></h3><p>
+<span class="apii">[-1, +0, <em>m</em>]</span>
+<pre>int luaL_ref (lua_State *L, int t);</pre>
+
+<p>
+Creates and returns a <em>reference</em>,
+in the table at index <code>t</code>,
+for the object on the top of the stack (and pops the object).
+
+
+<p>
+A reference is a unique integer key.
+As long as you do not manually add integer keys into the table <code>t</code>,
+<a href="#luaL_ref"><code>luaL_ref</code></a> ensures the uniqueness of the key it returns.
+You can retrieve an object referred by the reference <code>r</code>
+by calling <code>lua_rawgeti(L, t, r)</code>.
+The function <a href="#luaL_unref"><code>luaL_unref</code></a> frees a reference.
+
+
+<p>
+If the object on the top of the stack is <b>nil</b>,
+<a href="#luaL_ref"><code>luaL_ref</code></a> returns the constant <a name="pdf-LUA_REFNIL"><code>LUA_REFNIL</code></a>.
+The constant <a name="pdf-LUA_NOREF"><code>LUA_NOREF</code></a> is guaranteed to be different
+from any reference returned by <a href="#luaL_ref"><code>luaL_ref</code></a>.
+
+
+
+
+
+<hr><h3><a name="luaL_Reg"><code>luaL_Reg</code></a></h3>
+<pre>typedef struct luaL_Reg {
+  const char *name;
+  lua_CFunction func;
+} luaL_Reg;</pre>
+
+<p>
+Type for arrays of functions to be registered by
+<a href="#luaL_setfuncs"><code>luaL_setfuncs</code></a>.
+<code>name</code> is the function name and <code>func</code> is a pointer to
+the function.
+Any array of <a href="#luaL_Reg"><code>luaL_Reg</code></a> must end with a sentinel entry
+in which both <code>name</code> and <code>func</code> are <code>NULL</code>.
+
+
+
+
+
+<hr><h3><a name="luaL_requiref"><code>luaL_requiref</code></a></h3><p>
+<span class="apii">[-0, +1, <em>e</em>]</span>
+<pre>void luaL_requiref (lua_State *L, const char *modname,
+                    lua_CFunction openf, int glb);</pre>
+
+<p>
+If <code>package.loaded[modname]</code> is not true,
+calls the function <code>openf</code> with the string <code>modname</code> as an argument
+and sets the call result to <code>package.loaded[modname]</code>,
+as if that function has been called through <a href="#pdf-require"><code>require</code></a>.
+
+
+<p>
+If <code>glb</code> is true,
+also stores the module into the global <code>modname</code>.
+
+
+<p>
+Leaves a copy of the module on the stack.
+
+
+
+
+
+<hr><h3><a name="luaL_setfuncs"><code>luaL_setfuncs</code></a></h3><p>
+<span class="apii">[-nup, +0, <em>m</em>]</span>
+<pre>void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup);</pre>
+
+<p>
+Registers all functions in the array <code>l</code>
+(see <a href="#luaL_Reg"><code>luaL_Reg</code></a>) into the table on the top of the stack
+(below optional upvalues, see next).
+
+
+<p>
+When <code>nup</code> is not zero,
+all functions are created with <code>nup</code> upvalues,
+initialized with copies of the <code>nup</code> values
+previously pushed on the stack
+on top of the library table.
+These values are popped from the stack after the registration.
+
+
+<p>
+A function with a <code>NULL</code> value represents a placeholder,
+which is filled with <b>false</b>.
+
+
+
+
+
+<hr><h3><a name="luaL_setmetatable"><code>luaL_setmetatable</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>void luaL_setmetatable (lua_State *L, const char *tname);</pre>
+
+<p>
+Sets the metatable of the object on the top of the stack
+as the metatable associated with name <code>tname</code>
+in the registry (see <a href="#luaL_newmetatable"><code>luaL_newmetatable</code></a>).
+
+
+
+
+
+<hr><h3><a name="luaL_Stream"><code>luaL_Stream</code></a></h3>
+<pre>typedef struct luaL_Stream {
+  FILE *f;
+  lua_CFunction closef;
+} luaL_Stream;</pre>
+
+<p>
+The standard representation for file handles
+used by the standard I/O library.
+
+
+<p>
+A file handle is implemented as a full userdata,
+with a metatable called <code>LUA_FILEHANDLE</code>
+(where <code>LUA_FILEHANDLE</code> is a macro with the actual metatable's name).
+The metatable is created by the I/O library
+(see <a href="#luaL_newmetatable"><code>luaL_newmetatable</code></a>).
+
+
+<p>
+This userdata must start with the structure <code>luaL_Stream</code>;
+it can contain other data after this initial structure.
+The field <code>f</code> points to the corresponding C stream
+(or it can be <code>NULL</code> to indicate an incompletely created handle).
+The field <code>closef</code> points to a Lua function
+that will be called to close the stream
+when the handle is closed or collected;
+this function receives the file handle as its sole argument and
+must return either a true value, in case of success,
+or a false value plus an error message, in case of error.
+Once Lua calls this field,
+it changes the field value to <code>NULL</code>
+to signal that the handle is closed.
+
+
+
+
+
+<hr><h3><a name="luaL_testudata"><code>luaL_testudata</code></a></h3><p>
+<span class="apii">[-0, +0, <em>m</em>]</span>
+<pre>void *luaL_testudata (lua_State *L, int arg, const char *tname);</pre>
+
+<p>
+This function works like <a href="#luaL_checkudata"><code>luaL_checkudata</code></a>,
+except that, when the test fails,
+it returns <code>NULL</code> instead of raising an error.
+
+
+
+
+
+<hr><h3><a name="luaL_tolstring"><code>luaL_tolstring</code></a></h3><p>
+<span class="apii">[-0, +1, <em>e</em>]</span>
+<pre>const char *luaL_tolstring (lua_State *L, int idx, size_t *len);</pre>
+
+<p>
+Converts any Lua value at the given index to a C&nbsp;string
+in a reasonable format.
+The resulting string is pushed onto the stack and also
+returned by the function (see <a href="#4.1.3">&sect;4.1.3</a>).
+If <code>len</code> is not <code>NULL</code>,
+the function also sets <code>*len</code> with the string length.
+
+
+<p>
+If the value has a metatable with a <code>__tostring</code> field,
+then <code>luaL_tolstring</code> calls the corresponding metamethod
+with the value as argument,
+and uses the result of the call as its result.
+
+
+
+
+
+<hr><h3><a name="luaL_traceback"><code>luaL_traceback</code></a></h3><p>
+<span class="apii">[-0, +1, <em>m</em>]</span>
+<pre>void luaL_traceback (lua_State *L, lua_State *L1, const char *msg,
+                     int level);</pre>
+
+<p>
+Creates and pushes a traceback of the stack <code>L1</code>.
+If <code>msg</code> is not <code>NULL</code>, it is appended
+at the beginning of the traceback.
+The <code>level</code> parameter tells at which level
+to start the traceback.
+
+
+
+
+
+<hr><h3><a name="luaL_typeerror"><code>luaL_typeerror</code></a></h3><p>
+<span class="apii">[-0, +0, <em>v</em>]</span>
+<pre>int luaL_typeerror (lua_State *L, int arg, const char *tname);</pre>
+
+<p>
+Raises a type error for the argument <code>arg</code>
+of the C&nbsp;function that called it,
+using a standard message;
+<code>tname</code> is a "name" for the expected type.
+This function never returns.
+
+
+
+
+
+<hr><h3><a name="luaL_typename"><code>luaL_typename</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>const char *luaL_typename (lua_State *L, int index);</pre>
+
+<p>
+Returns the name of the type of the value at the given index.
+
+
+
+
+
+<hr><h3><a name="luaL_unref"><code>luaL_unref</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>void luaL_unref (lua_State *L, int t, int ref);</pre>
+
+<p>
+Releases the reference <code>ref</code> from the table at index <code>t</code>
+(see <a href="#luaL_ref"><code>luaL_ref</code></a>).
+The entry is removed from the table,
+so that the referred object can be collected.
+The reference <code>ref</code> is also freed to be used again.
+
+
+<p>
+If <code>ref</code> is <a href="#pdf-LUA_NOREF"><code>LUA_NOREF</code></a> or <a href="#pdf-LUA_REFNIL"><code>LUA_REFNIL</code></a>,
+<a href="#luaL_unref"><code>luaL_unref</code></a> does nothing.
+
+
+
+
+
+<hr><h3><a name="luaL_where"><code>luaL_where</code></a></h3><p>
+<span class="apii">[-0, +1, <em>m</em>]</span>
+<pre>void luaL_where (lua_State *L, int lvl);</pre>
+
+<p>
+Pushes onto the stack a string identifying the current position
+of the control at level <code>lvl</code> in the call stack.
+Typically this string has the following format:
+
+<pre>
+     <em>chunkname</em>:<em>currentline</em>:
+</pre><p>
+Level&nbsp;0 is the running function,
+level&nbsp;1 is the function that called the running function,
+etc.
+
+
+<p>
+This function is used to build a prefix for error messages.
+
+
+
+
+
+
+
+<h1>6 &ndash; <a name="6">The Standard Libraries</a></h1>
+
+
+
+<p>
+The standard Lua libraries provide useful functions
+that are implemented in&nbsp;C through the C&nbsp;API.
+Some of these functions provide essential services to the language
+(e.g., <a href="#pdf-type"><code>type</code></a> and <a href="#pdf-getmetatable"><code>getmetatable</code></a>);
+others provide access to outside services (e.g., I/O);
+and others could be implemented in Lua itself,
+but that for different reasons
+deserve an implementation in C (e.g., <a href="#pdf-table.sort"><code>table.sort</code></a>).
+
+
+<p>
+All libraries are implemented through the official C&nbsp;API
+and are provided as separate C&nbsp;modules.
+Unless otherwise noted,
+these library functions do not adjust its number of arguments
+to its expected parameters.
+For instance, a function documented as <code>foo(arg)</code>
+should not be called without an argument.
+
+
+<p>
+The notation <b>fail</b> means a false value representing
+some kind of failure.
+(Currently, <b>fail</b> is equal to <b>nil</b>,
+but that may change in future versions.
+The recommendation is to always test the success of these functions
+with <code>(not status)</code>, instead of <code>(status == nil)</code>.)
+
+
+<p>
+Currently, Lua has the following standard libraries:
+
+<ul>
+
+<li>basic library (<a href="#6.1">&sect;6.1</a>);</li>
+
+<li>coroutine library (<a href="#6.2">&sect;6.2</a>);</li>
+
+<li>package library (<a href="#6.3">&sect;6.3</a>);</li>
+
+<li>string manipulation (<a href="#6.4">&sect;6.4</a>);</li>
+
+<li>basic UTF-8 support (<a href="#6.5">&sect;6.5</a>);</li>
+
+<li>table manipulation (<a href="#6.6">&sect;6.6</a>);</li>
+
+<li>mathematical functions (<a href="#6.7">&sect;6.7</a>) (sin, log, etc.);</li>
+
+<li>input and output (<a href="#6.8">&sect;6.8</a>);</li>
+
+<li>operating system facilities (<a href="#6.9">&sect;6.9</a>);</li>
+
+<li>debug facilities (<a href="#6.10">&sect;6.10</a>).</li>
+
+</ul><p>
+Except for the basic and the package libraries,
+each library provides all its functions as fields of a global table
+or as methods of its objects.
+
+
+<p>
+To have access to these libraries,
+the C&nbsp;host program should call the <a href="#luaL_openlibs"><code>luaL_openlibs</code></a> function,
+which opens all standard libraries.
+Alternatively,
+the host program can open them individually by using
+<a href="#luaL_requiref"><code>luaL_requiref</code></a> to call
+<a name="pdf-luaopen_base"><code>luaopen_base</code></a> (for the basic library),
+<a name="pdf-luaopen_package"><code>luaopen_package</code></a> (for the package library),
+<a name="pdf-luaopen_coroutine"><code>luaopen_coroutine</code></a> (for the coroutine library),
+<a name="pdf-luaopen_string"><code>luaopen_string</code></a> (for the string library),
+<a name="pdf-luaopen_utf8"><code>luaopen_utf8</code></a> (for the UTF-8 library),
+<a name="pdf-luaopen_table"><code>luaopen_table</code></a> (for the table library),
+<a name="pdf-luaopen_math"><code>luaopen_math</code></a> (for the mathematical library),
+<a name="pdf-luaopen_io"><code>luaopen_io</code></a> (for the I/O library),
+<a name="pdf-luaopen_os"><code>luaopen_os</code></a> (for the operating system library),
+and <a name="pdf-luaopen_debug"><code>luaopen_debug</code></a> (for the debug library).
+These functions are declared in <a name="pdf-lualib.h"><code>lualib.h</code></a>.
+
+
+
+
+
+<h2>6.1 &ndash; <a name="6.1">Basic Functions</a></h2>
+
+<p>
+The basic library provides core functions to Lua.
+If you do not include this library in your application,
+you should check carefully whether you need to provide
+implementations for some of its facilities.
+
+
+<p>
+<hr><h3><a name="pdf-assert"><code>assert (v [, message])</code></a></h3>
+
+
+<p>
+Raises an error if
+the value of its argument <code>v</code> is false (i.e., <b>nil</b> or <b>false</b>);
+otherwise, returns all its arguments.
+In case of error,
+<code>message</code> is the error object;
+when absent, it defaults to "<code>assertion failed!</code>"
+
+
+
+
+<p>
+<hr><h3><a name="pdf-collectgarbage"><code>collectgarbage ([opt [, arg]])</code></a></h3>
+
+
+<p>
+This function is a generic interface to the garbage collector.
+It performs different functions according to its first argument, <code>opt</code>:
+
+<ul>
+
+<li><b>"<code>collect</code>": </b>
+Performs a full garbage-collection cycle.
+This is the default option.
+</li>
+
+<li><b>"<code>stop</code>": </b>
+Stops automatic execution of the garbage collector.
+The collector will run only when explicitly invoked,
+until a call to restart it.
+</li>
+
+<li><b>"<code>restart</code>": </b>
+Restarts automatic execution of the garbage collector.
+</li>
+
+<li><b>"<code>count</code>": </b>
+Returns the total memory in use by Lua in Kbytes.
+The value has a fractional part,
+so that it multiplied by 1024
+gives the exact number of bytes in use by Lua.
+</li>
+
+<li><b>"<code>step</code>": </b>
+Performs a garbage-collection step.
+The step "size" is controlled by <code>arg</code>.
+With a zero value,
+the collector will perform one basic (indivisible) step.
+For non-zero values,
+the collector will perform as if that amount of memory
+(in Kbytes) had been allocated by Lua.
+Returns <b>true</b> if the step finished a collection cycle.
+</li>
+
+<li><b>"<code>isrunning</code>": </b>
+Returns a boolean that tells whether the collector is running
+(i.e., not stopped).
+</li>
+
+<li><b>"<code>incremental</code>": </b>
+Change the collector mode to incremental.
+This option can be followed by three numbers:
+the garbage-collector pause,
+the step multiplier,
+and the step size (see <a href="#2.5.1">&sect;2.5.1</a>).
+A zero means to not change that value.
+</li>
+
+<li><b>"<code>generational</code>": </b>
+Change the collector mode to generational.
+This option can be followed by two numbers:
+the garbage-collector minor multiplier
+and the major multiplier (see <a href="#2.5.2">&sect;2.5.2</a>).
+A zero means to not change that value.
+</li>
+
+</ul><p>
+See <a href="#2.5">&sect;2.5</a> for more details about garbage collection
+and some of these options.
+
+
+<p>
+This function should not be called by a finalizer.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-dofile"><code>dofile ([filename])</code></a></h3>
+Opens the named file and executes its content as a Lua chunk.
+When called without arguments,
+<code>dofile</code> executes the content of the standard input (<code>stdin</code>).
+Returns all values returned by the chunk.
+In case of errors, <code>dofile</code> propagates the error
+to its caller.
+(That is, <code>dofile</code> does not run in protected mode.)
+
+
+
+
+<p>
+<hr><h3><a name="pdf-error"><code>error (message [, level])</code></a></h3>
+Raises an error (see <a href="#2.3">&sect;2.3</a>) with <code>message</code> as the error object.
+This function never returns.
+
+
+<p>
+Usually, <code>error</code> adds some information about the error position
+at the beginning of the message, if the message is a string.
+The <code>level</code> argument specifies how to get the error position.
+With level&nbsp;1 (the default), the error position is where the
+<code>error</code> function was called.
+Level&nbsp;2 points the error to where the function
+that called <code>error</code> was called; and so on.
+Passing a level&nbsp;0 avoids the addition of error position information
+to the message.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-_G"><code>_G</code></a></h3>
+A global variable (not a function) that
+holds the global environment (see <a href="#2.2">&sect;2.2</a>).
+Lua itself does not use this variable;
+changing its value does not affect any environment,
+nor vice versa.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-getmetatable"><code>getmetatable (object)</code></a></h3>
+
+
+<p>
+If <code>object</code> does not have a metatable, returns <b>nil</b>.
+Otherwise,
+if the object's metatable has a <code>__metatable</code> field,
+returns the associated value.
+Otherwise, returns the metatable of the given object.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-ipairs"><code>ipairs (t)</code></a></h3>
+
+
+<p>
+Returns three values (an iterator function, the table <code>t</code>, and 0)
+so that the construction
+
+<pre>
+     for i,v in ipairs(t) do <em>body</em> end
+</pre><p>
+will iterate over the key&ndash;value pairs
+(<code>1,t[1]</code>), (<code>2,t[2]</code>), ...,
+up to the first absent index.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-load"><code>load (chunk [, chunkname [, mode [, env]]])</code></a></h3>
+
+
+<p>
+Loads a chunk.
+
+
+<p>
+If <code>chunk</code> is a string, the chunk is this string.
+If <code>chunk</code> is a function,
+<code>load</code> calls it repeatedly to get the chunk pieces.
+Each call to <code>chunk</code> must return a string that concatenates
+with previous results.
+A return of an empty string, <b>nil</b>, or no value signals the end of the chunk.
+
+
+<p>
+If there are no syntactic errors,
+<code>load</code> returns the compiled chunk as a function;
+otherwise, it returns <b>fail</b> plus the error message.
+
+
+<p>
+When you load a main chunk,
+the resulting function will always have exactly one upvalue,
+the <code>_ENV</code> variable (see <a href="#2.2">&sect;2.2</a>).
+However,
+when you load a binary chunk created from a function (see <a href="#pdf-string.dump"><code>string.dump</code></a>),
+the resulting function can have an arbitrary number of upvalues,
+and there is no guarantee that its first upvalue will be
+the <code>_ENV</code> variable.
+(A non-main function may not even have an <code>_ENV</code> upvalue.)
+
+
+<p>
+Regardless, if the resulting function has any upvalues,
+its first upvalue is set to the value of <code>env</code>,
+if that parameter is given,
+or to the value of the global environment.
+Other upvalues are initialized with <b>nil</b>.
+All upvalues are fresh, that is,
+they are not shared with any other function.
+
+
+<p>
+<code>chunkname</code> is used as the name of the chunk for error messages
+and debug information (see <a href="#4.7">&sect;4.7</a>).
+When absent,
+it defaults to <code>chunk</code>, if <code>chunk</code> is a string,
+or to "<code>=(load)</code>" otherwise.
+
+
+<p>
+The string <code>mode</code> controls whether the chunk can be text or binary
+(that is, a precompiled chunk).
+It may be the string "<code>b</code>" (only binary chunks),
+"<code>t</code>" (only text chunks),
+or "<code>bt</code>" (both binary and text).
+The default is "<code>bt</code>".
+
+
+<p>
+It is safe to load malformed binary chunks;
+<code>load</code> signals an appropriate error.
+However,
+Lua does not check the consistency of the code inside binary chunks;
+running maliciously crafted bytecode can crash the interpreter.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-loadfile"><code>loadfile ([filename [, mode [, env]]])</code></a></h3>
+
+
+<p>
+Similar to <a href="#pdf-load"><code>load</code></a>,
+but gets the chunk from file <code>filename</code>
+or from the standard input,
+if no file name is given.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-next"><code>next (table [, index])</code></a></h3>
+
+
+<p>
+Allows a program to traverse all fields of a table.
+Its first argument is a table and its second argument
+is an index in this table.
+A call to <code>next</code> returns the next index of the table
+and its associated value.
+When called with <b>nil</b> as its second argument,
+<code>next</code> returns an initial index
+and its associated value.
+When called with the last index,
+or with <b>nil</b> in an empty table,
+<code>next</code> returns <b>nil</b>.
+If the second argument is absent, then it is interpreted as <b>nil</b>.
+In particular,
+you can use <code>next(t)</code> to check whether a table is empty.
+
+
+<p>
+The order in which the indices are enumerated is not specified,
+<em>even for numeric indices</em>.
+(To traverse a table in numerical order,
+use a numerical <b>for</b>.)
+
+
+<p>
+You should not assign any value to a non-existent field in a table
+during its traversal.
+You may however modify existing fields.
+In particular, you may set existing fields to nil.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-pairs"><code>pairs (t)</code></a></h3>
+
+
+<p>
+If <code>t</code> has a metamethod <code>__pairs</code>,
+calls it with <code>t</code> as argument and returns the first three
+results from the call.
+
+
+<p>
+Otherwise,
+returns three values: the <a href="#pdf-next"><code>next</code></a> function, the table <code>t</code>, and <b>nil</b>,
+so that the construction
+
+<pre>
+     for k,v in pairs(t) do <em>body</em> end
+</pre><p>
+will iterate over all key&ndash;value pairs of table <code>t</code>.
+
+
+<p>
+See function <a href="#pdf-next"><code>next</code></a> for the caveats of modifying
+the table during its traversal.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-pcall"><code>pcall (f [, arg1, &middot;&middot;&middot;])</code></a></h3>
+
+
+<p>
+Calls the function <code>f</code> with
+the given arguments in <em>protected mode</em>.
+This means that any error inside&nbsp;<code>f</code> is not propagated;
+instead, <code>pcall</code> catches the error
+and returns a status code.
+Its first result is the status code (a boolean),
+which is <b>true</b> if the call succeeds without errors.
+In such case, <code>pcall</code> also returns all results from the call,
+after this first result.
+In case of any error, <code>pcall</code> returns <b>false</b> plus the error object.
+Note that errors caught by <code>pcall</code> do not call a message handler.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-print"><code>print (&middot;&middot;&middot;)</code></a></h3>
+Receives any number of arguments
+and prints their values to <code>stdout</code>,
+converting each argument to a string
+following the same rules of <a href="#pdf-tostring"><code>tostring</code></a>.
+
+
+<p>
+The function <code>print</code> is not intended for formatted output,
+but only as a quick way to show a value,
+for instance for debugging.
+For complete control over the output,
+use <a href="#pdf-string.format"><code>string.format</code></a> and <a href="#pdf-io.write"><code>io.write</code></a>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-rawequal"><code>rawequal (v1, v2)</code></a></h3>
+Checks whether <code>v1</code> is equal to <code>v2</code>,
+without invoking the <code>__eq</code> metamethod.
+Returns a boolean.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-rawget"><code>rawget (table, index)</code></a></h3>
+Gets the real value of <code>table[index]</code>,
+without using the <code>__index</code> metavalue.
+<code>table</code> must be a table;
+<code>index</code> may be any value.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-rawlen"><code>rawlen (v)</code></a></h3>
+Returns the length of the object <code>v</code>,
+which must be a table or a string,
+without invoking the <code>__len</code> metamethod.
+Returns an integer.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-rawset"><code>rawset (table, index, value)</code></a></h3>
+Sets the real value of <code>table[index]</code> to <code>value</code>,
+without using the <code>__newindex</code> metavalue.
+<code>table</code> must be a table,
+<code>index</code> any value different from <b>nil</b> and NaN,
+and <code>value</code> any Lua value.
+
+
+<p>
+This function returns <code>table</code>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-select"><code>select (index, &middot;&middot;&middot;)</code></a></h3>
+
+
+<p>
+If <code>index</code> is a number,
+returns all arguments after argument number <code>index</code>;
+a negative number indexes from the end (-1 is the last argument).
+Otherwise, <code>index</code> must be the string <code>"#"</code>,
+and <code>select</code> returns the total number of extra arguments it received.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-setmetatable"><code>setmetatable (table, metatable)</code></a></h3>
+
+
+<p>
+Sets the metatable for the given table.
+If <code>metatable</code> is <b>nil</b>,
+removes the metatable of the given table.
+If the original metatable has a <code>__metatable</code> field,
+raises an error.
+
+
+<p>
+This function returns <code>table</code>.
+
+
+<p>
+To change the metatable of other types from Lua code,
+you must use the debug library (<a href="#6.10">&sect;6.10</a>).
+
+
+
+
+<p>
+<hr><h3><a name="pdf-tonumber"><code>tonumber (e [, base])</code></a></h3>
+
+
+<p>
+When called with no <code>base</code>,
+<code>tonumber</code> tries to convert its argument to a number.
+If the argument is already a number or
+a string convertible to a number,
+then <code>tonumber</code> returns this number;
+otherwise, it returns <b>fail</b>.
+
+
+<p>
+The conversion of strings can result in integers or floats,
+according to the lexical conventions of Lua (see <a href="#3.1">&sect;3.1</a>).
+The string may have leading and trailing spaces and a sign.
+
+
+<p>
+When called with <code>base</code>,
+then <code>e</code> must be a string to be interpreted as
+an integer numeral in that base.
+The base may be any integer between 2 and 36, inclusive.
+In bases above&nbsp;10, the letter '<code>A</code>' (in either upper or lower case)
+represents&nbsp;10, '<code>B</code>' represents&nbsp;11, and so forth,
+with '<code>Z</code>' representing 35.
+If the string <code>e</code> is not a valid numeral in the given base,
+the function returns <b>fail</b>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-tostring"><code>tostring (v)</code></a></h3>
+
+
+<p>
+Receives a value of any type and
+converts it to a string in a human-readable format.
+
+
+<p>
+If the metatable of <code>v</code> has a <code>__tostring</code> field,
+then <code>tostring</code> calls the corresponding value
+with <code>v</code> as argument,
+and uses the result of the call as its result.
+Otherwise, if the metatable of <code>v</code> has a <code>__name</code> field
+with a string value,
+<code>tostring</code> may use that string in its final result.
+
+
+<p>
+For complete control of how numbers are converted,
+use <a href="#pdf-string.format"><code>string.format</code></a>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-type"><code>type (v)</code></a></h3>
+
+
+<p>
+Returns the type of its only argument, coded as a string.
+The possible results of this function are
+"<code>nil</code>" (a string, not the value <b>nil</b>),
+"<code>number</code>",
+"<code>string</code>",
+"<code>boolean</code>",
+"<code>table</code>",
+"<code>function</code>",
+"<code>thread</code>",
+and "<code>userdata</code>".
+
+
+
+
+<p>
+<hr><h3><a name="pdf-_VERSION"><code>_VERSION</code></a></h3>
+
+
+<p>
+A global variable (not a function) that
+holds a string containing the running Lua version.
+The current value of this variable is "<code>Lua 5.4</code>".
+
+
+
+
+<p>
+<hr><h3><a name="pdf-warn"><code>warn (msg1, &middot;&middot;&middot;)</code></a></h3>
+
+
+<p>
+Emits a warning with a message composed by the concatenation
+of all its arguments (which should be strings).
+
+
+<p>
+By convention,
+a one-piece message starting with '<code>@</code>'
+is intended to be a <em>control message</em>,
+which is a message to the warning system itself.
+In particular, the standard warning function in Lua
+recognizes the control messages "<code>@off</code>",
+to stop the emission of warnings,
+and "<code>@on</code>", to (re)start the emission;
+it ignores unknown control messages.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-xpcall"><code>xpcall (f, msgh [, arg1, &middot;&middot;&middot;])</code></a></h3>
+
+
+<p>
+This function is similar to <a href="#pdf-pcall"><code>pcall</code></a>,
+except that it sets a new message handler <code>msgh</code>.
+
+
+
+
+
+
+
+<h2>6.2 &ndash; <a name="6.2">Coroutine Manipulation</a></h2>
+
+<p>
+This library comprises the operations to manipulate coroutines,
+which come inside the table <a name="pdf-coroutine"><code>coroutine</code></a>.
+See <a href="#2.6">&sect;2.6</a> for a general description of coroutines.
+
+
+<p>
+<hr><h3><a name="pdf-coroutine.close"><code>coroutine.close (co)</code></a></h3>
+
+
+<p>
+Closes coroutine <code>co</code>,
+that is,
+closes all its pending to-be-closed variables
+and puts the coroutine in a dead state.
+The given coroutine must be dead or suspended.
+In case of error
+(either the original error that stopped the coroutine or
+errors in closing methods),
+returns <b>false</b> plus the error object;
+otherwise returns <b>true</b>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-coroutine.create"><code>coroutine.create (f)</code></a></h3>
+
+
+<p>
+Creates a new coroutine, with body <code>f</code>.
+<code>f</code> must be a function.
+Returns this new coroutine,
+an object with type <code>"thread"</code>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-coroutine.isyieldable"><code>coroutine.isyieldable ([co])</code></a></h3>
+
+
+<p>
+Returns <b>true</b> when the coroutine <code>co</code> can yield.
+The default for <code>co</code> is the running coroutine.
+
+
+<p>
+A coroutine is yieldable if it is not the main thread and
+it is not inside a non-yieldable C&nbsp;function.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-coroutine.resume"><code>coroutine.resume (co [, val1, &middot;&middot;&middot;])</code></a></h3>
+
+
+<p>
+Starts or continues the execution of coroutine <code>co</code>.
+The first time you resume a coroutine,
+it starts running its body.
+The values <code>val1</code>, ... are passed
+as the arguments to the body function.
+If the coroutine has yielded,
+<code>resume</code> restarts it;
+the values <code>val1</code>, ... are passed
+as the results from the yield.
+
+
+<p>
+If the coroutine runs without any errors,
+<code>resume</code> returns <b>true</b> plus any values passed to <code>yield</code>
+(when the coroutine yields) or any values returned by the body function
+(when the coroutine terminates).
+If there is any error,
+<code>resume</code> returns <b>false</b> plus the error message.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-coroutine.running"><code>coroutine.running ()</code></a></h3>
+
+
+<p>
+Returns the running coroutine plus a boolean,
+<b>true</b> when the running coroutine is the main one.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-coroutine.status"><code>coroutine.status (co)</code></a></h3>
+
+
+<p>
+Returns the status of the coroutine <code>co</code>, as a string:
+<code>"running"</code>,
+if the coroutine is running
+(that is, it is the one that called <code>status</code>);
+<code>"suspended"</code>, if the coroutine is suspended in a call to <code>yield</code>,
+or if it has not started running yet;
+<code>"normal"</code> if the coroutine is active but not running
+(that is, it has resumed another coroutine);
+and <code>"dead"</code> if the coroutine has finished its body function,
+or if it has stopped with an error.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-coroutine.wrap"><code>coroutine.wrap (f)</code></a></h3>
+
+
+<p>
+Creates a new coroutine, with body <code>f</code>;
+<code>f</code> must be a function.
+Returns a function that resumes the coroutine each time it is called.
+Any arguments passed to this function behave as the
+extra arguments to <code>resume</code>.
+The function returns the same values returned by <code>resume</code>,
+except the first boolean.
+In case of error,
+the function closes the coroutine and propagates the error.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-coroutine.yield"><code>coroutine.yield (&middot;&middot;&middot;)</code></a></h3>
+
+
+<p>
+Suspends the execution of the calling coroutine.
+Any arguments to <code>yield</code> are passed as extra results to <code>resume</code>.
+
+
+
+
+
+
+
+<h2>6.3 &ndash; <a name="6.3">Modules</a></h2>
+
+<p>
+The package library provides basic
+facilities for loading modules in Lua.
+It exports one function directly in the global environment:
+<a href="#pdf-require"><code>require</code></a>.
+Everything else is exported in the table <a name="pdf-package"><code>package</code></a>.
+
+
+<p>
+<hr><h3><a name="pdf-require"><code>require (modname)</code></a></h3>
+
+
+<p>
+Loads the given module.
+The function starts by looking into the <a href="#pdf-package.loaded"><code>package.loaded</code></a> table
+to determine whether <code>modname</code> is already loaded.
+If it is, then <code>require</code> returns the value stored
+at <code>package.loaded[modname]</code>.
+(The absence of a second result in this case
+signals that this call did not have to load the module.)
+Otherwise, it tries to find a <em>loader</em> for the module.
+
+
+<p>
+To find a loader,
+<code>require</code> is guided by the table <a href="#pdf-package.searchers"><code>package.searchers</code></a>.
+Each item in this table is a search function,
+that searches for the module in a particular way.
+By changing this table,
+we can change how <code>require</code> looks for a module.
+The following explanation is based on the default configuration
+for <a href="#pdf-package.searchers"><code>package.searchers</code></a>.
+
+
+<p>
+First <code>require</code> queries <code>package.preload[modname]</code>.
+If it has a value,
+this value (which must be a function) is the loader.
+Otherwise <code>require</code> searches for a Lua loader using the
+path stored in <a href="#pdf-package.path"><code>package.path</code></a>.
+If that also fails, it searches for a C&nbsp;loader using the
+path stored in <a href="#pdf-package.cpath"><code>package.cpath</code></a>.
+If that also fails,
+it tries an <em>all-in-one</em> loader (see <a href="#pdf-package.searchers"><code>package.searchers</code></a>).
+
+
+<p>
+Once a loader is found,
+<code>require</code> calls the loader with two arguments:
+<code>modname</code> and an extra value,
+a <em>loader data</em>,
+also returned by the searcher.
+The loader data can be any value useful to the module;
+for the default searchers,
+it indicates where the loader was found.
+(For instance, if the loader came from a file,
+this extra value is the file path.)
+If the loader returns any non-nil value,
+<code>require</code> assigns the returned value to <code>package.loaded[modname]</code>.
+If the loader does not return a non-nil value and
+has not assigned any value to <code>package.loaded[modname]</code>,
+then <code>require</code> assigns <b>true</b> to this entry.
+In any case, <code>require</code> returns the
+final value of <code>package.loaded[modname]</code>.
+Besides that value, <code>require</code> also returns as a second result
+the loader data returned by the searcher,
+which indicates how <code>require</code> found the module.
+
+
+<p>
+If there is any error loading or running the module,
+or if it cannot find any loader for the module,
+then <code>require</code> raises an error.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-package.config"><code>package.config</code></a></h3>
+
+
+<p>
+A string describing some compile-time configurations for packages.
+This string is a sequence of lines:
+
+<ul>
+
+<li>The first line is the directory separator string.
+Default is '<code>\</code>' for Windows and '<code>/</code>' for all other systems.</li>
+
+<li>The second line is the character that separates templates in a path.
+Default is '<code>;</code>'.</li>
+
+<li>The third line is the string that marks the
+substitution points in a template.
+Default is '<code>?</code>'.</li>
+
+<li>The fourth line is a string that, in a path in Windows,
+is replaced by the executable's directory.
+Default is '<code>!</code>'.</li>
+
+<li>The fifth line is a mark to ignore all text after it
+when building the <code>luaopen_</code> function name.
+Default is '<code>-</code>'.</li>
+
+</ul>
+
+
+
+<p>
+<hr><h3><a name="pdf-package.cpath"><code>package.cpath</code></a></h3>
+
+
+<p>
+A string with the path used by <a href="#pdf-require"><code>require</code></a>
+to search for a C&nbsp;loader.
+
+
+<p>
+Lua initializes the C&nbsp;path <a href="#pdf-package.cpath"><code>package.cpath</code></a> in the same way
+it initializes the Lua path <a href="#pdf-package.path"><code>package.path</code></a>,
+using the environment variable <a name="pdf-LUA_CPATH_5_4"><code>LUA_CPATH_5_4</code></a>,
+or the environment variable <a name="pdf-LUA_CPATH"><code>LUA_CPATH</code></a>,
+or a default path defined in <code>luaconf.h</code>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-package.loaded"><code>package.loaded</code></a></h3>
+
+
+<p>
+A table used by <a href="#pdf-require"><code>require</code></a> to control which
+modules are already loaded.
+When you require a module <code>modname</code> and
+<code>package.loaded[modname]</code> is not false,
+<a href="#pdf-require"><code>require</code></a> simply returns the value stored there.
+
+
+<p>
+This variable is only a reference to the real table;
+assignments to this variable do not change the
+table used by <a href="#pdf-require"><code>require</code></a>.
+The real table is stored in the C registry (see <a href="#4.3">&sect;4.3</a>),
+indexed by the key <a name="pdf-LUA_LOADED_TABLE"><code>LUA_LOADED_TABLE</code></a>, a string.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-package.loadlib"><code>package.loadlib (libname, funcname)</code></a></h3>
+
+
+<p>
+Dynamically links the host program with the C&nbsp;library <code>libname</code>.
+
+
+<p>
+If <code>funcname</code> is "<code>*</code>",
+then it only links with the library,
+making the symbols exported by the library
+available to other dynamically linked libraries.
+Otherwise,
+it looks for a function <code>funcname</code> inside the library
+and returns this function as a C&nbsp;function.
+So, <code>funcname</code> must follow the <a href="#lua_CFunction"><code>lua_CFunction</code></a> prototype
+(see <a href="#lua_CFunction"><code>lua_CFunction</code></a>).
+
+
+<p>
+This is a low-level function.
+It completely bypasses the package and module system.
+Unlike <a href="#pdf-require"><code>require</code></a>,
+it does not perform any path searching and
+does not automatically adds extensions.
+<code>libname</code> must be the complete file name of the C&nbsp;library,
+including if necessary a path and an extension.
+<code>funcname</code> must be the exact name exported by the C&nbsp;library
+(which may depend on the C&nbsp;compiler and linker used).
+
+
+<p>
+This functionality is not supported by ISO&nbsp;C.
+As such, it is only available on some platforms
+(Windows, Linux, Mac OS X, Solaris, BSD,
+plus other Unix systems that support the <code>dlfcn</code> standard).
+
+
+<p>
+This function is inherently insecure,
+as it allows Lua to call any function in any readable dynamic
+library in the system.
+(Lua calls any function assuming the function
+has a proper prototype and respects a proper protocol
+(see <a href="#lua_CFunction"><code>lua_CFunction</code></a>).
+Therefore,
+calling an arbitrary function in an arbitrary dynamic library
+more often than not results in an access violation.)
+
+
+
+
+<p>
+<hr><h3><a name="pdf-package.path"><code>package.path</code></a></h3>
+
+
+<p>
+A string with the path used by <a href="#pdf-require"><code>require</code></a>
+to search for a Lua loader.
+
+
+<p>
+At start-up, Lua initializes this variable with
+the value of the environment variable <a name="pdf-LUA_PATH_5_4"><code>LUA_PATH_5_4</code></a> or
+the environment variable <a name="pdf-LUA_PATH"><code>LUA_PATH</code></a> or
+with a default path defined in <code>luaconf.h</code>,
+if those environment variables are not defined.
+A "<code>;;</code>" in the value of the environment variable
+is replaced by the default path.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-package.preload"><code>package.preload</code></a></h3>
+
+
+<p>
+A table to store loaders for specific modules
+(see <a href="#pdf-require"><code>require</code></a>).
+
+
+<p>
+This variable is only a reference to the real table;
+assignments to this variable do not change the
+table used by <a href="#pdf-require"><code>require</code></a>.
+The real table is stored in the C registry (see <a href="#4.3">&sect;4.3</a>),
+indexed by the key <a name="pdf-LUA_PRELOAD_TABLE"><code>LUA_PRELOAD_TABLE</code></a>, a string.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-package.searchers"><code>package.searchers</code></a></h3>
+
+
+<p>
+A table used by <a href="#pdf-require"><code>require</code></a> to control how to find modules.
+
+
+<p>
+Each entry in this table is a <em>searcher function</em>.
+When looking for a module,
+<a href="#pdf-require"><code>require</code></a> calls each of these searchers in ascending order,
+with the module name (the argument given to <a href="#pdf-require"><code>require</code></a>) as its
+sole argument.
+If the searcher finds the module,
+it returns another function, the module <em>loader</em>,
+plus an extra value, a <em>loader data</em>,
+that will be passed to that loader and
+returned as a second result by <a href="#pdf-require"><code>require</code></a>.
+If it cannot find the module,
+it returns a string explaining why
+(or <b>nil</b> if it has nothing to say).
+
+
+<p>
+Lua initializes this table with four searcher functions.
+
+
+<p>
+The first searcher simply looks for a loader in the
+<a href="#pdf-package.preload"><code>package.preload</code></a> table.
+
+
+<p>
+The second searcher looks for a loader as a Lua library,
+using the path stored at <a href="#pdf-package.path"><code>package.path</code></a>.
+The search is done as described in function <a href="#pdf-package.searchpath"><code>package.searchpath</code></a>.
+
+
+<p>
+The third searcher looks for a loader as a C&nbsp;library,
+using the path given by the variable <a href="#pdf-package.cpath"><code>package.cpath</code></a>.
+Again,
+the search is done as described in function <a href="#pdf-package.searchpath"><code>package.searchpath</code></a>.
+For instance,
+if the C&nbsp;path is the string
+
+<pre>
+     "./?.so;./?.dll;/usr/local/?/init.so"
+</pre><p>
+the searcher for module <code>foo</code>
+will try to open the files <code>./foo.so</code>, <code>./foo.dll</code>,
+and <code>/usr/local/foo/init.so</code>, in that order.
+Once it finds a C&nbsp;library,
+this searcher first uses a dynamic link facility to link the
+application with the library.
+Then it tries to find a C&nbsp;function inside the library to
+be used as the loader.
+The name of this C&nbsp;function is the string "<code>luaopen_</code>"
+concatenated with a copy of the module name where each dot
+is replaced by an underscore.
+Moreover, if the module name has a hyphen,
+its suffix after (and including) the first hyphen is removed.
+For instance, if the module name is <code>a.b.c-v2.1</code>,
+the function name will be <code>luaopen_a_b_c</code>.
+
+
+<p>
+The fourth searcher tries an <em>all-in-one loader</em>.
+It searches the C&nbsp;path for a library for
+the root name of the given module.
+For instance, when requiring <code>a.b.c</code>,
+it will search for a C&nbsp;library for <code>a</code>.
+If found, it looks into it for an open function for
+the submodule;
+in our example, that would be <code>luaopen_a_b_c</code>.
+With this facility, a package can pack several C&nbsp;submodules
+into one single library,
+with each submodule keeping its original open function.
+
+
+<p>
+All searchers except the first one (preload) return as the extra value
+the file path where the module was found,
+as returned by <a href="#pdf-package.searchpath"><code>package.searchpath</code></a>.
+The first searcher always returns the string "<code>:preload:</code>".
+
+
+<p>
+Searchers should raise no errors and have no side effects in Lua.
+(They may have side effects in C,
+for instance by linking the application with a library.)
+
+
+
+
+<p>
+<hr><h3><a name="pdf-package.searchpath"><code>package.searchpath (name, path [, sep [, rep]])</code></a></h3>
+
+
+<p>
+Searches for the given <code>name</code> in the given <code>path</code>.
+
+
+<p>
+A path is a string containing a sequence of
+<em>templates</em> separated by semicolons.
+For each template,
+the function replaces each interrogation mark (if any)
+in the template with a copy of <code>name</code>
+wherein all occurrences of <code>sep</code>
+(a dot, by default)
+were replaced by <code>rep</code>
+(the system's directory separator, by default),
+and then tries to open the resulting file name.
+
+
+<p>
+For instance, if the path is the string
+
+<pre>
+     "./?.lua;./?.lc;/usr/local/?/init.lua"
+</pre><p>
+the search for the name <code>foo.a</code>
+will try to open the files
+<code>./foo/a.lua</code>, <code>./foo/a.lc</code>, and
+<code>/usr/local/foo/a/init.lua</code>, in that order.
+
+
+<p>
+Returns the resulting name of the first file that it can
+open in read mode (after closing the file),
+or <b>fail</b> plus an error message if none succeeds.
+(This error message lists all file names it tried to open.)
+
+
+
+
+
+
+
+<h2>6.4 &ndash; <a name="6.4">String Manipulation</a></h2>
+
+
+
+<p>
+This library provides generic functions for string manipulation,
+such as finding and extracting substrings, and pattern matching.
+When indexing a string in Lua, the first character is at position&nbsp;1
+(not at&nbsp;0, as in C).
+Indices are allowed to be negative and are interpreted as indexing backwards,
+from the end of the string.
+Thus, the last character is at position -1, and so on.
+
+
+<p>
+The string library provides all its functions inside the table
+<a name="pdf-string"><code>string</code></a>.
+It also sets a metatable for strings
+where the <code>__index</code> field points to the <code>string</code> table.
+Therefore, you can use the string functions in object-oriented style.
+For instance, <code>string.byte(s,i)</code>
+can be written as <code>s:byte(i)</code>.
+
+
+<p>
+The string library assumes one-byte character encodings.
+
+
+<p>
+<hr><h3><a name="pdf-string.byte"><code>string.byte (s [, i [, j]])</code></a></h3>
+Returns the internal numeric codes of the characters <code>s[i]</code>,
+<code>s[i+1]</code>, ..., <code>s[j]</code>.
+The default value for <code>i</code> is&nbsp;1;
+the default value for <code>j</code> is&nbsp;<code>i</code>.
+These indices are corrected
+following the same rules of function <a href="#pdf-string.sub"><code>string.sub</code></a>.
+
+
+<p>
+Numeric codes are not necessarily portable across platforms.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-string.char"><code>string.char (&middot;&middot;&middot;)</code></a></h3>
+Receives zero or more integers.
+Returns a string with length equal to the number of arguments,
+in which each character has the internal numeric code equal
+to its corresponding argument.
+
+
+<p>
+Numeric codes are not necessarily portable across platforms.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-string.dump"><code>string.dump (function [, strip])</code></a></h3>
+
+
+<p>
+Returns a string containing a binary representation
+(a <em>binary chunk</em>)
+of the given function,
+so that a later <a href="#pdf-load"><code>load</code></a> on this string returns
+a copy of the function (but with new upvalues).
+If <code>strip</code> is a true value,
+the binary representation may not include all debug information
+about the function,
+to save space.
+
+
+<p>
+Functions with upvalues have only their number of upvalues saved.
+When (re)loaded,
+those upvalues receive fresh instances.
+(See the <a href="#pdf-load"><code>load</code></a> function for details about
+how these upvalues are initialized.
+You can use the debug library to serialize
+and reload the upvalues of a function
+in a way adequate to your needs.)
+
+
+
+
+<p>
+<hr><h3><a name="pdf-string.find"><code>string.find (s, pattern [, init [, plain]])</code></a></h3>
+
+
+<p>
+Looks for the first match of
+<code>pattern</code> (see <a href="#6.4.1">&sect;6.4.1</a>) in the string <code>s</code>.
+If it finds a match, then <code>find</code> returns the indices of&nbsp;<code>s</code>
+where this occurrence starts and ends;
+otherwise, it returns <b>fail</b>.
+A third, optional numeric argument <code>init</code> specifies
+where to start the search;
+its default value is&nbsp;1 and can be negative.
+A <b>true</b> as a fourth, optional argument <code>plain</code>
+turns off the pattern matching facilities,
+so the function does a plain "find substring" operation,
+with no characters in <code>pattern</code> being considered magic.
+
+
+<p>
+If the pattern has captures,
+then in a successful match
+the captured values are also returned,
+after the two indices.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-string.format"><code>string.format (formatstring, &middot;&middot;&middot;)</code></a></h3>
+
+
+<p>
+Returns a formatted version of its variable number of arguments
+following the description given in its first argument,
+which must be a string.
+The format string follows the same rules as the ISO&nbsp;C function <code>sprintf</code>.
+The only differences are that the conversion specifiers and modifiers
+<code>F</code>, <code>n</code>, <code>*</code>, <code>h</code>, <code>L</code>, and <code>l</code> are not supported
+and that there is an extra specifier, <code>q</code>.
+Both width and precision, when present,
+are limited to two digits.
+
+
+<p>
+The specifier <code>q</code> formats booleans, nil, numbers, and strings
+in a way that the result is a valid constant in Lua source code.
+Booleans and nil are written in the obvious way
+(<code>true</code>, <code>false</code>, <code>nil</code>).
+Floats are written in hexadecimal,
+to preserve full precision.
+A string is written between double quotes,
+using escape sequences when necessary to ensure that
+it can safely be read back by the Lua interpreter.
+For instance, the call
+
+<pre>
+     string.format('%q', 'a string with "quotes" and \n new line')
+</pre><p>
+may produce the string:
+
+<pre>
+     "a string with \"quotes\" and \
+      new line"
+</pre><p>
+This specifier does not support modifiers (flags, width, precision).
+
+
+<p>
+The conversion specifiers
+<code>A</code>, <code>a</code>, <code>E</code>, <code>e</code>, <code>f</code>,
+<code>G</code>, and <code>g</code> all expect a number as argument.
+The specifiers <code>c</code>, <code>d</code>,
+<code>i</code>, <code>o</code>, <code>u</code>, <code>X</code>, and <code>x</code>
+expect an integer.
+When Lua is compiled with a C89 compiler,
+the specifiers <code>A</code> and <code>a</code> (hexadecimal floats)
+do not support modifiers.
+
+
+<p>
+The specifier <code>s</code> expects a string;
+if its argument is not a string,
+it is converted to one following the same rules of <a href="#pdf-tostring"><code>tostring</code></a>.
+If the specifier has any modifier,
+the corresponding string argument should not contain embedded zeros.
+
+
+<p>
+The specifier <code>p</code> formats the pointer
+returned by <a href="#lua_topointer"><code>lua_topointer</code></a>.
+That gives a unique string identifier for tables, userdata,
+threads, strings, and functions.
+For other values (numbers, nil, booleans),
+this specifier results in a string representing
+the pointer <code>NULL</code>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-string.gmatch"><code>string.gmatch (s, pattern [, init])</code></a></h3>
+Returns an iterator function that,
+each time it is called,
+returns the next captures from <code>pattern</code> (see <a href="#6.4.1">&sect;6.4.1</a>)
+over the string <code>s</code>.
+If <code>pattern</code> specifies no captures,
+then the whole match is produced in each call.
+A third, optional numeric argument <code>init</code> specifies
+where to start the search;
+its default value is&nbsp;1 and can be negative.
+
+
+<p>
+As an example, the following loop
+will iterate over all the words from string <code>s</code>,
+printing one per line:
+
+<pre>
+     s = "hello world from Lua"
+     for w in string.gmatch(s, "%a+") do
+       print(w)
+     end
+</pre><p>
+The next example collects all pairs <code>key=value</code> from the
+given string into a table:
+
+<pre>
+     t = {}
+     s = "from=world, to=Lua"
+     for k, v in string.gmatch(s, "(%w+)=(%w+)") do
+       t[k] = v
+     end
+</pre>
+
+<p>
+For this function, a caret '<code>^</code>' at the start of a pattern does not
+work as an anchor, as this would prevent the iteration.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-string.gsub"><code>string.gsub (s, pattern, repl [, n])</code></a></h3>
+Returns a copy of <code>s</code>
+in which all (or the first <code>n</code>, if given)
+occurrences of the <code>pattern</code> (see <a href="#6.4.1">&sect;6.4.1</a>) have been
+replaced by a replacement string specified by <code>repl</code>,
+which can be a string, a table, or a function.
+<code>gsub</code> also returns, as its second value,
+the total number of matches that occurred.
+The name <code>gsub</code> comes from <em>Global SUBstitution</em>.
+
+
+<p>
+If <code>repl</code> is a string, then its value is used for replacement.
+The character&nbsp;<code>%</code> works as an escape character:
+any sequence in <code>repl</code> of the form <code>%<em>d</em></code>,
+with <em>d</em> between 1 and 9,
+stands for the value of the <em>d</em>-th captured substring;
+the sequence <code>%0</code> stands for the whole match;
+the sequence <code>%%</code> stands for a single&nbsp;<code>%</code>.
+
+
+<p>
+If <code>repl</code> is a table, then the table is queried for every match,
+using the first capture as the key.
+
+
+<p>
+If <code>repl</code> is a function, then this function is called every time a
+match occurs, with all captured substrings passed as arguments,
+in order.
+
+
+<p>
+In any case,
+if the pattern specifies no captures,
+then it behaves as if the whole pattern was inside a capture.
+
+
+<p>
+If the value returned by the table query or by the function call
+is a string or a number,
+then it is used as the replacement string;
+otherwise, if it is <b>false</b> or <b>nil</b>,
+then there is no replacement
+(that is, the original match is kept in the string).
+
+
+<p>
+Here are some examples:
+
+<pre>
+     x = string.gsub("hello world", "(%w+)", "%1 %1")
+     --&gt; x="hello hello world world"
+     
+     x = string.gsub("hello world", "%w+", "%0 %0", 1)
+     --&gt; x="hello hello world"
+     
+     x = string.gsub("hello world from Lua", "(%w+)%s*(%w+)", "%2 %1")
+     --&gt; x="world hello Lua from"
+     
+     x = string.gsub("home = $HOME, user = $USER", "%$(%w+)", os.getenv)
+     --&gt; x="home = /home/roberto, user = roberto"
+     
+     x = string.gsub("4+5 = $return 4+5$", "%$(.-)%$", function (s)
+           return load(s)()
+         end)
+     --&gt; x="4+5 = 9"
+     
+     local t = {name="lua", version="5.4"}
+     x = string.gsub("$name-$version.tar.gz", "%$(%w+)", t)
+     --&gt; x="lua-5.4.tar.gz"
+</pre>
+
+
+
+<p>
+<hr><h3><a name="pdf-string.len"><code>string.len (s)</code></a></h3>
+
+
+<p>
+Receives a string and returns its length.
+The empty string <code>""</code> has length 0.
+Embedded zeros are counted,
+so <code>"a\000bc\000"</code> has length 5.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-string.lower"><code>string.lower (s)</code></a></h3>
+
+
+<p>
+Receives a string and returns a copy of this string with all
+uppercase letters changed to lowercase.
+All other characters are left unchanged.
+The definition of what an uppercase letter is depends on the current locale.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-string.match"><code>string.match (s, pattern [, init])</code></a></h3>
+
+
+<p>
+Looks for the first <em>match</em> of
+the <code>pattern</code> (see <a href="#6.4.1">&sect;6.4.1</a>) in the string <code>s</code>.
+If it finds one, then <code>match</code> returns
+the captures from the pattern;
+otherwise it returns <b>fail</b>.
+If <code>pattern</code> specifies no captures,
+then the whole match is returned.
+A third, optional numeric argument <code>init</code> specifies
+where to start the search;
+its default value is&nbsp;1 and can be negative.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-string.pack"><code>string.pack (fmt, v1, v2, &middot;&middot;&middot;)</code></a></h3>
+
+
+<p>
+Returns a binary string containing the values <code>v1</code>, <code>v2</code>, etc.
+serialized in binary form (packed)
+according to the format string <code>fmt</code> (see <a href="#6.4.2">&sect;6.4.2</a>).
+
+
+
+
+<p>
+<hr><h3><a name="pdf-string.packsize"><code>string.packsize (fmt)</code></a></h3>
+
+
+<p>
+Returns the length of a string resulting from <a href="#pdf-string.pack"><code>string.pack</code></a>
+with the given format.
+The format string cannot have the variable-length options
+'<code>s</code>' or '<code>z</code>' (see <a href="#6.4.2">&sect;6.4.2</a>).
+
+
+
+
+<p>
+<hr><h3><a name="pdf-string.rep"><code>string.rep (s, n [, sep])</code></a></h3>
+
+
+<p>
+Returns a string that is the concatenation of <code>n</code> copies of
+the string <code>s</code> separated by the string <code>sep</code>.
+The default value for <code>sep</code> is the empty string
+(that is, no separator).
+Returns the empty string if <code>n</code> is not positive.
+
+
+<p>
+(Note that it is very easy to exhaust the memory of your machine
+with a single call to this function.)
+
+
+
+
+<p>
+<hr><h3><a name="pdf-string.reverse"><code>string.reverse (s)</code></a></h3>
+
+
+<p>
+Returns a string that is the string <code>s</code> reversed.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-string.sub"><code>string.sub (s, i [, j])</code></a></h3>
+
+
+<p>
+Returns the substring of <code>s</code> that
+starts at <code>i</code>  and continues until <code>j</code>;
+<code>i</code> and <code>j</code> can be negative.
+If <code>j</code> is absent, then it is assumed to be equal to -1
+(which is the same as the string length).
+In particular,
+the call <code>string.sub(s,1,j)</code> returns a prefix of <code>s</code>
+with length <code>j</code>,
+and <code>string.sub(s, -i)</code> (for a positive <code>i</code>)
+returns a suffix of <code>s</code>
+with length <code>i</code>.
+
+
+<p>
+If, after the translation of negative indices,
+<code>i</code> is less than 1,
+it is corrected to 1.
+If <code>j</code> is greater than the string length,
+it is corrected to that length.
+If, after these corrections,
+<code>i</code> is greater than <code>j</code>,
+the function returns the empty string.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-string.unpack"><code>string.unpack (fmt, s [, pos])</code></a></h3>
+
+
+<p>
+Returns the values packed in string <code>s</code> (see <a href="#pdf-string.pack"><code>string.pack</code></a>)
+according to the format string <code>fmt</code> (see <a href="#6.4.2">&sect;6.4.2</a>).
+An optional <code>pos</code> marks where
+to start reading in <code>s</code> (default is 1).
+After the read values,
+this function also returns the index of the first unread byte in <code>s</code>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-string.upper"><code>string.upper (s)</code></a></h3>
+
+
+<p>
+Receives a string and returns a copy of this string with all
+lowercase letters changed to uppercase.
+All other characters are left unchanged.
+The definition of what a lowercase letter is depends on the current locale.
+
+
+
+
+
+
+
+<h3>6.4.1 &ndash; <a name="6.4.1">Patterns</a></h3>
+
+
+
+<p>
+Patterns in Lua are described by regular strings,
+which are interpreted as patterns by the pattern-matching functions
+<a href="#pdf-string.find"><code>string.find</code></a>,
+<a href="#pdf-string.gmatch"><code>string.gmatch</code></a>,
+<a href="#pdf-string.gsub"><code>string.gsub</code></a>,
+and <a href="#pdf-string.match"><code>string.match</code></a>.
+This section describes the syntax and the meaning
+(that is, what they match) of these strings.
+
+
+
+
+
+<h4>Character Class:</h4><p>
+A <em>character class</em> is used to represent a set of characters.
+The following combinations are allowed in describing a character class:
+
+<ul>
+
+<li><b><em>x</em>: </b>
+(where <em>x</em> is not one of the <em>magic characters</em>
+<code>^$()%.[]*+-?</code>)
+represents the character <em>x</em> itself.
+</li>
+
+<li><b><code>.</code>: </b> (a dot) represents all characters.</li>
+
+<li><b><code>%a</code>: </b> represents all letters.</li>
+
+<li><b><code>%c</code>: </b> represents all control characters.</li>
+
+<li><b><code>%d</code>: </b> represents all digits.</li>
+
+<li><b><code>%g</code>: </b> represents all printable characters except space.</li>
+
+<li><b><code>%l</code>: </b> represents all lowercase letters.</li>
+
+<li><b><code>%p</code>: </b> represents all punctuation characters.</li>
+
+<li><b><code>%s</code>: </b> represents all space characters.</li>
+
+<li><b><code>%u</code>: </b> represents all uppercase letters.</li>
+
+<li><b><code>%w</code>: </b> represents all alphanumeric characters.</li>
+
+<li><b><code>%x</code>: </b> represents all hexadecimal digits.</li>
+
+<li><b><code>%<em>x</em></code>: </b> (where <em>x</em> is any non-alphanumeric character)
+represents the character <em>x</em>.
+This is the standard way to escape the magic characters.
+Any non-alphanumeric character
+(including all punctuation characters, even the non-magical)
+can be preceded by a '<code>%</code>' to represent itself in a pattern.
+</li>
+
+<li><b><code>[<em>set</em>]</code>: </b>
+represents the class which is the union of all
+characters in <em>set</em>.
+A range of characters can be specified by
+separating the end characters of the range,
+in ascending order, with a '<code>-</code>'.
+All classes <code>%</code><em>x</em> described above can also be used as
+components in <em>set</em>.
+All other characters in <em>set</em> represent themselves.
+For example, <code>[%w_]</code> (or <code>[_%w]</code>)
+represents all alphanumeric characters plus the underscore,
+<code>[0-7]</code> represents the octal digits,
+and <code>[0-7%l%-]</code> represents the octal digits plus
+the lowercase letters plus the '<code>-</code>' character.
+
+
+<p>
+You can put a closing square bracket in a set
+by positioning it as the first character in the set.
+You can put a hyphen in a set
+by positioning it as the first or the last character in the set.
+(You can also use an escape for both cases.)
+
+
+<p>
+The interaction between ranges and classes is not defined.
+Therefore, patterns like <code>[%a-z]</code> or <code>[a-%%]</code>
+have no meaning.
+</li>
+
+<li><b><code>[^<em>set</em>]</code>: </b>
+represents the complement of <em>set</em>,
+where <em>set</em> is interpreted as above.
+</li>
+
+</ul><p>
+For all classes represented by single letters (<code>%a</code>, <code>%c</code>, etc.),
+the corresponding uppercase letter represents the complement of the class.
+For instance, <code>%S</code> represents all non-space characters.
+
+
+<p>
+The definitions of letter, space, and other character groups
+depend on the current locale.
+In particular, the class <code>[a-z]</code> may not be equivalent to <code>%l</code>.
+
+
+
+
+
+<h4>Pattern Item:</h4><p>
+A <em>pattern item</em> can be
+
+<ul>
+
+<li>
+a single character class,
+which matches any single character in the class;
+</li>
+
+<li>
+a single character class followed by '<code>*</code>',
+which matches sequences of zero or more characters in the class.
+These repetition items will always match the longest possible sequence;
+</li>
+
+<li>
+a single character class followed by '<code>+</code>',
+which matches sequences of one or more characters in the class.
+These repetition items will always match the longest possible sequence;
+</li>
+
+<li>
+a single character class followed by '<code>-</code>',
+which also matches sequences of zero or more characters in the class.
+Unlike '<code>*</code>',
+these repetition items will always match the shortest possible sequence;
+</li>
+
+<li>
+a single character class followed by '<code>?</code>',
+which matches zero or one occurrence of a character in the class.
+It always matches one occurrence if possible;
+</li>
+
+<li>
+<code>%<em>n</em></code>, for <em>n</em> between 1 and 9;
+such item matches a substring equal to the <em>n</em>-th captured string
+(see below);
+</li>
+
+<li>
+<code>%b<em>xy</em></code>, where <em>x</em> and <em>y</em> are two distinct characters;
+such item matches strings that start with&nbsp;<em>x</em>, end with&nbsp;<em>y</em>,
+and where the <em>x</em> and <em>y</em> are <em>balanced</em>.
+This means that, if one reads the string from left to right,
+counting <em>+1</em> for an <em>x</em> and <em>-1</em> for a <em>y</em>,
+the ending <em>y</em> is the first <em>y</em> where the count reaches 0.
+For instance, the item <code>%b()</code> matches expressions with
+balanced parentheses.
+</li>
+
+<li>
+<code>%f[<em>set</em>]</code>, a <em>frontier pattern</em>;
+such item matches an empty string at any position such that
+the next character belongs to <em>set</em>
+and the previous character does not belong to <em>set</em>.
+The set <em>set</em> is interpreted as previously described.
+The beginning and the end of the subject are handled as if
+they were the character '<code>\0</code>'.
+</li>
+
+</ul>
+
+
+
+
+<h4>Pattern:</h4><p>
+A <em>pattern</em> is a sequence of pattern items.
+A caret '<code>^</code>' at the beginning of a pattern anchors the match at the
+beginning of the subject string.
+A '<code>$</code>' at the end of a pattern anchors the match at the
+end of the subject string.
+At other positions,
+'<code>^</code>' and '<code>$</code>' have no special meaning and represent themselves.
+
+
+
+
+
+<h4>Captures:</h4><p>
+A pattern can contain sub-patterns enclosed in parentheses;
+they describe <em>captures</em>.
+When a match succeeds, the substrings of the subject string
+that match captures are stored (<em>captured</em>) for future use.
+Captures are numbered according to their left parentheses.
+For instance, in the pattern <code>"(a*(.)%w(%s*))"</code>,
+the part of the string matching <code>"a*(.)%w(%s*)"</code> is
+stored as the first capture, and therefore has number&nbsp;1;
+the character matching "<code>.</code>" is captured with number&nbsp;2,
+and the part matching "<code>%s*</code>" has number&nbsp;3.
+
+
+<p>
+As a special case, the capture <code>()</code> captures
+the current string position (a number).
+For instance, if we apply the pattern <code>"()aa()"</code> on the
+string <code>"flaaap"</code>, there will be two captures: 3&nbsp;and&nbsp;5.
+
+
+
+
+
+<h4>Multiple matches:</h4><p>
+The function <a href="#pdf-string.gsub"><code>string.gsub</code></a> and the iterator <a href="#pdf-string.gmatch"><code>string.gmatch</code></a>
+match multiple occurrences of the given pattern in the subject.
+For these functions,
+a new match is considered valid only
+if it ends at least one byte after the end of the previous match.
+In other words, the pattern machine never accepts the
+empty string as a match immediately after another match.
+As an example,
+consider the results of the following code:
+
+<pre>
+     &gt; string.gsub("abc", "()a*()", print);
+     --&gt; 1   2
+     --&gt; 3   3
+     --&gt; 4   4
+</pre><p>
+The second and third results come from Lua matching an empty
+string after '<code>b</code>' and another one after '<code>c</code>'.
+Lua does not match an empty string after '<code>a</code>',
+because it would end at the same position of the previous match.
+
+
+
+
+
+
+
+<h3>6.4.2 &ndash; <a name="6.4.2">Format Strings for Pack and Unpack</a></h3>
+
+<p>
+The first argument to <a href="#pdf-string.pack"><code>string.pack</code></a>,
+<a href="#pdf-string.packsize"><code>string.packsize</code></a>, and <a href="#pdf-string.unpack"><code>string.unpack</code></a>
+is a format string,
+which describes the layout of the structure being created or read.
+
+
+<p>
+A format string is a sequence of conversion options.
+The conversion options are as follows:
+
+<ul>
+<li><b><code>&lt;</code>: </b>sets little endian</li>
+<li><b><code>&gt;</code>: </b>sets big endian</li>
+<li><b><code>=</code>: </b>sets native endian</li>
+<li><b><code>![<em>n</em>]</code>: </b>sets maximum alignment to <code>n</code>
+(default is native alignment)</li>
+<li><b><code>b</code>: </b>a signed byte (<code>char</code>)</li>
+<li><b><code>B</code>: </b>an unsigned byte (<code>char</code>)</li>
+<li><b><code>h</code>: </b>a signed <code>short</code> (native size)</li>
+<li><b><code>H</code>: </b>an unsigned <code>short</code> (native size)</li>
+<li><b><code>l</code>: </b>a signed <code>long</code> (native size)</li>
+<li><b><code>L</code>: </b>an unsigned <code>long</code> (native size)</li>
+<li><b><code>j</code>: </b>a <code>lua_Integer</code></li>
+<li><b><code>J</code>: </b>a <code>lua_Unsigned</code></li>
+<li><b><code>T</code>: </b>a <code>size_t</code> (native size)</li>
+<li><b><code>i[<em>n</em>]</code>: </b>a signed <code>int</code> with <code>n</code> bytes
+(default is native size)</li>
+<li><b><code>I[<em>n</em>]</code>: </b>an unsigned <code>int</code> with <code>n</code> bytes
+(default is native size)</li>
+<li><b><code>f</code>: </b>a <code>float</code> (native size)</li>
+<li><b><code>d</code>: </b>a <code>double</code> (native size)</li>
+<li><b><code>n</code>: </b>a <code>lua_Number</code></li>
+<li><b><code>c<em>n</em></code>: </b>a fixed-sized string with <code>n</code> bytes</li>
+<li><b><code>z</code>: </b>a zero-terminated string</li>
+<li><b><code>s[<em>n</em>]</code>: </b>a string preceded by its length
+coded as an unsigned integer with <code>n</code> bytes
+(default is a <code>size_t</code>)</li>
+<li><b><code>x</code>: </b>one byte of padding</li>
+<li><b><code>X<em>op</em></code>: </b>an empty item that aligns
+according to option <code>op</code>
+(which is otherwise ignored)</li>
+<li><b>'<code> </code>': </b>(space) ignored</li>
+</ul><p>
+(A "<code>[<em>n</em>]</code>" means an optional integral numeral.)
+Except for padding, spaces, and configurations
+(options "<code>xX &lt;=&gt;!</code>"),
+each option corresponds to an argument in <a href="#pdf-string.pack"><code>string.pack</code></a>
+or a result in <a href="#pdf-string.unpack"><code>string.unpack</code></a>.
+
+
+<p>
+For options "<code>!<em>n</em></code>", "<code>s<em>n</em></code>", "<code>i<em>n</em></code>", and "<code>I<em>n</em></code>",
+<code>n</code> can be any integer between 1 and 16.
+All integral options check overflows;
+<a href="#pdf-string.pack"><code>string.pack</code></a> checks whether the given value fits in the given size;
+<a href="#pdf-string.unpack"><code>string.unpack</code></a> checks whether the read value fits in a Lua integer.
+For the unsigned options,
+Lua integers are treated as unsigned values too.
+
+
+<p>
+Any format string starts as if prefixed by "<code>!1=</code>",
+that is,
+with maximum alignment of 1 (no alignment)
+and native endianness.
+
+
+<p>
+Native endianness assumes that the whole system is
+either big or little endian.
+The packing functions will not emulate correctly the behavior
+of mixed-endian formats.
+
+
+<p>
+Alignment works as follows:
+For each option,
+the format gets extra padding until the data starts
+at an offset that is a multiple of the minimum between the
+option size and the maximum alignment;
+this minimum must be a power of 2.
+Options "<code>c</code>" and "<code>z</code>" are not aligned;
+option "<code>s</code>" follows the alignment of its starting integer.
+
+
+<p>
+All padding is filled with zeros by <a href="#pdf-string.pack"><code>string.pack</code></a>
+and ignored by <a href="#pdf-string.unpack"><code>string.unpack</code></a>.
+
+
+
+
+
+
+
+<h2>6.5 &ndash; <a name="6.5">UTF-8 Support</a></h2>
+
+<p>
+This library provides basic support for UTF-8 encoding.
+It provides all its functions inside the table <a name="pdf-utf8"><code>utf8</code></a>.
+This library does not provide any support for Unicode other
+than the handling of the encoding.
+Any operation that needs the meaning of a character,
+such as character classification, is outside its scope.
+
+
+<p>
+Unless stated otherwise,
+all functions that expect a byte position as a parameter
+assume that the given position is either the start of a byte sequence
+or one plus the length of the subject string.
+As in the string library,
+negative indices count from the end of the string.
+
+
+<p>
+Functions that create byte sequences
+accept all values up to <code>0x7FFFFFFF</code>,
+as defined in the original UTF-8 specification;
+that implies byte sequences of up to six bytes.
+
+
+<p>
+Functions that interpret byte sequences only accept
+valid sequences (well formed and not overlong).
+By default, they only accept byte sequences
+that result in valid Unicode code points,
+rejecting values greater than <code>10FFFF</code> and surrogates.
+A boolean argument <code>lax</code>, when available,
+lifts these checks,
+so that all values up to <code>0x7FFFFFFF</code> are accepted.
+(Not well formed and overlong sequences are still rejected.)
+
+
+<p>
+<hr><h3><a name="pdf-utf8.char"><code>utf8.char (&middot;&middot;&middot;)</code></a></h3>
+
+
+<p>
+Receives zero or more integers,
+converts each one to its corresponding UTF-8 byte sequence
+and returns a string with the concatenation of all these sequences.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-utf8.charpattern"><code>utf8.charpattern</code></a></h3>
+
+
+<p>
+The pattern (a string, not a function) "<code>[\0-\x7F\xC2-\xFD][\x80-\xBF]*</code>"
+(see <a href="#6.4.1">&sect;6.4.1</a>),
+which matches exactly one UTF-8 byte sequence,
+assuming that the subject is a valid UTF-8 string.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-utf8.codes"><code>utf8.codes (s [, lax])</code></a></h3>
+
+
+<p>
+Returns values so that the construction
+
+<pre>
+     for p, c in utf8.codes(s) do <em>body</em> end
+</pre><p>
+will iterate over all UTF-8 characters in string <code>s</code>,
+with <code>p</code> being the position (in bytes) and <code>c</code> the code point
+of each character.
+It raises an error if it meets any invalid byte sequence.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-utf8.codepoint"><code>utf8.codepoint (s [, i [, j [, lax]]])</code></a></h3>
+
+
+<p>
+Returns the code points (as integers) from all characters in <code>s</code>
+that start between byte position <code>i</code> and <code>j</code> (both included).
+The default for <code>i</code> is 1 and for <code>j</code> is <code>i</code>.
+It raises an error if it meets any invalid byte sequence.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-utf8.len"><code>utf8.len (s [, i [, j [, lax]]])</code></a></h3>
+
+
+<p>
+Returns the number of UTF-8 characters in string <code>s</code>
+that start between positions <code>i</code> and <code>j</code> (both inclusive).
+The default for <code>i</code> is 1 and for <code>j</code> is -1.
+If it finds any invalid byte sequence,
+returns <b>fail</b> plus the position of the first invalid byte.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-utf8.offset"><code>utf8.offset (s, n [, i])</code></a></h3>
+
+
+<p>
+Returns the position (in bytes) where the encoding of the
+<code>n</code>-th character of <code>s</code>
+(counting from position <code>i</code>) starts.
+A negative <code>n</code> gets characters before position <code>i</code>.
+The default for <code>i</code> is 1 when <code>n</code> is non-negative
+and <code>#s + 1</code> otherwise,
+so that <code>utf8.offset(s, -n)</code> gets the offset of the
+<code>n</code>-th character from the end of the string.
+If the specified character is neither in the subject
+nor right after its end,
+the function returns <b>fail</b>.
+
+
+<p>
+As a special case,
+when <code>n</code> is 0 the function returns the start of the encoding
+of the character that contains the <code>i</code>-th byte of <code>s</code>.
+
+
+<p>
+This function assumes that <code>s</code> is a valid UTF-8 string.
+
+
+
+
+
+
+
+<h2>6.6 &ndash; <a name="6.6">Table Manipulation</a></h2>
+
+<p>
+This library provides generic functions for table manipulation.
+It provides all its functions inside the table <a name="pdf-table"><code>table</code></a>.
+
+
+<p>
+Remember that, whenever an operation needs the length of a table,
+all caveats about the length operator apply (see <a href="#3.4.7">&sect;3.4.7</a>).
+All functions ignore non-numeric keys
+in the tables given as arguments.
+
+
+<p>
+<hr><h3><a name="pdf-table.concat"><code>table.concat (list [, sep [, i [, j]]])</code></a></h3>
+
+
+<p>
+Given a list where all elements are strings or numbers,
+returns the string <code>list[i]..sep..list[i+1] &middot;&middot;&middot; sep..list[j]</code>.
+The default value for <code>sep</code> is the empty string,
+the default for <code>i</code> is 1,
+and the default for <code>j</code> is <code>#list</code>.
+If <code>i</code> is greater than <code>j</code>, returns the empty string.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-table.insert"><code>table.insert (list, [pos,] value)</code></a></h3>
+
+
+<p>
+Inserts element <code>value</code> at position <code>pos</code> in <code>list</code>,
+shifting up the elements
+<code>list[pos], list[pos+1], &middot;&middot;&middot;, list[#list]</code>.
+The default value for <code>pos</code> is <code>#list+1</code>,
+so that a call <code>table.insert(t,x)</code> inserts <code>x</code> at the end
+of the list <code>t</code>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-table.move"><code>table.move (a1, f, e, t [,a2])</code></a></h3>
+
+
+<p>
+Moves elements from the table <code>a1</code> to the table <code>a2</code>,
+performing the equivalent to the following
+multiple assignment:
+<code>a2[t],&middot;&middot;&middot; = a1[f],&middot;&middot;&middot;,a1[e]</code>.
+The default for <code>a2</code> is <code>a1</code>.
+The destination range can overlap with the source range.
+The number of elements to be moved must fit in a Lua integer.
+
+
+<p>
+Returns the destination table <code>a2</code>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-table.pack"><code>table.pack (&middot;&middot;&middot;)</code></a></h3>
+
+
+<p>
+Returns a new table with all arguments stored into keys 1, 2, etc.
+and with a field "<code>n</code>" with the total number of arguments.
+Note that the resulting table may not be a sequence,
+if some arguments are <b>nil</b>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-table.remove"><code>table.remove (list [, pos])</code></a></h3>
+
+
+<p>
+Removes from <code>list</code> the element at position <code>pos</code>,
+returning the value of the removed element.
+When <code>pos</code> is an integer between 1 and <code>#list</code>,
+it shifts down the elements
+<code>list[pos+1], list[pos+2], &middot;&middot;&middot;, list[#list]</code>
+and erases element <code>list[#list]</code>;
+The index <code>pos</code> can also be 0 when <code>#list</code> is 0,
+or <code>#list + 1</code>.
+
+
+<p>
+The default value for <code>pos</code> is <code>#list</code>,
+so that a call <code>table.remove(l)</code> removes the last element
+of the list <code>l</code>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-table.sort"><code>table.sort (list [, comp])</code></a></h3>
+
+
+<p>
+Sorts the list elements in a given order, <em>in-place</em>,
+from <code>list[1]</code> to <code>list[#list]</code>.
+If <code>comp</code> is given,
+then it must be a function that receives two list elements
+and returns true when the first element must come
+before the second in the final order,
+so that, after the sort,
+<code>i &lt;= j</code> implies <code>not comp(list[j],list[i])</code>.
+If <code>comp</code> is not given,
+then the standard Lua operator <code>&lt;</code> is used instead.
+
+
+<p>
+The <code>comp</code> function must define a consistent order;
+more formally, the function must define a strict weak order.
+(A weak order is similar to a total order,
+but it can equate different elements for comparison purposes.)
+
+
+<p>
+The sort algorithm is not stable:
+Different elements considered equal by the given order
+may have their relative positions changed by the sort.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-table.unpack"><code>table.unpack (list [, i [, j]])</code></a></h3>
+
+
+<p>
+Returns the elements from the given list.
+This function is equivalent to
+
+<pre>
+     return list[i], list[i+1], &middot;&middot;&middot;, list[j]
+</pre><p>
+By default, <code>i</code> is&nbsp;1 and <code>j</code> is <code>#list</code>.
+
+
+
+
+
+
+
+<h2>6.7 &ndash; <a name="6.7">Mathematical Functions</a></h2>
+
+<p>
+This library provides basic mathematical functions.
+It provides all its functions and constants inside the table <a name="pdf-math"><code>math</code></a>.
+Functions with the annotation "<code>integer/float</code>" give
+integer results for integer arguments
+and float results for non-integer arguments.
+The rounding functions
+<a href="#pdf-math.ceil"><code>math.ceil</code></a>, <a href="#pdf-math.floor"><code>math.floor</code></a>, and <a href="#pdf-math.modf"><code>math.modf</code></a>
+return an integer when the result fits in the range of an integer,
+or a float otherwise.
+
+
+<p>
+<hr><h3><a name="pdf-math.abs"><code>math.abs (x)</code></a></h3>
+
+
+<p>
+Returns the maximum value between <code>x</code> and <code>-x</code>. (integer/float)
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.acos"><code>math.acos (x)</code></a></h3>
+
+
+<p>
+Returns the arc cosine of <code>x</code> (in radians).
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.asin"><code>math.asin (x)</code></a></h3>
+
+
+<p>
+Returns the arc sine of <code>x</code> (in radians).
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.atan"><code>math.atan (y [, x])</code></a></h3>
+
+
+<p>
+ 
+Returns the arc tangent of <code>y/x</code> (in radians),
+using the signs of both arguments to find the
+quadrant of the result.
+It also handles correctly the case of <code>x</code> being zero.
+
+
+<p>
+The default value for <code>x</code> is 1,
+so that the call <code>math.atan(y)</code>
+returns the arc tangent of <code>y</code>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.ceil"><code>math.ceil (x)</code></a></h3>
+
+
+<p>
+Returns the smallest integral value greater than or equal to <code>x</code>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.cos"><code>math.cos (x)</code></a></h3>
+
+
+<p>
+Returns the cosine of <code>x</code> (assumed to be in radians).
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.deg"><code>math.deg (x)</code></a></h3>
+
+
+<p>
+Converts the angle <code>x</code> from radians to degrees.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.exp"><code>math.exp (x)</code></a></h3>
+
+
+<p>
+Returns the value <em>e<sup>x</sup></em>
+(where <code>e</code> is the base of natural logarithms).
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.floor"><code>math.floor (x)</code></a></h3>
+
+
+<p>
+Returns the largest integral value less than or equal to <code>x</code>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.fmod"><code>math.fmod (x, y)</code></a></h3>
+
+
+<p>
+Returns the remainder of the division of <code>x</code> by <code>y</code>
+that rounds the quotient towards zero. (integer/float)
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.huge"><code>math.huge</code></a></h3>
+
+
+<p>
+The float value <code>HUGE_VAL</code>,
+a value greater than any other numeric value.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.log"><code>math.log (x [, base])</code></a></h3>
+
+
+<p>
+Returns the logarithm of <code>x</code> in the given base.
+The default for <code>base</code> is <em>e</em>
+(so that the function returns the natural logarithm of <code>x</code>).
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.max"><code>math.max (x, &middot;&middot;&middot;)</code></a></h3>
+
+
+<p>
+Returns the argument with the maximum value,
+according to the Lua operator <code>&lt;</code>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.maxinteger"><code>math.maxinteger</code></a></h3>
+An integer with the maximum value for an integer.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.min"><code>math.min (x, &middot;&middot;&middot;)</code></a></h3>
+
+
+<p>
+Returns the argument with the minimum value,
+according to the Lua operator <code>&lt;</code>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.mininteger"><code>math.mininteger</code></a></h3>
+An integer with the minimum value for an integer.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.modf"><code>math.modf (x)</code></a></h3>
+
+
+<p>
+Returns the integral part of <code>x</code> and the fractional part of <code>x</code>.
+Its second result is always a float.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.pi"><code>math.pi</code></a></h3>
+
+
+<p>
+The value of <em>&pi;</em>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.rad"><code>math.rad (x)</code></a></h3>
+
+
+<p>
+Converts the angle <code>x</code> from degrees to radians.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.random"><code>math.random ([m [, n]])</code></a></h3>
+
+
+<p>
+When called without arguments,
+returns a pseudo-random float with uniform distribution
+in the range  <em>[0,1)</em>.  
+When called with two integers <code>m</code> and <code>n</code>,
+<code>math.random</code> returns a pseudo-random integer
+with uniform distribution in the range <em>[m, n]</em>.
+The call <code>math.random(n)</code>, for a positive <code>n</code>,
+is equivalent to <code>math.random(1,n)</code>.
+The call <code>math.random(0)</code> produces an integer with
+all bits (pseudo)random.
+
+
+<p>
+This function uses the <code>xoshiro256**</code> algorithm to produce
+pseudo-random 64-bit integers,
+which are the results of calls with argument&nbsp;0.
+Other results (ranges and floats)
+are unbiased extracted from these integers.
+
+
+<p>
+Lua initializes its pseudo-random generator with the equivalent of
+a call to <a href="#pdf-math.randomseed"><code>math.randomseed</code></a> with no arguments,
+so that <code>math.random</code> should generate
+different sequences of results each time the program runs.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.randomseed"><code>math.randomseed ([x [, y]])</code></a></h3>
+
+
+<p>
+When called with at least one argument,
+the integer parameters <code>x</code> and <code>y</code> are
+joined into a 128-bit <em>seed</em> that
+is used to reinitialize the pseudo-random generator;
+equal seeds produce equal sequences of numbers.
+The default for <code>y</code> is zero.
+
+
+<p>
+When called with no arguments,
+Lua generates a seed with
+a weak attempt for randomness.
+
+
+<p>
+This function returns the two seed components
+that were effectively used,
+so that setting them again repeats the sequence.
+
+
+<p>
+To ensure a required level of randomness to the initial state
+(or contrarily, to have a deterministic sequence,
+for instance when debugging a program),
+you should call <a href="#pdf-math.randomseed"><code>math.randomseed</code></a> with explicit arguments.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.sin"><code>math.sin (x)</code></a></h3>
+
+
+<p>
+Returns the sine of <code>x</code> (assumed to be in radians).
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.sqrt"><code>math.sqrt (x)</code></a></h3>
+
+
+<p>
+Returns the square root of <code>x</code>.
+(You can also use the expression <code>x^0.5</code> to compute this value.)
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.tan"><code>math.tan (x)</code></a></h3>
+
+
+<p>
+Returns the tangent of <code>x</code> (assumed to be in radians).
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.tointeger"><code>math.tointeger (x)</code></a></h3>
+
+
+<p>
+If the value <code>x</code> is convertible to an integer,
+returns that integer.
+Otherwise, returns <b>fail</b>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.type"><code>math.type (x)</code></a></h3>
+
+
+<p>
+Returns "<code>integer</code>" if <code>x</code> is an integer,
+"<code>float</code>" if it is a float,
+or <b>fail</b> if <code>x</code> is not a number.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.ult"><code>math.ult (m, n)</code></a></h3>
+
+
+<p>
+Returns a boolean,
+<b>true</b> if and only if integer <code>m</code> is below integer <code>n</code> when
+they are compared as unsigned integers.
+
+
+
+
+
+
+
+<h2>6.8 &ndash; <a name="6.8">Input and Output Facilities</a></h2>
+
+<p>
+The I/O library provides two different styles for file manipulation.
+The first one uses implicit file handles;
+that is, there are operations to set a default input file and a
+default output file,
+and all input/output operations are done over these default files.
+The second style uses explicit file handles.
+
+
+<p>
+When using implicit file handles,
+all operations are supplied by table <a name="pdf-io"><code>io</code></a>.
+When using explicit file handles,
+the operation <a href="#pdf-io.open"><code>io.open</code></a> returns a file handle
+and then all operations are supplied as methods of the file handle.
+
+
+<p>
+The metatable for file handles provides metamethods
+for <code>__gc</code> and <code>__close</code> that try
+to close the file when called.
+
+
+<p>
+The table <code>io</code> also provides
+three predefined file handles with their usual meanings from C:
+<a name="pdf-io.stdin"><code>io.stdin</code></a>, <a name="pdf-io.stdout"><code>io.stdout</code></a>, and <a name="pdf-io.stderr"><code>io.stderr</code></a>.
+The I/O library never closes these files.
+
+
+<p>
+Unless otherwise stated,
+all I/O functions return <b>fail</b> on failure,
+plus an error message as a second result and
+a system-dependent error code as a third result,
+and some non-false value on success.
+On non-POSIX systems,
+the computation of the error message and error code
+in case of errors
+may be not thread safe,
+because they rely on the global C variable <code>errno</code>.
+
+
+<p>
+<hr><h3><a name="pdf-io.close"><code>io.close ([file])</code></a></h3>
+
+
+<p>
+Equivalent to <code>file:close()</code>.
+Without a <code>file</code>, closes the default output file.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-io.flush"><code>io.flush ()</code></a></h3>
+
+
+<p>
+Equivalent to <code>io.output():flush()</code>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-io.input"><code>io.input ([file])</code></a></h3>
+
+
+<p>
+When called with a file name, it opens the named file (in text mode),
+and sets its handle as the default input file.
+When called with a file handle,
+it simply sets this file handle as the default input file.
+When called without arguments,
+it returns the current default input file.
+
+
+<p>
+In case of errors this function raises the error,
+instead of returning an error code.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-io.lines"><code>io.lines ([filename, &middot;&middot;&middot;])</code></a></h3>
+
+
+<p>
+Opens the given file name in read mode
+and returns an iterator function that
+works like <code>file:lines(&middot;&middot;&middot;)</code> over the opened file.
+When the iterator function fails to read any value,
+it automatically closes the file.
+Besides the iterator function,
+<code>io.lines</code> returns three other values:
+two <b>nil</b> values as placeholders,
+plus the created file handle.
+Therefore, when used in a generic <b>for</b> loop,
+the file is closed also if the loop is interrupted by an
+error or a <b>break</b>.
+
+
+<p>
+The call <code>io.lines()</code> (with no file name) is equivalent
+to <code>io.input():lines("l")</code>;
+that is, it iterates over the lines of the default input file.
+In this case, the iterator does not close the file when the loop ends.
+
+
+<p>
+In case of errors opening the file,
+this function raises the error,
+instead of returning an error code.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-io.open"><code>io.open (filename [, mode])</code></a></h3>
+
+
+<p>
+This function opens a file,
+in the mode specified in the string <code>mode</code>.
+In case of success,
+it returns a new file handle.
+
+
+<p>
+The <code>mode</code> string can be any of the following:
+
+<ul>
+<li><b>"<code>r</code>": </b> read mode (the default);</li>
+<li><b>"<code>w</code>": </b> write mode;</li>
+<li><b>"<code>a</code>": </b> append mode;</li>
+<li><b>"<code>r+</code>": </b> update mode, all previous data is preserved;</li>
+<li><b>"<code>w+</code>": </b> update mode, all previous data is erased;</li>
+<li><b>"<code>a+</code>": </b> append update mode, previous data is preserved,
+  writing is only allowed at the end of file.</li>
+</ul><p>
+The <code>mode</code> string can also have a '<code>b</code>' at the end,
+which is needed in some systems to open the file in binary mode.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-io.output"><code>io.output ([file])</code></a></h3>
+
+
+<p>
+Similar to <a href="#pdf-io.input"><code>io.input</code></a>, but operates over the default output file.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-io.popen"><code>io.popen (prog [, mode])</code></a></h3>
+
+
+<p>
+This function is system dependent and is not available
+on all platforms.
+
+
+<p>
+Starts the program <code>prog</code> in a separated process and returns
+a file handle that you can use to read data from this program
+(if <code>mode</code> is <code>"r"</code>, the default)
+or to write data to this program
+(if <code>mode</code> is <code>"w"</code>).
+
+
+
+
+<p>
+<hr><h3><a name="pdf-io.read"><code>io.read (&middot;&middot;&middot;)</code></a></h3>
+
+
+<p>
+Equivalent to <code>io.input():read(&middot;&middot;&middot;)</code>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-io.tmpfile"><code>io.tmpfile ()</code></a></h3>
+
+
+<p>
+In case of success,
+returns a handle for a temporary file.
+This file is opened in update mode
+and it is automatically removed when the program ends.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-io.type"><code>io.type (obj)</code></a></h3>
+
+
+<p>
+Checks whether <code>obj</code> is a valid file handle.
+Returns the string <code>"file"</code> if <code>obj</code> is an open file handle,
+<code>"closed file"</code> if <code>obj</code> is a closed file handle,
+or <b>fail</b> if <code>obj</code> is not a file handle.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-io.write"><code>io.write (&middot;&middot;&middot;)</code></a></h3>
+
+
+<p>
+Equivalent to <code>io.output():write(&middot;&middot;&middot;)</code>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-file:close"><code>file:close ()</code></a></h3>
+
+
+<p>
+Closes <code>file</code>.
+Note that files are automatically closed when
+their handles are garbage collected,
+but that takes an unpredictable amount of time to happen.
+
+
+<p>
+When closing a file handle created with <a href="#pdf-io.popen"><code>io.popen</code></a>,
+<a href="#pdf-file:close"><code>file:close</code></a> returns the same values
+returned by <a href="#pdf-os.execute"><code>os.execute</code></a>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-file:flush"><code>file:flush ()</code></a></h3>
+
+
+<p>
+Saves any written data to <code>file</code>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-file:lines"><code>file:lines (&middot;&middot;&middot;)</code></a></h3>
+
+
+<p>
+Returns an iterator function that,
+each time it is called,
+reads the file according to the given formats.
+When no format is given,
+uses "<code>l</code>" as a default.
+As an example, the construction
+
+<pre>
+     for c in file:lines(1) do <em>body</em> end
+</pre><p>
+will iterate over all characters of the file,
+starting at the current position.
+Unlike <a href="#pdf-io.lines"><code>io.lines</code></a>, this function does not close the file
+when the loop ends.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-file:read"><code>file:read (&middot;&middot;&middot;)</code></a></h3>
+
+
+<p>
+Reads the file <code>file</code>,
+according to the given formats, which specify what to read.
+For each format,
+the function returns a string or a number with the characters read,
+or <b>fail</b> if it cannot read data with the specified format.
+(In this latter case,
+the function does not read subsequent formats.)
+When called without arguments,
+it uses a default format that reads the next line
+(see below).
+
+
+<p>
+The available formats are
+
+<ul>
+
+<li><b>"<code>n</code>": </b>
+reads a numeral and returns it as a float or an integer,
+following the lexical conventions of Lua.
+(The numeral may have leading whitespaces and a sign.)
+This format always reads the longest input sequence that
+is a valid prefix for a numeral;
+if that prefix does not form a valid numeral
+(e.g., an empty string, "<code>0x</code>", or "<code>3.4e-</code>")
+or it is too long (more than 200 characters),
+it is discarded and the format returns <b>fail</b>.
+</li>
+
+<li><b>"<code>a</code>": </b>
+reads the whole file, starting at the current position.
+On end of file, it returns the empty string;
+this format never fails.
+</li>
+
+<li><b>"<code>l</code>": </b>
+reads the next line skipping the end of line,
+returning <b>fail</b> on end of file.
+This is the default format.
+</li>
+
+<li><b>"<code>L</code>": </b>
+reads the next line keeping the end-of-line character (if present),
+returning <b>fail</b> on end of file.
+</li>
+
+<li><b><em>number</em>: </b>
+reads a string with up to this number of bytes,
+returning <b>fail</b> on end of file.
+If <code>number</code> is zero,
+it reads nothing and returns an empty string,
+or <b>fail</b> on end of file.
+</li>
+
+</ul><p>
+The formats "<code>l</code>" and "<code>L</code>" should be used only for text files.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-file:seek"><code>file:seek ([whence [, offset]])</code></a></h3>
+
+
+<p>
+Sets and gets the file position,
+measured from the beginning of the file,
+to the position given by <code>offset</code> plus a base
+specified by the string <code>whence</code>, as follows:
+
+<ul>
+<li><b>"<code>set</code>": </b> base is position 0 (beginning of the file);</li>
+<li><b>"<code>cur</code>": </b> base is current position;</li>
+<li><b>"<code>end</code>": </b> base is end of file;</li>
+</ul><p>
+In case of success, <code>seek</code> returns the final file position,
+measured in bytes from the beginning of the file.
+If <code>seek</code> fails, it returns <b>fail</b>,
+plus a string describing the error.
+
+
+<p>
+The default value for <code>whence</code> is <code>"cur"</code>,
+and for <code>offset</code> is 0.
+Therefore, the call <code>file:seek()</code> returns the current
+file position, without changing it;
+the call <code>file:seek("set")</code> sets the position to the
+beginning of the file (and returns 0);
+and the call <code>file:seek("end")</code> sets the position to the
+end of the file, and returns its size.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-file:setvbuf"><code>file:setvbuf (mode [, size])</code></a></h3>
+
+
+<p>
+Sets the buffering mode for a file.
+There are three available modes:
+
+<ul>
+<li><b>"<code>no</code>": </b> no buffering.</li>
+<li><b>"<code>full</code>": </b> full buffering.</li>
+<li><b>"<code>line</code>": </b> line buffering.</li>
+</ul>
+
+<p>
+For the last two cases,
+<code>size</code> is a hint for the size of the buffer, in bytes.
+The default is an appropriate size.
+
+
+<p>
+The specific behavior of each mode is non portable;
+check the underlying ISO&nbsp;C function <code>setvbuf</code> in your platform for
+more details.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-file:write"><code>file:write (&middot;&middot;&middot;)</code></a></h3>
+
+
+<p>
+Writes the value of each of its arguments to <code>file</code>.
+The arguments must be strings or numbers.
+
+
+<p>
+In case of success, this function returns <code>file</code>.
+
+
+
+
+
+
+
+<h2>6.9 &ndash; <a name="6.9">Operating System Facilities</a></h2>
+
+<p>
+This library is implemented through table <a name="pdf-os"><code>os</code></a>.
+
+
+<p>
+<hr><h3><a name="pdf-os.clock"><code>os.clock ()</code></a></h3>
+
+
+<p>
+Returns an approximation of the amount in seconds of CPU time
+used by the program,
+as returned by the underlying ISO&nbsp;C function <code>clock</code>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-os.date"><code>os.date ([format [, time]])</code></a></h3>
+
+
+<p>
+Returns a string or a table containing date and time,
+formatted according to the given string <code>format</code>.
+
+
+<p>
+If the <code>time</code> argument is present,
+this is the time to be formatted
+(see the <a href="#pdf-os.time"><code>os.time</code></a> function for a description of this value).
+Otherwise, <code>date</code> formats the current time.
+
+
+<p>
+If <code>format</code> starts with '<code>!</code>',
+then the date is formatted in Coordinated Universal Time.
+After this optional character,
+if <code>format</code> is the string "<code>*t</code>",
+then <code>date</code> returns a table with the following fields:
+<code>year</code>, <code>month</code> (1&ndash;12), <code>day</code> (1&ndash;31),
+<code>hour</code> (0&ndash;23), <code>min</code> (0&ndash;59),
+<code>sec</code> (0&ndash;61, due to leap seconds),
+<code>wday</code> (weekday, 1&ndash;7, Sunday is&nbsp;1),
+<code>yday</code> (day of the year, 1&ndash;366),
+and <code>isdst</code> (daylight saving flag, a boolean).
+This last field may be absent
+if the information is not available.
+
+
+<p>
+If <code>format</code> is not "<code>*t</code>",
+then <code>date</code> returns the date as a string,
+formatted according to the same rules as the ISO&nbsp;C function <code>strftime</code>.
+
+
+<p>
+If <code>format</code> is absent, it defaults to "<code>%c</code>",
+which gives a human-readable date and time representation
+using the current locale.
+
+
+<p>
+On non-POSIX systems,
+this function may be not thread safe
+because of its reliance on C&nbsp;function <code>gmtime</code> and C&nbsp;function <code>localtime</code>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-os.difftime"><code>os.difftime (t2, t1)</code></a></h3>
+
+
+<p>
+Returns the difference, in seconds,
+from time <code>t1</code> to time <code>t2</code>
+(where the times are values returned by <a href="#pdf-os.time"><code>os.time</code></a>).
+In POSIX, Windows, and some other systems,
+this value is exactly <code>t2</code><em>-</em><code>t1</code>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-os.execute"><code>os.execute ([command])</code></a></h3>
+
+
+<p>
+This function is equivalent to the ISO&nbsp;C function <code>system</code>.
+It passes <code>command</code> to be executed by an operating system shell.
+Its first result is <b>true</b>
+if the command terminated successfully,
+or <b>fail</b> otherwise.
+After this first result
+the function returns a string plus a number,
+as follows:
+
+<ul>
+
+<li><b>"<code>exit</code>": </b>
+the command terminated normally;
+the following number is the exit status of the command.
+</li>
+
+<li><b>"<code>signal</code>": </b>
+the command was terminated by a signal;
+the following number is the signal that terminated the command.
+</li>
+
+</ul>
+
+<p>
+When called without a <code>command</code>,
+<code>os.execute</code> returns a boolean that is true if a shell is available.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-os.exit"><code>os.exit ([code [, close]])</code></a></h3>
+
+
+<p>
+Calls the ISO&nbsp;C function <code>exit</code> to terminate the host program.
+If <code>code</code> is <b>true</b>,
+the returned status is <code>EXIT_SUCCESS</code>;
+if <code>code</code> is <b>false</b>,
+the returned status is <code>EXIT_FAILURE</code>;
+if <code>code</code> is a number,
+the returned status is this number.
+The default value for <code>code</code> is <b>true</b>.
+
+
+<p>
+If the optional second argument <code>close</code> is true,
+the function closes the Lua state before exiting (see <a href="#lua_close"><code>lua_close</code></a>).
+
+
+
+
+<p>
+<hr><h3><a name="pdf-os.getenv"><code>os.getenv (varname)</code></a></h3>
+
+
+<p>
+Returns the value of the process environment variable <code>varname</code>
+or <b>fail</b> if the variable is not defined.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-os.remove"><code>os.remove (filename)</code></a></h3>
+
+
+<p>
+Deletes the file (or empty directory, on POSIX systems)
+with the given name.
+If this function fails, it returns <b>fail</b>
+plus a string describing the error and the error code.
+Otherwise, it returns true.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-os.rename"><code>os.rename (oldname, newname)</code></a></h3>
+
+
+<p>
+Renames the file or directory named <code>oldname</code> to <code>newname</code>.
+If this function fails, it returns <b>fail</b>,
+plus a string describing the error and the error code.
+Otherwise, it returns true.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-os.setlocale"><code>os.setlocale (locale [, category])</code></a></h3>
+
+
+<p>
+Sets the current locale of the program.
+<code>locale</code> is a system-dependent string specifying a locale;
+<code>category</code> is an optional string describing which category to change:
+<code>"all"</code>, <code>"collate"</code>, <code>"ctype"</code>,
+<code>"monetary"</code>, <code>"numeric"</code>, or <code>"time"</code>;
+the default category is <code>"all"</code>.
+The function returns the name of the new locale,
+or <b>fail</b> if the request cannot be honored.
+
+
+<p>
+If <code>locale</code> is the empty string,
+the current locale is set to an implementation-defined native locale.
+If <code>locale</code> is the string "<code>C</code>",
+the current locale is set to the standard C locale.
+
+
+<p>
+When called with <b>nil</b> as the first argument,
+this function only returns the name of the current locale
+for the given category.
+
+
+<p>
+This function may be not thread safe
+because of its reliance on C&nbsp;function <code>setlocale</code>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-os.time"><code>os.time ([table])</code></a></h3>
+
+
+<p>
+Returns the current time when called without arguments,
+or a time representing the local date and time specified by the given table.
+This table must have fields <code>year</code>, <code>month</code>, and <code>day</code>,
+and may have fields
+<code>hour</code> (default is 12),
+<code>min</code> (default is 0),
+<code>sec</code> (default is 0),
+and <code>isdst</code> (default is <b>nil</b>).
+Other fields are ignored.
+For a description of these fields, see the <a href="#pdf-os.date"><code>os.date</code></a> function.
+
+
+<p>
+When the function is called,
+the values in these fields do not need to be inside their valid ranges.
+For instance, if <code>sec</code> is -10,
+it means 10 seconds before the time specified by the other fields;
+if <code>hour</code> is 1000,
+it means 1000 hours after the time specified by the other fields.
+
+
+<p>
+The returned value is a number, whose meaning depends on your system.
+In POSIX, Windows, and some other systems,
+this number counts the number
+of seconds since some given start time (the "epoch").
+In other systems, the meaning is not specified,
+and the number returned by <code>time</code> can be used only as an argument to
+<a href="#pdf-os.date"><code>os.date</code></a> and <a href="#pdf-os.difftime"><code>os.difftime</code></a>.
+
+
+<p>
+When called with a table,
+<code>os.time</code> also normalizes all the fields
+documented in the <a href="#pdf-os.date"><code>os.date</code></a> function,
+so that they represent the same time as before the call
+but with values inside their valid ranges.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-os.tmpname"><code>os.tmpname ()</code></a></h3>
+
+
+<p>
+Returns a string with a file name that can
+be used for a temporary file.
+The file must be explicitly opened before its use
+and explicitly removed when no longer needed.
+
+
+<p>
+In POSIX systems,
+this function also creates a file with that name,
+to avoid security risks.
+(Someone else might create the file with wrong permissions
+in the time between getting the name and creating the file.)
+You still have to open the file to use it
+and to remove it (even if you do not use it).
+
+
+<p>
+When possible,
+you may prefer to use <a href="#pdf-io.tmpfile"><code>io.tmpfile</code></a>,
+which automatically removes the file when the program ends.
+
+
+
+
+
+
+
+<h2>6.10 &ndash; <a name="6.10">The Debug Library</a></h2>
+
+<p>
+This library provides
+the functionality of the debug interface (<a href="#4.7">&sect;4.7</a>) to Lua programs.
+You should exert care when using this library.
+Several of its functions
+violate basic assumptions about Lua code
+(e.g., that variables local to a function
+cannot be accessed from outside;
+that userdata metatables cannot be changed by Lua code;
+that Lua programs do not crash)
+and therefore can compromise otherwise secure code.
+Moreover, some functions in this library may be slow.
+
+
+<p>
+All functions in this library are provided
+inside the <a name="pdf-debug"><code>debug</code></a> table.
+All functions that operate over a thread
+have an optional first argument which is the
+thread to operate over.
+The default is always the current thread.
+
+
+<p>
+<hr><h3><a name="pdf-debug.debug"><code>debug.debug ()</code></a></h3>
+
+
+<p>
+Enters an interactive mode with the user,
+running each string that the user enters.
+Using simple commands and other debug facilities,
+the user can inspect global and local variables,
+change their values, evaluate expressions, and so on.
+A line containing only the word <code>cont</code> finishes this function,
+so that the caller continues its execution.
+
+
+<p>
+Note that commands for <code>debug.debug</code> are not lexically nested
+within any function and so have no direct access to local variables.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-debug.gethook"><code>debug.gethook ([thread])</code></a></h3>
+
+
+<p>
+Returns the current hook settings of the thread, as three values:
+the current hook function, the current hook mask,
+and the current hook count,
+as set by the <a href="#pdf-debug.sethook"><code>debug.sethook</code></a> function.
+
+
+<p>
+Returns <b>fail</b> if there is no active hook.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-debug.getinfo"><code>debug.getinfo ([thread,] f [, what])</code></a></h3>
+
+
+<p>
+Returns a table with information about a function.
+You can give the function directly
+or you can give a number as the value of <code>f</code>,
+which means the function running at level <code>f</code> of the call stack
+of the given thread:
+level&nbsp;0 is the current function (<code>getinfo</code> itself);
+level&nbsp;1 is the function that called <code>getinfo</code>
+(except for tail calls, which do not count in the stack);
+and so on.
+If <code>f</code> is a number greater than the number of active functions,
+then <code>getinfo</code> returns <b>fail</b>.
+
+
+<p>
+The returned table can contain all the fields returned by <a href="#lua_getinfo"><code>lua_getinfo</code></a>,
+with the string <code>what</code> describing which fields to fill in.
+The default for <code>what</code> is to get all information available,
+except the table of valid lines.
+If present,
+the option '<code>f</code>'
+adds a field named <code>func</code> with the function itself.
+If present,
+the option '<code>L</code>'
+adds a field named <code>activelines</code> with the table of
+valid lines.
+
+
+<p>
+For instance, the expression <code>debug.getinfo(1,"n").name</code> returns
+a name for the current function,
+if a reasonable name can be found,
+and the expression <code>debug.getinfo(print)</code>
+returns a table with all available information
+about the <a href="#pdf-print"><code>print</code></a> function.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-debug.getlocal"><code>debug.getlocal ([thread,] f, local)</code></a></h3>
+
+
+<p>
+This function returns the name and the value of the local variable
+with index <code>local</code> of the function at level <code>f</code> of the stack.
+This function accesses not only explicit local variables,
+but also parameters and temporary values.
+
+
+<p>
+The first parameter or local variable has index&nbsp;1, and so on,
+following the order that they are declared in the code,
+counting only the variables that are active
+in the current scope of the function.
+Compile-time constants may not appear in this listing,
+if they were optimized away by the compiler.
+Negative indices refer to vararg arguments;
+-1 is the first vararg argument.
+The function returns <b>fail</b>
+if there is no variable with the given index,
+and raises an error when called with a level out of range.
+(You can call <a href="#pdf-debug.getinfo"><code>debug.getinfo</code></a> to check whether the level is valid.)
+
+
+<p>
+Variable names starting with '<code>(</code>' (open parenthesis) 
+represent variables with no known names
+(internal variables such as loop control variables,
+and variables from chunks saved without debug information).
+
+
+<p>
+The parameter <code>f</code> may also be a function.
+In that case, <code>getlocal</code> returns only the name of function parameters.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-debug.getmetatable"><code>debug.getmetatable (value)</code></a></h3>
+
+
+<p>
+Returns the metatable of the given <code>value</code>
+or <b>nil</b> if it does not have a metatable.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-debug.getregistry"><code>debug.getregistry ()</code></a></h3>
+
+
+<p>
+Returns the registry table (see <a href="#4.3">&sect;4.3</a>).
+
+
+
+
+<p>
+<hr><h3><a name="pdf-debug.getupvalue"><code>debug.getupvalue (f, up)</code></a></h3>
+
+
+<p>
+This function returns the name and the value of the upvalue
+with index <code>up</code> of the function <code>f</code>.
+The function returns <b>fail</b>
+if there is no upvalue with the given index.
+
+
+<p>
+(For Lua functions,
+upvalues are the external local variables that the function uses,
+and that are consequently included in its closure.)
+
+
+<p>
+For C&nbsp;functions, this function uses the empty string <code>""</code>
+as a name for all upvalues.
+
+
+<p>
+Variable name '<code>?</code>' (interrogation mark)
+represents variables with no known names
+(variables from chunks saved without debug information).
+
+
+
+
+<p>
+<hr><h3><a name="pdf-debug.getuservalue"><code>debug.getuservalue (u, n)</code></a></h3>
+
+
+<p>
+Returns the <code>n</code>-th user value associated
+to the userdata <code>u</code> plus a boolean,
+<b>false</b> if the userdata does not have that value.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-debug.sethook"><code>debug.sethook ([thread,] hook, mask [, count])</code></a></h3>
+
+
+<p>
+Sets the given function as the debug hook.
+The string <code>mask</code> and the number <code>count</code> describe
+when the hook will be called.
+The string mask may have any combination of the following characters,
+with the given meaning:
+
+<ul>
+<li><b>'<code>c</code>': </b> the hook is called every time Lua calls a function;</li>
+<li><b>'<code>r</code>': </b> the hook is called every time Lua returns from a function;</li>
+<li><b>'<code>l</code>': </b> the hook is called every time Lua enters a new line of code.</li>
+</ul><p>
+Moreover,
+with a <code>count</code> different from zero,
+the hook is called also after every <code>count</code> instructions.
+
+
+<p>
+When called without arguments,
+<a href="#pdf-debug.sethook"><code>debug.sethook</code></a> turns off the hook.
+
+
+<p>
+When the hook is called, its first parameter is a string
+describing the event that has triggered its call:
+<code>"call"</code>, <code>"tail call"</code>, <code>"return"</code>,
+<code>"line"</code>, and <code>"count"</code>.
+For line events,
+the hook also gets the new line number as its second parameter.
+Inside a hook,
+you can call <code>getinfo</code> with level&nbsp;2 to get more information about
+the running function.
+(Level&nbsp;0 is the <code>getinfo</code> function,
+and level&nbsp;1 is the hook function.)
+
+
+
+
+<p>
+<hr><h3><a name="pdf-debug.setlocal"><code>debug.setlocal ([thread,] level, local, value)</code></a></h3>
+
+
+<p>
+This function assigns the value <code>value</code> to the local variable
+with index <code>local</code> of the function at level <code>level</code> of the stack.
+The function returns <b>fail</b> if there is no local
+variable with the given index,
+and raises an error when called with a <code>level</code> out of range.
+(You can call <code>getinfo</code> to check whether the level is valid.)
+Otherwise, it returns the name of the local variable.
+
+
+<p>
+See <a href="#pdf-debug.getlocal"><code>debug.getlocal</code></a> for more information about
+variable indices and names.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-debug.setmetatable"><code>debug.setmetatable (value, table)</code></a></h3>
+
+
+<p>
+Sets the metatable for the given <code>value</code> to the given <code>table</code>
+(which can be <b>nil</b>).
+Returns <code>value</code>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-debug.setupvalue"><code>debug.setupvalue (f, up, value)</code></a></h3>
+
+
+<p>
+This function assigns the value <code>value</code> to the upvalue
+with index <code>up</code> of the function <code>f</code>.
+The function returns <b>fail</b> if there is no upvalue
+with the given index.
+Otherwise, it returns the name of the upvalue.
+
+
+<p>
+See <a href="#pdf-debug.getupvalue"><code>debug.getupvalue</code></a> for more information about upvalues.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-debug.setuservalue"><code>debug.setuservalue (udata, value, n)</code></a></h3>
+
+
+<p>
+Sets the given <code>value</code> as
+the <code>n</code>-th user value associated to the given <code>udata</code>.
+<code>udata</code> must be a full userdata.
+
+
+<p>
+Returns <code>udata</code>,
+or <b>fail</b> if the userdata does not have that value.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-debug.traceback"><code>debug.traceback ([thread,] [message [, level]])</code></a></h3>
+
+
+<p>
+If <code>message</code> is present but is neither a string nor <b>nil</b>,
+this function returns <code>message</code> without further processing.
+Otherwise,
+it returns a string with a traceback of the call stack.
+The optional <code>message</code> string is appended
+at the beginning of the traceback.
+An optional <code>level</code> number tells at which level
+to start the traceback
+(default is 1, the function calling <code>traceback</code>).
+
+
+
+
+<p>
+<hr><h3><a name="pdf-debug.upvalueid"><code>debug.upvalueid (f, n)</code></a></h3>
+
+
+<p>
+Returns a unique identifier (as a light userdata)
+for the upvalue numbered <code>n</code>
+from the given function.
+
+
+<p>
+These unique identifiers allow a program to check whether different
+closures share upvalues.
+Lua closures that share an upvalue
+(that is, that access a same external local variable)
+will return identical ids for those upvalue indices.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-debug.upvaluejoin"><code>debug.upvaluejoin (f1, n1, f2, n2)</code></a></h3>
+
+
+<p>
+Make the <code>n1</code>-th upvalue of the Lua closure <code>f1</code>
+refer to the <code>n2</code>-th upvalue of the Lua closure <code>f2</code>.
+
+
+
+
+
+
+
+<h1>7 &ndash; <a name="7">Lua Standalone</a></h1>
+
+<p>
+Although Lua has been designed as an extension language,
+to be embedded in a host C&nbsp;program,
+it is also frequently used as a standalone language.
+An interpreter for Lua as a standalone language,
+called simply <code>lua</code>,
+is provided with the standard distribution.
+The standalone interpreter includes
+all standard libraries.
+Its usage is:
+
+<pre>
+     lua [options] [script [args]]
+</pre><p>
+The options are:
+
+<ul>
+<li><b><code>-e <em>stat</em></code>: </b> execute string <em>stat</em>;</li>
+<li><b><code>-i</code>: </b> enter interactive mode after running <em>script</em>;</li>
+<li><b><code>-l <em>mod</em></code>: </b> "require" <em>mod</em> and assign the
+  result to global <em>mod</em>;</li>
+<li><b><code>-l <em>g=mod</em></code>: </b> "require" <em>mod</em> and assign the
+  result to global <em>g</em>;</li>
+<li><b><code>-v</code>: </b> print version information;</li>
+<li><b><code>-E</code>: </b> ignore environment variables;</li>
+<li><b><code>-W</code>: </b> turn warnings on;</li>
+<li><b><code>--</code>: </b> stop handling options;</li>
+<li><b><code>-</code>: </b> execute <code>stdin</code> as a file and stop handling options.</li>
+</ul><p>
+(The form <code>-l <em>g=mod</em></code> was introduced in release&nbsp;5.4.4.)
+
+
+<p>
+After handling its options, <code>lua</code> runs the given <em>script</em>.
+When called without arguments,
+<code>lua</code> behaves as <code>lua -v -i</code>
+when the standard input (<code>stdin</code>) is a terminal,
+and as <code>lua -</code> otherwise.
+
+
+<p>
+When called without the option <code>-E</code>,
+the interpreter checks for an environment variable <a name="pdf-LUA_INIT_5_4"><code>LUA_INIT_5_4</code></a>
+(or <a name="pdf-LUA_INIT"><code>LUA_INIT</code></a> if the versioned name is not defined)
+before running any argument.
+If the variable content has the format <code>@<em>filename</em></code>,
+then <code>lua</code> executes the file.
+Otherwise, <code>lua</code> executes the string itself.
+
+
+<p>
+When called with the option <code>-E</code>,
+Lua does not consult any environment variables.
+In particular,
+the values of <a href="#pdf-package.path"><code>package.path</code></a> and <a href="#pdf-package.cpath"><code>package.cpath</code></a>
+are set with the default paths defined in <code>luaconf.h</code>.
+
+
+<p>
+The options <code>-e</code>, <code>-l</code>, and <code>-W</code> are handled in
+the order they appear.
+For instance, an invocation like
+
+<pre>
+     $ lua -e 'a=1' -llib1 script.lua
+</pre><p>
+will first set <code>a</code> to 1, then require the library <code>lib1</code>,
+and finally run the file <code>script.lua</code> with no arguments.
+(Here <code>$</code> is the shell prompt. Your prompt may be different.)
+
+
+<p>
+Before running any code,
+<code>lua</code> collects all command-line arguments
+in a global table called <code>arg</code>.
+The script name goes to index 0,
+the first argument after the script name goes to index 1,
+and so on.
+Any arguments before the script name
+(that is, the interpreter name plus its options)
+go to negative indices.
+For instance, in the call
+
+<pre>
+     $ lua -la b.lua t1 t2
+</pre><p>
+the table is like this:
+
+<pre>
+     arg = { [-2] = "lua", [-1] = "-la",
+             [0] = "b.lua",
+             [1] = "t1", [2] = "t2" }
+</pre><p>
+If there is no script in the call,
+the interpreter name goes to index 0,
+followed by the other arguments.
+For instance, the call
+
+<pre>
+     $ lua -e "print(arg[1])"
+</pre><p>
+will print "<code>-e</code>".
+If there is a script,
+the script is called with arguments
+<code>arg[1]</code>, &middot;&middot;&middot;, <code>arg[#arg]</code>.
+Like all chunks in Lua,
+the script is compiled as a variadic function.
+
+
+<p>
+In interactive mode,
+Lua repeatedly prompts and waits for a line.
+After reading a line,
+Lua first try to interpret the line as an expression.
+If it succeeds, it prints its value.
+Otherwise, it interprets the line as a statement.
+If you write an incomplete statement,
+the interpreter waits for its completion
+by issuing a different prompt.
+
+
+<p>
+If the global variable <a name="pdf-_PROMPT"><code>_PROMPT</code></a> contains a string,
+then its value is used as the prompt.
+Similarly, if the global variable <a name="pdf-_PROMPT2"><code>_PROMPT2</code></a> contains a string,
+its value is used as the secondary prompt
+(issued during incomplete statements).
+
+
+<p>
+In case of unprotected errors in the script,
+the interpreter reports the error to the standard error stream.
+If the error object is not a string but
+has a metamethod <code>__tostring</code>,
+the interpreter calls this metamethod to produce the final message.
+Otherwise, the interpreter converts the error object to a string
+and adds a stack traceback to it.
+When warnings are on,
+they are simply printed in the standard error output.
+
+
+<p>
+When finishing normally,
+the interpreter closes its main Lua state
+(see <a href="#lua_close"><code>lua_close</code></a>).
+The script can avoid this step by
+calling <a href="#pdf-os.exit"><code>os.exit</code></a> to terminate.
+
+
+<p>
+To allow the use of Lua as a
+script interpreter in Unix systems,
+Lua skips the first line of a file chunk if it starts with <code>#</code>.
+Therefore, Lua scripts can be made into executable programs
+by using <code>chmod +x</code> and the&nbsp;<code>#!</code> form,
+as in
+
+<pre>
+     #!/usr/local/bin/lua
+</pre><p>
+Of course,
+the location of the Lua interpreter may be different in your machine.
+If <code>lua</code> is in your <code>PATH</code>,
+then
+
+<pre>
+     #!/usr/bin/env lua
+</pre><p>
+is a more portable solution.
+
+
+
+<h1>8 &ndash; <a name="8">Incompatibilities with the Previous Version</a></h1>
+
+
+
+<p>
+Here we list the incompatibilities that you may find when moving a program
+from Lua&nbsp;5.3 to Lua&nbsp;5.4.
+
+
+<p>
+You can avoid some incompatibilities by compiling Lua with
+appropriate options (see file <code>luaconf.h</code>).
+However,
+all these compatibility options will be removed in the future.
+More often than not,
+compatibility issues arise when these compatibility options
+are removed.
+So, whenever you have the chance,
+you should try to test your code with a version of Lua compiled
+with all compatibility options turned off.
+That will ease transitions to newer versions of Lua.
+
+
+<p>
+Lua versions can always change the C API in ways that
+do not imply source-code changes in a program,
+such as the numeric values for constants
+or the implementation of functions as macros.
+Therefore,
+you should never assume that binaries are compatible between
+different Lua versions.
+Always recompile clients of the Lua API when
+using a new version.
+
+
+<p>
+Similarly, Lua versions can always change the internal representation
+of precompiled chunks;
+precompiled chunks are not compatible between different Lua versions.
+
+
+<p>
+The standard paths in the official distribution may
+change between versions.
+
+
+
+
+
+<h2>8.1 &ndash; <a name="8.1">Incompatibilities in the Language</a></h2>
+<ul>
+
+<li>
+The coercion of strings to numbers in
+arithmetic and bitwise operations
+has been removed from the core language.
+The string library does a similar job
+for arithmetic (but not for bitwise) operations
+using the string metamethods.
+However, unlike in previous versions,
+the new implementation preserves the implicit type of the numeral
+in the string.
+For instance, the result of <code>"1" + "2"</code> now is an integer,
+not a float.
+</li>
+
+<li>
+Literal decimal integer constants that overflow are read as floats,
+instead of wrapping around.
+You can use hexadecimal notation for such constants if you
+want the old behavior
+(reading them as integers with wrap around).
+</li>
+
+<li>
+The use of the <code>__lt</code> metamethod to emulate <code>__le</code>
+has been removed.
+When needed, this metamethod must be explicitly defined.
+</li>
+
+<li>
+The semantics of the numerical <b>for</b> loop
+over integers changed in some details.
+In particular, the control variable never wraps around.
+</li>
+
+<li>
+A label for a <b>goto</b> cannot be declared where a label with the same
+name is visible, even if this other label is declared in an enclosing
+block.
+</li>
+
+<li>
+When finalizing an object,
+Lua does not ignore <code>__gc</code> metamethods that are not functions.
+Any value will be called, if present.
+(Non-callable values will generate a warning,
+like any other error when calling a finalizer.)
+</li>
+
+</ul>
+
+
+
+
+<h2>8.2 &ndash; <a name="8.2">Incompatibilities in the Libraries</a></h2>
+<ul>
+
+<li>
+The function <a href="#pdf-print"><code>print</code></a> does not call <a href="#pdf-tostring"><code>tostring</code></a>
+to format its arguments;
+instead, it has this functionality hardwired.
+You should use <code>__tostring</code> to modify how values are printed.
+</li>
+
+<li>
+The pseudo-random number generator used by the function <a href="#pdf-math.random"><code>math.random</code></a>
+now starts with a somewhat random seed.
+Moreover, it uses a different algorithm.
+</li>
+
+<li>
+By default, the decoding functions in the <a href="#pdf-utf8"><code>utf8</code></a> library
+do not accept surrogates as valid code points.
+An extra parameter in these functions makes them more permissive.
+</li>
+
+<li>
+The options "<code>setpause</code>" and "<code>setstepmul</code>"
+of the function <a href="#pdf-collectgarbage"><code>collectgarbage</code></a> are deprecated.
+You should use the new option "<code>incremental</code>" to set them.
+</li>
+
+<li>
+The function <a href="#pdf-io.lines"><code>io.lines</code></a> now returns four values,
+instead of just one.
+That can be a problem when it is used as the sole
+argument to another function that has optional parameters,
+such as in <code>load(io.lines(filename, "L"))</code>.
+To fix that issue,
+you can wrap the call into parentheses,
+to adjust its number of results to one.
+</li>
+
+</ul>
+
+
+
+
+<h2>8.3 &ndash; <a name="8.3">Incompatibilities in the API</a></h2>
+
+
+<ul>
+
+<li>
+Full userdata now has an arbitrary number of associated user values.
+Therefore, the functions <code>lua_newuserdata</code>,
+<code>lua_setuservalue</code>, and <code>lua_getuservalue</code> were
+replaced by <a href="#lua_newuserdatauv"><code>lua_newuserdatauv</code></a>,
+<a href="#lua_setiuservalue"><code>lua_setiuservalue</code></a>, and <a href="#lua_getiuservalue"><code>lua_getiuservalue</code></a>,
+which have an extra argument.
+
+
+<p>
+For compatibility, the old names still work as macros assuming
+one single user value.
+Note, however, that userdata with zero user values
+are more efficient memory-wise.
+</li>
+
+<li>
+The function <a href="#lua_resume"><code>lua_resume</code></a> has an extra parameter.
+This out parameter returns the number of values on
+the top of the stack that were yielded or returned by the coroutine.
+(In previous versions,
+those values were the entire stack.)
+</li>
+
+<li>
+The function <a href="#lua_version"><code>lua_version</code></a> returns the version number,
+instead of an address of the version number.
+The Lua core should work correctly with libraries using their
+own static copies of the same core,
+so there is no need to check whether they are using the same
+address space.
+</li>
+
+<li>
+The constant <code>LUA_ERRGCMM</code> was removed.
+Errors in finalizers are never propagated;
+instead, they generate a warning.
+</li>
+
+<li>
+The options <code>LUA_GCSETPAUSE</code> and <code>LUA_GCSETSTEPMUL</code>
+of the function <a href="#lua_gc"><code>lua_gc</code></a> are deprecated.
+You should use the new option <code>LUA_GCINC</code> to set them.
+</li>
+
+</ul>
+
+
+
+
+<h1>9 &ndash; <a name="9">The Complete Syntax of Lua</a></h1>
+
+<p>
+Here is the complete syntax of Lua in extended BNF.
+As usual in extended BNF,
+{A} means 0 or more As,
+and [A] means an optional A.
+(For operator precedences, see <a href="#3.4.8">&sect;3.4.8</a>;
+for a description of the terminals
+Name, Numeral,
+and LiteralString, see <a href="#3.1">&sect;3.1</a>.)
+
+
+
+
+<pre>
+
+	chunk ::= block
+
+	block ::= {stat} [retstat]
+
+	stat ::=  &lsquo;<b>;</b>&rsquo; | 
+		 varlist &lsquo;<b>=</b>&rsquo; explist | 
+		 functioncall | 
+		 label | 
+		 <b>break</b> | 
+		 <b>goto</b> Name | 
+		 <b>do</b> block <b>end</b> | 
+		 <b>while</b> exp <b>do</b> block <b>end</b> | 
+		 <b>repeat</b> block <b>until</b> exp | 
+		 <b>if</b> exp <b>then</b> block {<b>elseif</b> exp <b>then</b> block} [<b>else</b> block] <b>end</b> | 
+		 <b>for</b> Name &lsquo;<b>=</b>&rsquo; exp &lsquo;<b>,</b>&rsquo; exp [&lsquo;<b>,</b>&rsquo; exp] <b>do</b> block <b>end</b> | 
+		 <b>for</b> namelist <b>in</b> explist <b>do</b> block <b>end</b> | 
+		 <b>function</b> funcname funcbody | 
+		 <b>local</b> <b>function</b> Name funcbody | 
+		 <b>local</b> attnamelist [&lsquo;<b>=</b>&rsquo; explist] 
+
+	attnamelist ::=  Name attrib {&lsquo;<b>,</b>&rsquo; Name attrib}
+
+	attrib ::= [&lsquo;<b>&lt;</b>&rsquo; Name &lsquo;<b>&gt;</b>&rsquo;]
+
+	retstat ::= <b>return</b> [explist] [&lsquo;<b>;</b>&rsquo;]
+
+	label ::= &lsquo;<b>::</b>&rsquo; Name &lsquo;<b>::</b>&rsquo;
+
+	funcname ::= Name {&lsquo;<b>.</b>&rsquo; Name} [&lsquo;<b>:</b>&rsquo; Name]
+
+	varlist ::= var {&lsquo;<b>,</b>&rsquo; var}
+
+	var ::=  Name | prefixexp &lsquo;<b>[</b>&rsquo; exp &lsquo;<b>]</b>&rsquo; | prefixexp &lsquo;<b>.</b>&rsquo; Name 
+
+	namelist ::= Name {&lsquo;<b>,</b>&rsquo; Name}
+
+	explist ::= exp {&lsquo;<b>,</b>&rsquo; exp}
+
+	exp ::=  <b>nil</b> | <b>false</b> | <b>true</b> | Numeral | LiteralString | &lsquo;<b>...</b>&rsquo; | functiondef | 
+		 prefixexp | tableconstructor | exp binop exp | unop exp 
+
+	prefixexp ::= var | functioncall | &lsquo;<b>(</b>&rsquo; exp &lsquo;<b>)</b>&rsquo;
+
+	functioncall ::=  prefixexp args | prefixexp &lsquo;<b>:</b>&rsquo; Name args 
+
+	args ::=  &lsquo;<b>(</b>&rsquo; [explist] &lsquo;<b>)</b>&rsquo; | tableconstructor | LiteralString 
+
+	functiondef ::= <b>function</b> funcbody
+
+	funcbody ::= &lsquo;<b>(</b>&rsquo; [parlist] &lsquo;<b>)</b>&rsquo; block <b>end</b>
+
+	parlist ::= namelist [&lsquo;<b>,</b>&rsquo; &lsquo;<b>...</b>&rsquo;] | &lsquo;<b>...</b>&rsquo;
+
+	tableconstructor ::= &lsquo;<b>{</b>&rsquo; [fieldlist] &lsquo;<b>}</b>&rsquo;
+
+	fieldlist ::= field {fieldsep field} [fieldsep]
+
+	field ::= &lsquo;<b>[</b>&rsquo; exp &lsquo;<b>]</b>&rsquo; &lsquo;<b>=</b>&rsquo; exp | Name &lsquo;<b>=</b>&rsquo; exp | exp
+
+	fieldsep ::= &lsquo;<b>,</b>&rsquo; | &lsquo;<b>;</b>&rsquo;
+
+	binop ::=  &lsquo;<b>+</b>&rsquo; | &lsquo;<b>-</b>&rsquo; | &lsquo;<b>*</b>&rsquo; | &lsquo;<b>/</b>&rsquo; | &lsquo;<b>//</b>&rsquo; | &lsquo;<b>^</b>&rsquo; | &lsquo;<b>%</b>&rsquo; | 
+		 &lsquo;<b>&amp;</b>&rsquo; | &lsquo;<b>~</b>&rsquo; | &lsquo;<b>|</b>&rsquo; | &lsquo;<b>&gt;&gt;</b>&rsquo; | &lsquo;<b>&lt;&lt;</b>&rsquo; | &lsquo;<b>..</b>&rsquo; | 
+		 &lsquo;<b>&lt;</b>&rsquo; | &lsquo;<b>&lt;=</b>&rsquo; | &lsquo;<b>&gt;</b>&rsquo; | &lsquo;<b>&gt;=</b>&rsquo; | &lsquo;<b>==</b>&rsquo; | &lsquo;<b>~=</b>&rsquo; | 
+		 <b>and</b> | <b>or</b>
+
+	unop ::= &lsquo;<b>-</b>&rsquo; | <b>not</b> | &lsquo;<b>#</b>&rsquo; | &lsquo;<b>~</b>&rsquo;
+
+</pre>
+
+<p>
+
+
+
+
+
+
+
+<P CLASS="footer">
+Last update:
+Tue May  2 20:09:38 UTC 2023
+</P>
+<!--
+Last change: revised for Lua 5.4.6
+-->
+
+</body></html>
+
diff --git a/src/libs/3rdparty/lua/doc/osi-certified-72x60.png b/src/libs/3rdparty/lua/doc/osi-certified-72x60.png
new file mode 100644
index 0000000000..07df5f6ee7
--- /dev/null
+++ b/src/libs/3rdparty/lua/doc/osi-certified-72x60.png
diff --git a/src/libs/3rdparty/lua/doc/readme.html b/src/libs/3rdparty/lua/doc/readme.html
new file mode 100644
index 0000000000..918ec8ed93
--- /dev/null
+++ b/src/libs/3rdparty/lua/doc/readme.html
@@ -0,0 +1,337 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<HTML>
+<HEAD>
+<TITLE>Lua 5.4 readme</TITLE>
+<LINK REL="stylesheet" TYPE="text/css" HREF="lua.css">
+<META HTTP-EQUIV="content-type" CONTENT="text/html; charset=iso-8859-1">
+<STYLE TYPE="text/css">
+blockquote, .display {
+	border: solid #a0a0a0 2px ;
+	border-radius: 8px ;
+	padding: 1em ;
+	margin: 0px ;
+}
+
+.display {
+	word-spacing: 0.25em ;
+}
+
+dl.display dd {
+	padding-bottom: 0.2em ;
+}
+
+tt, kbd, code {
+	font-size: 12pt ;
+}
+</STYLE>
+</HEAD>
+
+<BODY>
+
+<H1>
+<A HREF="http://www.lua.org/"><IMG SRC="logo.gif" ALT="Lua"></A>
+Welcome to Lua 5.4
+</H1>
+
+<DIV CLASS="menubar">
+<A HREF="#about">about</A>
+&middot;
+<A HREF="#install">installation</A>
+&middot;
+<A HREF="#changes">changes</A>
+&middot;
+<A HREF="#license">license</A>
+&middot;
+<A HREF="contents.html">reference manual</A>
+</DIV>
+
+<H2><A NAME="about">About Lua</A></H2>
+<P>
+Lua is a powerful, efficient, lightweight, embeddable scripting language
+developed by a
+<A HREF="http://www.lua.org/authors.html">team</A>
+at
+<A HREF="http://www.puc-rio.br/">PUC-Rio</A>,
+the Pontifical Catholic University of Rio de Janeiro in Brazil.
+Lua is
+<A HREF="#license">free software</A>
+used in
+<A HREF="http://www.lua.org/uses.html">many products and projects</A>
+around the world.
+
+<P>
+Lua's
+<A HREF="http://www.lua.org/">official web site</A>
+provides complete information
+about Lua,
+including
+an
+<A HREF="http://www.lua.org/about.html">executive summary</A>
+and
+updated
+<A HREF="http://www.lua.org/docs.html">documentation</A>,
+especially the
+<A HREF="http://www.lua.org/manual/5.4/">reference manual</A>,
+which may differ slightly from the
+<A HREF="contents.html">local copy</A>
+distributed in this package.
+
+<H2><A NAME="install">Installing Lua</A></H2>
+<P>
+Lua is distributed in
+<A HREF="http://www.lua.org/ftp/">source</A>
+form.
+You need to build it before using it.
+Building Lua should be straightforward
+because
+Lua is implemented in pure ANSI C and compiles unmodified in all known
+platforms that have an ANSI C compiler.
+Lua also compiles unmodified as C++.
+The instructions given below for building Lua are for Unix-like platforms,
+such as Linux and Mac OS X.
+See also
+<A HREF="#other">instructions for other systems</A>
+and
+<A HREF="#customization">customization options</A>.
+
+<P>
+If you don't have the time or the inclination to compile Lua yourself,
+get a binary from
+<A HREF="http://lua-users.org/wiki/LuaBinaries">LuaBinaries</A>.
+
+<H3>Building Lua</H3>
+<P>
+In most common Unix-like platforms, simply do "<KBD>make</KBD>".
+Here are the details.
+
+<OL>
+<LI>
+Open a terminal window and move to
+the top-level directory, which is named <TT>lua-5.4.6</TT>.
+The <TT>Makefile</TT> there controls both the build process and the installation process.
+<P>
+<LI>
+  Do "<KBD>make</KBD>". The <TT>Makefile</TT> will guess your platform and build Lua for it.
+<P>
+<LI>
+  If the guess failed, do "<KBD>make help</KBD>" and see if your platform is listed.
+  The platforms currently supported are:
+<P>
+<P CLASS="display">
+   guess aix bsd c89 freebsd generic ios linux linux-readline macosx mingw posix solaris
+</P>
+<P>
+  If your platform is listed, just do "<KBD>make xxx</KBD>", where xxx
+  is your platform name.
+<P>
+  If your platform is not listed, try the closest one or posix, generic,
+  c89, in this order.
+<P>
+<LI>
+The compilation takes only a few moments
+and produces three files in the <TT>src</TT> directory:
+lua (the interpreter),
+luac (the compiler),
+and liblua.a (the library).
+<P>
+<LI>
+  To check that Lua has been built correctly, do "<KBD>make test</KBD>"
+  after building Lua. This will run the interpreter and print its version.
+</OL>
+<P>
+If you're running Linux, try "<KBD>make linux-readline</KBD>" to build the interactive Lua interpreter with handy line-editing and history capabilities.
+If you get compilation errors,
+make sure you have installed the <TT>readline</TT> development package
+(which is probably named <TT>libreadline-dev</TT> or <TT>readline-devel</TT>).
+If you get link errors after that,
+then try "<KBD>make linux-readline MYLIBS=-ltermcap</KBD>".
+
+<H3>Installing Lua</H3>
+<P>
+  Once you have built Lua, you may want to install it in an official
+  place in your system. In this case, do "<KBD>make install</KBD>". The official
+  place and the way to install files are defined in the <TT>Makefile</TT>. You'll
+  probably need the right permissions to install files, and so may need to do "<KBD>sudo make install</KBD>".
+
+<P>
+  To build and install Lua in one step, do "<KBD>make all install</KBD>",
+  or "<KBD>make xxx install</KBD>",
+  where xxx is your platform name.
+
+<P>
+  To install Lua locally after building it, do "<KBD>make local</KBD>".
+  This will create a directory <TT>install</TT> with subdirectories
+  <TT>bin</TT>, <TT>include</TT>, <TT>lib</TT>, <TT>man</TT>, <TT>share</TT>,
+  and install Lua as listed below.
+
+  To install Lua locally, but in some other directory, do
+  "<KBD>make install INSTALL_TOP=xxx</KBD>", where xxx is your chosen directory.
+  The installation starts in the <TT>src</TT> and <TT>doc</TT> directories,
+  so take care if <TT>INSTALL_TOP</TT> is not an absolute path.
+
+<DL CLASS="display">
+<DT>
+    bin:
+<DD>
+    lua luac
+<DT>
+    include:
+<DD>
+    lua.h luaconf.h lualib.h lauxlib.h lua.hpp
+<DT>
+    lib:
+<DD>
+    liblua.a
+<DT>
+    man/man1:
+<DD>
+    lua.1 luac.1
+</DL>
+
+<P>
+  These are the only directories you need for development.
+  If you only want to run Lua programs,
+  you only need the files in <TT>bin</TT> and <TT>man</TT>.
+  The files in <TT>include</TT> and <TT>lib</TT> are needed for
+  embedding Lua in C or C++ programs.
+
+<H3><A NAME="customization">Customization</A></H3>
+<P>
+  Three kinds of things can be customized by editing a file:
+<UL>
+    <LI> Where and how to install Lua &mdash; edit <TT>Makefile</TT>.
+    <LI> How to build Lua &mdash; edit <TT>src/Makefile</TT>.
+    <LI> Lua features &mdash; edit <TT>src/luaconf.h</TT>.
+</UL>
+
+<P>
+  You don't actually need to edit the Makefiles because you may set the
+  relevant variables in the command line when invoking make.
+  Nevertheless, it's probably best to edit and save the Makefiles to
+  record the changes you've made.
+
+<P>
+  On the other hand, if you need to customize some Lua features, you'll need
+  to edit <TT>src/luaconf.h</TT> before building and installing Lua.
+  The edited file will be the one installed, and
+  it will be used by any Lua clients that you build, to ensure consistency.
+  Further customization is available to experts by editing the Lua sources.
+
+<H3><A NAME="other">Building Lua on other systems</A></H3>
+<P>
+  If you're not using the usual Unix tools, then the instructions for
+  building Lua depend on the compiler you use. You'll need to create
+  projects (or whatever your compiler uses) for building the library,
+  the interpreter, and the compiler, as follows:
+
+<DL CLASS="display">
+<DT>
+library:
+<DD>
+lapi.c lcode.c lctype.c ldebug.c ldo.c ldump.c lfunc.c lgc.c llex.c lmem.c lobject.c lopcodes.c lparser.c lstate.c lstring.c ltable.c ltm.c lundump.c lvm.c lzio.c
+lauxlib.c lbaselib.c lcorolib.c ldblib.c liolib.c lmathlib.c loadlib.c loslib.c lstrlib.c ltablib.c lutf8lib.c linit.c
+<DT>
+interpreter:
+<DD>
+  library, lua.c
+<DT>
+compiler:
+<DD>
+  library, luac.c
+</DL>
+
+<P>
+  To use Lua as a library in your own programs, you'll need to know how to
+  create and use libraries with your compiler. Moreover, to dynamically load
+  C libraries for Lua, you'll need to know how to create dynamic libraries
+  and you'll need to make sure that the Lua API functions are accessible to
+  those dynamic libraries &mdash; but <EM>don't</EM> link the Lua library
+  into each dynamic library. For Unix, we recommend that the Lua library
+  be linked statically into the host program and its symbols exported for
+  dynamic linking; <TT>src/Makefile</TT> does this for the Lua interpreter.
+  For Windows, we recommend that the Lua library be a DLL.
+  In all cases, the compiler luac should be linked statically.
+
+<P>
+  As mentioned above, you may edit <TT>src/luaconf.h</TT> to customize
+  some features before building Lua.
+
+<H2><A NAME="changes">Changes since Lua 5.3</A></H2>
+<P>
+Here are the main changes introduced in Lua 5.4.
+The
+<A HREF="contents.html">reference manual</A>
+lists the
+<A HREF="manual.html#8">incompatibilities</A> that had to be introduced.
+
+<H3>Main changes</H3>
+<UL>
+<LI> new generational mode for garbage collection
+<LI> to-be-closed variables
+<LI> const variables
+<LI> userdata can have multiple user values
+<LI> new implementation for math.random
+<LI> warning system
+<LI> debug information about function arguments and returns
+<LI> new semantics for the integer 'for' loop
+<LI> optional 'init' argument to 'string.gmatch'
+<LI> new functions 'lua_resetthread' and 'coroutine.close'
+<LI> string-to-number coercions moved to the string library
+<LI> allocation function allowed to fail when shrinking a memory block
+<LI> new format '%p' in 'string.format'
+<LI> utf8 library accepts codepoints up to 2^31
+</UL>
+
+<H2><A NAME="license">License</A></H2>
+<P>
+<A HREF="http://www.opensource.org/docs/definition.php">
+<IMG SRC="osi-certified-72x60.png" ALIGN="right" ALT="[osi certified]" STYLE="padding-left: 30px ;">
+</A>
+Lua is free software distributed under the terms of the
+<A HREF="http://www.opensource.org/licenses/mit-license.html">MIT license</A>
+reproduced below;
+it may be used for any purpose, including commercial purposes,
+at absolutely no cost without having to ask us.
+
+The only requirement is that if you do use Lua,
+then you should give us credit by including the appropriate copyright notice somewhere in your product or its documentation.
+
+For details, see
+<A HREF="http://www.lua.org/license.html">this</A>.
+
+<BLOCKQUOTE STYLE="padding-bottom: 0em">
+Copyright &copy; 1994&ndash;2023 Lua.org, PUC-Rio.
+
+<P>
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+<P>
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+<P>
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+</BLOCKQUOTE>
+<P>
+
+<P CLASS="footer">
+Last update:
+Tue May  2 20:08:55 UTC 2023
+</P>
+<!--
+Last change: revised for Lua 5.4.6
+-->
+
+</BODY>
+</HTML>
diff --git a/src/libs/3rdparty/lua/lua.qbs b/src/libs/3rdparty/lua/lua.qbs
new file mode 100644
index 0000000000..73d61b039c
--- /dev/null
+++ b/src/libs/3rdparty/lua/lua.qbs
@@ -0,0 +1,81 @@
+QtcLibrary {
+    name: "lua546"
+    type: "staticlibrary"
+
+    cpp.defines: {
+        var defines = base;
+        if (qbs.targetOS.contains("windows"))
+            defines.push("LUA_USE_WINDOWS");
+        else if (qbs.targetOS.contains("macos"))
+            defines.push("LUA_USE_MACOSX");
+        else if (qbs.targetOS.contains("linux"))
+            defines.push("LUA_USE_LINUX");
+        return defines;
+    }
+
+    Group {
+        name: "Sources"
+        prefix: "src/"
+
+        files: [
+            "lapi.c",
+            "lapi.h",
+            "lauxlib.c",
+            "lauxlib.h",
+            "lbaselib.c",
+            "lcode.c",
+            "lcode.h",
+            "lcorolib.c",
+            "lctype.c",
+            "lctype.h",
+            "ldblib.c",
+            "ldebug.c",
+            "ldebug.h",
+            "ldo.c",
+            "ldo.h",
+            "ldump.c",
+            "lfunc.c",
+            "lfunc.h",
+            "lgc.c",
+            "lgc.h",
+            "linit.c",
+            "liolib.c",
+            "llex.c",
+            "llex.h",
+            "lmathlib.c",
+            "lmem.c",
+            "lmem.h",
+            "loadlib.c",
+            "lobject.c",
+            "lobject.h",
+            "lopcodes.c",
+            "lopcodes.h",
+            "loslib.c",
+            "lparser.c",
+            "lparser.h",
+            "lstate.c",
+            "lstate.h",
+            "lstring.c",
+            "lstring.h",
+            "lstrlib.c",
+            "ltable.c",
+            "ltable.h",
+            "ltablib.c",
+            "ltm.c",
+            "ltm.h",
+            "lua.c",
+            "lua.h",
+            "lundump.c",
+            "lundump.h",
+            "lutf8lib.c",
+            "lvm.c",
+            "lvm.h",
+            "lzio.c",
+            "lzio.h",
+        ]
+    }
+
+    Export {
+        cpp.includePaths: project.ide_source_tree + "/src/libs/3rdparty/lua/src"
+    }
+}
diff --git a/src/libs/3rdparty/lua/src/lapi.c b/src/libs/3rdparty/lua/src/lapi.c
new file mode 100644
index 0000000000..34e64af142
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lapi.c
@@ -0,0 +1,1463 @@
+/*
+** $Id: lapi.c $
+** Lua API
+** See Copyright Notice in lua.h
+*/
+
+#define lapi_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include <limits.h>
+#include <stdarg.h>
+#include <string.h>
+
+#include "lua.h"
+
+#include "lapi.h"
+#include "ldebug.h"
+#include "ldo.h"
+#include "lfunc.h"
+#include "lgc.h"
+#include "lmem.h"
+#include "lobject.h"
+#include "lstate.h"
+#include "lstring.h"
+#include "ltable.h"
+#include "ltm.h"
+#include "lundump.h"
+#include "lvm.h"
+
+
+
+const char lua_ident[] =
+  "$LuaVersion: " LUA_COPYRIGHT " $"
+  "$LuaAuthors: " LUA_AUTHORS " $";
+
+
+
+/*
+** Test for a valid index (one that is not the 'nilvalue').
+** '!ttisnil(o)' implies 'o != &G(L)->nilvalue', so it is not needed.
+** However, it covers the most common cases in a faster way.
+*/
+#define isvalid(L, o)	(!ttisnil(o) || o != &G(L)->nilvalue)
+
+
+/* test for pseudo index */
+#define ispseudo(i)		((i) <= LUA_REGISTRYINDEX)
+
+/* test for upvalue */
+#define isupvalue(i)		((i) < LUA_REGISTRYINDEX)
+
+
+/*
+** Convert an acceptable index to a pointer to its respective value.
+** Non-valid indices return the special nil value 'G(L)->nilvalue'.
+*/
+static TValue *index2value (lua_State *L, int idx) {
+  CallInfo *ci = L->ci;
+  if (idx > 0) {
+    StkId o = ci->func.p + idx;
+    api_check(L, idx <= ci->top.p - (ci->func.p + 1), "unacceptable index");
+    if (o >= L->top.p) return &G(L)->nilvalue;
+    else return s2v(o);
+  }
+  else if (!ispseudo(idx)) {  /* negative index */
+    api_check(L, idx != 0 && -idx <= L->top.p - (ci->func.p + 1),
+                 "invalid index");
+    return s2v(L->top.p + idx);
+  }
+  else if (idx == LUA_REGISTRYINDEX)
+    return &G(L)->l_registry;
+  else {  /* upvalues */
+    idx = LUA_REGISTRYINDEX - idx;
+    api_check(L, idx <= MAXUPVAL + 1, "upvalue index too large");
+    if (ttisCclosure(s2v(ci->func.p))) {  /* C closure? */
+      CClosure *func = clCvalue(s2v(ci->func.p));
+      return (idx <= func->nupvalues) ? &func->upvalue[idx-1]
+                                      : &G(L)->nilvalue;
+    }
+    else {  /* light C function or Lua function (through a hook)?) */
+      api_check(L, ttislcf(s2v(ci->func.p)), "caller not a C function");
+      return &G(L)->nilvalue;  /* no upvalues */
+    }
+  }
+}
+
+
+
+/*
+** Convert a valid actual index (not a pseudo-index) to its address.
+*/
+l_sinline StkId index2stack (lua_State *L, int idx) {
+  CallInfo *ci = L->ci;
+  if (idx > 0) {
+    StkId o = ci->func.p + idx;
+    api_check(L, o < L->top.p, "invalid index");
+    return o;
+  }
+  else {    /* non-positive index */
+    api_check(L, idx != 0 && -idx <= L->top.p - (ci->func.p + 1),
+                 "invalid index");
+    api_check(L, !ispseudo(idx), "invalid index");
+    return L->top.p + idx;
+  }
+}
+
+
+LUA_API int lua_checkstack (lua_State *L, int n) {
+  int res;
+  CallInfo *ci;
+  lua_lock(L);
+  ci = L->ci;
+  api_check(L, n >= 0, "negative 'n'");
+  if (L->stack_last.p - L->top.p > n)  /* stack large enough? */
+    res = 1;  /* yes; check is OK */
+  else  /* need to grow stack */
+    res = luaD_growstack(L, n, 0);
+  if (res && ci->top.p < L->top.p + n)
+    ci->top.p = L->top.p + n;  /* adjust frame top */
+  lua_unlock(L);
+  return res;
+}
+
+
+LUA_API void lua_xmove (lua_State *from, lua_State *to, int n) {
+  int i;
+  if (from == to) return;
+  lua_lock(to);
+  api_checknelems(from, n);
+  api_check(from, G(from) == G(to), "moving among independent states");
+  api_check(from, to->ci->top.p - to->top.p >= n, "stack overflow");
+  from->top.p -= n;
+  for (i = 0; i < n; i++) {
+    setobjs2s(to, to->top.p, from->top.p + i);
+    to->top.p++;  /* stack already checked by previous 'api_check' */
+  }
+  lua_unlock(to);
+}
+
+
+LUA_API lua_CFunction lua_atpanic (lua_State *L, lua_CFunction panicf) {
+  lua_CFunction old;
+  lua_lock(L);
+  old = G(L)->panic;
+  G(L)->panic = panicf;
+  lua_unlock(L);
+  return old;
+}
+
+
+LUA_API lua_Number lua_version (lua_State *L) {
+  UNUSED(L);
+  return LUA_VERSION_NUM;
+}
+
+
+
+/*
+** basic stack manipulation
+*/
+
+
+/*
+** convert an acceptable stack index into an absolute index
+*/
+LUA_API int lua_absindex (lua_State *L, int idx) {
+  return (idx > 0 || ispseudo(idx))
+         ? idx
+         : cast_int(L->top.p - L->ci->func.p) + idx;
+}
+
+
+LUA_API int lua_gettop (lua_State *L) {
+  return cast_int(L->top.p - (L->ci->func.p + 1));
+}
+
+
+LUA_API void lua_settop (lua_State *L, int idx) {
+  CallInfo *ci;
+  StkId func, newtop;
+  ptrdiff_t diff;  /* difference for new top */
+  lua_lock(L);
+  ci = L->ci;
+  func = ci->func.p;
+  if (idx >= 0) {
+    api_check(L, idx <= ci->top.p - (func + 1), "new top too large");
+    diff = ((func + 1) + idx) - L->top.p;
+    for (; diff > 0; diff--)
+      setnilvalue(s2v(L->top.p++));  /* clear new slots */
+  }
+  else {
+    api_check(L, -(idx+1) <= (L->top.p - (func + 1)), "invalid new top");
+    diff = idx + 1;  /* will "subtract" index (as it is negative) */
+  }
+  api_check(L, L->tbclist.p < L->top.p, "previous pop of an unclosed slot");
+  newtop = L->top.p + diff;
+  if (diff < 0 && L->tbclist.p >= newtop) {
+    lua_assert(hastocloseCfunc(ci->nresults));
+    newtop = luaF_close(L, newtop, CLOSEKTOP, 0);
+  }
+  L->top.p = newtop;  /* correct top only after closing any upvalue */
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_closeslot (lua_State *L, int idx) {
+  StkId level;
+  lua_lock(L);
+  level = index2stack(L, idx);
+  api_check(L, hastocloseCfunc(L->ci->nresults) && L->tbclist.p == level,
+     "no variable to close at given level");
+  level = luaF_close(L, level, CLOSEKTOP, 0);
+  setnilvalue(s2v(level));
+  lua_unlock(L);
+}
+
+
+/*
+** Reverse the stack segment from 'from' to 'to'
+** (auxiliary to 'lua_rotate')
+** Note that we move(copy) only the value inside the stack.
+** (We do not move additional fields that may exist.)
+*/
+l_sinline void reverse (lua_State *L, StkId from, StkId to) {
+  for (; from < to; from++, to--) {
+    TValue temp;
+    setobj(L, &temp, s2v(from));
+    setobjs2s(L, from, to);
+    setobj2s(L, to, &temp);
+  }
+}
+
+
+/*
+** Let x = AB, where A is a prefix of length 'n'. Then,
+** rotate x n == BA. But BA == (A^r . B^r)^r.
+*/
+LUA_API void lua_rotate (lua_State *L, int idx, int n) {
+  StkId p, t, m;
+  lua_lock(L);
+  t = L->top.p - 1;  /* end of stack segment being rotated */
+  p = index2stack(L, idx);  /* start of segment */
+  api_check(L, (n >= 0 ? n : -n) <= (t - p + 1), "invalid 'n'");
+  m = (n >= 0 ? t - n : p - n - 1);  /* end of prefix */
+  reverse(L, p, m);  /* reverse the prefix with length 'n' */
+  reverse(L, m + 1, t);  /* reverse the suffix */
+  reverse(L, p, t);  /* reverse the entire segment */
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_copy (lua_State *L, int fromidx, int toidx) {
+  TValue *fr, *to;
+  lua_lock(L);
+  fr = index2value(L, fromidx);
+  to = index2value(L, toidx);
+  api_check(L, isvalid(L, to), "invalid index");
+  setobj(L, to, fr);
+  if (isupvalue(toidx))  /* function upvalue? */
+    luaC_barrier(L, clCvalue(s2v(L->ci->func.p)), fr);
+  /* LUA_REGISTRYINDEX does not need gc barrier
+     (collector revisits it before finishing collection) */
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_pushvalue (lua_State *L, int idx) {
+  lua_lock(L);
+  setobj2s(L, L->top.p, index2value(L, idx));
+  api_incr_top(L);
+  lua_unlock(L);
+}
+
+
+
+/*
+** access functions (stack -> C)
+*/
+
+
+LUA_API int lua_type (lua_State *L, int idx) {
+  const TValue *o = index2value(L, idx);
+  return (isvalid(L, o) ? ttype(o) : LUA_TNONE);
+}
+
+
+LUA_API const char *lua_typename (lua_State *L, int t) {
+  UNUSED(L);
+  api_check(L, LUA_TNONE <= t && t < LUA_NUMTYPES, "invalid type");
+  return ttypename(t);
+}
+
+
+LUA_API int lua_iscfunction (lua_State *L, int idx) {
+  const TValue *o = index2value(L, idx);
+  return (ttislcf(o) || (ttisCclosure(o)));
+}
+
+
+LUA_API int lua_isinteger (lua_State *L, int idx) {
+  const TValue *o = index2value(L, idx);
+  return ttisinteger(o);
+}
+
+
+LUA_API int lua_isnumber (lua_State *L, int idx) {
+  lua_Number n;
+  const TValue *o = index2value(L, idx);
+  return tonumber(o, &n);
+}
+
+
+LUA_API int lua_isstring (lua_State *L, int idx) {
+  const TValue *o = index2value(L, idx);
+  return (ttisstring(o) || cvt2str(o));
+}
+
+
+LUA_API int lua_isuserdata (lua_State *L, int idx) {
+  const TValue *o = index2value(L, idx);
+  return (ttisfulluserdata(o) || ttislightuserdata(o));
+}
+
+
+LUA_API int lua_rawequal (lua_State *L, int index1, int index2) {
+  const TValue *o1 = index2value(L, index1);
+  const TValue *o2 = index2value(L, index2);
+  return (isvalid(L, o1) && isvalid(L, o2)) ? luaV_rawequalobj(o1, o2) : 0;
+}
+
+
+LUA_API void lua_arith (lua_State *L, int op) {
+  lua_lock(L);
+  if (op != LUA_OPUNM && op != LUA_OPBNOT)
+    api_checknelems(L, 2);  /* all other operations expect two operands */
+  else {  /* for unary operations, add fake 2nd operand */
+    api_checknelems(L, 1);
+    setobjs2s(L, L->top.p, L->top.p - 1);
+    api_incr_top(L);
+  }
+  /* first operand at top - 2, second at top - 1; result go to top - 2 */
+  luaO_arith(L, op, s2v(L->top.p - 2), s2v(L->top.p - 1), L->top.p - 2);
+  L->top.p--;  /* remove second operand */
+  lua_unlock(L);
+}
+
+
+LUA_API int lua_compare (lua_State *L, int index1, int index2, int op) {
+  const TValue *o1;
+  const TValue *o2;
+  int i = 0;
+  lua_lock(L);  /* may call tag method */
+  o1 = index2value(L, index1);
+  o2 = index2value(L, index2);
+  if (isvalid(L, o1) && isvalid(L, o2)) {
+    switch (op) {
+      case LUA_OPEQ: i = luaV_equalobj(L, o1, o2); break;
+      case LUA_OPLT: i = luaV_lessthan(L, o1, o2); break;
+      case LUA_OPLE: i = luaV_lessequal(L, o1, o2); break;
+      default: api_check(L, 0, "invalid option");
+    }
+  }
+  lua_unlock(L);
+  return i;
+}
+
+
+LUA_API size_t lua_stringtonumber (lua_State *L, const char *s) {
+  size_t sz = luaO_str2num(s, s2v(L->top.p));
+  if (sz != 0)
+    api_incr_top(L);
+  return sz;
+}
+
+
+LUA_API lua_Number lua_tonumberx (lua_State *L, int idx, int *pisnum) {
+  lua_Number n = 0;
+  const TValue *o = index2value(L, idx);
+  int isnum = tonumber(o, &n);
+  if (pisnum)
+    *pisnum = isnum;
+  return n;
+}
+
+
+LUA_API lua_Integer lua_tointegerx (lua_State *L, int idx, int *pisnum) {
+  lua_Integer res = 0;
+  const TValue *o = index2value(L, idx);
+  int isnum = tointeger(o, &res);
+  if (pisnum)
+    *pisnum = isnum;
+  return res;
+}
+
+
+LUA_API int lua_toboolean (lua_State *L, int idx) {
+  const TValue *o = index2value(L, idx);
+  return !l_isfalse(o);
+}
+
+
+LUA_API const char *lua_tolstring (lua_State *L, int idx, size_t *len) {
+  TValue *o;
+  lua_lock(L);
+  o = index2value(L, idx);
+  if (!ttisstring(o)) {
+    if (!cvt2str(o)) {  /* not convertible? */
+      if (len != NULL) *len = 0;
+      lua_unlock(L);
+      return NULL;
+    }
+    luaO_tostring(L, o);
+    luaC_checkGC(L);
+    o = index2value(L, idx);  /* previous call may reallocate the stack */
+  }
+  if (len != NULL)
+    *len = vslen(o);
+  lua_unlock(L);
+  return svalue(o);
+}
+
+
+LUA_API lua_Unsigned lua_rawlen (lua_State *L, int idx) {
+  const TValue *o = index2value(L, idx);
+  switch (ttypetag(o)) {
+    case LUA_VSHRSTR: return tsvalue(o)->shrlen;
+    case LUA_VLNGSTR: return tsvalue(o)->u.lnglen;
+    case LUA_VUSERDATA: return uvalue(o)->len;
+    case LUA_VTABLE: return luaH_getn(hvalue(o));
+    default: return 0;
+  }
+}
+
+
+LUA_API lua_CFunction lua_tocfunction (lua_State *L, int idx) {
+  const TValue *o = index2value(L, idx);
+  if (ttislcf(o)) return fvalue(o);
+  else if (ttisCclosure(o))
+    return clCvalue(o)->f;
+  else return NULL;  /* not a C function */
+}
+
+
+l_sinline void *touserdata (const TValue *o) {
+  switch (ttype(o)) {
+    case LUA_TUSERDATA: return getudatamem(uvalue(o));
+    case LUA_TLIGHTUSERDATA: return pvalue(o);
+    default: return NULL;
+  }
+}
+
+
+LUA_API void *lua_touserdata (lua_State *L, int idx) {
+  const TValue *o = index2value(L, idx);
+  return touserdata(o);
+}
+
+
+LUA_API lua_State *lua_tothread (lua_State *L, int idx) {
+  const TValue *o = index2value(L, idx);
+  return (!ttisthread(o)) ? NULL : thvalue(o);
+}
+
+
+/*
+** Returns a pointer to the internal representation of an object.
+** Note that ANSI C does not allow the conversion of a pointer to
+** function to a 'void*', so the conversion here goes through
+** a 'size_t'. (As the returned pointer is only informative, this
+** conversion should not be a problem.)
+*/
+LUA_API const void *lua_topointer (lua_State *L, int idx) {
+  const TValue *o = index2value(L, idx);
+  switch (ttypetag(o)) {
+    case LUA_VLCF: return cast_voidp(cast_sizet(fvalue(o)));
+    case LUA_VUSERDATA: case LUA_VLIGHTUSERDATA:
+      return touserdata(o);
+    default: {
+      if (iscollectable(o))
+        return gcvalue(o);
+      else
+        return NULL;
+    }
+  }
+}
+
+
+
+/*
+** push functions (C -> stack)
+*/
+
+
+LUA_API void lua_pushnil (lua_State *L) {
+  lua_lock(L);
+  setnilvalue(s2v(L->top.p));
+  api_incr_top(L);
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_pushnumber (lua_State *L, lua_Number n) {
+  lua_lock(L);
+  setfltvalue(s2v(L->top.p), n);
+  api_incr_top(L);
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_pushinteger (lua_State *L, lua_Integer n) {
+  lua_lock(L);
+  setivalue(s2v(L->top.p), n);
+  api_incr_top(L);
+  lua_unlock(L);
+}
+
+
+/*
+** Pushes on the stack a string with given length. Avoid using 's' when
+** 'len' == 0 (as 's' can be NULL in that case), due to later use of
+** 'memcmp' and 'memcpy'.
+*/
+LUA_API const char *lua_pushlstring (lua_State *L, const char *s, size_t len) {
+  TString *ts;
+  lua_lock(L);
+  ts = (len == 0) ? luaS_new(L, "") : luaS_newlstr(L, s, len);
+  setsvalue2s(L, L->top.p, ts);
+  api_incr_top(L);
+  luaC_checkGC(L);
+  lua_unlock(L);
+  return getstr(ts);
+}
+
+
+LUA_API const char *lua_pushstring (lua_State *L, const char *s) {
+  lua_lock(L);
+  if (s == NULL)
+    setnilvalue(s2v(L->top.p));
+  else {
+    TString *ts;
+    ts = luaS_new(L, s);
+    setsvalue2s(L, L->top.p, ts);
+    s = getstr(ts);  /* internal copy's address */
+  }
+  api_incr_top(L);
+  luaC_checkGC(L);
+  lua_unlock(L);
+  return s;
+}
+
+
+LUA_API const char *lua_pushvfstring (lua_State *L, const char *fmt,
+                                      va_list argp) {
+  const char *ret;
+  lua_lock(L);
+  ret = luaO_pushvfstring(L, fmt, argp);
+  luaC_checkGC(L);
+  lua_unlock(L);
+  return ret;
+}
+
+
+LUA_API const char *lua_pushfstring (lua_State *L, const char *fmt, ...) {
+  const char *ret;
+  va_list argp;
+  lua_lock(L);
+  va_start(argp, fmt);
+  ret = luaO_pushvfstring(L, fmt, argp);
+  va_end(argp);
+  luaC_checkGC(L);
+  lua_unlock(L);
+  return ret;
+}
+
+
+LUA_API void lua_pushcclosure (lua_State *L, lua_CFunction fn, int n) {
+  lua_lock(L);
+  if (n == 0) {
+    setfvalue(s2v(L->top.p), fn);
+    api_incr_top(L);
+  }
+  else {
+    CClosure *cl;
+    api_checknelems(L, n);
+    api_check(L, n <= MAXUPVAL, "upvalue index too large");
+    cl = luaF_newCclosure(L, n);
+    cl->f = fn;
+    L->top.p -= n;
+    while (n--) {
+      setobj2n(L, &cl->upvalue[n], s2v(L->top.p + n));
+      /* does not need barrier because closure is white */
+      lua_assert(iswhite(cl));
+    }
+    setclCvalue(L, s2v(L->top.p), cl);
+    api_incr_top(L);
+    luaC_checkGC(L);
+  }
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_pushboolean (lua_State *L, int b) {
+  lua_lock(L);
+  if (b)
+    setbtvalue(s2v(L->top.p));
+  else
+    setbfvalue(s2v(L->top.p));
+  api_incr_top(L);
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_pushlightuserdata (lua_State *L, void *p) {
+  lua_lock(L);
+  setpvalue(s2v(L->top.p), p);
+  api_incr_top(L);
+  lua_unlock(L);
+}
+
+
+LUA_API int lua_pushthread (lua_State *L) {
+  lua_lock(L);
+  setthvalue(L, s2v(L->top.p), L);
+  api_incr_top(L);
+  lua_unlock(L);
+  return (G(L)->mainthread == L);
+}
+
+
+
+/*
+** get functions (Lua -> stack)
+*/
+
+
+l_sinline int auxgetstr (lua_State *L, const TValue *t, const char *k) {
+  const TValue *slot;
+  TString *str = luaS_new(L, k);
+  if (luaV_fastget(L, t, str, slot, luaH_getstr)) {
+    setobj2s(L, L->top.p, slot);
+    api_incr_top(L);
+  }
+  else {
+    setsvalue2s(L, L->top.p, str);
+    api_incr_top(L);
+    luaV_finishget(L, t, s2v(L->top.p - 1), L->top.p - 1, slot);
+  }
+  lua_unlock(L);
+  return ttype(s2v(L->top.p - 1));
+}
+
+
+/*
+** Get the global table in the registry. Since all predefined
+** indices in the registry were inserted right when the registry
+** was created and never removed, they must always be in the array
+** part of the registry.
+*/
+#define getGtable(L)  \
+	(&hvalue(&G(L)->l_registry)->array[LUA_RIDX_GLOBALS - 1])
+
+
+LUA_API int lua_getglobal (lua_State *L, const char *name) {
+  const TValue *G;
+  lua_lock(L);
+  G = getGtable(L);
+  return auxgetstr(L, G, name);
+}
+
+
+LUA_API int lua_gettable (lua_State *L, int idx) {
+  const TValue *slot;
+  TValue *t;
+  lua_lock(L);
+  t = index2value(L, idx);
+  if (luaV_fastget(L, t, s2v(L->top.p - 1), slot, luaH_get)) {
+    setobj2s(L, L->top.p - 1, slot);
+  }
+  else
+    luaV_finishget(L, t, s2v(L->top.p - 1), L->top.p - 1, slot);
+  lua_unlock(L);
+  return ttype(s2v(L->top.p - 1));
+}
+
+
+LUA_API int lua_getfield (lua_State *L, int idx, const char *k) {
+  lua_lock(L);
+  return auxgetstr(L, index2value(L, idx), k);
+}
+
+
+LUA_API int lua_geti (lua_State *L, int idx, lua_Integer n) {
+  TValue *t;
+  const TValue *slot;
+  lua_lock(L);
+  t = index2value(L, idx);
+  if (luaV_fastgeti(L, t, n, slot)) {
+    setobj2s(L, L->top.p, slot);
+  }
+  else {
+    TValue aux;
+    setivalue(&aux, n);
+    luaV_finishget(L, t, &aux, L->top.p, slot);
+  }
+  api_incr_top(L);
+  lua_unlock(L);
+  return ttype(s2v(L->top.p - 1));
+}
+
+
+l_sinline int finishrawget (lua_State *L, const TValue *val) {
+  if (isempty(val))  /* avoid copying empty items to the stack */
+    setnilvalue(s2v(L->top.p));
+  else
+    setobj2s(L, L->top.p, val);
+  api_incr_top(L);
+  lua_unlock(L);
+  return ttype(s2v(L->top.p - 1));
+}
+
+
+static Table *gettable (lua_State *L, int idx) {
+  TValue *t = index2value(L, idx);
+  api_check(L, ttistable(t), "table expected");
+  return hvalue(t);
+}
+
+
+LUA_API int lua_rawget (lua_State *L, int idx) {
+  Table *t;
+  const TValue *val;
+  lua_lock(L);
+  api_checknelems(L, 1);
+  t = gettable(L, idx);
+  val = luaH_get(t, s2v(L->top.p - 1));
+  L->top.p--;  /* remove key */
+  return finishrawget(L, val);
+}
+
+
+LUA_API int lua_rawgeti (lua_State *L, int idx, lua_Integer n) {
+  Table *t;
+  lua_lock(L);
+  t = gettable(L, idx);
+  return finishrawget(L, luaH_getint(t, n));
+}
+
+
+LUA_API int lua_rawgetp (lua_State *L, int idx, const void *p) {
+  Table *t;
+  TValue k;
+  lua_lock(L);
+  t = gettable(L, idx);
+  setpvalue(&k, cast_voidp(p));
+  return finishrawget(L, luaH_get(t, &k));
+}
+
+
+LUA_API void lua_createtable (lua_State *L, int narray, int nrec) {
+  Table *t;
+  lua_lock(L);
+  t = luaH_new(L);
+  sethvalue2s(L, L->top.p, t);
+  api_incr_top(L);
+  if (narray > 0 || nrec > 0)
+    luaH_resize(L, t, narray, nrec);
+  luaC_checkGC(L);
+  lua_unlock(L);
+}
+
+
+LUA_API int lua_getmetatable (lua_State *L, int objindex) {
+  const TValue *obj;
+  Table *mt;
+  int res = 0;
+  lua_lock(L);
+  obj = index2value(L, objindex);
+  switch (ttype(obj)) {
+    case LUA_TTABLE:
+      mt = hvalue(obj)->metatable;
+      break;
+    case LUA_TUSERDATA:
+      mt = uvalue(obj)->metatable;
+      break;
+    default:
+      mt = G(L)->mt[ttype(obj)];
+      break;
+  }
+  if (mt != NULL) {
+    sethvalue2s(L, L->top.p, mt);
+    api_incr_top(L);
+    res = 1;
+  }
+  lua_unlock(L);
+  return res;
+}
+
+
+LUA_API int lua_getiuservalue (lua_State *L, int idx, int n) {
+  TValue *o;
+  int t;
+  lua_lock(L);
+  o = index2value(L, idx);
+  api_check(L, ttisfulluserdata(o), "full userdata expected");
+  if (n <= 0 || n > uvalue(o)->nuvalue) {
+    setnilvalue(s2v(L->top.p));
+    t = LUA_TNONE;
+  }
+  else {
+    setobj2s(L, L->top.p, &uvalue(o)->uv[n - 1].uv);
+    t = ttype(s2v(L->top.p));
+  }
+  api_incr_top(L);
+  lua_unlock(L);
+  return t;
+}
+
+
+/*
+** set functions (stack -> Lua)
+*/
+
+/*
+** t[k] = value at the top of the stack (where 'k' is a string)
+*/
+static void auxsetstr (lua_State *L, const TValue *t, const char *k) {
+  const TValue *slot;
+  TString *str = luaS_new(L, k);
+  api_checknelems(L, 1);
+  if (luaV_fastget(L, t, str, slot, luaH_getstr)) {
+    luaV_finishfastset(L, t, slot, s2v(L->top.p - 1));
+    L->top.p--;  /* pop value */
+  }
+  else {
+    setsvalue2s(L, L->top.p, str);  /* push 'str' (to make it a TValue) */
+    api_incr_top(L);
+    luaV_finishset(L, t, s2v(L->top.p - 1), s2v(L->top.p - 2), slot);
+    L->top.p -= 2;  /* pop value and key */
+  }
+  lua_unlock(L);  /* lock done by caller */
+}
+
+
+LUA_API void lua_setglobal (lua_State *L, const char *name) {
+  const TValue *G;
+  lua_lock(L);  /* unlock done in 'auxsetstr' */
+  G = getGtable(L);
+  auxsetstr(L, G, name);
+}
+
+
+LUA_API void lua_settable (lua_State *L, int idx) {
+  TValue *t;
+  const TValue *slot;
+  lua_lock(L);
+  api_checknelems(L, 2);
+  t = index2value(L, idx);
+  if (luaV_fastget(L, t, s2v(L->top.p - 2), slot, luaH_get)) {
+    luaV_finishfastset(L, t, slot, s2v(L->top.p - 1));
+  }
+  else
+    luaV_finishset(L, t, s2v(L->top.p - 2), s2v(L->top.p - 1), slot);
+  L->top.p -= 2;  /* pop index and value */
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_setfield (lua_State *L, int idx, const char *k) {
+  lua_lock(L);  /* unlock done in 'auxsetstr' */
+  auxsetstr(L, index2value(L, idx), k);
+}
+
+
+LUA_API void lua_seti (lua_State *L, int idx, lua_Integer n) {
+  TValue *t;
+  const TValue *slot;
+  lua_lock(L);
+  api_checknelems(L, 1);
+  t = index2value(L, idx);
+  if (luaV_fastgeti(L, t, n, slot)) {
+    luaV_finishfastset(L, t, slot, s2v(L->top.p - 1));
+  }
+  else {
+    TValue aux;
+    setivalue(&aux, n);
+    luaV_finishset(L, t, &aux, s2v(L->top.p - 1), slot);
+  }
+  L->top.p--;  /* pop value */
+  lua_unlock(L);
+}
+
+
+static void aux_rawset (lua_State *L, int idx, TValue *key, int n) {
+  Table *t;
+  lua_lock(L);
+  api_checknelems(L, n);
+  t = gettable(L, idx);
+  luaH_set(L, t, key, s2v(L->top.p - 1));
+  invalidateTMcache(t);
+  luaC_barrierback(L, obj2gco(t), s2v(L->top.p - 1));
+  L->top.p -= n;
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_rawset (lua_State *L, int idx) {
+  aux_rawset(L, idx, s2v(L->top.p - 2), 2);
+}
+
+
+LUA_API void lua_rawsetp (lua_State *L, int idx, const void *p) {
+  TValue k;
+  setpvalue(&k, cast_voidp(p));
+  aux_rawset(L, idx, &k, 1);
+}
+
+
+LUA_API void lua_rawseti (lua_State *L, int idx, lua_Integer n) {
+  Table *t;
+  lua_lock(L);
+  api_checknelems(L, 1);
+  t = gettable(L, idx);
+  luaH_setint(L, t, n, s2v(L->top.p - 1));
+  luaC_barrierback(L, obj2gco(t), s2v(L->top.p - 1));
+  L->top.p--;
+  lua_unlock(L);
+}
+
+
+LUA_API int lua_setmetatable (lua_State *L, int objindex) {
+  TValue *obj;
+  Table *mt;
+  lua_lock(L);
+  api_checknelems(L, 1);
+  obj = index2value(L, objindex);
+  if (ttisnil(s2v(L->top.p - 1)))
+    mt = NULL;
+  else {
+    api_check(L, ttistable(s2v(L->top.p - 1)), "table expected");
+    mt = hvalue(s2v(L->top.p - 1));
+  }
+  switch (ttype(obj)) {
+    case LUA_TTABLE: {
+      hvalue(obj)->metatable = mt;
+      if (mt) {
+        luaC_objbarrier(L, gcvalue(obj), mt);
+        luaC_checkfinalizer(L, gcvalue(obj), mt);
+      }
+      break;
+    }
+    case LUA_TUSERDATA: {
+      uvalue(obj)->metatable = mt;
+      if (mt) {
+        luaC_objbarrier(L, uvalue(obj), mt);
+        luaC_checkfinalizer(L, gcvalue(obj), mt);
+      }
+      break;
+    }
+    default: {
+      G(L)->mt[ttype(obj)] = mt;
+      break;
+    }
+  }
+  L->top.p--;
+  lua_unlock(L);
+  return 1;
+}
+
+
+LUA_API int lua_setiuservalue (lua_State *L, int idx, int n) {
+  TValue *o;
+  int res;
+  lua_lock(L);
+  api_checknelems(L, 1);
+  o = index2value(L, idx);
+  api_check(L, ttisfulluserdata(o), "full userdata expected");
+  if (!(cast_uint(n) - 1u < cast_uint(uvalue(o)->nuvalue)))
+    res = 0;  /* 'n' not in [1, uvalue(o)->nuvalue] */
+  else {
+    setobj(L, &uvalue(o)->uv[n - 1].uv, s2v(L->top.p - 1));
+    luaC_barrierback(L, gcvalue(o), s2v(L->top.p - 1));
+    res = 1;
+  }
+  L->top.p--;
+  lua_unlock(L);
+  return res;
+}
+
+
+/*
+** 'load' and 'call' functions (run Lua code)
+*/
+
+
+#define checkresults(L,na,nr) \
+     api_check(L, (nr) == LUA_MULTRET \
+               || (L->ci->top.p - L->top.p >= (nr) - (na)), \
+	"results from function overflow current stack size")
+
+
+LUA_API void lua_callk (lua_State *L, int nargs, int nresults,
+                        lua_KContext ctx, lua_KFunction k) {
+  StkId func;
+  lua_lock(L);
+  api_check(L, k == NULL || !isLua(L->ci),
+    "cannot use continuations inside hooks");
+  api_checknelems(L, nargs+1);
+  api_check(L, L->status == LUA_OK, "cannot do calls on non-normal thread");
+  checkresults(L, nargs, nresults);
+  func = L->top.p - (nargs+1);
+  if (k != NULL && yieldable(L)) {  /* need to prepare continuation? */
+    L->ci->u.c.k = k;  /* save continuation */
+    L->ci->u.c.ctx = ctx;  /* save context */
+    luaD_call(L, func, nresults);  /* do the call */
+  }
+  else  /* no continuation or no yieldable */
+    luaD_callnoyield(L, func, nresults);  /* just do the call */
+  adjustresults(L, nresults);
+  lua_unlock(L);
+}
+
+
+
+/*
+** Execute a protected call.
+*/
+struct CallS {  /* data to 'f_call' */
+  StkId func;
+  int nresults;
+};
+
+
+static void f_call (lua_State *L, void *ud) {
+  struct CallS *c = cast(struct CallS *, ud);
+  luaD_callnoyield(L, c->func, c->nresults);
+}
+
+
+
+LUA_API int lua_pcallk (lua_State *L, int nargs, int nresults, int errfunc,
+                        lua_KContext ctx, lua_KFunction k) {
+  struct CallS c;
+  int status;
+  ptrdiff_t func;
+  lua_lock(L);
+  api_check(L, k == NULL || !isLua(L->ci),
+    "cannot use continuations inside hooks");
+  api_checknelems(L, nargs+1);
+  api_check(L, L->status == LUA_OK, "cannot do calls on non-normal thread");
+  checkresults(L, nargs, nresults);
+  if (errfunc == 0)
+    func = 0;
+  else {
+    StkId o = index2stack(L, errfunc);
+    api_check(L, ttisfunction(s2v(o)), "error handler must be a function");
+    func = savestack(L, o);
+  }
+  c.func = L->top.p - (nargs+1);  /* function to be called */
+  if (k == NULL || !yieldable(L)) {  /* no continuation or no yieldable? */
+    c.nresults = nresults;  /* do a 'conventional' protected call */
+    status = luaD_pcall(L, f_call, &c, savestack(L, c.func), func);
+  }
+  else {  /* prepare continuation (call is already protected by 'resume') */
+    CallInfo *ci = L->ci;
+    ci->u.c.k = k;  /* save continuation */
+    ci->u.c.ctx = ctx;  /* save context */
+    /* save information for error recovery */
+    ci->u2.funcidx = cast_int(savestack(L, c.func));
+    ci->u.c.old_errfunc = L->errfunc;
+    L->errfunc = func;
+    setoah(ci->callstatus, L->allowhook);  /* save value of 'allowhook' */
+    ci->callstatus |= CIST_YPCALL;  /* function can do error recovery */
+    luaD_call(L, c.func, nresults);  /* do the call */
+    ci->callstatus &= ~CIST_YPCALL;
+    L->errfunc = ci->u.c.old_errfunc;
+    status = LUA_OK;  /* if it is here, there were no errors */
+  }
+  adjustresults(L, nresults);
+  lua_unlock(L);
+  return status;
+}
+
+
+LUA_API int lua_load (lua_State *L, lua_Reader reader, void *data,
+                      const char *chunkname, const char *mode) {
+  ZIO z;
+  int status;
+  lua_lock(L);
+  if (!chunkname) chunkname = "?";
+  luaZ_init(L, &z, reader, data);
+  status = luaD_protectedparser(L, &z, chunkname, mode);
+  if (status == LUA_OK) {  /* no errors? */
+    LClosure *f = clLvalue(s2v(L->top.p - 1));  /* get new function */
+    if (f->nupvalues >= 1) {  /* does it have an upvalue? */
+      /* get global table from registry */
+      const TValue *gt = getGtable(L);
+      /* set global table as 1st upvalue of 'f' (may be LUA_ENV) */
+      setobj(L, f->upvals[0]->v.p, gt);
+      luaC_barrier(L, f->upvals[0], gt);
+    }
+  }
+  lua_unlock(L);
+  return status;
+}
+
+
+LUA_API int lua_dump (lua_State *L, lua_Writer writer, void *data, int strip) {
+  int status;
+  TValue *o;
+  lua_lock(L);
+  api_checknelems(L, 1);
+  o = s2v(L->top.p - 1);
+  if (isLfunction(o))
+    status = luaU_dump(L, getproto(o), writer, data, strip);
+  else
+    status = 1;
+  lua_unlock(L);
+  return status;
+}
+
+
+LUA_API int lua_status (lua_State *L) {
+  return L->status;
+}
+
+
+/*
+** Garbage-collection function
+*/
+LUA_API int lua_gc (lua_State *L, int what, ...) {
+  va_list argp;
+  int res = 0;
+  global_State *g = G(L);
+  if (g->gcstp & GCSTPGC)  /* internal stop? */
+    return -1;  /* all options are invalid when stopped */
+  lua_lock(L);
+  va_start(argp, what);
+  switch (what) {
+    case LUA_GCSTOP: {
+      g->gcstp = GCSTPUSR;  /* stopped by the user */
+      break;
+    }
+    case LUA_GCRESTART: {
+      luaE_setdebt(g, 0);
+      g->gcstp = 0;  /* (GCSTPGC must be already zero here) */
+      break;
+    }
+    case LUA_GCCOLLECT: {
+      luaC_fullgc(L, 0);
+      break;
+    }
+    case LUA_GCCOUNT: {
+      /* GC values are expressed in Kbytes: #bytes/2^10 */
+      res = cast_int(gettotalbytes(g) >> 10);
+      break;
+    }
+    case LUA_GCCOUNTB: {
+      res = cast_int(gettotalbytes(g) & 0x3ff);
+      break;
+    }
+    case LUA_GCSTEP: {
+      int data = va_arg(argp, int);
+      l_mem debt = 1;  /* =1 to signal that it did an actual step */
+      lu_byte oldstp = g->gcstp;
+      g->gcstp = 0;  /* allow GC to run (GCSTPGC must be zero here) */
+      if (data == 0) {
+        luaE_setdebt(g, 0);  /* do a basic step */
+        luaC_step(L);
+      }
+      else {  /* add 'data' to total debt */
+        debt = cast(l_mem, data) * 1024 + g->GCdebt;
+        luaE_setdebt(g, debt);
+        luaC_checkGC(L);
+      }
+      g->gcstp = oldstp;  /* restore previous state */
+      if (debt > 0 && g->gcstate == GCSpause)  /* end of cycle? */
+        res = 1;  /* signal it */
+      break;
+    }
+    case LUA_GCSETPAUSE: {
+      int data = va_arg(argp, int);
+      res = getgcparam(g->gcpause);
+      setgcparam(g->gcpause, data);
+      break;
+    }
+    case LUA_GCSETSTEPMUL: {
+      int data = va_arg(argp, int);
+      res = getgcparam(g->gcstepmul);
+      setgcparam(g->gcstepmul, data);
+      break;
+    }
+    case LUA_GCISRUNNING: {
+      res = gcrunning(g);
+      break;
+    }
+    case LUA_GCGEN: {
+      int minormul = va_arg(argp, int);
+      int majormul = va_arg(argp, int);
+      res = isdecGCmodegen(g) ? LUA_GCGEN : LUA_GCINC;
+      if (minormul != 0)
+        g->genminormul = minormul;
+      if (majormul != 0)
+        setgcparam(g->genmajormul, majormul);
+      luaC_changemode(L, KGC_GEN);
+      break;
+    }
+    case LUA_GCINC: {
+      int pause = va_arg(argp, int);
+      int stepmul = va_arg(argp, int);
+      int stepsize = va_arg(argp, int);
+      res = isdecGCmodegen(g) ? LUA_GCGEN : LUA_GCINC;
+      if (pause != 0)
+        setgcparam(g->gcpause, pause);
+      if (stepmul != 0)
+        setgcparam(g->gcstepmul, stepmul);
+      if (stepsize != 0)
+        g->gcstepsize = stepsize;
+      luaC_changemode(L, KGC_INC);
+      break;
+    }
+    default: res = -1;  /* invalid option */
+  }
+  va_end(argp);
+  lua_unlock(L);
+  return res;
+}
+
+
+
+/*
+** miscellaneous functions
+*/
+
+
+LUA_API int lua_error (lua_State *L) {
+  TValue *errobj;
+  lua_lock(L);
+  errobj = s2v(L->top.p - 1);
+  api_checknelems(L, 1);
+  /* error object is the memory error message? */
+  if (ttisshrstring(errobj) && eqshrstr(tsvalue(errobj), G(L)->memerrmsg))
+    luaM_error(L);  /* raise a memory error */
+  else
+    luaG_errormsg(L);  /* raise a regular error */
+  /* code unreachable; will unlock when control actually leaves the kernel */
+  return 0;  /* to avoid warnings */
+}
+
+
+LUA_API int lua_next (lua_State *L, int idx) {
+  Table *t;
+  int more;
+  lua_lock(L);
+  api_checknelems(L, 1);
+  t = gettable(L, idx);
+  more = luaH_next(L, t, L->top.p - 1);
+  if (more) {
+    api_incr_top(L);
+  }
+  else  /* no more elements */
+    L->top.p -= 1;  /* remove key */
+  lua_unlock(L);
+  return more;
+}
+
+
+LUA_API void lua_toclose (lua_State *L, int idx) {
+  int nresults;
+  StkId o;
+  lua_lock(L);
+  o = index2stack(L, idx);
+  nresults = L->ci->nresults;
+  api_check(L, L->tbclist.p < o, "given index below or equal a marked one");
+  luaF_newtbcupval(L, o);  /* create new to-be-closed upvalue */
+  if (!hastocloseCfunc(nresults))  /* function not marked yet? */
+    L->ci->nresults = codeNresults(nresults);  /* mark it */
+  lua_assert(hastocloseCfunc(L->ci->nresults));
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_concat (lua_State *L, int n) {
+  lua_lock(L);
+  api_checknelems(L, n);
+  if (n > 0)
+    luaV_concat(L, n);
+  else {  /* nothing to concatenate */
+    setsvalue2s(L, L->top.p, luaS_newlstr(L, "", 0));  /* push empty string */
+    api_incr_top(L);
+  }
+  luaC_checkGC(L);
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_len (lua_State *L, int idx) {
+  TValue *t;
+  lua_lock(L);
+  t = index2value(L, idx);
+  luaV_objlen(L, L->top.p, t);
+  api_incr_top(L);
+  lua_unlock(L);
+}
+
+
+LUA_API lua_Alloc lua_getallocf (lua_State *L, void **ud) {
+  lua_Alloc f;
+  lua_lock(L);
+  if (ud) *ud = G(L)->ud;
+  f = G(L)->frealloc;
+  lua_unlock(L);
+  return f;
+}
+
+
+LUA_API void lua_setallocf (lua_State *L, lua_Alloc f, void *ud) {
+  lua_lock(L);
+  G(L)->ud = ud;
+  G(L)->frealloc = f;
+  lua_unlock(L);
+}
+
+
+void lua_setwarnf (lua_State *L, lua_WarnFunction f, void *ud) {
+  lua_lock(L);
+  G(L)->ud_warn = ud;
+  G(L)->warnf = f;
+  lua_unlock(L);
+}
+
+
+void lua_warning (lua_State *L, const char *msg, int tocont) {
+  lua_lock(L);
+  luaE_warning(L, msg, tocont);
+  lua_unlock(L);
+}
+
+
+
+LUA_API void *lua_newuserdatauv (lua_State *L, size_t size, int nuvalue) {
+  Udata *u;
+  lua_lock(L);
+  api_check(L, 0 <= nuvalue && nuvalue < USHRT_MAX, "invalid value");
+  u = luaS_newudata(L, size, nuvalue);
+  setuvalue(L, s2v(L->top.p), u);
+  api_incr_top(L);
+  luaC_checkGC(L);
+  lua_unlock(L);
+  return getudatamem(u);
+}
+
+
+
+static const char *aux_upvalue (TValue *fi, int n, TValue **val,
+                                GCObject **owner) {
+  switch (ttypetag(fi)) {
+    case LUA_VCCL: {  /* C closure */
+      CClosure *f = clCvalue(fi);
+      if (!(cast_uint(n) - 1u < cast_uint(f->nupvalues)))
+        return NULL;  /* 'n' not in [1, f->nupvalues] */
+      *val = &f->upvalue[n-1];
+      if (owner) *owner = obj2gco(f);
+      return "";
+    }
+    case LUA_VLCL: {  /* Lua closure */
+      LClosure *f = clLvalue(fi);
+      TString *name;
+      Proto *p = f->p;
+      if (!(cast_uint(n) - 1u  < cast_uint(p->sizeupvalues)))
+        return NULL;  /* 'n' not in [1, p->sizeupvalues] */
+      *val = f->upvals[n-1]->v.p;
+      if (owner) *owner = obj2gco(f->upvals[n - 1]);
+      name = p->upvalues[n-1].name;
+      return (name == NULL) ? "(no name)" : getstr(name);
+    }
+    default: return NULL;  /* not a closure */
+  }
+}
+
+
+LUA_API const char *lua_getupvalue (lua_State *L, int funcindex, int n) {
+  const char *name;
+  TValue *val = NULL;  /* to avoid warnings */
+  lua_lock(L);
+  name = aux_upvalue(index2value(L, funcindex), n, &val, NULL);
+  if (name) {
+    setobj2s(L, L->top.p, val);
+    api_incr_top(L);
+  }
+  lua_unlock(L);
+  return name;
+}
+
+
+LUA_API const char *lua_setupvalue (lua_State *L, int funcindex, int n) {
+  const char *name;
+  TValue *val = NULL;  /* to avoid warnings */
+  GCObject *owner = NULL;  /* to avoid warnings */
+  TValue *fi;
+  lua_lock(L);
+  fi = index2value(L, funcindex);
+  api_checknelems(L, 1);
+  name = aux_upvalue(fi, n, &val, &owner);
+  if (name) {
+    L->top.p--;
+    setobj(L, val, s2v(L->top.p));
+    luaC_barrier(L, owner, val);
+  }
+  lua_unlock(L);
+  return name;
+}
+
+
+static UpVal **getupvalref (lua_State *L, int fidx, int n, LClosure **pf) {
+  static const UpVal *const nullup = NULL;
+  LClosure *f;
+  TValue *fi = index2value(L, fidx);
+  api_check(L, ttisLclosure(fi), "Lua function expected");
+  f = clLvalue(fi);
+  if (pf) *pf = f;
+  if (1 <= n && n <= f->p->sizeupvalues)
+    return &f->upvals[n - 1];  /* get its upvalue pointer */
+  else
+    return (UpVal**)&nullup;
+}
+
+
+LUA_API void *lua_upvalueid (lua_State *L, int fidx, int n) {
+  TValue *fi = index2value(L, fidx);
+  switch (ttypetag(fi)) {
+    case LUA_VLCL: {  /* lua closure */
+      return *getupvalref(L, fidx, n, NULL);
+    }
+    case LUA_VCCL: {  /* C closure */
+      CClosure *f = clCvalue(fi);
+      if (1 <= n && n <= f->nupvalues)
+        return &f->upvalue[n - 1];
+      /* else */
+    }  /* FALLTHROUGH */
+    case LUA_VLCF:
+      return NULL;  /* light C functions have no upvalues */
+    default: {
+      api_check(L, 0, "function expected");
+      return NULL;
+    }
+  }
+}
+
+
+LUA_API void lua_upvaluejoin (lua_State *L, int fidx1, int n1,
+                                            int fidx2, int n2) {
+  LClosure *f1;
+  UpVal **up1 = getupvalref(L, fidx1, n1, &f1);
+  UpVal **up2 = getupvalref(L, fidx2, n2, NULL);
+  api_check(L, *up1 != NULL && *up2 != NULL, "invalid upvalue index");
+  *up1 = *up2;
+  luaC_objbarrier(L, f1, *up1);
+}
+
+
diff --git a/src/libs/3rdparty/lua/src/lapi.h b/src/libs/3rdparty/lua/src/lapi.h
new file mode 100644
index 0000000000..a742427cdc
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lapi.h
@@ -0,0 +1,52 @@
+/*
+** $Id: lapi.h $
+** Auxiliary functions from Lua API
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lapi_h
+#define lapi_h
+
+
+#include "llimits.h"
+#include "lstate.h"
+
+
+/* Increments 'L->top.p', checking for stack overflows */
+#define api_incr_top(L)	{L->top.p++; \
+			 api_check(L, L->top.p <= L->ci->top.p, \
+					"stack overflow");}
+
+
+/*
+** If a call returns too many multiple returns, the callee may not have
+** stack space to accommodate all results. In this case, this macro
+** increases its stack space ('L->ci->top.p').
+*/
+#define adjustresults(L,nres) \
+    { if ((nres) <= LUA_MULTRET && L->ci->top.p < L->top.p) \
+	L->ci->top.p = L->top.p; }
+
+
+/* Ensure the stack has at least 'n' elements */
+#define api_checknelems(L,n) \
+	api_check(L, (n) < (L->top.p - L->ci->func.p), \
+			  "not enough elements in the stack")
+
+
+/*
+** To reduce the overhead of returning from C functions, the presence of
+** to-be-closed variables in these functions is coded in the CallInfo's
+** field 'nresults', in a way that functions with no to-be-closed variables
+** with zero, one, or "all" wanted results have no overhead. Functions
+** with other number of wanted results, as well as functions with
+** variables to be closed, have an extra check.
+*/
+
+#define hastocloseCfunc(n)	((n) < LUA_MULTRET)
+
+/* Map [-1, inf) (range of 'nresults') into (-inf, -2] */
+#define codeNresults(n)		(-(n) - 3)
+#define decodeNresults(n)	(-(n) - 3)
+
+#endif
diff --git a/src/libs/3rdparty/lua/src/lauxlib.c b/src/libs/3rdparty/lua/src/lauxlib.c
new file mode 100644
index 0000000000..4ca6c65488
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lauxlib.c
@@ -0,0 +1,1112 @@
+/*
+** $Id: lauxlib.c $
+** Auxiliary functions for building Lua libraries
+** See Copyright Notice in lua.h
+*/
+
+#define lauxlib_c
+#define LUA_LIB
+
+#include "lprefix.h"
+
+
+#include <errno.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+
+/*
+** This file uses only the official API of Lua.
+** Any function declared here could be written as an application function.
+*/
+
+#include "lua.h"
+
+#include "lauxlib.h"
+
+
+#if !defined(MAX_SIZET)
+/* maximum value for size_t */
+#define MAX_SIZET	((size_t)(~(size_t)0))
+#endif
+
+
+/*
+** {======================================================
+** Traceback
+** =======================================================
+*/
+
+
+#define LEVELS1	10	/* size of the first part of the stack */
+#define LEVELS2	11	/* size of the second part of the stack */
+
+
+
+/*
+** Search for 'objidx' in table at index -1. ('objidx' must be an
+** absolute index.) Return 1 + string at top if it found a good name.
+*/
+static int findfield (lua_State *L, int objidx, int level) {
+  if (level == 0 || !lua_istable(L, -1))
+    return 0;  /* not found */
+  lua_pushnil(L);  /* start 'next' loop */
+  while (lua_next(L, -2)) {  /* for each pair in table */
+    if (lua_type(L, -2) == LUA_TSTRING) {  /* ignore non-string keys */
+      if (lua_rawequal(L, objidx, -1)) {  /* found object? */
+        lua_pop(L, 1);  /* remove value (but keep name) */
+        return 1;
+      }
+      else if (findfield(L, objidx, level - 1)) {  /* try recursively */
+        /* stack: lib_name, lib_table, field_name (top) */
+        lua_pushliteral(L, ".");  /* place '.' between the two names */
+        lua_replace(L, -3);  /* (in the slot occupied by table) */
+        lua_concat(L, 3);  /* lib_name.field_name */
+        return 1;
+      }
+    }
+    lua_pop(L, 1);  /* remove value */
+  }
+  return 0;  /* not found */
+}
+
+
+/*
+** Search for a name for a function in all loaded modules
+*/
+static int pushglobalfuncname (lua_State *L, lua_Debug *ar) {
+  int top = lua_gettop(L);
+  lua_getinfo(L, "f", ar);  /* push function */
+  lua_getfield(L, LUA_REGISTRYINDEX, LUA_LOADED_TABLE);
+  if (findfield(L, top + 1, 2)) {
+    const char *name = lua_tostring(L, -1);
+    if (strncmp(name, LUA_GNAME ".", 3) == 0) {  /* name start with '_G.'? */
+      lua_pushstring(L, name + 3);  /* push name without prefix */
+      lua_remove(L, -2);  /* remove original name */
+    }
+    lua_copy(L, -1, top + 1);  /* copy name to proper place */
+    lua_settop(L, top + 1);  /* remove table "loaded" and name copy */
+    return 1;
+  }
+  else {
+    lua_settop(L, top);  /* remove function and global table */
+    return 0;
+  }
+}
+
+
+static void pushfuncname (lua_State *L, lua_Debug *ar) {
+  if (pushglobalfuncname(L, ar)) {  /* try first a global name */
+    lua_pushfstring(L, "function '%s'", lua_tostring(L, -1));
+    lua_remove(L, -2);  /* remove name */
+  }
+  else if (*ar->namewhat != '\0')  /* is there a name from code? */
+    lua_pushfstring(L, "%s '%s'", ar->namewhat, ar->name);  /* use it */
+  else if (*ar->what == 'm')  /* main? */
+      lua_pushliteral(L, "main chunk");
+  else if (*ar->what != 'C')  /* for Lua functions, use <file:line> */
+    lua_pushfstring(L, "function <%s:%d>", ar->short_src, ar->linedefined);
+  else  /* nothing left... */
+    lua_pushliteral(L, "?");
+}
+
+
+static int lastlevel (lua_State *L) {
+  lua_Debug ar;
+  int li = 1, le = 1;
+  /* find an upper bound */
+  while (lua_getstack(L, le, &ar)) { li = le; le *= 2; }
+  /* do a binary search */
+  while (li < le) {
+    int m = (li + le)/2;
+    if (lua_getstack(L, m, &ar)) li = m + 1;
+    else le = m;
+  }
+  return le - 1;
+}
+
+
+LUALIB_API void luaL_traceback (lua_State *L, lua_State *L1,
+                                const char *msg, int level) {
+  luaL_Buffer b;
+  lua_Debug ar;
+  int last = lastlevel(L1);
+  int limit2show = (last - level > LEVELS1 + LEVELS2) ? LEVELS1 : -1;
+  luaL_buffinit(L, &b);
+  if (msg) {
+    luaL_addstring(&b, msg);
+    luaL_addchar(&b, '\n');
+  }
+  luaL_addstring(&b, "stack traceback:");
+  while (lua_getstack(L1, level++, &ar)) {
+    if (limit2show-- == 0) {  /* too many levels? */
+      int n = last - level - LEVELS2 + 1;  /* number of levels to skip */
+      lua_pushfstring(L, "\n\t...\t(skipping %d levels)", n);
+      luaL_addvalue(&b);  /* add warning about skip */
+      level += n;  /* and skip to last levels */
+    }
+    else {
+      lua_getinfo(L1, "Slnt", &ar);
+      if (ar.currentline <= 0)
+        lua_pushfstring(L, "\n\t%s: in ", ar.short_src);
+      else
+        lua_pushfstring(L, "\n\t%s:%d: in ", ar.short_src, ar.currentline);
+      luaL_addvalue(&b);
+      pushfuncname(L, &ar);
+      luaL_addvalue(&b);
+      if (ar.istailcall)
+        luaL_addstring(&b, "\n\t(...tail calls...)");
+    }
+  }
+  luaL_pushresult(&b);
+}
+
+/* }====================================================== */
+
+
+/*
+** {======================================================
+** Error-report functions
+** =======================================================
+*/
+
+LUALIB_API int luaL_argerror (lua_State *L, int arg, const char *extramsg) {
+  lua_Debug ar;
+  if (!lua_getstack(L, 0, &ar))  /* no stack frame? */
+    return luaL_error(L, "bad argument #%d (%s)", arg, extramsg);
+  lua_getinfo(L, "n", &ar);
+  if (strcmp(ar.namewhat, "method") == 0) {
+    arg--;  /* do not count 'self' */
+    if (arg == 0)  /* error is in the self argument itself? */
+      return luaL_error(L, "calling '%s' on bad self (%s)",
+                           ar.name, extramsg);
+  }
+  if (ar.name == NULL)
+    ar.name = (pushglobalfuncname(L, &ar)) ? lua_tostring(L, -1) : "?";
+  return luaL_error(L, "bad argument #%d to '%s' (%s)",
+                        arg, ar.name, extramsg);
+}
+
+
+LUALIB_API int luaL_typeerror (lua_State *L, int arg, const char *tname) {
+  const char *msg;
+  const char *typearg;  /* name for the type of the actual argument */
+  if (luaL_getmetafield(L, arg, "__name") == LUA_TSTRING)
+    typearg = lua_tostring(L, -1);  /* use the given type name */
+  else if (lua_type(L, arg) == LUA_TLIGHTUSERDATA)
+    typearg = "light userdata";  /* special name for messages */
+  else
+    typearg = luaL_typename(L, arg);  /* standard name */
+  msg = lua_pushfstring(L, "%s expected, got %s", tname, typearg);
+  return luaL_argerror(L, arg, msg);
+}
+
+
+static void tag_error (lua_State *L, int arg, int tag) {
+  luaL_typeerror(L, arg, lua_typename(L, tag));
+}
+
+
+/*
+** The use of 'lua_pushfstring' ensures this function does not
+** need reserved stack space when called.
+*/
+LUALIB_API void luaL_where (lua_State *L, int level) {
+  lua_Debug ar;
+  if (lua_getstack(L, level, &ar)) {  /* check function at level */
+    lua_getinfo(L, "Sl", &ar);  /* get info about it */
+    if (ar.currentline > 0) {  /* is there info? */
+      lua_pushfstring(L, "%s:%d: ", ar.short_src, ar.currentline);
+      return;
+    }
+  }
+  lua_pushfstring(L, "");  /* else, no information available... */
+}
+
+
+/*
+** Again, the use of 'lua_pushvfstring' ensures this function does
+** not need reserved stack space when called. (At worst, it generates
+** an error with "stack overflow" instead of the given message.)
+*/
+LUALIB_API int luaL_error (lua_State *L, const char *fmt, ...) {
+  va_list argp;
+  va_start(argp, fmt);
+  luaL_where(L, 1);
+  lua_pushvfstring(L, fmt, argp);
+  va_end(argp);
+  lua_concat(L, 2);
+  return lua_error(L);
+}
+
+
+LUALIB_API int luaL_fileresult (lua_State *L, int stat, const char *fname) {
+  int en = errno;  /* calls to Lua API may change this value */
+  if (stat) {
+    lua_pushboolean(L, 1);
+    return 1;
+  }
+  else {
+    luaL_pushfail(L);
+    if (fname)
+      lua_pushfstring(L, "%s: %s", fname, strerror(en));
+    else
+      lua_pushstring(L, strerror(en));
+    lua_pushinteger(L, en);
+    return 3;
+  }
+}
+
+
+#if !defined(l_inspectstat)	/* { */
+
+#if defined(LUA_USE_POSIX)
+
+#include <sys/wait.h>
+
+/*
+** use appropriate macros to interpret 'pclose' return status
+*/
+#define l_inspectstat(stat,what)  \
+   if (WIFEXITED(stat)) { stat = WEXITSTATUS(stat); } \
+   else if (WIFSIGNALED(stat)) { stat = WTERMSIG(stat); what = "signal"; }
+
+#else
+
+#define l_inspectstat(stat,what)  /* no op */
+
+#endif
+
+#endif				/* } */
+
+
+LUALIB_API int luaL_execresult (lua_State *L, int stat) {
+  if (stat != 0 && errno != 0)  /* error with an 'errno'? */
+    return luaL_fileresult(L, 0, NULL);
+  else {
+    const char *what = "exit";  /* type of termination */
+    l_inspectstat(stat, what);  /* interpret result */
+    if (*what == 'e' && stat == 0)  /* successful termination? */
+      lua_pushboolean(L, 1);
+    else
+      luaL_pushfail(L);
+    lua_pushstring(L, what);
+    lua_pushinteger(L, stat);
+    return 3;  /* return true/fail,what,code */
+  }
+}
+
+/* }====================================================== */
+
+
+
+/*
+** {======================================================
+** Userdata's metatable manipulation
+** =======================================================
+*/
+
+LUALIB_API int luaL_newmetatable (lua_State *L, const char *tname) {
+  if (luaL_getmetatable(L, tname) != LUA_TNIL)  /* name already in use? */
+    return 0;  /* leave previous value on top, but return 0 */
+  lua_pop(L, 1);
+  lua_createtable(L, 0, 2);  /* create metatable */
+  lua_pushstring(L, tname);
+  lua_setfield(L, -2, "__name");  /* metatable.__name = tname */
+  lua_pushvalue(L, -1);
+  lua_setfield(L, LUA_REGISTRYINDEX, tname);  /* registry.name = metatable */
+  return 1;
+}
+
+
+LUALIB_API void luaL_setmetatable (lua_State *L, const char *tname) {
+  luaL_getmetatable(L, tname);
+  lua_setmetatable(L, -2);
+}
+
+
+LUALIB_API void *luaL_testudata (lua_State *L, int ud, const char *tname) {
+  void *p = lua_touserdata(L, ud);
+  if (p != NULL) {  /* value is a userdata? */
+    if (lua_getmetatable(L, ud)) {  /* does it have a metatable? */
+      luaL_getmetatable(L, tname);  /* get correct metatable */
+      if (!lua_rawequal(L, -1, -2))  /* not the same? */
+        p = NULL;  /* value is a userdata with wrong metatable */
+      lua_pop(L, 2);  /* remove both metatables */
+      return p;
+    }
+  }
+  return NULL;  /* value is not a userdata with a metatable */
+}
+
+
+LUALIB_API void *luaL_checkudata (lua_State *L, int ud, const char *tname) {
+  void *p = luaL_testudata(L, ud, tname);
+  luaL_argexpected(L, p != NULL, ud, tname);
+  return p;
+}
+
+/* }====================================================== */
+
+
+/*
+** {======================================================
+** Argument check functions
+** =======================================================
+*/
+
+LUALIB_API int luaL_checkoption (lua_State *L, int arg, const char *def,
+                                 const char *const lst[]) {
+  const char *name = (def) ? luaL_optstring(L, arg, def) :
+                             luaL_checkstring(L, arg);
+  int i;
+  for (i=0; lst[i]; i++)
+    if (strcmp(lst[i], name) == 0)
+      return i;
+  return luaL_argerror(L, arg,
+                       lua_pushfstring(L, "invalid option '%s'", name));
+}
+
+
+/*
+** Ensures the stack has at least 'space' extra slots, raising an error
+** if it cannot fulfill the request. (The error handling needs a few
+** extra slots to format the error message. In case of an error without
+** this extra space, Lua will generate the same 'stack overflow' error,
+** but without 'msg'.)
+*/
+LUALIB_API void luaL_checkstack (lua_State *L, int space, const char *msg) {
+  if (l_unlikely(!lua_checkstack(L, space))) {
+    if (msg)
+      luaL_error(L, "stack overflow (%s)", msg);
+    else
+      luaL_error(L, "stack overflow");
+  }
+}
+
+
+LUALIB_API void luaL_checktype (lua_State *L, int arg, int t) {
+  if (l_unlikely(lua_type(L, arg) != t))
+    tag_error(L, arg, t);
+}
+
+
+LUALIB_API void luaL_checkany (lua_State *L, int arg) {
+  if (l_unlikely(lua_type(L, arg) == LUA_TNONE))
+    luaL_argerror(L, arg, "value expected");
+}
+
+
+LUALIB_API const char *luaL_checklstring (lua_State *L, int arg, size_t *len) {
+  const char *s = lua_tolstring(L, arg, len);
+  if (l_unlikely(!s)) tag_error(L, arg, LUA_TSTRING);
+  return s;
+}
+
+
+LUALIB_API const char *luaL_optlstring (lua_State *L, int arg,
+                                        const char *def, size_t *len) {
+  if (lua_isnoneornil(L, arg)) {
+    if (len)
+      *len = (def ? strlen(def) : 0);
+    return def;
+  }
+  else return luaL_checklstring(L, arg, len);
+}
+
+
+LUALIB_API lua_Number luaL_checknumber (lua_State *L, int arg) {
+  int isnum;
+  lua_Number d = lua_tonumberx(L, arg, &isnum);
+  if (l_unlikely(!isnum))
+    tag_error(L, arg, LUA_TNUMBER);
+  return d;
+}
+
+
+LUALIB_API lua_Number luaL_optnumber (lua_State *L, int arg, lua_Number def) {
+  return luaL_opt(L, luaL_checknumber, arg, def);
+}
+
+
+static void interror (lua_State *L, int arg) {
+  if (lua_isnumber(L, arg))
+    luaL_argerror(L, arg, "number has no integer representation");
+  else
+    tag_error(L, arg, LUA_TNUMBER);
+}
+
+
+LUALIB_API lua_Integer luaL_checkinteger (lua_State *L, int arg) {
+  int isnum;
+  lua_Integer d = lua_tointegerx(L, arg, &isnum);
+  if (l_unlikely(!isnum)) {
+    interror(L, arg);
+  }
+  return d;
+}
+
+
+LUALIB_API lua_Integer luaL_optinteger (lua_State *L, int arg,
+                                                      lua_Integer def) {
+  return luaL_opt(L, luaL_checkinteger, arg, def);
+}
+
+/* }====================================================== */
+
+
+/*
+** {======================================================
+** Generic Buffer manipulation
+** =======================================================
+*/
+
+/* userdata to box arbitrary data */
+typedef struct UBox {
+  void *box;
+  size_t bsize;
+} UBox;
+
+
+static void *resizebox (lua_State *L, int idx, size_t newsize) {
+  void *ud;
+  lua_Alloc allocf = lua_getallocf(L, &ud);
+  UBox *box = (UBox *)lua_touserdata(L, idx);
+  void *temp = allocf(ud, box->box, box->bsize, newsize);
+  if (l_unlikely(temp == NULL && newsize > 0)) {  /* allocation error? */
+    lua_pushliteral(L, "not enough memory");
+    lua_error(L);  /* raise a memory error */
+  }
+  box->box = temp;
+  box->bsize = newsize;
+  return temp;
+}
+
+
+static int boxgc (lua_State *L) {
+  resizebox(L, 1, 0);
+  return 0;
+}
+
+
+static const luaL_Reg boxmt[] = {  /* box metamethods */
+  {"__gc", boxgc},
+  {"__close", boxgc},
+  {NULL, NULL}
+};
+
+
+static void newbox (lua_State *L) {
+  UBox *box = (UBox *)lua_newuserdatauv(L, sizeof(UBox), 0);
+  box->box = NULL;
+  box->bsize = 0;
+  if (luaL_newmetatable(L, "_UBOX*"))  /* creating metatable? */
+    luaL_setfuncs(L, boxmt, 0);  /* set its metamethods */
+  lua_setmetatable(L, -2);
+}
+
+
+/*
+** check whether buffer is using a userdata on the stack as a temporary
+** buffer
+*/
+#define buffonstack(B)	((B)->b != (B)->init.b)
+
+
+/*
+** Whenever buffer is accessed, slot 'idx' must either be a box (which
+** cannot be NULL) or it is a placeholder for the buffer.
+*/
+#define checkbufferlevel(B,idx)  \
+  lua_assert(buffonstack(B) ? lua_touserdata(B->L, idx) != NULL  \
+                            : lua_touserdata(B->L, idx) == (void*)B)
+
+
+/*
+** Compute new size for buffer 'B', enough to accommodate extra 'sz'
+** bytes. (The test for "not big enough" also gets the case when the
+** computation of 'newsize' overflows.)
+*/
+static size_t newbuffsize (luaL_Buffer *B, size_t sz) {
+  size_t newsize = (B->size / 2) * 3;  /* buffer size * 1.5 */
+  if (l_unlikely(MAX_SIZET - sz < B->n))  /* overflow in (B->n + sz)? */
+    return luaL_error(B->L, "buffer too large");
+  if (newsize < B->n + sz)  /* not big enough? */
+    newsize = B->n + sz;
+  return newsize;
+}
+
+
+/*
+** Returns a pointer to a free area with at least 'sz' bytes in buffer
+** 'B'. 'boxidx' is the relative position in the stack where is the
+** buffer's box or its placeholder.
+*/
+static char *prepbuffsize (luaL_Buffer *B, size_t sz, int boxidx) {
+  checkbufferlevel(B, boxidx);
+  if (B->size - B->n >= sz)  /* enough space? */
+    return B->b + B->n;
+  else {
+    lua_State *L = B->L;
+    char *newbuff;
+    size_t newsize = newbuffsize(B, sz);
+    /* create larger buffer */
+    if (buffonstack(B))  /* buffer already has a box? */
+      newbuff = (char *)resizebox(L, boxidx, newsize);  /* resize it */
+    else {  /* no box yet */
+      lua_remove(L, boxidx);  /* remove placeholder */
+      newbox(L);  /* create a new box */
+      lua_insert(L, boxidx);  /* move box to its intended position */
+      lua_toclose(L, boxidx);
+      newbuff = (char *)resizebox(L, boxidx, newsize);
+      memcpy(newbuff, B->b, B->n * sizeof(char));  /* copy original content */
+    }
+    B->b = newbuff;
+    B->size = newsize;
+    return newbuff + B->n;
+  }
+}
+
+/*
+** returns a pointer to a free area with at least 'sz' bytes
+*/
+LUALIB_API char *luaL_prepbuffsize (luaL_Buffer *B, size_t sz) {
+  return prepbuffsize(B, sz, -1);
+}
+
+
+LUALIB_API void luaL_addlstring (luaL_Buffer *B, const char *s, size_t l) {
+  if (l > 0) {  /* avoid 'memcpy' when 's' can be NULL */
+    char *b = prepbuffsize(B, l, -1);
+    memcpy(b, s, l * sizeof(char));
+    luaL_addsize(B, l);
+  }
+}
+
+
+LUALIB_API void luaL_addstring (luaL_Buffer *B, const char *s) {
+  luaL_addlstring(B, s, strlen(s));
+}
+
+
+LUALIB_API void luaL_pushresult (luaL_Buffer *B) {
+  lua_State *L = B->L;
+  checkbufferlevel(B, -1);
+  lua_pushlstring(L, B->b, B->n);
+  if (buffonstack(B))
+    lua_closeslot(L, -2);  /* close the box */
+  lua_remove(L, -2);  /* remove box or placeholder from the stack */
+}
+
+
+LUALIB_API void luaL_pushresultsize (luaL_Buffer *B, size_t sz) {
+  luaL_addsize(B, sz);
+  luaL_pushresult(B);
+}
+
+
+/*
+** 'luaL_addvalue' is the only function in the Buffer system where the
+** box (if existent) is not on the top of the stack. So, instead of
+** calling 'luaL_addlstring', it replicates the code using -2 as the
+** last argument to 'prepbuffsize', signaling that the box is (or will
+** be) below the string being added to the buffer. (Box creation can
+** trigger an emergency GC, so we should not remove the string from the
+** stack before we have the space guaranteed.)
+*/
+LUALIB_API void luaL_addvalue (luaL_Buffer *B) {
+  lua_State *L = B->L;
+  size_t len;
+  const char *s = lua_tolstring(L, -1, &len);
+  char *b = prepbuffsize(B, len, -2);
+  memcpy(b, s, len * sizeof(char));
+  luaL_addsize(B, len);
+  lua_pop(L, 1);  /* pop string */
+}
+
+
+LUALIB_API void luaL_buffinit (lua_State *L, luaL_Buffer *B) {
+  B->L = L;
+  B->b = B->init.b;
+  B->n = 0;
+  B->size = LUAL_BUFFERSIZE;
+  lua_pushlightuserdata(L, (void*)B);  /* push placeholder */
+}
+
+
+LUALIB_API char *luaL_buffinitsize (lua_State *L, luaL_Buffer *B, size_t sz) {
+  luaL_buffinit(L, B);
+  return prepbuffsize(B, sz, -1);
+}
+
+/* }====================================================== */
+
+
+/*
+** {======================================================
+** Reference system
+** =======================================================
+*/
+
+/* index of free-list header (after the predefined values) */
+#define freelist	(LUA_RIDX_LAST + 1)
+
+/*
+** The previously freed references form a linked list:
+** t[freelist] is the index of a first free index, or zero if list is
+** empty; t[t[freelist]] is the index of the second element; etc.
+*/
+LUALIB_API int luaL_ref (lua_State *L, int t) {
+  int ref;
+  if (lua_isnil(L, -1)) {
+    lua_pop(L, 1);  /* remove from stack */
+    return LUA_REFNIL;  /* 'nil' has a unique fixed reference */
+  }
+  t = lua_absindex(L, t);
+  if (lua_rawgeti(L, t, freelist) == LUA_TNIL) {  /* first access? */
+    ref = 0;  /* list is empty */
+    lua_pushinteger(L, 0);  /* initialize as an empty list */
+    lua_rawseti(L, t, freelist);  /* ref = t[freelist] = 0 */
+  }
+  else {  /* already initialized */
+    lua_assert(lua_isinteger(L, -1));
+    ref = (int)lua_tointeger(L, -1);  /* ref = t[freelist] */
+  }
+  lua_pop(L, 1);  /* remove element from stack */
+  if (ref != 0) {  /* any free element? */
+    lua_rawgeti(L, t, ref);  /* remove it from list */
+    lua_rawseti(L, t, freelist);  /* (t[freelist] = t[ref]) */
+  }
+  else  /* no free elements */
+    ref = (int)lua_rawlen(L, t) + 1;  /* get a new reference */
+  lua_rawseti(L, t, ref);
+  return ref;
+}
+
+
+LUALIB_API void luaL_unref (lua_State *L, int t, int ref) {
+  if (ref >= 0) {
+    t = lua_absindex(L, t);
+    lua_rawgeti(L, t, freelist);
+    lua_assert(lua_isinteger(L, -1));
+    lua_rawseti(L, t, ref);  /* t[ref] = t[freelist] */
+    lua_pushinteger(L, ref);
+    lua_rawseti(L, t, freelist);  /* t[freelist] = ref */
+  }
+}
+
+/* }====================================================== */
+
+
+/*
+** {======================================================
+** Load functions
+** =======================================================
+*/
+
+typedef struct LoadF {
+  int n;  /* number of pre-read characters */
+  FILE *f;  /* file being read */
+  char buff[BUFSIZ];  /* area for reading file */
+} LoadF;
+
+
+static const char *getF (lua_State *L, void *ud, size_t *size) {
+  LoadF *lf = (LoadF *)ud;
+  (void)L;  /* not used */
+  if (lf->n > 0) {  /* are there pre-read characters to be read? */
+    *size = lf->n;  /* return them (chars already in buffer) */
+    lf->n = 0;  /* no more pre-read characters */
+  }
+  else {  /* read a block from file */
+    /* 'fread' can return > 0 *and* set the EOF flag. If next call to
+       'getF' called 'fread', it might still wait for user input.
+       The next check avoids this problem. */
+    if (feof(lf->f)) return NULL;
+    *size = fread(lf->buff, 1, sizeof(lf->buff), lf->f);  /* read block */
+  }
+  return lf->buff;
+}
+
+
+static int errfile (lua_State *L, const char *what, int fnameindex) {
+  const char *serr = strerror(errno);
+  const char *filename = lua_tostring(L, fnameindex) + 1;
+  lua_pushfstring(L, "cannot %s %s: %s", what, filename, serr);
+  lua_remove(L, fnameindex);
+  return LUA_ERRFILE;
+}
+
+
+/*
+** Skip an optional BOM at the start of a stream. If there is an
+** incomplete BOM (the first character is correct but the rest is
+** not), returns the first character anyway to force an error
+** (as no chunk can start with 0xEF).
+*/
+static int skipBOM (FILE *f) {
+  int c = getc(f);  /* read first character */
+  if (c == 0xEF && getc(f) == 0xBB && getc(f) == 0xBF)  /* correct BOM? */
+    return getc(f);  /* ignore BOM and return next char */
+  else  /* no (valid) BOM */
+    return c;  /* return first character */
+}
+
+
+/*
+** reads the first character of file 'f' and skips an optional BOM mark
+** in its beginning plus its first line if it starts with '#'. Returns
+** true if it skipped the first line.  In any case, '*cp' has the
+** first "valid" character of the file (after the optional BOM and
+** a first-line comment).
+*/
+static int skipcomment (FILE *f, int *cp) {
+  int c = *cp = skipBOM(f);
+  if (c == '#') {  /* first line is a comment (Unix exec. file)? */
+    do {  /* skip first line */
+      c = getc(f);
+    } while (c != EOF && c != '\n');
+    *cp = getc(f);  /* next character after comment, if present */
+    return 1;  /* there was a comment */
+  }
+  else return 0;  /* no comment */
+}
+
+
+LUALIB_API int luaL_loadfilex (lua_State *L, const char *filename,
+                                             const char *mode) {
+  LoadF lf;
+  int status, readstatus;
+  int c;
+  int fnameindex = lua_gettop(L) + 1;  /* index of filename on the stack */
+  if (filename == NULL) {
+    lua_pushliteral(L, "=stdin");
+    lf.f = stdin;
+  }
+  else {
+    lua_pushfstring(L, "@%s", filename);
+    lf.f = fopen(filename, "r");
+    if (lf.f == NULL) return errfile(L, "open", fnameindex);
+  }
+  lf.n = 0;
+  if (skipcomment(lf.f, &c))  /* read initial portion */
+    lf.buff[lf.n++] = '\n';  /* add newline to correct line numbers */
+  if (c == LUA_SIGNATURE[0]) {  /* binary file? */
+    lf.n = 0;  /* remove possible newline */
+    if (filename) {  /* "real" file? */
+      lf.f = freopen(filename, "rb", lf.f);  /* reopen in binary mode */
+      if (lf.f == NULL) return errfile(L, "reopen", fnameindex);
+      skipcomment(lf.f, &c);  /* re-read initial portion */
+    }
+  }
+  if (c != EOF)
+    lf.buff[lf.n++] = c;  /* 'c' is the first character of the stream */
+  status = lua_load(L, getF, &lf, lua_tostring(L, -1), mode);
+  readstatus = ferror(lf.f);
+  if (filename) fclose(lf.f);  /* close file (even in case of errors) */
+  if (readstatus) {
+    lua_settop(L, fnameindex);  /* ignore results from 'lua_load' */
+    return errfile(L, "read", fnameindex);
+  }
+  lua_remove(L, fnameindex);
+  return status;
+}
+
+
+typedef struct LoadS {
+  const char *s;
+  size_t size;
+} LoadS;
+
+
+static const char *getS (lua_State *L, void *ud, size_t *size) {
+  LoadS *ls = (LoadS *)ud;
+  (void)L;  /* not used */
+  if (ls->size == 0) return NULL;
+  *size = ls->size;
+  ls->size = 0;
+  return ls->s;
+}
+
+
+LUALIB_API int luaL_loadbufferx (lua_State *L, const char *buff, size_t size,
+                                 const char *name, const char *mode) {
+  LoadS ls;
+  ls.s = buff;
+  ls.size = size;
+  return lua_load(L, getS, &ls, name, mode);
+}
+
+
+LUALIB_API int luaL_loadstring (lua_State *L, const char *s) {
+  return luaL_loadbuffer(L, s, strlen(s), s);
+}
+
+/* }====================================================== */
+
+
+
+LUALIB_API int luaL_getmetafield (lua_State *L, int obj, const char *event) {
+  if (!lua_getmetatable(L, obj))  /* no metatable? */
+    return LUA_TNIL;
+  else {
+    int tt;
+    lua_pushstring(L, event);
+    tt = lua_rawget(L, -2);
+    if (tt == LUA_TNIL)  /* is metafield nil? */
+      lua_pop(L, 2);  /* remove metatable and metafield */
+    else
+      lua_remove(L, -2);  /* remove only metatable */
+    return tt;  /* return metafield type */
+  }
+}
+
+
+LUALIB_API int luaL_callmeta (lua_State *L, int obj, const char *event) {
+  obj = lua_absindex(L, obj);
+  if (luaL_getmetafield(L, obj, event) == LUA_TNIL)  /* no metafield? */
+    return 0;
+  lua_pushvalue(L, obj);
+  lua_call(L, 1, 1);
+  return 1;
+}
+
+
+LUALIB_API lua_Integer luaL_len (lua_State *L, int idx) {
+  lua_Integer l;
+  int isnum;
+  lua_len(L, idx);
+  l = lua_tointegerx(L, -1, &isnum);
+  if (l_unlikely(!isnum))
+    luaL_error(L, "object length is not an integer");
+  lua_pop(L, 1);  /* remove object */
+  return l;
+}
+
+
+LUALIB_API const char *luaL_tolstring (lua_State *L, int idx, size_t *len) {
+  idx = lua_absindex(L,idx);
+  if (luaL_callmeta(L, idx, "__tostring")) {  /* metafield? */
+    if (!lua_isstring(L, -1))
+      luaL_error(L, "'__tostring' must return a string");
+  }
+  else {
+    switch (lua_type(L, idx)) {
+      case LUA_TNUMBER: {
+        if (lua_isinteger(L, idx))
+          lua_pushfstring(L, "%I", (LUAI_UACINT)lua_tointeger(L, idx));
+        else
+          lua_pushfstring(L, "%f", (LUAI_UACNUMBER)lua_tonumber(L, idx));
+        break;
+      }
+      case LUA_TSTRING:
+        lua_pushvalue(L, idx);
+        break;
+      case LUA_TBOOLEAN:
+        lua_pushstring(L, (lua_toboolean(L, idx) ? "true" : "false"));
+        break;
+      case LUA_TNIL:
+        lua_pushliteral(L, "nil");
+        break;
+      default: {
+        int tt = luaL_getmetafield(L, idx, "__name");  /* try name */
+        const char *kind = (tt == LUA_TSTRING) ? lua_tostring(L, -1) :
+                                                 luaL_typename(L, idx);
+        lua_pushfstring(L, "%s: %p", kind, lua_topointer(L, idx));
+        if (tt != LUA_TNIL)
+          lua_remove(L, -2);  /* remove '__name' */
+        break;
+      }
+    }
+  }
+  return lua_tolstring(L, -1, len);
+}
+
+
+/*
+** set functions from list 'l' into table at top - 'nup'; each
+** function gets the 'nup' elements at the top as upvalues.
+** Returns with only the table at the stack.
+*/
+LUALIB_API void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup) {
+  luaL_checkstack(L, nup, "too many upvalues");
+  for (; l->name != NULL; l++) {  /* fill the table with given functions */
+    if (l->func == NULL)  /* place holder? */
+      lua_pushboolean(L, 0);
+    else {
+      int i;
+      for (i = 0; i < nup; i++)  /* copy upvalues to the top */
+        lua_pushvalue(L, -nup);
+      lua_pushcclosure(L, l->func, nup);  /* closure with those upvalues */
+    }
+    lua_setfield(L, -(nup + 2), l->name);
+  }
+  lua_pop(L, nup);  /* remove upvalues */
+}
+
+
+/*
+** ensure that stack[idx][fname] has a table and push that table
+** into the stack
+*/
+LUALIB_API int luaL_getsubtable (lua_State *L, int idx, const char *fname) {
+  if (lua_getfield(L, idx, fname) == LUA_TTABLE)
+    return 1;  /* table already there */
+  else {
+    lua_pop(L, 1);  /* remove previous result */
+    idx = lua_absindex(L, idx);
+    lua_newtable(L);
+    lua_pushvalue(L, -1);  /* copy to be left at top */
+    lua_setfield(L, idx, fname);  /* assign new table to field */
+    return 0;  /* false, because did not find table there */
+  }
+}
+
+
+/*
+** Stripped-down 'require': After checking "loaded" table, calls 'openf'
+** to open a module, registers the result in 'package.loaded' table and,
+** if 'glb' is true, also registers the result in the global table.
+** Leaves resulting module on the top.
+*/
+LUALIB_API void luaL_requiref (lua_State *L, const char *modname,
+                               lua_CFunction openf, int glb) {
+  luaL_getsubtable(L, LUA_REGISTRYINDEX, LUA_LOADED_TABLE);
+  lua_getfield(L, -1, modname);  /* LOADED[modname] */
+  if (!lua_toboolean(L, -1)) {  /* package not already loaded? */
+    lua_pop(L, 1);  /* remove field */
+    lua_pushcfunction(L, openf);
+    lua_pushstring(L, modname);  /* argument to open function */
+    lua_call(L, 1, 1);  /* call 'openf' to open module */
+    lua_pushvalue(L, -1);  /* make copy of module (call result) */
+    lua_setfield(L, -3, modname);  /* LOADED[modname] = module */
+  }
+  lua_remove(L, -2);  /* remove LOADED table */
+  if (glb) {
+    lua_pushvalue(L, -1);  /* copy of module */
+    lua_setglobal(L, modname);  /* _G[modname] = module */
+  }
+}
+
+
+LUALIB_API void luaL_addgsub (luaL_Buffer *b, const char *s,
+                                     const char *p, const char *r) {
+  const char *wild;
+  size_t l = strlen(p);
+  while ((wild = strstr(s, p)) != NULL) {
+    luaL_addlstring(b, s, wild - s);  /* push prefix */
+    luaL_addstring(b, r);  /* push replacement in place of pattern */
+    s = wild + l;  /* continue after 'p' */
+  }
+  luaL_addstring(b, s);  /* push last suffix */
+}
+
+
+LUALIB_API const char *luaL_gsub (lua_State *L, const char *s,
+                                  const char *p, const char *r) {
+  luaL_Buffer b;
+  luaL_buffinit(L, &b);
+  luaL_addgsub(&b, s, p, r);
+  luaL_pushresult(&b);
+  return lua_tostring(L, -1);
+}
+
+
+static void *l_alloc (void *ud, void *ptr, size_t osize, size_t nsize) {
+  (void)ud; (void)osize;  /* not used */
+  if (nsize == 0) {
+    free(ptr);
+    return NULL;
+  }
+  else
+    return realloc(ptr, nsize);
+}
+
+
+static int panic (lua_State *L) {
+  const char *msg = lua_tostring(L, -1);
+  if (msg == NULL) msg = "error object is not a string";
+  lua_writestringerror("PANIC: unprotected error in call to Lua API (%s)\n",
+                        msg);
+  return 0;  /* return to Lua to abort */
+}
+
+
+/*
+** Warning functions:
+** warnfoff: warning system is off
+** warnfon: ready to start a new message
+** warnfcont: previous message is to be continued
+*/
+static void warnfoff (void *ud, const char *message, int tocont);
+static void warnfon (void *ud, const char *message, int tocont);
+static void warnfcont (void *ud, const char *message, int tocont);
+
+
+/*
+** Check whether message is a control message. If so, execute the
+** control or ignore it if unknown.
+*/
+static int checkcontrol (lua_State *L, const char *message, int tocont) {
+  if (tocont || *(message++) != '@')  /* not a control message? */
+    return 0;
+  else {
+    if (strcmp(message, "off") == 0)
+      lua_setwarnf(L, warnfoff, L);  /* turn warnings off */
+    else if (strcmp(message, "on") == 0)
+      lua_setwarnf(L, warnfon, L);   /* turn warnings on */
+    return 1;  /* it was a control message */
+  }
+}
+
+
+static void warnfoff (void *ud, const char *message, int tocont) {
+  checkcontrol((lua_State *)ud, message, tocont);
+}
+
+
+/*
+** Writes the message and handle 'tocont', finishing the message
+** if needed and setting the next warn function.
+*/
+static void warnfcont (void *ud, const char *message, int tocont) {
+  lua_State *L = (lua_State *)ud;
+  lua_writestringerror("%s", message);  /* write message */
+  if (tocont)  /* not the last part? */
+    lua_setwarnf(L, warnfcont, L);  /* to be continued */
+  else {  /* last part */
+    lua_writestringerror("%s", "\n");  /* finish message with end-of-line */
+    lua_setwarnf(L, warnfon, L);  /* next call is a new message */
+  }
+}
+
+
+static void warnfon (void *ud, const char *message, int tocont) {
+  if (checkcontrol((lua_State *)ud, message, tocont))  /* control message? */
+    return;  /* nothing else to be done */
+  lua_writestringerror("%s", "Lua warning: ");  /* start a new warning */
+  warnfcont(ud, message, tocont);  /* finish processing */
+}
+
+
+LUALIB_API lua_State *luaL_newstate (void) {
+  lua_State *L = lua_newstate(l_alloc, NULL);
+  if (l_likely(L)) {
+    lua_atpanic(L, &panic);
+    lua_setwarnf(L, warnfoff, L);  /* default is warnings off */
+  }
+  return L;
+}
+
+
+LUALIB_API void luaL_checkversion_ (lua_State *L, lua_Number ver, size_t sz) {
+  lua_Number v = lua_version(L);
+  if (sz != LUAL_NUMSIZES)  /* check numeric types */
+    luaL_error(L, "core and library have incompatible numeric types");
+  else if (v != ver)
+    luaL_error(L, "version mismatch: app. needs %f, Lua core provides %f",
+                  (LUAI_UACNUMBER)ver, (LUAI_UACNUMBER)v);
+}
+
diff --git a/src/libs/3rdparty/lua/src/lauxlib.h b/src/libs/3rdparty/lua/src/lauxlib.h
new file mode 100644
index 0000000000..5b977e2a39
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lauxlib.h
@@ -0,0 +1,301 @@
+/*
+** $Id: lauxlib.h $
+** Auxiliary functions for building Lua libraries
+** See Copyright Notice in lua.h
+*/
+
+
+#ifndef lauxlib_h
+#define lauxlib_h
+
+
+#include <stddef.h>
+#include <stdio.h>
+
+#include "luaconf.h"
+#include "lua.h"
+
+
+/* global table */
+#define LUA_GNAME	"_G"
+
+
+typedef struct luaL_Buffer luaL_Buffer;
+
+
+/* extra error code for 'luaL_loadfilex' */
+#define LUA_ERRFILE     (LUA_ERRERR+1)
+
+
+/* key, in the registry, for table of loaded modules */
+#define LUA_LOADED_TABLE	"_LOADED"
+
+
+/* key, in the registry, for table of preloaded loaders */
+#define LUA_PRELOAD_TABLE	"_PRELOAD"
+
+
+typedef struct luaL_Reg {
+  const char *name;
+  lua_CFunction func;
+} luaL_Reg;
+
+
+#define LUAL_NUMSIZES	(sizeof(lua_Integer)*16 + sizeof(lua_Number))
+
+LUALIB_API void (luaL_checkversion_) (lua_State *L, lua_Number ver, size_t sz);
+#define luaL_checkversion(L)  \
+	  luaL_checkversion_(L, LUA_VERSION_NUM, LUAL_NUMSIZES)
+
+LUALIB_API int (luaL_getmetafield) (lua_State *L, int obj, const char *e);
+LUALIB_API int (luaL_callmeta) (lua_State *L, int obj, const char *e);
+LUALIB_API const char *(luaL_tolstring) (lua_State *L, int idx, size_t *len);
+LUALIB_API int (luaL_argerror) (lua_State *L, int arg, const char *extramsg);
+LUALIB_API int (luaL_typeerror) (lua_State *L, int arg, const char *tname);
+LUALIB_API const char *(luaL_checklstring) (lua_State *L, int arg,
+                                                          size_t *l);
+LUALIB_API const char *(luaL_optlstring) (lua_State *L, int arg,
+                                          const char *def, size_t *l);
+LUALIB_API lua_Number (luaL_checknumber) (lua_State *L, int arg);
+LUALIB_API lua_Number (luaL_optnumber) (lua_State *L, int arg, lua_Number def);
+
+LUALIB_API lua_Integer (luaL_checkinteger) (lua_State *L, int arg);
+LUALIB_API lua_Integer (luaL_optinteger) (lua_State *L, int arg,
+                                          lua_Integer def);
+
+LUALIB_API void (luaL_checkstack) (lua_State *L, int sz, const char *msg);
+LUALIB_API void (luaL_checktype) (lua_State *L, int arg, int t);
+LUALIB_API void (luaL_checkany) (lua_State *L, int arg);
+
+LUALIB_API int   (luaL_newmetatable) (lua_State *L, const char *tname);
+LUALIB_API void  (luaL_setmetatable) (lua_State *L, const char *tname);
+LUALIB_API void *(luaL_testudata) (lua_State *L, int ud, const char *tname);
+LUALIB_API void *(luaL_checkudata) (lua_State *L, int ud, const char *tname);
+
+LUALIB_API void (luaL_where) (lua_State *L, int lvl);
+LUALIB_API int (luaL_error) (lua_State *L, const char *fmt, ...);
+
+LUALIB_API int (luaL_checkoption) (lua_State *L, int arg, const char *def,
+                                   const char *const lst[]);
+
+LUALIB_API int (luaL_fileresult) (lua_State *L, int stat, const char *fname);
+LUALIB_API int (luaL_execresult) (lua_State *L, int stat);
+
+
+/* predefined references */
+#define LUA_NOREF       (-2)
+#define LUA_REFNIL      (-1)
+
+LUALIB_API int (luaL_ref) (lua_State *L, int t);
+LUALIB_API void (luaL_unref) (lua_State *L, int t, int ref);
+
+LUALIB_API int (luaL_loadfilex) (lua_State *L, const char *filename,
+                                               const char *mode);
+
+#define luaL_loadfile(L,f)	luaL_loadfilex(L,f,NULL)
+
+LUALIB_API int (luaL_loadbufferx) (lua_State *L, const char *buff, size_t sz,
+                                   const char *name, const char *mode);
+LUALIB_API int (luaL_loadstring) (lua_State *L, const char *s);
+
+LUALIB_API lua_State *(luaL_newstate) (void);
+
+LUALIB_API lua_Integer (luaL_len) (lua_State *L, int idx);
+
+LUALIB_API void (luaL_addgsub) (luaL_Buffer *b, const char *s,
+                                     const char *p, const char *r);
+LUALIB_API const char *(luaL_gsub) (lua_State *L, const char *s,
+                                    const char *p, const char *r);
+
+LUALIB_API void (luaL_setfuncs) (lua_State *L, const luaL_Reg *l, int nup);
+
+LUALIB_API int (luaL_getsubtable) (lua_State *L, int idx, const char *fname);
+
+LUALIB_API void (luaL_traceback) (lua_State *L, lua_State *L1,
+                                  const char *msg, int level);
+
+LUALIB_API void (luaL_requiref) (lua_State *L, const char *modname,
+                                 lua_CFunction openf, int glb);
+
+/*
+** ===============================================================
+** some useful macros
+** ===============================================================
+*/
+
+
+#define luaL_newlibtable(L,l)	\
+  lua_createtable(L, 0, sizeof(l)/sizeof((l)[0]) - 1)
+
+#define luaL_newlib(L,l)  \
+  (luaL_checkversion(L), luaL_newlibtable(L,l), luaL_setfuncs(L,l,0))
+
+#define luaL_argcheck(L, cond,arg,extramsg)	\
+	((void)(luai_likely(cond) || luaL_argerror(L, (arg), (extramsg))))
+
+#define luaL_argexpected(L,cond,arg,tname)	\
+	((void)(luai_likely(cond) || luaL_typeerror(L, (arg), (tname))))
+
+#define luaL_checkstring(L,n)	(luaL_checklstring(L, (n), NULL))
+#define luaL_optstring(L,n,d)	(luaL_optlstring(L, (n), (d), NULL))
+
+#define luaL_typename(L,i)	lua_typename(L, lua_type(L,(i)))
+
+#define luaL_dofile(L, fn) \
+	(luaL_loadfile(L, fn) || lua_pcall(L, 0, LUA_MULTRET, 0))
+
+#define luaL_dostring(L, s) \
+	(luaL_loadstring(L, s) || lua_pcall(L, 0, LUA_MULTRET, 0))
+
+#define luaL_getmetatable(L,n)	(lua_getfield(L, LUA_REGISTRYINDEX, (n)))
+
+#define luaL_opt(L,f,n,d)	(lua_isnoneornil(L,(n)) ? (d) : f(L,(n)))
+
+#define luaL_loadbuffer(L,s,sz,n)	luaL_loadbufferx(L,s,sz,n,NULL)
+
+
+/*
+** Perform arithmetic operations on lua_Integer values with wrap-around
+** semantics, as the Lua core does.
+*/
+#define luaL_intop(op,v1,v2)  \
+	((lua_Integer)((lua_Unsigned)(v1) op (lua_Unsigned)(v2)))
+
+
+/* push the value used to represent failure/error */
+#define luaL_pushfail(L)	lua_pushnil(L)
+
+
+/*
+** Internal assertions for in-house debugging
+*/
+#if !defined(lua_assert)
+
+#if defined LUAI_ASSERT
+  #include <assert.h>
+  #define lua_assert(c)		assert(c)
+#else
+  #define lua_assert(c)		((void)0)
+#endif
+
+#endif
+
+
+
+/*
+** {======================================================
+** Generic Buffer manipulation
+** =======================================================
+*/
+
+struct luaL_Buffer {
+  char *b;  /* buffer address */
+  size_t size;  /* buffer size */
+  size_t n;  /* number of characters in buffer */
+  lua_State *L;
+  union {
+    LUAI_MAXALIGN;  /* ensure maximum alignment for buffer */
+    char b[LUAL_BUFFERSIZE];  /* initial buffer */
+  } init;
+};
+
+
+#define luaL_bufflen(bf)	((bf)->n)
+#define luaL_buffaddr(bf)	((bf)->b)
+
+
+#define luaL_addchar(B,c) \
+  ((void)((B)->n < (B)->size || luaL_prepbuffsize((B), 1)), \
+   ((B)->b[(B)->n++] = (c)))
+
+#define luaL_addsize(B,s)	((B)->n += (s))
+
+#define luaL_buffsub(B,s)	((B)->n -= (s))
+
+LUALIB_API void (luaL_buffinit) (lua_State *L, luaL_Buffer *B);
+LUALIB_API char *(luaL_prepbuffsize) (luaL_Buffer *B, size_t sz);
+LUALIB_API void (luaL_addlstring) (luaL_Buffer *B, const char *s, size_t l);
+LUALIB_API void (luaL_addstring) (luaL_Buffer *B, const char *s);
+LUALIB_API void (luaL_addvalue) (luaL_Buffer *B);
+LUALIB_API void (luaL_pushresult) (luaL_Buffer *B);
+LUALIB_API void (luaL_pushresultsize) (luaL_Buffer *B, size_t sz);
+LUALIB_API char *(luaL_buffinitsize) (lua_State *L, luaL_Buffer *B, size_t sz);
+
+#define luaL_prepbuffer(B)	luaL_prepbuffsize(B, LUAL_BUFFERSIZE)
+
+/* }====================================================== */
+
+
+
+/*
+** {======================================================
+** File handles for IO library
+** =======================================================
+*/
+
+/*
+** A file handle is a userdata with metatable 'LUA_FILEHANDLE' and
+** initial structure 'luaL_Stream' (it may contain other fields
+** after that initial structure).
+*/
+
+#define LUA_FILEHANDLE          "FILE*"
+
+
+typedef struct luaL_Stream {
+  FILE *f;  /* stream (NULL for incompletely created streams) */
+  lua_CFunction closef;  /* to close stream (NULL for closed streams) */
+} luaL_Stream;
+
+/* }====================================================== */
+
+/*
+** {==================================================================
+** "Abstraction Layer" for basic report of messages and errors
+** ===================================================================
+*/
+
+/* print a string */
+#if !defined(lua_writestring)
+#define lua_writestring(s,l)   fwrite((s), sizeof(char), (l), stdout)
+#endif
+
+/* print a newline and flush the output */
+#if !defined(lua_writeline)
+#define lua_writeline()        (lua_writestring("\n", 1), fflush(stdout))
+#endif
+
+/* print an error message */
+#if !defined(lua_writestringerror)
+#define lua_writestringerror(s,p) \
+        (fprintf(stderr, (s), (p)), fflush(stderr))
+#endif
+
+/* }================================================================== */
+
+
+/*
+** {============================================================
+** Compatibility with deprecated conversions
+** =============================================================
+*/
+#if defined(LUA_COMPAT_APIINTCASTS)
+
+#define luaL_checkunsigned(L,a)	((lua_Unsigned)luaL_checkinteger(L,a))
+#define luaL_optunsigned(L,a,d)	\
+	((lua_Unsigned)luaL_optinteger(L,a,(lua_Integer)(d)))
+
+#define luaL_checkint(L,n)	((int)luaL_checkinteger(L, (n)))
+#define luaL_optint(L,n,d)	((int)luaL_optinteger(L, (n), (d)))
+
+#define luaL_checklong(L,n)	((long)luaL_checkinteger(L, (n)))
+#define luaL_optlong(L,n,d)	((long)luaL_optinteger(L, (n), (d)))
+
+#endif
+/* }============================================================ */
+
+
+
+#endif
+
+
diff --git a/src/libs/3rdparty/lua/src/lbaselib.c b/src/libs/3rdparty/lua/src/lbaselib.c
new file mode 100644
index 0000000000..1d60c9dede
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lbaselib.c
@@ -0,0 +1,549 @@
+/*
+** $Id: lbaselib.c $
+** Basic library
+** See Copyright Notice in lua.h
+*/
+
+#define lbaselib_c
+#define LUA_LIB
+
+#include "lprefix.h"
+
+
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "lua.h"
+
+#include "lauxlib.h"
+#include "lualib.h"
+
+
+static int luaB_print (lua_State *L) {
+  int n = lua_gettop(L);  /* number of arguments */
+  int i;
+  for (i = 1; i <= n; i++) {  /* for each argument */
+    size_t l;
+    const char *s = luaL_tolstring(L, i, &l);  /* convert it to string */
+    if (i > 1)  /* not the first element? */
+      lua_writestring("\t", 1);  /* add a tab before it */
+    lua_writestring(s, l);  /* print it */
+    lua_pop(L, 1);  /* pop result */
+  }
+  lua_writeline();
+  return 0;
+}
+
+
+/*
+** Creates a warning with all given arguments.
+** Check first for errors; otherwise an error may interrupt
+** the composition of a warning, leaving it unfinished.
+*/
+static int luaB_warn (lua_State *L) {
+  int n = lua_gettop(L);  /* number of arguments */
+  int i;
+  luaL_checkstring(L, 1);  /* at least one argument */
+  for (i = 2; i <= n; i++)
+    luaL_checkstring(L, i);  /* make sure all arguments are strings */
+  for (i = 1; i < n; i++)  /* compose warning */
+    lua_warning(L, lua_tostring(L, i), 1);
+  lua_warning(L, lua_tostring(L, n), 0);  /* close warning */
+  return 0;
+}
+
+
+#define SPACECHARS	" \f\n\r\t\v"
+
+static const char *b_str2int (const char *s, int base, lua_Integer *pn) {
+  lua_Unsigned n = 0;
+  int neg = 0;
+  s += strspn(s, SPACECHARS);  /* skip initial spaces */
+  if (*s == '-') { s++; neg = 1; }  /* handle sign */
+  else if (*s == '+') s++;
+  if (!isalnum((unsigned char)*s))  /* no digit? */
+    return NULL;
+  do {
+    int digit = (isdigit((unsigned char)*s)) ? *s - '0'
+                   : (toupper((unsigned char)*s) - 'A') + 10;
+    if (digit >= base) return NULL;  /* invalid numeral */
+    n = n * base + digit;
+    s++;
+  } while (isalnum((unsigned char)*s));
+  s += strspn(s, SPACECHARS);  /* skip trailing spaces */
+  *pn = (lua_Integer)((neg) ? (0u - n) : n);
+  return s;
+}
+
+
+static int luaB_tonumber (lua_State *L) {
+  if (lua_isnoneornil(L, 2)) {  /* standard conversion? */
+    if (lua_type(L, 1) == LUA_TNUMBER) {  /* already a number? */
+      lua_settop(L, 1);  /* yes; return it */
+      return 1;
+    }
+    else {
+      size_t l;
+      const char *s = lua_tolstring(L, 1, &l);
+      if (s != NULL && lua_stringtonumber(L, s) == l + 1)
+        return 1;  /* successful conversion to number */
+      /* else not a number */
+      luaL_checkany(L, 1);  /* (but there must be some parameter) */
+    }
+  }
+  else {
+    size_t l;
+    const char *s;
+    lua_Integer n = 0;  /* to avoid warnings */
+    lua_Integer base = luaL_checkinteger(L, 2);
+    luaL_checktype(L, 1, LUA_TSTRING);  /* no numbers as strings */
+    s = lua_tolstring(L, 1, &l);
+    luaL_argcheck(L, 2 <= base && base <= 36, 2, "base out of range");
+    if (b_str2int(s, (int)base, &n) == s + l) {
+      lua_pushinteger(L, n);
+      return 1;
+    }  /* else not a number */
+  }  /* else not a number */
+  luaL_pushfail(L);  /* not a number */
+  return 1;
+}
+
+
+static int luaB_error (lua_State *L) {
+  int level = (int)luaL_optinteger(L, 2, 1);
+  lua_settop(L, 1);
+  if (lua_type(L, 1) == LUA_TSTRING && level > 0) {
+    luaL_where(L, level);   /* add extra information */
+    lua_pushvalue(L, 1);
+    lua_concat(L, 2);
+  }
+  return lua_error(L);
+}
+
+
+static int luaB_getmetatable (lua_State *L) {
+  luaL_checkany(L, 1);
+  if (!lua_getmetatable(L, 1)) {
+    lua_pushnil(L);
+    return 1;  /* no metatable */
+  }
+  luaL_getmetafield(L, 1, "__metatable");
+  return 1;  /* returns either __metatable field (if present) or metatable */
+}
+
+
+static int luaB_setmetatable (lua_State *L) {
+  int t = lua_type(L, 2);
+  luaL_checktype(L, 1, LUA_TTABLE);
+  luaL_argexpected(L, t == LUA_TNIL || t == LUA_TTABLE, 2, "nil or table");
+  if (l_unlikely(luaL_getmetafield(L, 1, "__metatable") != LUA_TNIL))
+    return luaL_error(L, "cannot change a protected metatable");
+  lua_settop(L, 2);
+  lua_setmetatable(L, 1);
+  return 1;
+}
+
+
+static int luaB_rawequal (lua_State *L) {
+  luaL_checkany(L, 1);
+  luaL_checkany(L, 2);
+  lua_pushboolean(L, lua_rawequal(L, 1, 2));
+  return 1;
+}
+
+
+static int luaB_rawlen (lua_State *L) {
+  int t = lua_type(L, 1);
+  luaL_argexpected(L, t == LUA_TTABLE || t == LUA_TSTRING, 1,
+                      "table or string");
+  lua_pushinteger(L, lua_rawlen(L, 1));
+  return 1;
+}
+
+
+static int luaB_rawget (lua_State *L) {
+  luaL_checktype(L, 1, LUA_TTABLE);
+  luaL_checkany(L, 2);
+  lua_settop(L, 2);
+  lua_rawget(L, 1);
+  return 1;
+}
+
+static int luaB_rawset (lua_State *L) {
+  luaL_checktype(L, 1, LUA_TTABLE);
+  luaL_checkany(L, 2);
+  luaL_checkany(L, 3);
+  lua_settop(L, 3);
+  lua_rawset(L, 1);
+  return 1;
+}
+
+
+static int pushmode (lua_State *L, int oldmode) {
+  if (oldmode == -1)
+    luaL_pushfail(L);  /* invalid call to 'lua_gc' */
+  else
+    lua_pushstring(L, (oldmode == LUA_GCINC) ? "incremental"
+                                             : "generational");
+  return 1;
+}
+
+
+/*
+** check whether call to 'lua_gc' was valid (not inside a finalizer)
+*/
+#define checkvalres(res) { if (res == -1) break; }
+
+static int luaB_collectgarbage (lua_State *L) {
+  static const char *const opts[] = {"stop", "restart", "collect",
+    "count", "step", "setpause", "setstepmul",
+    "isrunning", "generational", "incremental", NULL};
+  static const int optsnum[] = {LUA_GCSTOP, LUA_GCRESTART, LUA_GCCOLLECT,
+    LUA_GCCOUNT, LUA_GCSTEP, LUA_GCSETPAUSE, LUA_GCSETSTEPMUL,
+    LUA_GCISRUNNING, LUA_GCGEN, LUA_GCINC};
+  int o = optsnum[luaL_checkoption(L, 1, "collect", opts)];
+  switch (o) {
+    case LUA_GCCOUNT: {
+      int k = lua_gc(L, o);
+      int b = lua_gc(L, LUA_GCCOUNTB);
+      checkvalres(k);
+      lua_pushnumber(L, (lua_Number)k + ((lua_Number)b/1024));
+      return 1;
+    }
+    case LUA_GCSTEP: {
+      int step = (int)luaL_optinteger(L, 2, 0);
+      int res = lua_gc(L, o, step);
+      checkvalres(res);
+      lua_pushboolean(L, res);
+      return 1;
+    }
+    case LUA_GCSETPAUSE:
+    case LUA_GCSETSTEPMUL: {
+      int p = (int)luaL_optinteger(L, 2, 0);
+      int previous = lua_gc(L, o, p);
+      checkvalres(previous);
+      lua_pushinteger(L, previous);
+      return 1;
+    }
+    case LUA_GCISRUNNING: {
+      int res = lua_gc(L, o);
+      checkvalres(res);
+      lua_pushboolean(L, res);
+      return 1;
+    }
+    case LUA_GCGEN: {
+      int minormul = (int)luaL_optinteger(L, 2, 0);
+      int majormul = (int)luaL_optinteger(L, 3, 0);
+      return pushmode(L, lua_gc(L, o, minormul, majormul));
+    }
+    case LUA_GCINC: {
+      int pause = (int)luaL_optinteger(L, 2, 0);
+      int stepmul = (int)luaL_optinteger(L, 3, 0);
+      int stepsize = (int)luaL_optinteger(L, 4, 0);
+      return pushmode(L, lua_gc(L, o, pause, stepmul, stepsize));
+    }
+    default: {
+      int res = lua_gc(L, o);
+      checkvalres(res);
+      lua_pushinteger(L, res);
+      return 1;
+    }
+  }
+  luaL_pushfail(L);  /* invalid call (inside a finalizer) */
+  return 1;
+}
+
+
+static int luaB_type (lua_State *L) {
+  int t = lua_type(L, 1);
+  luaL_argcheck(L, t != LUA_TNONE, 1, "value expected");
+  lua_pushstring(L, lua_typename(L, t));
+  return 1;
+}
+
+
+static int luaB_next (lua_State *L) {
+  luaL_checktype(L, 1, LUA_TTABLE);
+  lua_settop(L, 2);  /* create a 2nd argument if there isn't one */
+  if (lua_next(L, 1))
+    return 2;
+  else {
+    lua_pushnil(L);
+    return 1;
+  }
+}
+
+
+static int pairscont (lua_State *L, int status, lua_KContext k) {
+  (void)L; (void)status; (void)k;  /* unused */
+  return 3;
+}
+
+static int luaB_pairs (lua_State *L) {
+  luaL_checkany(L, 1);
+  if (luaL_getmetafield(L, 1, "__pairs") == LUA_TNIL) {  /* no metamethod? */
+    lua_pushcfunction(L, luaB_next);  /* will return generator, */
+    lua_pushvalue(L, 1);  /* state, */
+    lua_pushnil(L);  /* and initial value */
+  }
+  else {
+    lua_pushvalue(L, 1);  /* argument 'self' to metamethod */
+    lua_callk(L, 1, 3, 0, pairscont);  /* get 3 values from metamethod */
+  }
+  return 3;
+}
+
+
+/*
+** Traversal function for 'ipairs'
+*/
+static int ipairsaux (lua_State *L) {
+  lua_Integer i = luaL_checkinteger(L, 2);
+  i = luaL_intop(+, i, 1);
+  lua_pushinteger(L, i);
+  return (lua_geti(L, 1, i) == LUA_TNIL) ? 1 : 2;
+}
+
+
+/*
+** 'ipairs' function. Returns 'ipairsaux', given "table", 0.
+** (The given "table" may not be a table.)
+*/
+static int luaB_ipairs (lua_State *L) {
+  luaL_checkany(L, 1);
+  lua_pushcfunction(L, ipairsaux);  /* iteration function */
+  lua_pushvalue(L, 1);  /* state */
+  lua_pushinteger(L, 0);  /* initial value */
+  return 3;
+}
+
+
+static int load_aux (lua_State *L, int status, int envidx) {
+  if (l_likely(status == LUA_OK)) {
+    if (envidx != 0) {  /* 'env' parameter? */
+      lua_pushvalue(L, envidx);  /* environment for loaded function */
+      if (!lua_setupvalue(L, -2, 1))  /* set it as 1st upvalue */
+        lua_pop(L, 1);  /* remove 'env' if not used by previous call */
+    }
+    return 1;
+  }
+  else {  /* error (message is on top of the stack) */
+    luaL_pushfail(L);
+    lua_insert(L, -2);  /* put before error message */
+    return 2;  /* return fail plus error message */
+  }
+}
+
+
+static int luaB_loadfile (lua_State *L) {
+  const char *fname = luaL_optstring(L, 1, NULL);
+  const char *mode = luaL_optstring(L, 2, NULL);
+  int env = (!lua_isnone(L, 3) ? 3 : 0);  /* 'env' index or 0 if no 'env' */
+  int status = luaL_loadfilex(L, fname, mode);
+  return load_aux(L, status, env);
+}
+
+
+/*
+** {======================================================
+** Generic Read function
+** =======================================================
+*/
+
+
+/*
+** reserved slot, above all arguments, to hold a copy of the returned
+** string to avoid it being collected while parsed. 'load' has four
+** optional arguments (chunk, source name, mode, and environment).
+*/
+#define RESERVEDSLOT	5
+
+
+/*
+** Reader for generic 'load' function: 'lua_load' uses the
+** stack for internal stuff, so the reader cannot change the
+** stack top. Instead, it keeps its resulting string in a
+** reserved slot inside the stack.
+*/
+static const char *generic_reader (lua_State *L, void *ud, size_t *size) {
+  (void)(ud);  /* not used */
+  luaL_checkstack(L, 2, "too many nested functions");
+  lua_pushvalue(L, 1);  /* get function */
+  lua_call(L, 0, 1);  /* call it */
+  if (lua_isnil(L, -1)) {
+    lua_pop(L, 1);  /* pop result */
+    *size = 0;
+    return NULL;
+  }
+  else if (l_unlikely(!lua_isstring(L, -1)))
+    luaL_error(L, "reader function must return a string");
+  lua_replace(L, RESERVEDSLOT);  /* save string in reserved slot */
+  return lua_tolstring(L, RESERVEDSLOT, size);
+}
+
+
+static int luaB_load (lua_State *L) {
+  int status;
+  size_t l;
+  const char *s = lua_tolstring(L, 1, &l);
+  const char *mode = luaL_optstring(L, 3, "bt");
+  int env = (!lua_isnone(L, 4) ? 4 : 0);  /* 'env' index or 0 if no 'env' */
+  if (s != NULL) {  /* loading a string? */
+    const char *chunkname = luaL_optstring(L, 2, s);
+    status = luaL_loadbufferx(L, s, l, chunkname, mode);
+  }
+  else {  /* loading from a reader function */
+    const char *chunkname = luaL_optstring(L, 2, "=(load)");
+    luaL_checktype(L, 1, LUA_TFUNCTION);
+    lua_settop(L, RESERVEDSLOT);  /* create reserved slot */
+    status = lua_load(L, generic_reader, NULL, chunkname, mode);
+  }
+  return load_aux(L, status, env);
+}
+
+/* }====================================================== */
+
+
+static int dofilecont (lua_State *L, int d1, lua_KContext d2) {
+  (void)d1;  (void)d2;  /* only to match 'lua_Kfunction' prototype */
+  return lua_gettop(L) - 1;
+}
+
+
+static int luaB_dofile (lua_State *L) {
+  const char *fname = luaL_optstring(L, 1, NULL);
+  lua_settop(L, 1);
+  if (l_unlikely(luaL_loadfile(L, fname) != LUA_OK))
+    return lua_error(L);
+  lua_callk(L, 0, LUA_MULTRET, 0, dofilecont);
+  return dofilecont(L, 0, 0);
+}
+
+
+static int luaB_assert (lua_State *L) {
+  if (l_likely(lua_toboolean(L, 1)))  /* condition is true? */
+    return lua_gettop(L);  /* return all arguments */
+  else {  /* error */
+    luaL_checkany(L, 1);  /* there must be a condition */
+    lua_remove(L, 1);  /* remove it */
+    lua_pushliteral(L, "assertion failed!");  /* default message */
+    lua_settop(L, 1);  /* leave only message (default if no other one) */
+    return luaB_error(L);  /* call 'error' */
+  }
+}
+
+
+static int luaB_select (lua_State *L) {
+  int n = lua_gettop(L);
+  if (lua_type(L, 1) == LUA_TSTRING && *lua_tostring(L, 1) == '#') {
+    lua_pushinteger(L, n-1);
+    return 1;
+  }
+  else {
+    lua_Integer i = luaL_checkinteger(L, 1);
+    if (i < 0) i = n + i;
+    else if (i > n) i = n;
+    luaL_argcheck(L, 1 <= i, 1, "index out of range");
+    return n - (int)i;
+  }
+}
+
+
+/*
+** Continuation function for 'pcall' and 'xpcall'. Both functions
+** already pushed a 'true' before doing the call, so in case of success
+** 'finishpcall' only has to return everything in the stack minus
+** 'extra' values (where 'extra' is exactly the number of items to be
+** ignored).
+*/
+static int finishpcall (lua_State *L, int status, lua_KContext extra) {
+  if (l_unlikely(status != LUA_OK && status != LUA_YIELD)) {  /* error? */
+    lua_pushboolean(L, 0);  /* first result (false) */
+    lua_pushvalue(L, -2);  /* error message */
+    return 2;  /* return false, msg */
+  }
+  else
+    return lua_gettop(L) - (int)extra;  /* return all results */
+}
+
+
+static int luaB_pcall (lua_State *L) {
+  int status;
+  luaL_checkany(L, 1);
+  lua_pushboolean(L, 1);  /* first result if no errors */
+  lua_insert(L, 1);  /* put it in place */
+  status = lua_pcallk(L, lua_gettop(L) - 2, LUA_MULTRET, 0, 0, finishpcall);
+  return finishpcall(L, status, 0);
+}
+
+
+/*
+** Do a protected call with error handling. After 'lua_rotate', the
+** stack will have <f, err, true, f, [args...]>; so, the function passes
+** 2 to 'finishpcall' to skip the 2 first values when returning results.
+*/
+static int luaB_xpcall (lua_State *L) {
+  int status;
+  int n = lua_gettop(L);
+  luaL_checktype(L, 2, LUA_TFUNCTION);  /* check error function */
+  lua_pushboolean(L, 1);  /* first result */
+  lua_pushvalue(L, 1);  /* function */
+  lua_rotate(L, 3, 2);  /* move them below function's arguments */
+  status = lua_pcallk(L, n - 2, LUA_MULTRET, 2, 2, finishpcall);
+  return finishpcall(L, status, 2);
+}
+
+
+static int luaB_tostring (lua_State *L) {
+  luaL_checkany(L, 1);
+  luaL_tolstring(L, 1, NULL);
+  return 1;
+}
+
+
+static const luaL_Reg base_funcs[] = {
+  {"assert", luaB_assert},
+  {"collectgarbage", luaB_collectgarbage},
+  {"dofile", luaB_dofile},
+  {"error", luaB_error},
+  {"getmetatable", luaB_getmetatable},
+  {"ipairs", luaB_ipairs},
+  {"loadfile", luaB_loadfile},
+  {"load", luaB_load},
+  {"next", luaB_next},
+  {"pairs", luaB_pairs},
+  {"pcall", luaB_pcall},
+  {"print", luaB_print},
+  {"warn", luaB_warn},
+  {"rawequal", luaB_rawequal},
+  {"rawlen", luaB_rawlen},
+  {"rawget", luaB_rawget},
+  {"rawset", luaB_rawset},
+  {"select", luaB_select},
+  {"setmetatable", luaB_setmetatable},
+  {"tonumber", luaB_tonumber},
+  {"tostring", luaB_tostring},
+  {"type", luaB_type},
+  {"xpcall", luaB_xpcall},
+  /* placeholders */
+  {LUA_GNAME, NULL},
+  {"_VERSION", NULL},
+  {NULL, NULL}
+};
+
+
+LUAMOD_API int luaopen_base (lua_State *L) {
+  /* open lib into global table */
+  lua_pushglobaltable(L);
+  luaL_setfuncs(L, base_funcs, 0);
+  /* set global _G */
+  lua_pushvalue(L, -1);
+  lua_setfield(L, -2, LUA_GNAME);
+  /* set global _VERSION */
+  lua_pushliteral(L, LUA_VERSION);
+  lua_setfield(L, -2, "_VERSION");
+  return 1;
+}
+
diff --git a/src/libs/3rdparty/lua/src/lcode.c b/src/libs/3rdparty/lua/src/lcode.c
new file mode 100644
index 0000000000..1a371ca943
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lcode.c
@@ -0,0 +1,1871 @@
+/*
+** $Id: lcode.c $
+** Code generator for Lua
+** See Copyright Notice in lua.h
+*/
+
+#define lcode_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include <float.h>
+#include <limits.h>
+#include <math.h>
+#include <stdlib.h>
+
+#include "lua.h"
+
+#include "lcode.h"
+#include "ldebug.h"
+#include "ldo.h"
+#include "lgc.h"
+#include "llex.h"
+#include "lmem.h"
+#include "lobject.h"
+#include "lopcodes.h"
+#include "lparser.h"
+#include "lstring.h"
+#include "ltable.h"
+#include "lvm.h"
+
+
+/* Maximum number of registers in a Lua function (must fit in 8 bits) */
+#define MAXREGS		255
+
+
+#define hasjumps(e)	((e)->t != (e)->f)
+
+
+static int codesJ (FuncState *fs, OpCode o, int sj, int k);
+
+
+
+/* semantic error */
+l_noret luaK_semerror (LexState *ls, const char *msg) {
+  ls->t.token = 0;  /* remove "near <token>" from final message */
+  luaX_syntaxerror(ls, msg);
+}
+
+
+/*
+** If expression is a numeric constant, fills 'v' with its value
+** and returns 1. Otherwise, returns 0.
+*/
+static int tonumeral (const expdesc *e, TValue *v) {
+  if (hasjumps(e))
+    return 0;  /* not a numeral */
+  switch (e->k) {
+    case VKINT:
+      if (v) setivalue(v, e->u.ival);
+      return 1;
+    case VKFLT:
+      if (v) setfltvalue(v, e->u.nval);
+      return 1;
+    default: return 0;
+  }
+}
+
+
+/*
+** Get the constant value from a constant expression
+*/
+static TValue *const2val (FuncState *fs, const expdesc *e) {
+  lua_assert(e->k == VCONST);
+  return &fs->ls->dyd->actvar.arr[e->u.info].k;
+}
+
+
+/*
+** If expression is a constant, fills 'v' with its value
+** and returns 1. Otherwise, returns 0.
+*/
+int luaK_exp2const (FuncState *fs, const expdesc *e, TValue *v) {
+  if (hasjumps(e))
+    return 0;  /* not a constant */
+  switch (e->k) {
+    case VFALSE:
+      setbfvalue(v);
+      return 1;
+    case VTRUE:
+      setbtvalue(v);
+      return 1;
+    case VNIL:
+      setnilvalue(v);
+      return 1;
+    case VKSTR: {
+      setsvalue(fs->ls->L, v, e->u.strval);
+      return 1;
+    }
+    case VCONST: {
+      setobj(fs->ls->L, v, const2val(fs, e));
+      return 1;
+    }
+    default: return tonumeral(e, v);
+  }
+}
+
+
+/*
+** Return the previous instruction of the current code. If there
+** may be a jump target between the current instruction and the
+** previous one, return an invalid instruction (to avoid wrong
+** optimizations).
+*/
+static Instruction *previousinstruction (FuncState *fs) {
+  static const Instruction invalidinstruction = ~(Instruction)0;
+  if (fs->pc > fs->lasttarget)
+    return &fs->f->code[fs->pc - 1];  /* previous instruction */
+  else
+    return cast(Instruction*, &invalidinstruction);
+}
+
+
+/*
+** Create a OP_LOADNIL instruction, but try to optimize: if the previous
+** instruction is also OP_LOADNIL and ranges are compatible, adjust
+** range of previous instruction instead of emitting a new one. (For
+** instance, 'local a; local b' will generate a single opcode.)
+*/
+void luaK_nil (FuncState *fs, int from, int n) {
+  int l = from + n - 1;  /* last register to set nil */
+  Instruction *previous = previousinstruction(fs);
+  if (GET_OPCODE(*previous) == OP_LOADNIL) {  /* previous is LOADNIL? */
+    int pfrom = GETARG_A(*previous);  /* get previous range */
+    int pl = pfrom + GETARG_B(*previous);
+    if ((pfrom <= from && from <= pl + 1) ||
+        (from <= pfrom && pfrom <= l + 1)) {  /* can connect both? */
+      if (pfrom < from) from = pfrom;  /* from = min(from, pfrom) */
+      if (pl > l) l = pl;  /* l = max(l, pl) */
+      SETARG_A(*previous, from);
+      SETARG_B(*previous, l - from);
+      return;
+    }  /* else go through */
+  }
+  luaK_codeABC(fs, OP_LOADNIL, from, n - 1, 0);  /* else no optimization */
+}
+
+
+/*
+** Gets the destination address of a jump instruction. Used to traverse
+** a list of jumps.
+*/
+static int getjump (FuncState *fs, int pc) {
+  int offset = GETARG_sJ(fs->f->code[pc]);
+  if (offset == NO_JUMP)  /* point to itself represents end of list */
+    return NO_JUMP;  /* end of list */
+  else
+    return (pc+1)+offset;  /* turn offset into absolute position */
+}
+
+
+/*
+** Fix jump instruction at position 'pc' to jump to 'dest'.
+** (Jump addresses are relative in Lua)
+*/
+static void fixjump (FuncState *fs, int pc, int dest) {
+  Instruction *jmp = &fs->f->code[pc];
+  int offset = dest - (pc + 1);
+  lua_assert(dest != NO_JUMP);
+  if (!(-OFFSET_sJ <= offset && offset <= MAXARG_sJ - OFFSET_sJ))
+    luaX_syntaxerror(fs->ls, "control structure too long");
+  lua_assert(GET_OPCODE(*jmp) == OP_JMP);
+  SETARG_sJ(*jmp, offset);
+}
+
+
+/*
+** Concatenate jump-list 'l2' into jump-list 'l1'
+*/
+void luaK_concat (FuncState *fs, int *l1, int l2) {
+  if (l2 == NO_JUMP) return;  /* nothing to concatenate? */
+  else if (*l1 == NO_JUMP)  /* no original list? */
+    *l1 = l2;  /* 'l1' points to 'l2' */
+  else {
+    int list = *l1;
+    int next;
+    while ((next = getjump(fs, list)) != NO_JUMP)  /* find last element */
+      list = next;
+    fixjump(fs, list, l2);  /* last element links to 'l2' */
+  }
+}
+
+
+/*
+** Create a jump instruction and return its position, so its destination
+** can be fixed later (with 'fixjump').
+*/
+int luaK_jump (FuncState *fs) {
+  return codesJ(fs, OP_JMP, NO_JUMP, 0);
+}
+
+
+/*
+** Code a 'return' instruction
+*/
+void luaK_ret (FuncState *fs, int first, int nret) {
+  OpCode op;
+  switch (nret) {
+    case 0: op = OP_RETURN0; break;
+    case 1: op = OP_RETURN1; break;
+    default: op = OP_RETURN; break;
+  }
+  luaK_codeABC(fs, op, first, nret + 1, 0);
+}
+
+
+/*
+** Code a "conditional jump", that is, a test or comparison opcode
+** followed by a jump. Return jump position.
+*/
+static int condjump (FuncState *fs, OpCode op, int A, int B, int C, int k) {
+  luaK_codeABCk(fs, op, A, B, C, k);
+  return luaK_jump(fs);
+}
+
+
+/*
+** returns current 'pc' and marks it as a jump target (to avoid wrong
+** optimizations with consecutive instructions not in the same basic block).
+*/
+int luaK_getlabel (FuncState *fs) {
+  fs->lasttarget = fs->pc;
+  return fs->pc;
+}
+
+
+/*
+** Returns the position of the instruction "controlling" a given
+** jump (that is, its condition), or the jump itself if it is
+** unconditional.
+*/
+static Instruction *getjumpcontrol (FuncState *fs, int pc) {
+  Instruction *pi = &fs->f->code[pc];
+  if (pc >= 1 && testTMode(GET_OPCODE(*(pi-1))))
+    return pi-1;
+  else
+    return pi;
+}
+
+
+/*
+** Patch destination register for a TESTSET instruction.
+** If instruction in position 'node' is not a TESTSET, return 0 ("fails").
+** Otherwise, if 'reg' is not 'NO_REG', set it as the destination
+** register. Otherwise, change instruction to a simple 'TEST' (produces
+** no register value)
+*/
+static int patchtestreg (FuncState *fs, int node, int reg) {
+  Instruction *i = getjumpcontrol(fs, node);
+  if (GET_OPCODE(*i) != OP_TESTSET)
+    return 0;  /* cannot patch other instructions */
+  if (reg != NO_REG && reg != GETARG_B(*i))
+    SETARG_A(*i, reg);
+  else {
+     /* no register to put value or register already has the value;
+        change instruction to simple test */
+    *i = CREATE_ABCk(OP_TEST, GETARG_B(*i), 0, 0, GETARG_k(*i));
+  }
+  return 1;
+}
+
+
+/*
+** Traverse a list of tests ensuring no one produces a value
+*/
+static void removevalues (FuncState *fs, int list) {
+  for (; list != NO_JUMP; list = getjump(fs, list))
+      patchtestreg(fs, list, NO_REG);
+}
+
+
+/*
+** Traverse a list of tests, patching their destination address and
+** registers: tests producing values jump to 'vtarget' (and put their
+** values in 'reg'), other tests jump to 'dtarget'.
+*/
+static void patchlistaux (FuncState *fs, int list, int vtarget, int reg,
+                          int dtarget) {
+  while (list != NO_JUMP) {
+    int next = getjump(fs, list);
+    if (patchtestreg(fs, list, reg))
+      fixjump(fs, list, vtarget);
+    else
+      fixjump(fs, list, dtarget);  /* jump to default target */
+    list = next;
+  }
+}
+
+
+/*
+** Path all jumps in 'list' to jump to 'target'.
+** (The assert means that we cannot fix a jump to a forward address
+** because we only know addresses once code is generated.)
+*/
+void luaK_patchlist (FuncState *fs, int list, int target) {
+  lua_assert(target <= fs->pc);
+  patchlistaux(fs, list, target, NO_REG, target);
+}
+
+
+void luaK_patchtohere (FuncState *fs, int list) {
+  int hr = luaK_getlabel(fs);  /* mark "here" as a jump target */
+  luaK_patchlist(fs, list, hr);
+}
+
+
+/* limit for difference between lines in relative line info. */
+#define LIMLINEDIFF	0x80
+
+
+/*
+** Save line info for a new instruction. If difference from last line
+** does not fit in a byte, of after that many instructions, save a new
+** absolute line info; (in that case, the special value 'ABSLINEINFO'
+** in 'lineinfo' signals the existence of this absolute information.)
+** Otherwise, store the difference from last line in 'lineinfo'.
+*/
+static void savelineinfo (FuncState *fs, Proto *f, int line) {
+  int linedif = line - fs->previousline;
+  int pc = fs->pc - 1;  /* last instruction coded */
+  if (abs(linedif) >= LIMLINEDIFF || fs->iwthabs++ >= MAXIWTHABS) {
+    luaM_growvector(fs->ls->L, f->abslineinfo, fs->nabslineinfo,
+                    f->sizeabslineinfo, AbsLineInfo, MAX_INT, "lines");
+    f->abslineinfo[fs->nabslineinfo].pc = pc;
+    f->abslineinfo[fs->nabslineinfo++].line = line;
+    linedif = ABSLINEINFO;  /* signal that there is absolute information */
+    fs->iwthabs = 1;  /* restart counter */
+  }
+  luaM_growvector(fs->ls->L, f->lineinfo, pc, f->sizelineinfo, ls_byte,
+                  MAX_INT, "opcodes");
+  f->lineinfo[pc] = linedif;
+  fs->previousline = line;  /* last line saved */
+}
+
+
+/*
+** Remove line information from the last instruction.
+** If line information for that instruction is absolute, set 'iwthabs'
+** above its max to force the new (replacing) instruction to have
+** absolute line info, too.
+*/
+static void removelastlineinfo (FuncState *fs) {
+  Proto *f = fs->f;
+  int pc = fs->pc - 1;  /* last instruction coded */
+  if (f->lineinfo[pc] != ABSLINEINFO) {  /* relative line info? */
+    fs->previousline -= f->lineinfo[pc];  /* correct last line saved */
+    fs->iwthabs--;  /* undo previous increment */
+  }
+  else {  /* absolute line information */
+    lua_assert(f->abslineinfo[fs->nabslineinfo - 1].pc == pc);
+    fs->nabslineinfo--;  /* remove it */
+    fs->iwthabs = MAXIWTHABS + 1;  /* force next line info to be absolute */
+  }
+}
+
+
+/*
+** Remove the last instruction created, correcting line information
+** accordingly.
+*/
+static void removelastinstruction (FuncState *fs) {
+  removelastlineinfo(fs);
+  fs->pc--;
+}
+
+
+/*
+** Emit instruction 'i', checking for array sizes and saving also its
+** line information. Return 'i' position.
+*/
+int luaK_code (FuncState *fs, Instruction i) {
+  Proto *f = fs->f;
+  /* put new instruction in code array */
+  luaM_growvector(fs->ls->L, f->code, fs->pc, f->sizecode, Instruction,
+                  MAX_INT, "opcodes");
+  f->code[fs->pc++] = i;
+  savelineinfo(fs, f, fs->ls->lastline);
+  return fs->pc - 1;  /* index of new instruction */
+}
+
+
+/*
+** Format and emit an 'iABC' instruction. (Assertions check consistency
+** of parameters versus opcode.)
+*/
+int luaK_codeABCk (FuncState *fs, OpCode o, int a, int b, int c, int k) {
+  lua_assert(getOpMode(o) == iABC);
+  lua_assert(a <= MAXARG_A && b <= MAXARG_B &&
+             c <= MAXARG_C && (k & ~1) == 0);
+  return luaK_code(fs, CREATE_ABCk(o, a, b, c, k));
+}
+
+
+/*
+** Format and emit an 'iABx' instruction.
+*/
+int luaK_codeABx (FuncState *fs, OpCode o, int a, unsigned int bc) {
+  lua_assert(getOpMode(o) == iABx);
+  lua_assert(a <= MAXARG_A && bc <= MAXARG_Bx);
+  return luaK_code(fs, CREATE_ABx(o, a, bc));
+}
+
+
+/*
+** Format and emit an 'iAsBx' instruction.
+*/
+int luaK_codeAsBx (FuncState *fs, OpCode o, int a, int bc) {
+  unsigned int b = bc + OFFSET_sBx;
+  lua_assert(getOpMode(o) == iAsBx);
+  lua_assert(a <= MAXARG_A && b <= MAXARG_Bx);
+  return luaK_code(fs, CREATE_ABx(o, a, b));
+}
+
+
+/*
+** Format and emit an 'isJ' instruction.
+*/
+static int codesJ (FuncState *fs, OpCode o, int sj, int k) {
+  unsigned int j = sj + OFFSET_sJ;
+  lua_assert(getOpMode(o) == isJ);
+  lua_assert(j <= MAXARG_sJ && (k & ~1) == 0);
+  return luaK_code(fs, CREATE_sJ(o, j, k));
+}
+
+
+/*
+** Emit an "extra argument" instruction (format 'iAx')
+*/
+static int codeextraarg (FuncState *fs, int a) {
+  lua_assert(a <= MAXARG_Ax);
+  return luaK_code(fs, CREATE_Ax(OP_EXTRAARG, a));
+}
+
+
+/*
+** Emit a "load constant" instruction, using either 'OP_LOADK'
+** (if constant index 'k' fits in 18 bits) or an 'OP_LOADKX'
+** instruction with "extra argument".
+*/
+static int luaK_codek (FuncState *fs, int reg, int k) {
+  if (k <= MAXARG_Bx)
+    return luaK_codeABx(fs, OP_LOADK, reg, k);
+  else {
+    int p = luaK_codeABx(fs, OP_LOADKX, reg, 0);
+    codeextraarg(fs, k);
+    return p;
+  }
+}
+
+
+/*
+** Check register-stack level, keeping track of its maximum size
+** in field 'maxstacksize'
+*/
+void luaK_checkstack (FuncState *fs, int n) {
+  int newstack = fs->freereg + n;
+  if (newstack > fs->f->maxstacksize) {
+    if (newstack >= MAXREGS)
+      luaX_syntaxerror(fs->ls,
+        "function or expression needs too many registers");
+    fs->f->maxstacksize = cast_byte(newstack);
+  }
+}
+
+
+/*
+** Reserve 'n' registers in register stack
+*/
+void luaK_reserveregs (FuncState *fs, int n) {
+  luaK_checkstack(fs, n);
+  fs->freereg += n;
+}
+
+
+/*
+** Free register 'reg', if it is neither a constant index nor
+** a local variable.
+)
+*/
+static void freereg (FuncState *fs, int reg) {
+  if (reg >= luaY_nvarstack(fs)) {
+    fs->freereg--;
+    lua_assert(reg == fs->freereg);
+  }
+}
+
+
+/*
+** Free two registers in proper order
+*/
+static void freeregs (FuncState *fs, int r1, int r2) {
+  if (r1 > r2) {
+    freereg(fs, r1);
+    freereg(fs, r2);
+  }
+  else {
+    freereg(fs, r2);
+    freereg(fs, r1);
+  }
+}
+
+
+/*
+** Free register used by expression 'e' (if any)
+*/
+static void freeexp (FuncState *fs, expdesc *e) {
+  if (e->k == VNONRELOC)
+    freereg(fs, e->u.info);
+}
+
+
+/*
+** Free registers used by expressions 'e1' and 'e2' (if any) in proper
+** order.
+*/
+static void freeexps (FuncState *fs, expdesc *e1, expdesc *e2) {
+  int r1 = (e1->k == VNONRELOC) ? e1->u.info : -1;
+  int r2 = (e2->k == VNONRELOC) ? e2->u.info : -1;
+  freeregs(fs, r1, r2);
+}
+
+
+/*
+** Add constant 'v' to prototype's list of constants (field 'k').
+** Use scanner's table to cache position of constants in constant list
+** and try to reuse constants. Because some values should not be used
+** as keys (nil cannot be a key, integer keys can collapse with float
+** keys), the caller must provide a useful 'key' for indexing the cache.
+** Note that all functions share the same table, so entering or exiting
+** a function can make some indices wrong.
+*/
+static int addk (FuncState *fs, TValue *key, TValue *v) {
+  TValue val;
+  lua_State *L = fs->ls->L;
+  Proto *f = fs->f;
+  const TValue *idx = luaH_get(fs->ls->h, key);  /* query scanner table */
+  int k, oldsize;
+  if (ttisinteger(idx)) {  /* is there an index there? */
+    k = cast_int(ivalue(idx));
+    /* correct value? (warning: must distinguish floats from integers!) */
+    if (k < fs->nk && ttypetag(&f->k[k]) == ttypetag(v) &&
+                      luaV_rawequalobj(&f->k[k], v))
+      return k;  /* reuse index */
+  }
+  /* constant not found; create a new entry */
+  oldsize = f->sizek;
+  k = fs->nk;
+  /* numerical value does not need GC barrier;
+     table has no metatable, so it does not need to invalidate cache */
+  setivalue(&val, k);
+  luaH_finishset(L, fs->ls->h, key, idx, &val);
+  luaM_growvector(L, f->k, k, f->sizek, TValue, MAXARG_Ax, "constants");
+  while (oldsize < f->sizek) setnilvalue(&f->k[oldsize++]);
+  setobj(L, &f->k[k], v);
+  fs->nk++;
+  luaC_barrier(L, f, v);
+  return k;
+}
+
+
+/*
+** Add a string to list of constants and return its index.
+*/
+static int stringK (FuncState *fs, TString *s) {
+  TValue o;
+  setsvalue(fs->ls->L, &o, s);
+  return addk(fs, &o, &o);  /* use string itself as key */
+}
+
+
+/*
+** Add an integer to list of constants and return its index.
+*/
+static int luaK_intK (FuncState *fs, lua_Integer n) {
+  TValue o;
+  setivalue(&o, n);
+  return addk(fs, &o, &o);  /* use integer itself as key */
+}
+
+/*
+** Add a float to list of constants and return its index. Floats
+** with integral values need a different key, to avoid collision
+** with actual integers. To that, we add to the number its smaller
+** power-of-two fraction that is still significant in its scale.
+** For doubles, that would be 1/2^52.
+** (This method is not bulletproof: there may be another float
+** with that value, and for floats larger than 2^53 the result is
+** still an integer. At worst, this only wastes an entry with
+** a duplicate.)
+*/
+static int luaK_numberK (FuncState *fs, lua_Number r) {
+  TValue o;
+  lua_Integer ik;
+  setfltvalue(&o, r);
+  if (!luaV_flttointeger(r, &ik, F2Ieq))  /* not an integral value? */
+    return addk(fs, &o, &o);  /* use number itself as key */
+  else {  /* must build an alternative key */
+    const int nbm = l_floatatt(MANT_DIG);
+    const lua_Number q = l_mathop(ldexp)(l_mathop(1.0), -nbm + 1);
+    const lua_Number k = (ik == 0) ? q : r + r*q;  /* new key */
+    TValue kv;
+    setfltvalue(&kv, k);
+    /* result is not an integral value, unless value is too large */
+    lua_assert(!luaV_flttointeger(k, &ik, F2Ieq) ||
+                l_mathop(fabs)(r) >= l_mathop(1e6));
+    return addk(fs, &kv, &o);
+  }
+}
+
+
+/*
+** Add a false to list of constants and return its index.
+*/
+static int boolF (FuncState *fs) {
+  TValue o;
+  setbfvalue(&o);
+  return addk(fs, &o, &o);  /* use boolean itself as key */
+}
+
+
+/*
+** Add a true to list of constants and return its index.
+*/
+static int boolT (FuncState *fs) {
+  TValue o;
+  setbtvalue(&o);
+  return addk(fs, &o, &o);  /* use boolean itself as key */
+}
+
+
+/*
+** Add nil to list of constants and return its index.
+*/
+static int nilK (FuncState *fs) {
+  TValue k, v;
+  setnilvalue(&v);
+  /* cannot use nil as key; instead use table itself to represent nil */
+  sethvalue(fs->ls->L, &k, fs->ls->h);
+  return addk(fs, &k, &v);
+}
+
+
+/*
+** Check whether 'i' can be stored in an 'sC' operand. Equivalent to
+** (0 <= int2sC(i) && int2sC(i) <= MAXARG_C) but without risk of
+** overflows in the hidden addition inside 'int2sC'.
+*/
+static int fitsC (lua_Integer i) {
+  return (l_castS2U(i) + OFFSET_sC <= cast_uint(MAXARG_C));
+}
+
+
+/*
+** Check whether 'i' can be stored in an 'sBx' operand.
+*/
+static int fitsBx (lua_Integer i) {
+  return (-OFFSET_sBx <= i && i <= MAXARG_Bx - OFFSET_sBx);
+}
+
+
+void luaK_int (FuncState *fs, int reg, lua_Integer i) {
+  if (fitsBx(i))
+    luaK_codeAsBx(fs, OP_LOADI, reg, cast_int(i));
+  else
+    luaK_codek(fs, reg, luaK_intK(fs, i));
+}
+
+
+static void luaK_float (FuncState *fs, int reg, lua_Number f) {
+  lua_Integer fi;
+  if (luaV_flttointeger(f, &fi, F2Ieq) && fitsBx(fi))
+    luaK_codeAsBx(fs, OP_LOADF, reg, cast_int(fi));
+  else
+    luaK_codek(fs, reg, luaK_numberK(fs, f));
+}
+
+
+/*
+** Convert a constant in 'v' into an expression description 'e'
+*/
+static void const2exp (TValue *v, expdesc *e) {
+  switch (ttypetag(v)) {
+    case LUA_VNUMINT:
+      e->k = VKINT; e->u.ival = ivalue(v);
+      break;
+    case LUA_VNUMFLT:
+      e->k = VKFLT; e->u.nval = fltvalue(v);
+      break;
+    case LUA_VFALSE:
+      e->k = VFALSE;
+      break;
+    case LUA_VTRUE:
+      e->k = VTRUE;
+      break;
+    case LUA_VNIL:
+      e->k = VNIL;
+      break;
+    case LUA_VSHRSTR:  case LUA_VLNGSTR:
+      e->k = VKSTR; e->u.strval = tsvalue(v);
+      break;
+    default: lua_assert(0);
+  }
+}
+
+
+/*
+** Fix an expression to return the number of results 'nresults'.
+** 'e' must be a multi-ret expression (function call or vararg).
+*/
+void luaK_setreturns (FuncState *fs, expdesc *e, int nresults) {
+  Instruction *pc = &getinstruction(fs, e);
+  if (e->k == VCALL)  /* expression is an open function call? */
+    SETARG_C(*pc, nresults + 1);
+  else {
+    lua_assert(e->k == VVARARG);
+    SETARG_C(*pc, nresults + 1);
+    SETARG_A(*pc, fs->freereg);
+    luaK_reserveregs(fs, 1);
+  }
+}
+
+
+/*
+** Convert a VKSTR to a VK
+*/
+static void str2K (FuncState *fs, expdesc *e) {
+  lua_assert(e->k == VKSTR);
+  e->u.info = stringK(fs, e->u.strval);
+  e->k = VK;
+}
+
+
+/*
+** Fix an expression to return one result.
+** If expression is not a multi-ret expression (function call or
+** vararg), it already returns one result, so nothing needs to be done.
+** Function calls become VNONRELOC expressions (as its result comes
+** fixed in the base register of the call), while vararg expressions
+** become VRELOC (as OP_VARARG puts its results where it wants).
+** (Calls are created returning one result, so that does not need
+** to be fixed.)
+*/
+void luaK_setoneret (FuncState *fs, expdesc *e) {
+  if (e->k == VCALL) {  /* expression is an open function call? */
+    /* already returns 1 value */
+    lua_assert(GETARG_C(getinstruction(fs, e)) == 2);
+    e->k = VNONRELOC;  /* result has fixed position */
+    e->u.info = GETARG_A(getinstruction(fs, e));
+  }
+  else if (e->k == VVARARG) {
+    SETARG_C(getinstruction(fs, e), 2);
+    e->k = VRELOC;  /* can relocate its simple result */
+  }
+}
+
+
+/*
+** Ensure that expression 'e' is not a variable (nor a <const>).
+** (Expression still may have jump lists.)
+*/
+void luaK_dischargevars (FuncState *fs, expdesc *e) {
+  switch (e->k) {
+    case VCONST: {
+      const2exp(const2val(fs, e), e);
+      break;
+    }
+    case VLOCAL: {  /* already in a register */
+      e->u.info = e->u.var.ridx;
+      e->k = VNONRELOC;  /* becomes a non-relocatable value */
+      break;
+    }
+    case VUPVAL: {  /* move value to some (pending) register */
+      e->u.info = luaK_codeABC(fs, OP_GETUPVAL, 0, e->u.info, 0);
+      e->k = VRELOC;
+      break;
+    }
+    case VINDEXUP: {
+      e->u.info = luaK_codeABC(fs, OP_GETTABUP, 0, e->u.ind.t, e->u.ind.idx);
+      e->k = VRELOC;
+      break;
+    }
+    case VINDEXI: {
+      freereg(fs, e->u.ind.t);
+      e->u.info = luaK_codeABC(fs, OP_GETI, 0, e->u.ind.t, e->u.ind.idx);
+      e->k = VRELOC;
+      break;
+    }
+    case VINDEXSTR: {
+      freereg(fs, e->u.ind.t);
+      e->u.info = luaK_codeABC(fs, OP_GETFIELD, 0, e->u.ind.t, e->u.ind.idx);
+      e->k = VRELOC;
+      break;
+    }
+    case VINDEXED: {
+      freeregs(fs, e->u.ind.t, e->u.ind.idx);
+      e->u.info = luaK_codeABC(fs, OP_GETTABLE, 0, e->u.ind.t, e->u.ind.idx);
+      e->k = VRELOC;
+      break;
+    }
+    case VVARARG: case VCALL: {
+      luaK_setoneret(fs, e);
+      break;
+    }
+    default: break;  /* there is one value available (somewhere) */
+  }
+}
+
+
+/*
+** Ensure expression value is in register 'reg', making 'e' a
+** non-relocatable expression.
+** (Expression still may have jump lists.)
+*/
+static void discharge2reg (FuncState *fs, expdesc *e, int reg) {
+  luaK_dischargevars(fs, e);
+  switch (e->k) {
+    case VNIL: {
+      luaK_nil(fs, reg, 1);
+      break;
+    }
+    case VFALSE: {
+      luaK_codeABC(fs, OP_LOADFALSE, reg, 0, 0);
+      break;
+    }
+    case VTRUE: {
+      luaK_codeABC(fs, OP_LOADTRUE, reg, 0, 0);
+      break;
+    }
+    case VKSTR: {
+      str2K(fs, e);
+    }  /* FALLTHROUGH */
+    case VK: {
+      luaK_codek(fs, reg, e->u.info);
+      break;
+    }
+    case VKFLT: {
+      luaK_float(fs, reg, e->u.nval);
+      break;
+    }
+    case VKINT: {
+      luaK_int(fs, reg, e->u.ival);
+      break;
+    }
+    case VRELOC: {
+      Instruction *pc = &getinstruction(fs, e);
+      SETARG_A(*pc, reg);  /* instruction will put result in 'reg' */
+      break;
+    }
+    case VNONRELOC: {
+      if (reg != e->u.info)
+        luaK_codeABC(fs, OP_MOVE, reg, e->u.info, 0);
+      break;
+    }
+    default: {
+      lua_assert(e->k == VJMP);
+      return;  /* nothing to do... */
+    }
+  }
+  e->u.info = reg;
+  e->k = VNONRELOC;
+}
+
+
+/*
+** Ensure expression value is in a register, making 'e' a
+** non-relocatable expression.
+** (Expression still may have jump lists.)
+*/
+static void discharge2anyreg (FuncState *fs, expdesc *e) {
+  if (e->k != VNONRELOC) {  /* no fixed register yet? */
+    luaK_reserveregs(fs, 1);  /* get a register */
+    discharge2reg(fs, e, fs->freereg-1);  /* put value there */
+  }
+}
+
+
+static int code_loadbool (FuncState *fs, int A, OpCode op) {
+  luaK_getlabel(fs);  /* those instructions may be jump targets */
+  return luaK_codeABC(fs, op, A, 0, 0);
+}
+
+
+/*
+** check whether list has any jump that do not produce a value
+** or produce an inverted value
+*/
+static int need_value (FuncState *fs, int list) {
+  for (; list != NO_JUMP; list = getjump(fs, list)) {
+    Instruction i = *getjumpcontrol(fs, list);
+    if (GET_OPCODE(i) != OP_TESTSET) return 1;
+  }
+  return 0;  /* not found */
+}
+
+
+/*
+** Ensures final expression result (which includes results from its
+** jump lists) is in register 'reg'.
+** If expression has jumps, need to patch these jumps either to
+** its final position or to "load" instructions (for those tests
+** that do not produce values).
+*/
+static void exp2reg (FuncState *fs, expdesc *e, int reg) {
+  discharge2reg(fs, e, reg);
+  if (e->k == VJMP)  /* expression itself is a test? */
+    luaK_concat(fs, &e->t, e->u.info);  /* put this jump in 't' list */
+  if (hasjumps(e)) {
+    int final;  /* position after whole expression */
+    int p_f = NO_JUMP;  /* position of an eventual LOAD false */
+    int p_t = NO_JUMP;  /* position of an eventual LOAD true */
+    if (need_value(fs, e->t) || need_value(fs, e->f)) {
+      int fj = (e->k == VJMP) ? NO_JUMP : luaK_jump(fs);
+      p_f = code_loadbool(fs, reg, OP_LFALSESKIP);  /* skip next inst. */
+      p_t = code_loadbool(fs, reg, OP_LOADTRUE);
+      /* jump around these booleans if 'e' is not a test */
+      luaK_patchtohere(fs, fj);
+    }
+    final = luaK_getlabel(fs);
+    patchlistaux(fs, e->f, final, reg, p_f);
+    patchlistaux(fs, e->t, final, reg, p_t);
+  }
+  e->f = e->t = NO_JUMP;
+  e->u.info = reg;
+  e->k = VNONRELOC;
+}
+
+
+/*
+** Ensures final expression result is in next available register.
+*/
+void luaK_exp2nextreg (FuncState *fs, expdesc *e) {
+  luaK_dischargevars(fs, e);
+  freeexp(fs, e);
+  luaK_reserveregs(fs, 1);
+  exp2reg(fs, e, fs->freereg - 1);
+}
+
+
+/*
+** Ensures final expression result is in some (any) register
+** and return that register.
+*/
+int luaK_exp2anyreg (FuncState *fs, expdesc *e) {
+  luaK_dischargevars(fs, e);
+  if (e->k == VNONRELOC) {  /* expression already has a register? */
+    if (!hasjumps(e))  /* no jumps? */
+      return e->u.info;  /* result is already in a register */
+    if (e->u.info >= luaY_nvarstack(fs)) {  /* reg. is not a local? */
+      exp2reg(fs, e, e->u.info);  /* put final result in it */
+      return e->u.info;
+    }
+    /* else expression has jumps and cannot change its register
+       to hold the jump values, because it is a local variable.
+       Go through to the default case. */
+  }
+  luaK_exp2nextreg(fs, e);  /* default: use next available register */
+  return e->u.info;
+}
+
+
+/*
+** Ensures final expression result is either in a register
+** or in an upvalue.
+*/
+void luaK_exp2anyregup (FuncState *fs, expdesc *e) {
+  if (e->k != VUPVAL || hasjumps(e))
+    luaK_exp2anyreg(fs, e);
+}
+
+
+/*
+** Ensures final expression result is either in a register
+** or it is a constant.
+*/
+void luaK_exp2val (FuncState *fs, expdesc *e) {
+  if (hasjumps(e))
+    luaK_exp2anyreg(fs, e);
+  else
+    luaK_dischargevars(fs, e);
+}
+
+
+/*
+** Try to make 'e' a K expression with an index in the range of R/K
+** indices. Return true iff succeeded.
+*/
+static int luaK_exp2K (FuncState *fs, expdesc *e) {
+  if (!hasjumps(e)) {
+    int info;
+    switch (e->k) {  /* move constants to 'k' */
+      case VTRUE: info = boolT(fs); break;
+      case VFALSE: info = boolF(fs); break;
+      case VNIL: info = nilK(fs); break;
+      case VKINT: info = luaK_intK(fs, e->u.ival); break;
+      case VKFLT: info = luaK_numberK(fs, e->u.nval); break;
+      case VKSTR: info = stringK(fs, e->u.strval); break;
+      case VK: info = e->u.info; break;
+      default: return 0;  /* not a constant */
+    }
+    if (info <= MAXINDEXRK) {  /* does constant fit in 'argC'? */
+      e->k = VK;  /* make expression a 'K' expression */
+      e->u.info = info;
+      return 1;
+    }
+  }
+  /* else, expression doesn't fit; leave it unchanged */
+  return 0;
+}
+
+
+/*
+** Ensures final expression result is in a valid R/K index
+** (that is, it is either in a register or in 'k' with an index
+** in the range of R/K indices).
+** Returns 1 iff expression is K.
+*/
+int luaK_exp2RK (FuncState *fs, expdesc *e) {
+  if (luaK_exp2K(fs, e))
+    return 1;
+  else {  /* not a constant in the right range: put it in a register */
+    luaK_exp2anyreg(fs, e);
+    return 0;
+  }
+}
+
+
+static void codeABRK (FuncState *fs, OpCode o, int a, int b,
+                      expdesc *ec) {
+  int k = luaK_exp2RK(fs, ec);
+  luaK_codeABCk(fs, o, a, b, ec->u.info, k);
+}
+
+
+/*
+** Generate code to store result of expression 'ex' into variable 'var'.
+*/
+void luaK_storevar (FuncState *fs, expdesc *var, expdesc *ex) {
+  switch (var->k) {
+    case VLOCAL: {
+      freeexp(fs, ex);
+      exp2reg(fs, ex, var->u.var.ridx);  /* compute 'ex' into proper place */
+      return;
+    }
+    case VUPVAL: {
+      int e = luaK_exp2anyreg(fs, ex);
+      luaK_codeABC(fs, OP_SETUPVAL, e, var->u.info, 0);
+      break;
+    }
+    case VINDEXUP: {
+      codeABRK(fs, OP_SETTABUP, var->u.ind.t, var->u.ind.idx, ex);
+      break;
+    }
+    case VINDEXI: {
+      codeABRK(fs, OP_SETI, var->u.ind.t, var->u.ind.idx, ex);
+      break;
+    }
+    case VINDEXSTR: {
+      codeABRK(fs, OP_SETFIELD, var->u.ind.t, var->u.ind.idx, ex);
+      break;
+    }
+    case VINDEXED: {
+      codeABRK(fs, OP_SETTABLE, var->u.ind.t, var->u.ind.idx, ex);
+      break;
+    }
+    default: lua_assert(0);  /* invalid var kind to store */
+  }
+  freeexp(fs, ex);
+}
+
+
+/*
+** Emit SELF instruction (convert expression 'e' into 'e:key(e,').
+*/
+void luaK_self (FuncState *fs, expdesc *e, expdesc *key) {
+  int ereg;
+  luaK_exp2anyreg(fs, e);
+  ereg = e->u.info;  /* register where 'e' was placed */
+  freeexp(fs, e);
+  e->u.info = fs->freereg;  /* base register for op_self */
+  e->k = VNONRELOC;  /* self expression has a fixed register */
+  luaK_reserveregs(fs, 2);  /* function and 'self' produced by op_self */
+  codeABRK(fs, OP_SELF, e->u.info, ereg, key);
+  freeexp(fs, key);
+}
+
+
+/*
+** Negate condition 'e' (where 'e' is a comparison).
+*/
+static void negatecondition (FuncState *fs, expdesc *e) {
+  Instruction *pc = getjumpcontrol(fs, e->u.info);
+  lua_assert(testTMode(GET_OPCODE(*pc)) && GET_OPCODE(*pc) != OP_TESTSET &&
+                                           GET_OPCODE(*pc) != OP_TEST);
+  SETARG_k(*pc, (GETARG_k(*pc) ^ 1));
+}
+
+
+/*
+** Emit instruction to jump if 'e' is 'cond' (that is, if 'cond'
+** is true, code will jump if 'e' is true.) Return jump position.
+** Optimize when 'e' is 'not' something, inverting the condition
+** and removing the 'not'.
+*/
+static int jumponcond (FuncState *fs, expdesc *e, int cond) {
+  if (e->k == VRELOC) {
+    Instruction ie = getinstruction(fs, e);
+    if (GET_OPCODE(ie) == OP_NOT) {
+      removelastinstruction(fs);  /* remove previous OP_NOT */
+      return condjump(fs, OP_TEST, GETARG_B(ie), 0, 0, !cond);
+    }
+    /* else go through */
+  }
+  discharge2anyreg(fs, e);
+  freeexp(fs, e);
+  return condjump(fs, OP_TESTSET, NO_REG, e->u.info, 0, cond);
+}
+
+
+/*
+** Emit code to go through if 'e' is true, jump otherwise.
+*/
+void luaK_goiftrue (FuncState *fs, expdesc *e) {
+  int pc;  /* pc of new jump */
+  luaK_dischargevars(fs, e);
+  switch (e->k) {
+    case VJMP: {  /* condition? */
+      negatecondition(fs, e);  /* jump when it is false */
+      pc = e->u.info;  /* save jump position */
+      break;
+    }
+    case VK: case VKFLT: case VKINT: case VKSTR: case VTRUE: {
+      pc = NO_JUMP;  /* always true; do nothing */
+      break;
+    }
+    default: {
+      pc = jumponcond(fs, e, 0);  /* jump when false */
+      break;
+    }
+  }
+  luaK_concat(fs, &e->f, pc);  /* insert new jump in false list */
+  luaK_patchtohere(fs, e->t);  /* true list jumps to here (to go through) */
+  e->t = NO_JUMP;
+}
+
+
+/*
+** Emit code to go through if 'e' is false, jump otherwise.
+*/
+void luaK_goiffalse (FuncState *fs, expdesc *e) {
+  int pc;  /* pc of new jump */
+  luaK_dischargevars(fs, e);
+  switch (e->k) {
+    case VJMP: {
+      pc = e->u.info;  /* already jump if true */
+      break;
+    }
+    case VNIL: case VFALSE: {
+      pc = NO_JUMP;  /* always false; do nothing */
+      break;
+    }
+    default: {
+      pc = jumponcond(fs, e, 1);  /* jump if true */
+      break;
+    }
+  }
+  luaK_concat(fs, &e->t, pc);  /* insert new jump in 't' list */
+  luaK_patchtohere(fs, e->f);  /* false list jumps to here (to go through) */
+  e->f = NO_JUMP;
+}
+
+
+/*
+** Code 'not e', doing constant folding.
+*/
+static void codenot (FuncState *fs, expdesc *e) {
+  switch (e->k) {
+    case VNIL: case VFALSE: {
+      e->k = VTRUE;  /* true == not nil == not false */
+      break;
+    }
+    case VK: case VKFLT: case VKINT: case VKSTR: case VTRUE: {
+      e->k = VFALSE;  /* false == not "x" == not 0.5 == not 1 == not true */
+      break;
+    }
+    case VJMP: {
+      negatecondition(fs, e);
+      break;
+    }
+    case VRELOC:
+    case VNONRELOC: {
+      discharge2anyreg(fs, e);
+      freeexp(fs, e);
+      e->u.info = luaK_codeABC(fs, OP_NOT, 0, e->u.info, 0);
+      e->k = VRELOC;
+      break;
+    }
+    default: lua_assert(0);  /* cannot happen */
+  }
+  /* interchange true and false lists */
+  { int temp = e->f; e->f = e->t; e->t = temp; }
+  removevalues(fs, e->f);  /* values are useless when negated */
+  removevalues(fs, e->t);
+}
+
+
+/*
+** Check whether expression 'e' is a small literal string
+*/
+static int isKstr (FuncState *fs, expdesc *e) {
+  return (e->k == VK && !hasjumps(e) && e->u.info <= MAXARG_B &&
+          ttisshrstring(&fs->f->k[e->u.info]));
+}
+
+/*
+** Check whether expression 'e' is a literal integer.
+*/
+int luaK_isKint (expdesc *e) {
+  return (e->k == VKINT && !hasjumps(e));
+}
+
+
+/*
+** Check whether expression 'e' is a literal integer in
+** proper range to fit in register C
+*/
+static int isCint (expdesc *e) {
+  return luaK_isKint(e) && (l_castS2U(e->u.ival) <= l_castS2U(MAXARG_C));
+}
+
+
+/*
+** Check whether expression 'e' is a literal integer in
+** proper range to fit in register sC
+*/
+static int isSCint (expdesc *e) {
+  return luaK_isKint(e) && fitsC(e->u.ival);
+}
+
+
+/*
+** Check whether expression 'e' is a literal integer or float in
+** proper range to fit in a register (sB or sC).
+*/
+static int isSCnumber (expdesc *e, int *pi, int *isfloat) {
+  lua_Integer i;
+  if (e->k == VKINT)
+    i = e->u.ival;
+  else if (e->k == VKFLT && luaV_flttointeger(e->u.nval, &i, F2Ieq))
+    *isfloat = 1;
+  else
+    return 0;  /* not a number */
+  if (!hasjumps(e) && fitsC(i)) {
+    *pi = int2sC(cast_int(i));
+    return 1;
+  }
+  else
+    return 0;
+}
+
+
+/*
+** Create expression 't[k]'. 't' must have its final result already in a
+** register or upvalue. Upvalues can only be indexed by literal strings.
+** Keys can be literal strings in the constant table or arbitrary
+** values in registers.
+*/
+void luaK_indexed (FuncState *fs, expdesc *t, expdesc *k) {
+  if (k->k == VKSTR)
+    str2K(fs, k);
+  lua_assert(!hasjumps(t) &&
+             (t->k == VLOCAL || t->k == VNONRELOC || t->k == VUPVAL));
+  if (t->k == VUPVAL && !isKstr(fs, k))  /* upvalue indexed by non 'Kstr'? */
+    luaK_exp2anyreg(fs, t);  /* put it in a register */
+  if (t->k == VUPVAL) {
+    t->u.ind.t = t->u.info;  /* upvalue index */
+    t->u.ind.idx = k->u.info;  /* literal string */
+    t->k = VINDEXUP;
+  }
+  else {
+    /* register index of the table */
+    t->u.ind.t = (t->k == VLOCAL) ? t->u.var.ridx: t->u.info;
+    if (isKstr(fs, k)) {
+      t->u.ind.idx = k->u.info;  /* literal string */
+      t->k = VINDEXSTR;
+    }
+    else if (isCint(k)) {
+      t->u.ind.idx = cast_int(k->u.ival);  /* int. constant in proper range */
+      t->k = VINDEXI;
+    }
+    else {
+      t->u.ind.idx = luaK_exp2anyreg(fs, k);  /* register */
+      t->k = VINDEXED;
+    }
+  }
+}
+
+
+/*
+** Return false if folding can raise an error.
+** Bitwise operations need operands convertible to integers; division
+** operations cannot have 0 as divisor.
+*/
+static int validop (int op, TValue *v1, TValue *v2) {
+  switch (op) {
+    case LUA_OPBAND: case LUA_OPBOR: case LUA_OPBXOR:
+    case LUA_OPSHL: case LUA_OPSHR: case LUA_OPBNOT: {  /* conversion errors */
+      lua_Integer i;
+      return (luaV_tointegerns(v1, &i, LUA_FLOORN2I) &&
+              luaV_tointegerns(v2, &i, LUA_FLOORN2I));
+    }
+    case LUA_OPDIV: case LUA_OPIDIV: case LUA_OPMOD:  /* division by 0 */
+      return (nvalue(v2) != 0);
+    default: return 1;  /* everything else is valid */
+  }
+}
+
+
+/*
+** Try to "constant-fold" an operation; return 1 iff successful.
+** (In this case, 'e1' has the final result.)
+*/
+static int constfolding (FuncState *fs, int op, expdesc *e1,
+                                        const expdesc *e2) {
+  TValue v1, v2, res;
+  if (!tonumeral(e1, &v1) || !tonumeral(e2, &v2) || !validop(op, &v1, &v2))
+    return 0;  /* non-numeric operands or not safe to fold */
+  luaO_rawarith(fs->ls->L, op, &v1, &v2, &res);  /* does operation */
+  if (ttisinteger(&res)) {
+    e1->k = VKINT;
+    e1->u.ival = ivalue(&res);
+  }
+  else {  /* folds neither NaN nor 0.0 (to avoid problems with -0.0) */
+    lua_Number n = fltvalue(&res);
+    if (luai_numisnan(n) || n == 0)
+      return 0;
+    e1->k = VKFLT;
+    e1->u.nval = n;
+  }
+  return 1;
+}
+
+
+/*
+** Convert a BinOpr to an OpCode  (ORDER OPR - ORDER OP)
+*/
+l_sinline OpCode binopr2op (BinOpr opr, BinOpr baser, OpCode base) {
+  lua_assert(baser <= opr &&
+            ((baser == OPR_ADD && opr <= OPR_SHR) ||
+             (baser == OPR_LT && opr <= OPR_LE)));
+  return cast(OpCode, (cast_int(opr) - cast_int(baser)) + cast_int(base));
+}
+
+
+/*
+** Convert a UnOpr to an OpCode  (ORDER OPR - ORDER OP)
+*/
+l_sinline OpCode unopr2op (UnOpr opr) {
+  return cast(OpCode, (cast_int(opr) - cast_int(OPR_MINUS)) +
+                                       cast_int(OP_UNM));
+}
+
+
+/*
+** Convert a BinOpr to a tag method  (ORDER OPR - ORDER TM)
+*/
+l_sinline TMS binopr2TM (BinOpr opr) {
+  lua_assert(OPR_ADD <= opr && opr <= OPR_SHR);
+  return cast(TMS, (cast_int(opr) - cast_int(OPR_ADD)) + cast_int(TM_ADD));
+}
+
+
+/*
+** Emit code for unary expressions that "produce values"
+** (everything but 'not').
+** Expression to produce final result will be encoded in 'e'.
+*/
+static void codeunexpval (FuncState *fs, OpCode op, expdesc *e, int line) {
+  int r = luaK_exp2anyreg(fs, e);  /* opcodes operate only on registers */
+  freeexp(fs, e);
+  e->u.info = luaK_codeABC(fs, op, 0, r, 0);  /* generate opcode */
+  e->k = VRELOC;  /* all those operations are relocatable */
+  luaK_fixline(fs, line);
+}
+
+
+/*
+** Emit code for binary expressions that "produce values"
+** (everything but logical operators 'and'/'or' and comparison
+** operators).
+** Expression to produce final result will be encoded in 'e1'.
+*/
+static void finishbinexpval (FuncState *fs, expdesc *e1, expdesc *e2,
+                             OpCode op, int v2, int flip, int line,
+                             OpCode mmop, TMS event) {
+  int v1 = luaK_exp2anyreg(fs, e1);
+  int pc = luaK_codeABCk(fs, op, 0, v1, v2, 0);
+  freeexps(fs, e1, e2);
+  e1->u.info = pc;
+  e1->k = VRELOC;  /* all those operations are relocatable */
+  luaK_fixline(fs, line);
+  luaK_codeABCk(fs, mmop, v1, v2, event, flip);  /* to call metamethod */
+  luaK_fixline(fs, line);
+}
+
+
+/*
+** Emit code for binary expressions that "produce values" over
+** two registers.
+*/
+static void codebinexpval (FuncState *fs, BinOpr opr,
+                           expdesc *e1, expdesc *e2, int line) {
+  OpCode op = binopr2op(opr, OPR_ADD, OP_ADD);
+  int v2 = luaK_exp2anyreg(fs, e2);  /* make sure 'e2' is in a register */
+  /* 'e1' must be already in a register or it is a constant */
+  lua_assert((VNIL <= e1->k && e1->k <= VKSTR) ||
+             e1->k == VNONRELOC || e1->k == VRELOC);
+  lua_assert(OP_ADD <= op && op <= OP_SHR);
+  finishbinexpval(fs, e1, e2, op, v2, 0, line, OP_MMBIN, binopr2TM(opr));
+}
+
+
+/*
+** Code binary operators with immediate operands.
+*/
+static void codebini (FuncState *fs, OpCode op,
+                       expdesc *e1, expdesc *e2, int flip, int line,
+                       TMS event) {
+  int v2 = int2sC(cast_int(e2->u.ival));  /* immediate operand */
+  lua_assert(e2->k == VKINT);
+  finishbinexpval(fs, e1, e2, op, v2, flip, line, OP_MMBINI, event);
+}
+
+
+/*
+** Code binary operators with K operand.
+*/
+static void codebinK (FuncState *fs, BinOpr opr,
+                      expdesc *e1, expdesc *e2, int flip, int line) {
+  TMS event = binopr2TM(opr);
+  int v2 = e2->u.info;  /* K index */
+  OpCode op = binopr2op(opr, OPR_ADD, OP_ADDK);
+  finishbinexpval(fs, e1, e2, op, v2, flip, line, OP_MMBINK, event);
+}
+
+
+/* Try to code a binary operator negating its second operand.
+** For the metamethod, 2nd operand must keep its original value.
+*/
+static int finishbinexpneg (FuncState *fs, expdesc *e1, expdesc *e2,
+                             OpCode op, int line, TMS event) {
+  if (!luaK_isKint(e2))
+    return 0;  /* not an integer constant */
+  else {
+    lua_Integer i2 = e2->u.ival;
+    if (!(fitsC(i2) && fitsC(-i2)))
+      return 0;  /* not in the proper range */
+    else {  /* operating a small integer constant */
+      int v2 = cast_int(i2);
+      finishbinexpval(fs, e1, e2, op, int2sC(-v2), 0, line, OP_MMBINI, event);
+      /* correct metamethod argument */
+      SETARG_B(fs->f->code[fs->pc - 1], int2sC(v2));
+      return 1;  /* successfully coded */
+    }
+  }
+}
+
+
+static void swapexps (expdesc *e1, expdesc *e2) {
+  expdesc temp = *e1; *e1 = *e2; *e2 = temp;  /* swap 'e1' and 'e2' */
+}
+
+
+/*
+** Code binary operators with no constant operand.
+*/
+static void codebinNoK (FuncState *fs, BinOpr opr,
+                        expdesc *e1, expdesc *e2, int flip, int line) {
+  if (flip)
+    swapexps(e1, e2);  /* back to original order */
+  codebinexpval(fs, opr, e1, e2, line);  /* use standard operators */
+}
+
+
+/*
+** Code arithmetic operators ('+', '-', ...). If second operand is a
+** constant in the proper range, use variant opcodes with K operands.
+*/
+static void codearith (FuncState *fs, BinOpr opr,
+                       expdesc *e1, expdesc *e2, int flip, int line) {
+  if (tonumeral(e2, NULL) && luaK_exp2K(fs, e2))  /* K operand? */
+    codebinK(fs, opr, e1, e2, flip, line);
+  else  /* 'e2' is neither an immediate nor a K operand */
+    codebinNoK(fs, opr, e1, e2, flip, line);
+}
+
+
+/*
+** Code commutative operators ('+', '*'). If first operand is a
+** numeric constant, change order of operands to try to use an
+** immediate or K operator.
+*/
+static void codecommutative (FuncState *fs, BinOpr op,
+                             expdesc *e1, expdesc *e2, int line) {
+  int flip = 0;
+  if (tonumeral(e1, NULL)) {  /* is first operand a numeric constant? */
+    swapexps(e1, e2);  /* change order */
+    flip = 1;
+  }
+  if (op == OPR_ADD && isSCint(e2))  /* immediate operand? */
+    codebini(fs, OP_ADDI, e1, e2, flip, line, TM_ADD);
+  else
+    codearith(fs, op, e1, e2, flip, line);
+}
+
+
+/*
+** Code bitwise operations; they are all commutative, so the function
+** tries to put an integer constant as the 2nd operand (a K operand).
+*/
+static void codebitwise (FuncState *fs, BinOpr opr,
+                         expdesc *e1, expdesc *e2, int line) {
+  int flip = 0;
+  if (e1->k == VKINT) {
+    swapexps(e1, e2);  /* 'e2' will be the constant operand */
+    flip = 1;
+  }
+  if (e2->k == VKINT && luaK_exp2K(fs, e2))  /* K operand? */
+    codebinK(fs, opr, e1, e2, flip, line);
+  else  /* no constants */
+    codebinNoK(fs, opr, e1, e2, flip, line);
+}
+
+
+/*
+** Emit code for order comparisons. When using an immediate operand,
+** 'isfloat' tells whether the original value was a float.
+*/
+static void codeorder (FuncState *fs, BinOpr opr, expdesc *e1, expdesc *e2) {
+  int r1, r2;
+  int im;
+  int isfloat = 0;
+  OpCode op;
+  if (isSCnumber(e2, &im, &isfloat)) {
+    /* use immediate operand */
+    r1 = luaK_exp2anyreg(fs, e1);
+    r2 = im;
+    op = binopr2op(opr, OPR_LT, OP_LTI);
+  }
+  else if (isSCnumber(e1, &im, &isfloat)) {
+    /* transform (A < B) to (B > A) and (A <= B) to (B >= A) */
+    r1 = luaK_exp2anyreg(fs, e2);
+    r2 = im;
+    op = binopr2op(opr, OPR_LT, OP_GTI);
+  }
+  else {  /* regular case, compare two registers */
+    r1 = luaK_exp2anyreg(fs, e1);
+    r2 = luaK_exp2anyreg(fs, e2);
+    op = binopr2op(opr, OPR_LT, OP_LT);
+  }
+  freeexps(fs, e1, e2);
+  e1->u.info = condjump(fs, op, r1, r2, isfloat, 1);
+  e1->k = VJMP;
+}
+
+
+/*
+** Emit code for equality comparisons ('==', '~=').
+** 'e1' was already put as RK by 'luaK_infix'.
+*/
+static void codeeq (FuncState *fs, BinOpr opr, expdesc *e1, expdesc *e2) {
+  int r1, r2;
+  int im;
+  int isfloat = 0;  /* not needed here, but kept for symmetry */
+  OpCode op;
+  if (e1->k != VNONRELOC) {
+    lua_assert(e1->k == VK || e1->k == VKINT || e1->k == VKFLT);
+    swapexps(e1, e2);
+  }
+  r1 = luaK_exp2anyreg(fs, e1);  /* 1st expression must be in register */
+  if (isSCnumber(e2, &im, &isfloat)) {
+    op = OP_EQI;
+    r2 = im;  /* immediate operand */
+  }
+  else if (luaK_exp2RK(fs, e2)) {  /* 2nd expression is constant? */
+    op = OP_EQK;
+    r2 = e2->u.info;  /* constant index */
+  }
+  else {
+    op = OP_EQ;  /* will compare two registers */
+    r2 = luaK_exp2anyreg(fs, e2);
+  }
+  freeexps(fs, e1, e2);
+  e1->u.info = condjump(fs, op, r1, r2, isfloat, (opr == OPR_EQ));
+  e1->k = VJMP;
+}
+
+
+/*
+** Apply prefix operation 'op' to expression 'e'.
+*/
+void luaK_prefix (FuncState *fs, UnOpr opr, expdesc *e, int line) {
+  static const expdesc ef = {VKINT, {0}, NO_JUMP, NO_JUMP};
+  luaK_dischargevars(fs, e);
+  switch (opr) {
+    case OPR_MINUS: case OPR_BNOT:  /* use 'ef' as fake 2nd operand */
+      if (constfolding(fs, opr + LUA_OPUNM, e, &ef))
+        break;
+      /* else */ /* FALLTHROUGH */
+    case OPR_LEN:
+      codeunexpval(fs, unopr2op(opr), e, line);
+      break;
+    case OPR_NOT: codenot(fs, e); break;
+    default: lua_assert(0);
+  }
+}
+
+
+/*
+** Process 1st operand 'v' of binary operation 'op' before reading
+** 2nd operand.
+*/
+void luaK_infix (FuncState *fs, BinOpr op, expdesc *v) {
+  luaK_dischargevars(fs, v);
+  switch (op) {
+    case OPR_AND: {
+      luaK_goiftrue(fs, v);  /* go ahead only if 'v' is true */
+      break;
+    }
+    case OPR_OR: {
+      luaK_goiffalse(fs, v);  /* go ahead only if 'v' is false */
+      break;
+    }
+    case OPR_CONCAT: {
+      luaK_exp2nextreg(fs, v);  /* operand must be on the stack */
+      break;
+    }
+    case OPR_ADD: case OPR_SUB:
+    case OPR_MUL: case OPR_DIV: case OPR_IDIV:
+    case OPR_MOD: case OPR_POW:
+    case OPR_BAND: case OPR_BOR: case OPR_BXOR:
+    case OPR_SHL: case OPR_SHR: {
+      if (!tonumeral(v, NULL))
+        luaK_exp2anyreg(fs, v);
+      /* else keep numeral, which may be folded or used as an immediate
+         operand */
+      break;
+    }
+    case OPR_EQ: case OPR_NE: {
+      if (!tonumeral(v, NULL))
+        luaK_exp2RK(fs, v);
+      /* else keep numeral, which may be an immediate operand */
+      break;
+    }
+    case OPR_LT: case OPR_LE:
+    case OPR_GT: case OPR_GE: {
+      int dummy, dummy2;
+      if (!isSCnumber(v, &dummy, &dummy2))
+        luaK_exp2anyreg(fs, v);
+      /* else keep numeral, which may be an immediate operand */
+      break;
+    }
+    default: lua_assert(0);
+  }
+}
+
+/*
+** Create code for '(e1 .. e2)'.
+** For '(e1 .. e2.1 .. e2.2)' (which is '(e1 .. (e2.1 .. e2.2))',
+** because concatenation is right associative), merge both CONCATs.
+*/
+static void codeconcat (FuncState *fs, expdesc *e1, expdesc *e2, int line) {
+  Instruction *ie2 = previousinstruction(fs);
+  if (GET_OPCODE(*ie2) == OP_CONCAT) {  /* is 'e2' a concatenation? */
+    int n = GETARG_B(*ie2);  /* # of elements concatenated in 'e2' */
+    lua_assert(e1->u.info + 1 == GETARG_A(*ie2));
+    freeexp(fs, e2);
+    SETARG_A(*ie2, e1->u.info);  /* correct first element ('e1') */
+    SETARG_B(*ie2, n + 1);  /* will concatenate one more element */
+  }
+  else {  /* 'e2' is not a concatenation */
+    luaK_codeABC(fs, OP_CONCAT, e1->u.info, 2, 0);  /* new concat opcode */
+    freeexp(fs, e2);
+    luaK_fixline(fs, line);
+  }
+}
+
+
+/*
+** Finalize code for binary operation, after reading 2nd operand.
+*/
+void luaK_posfix (FuncState *fs, BinOpr opr,
+                  expdesc *e1, expdesc *e2, int line) {
+  luaK_dischargevars(fs, e2);
+  if (foldbinop(opr) && constfolding(fs, opr + LUA_OPADD, e1, e2))
+    return;  /* done by folding */
+  switch (opr) {
+    case OPR_AND: {
+      lua_assert(e1->t == NO_JUMP);  /* list closed by 'luaK_infix' */
+      luaK_concat(fs, &e2->f, e1->f);
+      *e1 = *e2;
+      break;
+    }
+    case OPR_OR: {
+      lua_assert(e1->f == NO_JUMP);  /* list closed by 'luaK_infix' */
+      luaK_concat(fs, &e2->t, e1->t);
+      *e1 = *e2;
+      break;
+    }
+    case OPR_CONCAT: {  /* e1 .. e2 */
+      luaK_exp2nextreg(fs, e2);
+      codeconcat(fs, e1, e2, line);
+      break;
+    }
+    case OPR_ADD: case OPR_MUL: {
+      codecommutative(fs, opr, e1, e2, line);
+      break;
+    }
+    case OPR_SUB: {
+      if (finishbinexpneg(fs, e1, e2, OP_ADDI, line, TM_SUB))
+        break; /* coded as (r1 + -I) */
+      /* ELSE */
+    }  /* FALLTHROUGH */
+    case OPR_DIV: case OPR_IDIV: case OPR_MOD: case OPR_POW: {
+      codearith(fs, opr, e1, e2, 0, line);
+      break;
+    }
+    case OPR_BAND: case OPR_BOR: case OPR_BXOR: {
+      codebitwise(fs, opr, e1, e2, line);
+      break;
+    }
+    case OPR_SHL: {
+      if (isSCint(e1)) {
+        swapexps(e1, e2);
+        codebini(fs, OP_SHLI, e1, e2, 1, line, TM_SHL);  /* I << r2 */
+      }
+      else if (finishbinexpneg(fs, e1, e2, OP_SHRI, line, TM_SHL)) {
+        /* coded as (r1 >> -I) */;
+      }
+      else  /* regular case (two registers) */
+       codebinexpval(fs, opr, e1, e2, line);
+      break;
+    }
+    case OPR_SHR: {
+      if (isSCint(e2))
+        codebini(fs, OP_SHRI, e1, e2, 0, line, TM_SHR);  /* r1 >> I */
+      else  /* regular case (two registers) */
+        codebinexpval(fs, opr, e1, e2, line);
+      break;
+    }
+    case OPR_EQ: case OPR_NE: {
+      codeeq(fs, opr, e1, e2);
+      break;
+    }
+    case OPR_GT: case OPR_GE: {
+      /* '(a > b)' <=> '(b < a)';  '(a >= b)' <=> '(b <= a)' */
+      swapexps(e1, e2);
+      opr = cast(BinOpr, (opr - OPR_GT) + OPR_LT);
+    }  /* FALLTHROUGH */
+    case OPR_LT: case OPR_LE: {
+      codeorder(fs, opr, e1, e2);
+      break;
+    }
+    default: lua_assert(0);
+  }
+}
+
+
+/*
+** Change line information associated with current position, by removing
+** previous info and adding it again with new line.
+*/
+void luaK_fixline (FuncState *fs, int line) {
+  removelastlineinfo(fs);
+  savelineinfo(fs, fs->f, line);
+}
+
+
+void luaK_settablesize (FuncState *fs, int pc, int ra, int asize, int hsize) {
+  Instruction *inst = &fs->f->code[pc];
+  int rb = (hsize != 0) ? luaO_ceillog2(hsize) + 1 : 0;  /* hash size */
+  int extra = asize / (MAXARG_C + 1);  /* higher bits of array size */
+  int rc = asize % (MAXARG_C + 1);  /* lower bits of array size */
+  int k = (extra > 0);  /* true iff needs extra argument */
+  *inst = CREATE_ABCk(OP_NEWTABLE, ra, rb, rc, k);
+  *(inst + 1) = CREATE_Ax(OP_EXTRAARG, extra);
+}
+
+
+/*
+** Emit a SETLIST instruction.
+** 'base' is register that keeps table;
+** 'nelems' is #table plus those to be stored now;
+** 'tostore' is number of values (in registers 'base + 1',...) to add to
+** table (or LUA_MULTRET to add up to stack top).
+*/
+void luaK_setlist (FuncState *fs, int base, int nelems, int tostore) {
+  lua_assert(tostore != 0 && tostore <= LFIELDS_PER_FLUSH);
+  if (tostore == LUA_MULTRET)
+    tostore = 0;
+  if (nelems <= MAXARG_C)
+    luaK_codeABC(fs, OP_SETLIST, base, tostore, nelems);
+  else {
+    int extra = nelems / (MAXARG_C + 1);
+    nelems %= (MAXARG_C + 1);
+    luaK_codeABCk(fs, OP_SETLIST, base, tostore, nelems, 1);
+    codeextraarg(fs, extra);
+  }
+  fs->freereg = base + 1;  /* free registers with list values */
+}
+
+
+/*
+** return the final target of a jump (skipping jumps to jumps)
+*/
+static int finaltarget (Instruction *code, int i) {
+  int count;
+  for (count = 0; count < 100; count++) {  /* avoid infinite loops */
+    Instruction pc = code[i];
+    if (GET_OPCODE(pc) != OP_JMP)
+      break;
+     else
+       i += GETARG_sJ(pc) + 1;
+  }
+  return i;
+}
+
+
+/*
+** Do a final pass over the code of a function, doing small peephole
+** optimizations and adjustments.
+*/
+void luaK_finish (FuncState *fs) {
+  int i;
+  Proto *p = fs->f;
+  for (i = 0; i < fs->pc; i++) {
+    Instruction *pc = &p->code[i];
+    lua_assert(i == 0 || isOT(*(pc - 1)) == isIT(*pc));
+    switch (GET_OPCODE(*pc)) {
+      case OP_RETURN0: case OP_RETURN1: {
+        if (!(fs->needclose || p->is_vararg))
+          break;  /* no extra work */
+        /* else use OP_RETURN to do the extra work */
+        SET_OPCODE(*pc, OP_RETURN);
+      }  /* FALLTHROUGH */
+      case OP_RETURN: case OP_TAILCALL: {
+        if (fs->needclose)
+          SETARG_k(*pc, 1);  /* signal that it needs to close */
+        if (p->is_vararg)
+          SETARG_C(*pc, p->numparams + 1);  /* signal that it is vararg */
+        break;
+      }
+      case OP_JMP: {
+        int target = finaltarget(p->code, i);
+        fixjump(fs, i, target);
+        break;
+      }
+      default: break;
+    }
+  }
+}
diff --git a/src/libs/3rdparty/lua/src/lcode.h b/src/libs/3rdparty/lua/src/lcode.h
new file mode 100644
index 0000000000..3265824452
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lcode.h
@@ -0,0 +1,104 @@
+/*
+** $Id: lcode.h $
+** Code generator for Lua
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lcode_h
+#define lcode_h
+
+#include "llex.h"
+#include "lobject.h"
+#include "lopcodes.h"
+#include "lparser.h"
+
+
+/*
+** Marks the end of a patch list. It is an invalid value both as an absolute
+** address, and as a list link (would link an element to itself).
+*/
+#define NO_JUMP (-1)
+
+
+/*
+** grep "ORDER OPR" if you change these enums  (ORDER OP)
+*/
+typedef enum BinOpr {
+  /* arithmetic operators */
+  OPR_ADD, OPR_SUB, OPR_MUL, OPR_MOD, OPR_POW,
+  OPR_DIV, OPR_IDIV,
+  /* bitwise operators */
+  OPR_BAND, OPR_BOR, OPR_BXOR,
+  OPR_SHL, OPR_SHR,
+  /* string operator */
+  OPR_CONCAT,
+  /* comparison operators */
+  OPR_EQ, OPR_LT, OPR_LE,
+  OPR_NE, OPR_GT, OPR_GE,
+  /* logical operators */
+  OPR_AND, OPR_OR,
+  OPR_NOBINOPR
+} BinOpr;
+
+
+/* true if operation is foldable (that is, it is arithmetic or bitwise) */
+#define foldbinop(op)	((op) <= OPR_SHR)
+
+
+#define luaK_codeABC(fs,o,a,b,c)	luaK_codeABCk(fs,o,a,b,c,0)
+
+
+typedef enum UnOpr { OPR_MINUS, OPR_BNOT, OPR_NOT, OPR_LEN, OPR_NOUNOPR } UnOpr;
+
+
+/* get (pointer to) instruction of given 'expdesc' */
+#define getinstruction(fs,e)	((fs)->f->code[(e)->u.info])
+
+
+#define luaK_setmultret(fs,e)	luaK_setreturns(fs, e, LUA_MULTRET)
+
+#define luaK_jumpto(fs,t)	luaK_patchlist(fs, luaK_jump(fs), t)
+
+LUAI_FUNC int luaK_code (FuncState *fs, Instruction i);
+LUAI_FUNC int luaK_codeABx (FuncState *fs, OpCode o, int A, unsigned int Bx);
+LUAI_FUNC int luaK_codeAsBx (FuncState *fs, OpCode o, int A, int Bx);
+LUAI_FUNC int luaK_codeABCk (FuncState *fs, OpCode o, int A,
+                                            int B, int C, int k);
+LUAI_FUNC int luaK_isKint (expdesc *e);
+LUAI_FUNC int luaK_exp2const (FuncState *fs, const expdesc *e, TValue *v);
+LUAI_FUNC void luaK_fixline (FuncState *fs, int line);
+LUAI_FUNC void luaK_nil (FuncState *fs, int from, int n);
+LUAI_FUNC void luaK_reserveregs (FuncState *fs, int n);
+LUAI_FUNC void luaK_checkstack (FuncState *fs, int n);
+LUAI_FUNC void luaK_int (FuncState *fs, int reg, lua_Integer n);
+LUAI_FUNC void luaK_dischargevars (FuncState *fs, expdesc *e);
+LUAI_FUNC int luaK_exp2anyreg (FuncState *fs, expdesc *e);
+LUAI_FUNC void luaK_exp2anyregup (FuncState *fs, expdesc *e);
+LUAI_FUNC void luaK_exp2nextreg (FuncState *fs, expdesc *e);
+LUAI_FUNC void luaK_exp2val (FuncState *fs, expdesc *e);
+LUAI_FUNC int luaK_exp2RK (FuncState *fs, expdesc *e);
+LUAI_FUNC void luaK_self (FuncState *fs, expdesc *e, expdesc *key);
+LUAI_FUNC void luaK_indexed (FuncState *fs, expdesc *t, expdesc *k);
+LUAI_FUNC void luaK_goiftrue (FuncState *fs, expdesc *e);
+LUAI_FUNC void luaK_goiffalse (FuncState *fs, expdesc *e);
+LUAI_FUNC void luaK_storevar (FuncState *fs, expdesc *var, expdesc *e);
+LUAI_FUNC void luaK_setreturns (FuncState *fs, expdesc *e, int nresults);
+LUAI_FUNC void luaK_setoneret (FuncState *fs, expdesc *e);
+LUAI_FUNC int luaK_jump (FuncState *fs);
+LUAI_FUNC void luaK_ret (FuncState *fs, int first, int nret);
+LUAI_FUNC void luaK_patchlist (FuncState *fs, int list, int target);
+LUAI_FUNC void luaK_patchtohere (FuncState *fs, int list);
+LUAI_FUNC void luaK_concat (FuncState *fs, int *l1, int l2);
+LUAI_FUNC int luaK_getlabel (FuncState *fs);
+LUAI_FUNC void luaK_prefix (FuncState *fs, UnOpr op, expdesc *v, int line);
+LUAI_FUNC void luaK_infix (FuncState *fs, BinOpr op, expdesc *v);
+LUAI_FUNC void luaK_posfix (FuncState *fs, BinOpr op, expdesc *v1,
+                            expdesc *v2, int line);
+LUAI_FUNC void luaK_settablesize (FuncState *fs, int pc,
+                                  int ra, int asize, int hsize);
+LUAI_FUNC void luaK_setlist (FuncState *fs, int base, int nelems, int tostore);
+LUAI_FUNC void luaK_finish (FuncState *fs);
+LUAI_FUNC l_noret luaK_semerror (LexState *ls, const char *msg);
+
+
+#endif
diff --git a/src/libs/3rdparty/lua/src/lcorolib.c b/src/libs/3rdparty/lua/src/lcorolib.c
new file mode 100644
index 0000000000..c64adf08a8
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lcorolib.c
@@ -0,0 +1,210 @@
+/*
+** $Id: lcorolib.c $
+** Coroutine Library
+** See Copyright Notice in lua.h
+*/
+
+#define lcorolib_c
+#define LUA_LIB
+
+#include "lprefix.h"
+
+
+#include <stdlib.h>
+
+#include "lua.h"
+
+#include "lauxlib.h"
+#include "lualib.h"
+
+
+static lua_State *getco (lua_State *L) {
+  lua_State *co = lua_tothread(L, 1);
+  luaL_argexpected(L, co, 1, "thread");
+  return co;
+}
+
+
+/*
+** Resumes a coroutine. Returns the number of results for non-error
+** cases or -1 for errors.
+*/
+static int auxresume (lua_State *L, lua_State *co, int narg) {
+  int status, nres;
+  if (l_unlikely(!lua_checkstack(co, narg))) {
+    lua_pushliteral(L, "too many arguments to resume");
+    return -1;  /* error flag */
+  }
+  lua_xmove(L, co, narg);
+  status = lua_resume(co, L, narg, &nres);
+  if (l_likely(status == LUA_OK || status == LUA_YIELD)) {
+    if (l_unlikely(!lua_checkstack(L, nres + 1))) {
+      lua_pop(co, nres);  /* remove results anyway */
+      lua_pushliteral(L, "too many results to resume");
+      return -1;  /* error flag */
+    }
+    lua_xmove(co, L, nres);  /* move yielded values */
+    return nres;
+  }
+  else {
+    lua_xmove(co, L, 1);  /* move error message */
+    return -1;  /* error flag */
+  }
+}
+
+
+static int luaB_coresume (lua_State *L) {
+  lua_State *co = getco(L);
+  int r;
+  r = auxresume(L, co, lua_gettop(L) - 1);
+  if (l_unlikely(r < 0)) {
+    lua_pushboolean(L, 0);
+    lua_insert(L, -2);
+    return 2;  /* return false + error message */
+  }
+  else {
+    lua_pushboolean(L, 1);
+    lua_insert(L, -(r + 1));
+    return r + 1;  /* return true + 'resume' returns */
+  }
+}
+
+
+static int luaB_auxwrap (lua_State *L) {
+  lua_State *co = lua_tothread(L, lua_upvalueindex(1));
+  int r = auxresume(L, co, lua_gettop(L));
+  if (l_unlikely(r < 0)) {  /* error? */
+    int stat = lua_status(co);
+    if (stat != LUA_OK && stat != LUA_YIELD) {  /* error in the coroutine? */
+      stat = lua_closethread(co, L);  /* close its tbc variables */
+      lua_assert(stat != LUA_OK);
+      lua_xmove(co, L, 1);  /* move error message to the caller */
+    }
+    if (stat != LUA_ERRMEM &&  /* not a memory error and ... */
+        lua_type(L, -1) == LUA_TSTRING) {  /* ... error object is a string? */
+      luaL_where(L, 1);  /* add extra info, if available */
+      lua_insert(L, -2);
+      lua_concat(L, 2);
+    }
+    return lua_error(L);  /* propagate error */
+  }
+  return r;
+}
+
+
+static int luaB_cocreate (lua_State *L) {
+  lua_State *NL;
+  luaL_checktype(L, 1, LUA_TFUNCTION);
+  NL = lua_newthread(L);
+  lua_pushvalue(L, 1);  /* move function to top */
+  lua_xmove(L, NL, 1);  /* move function from L to NL */
+  return 1;
+}
+
+
+static int luaB_cowrap (lua_State *L) {
+  luaB_cocreate(L);
+  lua_pushcclosure(L, luaB_auxwrap, 1);
+  return 1;
+}
+
+
+static int luaB_yield (lua_State *L) {
+  return lua_yield(L, lua_gettop(L));
+}
+
+
+#define COS_RUN		0
+#define COS_DEAD	1
+#define COS_YIELD	2
+#define COS_NORM	3
+
+
+static const char *const statname[] =
+  {"running", "dead", "suspended", "normal"};
+
+
+static int auxstatus (lua_State *L, lua_State *co) {
+  if (L == co) return COS_RUN;
+  else {
+    switch (lua_status(co)) {
+      case LUA_YIELD:
+        return COS_YIELD;
+      case LUA_OK: {
+        lua_Debug ar;
+        if (lua_getstack(co, 0, &ar))  /* does it have frames? */
+          return COS_NORM;  /* it is running */
+        else if (lua_gettop(co) == 0)
+            return COS_DEAD;
+        else
+          return COS_YIELD;  /* initial state */
+      }
+      default:  /* some error occurred */
+        return COS_DEAD;
+    }
+  }
+}
+
+
+static int luaB_costatus (lua_State *L) {
+  lua_State *co = getco(L);
+  lua_pushstring(L, statname[auxstatus(L, co)]);
+  return 1;
+}
+
+
+static int luaB_yieldable (lua_State *L) {
+  lua_State *co = lua_isnone(L, 1) ? L : getco(L);
+  lua_pushboolean(L, lua_isyieldable(co));
+  return 1;
+}
+
+
+static int luaB_corunning (lua_State *L) {
+  int ismain = lua_pushthread(L);
+  lua_pushboolean(L, ismain);
+  return 2;
+}
+
+
+static int luaB_close (lua_State *L) {
+  lua_State *co = getco(L);
+  int status = auxstatus(L, co);
+  switch (status) {
+    case COS_DEAD: case COS_YIELD: {
+      status = lua_closethread(co, L);
+      if (status == LUA_OK) {
+        lua_pushboolean(L, 1);
+        return 1;
+      }
+      else {
+        lua_pushboolean(L, 0);
+        lua_xmove(co, L, 1);  /* move error message */
+        return 2;
+      }
+    }
+    default:  /* normal or running coroutine */
+      return luaL_error(L, "cannot close a %s coroutine", statname[status]);
+  }
+}
+
+
+static const luaL_Reg co_funcs[] = {
+  {"create", luaB_cocreate},
+  {"resume", luaB_coresume},
+  {"running", luaB_corunning},
+  {"status", luaB_costatus},
+  {"wrap", luaB_cowrap},
+  {"yield", luaB_yield},
+  {"isyieldable", luaB_yieldable},
+  {"close", luaB_close},
+  {NULL, NULL}
+};
+
+
+
+LUAMOD_API int luaopen_coroutine (lua_State *L) {
+  luaL_newlib(L, co_funcs);
+  return 1;
+}
+
diff --git a/src/libs/3rdparty/lua/src/lctype.c b/src/libs/3rdparty/lua/src/lctype.c
new file mode 100644
index 0000000000..9542280942
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lctype.c
@@ -0,0 +1,64 @@
+/*
+** $Id: lctype.c $
+** 'ctype' functions for Lua
+** See Copyright Notice in lua.h
+*/
+
+#define lctype_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include "lctype.h"
+
+#if !LUA_USE_CTYPE	/* { */
+
+#include <limits.h>
+
+
+#if defined (LUA_UCID)		/* accept UniCode IDentifiers? */
+/* consider all non-ascii codepoints to be alphabetic */
+#define NONA		0x01
+#else
+#define NONA		0x00	/* default */
+#endif
+
+
+LUAI_DDEF const lu_byte luai_ctype_[UCHAR_MAX + 2] = {
+  0x00,  /* EOZ */
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,	/* 0. */
+  0x00,  0x08,  0x08,  0x08,  0x08,  0x08,  0x00,  0x00,
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,	/* 1. */
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
+  0x0c,  0x04,  0x04,  0x04,  0x04,  0x04,  0x04,  0x04,	/* 2. */
+  0x04,  0x04,  0x04,  0x04,  0x04,  0x04,  0x04,  0x04,
+  0x16,  0x16,  0x16,  0x16,  0x16,  0x16,  0x16,  0x16,	/* 3. */
+  0x16,  0x16,  0x04,  0x04,  0x04,  0x04,  0x04,  0x04,
+  0x04,  0x15,  0x15,  0x15,  0x15,  0x15,  0x15,  0x05,	/* 4. */
+  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,
+  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,	/* 5. */
+  0x05,  0x05,  0x05,  0x04,  0x04,  0x04,  0x04,  0x05,
+  0x04,  0x15,  0x15,  0x15,  0x15,  0x15,  0x15,  0x05,	/* 6. */
+  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,
+  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,	/* 7. */
+  0x05,  0x05,  0x05,  0x04,  0x04,  0x04,  0x04,  0x00,
+  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,	/* 8. */
+  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,
+  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,	/* 9. */
+  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,
+  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,	/* a. */
+  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,
+  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,	/* b. */
+  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,
+  0x00,  0x00,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,	/* c. */
+  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,
+  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,	/* d. */
+  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,
+  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,	/* e. */
+  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,
+  NONA,  NONA,  NONA,  NONA,  NONA,  0x00,  0x00,  0x00,	/* f. */
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00
+};
+
+#endif			/* } */
diff --git a/src/libs/3rdparty/lua/src/lctype.h b/src/libs/3rdparty/lua/src/lctype.h
new file mode 100644
index 0000000000..864e190188
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lctype.h
@@ -0,0 +1,101 @@
+/*
+** $Id: lctype.h $
+** 'ctype' functions for Lua
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lctype_h
+#define lctype_h
+
+#include "lua.h"
+
+
+/*
+** WARNING: the functions defined here do not necessarily correspond
+** to the similar functions in the standard C ctype.h. They are
+** optimized for the specific needs of Lua.
+*/
+
+#if !defined(LUA_USE_CTYPE)
+
+#if 'A' == 65 && '0' == 48
+/* ASCII case: can use its own tables; faster and fixed */
+#define LUA_USE_CTYPE	0
+#else
+/* must use standard C ctype */
+#define LUA_USE_CTYPE	1
+#endif
+
+#endif
+
+
+#if !LUA_USE_CTYPE	/* { */
+
+#include <limits.h>
+
+#include "llimits.h"
+
+
+#define ALPHABIT	0
+#define DIGITBIT	1
+#define PRINTBIT	2
+#define SPACEBIT	3
+#define XDIGITBIT	4
+
+
+#define MASK(B)		(1 << (B))
+
+
+/*
+** add 1 to char to allow index -1 (EOZ)
+*/
+#define testprop(c,p)	(luai_ctype_[(c)+1] & (p))
+
+/*
+** 'lalpha' (Lua alphabetic) and 'lalnum' (Lua alphanumeric) both include '_'
+*/
+#define lislalpha(c)	testprop(c, MASK(ALPHABIT))
+#define lislalnum(c)	testprop(c, (MASK(ALPHABIT) | MASK(DIGITBIT)))
+#define lisdigit(c)	testprop(c, MASK(DIGITBIT))
+#define lisspace(c)	testprop(c, MASK(SPACEBIT))
+#define lisprint(c)	testprop(c, MASK(PRINTBIT))
+#define lisxdigit(c)	testprop(c, MASK(XDIGITBIT))
+
+
+/*
+** In ASCII, this 'ltolower' is correct for alphabetic characters and
+** for '.'. That is enough for Lua needs. ('check_exp' ensures that
+** the character either is an upper-case letter or is unchanged by
+** the transformation, which holds for lower-case letters and '.'.)
+*/
+#define ltolower(c)  \
+  check_exp(('A' <= (c) && (c) <= 'Z') || (c) == ((c) | ('A' ^ 'a')),  \
+            (c) | ('A' ^ 'a'))
+
+
+/* one entry for each character and for -1 (EOZ) */
+LUAI_DDEC(const lu_byte luai_ctype_[UCHAR_MAX + 2];)
+
+
+#else			/* }{ */
+
+/*
+** use standard C ctypes
+*/
+
+#include <ctype.h>
+
+
+#define lislalpha(c)	(isalpha(c) || (c) == '_')
+#define lislalnum(c)	(isalnum(c) || (c) == '_')
+#define lisdigit(c)	(isdigit(c))
+#define lisspace(c)	(isspace(c))
+#define lisprint(c)	(isprint(c))
+#define lisxdigit(c)	(isxdigit(c))
+
+#define ltolower(c)	(tolower(c))
+
+#endif			/* } */
+
+#endif
+
diff --git a/src/libs/3rdparty/lua/src/ldblib.c b/src/libs/3rdparty/lua/src/ldblib.c
new file mode 100644
index 0000000000..6dcbaa9824
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/ldblib.c
@@ -0,0 +1,483 @@
+/*
+** $Id: ldblib.c $
+** Interface from Lua to its debug API
+** See Copyright Notice in lua.h
+*/
+
+#define ldblib_c
+#define LUA_LIB
+
+#include "lprefix.h"
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "lua.h"
+
+#include "lauxlib.h"
+#include "lualib.h"
+
+
+/*
+** The hook table at registry[HOOKKEY] maps threads to their current
+** hook function.
+*/
+static const char *const HOOKKEY = "_HOOKKEY";
+
+
+/*
+** If L1 != L, L1 can be in any state, and therefore there are no
+** guarantees about its stack space; any push in L1 must be
+** checked.
+*/
+static void checkstack (lua_State *L, lua_State *L1, int n) {
+  if (l_unlikely(L != L1 && !lua_checkstack(L1, n)))
+    luaL_error(L, "stack overflow");
+}
+
+
+static int db_getregistry (lua_State *L) {
+  lua_pushvalue(L, LUA_REGISTRYINDEX);
+  return 1;
+}
+
+
+static int db_getmetatable (lua_State *L) {
+  luaL_checkany(L, 1);
+  if (!lua_getmetatable(L, 1)) {
+    lua_pushnil(L);  /* no metatable */
+  }
+  return 1;
+}
+
+
+static int db_setmetatable (lua_State *L) {
+  int t = lua_type(L, 2);
+  luaL_argexpected(L, t == LUA_TNIL || t == LUA_TTABLE, 2, "nil or table");
+  lua_settop(L, 2);
+  lua_setmetatable(L, 1);
+  return 1;  /* return 1st argument */
+}
+
+
+static int db_getuservalue (lua_State *L) {
+  int n = (int)luaL_optinteger(L, 2, 1);
+  if (lua_type(L, 1) != LUA_TUSERDATA)
+    luaL_pushfail(L);
+  else if (lua_getiuservalue(L, 1, n) != LUA_TNONE) {
+    lua_pushboolean(L, 1);
+    return 2;
+  }
+  return 1;
+}
+
+
+static int db_setuservalue (lua_State *L) {
+  int n = (int)luaL_optinteger(L, 3, 1);
+  luaL_checktype(L, 1, LUA_TUSERDATA);
+  luaL_checkany(L, 2);
+  lua_settop(L, 2);
+  if (!lua_setiuservalue(L, 1, n))
+    luaL_pushfail(L);
+  return 1;
+}
+
+
+/*
+** Auxiliary function used by several library functions: check for
+** an optional thread as function's first argument and set 'arg' with
+** 1 if this argument is present (so that functions can skip it to
+** access their other arguments)
+*/
+static lua_State *getthread (lua_State *L, int *arg) {
+  if (lua_isthread(L, 1)) {
+    *arg = 1;
+    return lua_tothread(L, 1);
+  }
+  else {
+    *arg = 0;
+    return L;  /* function will operate over current thread */
+  }
+}
+
+
+/*
+** Variations of 'lua_settable', used by 'db_getinfo' to put results
+** from 'lua_getinfo' into result table. Key is always a string;
+** value can be a string, an int, or a boolean.
+*/
+static void settabss (lua_State *L, const char *k, const char *v) {
+  lua_pushstring(L, v);
+  lua_setfield(L, -2, k);
+}
+
+static void settabsi (lua_State *L, const char *k, int v) {
+  lua_pushinteger(L, v);
+  lua_setfield(L, -2, k);
+}
+
+static void settabsb (lua_State *L, const char *k, int v) {
+  lua_pushboolean(L, v);
+  lua_setfield(L, -2, k);
+}
+
+
+/*
+** In function 'db_getinfo', the call to 'lua_getinfo' may push
+** results on the stack; later it creates the result table to put
+** these objects. Function 'treatstackoption' puts the result from
+** 'lua_getinfo' on top of the result table so that it can call
+** 'lua_setfield'.
+*/
+static void treatstackoption (lua_State *L, lua_State *L1, const char *fname) {
+  if (L == L1)
+    lua_rotate(L, -2, 1);  /* exchange object and table */
+  else
+    lua_xmove(L1, L, 1);  /* move object to the "main" stack */
+  lua_setfield(L, -2, fname);  /* put object into table */
+}
+
+
+/*
+** Calls 'lua_getinfo' and collects all results in a new table.
+** L1 needs stack space for an optional input (function) plus
+** two optional outputs (function and line table) from function
+** 'lua_getinfo'.
+*/
+static int db_getinfo (lua_State *L) {
+  lua_Debug ar;
+  int arg;
+  lua_State *L1 = getthread(L, &arg);
+  const char *options = luaL_optstring(L, arg+2, "flnSrtu");
+  checkstack(L, L1, 3);
+  luaL_argcheck(L, options[0] != '>', arg + 2, "invalid option '>'");
+  if (lua_isfunction(L, arg + 1)) {  /* info about a function? */
+    options = lua_pushfstring(L, ">%s", options);  /* add '>' to 'options' */
+    lua_pushvalue(L, arg + 1);  /* move function to 'L1' stack */
+    lua_xmove(L, L1, 1);
+  }
+  else {  /* stack level */
+    if (!lua_getstack(L1, (int)luaL_checkinteger(L, arg + 1), &ar)) {
+      luaL_pushfail(L);  /* level out of range */
+      return 1;
+    }
+  }
+  if (!lua_getinfo(L1, options, &ar))
+    return luaL_argerror(L, arg+2, "invalid option");
+  lua_newtable(L);  /* table to collect results */
+  if (strchr(options, 'S')) {
+    lua_pushlstring(L, ar.source, ar.srclen);
+    lua_setfield(L, -2, "source");
+    settabss(L, "short_src", ar.short_src);
+    settabsi(L, "linedefined", ar.linedefined);
+    settabsi(L, "lastlinedefined", ar.lastlinedefined);
+    settabss(L, "what", ar.what);
+  }
+  if (strchr(options, 'l'))
+    settabsi(L, "currentline", ar.currentline);
+  if (strchr(options, 'u')) {
+    settabsi(L, "nups", ar.nups);
+    settabsi(L, "nparams", ar.nparams);
+    settabsb(L, "isvararg", ar.isvararg);
+  }
+  if (strchr(options, 'n')) {
+    settabss(L, "name", ar.name);
+    settabss(L, "namewhat", ar.namewhat);
+  }
+  if (strchr(options, 'r')) {
+    settabsi(L, "ftransfer", ar.ftransfer);
+    settabsi(L, "ntransfer", ar.ntransfer);
+  }
+  if (strchr(options, 't'))
+    settabsb(L, "istailcall", ar.istailcall);
+  if (strchr(options, 'L'))
+    treatstackoption(L, L1, "activelines");
+  if (strchr(options, 'f'))
+    treatstackoption(L, L1, "func");
+  return 1;  /* return table */
+}
+
+
+static int db_getlocal (lua_State *L) {
+  int arg;
+  lua_State *L1 = getthread(L, &arg);
+  int nvar = (int)luaL_checkinteger(L, arg + 2);  /* local-variable index */
+  if (lua_isfunction(L, arg + 1)) {  /* function argument? */
+    lua_pushvalue(L, arg + 1);  /* push function */
+    lua_pushstring(L, lua_getlocal(L, NULL, nvar));  /* push local name */
+    return 1;  /* return only name (there is no value) */
+  }
+  else {  /* stack-level argument */
+    lua_Debug ar;
+    const char *name;
+    int level = (int)luaL_checkinteger(L, arg + 1);
+    if (l_unlikely(!lua_getstack(L1, level, &ar)))  /* out of range? */
+      return luaL_argerror(L, arg+1, "level out of range");
+    checkstack(L, L1, 1);
+    name = lua_getlocal(L1, &ar, nvar);
+    if (name) {
+      lua_xmove(L1, L, 1);  /* move local value */
+      lua_pushstring(L, name);  /* push name */
+      lua_rotate(L, -2, 1);  /* re-order */
+      return 2;
+    }
+    else {
+      luaL_pushfail(L);  /* no name (nor value) */
+      return 1;
+    }
+  }
+}
+
+
+static int db_setlocal (lua_State *L) {
+  int arg;
+  const char *name;
+  lua_State *L1 = getthread(L, &arg);
+  lua_Debug ar;
+  int level = (int)luaL_checkinteger(L, arg + 1);
+  int nvar = (int)luaL_checkinteger(L, arg + 2);
+  if (l_unlikely(!lua_getstack(L1, level, &ar)))  /* out of range? */
+    return luaL_argerror(L, arg+1, "level out of range");
+  luaL_checkany(L, arg+3);
+  lua_settop(L, arg+3);
+  checkstack(L, L1, 1);
+  lua_xmove(L, L1, 1);
+  name = lua_setlocal(L1, &ar, nvar);
+  if (name == NULL)
+    lua_pop(L1, 1);  /* pop value (if not popped by 'lua_setlocal') */
+  lua_pushstring(L, name);
+  return 1;
+}
+
+
+/*
+** get (if 'get' is true) or set an upvalue from a closure
+*/
+static int auxupvalue (lua_State *L, int get) {
+  const char *name;
+  int n = (int)luaL_checkinteger(L, 2);  /* upvalue index */
+  luaL_checktype(L, 1, LUA_TFUNCTION);  /* closure */
+  name = get ? lua_getupvalue(L, 1, n) : lua_setupvalue(L, 1, n);
+  if (name == NULL) return 0;
+  lua_pushstring(L, name);
+  lua_insert(L, -(get+1));  /* no-op if get is false */
+  return get + 1;
+}
+
+
+static int db_getupvalue (lua_State *L) {
+  return auxupvalue(L, 1);
+}
+
+
+static int db_setupvalue (lua_State *L) {
+  luaL_checkany(L, 3);
+  return auxupvalue(L, 0);
+}
+
+
+/*
+** Check whether a given upvalue from a given closure exists and
+** returns its index
+*/
+static void *checkupval (lua_State *L, int argf, int argnup, int *pnup) {
+  void *id;
+  int nup = (int)luaL_checkinteger(L, argnup);  /* upvalue index */
+  luaL_checktype(L, argf, LUA_TFUNCTION);  /* closure */
+  id = lua_upvalueid(L, argf, nup);
+  if (pnup) {
+    luaL_argcheck(L, id != NULL, argnup, "invalid upvalue index");
+    *pnup = nup;
+  }
+  return id;
+}
+
+
+static int db_upvalueid (lua_State *L) {
+  void *id = checkupval(L, 1, 2, NULL);
+  if (id != NULL)
+    lua_pushlightuserdata(L, id);
+  else
+    luaL_pushfail(L);
+  return 1;
+}
+
+
+static int db_upvaluejoin (lua_State *L) {
+  int n1, n2;
+  checkupval(L, 1, 2, &n1);
+  checkupval(L, 3, 4, &n2);
+  luaL_argcheck(L, !lua_iscfunction(L, 1), 1, "Lua function expected");
+  luaL_argcheck(L, !lua_iscfunction(L, 3), 3, "Lua function expected");
+  lua_upvaluejoin(L, 1, n1, 3, n2);
+  return 0;
+}
+
+
+/*
+** Call hook function registered at hook table for the current
+** thread (if there is one)
+*/
+static void hookf (lua_State *L, lua_Debug *ar) {
+  static const char *const hooknames[] =
+    {"call", "return", "line", "count", "tail call"};
+  lua_getfield(L, LUA_REGISTRYINDEX, HOOKKEY);
+  lua_pushthread(L);
+  if (lua_rawget(L, -2) == LUA_TFUNCTION) {  /* is there a hook function? */
+    lua_pushstring(L, hooknames[(int)ar->event]);  /* push event name */
+    if (ar->currentline >= 0)
+      lua_pushinteger(L, ar->currentline);  /* push current line */
+    else lua_pushnil(L);
+    lua_assert(lua_getinfo(L, "lS", ar));
+    lua_call(L, 2, 0);  /* call hook function */
+  }
+}
+
+
+/*
+** Convert a string mask (for 'sethook') into a bit mask
+*/
+static int makemask (const char *smask, int count) {
+  int mask = 0;
+  if (strchr(smask, 'c')) mask |= LUA_MASKCALL;
+  if (strchr(smask, 'r')) mask |= LUA_MASKRET;
+  if (strchr(smask, 'l')) mask |= LUA_MASKLINE;
+  if (count > 0) mask |= LUA_MASKCOUNT;
+  return mask;
+}
+
+
+/*
+** Convert a bit mask (for 'gethook') into a string mask
+*/
+static char *unmakemask (int mask, char *smask) {
+  int i = 0;
+  if (mask & LUA_MASKCALL) smask[i++] = 'c';
+  if (mask & LUA_MASKRET) smask[i++] = 'r';
+  if (mask & LUA_MASKLINE) smask[i++] = 'l';
+  smask[i] = '\0';
+  return smask;
+}
+
+
+static int db_sethook (lua_State *L) {
+  int arg, mask, count;
+  lua_Hook func;
+  lua_State *L1 = getthread(L, &arg);
+  if (lua_isnoneornil(L, arg+1)) {  /* no hook? */
+    lua_settop(L, arg+1);
+    func = NULL; mask = 0; count = 0;  /* turn off hooks */
+  }
+  else {
+    const char *smask = luaL_checkstring(L, arg+2);
+    luaL_checktype(L, arg+1, LUA_TFUNCTION);
+    count = (int)luaL_optinteger(L, arg + 3, 0);
+    func = hookf; mask = makemask(smask, count);
+  }
+  if (!luaL_getsubtable(L, LUA_REGISTRYINDEX, HOOKKEY)) {
+    /* table just created; initialize it */
+    lua_pushliteral(L, "k");
+    lua_setfield(L, -2, "__mode");  /** hooktable.__mode = "k" */
+    lua_pushvalue(L, -1);
+    lua_setmetatable(L, -2);  /* metatable(hooktable) = hooktable */
+  }
+  checkstack(L, L1, 1);
+  lua_pushthread(L1); lua_xmove(L1, L, 1);  /* key (thread) */
+  lua_pushvalue(L, arg + 1);  /* value (hook function) */
+  lua_rawset(L, -3);  /* hooktable[L1] = new Lua hook */
+  lua_sethook(L1, func, mask, count);
+  return 0;
+}
+
+
+static int db_gethook (lua_State *L) {
+  int arg;
+  lua_State *L1 = getthread(L, &arg);
+  char buff[5];
+  int mask = lua_gethookmask(L1);
+  lua_Hook hook = lua_gethook(L1);
+  if (hook == NULL) {  /* no hook? */
+    luaL_pushfail(L);
+    return 1;
+  }
+  else if (hook != hookf)  /* external hook? */
+    lua_pushliteral(L, "external hook");
+  else {  /* hook table must exist */
+    lua_getfield(L, LUA_REGISTRYINDEX, HOOKKEY);
+    checkstack(L, L1, 1);
+    lua_pushthread(L1); lua_xmove(L1, L, 1);
+    lua_rawget(L, -2);   /* 1st result = hooktable[L1] */
+    lua_remove(L, -2);  /* remove hook table */
+  }
+  lua_pushstring(L, unmakemask(mask, buff));  /* 2nd result = mask */
+  lua_pushinteger(L, lua_gethookcount(L1));  /* 3rd result = count */
+  return 3;
+}
+
+
+static int db_debug (lua_State *L) {
+  for (;;) {
+    char buffer[250];
+    lua_writestringerror("%s", "lua_debug> ");
+    if (fgets(buffer, sizeof(buffer), stdin) == NULL ||
+        strcmp(buffer, "cont\n") == 0)
+      return 0;
+    if (luaL_loadbuffer(L, buffer, strlen(buffer), "=(debug command)") ||
+        lua_pcall(L, 0, 0, 0))
+      lua_writestringerror("%s\n", luaL_tolstring(L, -1, NULL));
+    lua_settop(L, 0);  /* remove eventual returns */
+  }
+}
+
+
+static int db_traceback (lua_State *L) {
+  int arg;
+  lua_State *L1 = getthread(L, &arg);
+  const char *msg = lua_tostring(L, arg + 1);
+  if (msg == NULL && !lua_isnoneornil(L, arg + 1))  /* non-string 'msg'? */
+    lua_pushvalue(L, arg + 1);  /* return it untouched */
+  else {
+    int level = (int)luaL_optinteger(L, arg + 2, (L == L1) ? 1 : 0);
+    luaL_traceback(L, L1, msg, level);
+  }
+  return 1;
+}
+
+
+static int db_setcstacklimit (lua_State *L) {
+  int limit = (int)luaL_checkinteger(L, 1);
+  int res = lua_setcstacklimit(L, limit);
+  lua_pushinteger(L, res);
+  return 1;
+}
+
+
+static const luaL_Reg dblib[] = {
+  {"debug", db_debug},
+  {"getuservalue", db_getuservalue},
+  {"gethook", db_gethook},
+  {"getinfo", db_getinfo},
+  {"getlocal", db_getlocal},
+  {"getregistry", db_getregistry},
+  {"getmetatable", db_getmetatable},
+  {"getupvalue", db_getupvalue},
+  {"upvaluejoin", db_upvaluejoin},
+  {"upvalueid", db_upvalueid},
+  {"setuservalue", db_setuservalue},
+  {"sethook", db_sethook},
+  {"setlocal", db_setlocal},
+  {"setmetatable", db_setmetatable},
+  {"setupvalue", db_setupvalue},
+  {"traceback", db_traceback},
+  {"setcstacklimit", db_setcstacklimit},
+  {NULL, NULL}
+};
+
+
+LUAMOD_API int luaopen_debug (lua_State *L) {
+  luaL_newlib(L, dblib);
+  return 1;
+}
+
diff --git a/src/libs/3rdparty/lua/src/ldebug.c b/src/libs/3rdparty/lua/src/ldebug.c
new file mode 100644
index 0000000000..28b1caabf7
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/ldebug.c
@@ -0,0 +1,924 @@
+/*
+** $Id: ldebug.c $
+** Debug Interface
+** See Copyright Notice in lua.h
+*/
+
+#define ldebug_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include <stdarg.h>
+#include <stddef.h>
+#include <string.h>
+
+#include "lua.h"
+
+#include "lapi.h"
+#include "lcode.h"
+#include "ldebug.h"
+#include "ldo.h"
+#include "lfunc.h"
+#include "lobject.h"
+#include "lopcodes.h"
+#include "lstate.h"
+#include "lstring.h"
+#include "ltable.h"
+#include "ltm.h"
+#include "lvm.h"
+
+
+
+#define noLuaClosure(f)		((f) == NULL || (f)->c.tt == LUA_VCCL)
+
+
+static const char *funcnamefromcall (lua_State *L, CallInfo *ci,
+                                                   const char **name);
+
+
+static int currentpc (CallInfo *ci) {
+  lua_assert(isLua(ci));
+  return pcRel(ci->u.l.savedpc, ci_func(ci)->p);
+}
+
+
+/*
+** Get a "base line" to find the line corresponding to an instruction.
+** Base lines are regularly placed at MAXIWTHABS intervals, so usually
+** an integer division gets the right place. When the source file has
+** large sequences of empty/comment lines, it may need extra entries,
+** so the original estimate needs a correction.
+** If the original estimate is -1, the initial 'if' ensures that the
+** 'while' will run at least once.
+** The assertion that the estimate is a lower bound for the correct base
+** is valid as long as the debug info has been generated with the same
+** value for MAXIWTHABS or smaller. (Previous releases use a little
+** smaller value.)
+*/
+static int getbaseline (const Proto *f, int pc, int *basepc) {
+  if (f->sizeabslineinfo == 0 || pc < f->abslineinfo[0].pc) {
+    *basepc = -1;  /* start from the beginning */
+    return f->linedefined;
+  }
+  else {
+    int i = cast_uint(pc) / MAXIWTHABS - 1;  /* get an estimate */
+    /* estimate must be a lower bound of the correct base */
+    lua_assert(i < 0 ||
+              (i < f->sizeabslineinfo && f->abslineinfo[i].pc <= pc));
+    while (i + 1 < f->sizeabslineinfo && pc >= f->abslineinfo[i + 1].pc)
+      i++;  /* low estimate; adjust it */
+    *basepc = f->abslineinfo[i].pc;
+    return f->abslineinfo[i].line;
+  }
+}
+
+
+/*
+** Get the line corresponding to instruction 'pc' in function 'f';
+** first gets a base line and from there does the increments until
+** the desired instruction.
+*/
+int luaG_getfuncline (const Proto *f, int pc) {
+  if (f->lineinfo == NULL)  /* no debug information? */
+    return -1;
+  else {
+    int basepc;
+    int baseline = getbaseline(f, pc, &basepc);
+    while (basepc++ < pc) {  /* walk until given instruction */
+      lua_assert(f->lineinfo[basepc] != ABSLINEINFO);
+      baseline += f->lineinfo[basepc];  /* correct line */
+    }
+    return baseline;
+  }
+}
+
+
+static int getcurrentline (CallInfo *ci) {
+  return luaG_getfuncline(ci_func(ci)->p, currentpc(ci));
+}
+
+
+/*
+** Set 'trap' for all active Lua frames.
+** This function can be called during a signal, under "reasonable"
+** assumptions. A new 'ci' is completely linked in the list before it
+** becomes part of the "active" list, and we assume that pointers are
+** atomic; see comment in next function.
+** (A compiler doing interprocedural optimizations could, theoretically,
+** reorder memory writes in such a way that the list could be
+** temporarily broken while inserting a new element. We simply assume it
+** has no good reasons to do that.)
+*/
+static void settraps (CallInfo *ci) {
+  for (; ci != NULL; ci = ci->previous)
+    if (isLua(ci))
+      ci->u.l.trap = 1;
+}
+
+
+/*
+** This function can be called during a signal, under "reasonable"
+** assumptions.
+** Fields 'basehookcount' and 'hookcount' (set by 'resethookcount')
+** are for debug only, and it is no problem if they get arbitrary
+** values (causes at most one wrong hook call). 'hookmask' is an atomic
+** value. We assume that pointers are atomic too (e.g., gcc ensures that
+** for all platforms where it runs). Moreover, 'hook' is always checked
+** before being called (see 'luaD_hook').
+*/
+LUA_API void lua_sethook (lua_State *L, lua_Hook func, int mask, int count) {
+  if (func == NULL || mask == 0) {  /* turn off hooks? */
+    mask = 0;
+    func = NULL;
+  }
+  L->hook = func;
+  L->basehookcount = count;
+  resethookcount(L);
+  L->hookmask = cast_byte(mask);
+  if (mask)
+    settraps(L->ci);  /* to trace inside 'luaV_execute' */
+}
+
+
+LUA_API lua_Hook lua_gethook (lua_State *L) {
+  return L->hook;
+}
+
+
+LUA_API int lua_gethookmask (lua_State *L) {
+  return L->hookmask;
+}
+
+
+LUA_API int lua_gethookcount (lua_State *L) {
+  return L->basehookcount;
+}
+
+
+LUA_API int lua_getstack (lua_State *L, int level, lua_Debug *ar) {
+  int status;
+  CallInfo *ci;
+  if (level < 0) return 0;  /* invalid (negative) level */
+  lua_lock(L);
+  for (ci = L->ci; level > 0 && ci != &L->base_ci; ci = ci->previous)
+    level--;
+  if (level == 0 && ci != &L->base_ci) {  /* level found? */
+    status = 1;
+    ar->i_ci = ci;
+  }
+  else status = 0;  /* no such level */
+  lua_unlock(L);
+  return status;
+}
+
+
+static const char *upvalname (const Proto *p, int uv) {
+  TString *s = check_exp(uv < p->sizeupvalues, p->upvalues[uv].name);
+  if (s == NULL) return "?";
+  else return getstr(s);
+}
+
+
+static const char *findvararg (CallInfo *ci, int n, StkId *pos) {
+  if (clLvalue(s2v(ci->func.p))->p->is_vararg) {
+    int nextra = ci->u.l.nextraargs;
+    if (n >= -nextra) {  /* 'n' is negative */
+      *pos = ci->func.p - nextra - (n + 1);
+      return "(vararg)";  /* generic name for any vararg */
+    }
+  }
+  return NULL;  /* no such vararg */
+}
+
+
+const char *luaG_findlocal (lua_State *L, CallInfo *ci, int n, StkId *pos) {
+  StkId base = ci->func.p + 1;
+  const char *name = NULL;
+  if (isLua(ci)) {
+    if (n < 0)  /* access to vararg values? */
+      return findvararg(ci, n, pos);
+    else
+      name = luaF_getlocalname(ci_func(ci)->p, n, currentpc(ci));
+  }
+  if (name == NULL) {  /* no 'standard' name? */
+    StkId limit = (ci == L->ci) ? L->top.p : ci->next->func.p;
+    if (limit - base >= n && n > 0) {  /* is 'n' inside 'ci' stack? */
+      /* generic name for any valid slot */
+      name = isLua(ci) ? "(temporary)" : "(C temporary)";
+    }
+    else
+      return NULL;  /* no name */
+  }
+  if (pos)
+    *pos = base + (n - 1);
+  return name;
+}
+
+
+LUA_API const char *lua_getlocal (lua_State *L, const lua_Debug *ar, int n) {
+  const char *name;
+  lua_lock(L);
+  if (ar == NULL) {  /* information about non-active function? */
+    if (!isLfunction(s2v(L->top.p - 1)))  /* not a Lua function? */
+      name = NULL;
+    else  /* consider live variables at function start (parameters) */
+      name = luaF_getlocalname(clLvalue(s2v(L->top.p - 1))->p, n, 0);
+  }
+  else {  /* active function; get information through 'ar' */
+    StkId pos = NULL;  /* to avoid warnings */
+    name = luaG_findlocal(L, ar->i_ci, n, &pos);
+    if (name) {
+      setobjs2s(L, L->top.p, pos);
+      api_incr_top(L);
+    }
+  }
+  lua_unlock(L);
+  return name;
+}
+
+
+LUA_API const char *lua_setlocal (lua_State *L, const lua_Debug *ar, int n) {
+  StkId pos = NULL;  /* to avoid warnings */
+  const char *name;
+  lua_lock(L);
+  name = luaG_findlocal(L, ar->i_ci, n, &pos);
+  if (name) {
+    setobjs2s(L, pos, L->top.p - 1);
+    L->top.p--;  /* pop value */
+  }
+  lua_unlock(L);
+  return name;
+}
+
+
+static void funcinfo (lua_Debug *ar, Closure *cl) {
+  if (noLuaClosure(cl)) {
+    ar->source = "=[C]";
+    ar->srclen = LL("=[C]");
+    ar->linedefined = -1;
+    ar->lastlinedefined = -1;
+    ar->what = "C";
+  }
+  else {
+    const Proto *p = cl->l.p;
+    if (p->source) {
+      ar->source = getstr(p->source);
+      ar->srclen = tsslen(p->source);
+    }
+    else {
+      ar->source = "=?";
+      ar->srclen = LL("=?");
+    }
+    ar->linedefined = p->linedefined;
+    ar->lastlinedefined = p->lastlinedefined;
+    ar->what = (ar->linedefined == 0) ? "main" : "Lua";
+  }
+  luaO_chunkid(ar->short_src, ar->source, ar->srclen);
+}
+
+
+static int nextline (const Proto *p, int currentline, int pc) {
+  if (p->lineinfo[pc] != ABSLINEINFO)
+    return currentline + p->lineinfo[pc];
+  else
+    return luaG_getfuncline(p, pc);
+}
+
+
+static void collectvalidlines (lua_State *L, Closure *f) {
+  if (noLuaClosure(f)) {
+    setnilvalue(s2v(L->top.p));
+    api_incr_top(L);
+  }
+  else {
+    int i;
+    TValue v;
+    const Proto *p = f->l.p;
+    int currentline = p->linedefined;
+    Table *t = luaH_new(L);  /* new table to store active lines */
+    sethvalue2s(L, L->top.p, t);  /* push it on stack */
+    api_incr_top(L);
+    setbtvalue(&v);  /* boolean 'true' to be the value of all indices */
+    if (!p->is_vararg)  /* regular function? */
+      i = 0;  /* consider all instructions */
+    else {  /* vararg function */
+      lua_assert(GET_OPCODE(p->code[0]) == OP_VARARGPREP);
+      currentline = nextline(p, currentline, 0);
+      i = 1;  /* skip first instruction (OP_VARARGPREP) */
+    }
+    for (; i < p->sizelineinfo; i++) {  /* for each instruction */
+      currentline = nextline(p, currentline, i);  /* get its line */
+      luaH_setint(L, t, currentline, &v);  /* table[line] = true */
+    }
+  }
+}
+
+
+static const char *getfuncname (lua_State *L, CallInfo *ci, const char **name) {
+  /* calling function is a known function? */
+  if (ci != NULL && !(ci->callstatus & CIST_TAIL))
+    return funcnamefromcall(L, ci->previous, name);
+  else return NULL;  /* no way to find a name */
+}
+
+
+static int auxgetinfo (lua_State *L, const char *what, lua_Debug *ar,
+                       Closure *f, CallInfo *ci) {
+  int status = 1;
+  for (; *what; what++) {
+    switch (*what) {
+      case 'S': {
+        funcinfo(ar, f);
+        break;
+      }
+      case 'l': {
+        ar->currentline = (ci && isLua(ci)) ? getcurrentline(ci) : -1;
+        break;
+      }
+      case 'u': {
+        ar->nups = (f == NULL) ? 0 : f->c.nupvalues;
+        if (noLuaClosure(f)) {
+          ar->isvararg = 1;
+          ar->nparams = 0;
+        }
+        else {
+          ar->isvararg = f->l.p->is_vararg;
+          ar->nparams = f->l.p->numparams;
+        }
+        break;
+      }
+      case 't': {
+        ar->istailcall = (ci) ? ci->callstatus & CIST_TAIL : 0;
+        break;
+      }
+      case 'n': {
+        ar->namewhat = getfuncname(L, ci, &ar->name);
+        if (ar->namewhat == NULL) {
+          ar->namewhat = "";  /* not found */
+          ar->name = NULL;
+        }
+        break;
+      }
+      case 'r': {
+        if (ci == NULL || !(ci->callstatus & CIST_TRAN))
+          ar->ftransfer = ar->ntransfer = 0;
+        else {
+          ar->ftransfer = ci->u2.transferinfo.ftransfer;
+          ar->ntransfer = ci->u2.transferinfo.ntransfer;
+        }
+        break;
+      }
+      case 'L':
+      case 'f':  /* handled by lua_getinfo */
+        break;
+      default: status = 0;  /* invalid option */
+    }
+  }
+  return status;
+}
+
+
+LUA_API int lua_getinfo (lua_State *L, const char *what, lua_Debug *ar) {
+  int status;
+  Closure *cl;
+  CallInfo *ci;
+  TValue *func;
+  lua_lock(L);
+  if (*what == '>') {
+    ci = NULL;
+    func = s2v(L->top.p - 1);
+    api_check(L, ttisfunction(func), "function expected");
+    what++;  /* skip the '>' */
+    L->top.p--;  /* pop function */
+  }
+  else {
+    ci = ar->i_ci;
+    func = s2v(ci->func.p);
+    lua_assert(ttisfunction(func));
+  }
+  cl = ttisclosure(func) ? clvalue(func) : NULL;
+  status = auxgetinfo(L, what, ar, cl, ci);
+  if (strchr(what, 'f')) {
+    setobj2s(L, L->top.p, func);
+    api_incr_top(L);
+  }
+  if (strchr(what, 'L'))
+    collectvalidlines(L, cl);
+  lua_unlock(L);
+  return status;
+}
+
+
+/*
+** {======================================================
+** Symbolic Execution
+** =======================================================
+*/
+
+static const char *getobjname (const Proto *p, int lastpc, int reg,
+                               const char **name);
+
+
+/*
+** Find a "name" for the constant 'c'.
+*/
+static void kname (const Proto *p, int c, const char **name) {
+  TValue *kvalue = &p->k[c];
+  *name = (ttisstring(kvalue)) ? svalue(kvalue) : "?";
+}
+
+
+/*
+** Find a "name" for the register 'c'.
+*/
+static void rname (const Proto *p, int pc, int c, const char **name) {
+  const char *what = getobjname(p, pc, c, name); /* search for 'c' */
+  if (!(what && *what == 'c'))  /* did not find a constant name? */
+    *name = "?";
+}
+
+
+/*
+** Find a "name" for a 'C' value in an RK instruction.
+*/
+static void rkname (const Proto *p, int pc, Instruction i, const char **name) {
+  int c = GETARG_C(i);  /* key index */
+  if (GETARG_k(i))  /* is 'c' a constant? */
+    kname(p, c, name);
+  else  /* 'c' is a register */
+    rname(p, pc, c, name);
+}
+
+
+static int filterpc (int pc, int jmptarget) {
+  if (pc < jmptarget)  /* is code conditional (inside a jump)? */
+    return -1;  /* cannot know who sets that register */
+  else return pc;  /* current position sets that register */
+}
+
+
+/*
+** Try to find last instruction before 'lastpc' that modified register 'reg'.
+*/
+static int findsetreg (const Proto *p, int lastpc, int reg) {
+  int pc;
+  int setreg = -1;  /* keep last instruction that changed 'reg' */
+  int jmptarget = 0;  /* any code before this address is conditional */
+  if (testMMMode(GET_OPCODE(p->code[lastpc])))
+    lastpc--;  /* previous instruction was not actually executed */
+  for (pc = 0; pc < lastpc; pc++) {
+    Instruction i = p->code[pc];
+    OpCode op = GET_OPCODE(i);
+    int a = GETARG_A(i);
+    int change;  /* true if current instruction changed 'reg' */
+    switch (op) {
+      case OP_LOADNIL: {  /* set registers from 'a' to 'a+b' */
+        int b = GETARG_B(i);
+        change = (a <= reg && reg <= a + b);
+        break;
+      }
+      case OP_TFORCALL: {  /* affect all regs above its base */
+        change = (reg >= a + 2);
+        break;
+      }
+      case OP_CALL:
+      case OP_TAILCALL: {  /* affect all registers above base */
+        change = (reg >= a);
+        break;
+      }
+      case OP_JMP: {  /* doesn't change registers, but changes 'jmptarget' */
+        int b = GETARG_sJ(i);
+        int dest = pc + 1 + b;
+        /* jump does not skip 'lastpc' and is larger than current one? */
+        if (dest <= lastpc && dest > jmptarget)
+          jmptarget = dest;  /* update 'jmptarget' */
+        change = 0;
+        break;
+      }
+      default:  /* any instruction that sets A */
+        change = (testAMode(op) && reg == a);
+        break;
+    }
+    if (change)
+      setreg = filterpc(pc, jmptarget);
+  }
+  return setreg;
+}
+
+
+/*
+** Check whether table being indexed by instruction 'i' is the
+** environment '_ENV'
+*/
+static const char *gxf (const Proto *p, int pc, Instruction i, int isup) {
+  int t = GETARG_B(i);  /* table index */
+  const char *name;  /* name of indexed variable */
+  if (isup)  /* is an upvalue? */
+    name = upvalname(p, t);
+  else
+    getobjname(p, pc, t, &name);
+  return (name && strcmp(name, LUA_ENV) == 0) ? "global" : "field";
+}
+
+
+static const char *getobjname (const Proto *p, int lastpc, int reg,
+                               const char **name) {
+  int pc;
+  *name = luaF_getlocalname(p, reg + 1, lastpc);
+  if (*name)  /* is a local? */
+    return "local";
+  /* else try symbolic execution */
+  pc = findsetreg(p, lastpc, reg);
+  if (pc != -1) {  /* could find instruction? */
+    Instruction i = p->code[pc];
+    OpCode op = GET_OPCODE(i);
+    switch (op) {
+      case OP_MOVE: {
+        int b = GETARG_B(i);  /* move from 'b' to 'a' */
+        if (b < GETARG_A(i))
+          return getobjname(p, pc, b, name);  /* get name for 'b' */
+        break;
+      }
+      case OP_GETTABUP: {
+        int k = GETARG_C(i);  /* key index */
+        kname(p, k, name);
+        return gxf(p, pc, i, 1);
+      }
+      case OP_GETTABLE: {
+        int k = GETARG_C(i);  /* key index */
+        rname(p, pc, k, name);
+        return gxf(p, pc, i, 0);
+      }
+      case OP_GETI: {
+        *name = "integer index";
+        return "field";
+      }
+      case OP_GETFIELD: {
+        int k = GETARG_C(i);  /* key index */
+        kname(p, k, name);
+        return gxf(p, pc, i, 0);
+      }
+      case OP_GETUPVAL: {
+        *name = upvalname(p, GETARG_B(i));
+        return "upvalue";
+      }
+      case OP_LOADK:
+      case OP_LOADKX: {
+        int b = (op == OP_LOADK) ? GETARG_Bx(i)
+                                 : GETARG_Ax(p->code[pc + 1]);
+        if (ttisstring(&p->k[b])) {
+          *name = svalue(&p->k[b]);
+          return "constant";
+        }
+        break;
+      }
+      case OP_SELF: {
+        rkname(p, pc, i, name);
+        return "method";
+      }
+      default: break;  /* go through to return NULL */
+    }
+  }
+  return NULL;  /* could not find reasonable name */
+}
+
+
+/*
+** Try to find a name for a function based on the code that called it.
+** (Only works when function was called by a Lua function.)
+** Returns what the name is (e.g., "for iterator", "method",
+** "metamethod") and sets '*name' to point to the name.
+*/
+static const char *funcnamefromcode (lua_State *L, const Proto *p,
+                                     int pc, const char **name) {
+  TMS tm = (TMS)0;  /* (initial value avoids warnings) */
+  Instruction i = p->code[pc];  /* calling instruction */
+  switch (GET_OPCODE(i)) {
+    case OP_CALL:
+    case OP_TAILCALL:
+      return getobjname(p, pc, GETARG_A(i), name);  /* get function name */
+    case OP_TFORCALL: {  /* for iterator */
+      *name = "for iterator";
+       return "for iterator";
+    }
+    /* other instructions can do calls through metamethods */
+    case OP_SELF: case OP_GETTABUP: case OP_GETTABLE:
+    case OP_GETI: case OP_GETFIELD:
+      tm = TM_INDEX;
+      break;
+    case OP_SETTABUP: case OP_SETTABLE: case OP_SETI: case OP_SETFIELD:
+      tm = TM_NEWINDEX;
+      break;
+    case OP_MMBIN: case OP_MMBINI: case OP_MMBINK: {
+      tm = cast(TMS, GETARG_C(i));
+      break;
+    }
+    case OP_UNM: tm = TM_UNM; break;
+    case OP_BNOT: tm = TM_BNOT; break;
+    case OP_LEN: tm = TM_LEN; break;
+    case OP_CONCAT: tm = TM_CONCAT; break;
+    case OP_EQ: tm = TM_EQ; break;
+    /* no cases for OP_EQI and OP_EQK, as they don't call metamethods */
+    case OP_LT: case OP_LTI: case OP_GTI: tm = TM_LT; break;
+    case OP_LE: case OP_LEI: case OP_GEI: tm = TM_LE; break;
+    case OP_CLOSE: case OP_RETURN: tm = TM_CLOSE; break;
+    default:
+      return NULL;  /* cannot find a reasonable name */
+  }
+  *name = getstr(G(L)->tmname[tm]) + 2;
+  return "metamethod";
+}
+
+
+/*
+** Try to find a name for a function based on how it was called.
+*/
+static const char *funcnamefromcall (lua_State *L, CallInfo *ci,
+                                                   const char **name) {
+  if (ci->callstatus & CIST_HOOKED) {  /* was it called inside a hook? */
+    *name = "?";
+    return "hook";
+  }
+  else if (ci->callstatus & CIST_FIN) {  /* was it called as a finalizer? */
+    *name = "__gc";
+    return "metamethod";  /* report it as such */
+  }
+  else if (isLua(ci))
+    return funcnamefromcode(L, ci_func(ci)->p, currentpc(ci), name);
+  else
+    return NULL;
+}
+
+/* }====================================================== */
+
+
+
+/*
+** Check whether pointer 'o' points to some value in the stack frame of
+** the current function and, if so, returns its index.  Because 'o' may
+** not point to a value in this stack, we cannot compare it with the
+** region boundaries (undefined behavior in ISO C).
+*/
+static int instack (CallInfo *ci, const TValue *o) {
+  int pos;
+  StkId base = ci->func.p + 1;
+  for (pos = 0; base + pos < ci->top.p; pos++) {
+    if (o == s2v(base + pos))
+      return pos;
+  }
+  return -1;  /* not found */
+}
+
+
+/*
+** Checks whether value 'o' came from an upvalue. (That can only happen
+** with instructions OP_GETTABUP/OP_SETTABUP, which operate directly on
+** upvalues.)
+*/
+static const char *getupvalname (CallInfo *ci, const TValue *o,
+                                 const char **name) {
+  LClosure *c = ci_func(ci);
+  int i;
+  for (i = 0; i < c->nupvalues; i++) {
+    if (c->upvals[i]->v.p == o) {
+      *name = upvalname(c->p, i);
+      return "upvalue";
+    }
+  }
+  return NULL;
+}
+
+
+static const char *formatvarinfo (lua_State *L, const char *kind,
+                                                const char *name) {
+  if (kind == NULL)
+    return "";  /* no information */
+  else
+    return luaO_pushfstring(L, " (%s '%s')", kind, name);
+}
+
+/*
+** Build a string with a "description" for the value 'o', such as
+** "variable 'x'" or "upvalue 'y'".
+*/
+static const char *varinfo (lua_State *L, const TValue *o) {
+  CallInfo *ci = L->ci;
+  const char *name = NULL;  /* to avoid warnings */
+  const char *kind = NULL;
+  if (isLua(ci)) {
+    kind = getupvalname(ci, o, &name);  /* check whether 'o' is an upvalue */
+    if (!kind) {  /* not an upvalue? */
+      int reg = instack(ci, o);  /* try a register */
+      if (reg >= 0)  /* is 'o' a register? */
+        kind = getobjname(ci_func(ci)->p, currentpc(ci), reg, &name);
+    }
+  }
+  return formatvarinfo(L, kind, name);
+}
+
+
+/*
+** Raise a type error
+*/
+static l_noret typeerror (lua_State *L, const TValue *o, const char *op,
+                          const char *extra) {
+  const char *t = luaT_objtypename(L, o);
+  luaG_runerror(L, "attempt to %s a %s value%s", op, t, extra);
+}
+
+
+/*
+** Raise a type error with "standard" information about the faulty
+** object 'o' (using 'varinfo').
+*/
+l_noret luaG_typeerror (lua_State *L, const TValue *o, const char *op) {
+  typeerror(L, o, op, varinfo(L, o));
+}
+
+
+/*
+** Raise an error for calling a non-callable object. Try to find a name
+** for the object based on how it was called ('funcnamefromcall'); if it
+** cannot get a name there, try 'varinfo'.
+*/
+l_noret luaG_callerror (lua_State *L, const TValue *o) {
+  CallInfo *ci = L->ci;
+  const char *name = NULL;  /* to avoid warnings */
+  const char *kind = funcnamefromcall(L, ci, &name);
+  const char *extra = kind ? formatvarinfo(L, kind, name) : varinfo(L, o);
+  typeerror(L, o, "call", extra);
+}
+
+
+l_noret luaG_forerror (lua_State *L, const TValue *o, const char *what) {
+  luaG_runerror(L, "bad 'for' %s (number expected, got %s)",
+                   what, luaT_objtypename(L, o));
+}
+
+
+l_noret luaG_concaterror (lua_State *L, const TValue *p1, const TValue *p2) {
+  if (ttisstring(p1) || cvt2str(p1)) p1 = p2;
+  luaG_typeerror(L, p1, "concatenate");
+}
+
+
+l_noret luaG_opinterror (lua_State *L, const TValue *p1,
+                         const TValue *p2, const char *msg) {
+  if (!ttisnumber(p1))  /* first operand is wrong? */
+    p2 = p1;  /* now second is wrong */
+  luaG_typeerror(L, p2, msg);
+}
+
+
+/*
+** Error when both values are convertible to numbers, but not to integers
+*/
+l_noret luaG_tointerror (lua_State *L, const TValue *p1, const TValue *p2) {
+  lua_Integer temp;
+  if (!luaV_tointegerns(p1, &temp, LUA_FLOORN2I))
+    p2 = p1;
+  luaG_runerror(L, "number%s has no integer representation", varinfo(L, p2));
+}
+
+
+l_noret luaG_ordererror (lua_State *L, const TValue *p1, const TValue *p2) {
+  const char *t1 = luaT_objtypename(L, p1);
+  const char *t2 = luaT_objtypename(L, p2);
+  if (strcmp(t1, t2) == 0)
+    luaG_runerror(L, "attempt to compare two %s values", t1);
+  else
+    luaG_runerror(L, "attempt to compare %s with %s", t1, t2);
+}
+
+
+/* add src:line information to 'msg' */
+const char *luaG_addinfo (lua_State *L, const char *msg, TString *src,
+                                        int line) {
+  char buff[LUA_IDSIZE];
+  if (src)
+    luaO_chunkid(buff, getstr(src), tsslen(src));
+  else {  /* no source available; use "?" instead */
+    buff[0] = '?'; buff[1] = '\0';
+  }
+  return luaO_pushfstring(L, "%s:%d: %s", buff, line, msg);
+}
+
+
+l_noret luaG_errormsg (lua_State *L) {
+  if (L->errfunc != 0) {  /* is there an error handling function? */
+    StkId errfunc = restorestack(L, L->errfunc);
+    lua_assert(ttisfunction(s2v(errfunc)));
+    setobjs2s(L, L->top.p, L->top.p - 1);  /* move argument */
+    setobjs2s(L, L->top.p - 1, errfunc);  /* push function */
+    L->top.p++;  /* assume EXTRA_STACK */
+    luaD_callnoyield(L, L->top.p - 2, 1);  /* call it */
+  }
+  luaD_throw(L, LUA_ERRRUN);
+}
+
+
+l_noret luaG_runerror (lua_State *L, const char *fmt, ...) {
+  CallInfo *ci = L->ci;
+  const char *msg;
+  va_list argp;
+  luaC_checkGC(L);  /* error message uses memory */
+  va_start(argp, fmt);
+  msg = luaO_pushvfstring(L, fmt, argp);  /* format message */
+  va_end(argp);
+  if (isLua(ci)) {  /* if Lua function, add source:line information */
+    luaG_addinfo(L, msg, ci_func(ci)->p->source, getcurrentline(ci));
+    setobjs2s(L, L->top.p - 2, L->top.p - 1);  /* remove 'msg' */
+    L->top.p--;
+  }
+  luaG_errormsg(L);
+}
+
+
+/*
+** Check whether new instruction 'newpc' is in a different line from
+** previous instruction 'oldpc'. More often than not, 'newpc' is only
+** one or a few instructions after 'oldpc' (it must be after, see
+** caller), so try to avoid calling 'luaG_getfuncline'. If they are
+** too far apart, there is a good chance of a ABSLINEINFO in the way,
+** so it goes directly to 'luaG_getfuncline'.
+*/
+static int changedline (const Proto *p, int oldpc, int newpc) {
+  if (p->lineinfo == NULL)  /* no debug information? */
+    return 0;
+  if (newpc - oldpc < MAXIWTHABS / 2) {  /* not too far apart? */
+    int delta = 0;  /* line difference */
+    int pc = oldpc;
+    for (;;) {
+      int lineinfo = p->lineinfo[++pc];
+      if (lineinfo == ABSLINEINFO)
+        break;  /* cannot compute delta; fall through */
+      delta += lineinfo;
+      if (pc == newpc)
+        return (delta != 0);  /* delta computed successfully */
+    }
+  }
+  /* either instructions are too far apart or there is an absolute line
+     info in the way; compute line difference explicitly */
+  return (luaG_getfuncline(p, oldpc) != luaG_getfuncline(p, newpc));
+}
+
+
+/*
+** Traces the execution of a Lua function. Called before the execution
+** of each opcode, when debug is on. 'L->oldpc' stores the last
+** instruction traced, to detect line changes. When entering a new
+** function, 'npci' will be zero and will test as a new line whatever
+** the value of 'oldpc'.  Some exceptional conditions may return to
+** a function without setting 'oldpc'. In that case, 'oldpc' may be
+** invalid; if so, use zero as a valid value. (A wrong but valid 'oldpc'
+** at most causes an extra call to a line hook.)
+** This function is not "Protected" when called, so it should correct
+** 'L->top.p' before calling anything that can run the GC.
+*/
+int luaG_traceexec (lua_State *L, const Instruction *pc) {
+  CallInfo *ci = L->ci;
+  lu_byte mask = L->hookmask;
+  const Proto *p = ci_func(ci)->p;
+  int counthook;
+  if (!(mask & (LUA_MASKLINE | LUA_MASKCOUNT))) {  /* no hooks? */
+    ci->u.l.trap = 0;  /* don't need to stop again */
+    return 0;  /* turn off 'trap' */
+  }
+  pc++;  /* reference is always next instruction */
+  ci->u.l.savedpc = pc;  /* save 'pc' */
+  counthook = (--L->hookcount == 0 && (mask & LUA_MASKCOUNT));
+  if (counthook)
+    resethookcount(L);  /* reset count */
+  else if (!(mask & LUA_MASKLINE))
+    return 1;  /* no line hook and count != 0; nothing to be done now */
+  if (ci->callstatus & CIST_HOOKYIELD) {  /* called hook last time? */
+    ci->callstatus &= ~CIST_HOOKYIELD;  /* erase mark */
+    return 1;  /* do not call hook again (VM yielded, so it did not move) */
+  }
+  if (!isIT(*(ci->u.l.savedpc - 1)))  /* top not being used? */
+    L->top.p = ci->top.p;  /* correct top */
+  if (counthook)
+    luaD_hook(L, LUA_HOOKCOUNT, -1, 0, 0);  /* call count hook */
+  if (mask & LUA_MASKLINE) {
+    /* 'L->oldpc' may be invalid; use zero in this case */
+    int oldpc = (L->oldpc < p->sizecode) ? L->oldpc : 0;
+    int npci = pcRel(pc, p);
+    if (npci <= oldpc ||  /* call hook when jump back (loop), */
+        changedline(p, oldpc, npci)) {  /* or when enter new line */
+      int newline = luaG_getfuncline(p, npci);
+      luaD_hook(L, LUA_HOOKLINE, newline, 0, 0);  /* call line hook */
+    }
+    L->oldpc = npci;  /* 'pc' of last call to line hook */
+  }
+  if (L->status == LUA_YIELD) {  /* did hook yield? */
+    if (counthook)
+      L->hookcount = 1;  /* undo decrement to zero */
+    ci->u.l.savedpc--;  /* undo increment (resume will increment it again) */
+    ci->callstatus |= CIST_HOOKYIELD;  /* mark that it yielded */
+    luaD_throw(L, LUA_YIELD);
+  }
+  return 1;  /* keep 'trap' on */
+}
+
diff --git a/src/libs/3rdparty/lua/src/ldebug.h b/src/libs/3rdparty/lua/src/ldebug.h
new file mode 100644
index 0000000000..2c3074c61b
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/ldebug.h
@@ -0,0 +1,63 @@
+/*
+** $Id: ldebug.h $
+** Auxiliary functions from Debug Interface module
+** See Copyright Notice in lua.h
+*/
+
+#ifndef ldebug_h
+#define ldebug_h
+
+
+#include "lstate.h"
+
+
+#define pcRel(pc, p)	(cast_int((pc) - (p)->code) - 1)
+
+
+/* Active Lua function (given call info) */
+#define ci_func(ci)		(clLvalue(s2v((ci)->func.p)))
+
+
+#define resethookcount(L)	(L->hookcount = L->basehookcount)
+
+/*
+** mark for entries in 'lineinfo' array that has absolute information in
+** 'abslineinfo' array
+*/
+#define ABSLINEINFO	(-0x80)
+
+
+/*
+** MAXimum number of successive Instructions WiTHout ABSolute line
+** information. (A power of two allows fast divisions.)
+*/
+#if !defined(MAXIWTHABS)
+#define MAXIWTHABS	128
+#endif
+
+
+LUAI_FUNC int luaG_getfuncline (const Proto *f, int pc);
+LUAI_FUNC const char *luaG_findlocal (lua_State *L, CallInfo *ci, int n,
+                                                    StkId *pos);
+LUAI_FUNC l_noret luaG_typeerror (lua_State *L, const TValue *o,
+                                                const char *opname);
+LUAI_FUNC l_noret luaG_callerror (lua_State *L, const TValue *o);
+LUAI_FUNC l_noret luaG_forerror (lua_State *L, const TValue *o,
+                                               const char *what);
+LUAI_FUNC l_noret luaG_concaterror (lua_State *L, const TValue *p1,
+                                                  const TValue *p2);
+LUAI_FUNC l_noret luaG_opinterror (lua_State *L, const TValue *p1,
+                                                 const TValue *p2,
+                                                 const char *msg);
+LUAI_FUNC l_noret luaG_tointerror (lua_State *L, const TValue *p1,
+                                                 const TValue *p2);
+LUAI_FUNC l_noret luaG_ordererror (lua_State *L, const TValue *p1,
+                                                 const TValue *p2);
+LUAI_FUNC l_noret luaG_runerror (lua_State *L, const char *fmt, ...);
+LUAI_FUNC const char *luaG_addinfo (lua_State *L, const char *msg,
+                                                  TString *src, int line);
+LUAI_FUNC l_noret luaG_errormsg (lua_State *L);
+LUAI_FUNC int luaG_traceexec (lua_State *L, const Instruction *pc);
+
+
+#endif
diff --git a/src/libs/3rdparty/lua/src/ldo.c b/src/libs/3rdparty/lua/src/ldo.c
new file mode 100644
index 0000000000..2a0017ca62
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/ldo.c
@@ -0,0 +1,1024 @@
+/*
+** $Id: ldo.c $
+** Stack and Call structure of Lua
+** See Copyright Notice in lua.h
+*/
+
+#define ldo_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include <setjmp.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "lua.h"
+
+#include "lapi.h"
+#include "ldebug.h"
+#include "ldo.h"
+#include "lfunc.h"
+#include "lgc.h"
+#include "lmem.h"
+#include "lobject.h"
+#include "lopcodes.h"
+#include "lparser.h"
+#include "lstate.h"
+#include "lstring.h"
+#include "ltable.h"
+#include "ltm.h"
+#include "lundump.h"
+#include "lvm.h"
+#include "lzio.h"
+
+
+
+#define errorstatus(s)	((s) > LUA_YIELD)
+
+
+/*
+** {======================================================
+** Error-recovery functions
+** =======================================================
+*/
+
+/*
+** LUAI_THROW/LUAI_TRY define how Lua does exception handling. By
+** default, Lua handles errors with exceptions when compiling as
+** C++ code, with _longjmp/_setjmp when asked to use them, and with
+** longjmp/setjmp otherwise.
+*/
+#if !defined(LUAI_THROW)				/* { */
+
+#if defined(__cplusplus) && !defined(LUA_USE_LONGJMP)	/* { */
+
+/* C++ exceptions */
+#define LUAI_THROW(L,c)		throw(c)
+#define LUAI_TRY(L,c,a) \
+	try { a } catch(...) { if ((c)->status == 0) (c)->status = -1; }
+#define luai_jmpbuf		int  /* dummy variable */
+
+#elif defined(LUA_USE_POSIX)				/* }{ */
+
+/* in POSIX, try _longjmp/_setjmp (more efficient) */
+#define LUAI_THROW(L,c)		_longjmp((c)->b, 1)
+#define LUAI_TRY(L,c,a)		if (_setjmp((c)->b) == 0) { a }
+#define luai_jmpbuf		jmp_buf
+
+#else							/* }{ */
+
+/* ISO C handling with long jumps */
+#define LUAI_THROW(L,c)		longjmp((c)->b, 1)
+#define LUAI_TRY(L,c,a)		if (setjmp((c)->b) == 0) { a }
+#define luai_jmpbuf		jmp_buf
+
+#endif							/* } */
+
+#endif							/* } */
+
+
+
+/* chain list of long jump buffers */
+struct lua_longjmp {
+  struct lua_longjmp *previous;
+  luai_jmpbuf b;
+  volatile int status;  /* error code */
+};
+
+
+void luaD_seterrorobj (lua_State *L, int errcode, StkId oldtop) {
+  switch (errcode) {
+    case LUA_ERRMEM: {  /* memory error? */
+      setsvalue2s(L, oldtop, G(L)->memerrmsg); /* reuse preregistered msg. */
+      break;
+    }
+    case LUA_ERRERR: {
+      setsvalue2s(L, oldtop, luaS_newliteral(L, "error in error handling"));
+      break;
+    }
+    case LUA_OK: {  /* special case only for closing upvalues */
+      setnilvalue(s2v(oldtop));  /* no error message */
+      break;
+    }
+    default: {
+      lua_assert(errorstatus(errcode));  /* real error */
+      setobjs2s(L, oldtop, L->top.p - 1);  /* error message on current top */
+      break;
+    }
+  }
+  L->top.p = oldtop + 1;
+}
+
+
+l_noret luaD_throw (lua_State *L, int errcode) {
+  if (L->errorJmp) {  /* thread has an error handler? */
+    L->errorJmp->status = errcode;  /* set status */
+    LUAI_THROW(L, L->errorJmp);  /* jump to it */
+  }
+  else {  /* thread has no error handler */
+    global_State *g = G(L);
+    errcode = luaE_resetthread(L, errcode);  /* close all upvalues */
+    if (g->mainthread->errorJmp) {  /* main thread has a handler? */
+      setobjs2s(L, g->mainthread->top.p++, L->top.p - 1);  /* copy error obj. */
+      luaD_throw(g->mainthread, errcode);  /* re-throw in main thread */
+    }
+    else {  /* no handler at all; abort */
+      if (g->panic) {  /* panic function? */
+        lua_unlock(L);
+        g->panic(L);  /* call panic function (last chance to jump out) */
+      }
+      abort();
+    }
+  }
+}
+
+
+int luaD_rawrunprotected (lua_State *L, Pfunc f, void *ud) {
+  l_uint32 oldnCcalls = L->nCcalls;
+  struct lua_longjmp lj;
+  lj.status = LUA_OK;
+  lj.previous = L->errorJmp;  /* chain new error handler */
+  L->errorJmp = &lj;
+  LUAI_TRY(L, &lj,
+    (*f)(L, ud);
+  );
+  L->errorJmp = lj.previous;  /* restore old error handler */
+  L->nCcalls = oldnCcalls;
+  return lj.status;
+}
+
+/* }====================================================== */
+
+
+/*
+** {==================================================================
+** Stack reallocation
+** ===================================================================
+*/
+
+
+/*
+** Change all pointers to the stack into offsets.
+*/
+static void relstack (lua_State *L) {
+  CallInfo *ci;
+  UpVal *up;
+  L->top.offset = savestack(L, L->top.p);
+  L->tbclist.offset = savestack(L, L->tbclist.p);
+  for (up = L->openupval; up != NULL; up = up->u.open.next)
+    up->v.offset = savestack(L, uplevel(up));
+  for (ci = L->ci; ci != NULL; ci = ci->previous) {
+    ci->top.offset = savestack(L, ci->top.p);
+    ci->func.offset = savestack(L, ci->func.p);
+  }
+}
+
+
+/*
+** Change back all offsets into pointers.
+*/
+static void correctstack (lua_State *L) {
+  CallInfo *ci;
+  UpVal *up;
+  L->top.p = restorestack(L, L->top.offset);
+  L->tbclist.p = restorestack(L, L->tbclist.offset);
+  for (up = L->openupval; up != NULL; up = up->u.open.next)
+    up->v.p = s2v(restorestack(L, up->v.offset));
+  for (ci = L->ci; ci != NULL; ci = ci->previous) {
+    ci->top.p = restorestack(L, ci->top.offset);
+    ci->func.p = restorestack(L, ci->func.offset);
+    if (isLua(ci))
+      ci->u.l.trap = 1;  /* signal to update 'trap' in 'luaV_execute' */
+  }
+}
+
+
+/* some space for error handling */
+#define ERRORSTACKSIZE	(LUAI_MAXSTACK + 200)
+
+/*
+** Reallocate the stack to a new size, correcting all pointers into it.
+** In ISO C, any pointer use after the pointer has been deallocated is
+** undefined behavior. So, before the reallocation, all pointers are
+** changed to offsets, and after the reallocation they are changed back
+** to pointers. As during the reallocation the pointers are invalid, the
+** reallocation cannot run emergency collections.
+**
+** In case of allocation error, raise an error or return false according
+** to 'raiseerror'.
+*/
+int luaD_reallocstack (lua_State *L, int newsize, int raiseerror) {
+  int oldsize = stacksize(L);
+  int i;
+  StkId newstack;
+  int oldgcstop = G(L)->gcstopem;
+  lua_assert(newsize <= LUAI_MAXSTACK || newsize == ERRORSTACKSIZE);
+  relstack(L);  /* change pointers to offsets */
+  G(L)->gcstopem = 1;  /* stop emergency collection */
+  newstack = luaM_reallocvector(L, L->stack.p, oldsize + EXTRA_STACK,
+                                   newsize + EXTRA_STACK, StackValue);
+  G(L)->gcstopem = oldgcstop;  /* restore emergency collection */
+  if (l_unlikely(newstack == NULL)) {  /* reallocation failed? */
+    correctstack(L);  /* change offsets back to pointers */
+    if (raiseerror)
+      luaM_error(L);
+    else return 0;  /* do not raise an error */
+  }
+  L->stack.p = newstack;
+  correctstack(L);  /* change offsets back to pointers */
+  L->stack_last.p = L->stack.p + newsize;
+  for (i = oldsize + EXTRA_STACK; i < newsize + EXTRA_STACK; i++)
+    setnilvalue(s2v(newstack + i)); /* erase new segment */
+  return 1;
+}
+
+
+/*
+** Try to grow the stack by at least 'n' elements. When 'raiseerror'
+** is true, raises any error; otherwise, return 0 in case of errors.
+*/
+int luaD_growstack (lua_State *L, int n, int raiseerror) {
+  int size = stacksize(L);
+  if (l_unlikely(size > LUAI_MAXSTACK)) {
+    /* if stack is larger than maximum, thread is already using the
+       extra space reserved for errors, that is, thread is handling
+       a stack error; cannot grow further than that. */
+    lua_assert(stacksize(L) == ERRORSTACKSIZE);
+    if (raiseerror)
+      luaD_throw(L, LUA_ERRERR);  /* error inside message handler */
+    return 0;  /* if not 'raiseerror', just signal it */
+  }
+  else if (n < LUAI_MAXSTACK) {  /* avoids arithmetic overflows */
+    int newsize = 2 * size;  /* tentative new size */
+    int needed = cast_int(L->top.p - L->stack.p) + n;
+    if (newsize > LUAI_MAXSTACK)  /* cannot cross the limit */
+      newsize = LUAI_MAXSTACK;
+    if (newsize < needed)  /* but must respect what was asked for */
+      newsize = needed;
+    if (l_likely(newsize <= LUAI_MAXSTACK))
+      return luaD_reallocstack(L, newsize, raiseerror);
+  }
+  /* else stack overflow */
+  /* add extra size to be able to handle the error message */
+  luaD_reallocstack(L, ERRORSTACKSIZE, raiseerror);
+  if (raiseerror)
+    luaG_runerror(L, "stack overflow");
+  return 0;
+}
+
+
+/*
+** Compute how much of the stack is being used, by computing the
+** maximum top of all call frames in the stack and the current top.
+*/
+static int stackinuse (lua_State *L) {
+  CallInfo *ci;
+  int res;
+  StkId lim = L->top.p;
+  for (ci = L->ci; ci != NULL; ci = ci->previous) {
+    if (lim < ci->top.p) lim = ci->top.p;
+  }
+  lua_assert(lim <= L->stack_last.p + EXTRA_STACK);
+  res = cast_int(lim - L->stack.p) + 1;  /* part of stack in use */
+  if (res < LUA_MINSTACK)
+    res = LUA_MINSTACK;  /* ensure a minimum size */
+  return res;
+}
+
+
+/*
+** If stack size is more than 3 times the current use, reduce that size
+** to twice the current use. (So, the final stack size is at most 2/3 the
+** previous size, and half of its entries are empty.)
+** As a particular case, if stack was handling a stack overflow and now
+** it is not, 'max' (limited by LUAI_MAXSTACK) will be smaller than
+** stacksize (equal to ERRORSTACKSIZE in this case), and so the stack
+** will be reduced to a "regular" size.
+*/
+void luaD_shrinkstack (lua_State *L) {
+  int inuse = stackinuse(L);
+  int max = (inuse > LUAI_MAXSTACK / 3) ? LUAI_MAXSTACK : inuse * 3;
+  /* if thread is currently not handling a stack overflow and its
+     size is larger than maximum "reasonable" size, shrink it */
+  if (inuse <= LUAI_MAXSTACK && stacksize(L) > max) {
+    int nsize = (inuse > LUAI_MAXSTACK / 2) ? LUAI_MAXSTACK : inuse * 2;
+    luaD_reallocstack(L, nsize, 0);  /* ok if that fails */
+  }
+  else  /* don't change stack */
+    condmovestack(L,{},{});  /* (change only for debugging) */
+  luaE_shrinkCI(L);  /* shrink CI list */
+}
+
+
+void luaD_inctop (lua_State *L) {
+  luaD_checkstack(L, 1);
+  L->top.p++;
+}
+
+/* }================================================================== */
+
+
+/*
+** Call a hook for the given event. Make sure there is a hook to be
+** called. (Both 'L->hook' and 'L->hookmask', which trigger this
+** function, can be changed asynchronously by signals.)
+*/
+void luaD_hook (lua_State *L, int event, int line,
+                              int ftransfer, int ntransfer) {
+  lua_Hook hook = L->hook;
+  if (hook && L->allowhook) {  /* make sure there is a hook */
+    int mask = CIST_HOOKED;
+    CallInfo *ci = L->ci;
+    ptrdiff_t top = savestack(L, L->top.p);  /* preserve original 'top' */
+    ptrdiff_t ci_top = savestack(L, ci->top.p);  /* idem for 'ci->top' */
+    lua_Debug ar;
+    ar.event = event;
+    ar.currentline = line;
+    ar.i_ci = ci;
+    if (ntransfer != 0) {
+      mask |= CIST_TRAN;  /* 'ci' has transfer information */
+      ci->u2.transferinfo.ftransfer = ftransfer;
+      ci->u2.transferinfo.ntransfer = ntransfer;
+    }
+    if (isLua(ci) && L->top.p < ci->top.p)
+      L->top.p = ci->top.p;  /* protect entire activation register */
+    luaD_checkstack(L, LUA_MINSTACK);  /* ensure minimum stack size */
+    if (ci->top.p < L->top.p + LUA_MINSTACK)
+      ci->top.p = L->top.p + LUA_MINSTACK;
+    L->allowhook = 0;  /* cannot call hooks inside a hook */
+    ci->callstatus |= mask;
+    lua_unlock(L);
+    (*hook)(L, &ar);
+    lua_lock(L);
+    lua_assert(!L->allowhook);
+    L->allowhook = 1;
+    ci->top.p = restorestack(L, ci_top);
+    L->top.p = restorestack(L, top);
+    ci->callstatus &= ~mask;
+  }
+}
+
+
+/*
+** Executes a call hook for Lua functions. This function is called
+** whenever 'hookmask' is not zero, so it checks whether call hooks are
+** active.
+*/
+void luaD_hookcall (lua_State *L, CallInfo *ci) {
+  L->oldpc = 0;  /* set 'oldpc' for new function */
+  if (L->hookmask & LUA_MASKCALL) {  /* is call hook on? */
+    int event = (ci->callstatus & CIST_TAIL) ? LUA_HOOKTAILCALL
+                                             : LUA_HOOKCALL;
+    Proto *p = ci_func(ci)->p;
+    ci->u.l.savedpc++;  /* hooks assume 'pc' is already incremented */
+    luaD_hook(L, event, -1, 1, p->numparams);
+    ci->u.l.savedpc--;  /* correct 'pc' */
+  }
+}
+
+
+/*
+** Executes a return hook for Lua and C functions and sets/corrects
+** 'oldpc'. (Note that this correction is needed by the line hook, so it
+** is done even when return hooks are off.)
+*/
+static void rethook (lua_State *L, CallInfo *ci, int nres) {
+  if (L->hookmask & LUA_MASKRET) {  /* is return hook on? */
+    StkId firstres = L->top.p - nres;  /* index of first result */
+    int delta = 0;  /* correction for vararg functions */
+    int ftransfer;
+    if (isLua(ci)) {
+      Proto *p = ci_func(ci)->p;
+      if (p->is_vararg)
+        delta = ci->u.l.nextraargs + p->numparams + 1;
+    }
+    ci->func.p += delta;  /* if vararg, back to virtual 'func' */
+    ftransfer = cast(unsigned short, firstres - ci->func.p);
+    luaD_hook(L, LUA_HOOKRET, -1, ftransfer, nres);  /* call it */
+    ci->func.p -= delta;
+  }
+  if (isLua(ci = ci->previous))
+    L->oldpc = pcRel(ci->u.l.savedpc, ci_func(ci)->p);  /* set 'oldpc' */
+}
+
+
+/*
+** Check whether 'func' has a '__call' metafield. If so, put it in the
+** stack, below original 'func', so that 'luaD_precall' can call it. Raise
+** an error if there is no '__call' metafield.
+*/
+StkId luaD_tryfuncTM (lua_State *L, StkId func) {
+  const TValue *tm;
+  StkId p;
+  checkstackGCp(L, 1, func);  /* space for metamethod */
+  tm = luaT_gettmbyobj(L, s2v(func), TM_CALL);  /* (after previous GC) */
+  if (l_unlikely(ttisnil(tm)))
+    luaG_callerror(L, s2v(func));  /* nothing to call */
+  for (p = L->top.p; p > func; p--)  /* open space for metamethod */
+    setobjs2s(L, p, p-1);
+  L->top.p++;  /* stack space pre-allocated by the caller */
+  setobj2s(L, func, tm);  /* metamethod is the new function to be called */
+  return func;
+}
+
+
+/*
+** Given 'nres' results at 'firstResult', move 'wanted' of them to 'res'.
+** Handle most typical cases (zero results for commands, one result for
+** expressions, multiple results for tail calls/single parameters)
+** separated.
+*/
+l_sinline void moveresults (lua_State *L, StkId res, int nres, int wanted) {
+  StkId firstresult;
+  int i;
+  switch (wanted) {  /* handle typical cases separately */
+    case 0:  /* no values needed */
+      L->top.p = res;
+      return;
+    case 1:  /* one value needed */
+      if (nres == 0)   /* no results? */
+        setnilvalue(s2v(res));  /* adjust with nil */
+      else  /* at least one result */
+        setobjs2s(L, res, L->top.p - nres);  /* move it to proper place */
+      L->top.p = res + 1;
+      return;
+    case LUA_MULTRET:
+      wanted = nres;  /* we want all results */
+      break;
+    default:  /* two/more results and/or to-be-closed variables */
+      if (hastocloseCfunc(wanted)) {  /* to-be-closed variables? */
+        L->ci->callstatus |= CIST_CLSRET;  /* in case of yields */
+        L->ci->u2.nres = nres;
+        res = luaF_close(L, res, CLOSEKTOP, 1);
+        L->ci->callstatus &= ~CIST_CLSRET;
+        if (L->hookmask) {  /* if needed, call hook after '__close's */
+          ptrdiff_t savedres = savestack(L, res);
+          rethook(L, L->ci, nres);
+          res = restorestack(L, savedres);  /* hook can move stack */
+        }
+        wanted = decodeNresults(wanted);
+        if (wanted == LUA_MULTRET)
+          wanted = nres;  /* we want all results */
+      }
+      break;
+  }
+  /* generic case */
+  firstresult = L->top.p - nres;  /* index of first result */
+  if (nres > wanted)  /* extra results? */
+    nres = wanted;  /* don't need them */
+  for (i = 0; i < nres; i++)  /* move all results to correct place */
+    setobjs2s(L, res + i, firstresult + i);
+  for (; i < wanted; i++)  /* complete wanted number of results */
+    setnilvalue(s2v(res + i));
+  L->top.p = res + wanted;  /* top points after the last result */
+}
+
+
+/*
+** Finishes a function call: calls hook if necessary, moves current
+** number of results to proper place, and returns to previous call
+** info. If function has to close variables, hook must be called after
+** that.
+*/
+void luaD_poscall (lua_State *L, CallInfo *ci, int nres) {
+  int wanted = ci->nresults;
+  if (l_unlikely(L->hookmask && !hastocloseCfunc(wanted)))
+    rethook(L, ci, nres);
+  /* move results to proper place */
+  moveresults(L, ci->func.p, nres, wanted);
+  /* function cannot be in any of these cases when returning */
+  lua_assert(!(ci->callstatus &
+        (CIST_HOOKED | CIST_YPCALL | CIST_FIN | CIST_TRAN | CIST_CLSRET)));
+  L->ci = ci->previous;  /* back to caller (after closing variables) */
+}
+
+
+
+#define next_ci(L)  (L->ci->next ? L->ci->next : luaE_extendCI(L))
+
+
+l_sinline CallInfo *prepCallInfo (lua_State *L, StkId func, int nret,
+                                                int mask, StkId top) {
+  CallInfo *ci = L->ci = next_ci(L);  /* new frame */
+  ci->func.p = func;
+  ci->nresults = nret;
+  ci->callstatus = mask;
+  ci->top.p = top;
+  return ci;
+}
+
+
+/*
+** precall for C functions
+*/
+l_sinline int precallC (lua_State *L, StkId func, int nresults,
+                                            lua_CFunction f) {
+  int n;  /* number of returns */
+  CallInfo *ci;
+  checkstackGCp(L, LUA_MINSTACK, func);  /* ensure minimum stack size */
+  L->ci = ci = prepCallInfo(L, func, nresults, CIST_C,
+                               L->top.p + LUA_MINSTACK);
+  lua_assert(ci->top.p <= L->stack_last.p);
+  if (l_unlikely(L->hookmask & LUA_MASKCALL)) {
+    int narg = cast_int(L->top.p - func) - 1;
+    luaD_hook(L, LUA_HOOKCALL, -1, 1, narg);
+  }
+  lua_unlock(L);
+  n = (*f)(L);  /* do the actual call */
+  lua_lock(L);
+  api_checknelems(L, n);
+  luaD_poscall(L, ci, n);
+  return n;
+}
+
+
+/*
+** Prepare a function for a tail call, building its call info on top
+** of the current call info. 'narg1' is the number of arguments plus 1
+** (so that it includes the function itself). Return the number of
+** results, if it was a C function, or -1 for a Lua function.
+*/
+int luaD_pretailcall (lua_State *L, CallInfo *ci, StkId func,
+                                    int narg1, int delta) {
+ retry:
+  switch (ttypetag(s2v(func))) {
+    case LUA_VCCL:  /* C closure */
+      return precallC(L, func, LUA_MULTRET, clCvalue(s2v(func))->f);
+    case LUA_VLCF:  /* light C function */
+      return precallC(L, func, LUA_MULTRET, fvalue(s2v(func)));
+    case LUA_VLCL: {  /* Lua function */
+      Proto *p = clLvalue(s2v(func))->p;
+      int fsize = p->maxstacksize;  /* frame size */
+      int nfixparams = p->numparams;
+      int i;
+      checkstackGCp(L, fsize - delta, func);
+      ci->func.p -= delta;  /* restore 'func' (if vararg) */
+      for (i = 0; i < narg1; i++)  /* move down function and arguments */
+        setobjs2s(L, ci->func.p + i, func + i);
+      func = ci->func.p;  /* moved-down function */
+      for (; narg1 <= nfixparams; narg1++)
+        setnilvalue(s2v(func + narg1));  /* complete missing arguments */
+      ci->top.p = func + 1 + fsize;  /* top for new function */
+      lua_assert(ci->top.p <= L->stack_last.p);
+      ci->u.l.savedpc = p->code;  /* starting point */
+      ci->callstatus |= CIST_TAIL;
+      L->top.p = func + narg1;  /* set top */
+      return -1;
+    }
+    default: {  /* not a function */
+      func = luaD_tryfuncTM(L, func);  /* try to get '__call' metamethod */
+      /* return luaD_pretailcall(L, ci, func, narg1 + 1, delta); */
+      narg1++;
+      goto retry;  /* try again */
+    }
+  }
+}
+
+
+/*
+** Prepares the call to a function (C or Lua). For C functions, also do
+** the call. The function to be called is at '*func'.  The arguments
+** are on the stack, right after the function.  Returns the CallInfo
+** to be executed, if it was a Lua function. Otherwise (a C function)
+** returns NULL, with all the results on the stack, starting at the
+** original function position.
+*/
+CallInfo *luaD_precall (lua_State *L, StkId func, int nresults) {
+ retry:
+  switch (ttypetag(s2v(func))) {
+    case LUA_VCCL:  /* C closure */
+      precallC(L, func, nresults, clCvalue(s2v(func))->f);
+      return NULL;
+    case LUA_VLCF:  /* light C function */
+      precallC(L, func, nresults, fvalue(s2v(func)));
+      return NULL;
+    case LUA_VLCL: {  /* Lua function */
+      CallInfo *ci;
+      Proto *p = clLvalue(s2v(func))->p;
+      int narg = cast_int(L->top.p - func) - 1;  /* number of real arguments */
+      int nfixparams = p->numparams;
+      int fsize = p->maxstacksize;  /* frame size */
+      checkstackGCp(L, fsize, func);
+      L->ci = ci = prepCallInfo(L, func, nresults, 0, func + 1 + fsize);
+      ci->u.l.savedpc = p->code;  /* starting point */
+      for (; narg < nfixparams; narg++)
+        setnilvalue(s2v(L->top.p++));  /* complete missing arguments */
+      lua_assert(ci->top.p <= L->stack_last.p);
+      return ci;
+    }
+    default: {  /* not a function */
+      func = luaD_tryfuncTM(L, func);  /* try to get '__call' metamethod */
+      /* return luaD_precall(L, func, nresults); */
+      goto retry;  /* try again with metamethod */
+    }
+  }
+}
+
+
+/*
+** Call a function (C or Lua) through C. 'inc' can be 1 (increment
+** number of recursive invocations in the C stack) or nyci (the same
+** plus increment number of non-yieldable calls).
+** This function can be called with some use of EXTRA_STACK, so it should
+** check the stack before doing anything else. 'luaD_precall' already
+** does that.
+*/
+l_sinline void ccall (lua_State *L, StkId func, int nResults, l_uint32 inc) {
+  CallInfo *ci;
+  L->nCcalls += inc;
+  if (l_unlikely(getCcalls(L) >= LUAI_MAXCCALLS)) {
+    checkstackp(L, 0, func);  /* free any use of EXTRA_STACK */
+    luaE_checkcstack(L);
+  }
+  if ((ci = luaD_precall(L, func, nResults)) != NULL) {  /* Lua function? */
+    ci->callstatus = CIST_FRESH;  /* mark that it is a "fresh" execute */
+    luaV_execute(L, ci);  /* call it */
+  }
+  L->nCcalls -= inc;
+}
+
+
+/*
+** External interface for 'ccall'
+*/
+void luaD_call (lua_State *L, StkId func, int nResults) {
+  ccall(L, func, nResults, 1);
+}
+
+
+/*
+** Similar to 'luaD_call', but does not allow yields during the call.
+*/
+void luaD_callnoyield (lua_State *L, StkId func, int nResults) {
+  ccall(L, func, nResults, nyci);
+}
+
+
+/*
+** Finish the job of 'lua_pcallk' after it was interrupted by an yield.
+** (The caller, 'finishCcall', does the final call to 'adjustresults'.)
+** The main job is to complete the 'luaD_pcall' called by 'lua_pcallk'.
+** If a '__close' method yields here, eventually control will be back
+** to 'finishCcall' (when that '__close' method finally returns) and
+** 'finishpcallk' will run again and close any still pending '__close'
+** methods. Similarly, if a '__close' method errs, 'precover' calls
+** 'unroll' which calls ''finishCcall' and we are back here again, to
+** close any pending '__close' methods.
+** Note that, up to the call to 'luaF_close', the corresponding
+** 'CallInfo' is not modified, so that this repeated run works like the
+** first one (except that it has at least one less '__close' to do). In
+** particular, field CIST_RECST preserves the error status across these
+** multiple runs, changing only if there is a new error.
+*/
+static int finishpcallk (lua_State *L,  CallInfo *ci) {
+  int status = getcistrecst(ci);  /* get original status */
+  if (l_likely(status == LUA_OK))  /* no error? */
+    status = LUA_YIELD;  /* was interrupted by an yield */
+  else {  /* error */
+    StkId func = restorestack(L, ci->u2.funcidx);
+    L->allowhook = getoah(ci->callstatus);  /* restore 'allowhook' */
+    func = luaF_close(L, func, status, 1);  /* can yield or raise an error */
+    luaD_seterrorobj(L, status, func);
+    luaD_shrinkstack(L);   /* restore stack size in case of overflow */
+    setcistrecst(ci, LUA_OK);  /* clear original status */
+  }
+  ci->callstatus &= ~CIST_YPCALL;
+  L->errfunc = ci->u.c.old_errfunc;
+  /* if it is here, there were errors or yields; unlike 'lua_pcallk',
+     do not change status */
+  return status;
+}
+
+
+/*
+** Completes the execution of a C function interrupted by an yield.
+** The interruption must have happened while the function was either
+** closing its tbc variables in 'moveresults' or executing
+** 'lua_callk'/'lua_pcallk'. In the first case, it just redoes
+** 'luaD_poscall'. In the second case, the call to 'finishpcallk'
+** finishes the interrupted execution of 'lua_pcallk'.  After that, it
+** calls the continuation of the interrupted function and finally it
+** completes the job of the 'luaD_call' that called the function.  In
+** the call to 'adjustresults', we do not know the number of results
+** of the function called by 'lua_callk'/'lua_pcallk', so we are
+** conservative and use LUA_MULTRET (always adjust).
+*/
+static void finishCcall (lua_State *L, CallInfo *ci) {
+  int n;  /* actual number of results from C function */
+  if (ci->callstatus & CIST_CLSRET) {  /* was returning? */
+    lua_assert(hastocloseCfunc(ci->nresults));
+    n = ci->u2.nres;  /* just redo 'luaD_poscall' */
+    /* don't need to reset CIST_CLSRET, as it will be set again anyway */
+  }
+  else {
+    int status = LUA_YIELD;  /* default if there were no errors */
+    /* must have a continuation and must be able to call it */
+    lua_assert(ci->u.c.k != NULL && yieldable(L));
+    if (ci->callstatus & CIST_YPCALL)   /* was inside a 'lua_pcallk'? */
+      status = finishpcallk(L, ci);  /* finish it */
+    adjustresults(L, LUA_MULTRET);  /* finish 'lua_callk' */
+    lua_unlock(L);
+    n = (*ci->u.c.k)(L, status, ci->u.c.ctx);  /* call continuation */
+    lua_lock(L);
+    api_checknelems(L, n);
+  }
+  luaD_poscall(L, ci, n);  /* finish 'luaD_call' */
+}
+
+
+/*
+** Executes "full continuation" (everything in the stack) of a
+** previously interrupted coroutine until the stack is empty (or another
+** interruption long-jumps out of the loop).
+*/
+static void unroll (lua_State *L, void *ud) {
+  CallInfo *ci;
+  UNUSED(ud);
+  while ((ci = L->ci) != &L->base_ci) {  /* something in the stack */
+    if (!isLua(ci))  /* C function? */
+      finishCcall(L, ci);  /* complete its execution */
+    else {  /* Lua function */
+      luaV_finishOp(L);  /* finish interrupted instruction */
+      luaV_execute(L, ci);  /* execute down to higher C 'boundary' */
+    }
+  }
+}
+
+
+/*
+** Try to find a suspended protected call (a "recover point") for the
+** given thread.
+*/
+static CallInfo *findpcall (lua_State *L) {
+  CallInfo *ci;
+  for (ci = L->ci; ci != NULL; ci = ci->previous) {  /* search for a pcall */
+    if (ci->callstatus & CIST_YPCALL)
+      return ci;
+  }
+  return NULL;  /* no pending pcall */
+}
+
+
+/*
+** Signal an error in the call to 'lua_resume', not in the execution
+** of the coroutine itself. (Such errors should not be handled by any
+** coroutine error handler and should not kill the coroutine.)
+*/
+static int resume_error (lua_State *L, const char *msg, int narg) {
+  L->top.p -= narg;  /* remove args from the stack */
+  setsvalue2s(L, L->top.p, luaS_new(L, msg));  /* push error message */
+  api_incr_top(L);
+  lua_unlock(L);
+  return LUA_ERRRUN;
+}
+
+
+/*
+** Do the work for 'lua_resume' in protected mode. Most of the work
+** depends on the status of the coroutine: initial state, suspended
+** inside a hook, or regularly suspended (optionally with a continuation
+** function), plus erroneous cases: non-suspended coroutine or dead
+** coroutine.
+*/
+static void resume (lua_State *L, void *ud) {
+  int n = *(cast(int*, ud));  /* number of arguments */
+  StkId firstArg = L->top.p - n;  /* first argument */
+  CallInfo *ci = L->ci;
+  if (L->status == LUA_OK)  /* starting a coroutine? */
+    ccall(L, firstArg - 1, LUA_MULTRET, 0);  /* just call its body */
+  else {  /* resuming from previous yield */
+    lua_assert(L->status == LUA_YIELD);
+    L->status = LUA_OK;  /* mark that it is running (again) */
+    if (isLua(ci)) {  /* yielded inside a hook? */
+      L->top.p = firstArg;  /* discard arguments */
+      luaV_execute(L, ci);  /* just continue running Lua code */
+    }
+    else {  /* 'common' yield */
+      if (ci->u.c.k != NULL) {  /* does it have a continuation function? */
+        lua_unlock(L);
+        n = (*ci->u.c.k)(L, LUA_YIELD, ci->u.c.ctx); /* call continuation */
+        lua_lock(L);
+        api_checknelems(L, n);
+      }
+      luaD_poscall(L, ci, n);  /* finish 'luaD_call' */
+    }
+    unroll(L, NULL);  /* run continuation */
+  }
+}
+
+
+/*
+** Unrolls a coroutine in protected mode while there are recoverable
+** errors, that is, errors inside a protected call. (Any error
+** interrupts 'unroll', and this loop protects it again so it can
+** continue.) Stops with a normal end (status == LUA_OK), an yield
+** (status == LUA_YIELD), or an unprotected error ('findpcall' doesn't
+** find a recover point).
+*/
+static int precover (lua_State *L, int status) {
+  CallInfo *ci;
+  while (errorstatus(status) && (ci = findpcall(L)) != NULL) {
+    L->ci = ci;  /* go down to recovery functions */
+    setcistrecst(ci, status);  /* status to finish 'pcall' */
+    status = luaD_rawrunprotected(L, unroll, NULL);
+  }
+  return status;
+}
+
+
+LUA_API int lua_resume (lua_State *L, lua_State *from, int nargs,
+                                      int *nresults) {
+  int status;
+  lua_lock(L);
+  if (L->status == LUA_OK) {  /* may be starting a coroutine */
+    if (L->ci != &L->base_ci)  /* not in base level? */
+      return resume_error(L, "cannot resume non-suspended coroutine", nargs);
+    else if (L->top.p - (L->ci->func.p + 1) == nargs)  /* no function? */
+      return resume_error(L, "cannot resume dead coroutine", nargs);
+  }
+  else if (L->status != LUA_YIELD)  /* ended with errors? */
+    return resume_error(L, "cannot resume dead coroutine", nargs);
+  L->nCcalls = (from) ? getCcalls(from) : 0;
+  if (getCcalls(L) >= LUAI_MAXCCALLS)
+    return resume_error(L, "C stack overflow", nargs);
+  L->nCcalls++;
+  luai_userstateresume(L, nargs);
+  api_checknelems(L, (L->status == LUA_OK) ? nargs + 1 : nargs);
+  status = luaD_rawrunprotected(L, resume, &nargs);
+   /* continue running after recoverable errors */
+  status = precover(L, status);
+  if (l_likely(!errorstatus(status)))
+    lua_assert(status == L->status);  /* normal end or yield */
+  else {  /* unrecoverable error */
+    L->status = cast_byte(status);  /* mark thread as 'dead' */
+    luaD_seterrorobj(L, status, L->top.p);  /* push error message */
+    L->ci->top.p = L->top.p;
+  }
+  *nresults = (status == LUA_YIELD) ? L->ci->u2.nyield
+                                    : cast_int(L->top.p - (L->ci->func.p + 1));
+  lua_unlock(L);
+  return status;
+}
+
+
+LUA_API int lua_isyieldable (lua_State *L) {
+  return yieldable(L);
+}
+
+
+LUA_API int lua_yieldk (lua_State *L, int nresults, lua_KContext ctx,
+                        lua_KFunction k) {
+  CallInfo *ci;
+  luai_userstateyield(L, nresults);
+  lua_lock(L);
+  ci = L->ci;
+  api_checknelems(L, nresults);
+  if (l_unlikely(!yieldable(L))) {
+    if (L != G(L)->mainthread)
+      luaG_runerror(L, "attempt to yield across a C-call boundary");
+    else
+      luaG_runerror(L, "attempt to yield from outside a coroutine");
+  }
+  L->status = LUA_YIELD;
+  ci->u2.nyield = nresults;  /* save number of results */
+  if (isLua(ci)) {  /* inside a hook? */
+    lua_assert(!isLuacode(ci));
+    api_check(L, nresults == 0, "hooks cannot yield values");
+    api_check(L, k == NULL, "hooks cannot continue after yielding");
+  }
+  else {
+    if ((ci->u.c.k = k) != NULL)  /* is there a continuation? */
+      ci->u.c.ctx = ctx;  /* save context */
+    luaD_throw(L, LUA_YIELD);
+  }
+  lua_assert(ci->callstatus & CIST_HOOKED);  /* must be inside a hook */
+  lua_unlock(L);
+  return 0;  /* return to 'luaD_hook' */
+}
+
+
+/*
+** Auxiliary structure to call 'luaF_close' in protected mode.
+*/
+struct CloseP {
+  StkId level;
+  int status;
+};
+
+
+/*
+** Auxiliary function to call 'luaF_close' in protected mode.
+*/
+static void closepaux (lua_State *L, void *ud) {
+  struct CloseP *pcl = cast(struct CloseP *, ud);
+  luaF_close(L, pcl->level, pcl->status, 0);
+}
+
+
+/*
+** Calls 'luaF_close' in protected mode. Return the original status
+** or, in case of errors, the new status.
+*/
+int luaD_closeprotected (lua_State *L, ptrdiff_t level, int status) {
+  CallInfo *old_ci = L->ci;
+  lu_byte old_allowhooks = L->allowhook;
+  for (;;) {  /* keep closing upvalues until no more errors */
+    struct CloseP pcl;
+    pcl.level = restorestack(L, level); pcl.status = status;
+    status = luaD_rawrunprotected(L, &closepaux, &pcl);
+    if (l_likely(status == LUA_OK))  /* no more errors? */
+      return pcl.status;
+    else {  /* an error occurred; restore saved state and repeat */
+      L->ci = old_ci;
+      L->allowhook = old_allowhooks;
+    }
+  }
+}
+
+
+/*
+** Call the C function 'func' in protected mode, restoring basic
+** thread information ('allowhook', etc.) and in particular
+** its stack level in case of errors.
+*/
+int luaD_pcall (lua_State *L, Pfunc func, void *u,
+                ptrdiff_t old_top, ptrdiff_t ef) {
+  int status;
+  CallInfo *old_ci = L->ci;
+  lu_byte old_allowhooks = L->allowhook;
+  ptrdiff_t old_errfunc = L->errfunc;
+  L->errfunc = ef;
+  status = luaD_rawrunprotected(L, func, u);
+  if (l_unlikely(status != LUA_OK)) {  /* an error occurred? */
+    L->ci = old_ci;
+    L->allowhook = old_allowhooks;
+    status = luaD_closeprotected(L, old_top, status);
+    luaD_seterrorobj(L, status, restorestack(L, old_top));
+    luaD_shrinkstack(L);   /* restore stack size in case of overflow */
+  }
+  L->errfunc = old_errfunc;
+  return status;
+}
+
+
+
+/*
+** Execute a protected parser.
+*/
+struct SParser {  /* data to 'f_parser' */
+  ZIO *z;
+  Mbuffer buff;  /* dynamic structure used by the scanner */
+  Dyndata dyd;  /* dynamic structures used by the parser */
+  const char *mode;
+  const char *name;
+};
+
+
+static void checkmode (lua_State *L, const char *mode, const char *x) {
+  if (mode && strchr(mode, x[0]) == NULL) {
+    luaO_pushfstring(L,
+       "attempt to load a %s chunk (mode is '%s')", x, mode);
+    luaD_throw(L, LUA_ERRSYNTAX);
+  }
+}
+
+
+static void f_parser (lua_State *L, void *ud) {
+  LClosure *cl;
+  struct SParser *p = cast(struct SParser *, ud);
+  int c = zgetc(p->z);  /* read first character */
+  if (c == LUA_SIGNATURE[0]) {
+    checkmode(L, p->mode, "binary");
+    cl = luaU_undump(L, p->z, p->name);
+  }
+  else {
+    checkmode(L, p->mode, "text");
+    cl = luaY_parser(L, p->z, &p->buff, &p->dyd, p->name, c);
+  }
+  lua_assert(cl->nupvalues == cl->p->sizeupvalues);
+  luaF_initupvals(L, cl);
+}
+
+
+int luaD_protectedparser (lua_State *L, ZIO *z, const char *name,
+                                        const char *mode) {
+  struct SParser p;
+  int status;
+  incnny(L);  /* cannot yield during parsing */
+  p.z = z; p.name = name; p.mode = mode;
+  p.dyd.actvar.arr = NULL; p.dyd.actvar.size = 0;
+  p.dyd.gt.arr = NULL; p.dyd.gt.size = 0;
+  p.dyd.label.arr = NULL; p.dyd.label.size = 0;
+  luaZ_initbuffer(L, &p.buff);
+  status = luaD_pcall(L, f_parser, &p, savestack(L, L->top.p), L->errfunc);
+  luaZ_freebuffer(L, &p.buff);
+  luaM_freearray(L, p.dyd.actvar.arr, p.dyd.actvar.size);
+  luaM_freearray(L, p.dyd.gt.arr, p.dyd.gt.size);
+  luaM_freearray(L, p.dyd.label.arr, p.dyd.label.size);
+  decnny(L);
+  return status;
+}
+
+
diff --git a/src/libs/3rdparty/lua/src/ldo.h b/src/libs/3rdparty/lua/src/ldo.h
new file mode 100644
index 0000000000..1aa446ad09
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/ldo.h
@@ -0,0 +1,88 @@
+/*
+** $Id: ldo.h $
+** Stack and Call structure of Lua
+** See Copyright Notice in lua.h
+*/
+
+#ifndef ldo_h
+#define ldo_h
+
+
+#include "llimits.h"
+#include "lobject.h"
+#include "lstate.h"
+#include "lzio.h"
+
+
+/*
+** Macro to check stack size and grow stack if needed.  Parameters
+** 'pre'/'pos' allow the macro to preserve a pointer into the
+** stack across reallocations, doing the work only when needed.
+** It also allows the running of one GC step when the stack is
+** reallocated.
+** 'condmovestack' is used in heavy tests to force a stack reallocation
+** at every check.
+*/
+#define luaD_checkstackaux(L,n,pre,pos)  \
+	if (l_unlikely(L->stack_last.p - L->top.p <= (n))) \
+	  { pre; luaD_growstack(L, n, 1); pos; } \
+        else { condmovestack(L,pre,pos); }
+
+/* In general, 'pre'/'pos' are empty (nothing to save) */
+#define luaD_checkstack(L,n)	luaD_checkstackaux(L,n,(void)0,(void)0)
+
+
+
+#define savestack(L,pt)		(cast_charp(pt) - cast_charp(L->stack.p))
+#define restorestack(L,n)	cast(StkId, cast_charp(L->stack.p) + (n))
+
+
+/* macro to check stack size, preserving 'p' */
+#define checkstackp(L,n,p)  \
+  luaD_checkstackaux(L, n, \
+    ptrdiff_t t__ = savestack(L, p),  /* save 'p' */ \
+    p = restorestack(L, t__))  /* 'pos' part: restore 'p' */
+
+
+/* macro to check stack size and GC, preserving 'p' */
+#define checkstackGCp(L,n,p)  \
+  luaD_checkstackaux(L, n, \
+    ptrdiff_t t__ = savestack(L, p);  /* save 'p' */ \
+    luaC_checkGC(L),  /* stack grow uses memory */ \
+    p = restorestack(L, t__))  /* 'pos' part: restore 'p' */
+
+
+/* macro to check stack size and GC */
+#define checkstackGC(L,fsize)  \
+	luaD_checkstackaux(L, (fsize), luaC_checkGC(L), (void)0)
+
+
+/* type of protected functions, to be ran by 'runprotected' */
+typedef void (*Pfunc) (lua_State *L, void *ud);
+
+LUAI_FUNC void luaD_seterrorobj (lua_State *L, int errcode, StkId oldtop);
+LUAI_FUNC int luaD_protectedparser (lua_State *L, ZIO *z, const char *name,
+                                                  const char *mode);
+LUAI_FUNC void luaD_hook (lua_State *L, int event, int line,
+                                        int fTransfer, int nTransfer);
+LUAI_FUNC void luaD_hookcall (lua_State *L, CallInfo *ci);
+LUAI_FUNC int luaD_pretailcall (lua_State *L, CallInfo *ci, StkId func,
+                                              int narg1, int delta);
+LUAI_FUNC CallInfo *luaD_precall (lua_State *L, StkId func, int nResults);
+LUAI_FUNC void luaD_call (lua_State *L, StkId func, int nResults);
+LUAI_FUNC void luaD_callnoyield (lua_State *L, StkId func, int nResults);
+LUAI_FUNC StkId luaD_tryfuncTM (lua_State *L, StkId func);
+LUAI_FUNC int luaD_closeprotected (lua_State *L, ptrdiff_t level, int status);
+LUAI_FUNC int luaD_pcall (lua_State *L, Pfunc func, void *u,
+                                        ptrdiff_t oldtop, ptrdiff_t ef);
+LUAI_FUNC void luaD_poscall (lua_State *L, CallInfo *ci, int nres);
+LUAI_FUNC int luaD_reallocstack (lua_State *L, int newsize, int raiseerror);
+LUAI_FUNC int luaD_growstack (lua_State *L, int n, int raiseerror);
+LUAI_FUNC void luaD_shrinkstack (lua_State *L);
+LUAI_FUNC void luaD_inctop (lua_State *L);
+
+LUAI_FUNC l_noret luaD_throw (lua_State *L, int errcode);
+LUAI_FUNC int luaD_rawrunprotected (lua_State *L, Pfunc f, void *ud);
+
+#endif
+
diff --git a/src/libs/3rdparty/lua/src/ldump.c b/src/libs/3rdparty/lua/src/ldump.c
new file mode 100644
index 0000000000..f231691b77
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/ldump.c
@@ -0,0 +1,230 @@
+/*
+** $Id: ldump.c $
+** save precompiled Lua chunks
+** See Copyright Notice in lua.h
+*/
+
+#define ldump_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include <limits.h>
+#include <stddef.h>
+
+#include "lua.h"
+
+#include "lobject.h"
+#include "lstate.h"
+#include "lundump.h"
+
+
+typedef struct {
+  lua_State *L;
+  lua_Writer writer;
+  void *data;
+  int strip;
+  int status;
+} DumpState;
+
+
+/*
+** All high-level dumps go through dumpVector; you can change it to
+** change the endianness of the result
+*/
+#define dumpVector(D,v,n)	dumpBlock(D,v,(n)*sizeof((v)[0]))
+
+#define dumpLiteral(D, s)	dumpBlock(D,s,sizeof(s) - sizeof(char))
+
+
+static void dumpBlock (DumpState *D, const void *b, size_t size) {
+  if (D->status == 0 && size > 0) {
+    lua_unlock(D->L);
+    D->status = (*D->writer)(D->L, b, size, D->data);
+    lua_lock(D->L);
+  }
+}
+
+
+#define dumpVar(D,x)		dumpVector(D,&x,1)
+
+
+static void dumpByte (DumpState *D, int y) {
+  lu_byte x = (lu_byte)y;
+  dumpVar(D, x);
+}
+
+
+/*
+** 'dumpSize' buffer size: each byte can store up to 7 bits. (The "+6"
+** rounds up the division.)
+*/
+#define DIBS    ((sizeof(size_t) * CHAR_BIT + 6) / 7)
+
+static void dumpSize (DumpState *D, size_t x) {
+  lu_byte buff[DIBS];
+  int n = 0;
+  do {
+    buff[DIBS - (++n)] = x & 0x7f;  /* fill buffer in reverse order */
+    x >>= 7;
+  } while (x != 0);
+  buff[DIBS - 1] |= 0x80;  /* mark last byte */
+  dumpVector(D, buff + DIBS - n, n);
+}
+
+
+static void dumpInt (DumpState *D, int x) {
+  dumpSize(D, x);
+}
+
+
+static void dumpNumber (DumpState *D, lua_Number x) {
+  dumpVar(D, x);
+}
+
+
+static void dumpInteger (DumpState *D, lua_Integer x) {
+  dumpVar(D, x);
+}
+
+
+static void dumpString (DumpState *D, const TString *s) {
+  if (s == NULL)
+    dumpSize(D, 0);
+  else {
+    size_t size = tsslen(s);
+    const char *str = getstr(s);
+    dumpSize(D, size + 1);
+    dumpVector(D, str, size);
+  }
+}
+
+
+static void dumpCode (DumpState *D, const Proto *f) {
+  dumpInt(D, f->sizecode);
+  dumpVector(D, f->code, f->sizecode);
+}
+
+
+static void dumpFunction(DumpState *D, const Proto *f, TString *psource);
+
+static void dumpConstants (DumpState *D, const Proto *f) {
+  int i;
+  int n = f->sizek;
+  dumpInt(D, n);
+  for (i = 0; i < n; i++) {
+    const TValue *o = &f->k[i];
+    int tt = ttypetag(o);
+    dumpByte(D, tt);
+    switch (tt) {
+      case LUA_VNUMFLT:
+        dumpNumber(D, fltvalue(o));
+        break;
+      case LUA_VNUMINT:
+        dumpInteger(D, ivalue(o));
+        break;
+      case LUA_VSHRSTR:
+      case LUA_VLNGSTR:
+        dumpString(D, tsvalue(o));
+        break;
+      default:
+        lua_assert(tt == LUA_VNIL || tt == LUA_VFALSE || tt == LUA_VTRUE);
+    }
+  }
+}
+
+
+static void dumpProtos (DumpState *D, const Proto *f) {
+  int i;
+  int n = f->sizep;
+  dumpInt(D, n);
+  for (i = 0; i < n; i++)
+    dumpFunction(D, f->p[i], f->source);
+}
+
+
+static void dumpUpvalues (DumpState *D, const Proto *f) {
+  int i, n = f->sizeupvalues;
+  dumpInt(D, n);
+  for (i = 0; i < n; i++) {
+    dumpByte(D, f->upvalues[i].instack);
+    dumpByte(D, f->upvalues[i].idx);
+    dumpByte(D, f->upvalues[i].kind);
+  }
+}
+
+
+static void dumpDebug (DumpState *D, const Proto *f) {
+  int i, n;
+  n = (D->strip) ? 0 : f->sizelineinfo;
+  dumpInt(D, n);
+  dumpVector(D, f->lineinfo, n);
+  n = (D->strip) ? 0 : f->sizeabslineinfo;
+  dumpInt(D, n);
+  for (i = 0; i < n; i++) {
+    dumpInt(D, f->abslineinfo[i].pc);
+    dumpInt(D, f->abslineinfo[i].line);
+  }
+  n = (D->strip) ? 0 : f->sizelocvars;
+  dumpInt(D, n);
+  for (i = 0; i < n; i++) {
+    dumpString(D, f->locvars[i].varname);
+    dumpInt(D, f->locvars[i].startpc);
+    dumpInt(D, f->locvars[i].endpc);
+  }
+  n = (D->strip) ? 0 : f->sizeupvalues;
+  dumpInt(D, n);
+  for (i = 0; i < n; i++)
+    dumpString(D, f->upvalues[i].name);
+}
+
+
+static void dumpFunction (DumpState *D, const Proto *f, TString *psource) {
+  if (D->strip || f->source == psource)
+    dumpString(D, NULL);  /* no debug info or same source as its parent */
+  else
+    dumpString(D, f->source);
+  dumpInt(D, f->linedefined);
+  dumpInt(D, f->lastlinedefined);
+  dumpByte(D, f->numparams);
+  dumpByte(D, f->is_vararg);
+  dumpByte(D, f->maxstacksize);
+  dumpCode(D, f);
+  dumpConstants(D, f);
+  dumpUpvalues(D, f);
+  dumpProtos(D, f);
+  dumpDebug(D, f);
+}
+
+
+static void dumpHeader (DumpState *D) {
+  dumpLiteral(D, LUA_SIGNATURE);
+  dumpByte(D, LUAC_VERSION);
+  dumpByte(D, LUAC_FORMAT);
+  dumpLiteral(D, LUAC_DATA);
+  dumpByte(D, sizeof(Instruction));
+  dumpByte(D, sizeof(lua_Integer));
+  dumpByte(D, sizeof(lua_Number));
+  dumpInteger(D, LUAC_INT);
+  dumpNumber(D, LUAC_NUM);
+}
+
+
+/*
+** dump Lua function as precompiled chunk
+*/
+int luaU_dump(lua_State *L, const Proto *f, lua_Writer w, void *data,
+              int strip) {
+  DumpState D;
+  D.L = L;
+  D.writer = w;
+  D.data = data;
+  D.strip = strip;
+  D.status = 0;
+  dumpHeader(&D);
+  dumpByte(&D, f->sizeupvalues);
+  dumpFunction(&D, f, NULL);
+  return D.status;
+}
+
diff --git a/src/libs/3rdparty/lua/src/lfunc.c b/src/libs/3rdparty/lua/src/lfunc.c
new file mode 100644
index 0000000000..0945f241de
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lfunc.c
@@ -0,0 +1,294 @@
+/*
+** $Id: lfunc.c $
+** Auxiliary functions to manipulate prototypes and closures
+** See Copyright Notice in lua.h
+*/
+
+#define lfunc_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include <stddef.h>
+
+#include "lua.h"
+
+#include "ldebug.h"
+#include "ldo.h"
+#include "lfunc.h"
+#include "lgc.h"
+#include "lmem.h"
+#include "lobject.h"
+#include "lstate.h"
+
+
+
+CClosure *luaF_newCclosure (lua_State *L, int nupvals) {
+  GCObject *o = luaC_newobj(L, LUA_VCCL, sizeCclosure(nupvals));
+  CClosure *c = gco2ccl(o);
+  c->nupvalues = cast_byte(nupvals);
+  return c;
+}
+
+
+LClosure *luaF_newLclosure (lua_State *L, int nupvals) {
+  GCObject *o = luaC_newobj(L, LUA_VLCL, sizeLclosure(nupvals));
+  LClosure *c = gco2lcl(o);
+  c->p = NULL;
+  c->nupvalues = cast_byte(nupvals);
+  while (nupvals--) c->upvals[nupvals] = NULL;
+  return c;
+}
+
+
+/*
+** fill a closure with new closed upvalues
+*/
+void luaF_initupvals (lua_State *L, LClosure *cl) {
+  int i;
+  for (i = 0; i < cl->nupvalues; i++) {
+    GCObject *o = luaC_newobj(L, LUA_VUPVAL, sizeof(UpVal));
+    UpVal *uv = gco2upv(o);
+    uv->v.p = &uv->u.value;  /* make it closed */
+    setnilvalue(uv->v.p);
+    cl->upvals[i] = uv;
+    luaC_objbarrier(L, cl, uv);
+  }
+}
+
+
+/*
+** Create a new upvalue at the given level, and link it to the list of
+** open upvalues of 'L' after entry 'prev'.
+**/
+static UpVal *newupval (lua_State *L, StkId level, UpVal **prev) {
+  GCObject *o = luaC_newobj(L, LUA_VUPVAL, sizeof(UpVal));
+  UpVal *uv = gco2upv(o);
+  UpVal *next = *prev;
+  uv->v.p = s2v(level);  /* current value lives in the stack */
+  uv->u.open.next = next;  /* link it to list of open upvalues */
+  uv->u.open.previous = prev;
+  if (next)
+    next->u.open.previous = &uv->u.open.next;
+  *prev = uv;
+  if (!isintwups(L)) {  /* thread not in list of threads with upvalues? */
+    L->twups = G(L)->twups;  /* link it to the list */
+    G(L)->twups = L;
+  }
+  return uv;
+}
+
+
+/*
+** Find and reuse, or create if it does not exist, an upvalue
+** at the given level.
+*/
+UpVal *luaF_findupval (lua_State *L, StkId level) {
+  UpVal **pp = &L->openupval;
+  UpVal *p;
+  lua_assert(isintwups(L) || L->openupval == NULL);
+  while ((p = *pp) != NULL && uplevel(p) >= level) {  /* search for it */
+    lua_assert(!isdead(G(L), p));
+    if (uplevel(p) == level)  /* corresponding upvalue? */
+      return p;  /* return it */
+    pp = &p->u.open.next;
+  }
+  /* not found: create a new upvalue after 'pp' */
+  return newupval(L, level, pp);
+}
+
+
+/*
+** Call closing method for object 'obj' with error message 'err'. The
+** boolean 'yy' controls whether the call is yieldable.
+** (This function assumes EXTRA_STACK.)
+*/
+static void callclosemethod (lua_State *L, TValue *obj, TValue *err, int yy) {
+  StkId top = L->top.p;
+  const TValue *tm = luaT_gettmbyobj(L, obj, TM_CLOSE);
+  setobj2s(L, top, tm);  /* will call metamethod... */
+  setobj2s(L, top + 1, obj);  /* with 'self' as the 1st argument */
+  setobj2s(L, top + 2, err);  /* and error msg. as 2nd argument */
+  L->top.p = top + 3;  /* add function and arguments */
+  if (yy)
+    luaD_call(L, top, 0);
+  else
+    luaD_callnoyield(L, top, 0);
+}
+
+
+/*
+** Check whether object at given level has a close metamethod and raise
+** an error if not.
+*/
+static void checkclosemth (lua_State *L, StkId level) {
+  const TValue *tm = luaT_gettmbyobj(L, s2v(level), TM_CLOSE);
+  if (ttisnil(tm)) {  /* no metamethod? */
+    int idx = cast_int(level - L->ci->func.p);  /* variable index */
+    const char *vname = luaG_findlocal(L, L->ci, idx, NULL);
+    if (vname == NULL) vname = "?";
+    luaG_runerror(L, "variable '%s' got a non-closable value", vname);
+  }
+}
+
+
+/*
+** Prepare and call a closing method.
+** If status is CLOSEKTOP, the call to the closing method will be pushed
+** at the top of the stack. Otherwise, values can be pushed right after
+** the 'level' of the upvalue being closed, as everything after that
+** won't be used again.
+*/
+static void prepcallclosemth (lua_State *L, StkId level, int status, int yy) {
+  TValue *uv = s2v(level);  /* value being closed */
+  TValue *errobj;
+  if (status == CLOSEKTOP)
+    errobj = &G(L)->nilvalue;  /* error object is nil */
+  else {  /* 'luaD_seterrorobj' will set top to level + 2 */
+    errobj = s2v(level + 1);  /* error object goes after 'uv' */
+    luaD_seterrorobj(L, status, level + 1);  /* set error object */
+  }
+  callclosemethod(L, uv, errobj, yy);
+}
+
+
+/*
+** Maximum value for deltas in 'tbclist', dependent on the type
+** of delta. (This macro assumes that an 'L' is in scope where it
+** is used.)
+*/
+#define MAXDELTA  \
+	((256ul << ((sizeof(L->stack.p->tbclist.delta) - 1) * 8)) - 1)
+
+
+/*
+** Insert a variable in the list of to-be-closed variables.
+*/
+void luaF_newtbcupval (lua_State *L, StkId level) {
+  lua_assert(level > L->tbclist.p);
+  if (l_isfalse(s2v(level)))
+    return;  /* false doesn't need to be closed */
+  checkclosemth(L, level);  /* value must have a close method */
+  while (cast_uint(level - L->tbclist.p) > MAXDELTA) {
+    L->tbclist.p += MAXDELTA;  /* create a dummy node at maximum delta */
+    L->tbclist.p->tbclist.delta = 0;
+  }
+  level->tbclist.delta = cast(unsigned short, level - L->tbclist.p);
+  L->tbclist.p = level;
+}
+
+
+void luaF_unlinkupval (UpVal *uv) {
+  lua_assert(upisopen(uv));
+  *uv->u.open.previous = uv->u.open.next;
+  if (uv->u.open.next)
+    uv->u.open.next->u.open.previous = uv->u.open.previous;
+}
+
+
+/*
+** Close all upvalues up to the given stack level.
+*/
+void luaF_closeupval (lua_State *L, StkId level) {
+  UpVal *uv;
+  StkId upl;  /* stack index pointed by 'uv' */
+  while ((uv = L->openupval) != NULL && (upl = uplevel(uv)) >= level) {
+    TValue *slot = &uv->u.value;  /* new position for value */
+    lua_assert(uplevel(uv) < L->top.p);
+    luaF_unlinkupval(uv);  /* remove upvalue from 'openupval' list */
+    setobj(L, slot, uv->v.p);  /* move value to upvalue slot */
+    uv->v.p = slot;  /* now current value lives here */
+    if (!iswhite(uv)) {  /* neither white nor dead? */
+      nw2black(uv);  /* closed upvalues cannot be gray */
+      luaC_barrier(L, uv, slot);
+    }
+  }
+}
+
+
+/*
+** Remove first element from the tbclist plus its dummy nodes.
+*/
+static void poptbclist (lua_State *L) {
+  StkId tbc = L->tbclist.p;
+  lua_assert(tbc->tbclist.delta > 0);  /* first element cannot be dummy */
+  tbc -= tbc->tbclist.delta;
+  while (tbc > L->stack.p && tbc->tbclist.delta == 0)
+    tbc -= MAXDELTA;  /* remove dummy nodes */
+  L->tbclist.p = tbc;
+}
+
+
+/*
+** Close all upvalues and to-be-closed variables up to the given stack
+** level. Return restored 'level'.
+*/
+StkId luaF_close (lua_State *L, StkId level, int status, int yy) {
+  ptrdiff_t levelrel = savestack(L, level);
+  luaF_closeupval(L, level);  /* first, close the upvalues */
+  while (L->tbclist.p >= level) {  /* traverse tbc's down to that level */
+    StkId tbc = L->tbclist.p;  /* get variable index */
+    poptbclist(L);  /* remove it from list */
+    prepcallclosemth(L, tbc, status, yy);  /* close variable */
+    level = restorestack(L, levelrel);
+  }
+  return level;
+}
+
+
+Proto *luaF_newproto (lua_State *L) {
+  GCObject *o = luaC_newobj(L, LUA_VPROTO, sizeof(Proto));
+  Proto *f = gco2p(o);
+  f->k = NULL;
+  f->sizek = 0;
+  f->p = NULL;
+  f->sizep = 0;
+  f->code = NULL;
+  f->sizecode = 0;
+  f->lineinfo = NULL;
+  f->sizelineinfo = 0;
+  f->abslineinfo = NULL;
+  f->sizeabslineinfo = 0;
+  f->upvalues = NULL;
+  f->sizeupvalues = 0;
+  f->numparams = 0;
+  f->is_vararg = 0;
+  f->maxstacksize = 0;
+  f->locvars = NULL;
+  f->sizelocvars = 0;
+  f->linedefined = 0;
+  f->lastlinedefined = 0;
+  f->source = NULL;
+  return f;
+}
+
+
+void luaF_freeproto (lua_State *L, Proto *f) {
+  luaM_freearray(L, f->code, f->sizecode);
+  luaM_freearray(L, f->p, f->sizep);
+  luaM_freearray(L, f->k, f->sizek);
+  luaM_freearray(L, f->lineinfo, f->sizelineinfo);
+  luaM_freearray(L, f->abslineinfo, f->sizeabslineinfo);
+  luaM_freearray(L, f->locvars, f->sizelocvars);
+  luaM_freearray(L, f->upvalues, f->sizeupvalues);
+  luaM_free(L, f);
+}
+
+
+/*
+** Look for n-th local variable at line 'line' in function 'func'.
+** Returns NULL if not found.
+*/
+const char *luaF_getlocalname (const Proto *f, int local_number, int pc) {
+  int i;
+  for (i = 0; i<f->sizelocvars && f->locvars[i].startpc <= pc; i++) {
+    if (pc < f->locvars[i].endpc) {  /* is variable active? */
+      local_number--;
+      if (local_number == 0)
+        return getstr(f->locvars[i].varname);
+    }
+  }
+  return NULL;  /* not found */
+}
+
diff --git a/src/libs/3rdparty/lua/src/lfunc.h b/src/libs/3rdparty/lua/src/lfunc.h
new file mode 100644
index 0000000000..3be265efb5
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lfunc.h
@@ -0,0 +1,64 @@
+/*
+** $Id: lfunc.h $
+** Auxiliary functions to manipulate prototypes and closures
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lfunc_h
+#define lfunc_h
+
+
+#include "lobject.h"
+
+
+#define sizeCclosure(n)	(cast_int(offsetof(CClosure, upvalue)) + \
+                         cast_int(sizeof(TValue)) * (n))
+
+#define sizeLclosure(n)	(cast_int(offsetof(LClosure, upvals)) + \
+                         cast_int(sizeof(TValue *)) * (n))
+
+
+/* test whether thread is in 'twups' list */
+#define isintwups(L)	(L->twups != L)
+
+
+/*
+** maximum number of upvalues in a closure (both C and Lua). (Value
+** must fit in a VM register.)
+*/
+#define MAXUPVAL	255
+
+
+#define upisopen(up)	((up)->v.p != &(up)->u.value)
+
+
+#define uplevel(up)	check_exp(upisopen(up), cast(StkId, (up)->v.p))
+
+
+/*
+** maximum number of misses before giving up the cache of closures
+** in prototypes
+*/
+#define MAXMISS		10
+
+
+
+/* special status to close upvalues preserving the top of the stack */
+#define CLOSEKTOP	(-1)
+
+
+LUAI_FUNC Proto *luaF_newproto (lua_State *L);
+LUAI_FUNC CClosure *luaF_newCclosure (lua_State *L, int nupvals);
+LUAI_FUNC LClosure *luaF_newLclosure (lua_State *L, int nupvals);
+LUAI_FUNC void luaF_initupvals (lua_State *L, LClosure *cl);
+LUAI_FUNC UpVal *luaF_findupval (lua_State *L, StkId level);
+LUAI_FUNC void luaF_newtbcupval (lua_State *L, StkId level);
+LUAI_FUNC void luaF_closeupval (lua_State *L, StkId level);
+LUAI_FUNC StkId luaF_close (lua_State *L, StkId level, int status, int yy);
+LUAI_FUNC void luaF_unlinkupval (UpVal *uv);
+LUAI_FUNC void luaF_freeproto (lua_State *L, Proto *f);
+LUAI_FUNC const char *luaF_getlocalname (const Proto *func, int local_number,
+                                         int pc);
+
+
+#endif
diff --git a/src/libs/3rdparty/lua/src/lgc.c b/src/libs/3rdparty/lua/src/lgc.c
new file mode 100644
index 0000000000..a3094ff571
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lgc.c
@@ -0,0 +1,1739 @@
+/*
+** $Id: lgc.c $
+** Garbage Collector
+** See Copyright Notice in lua.h
+*/
+
+#define lgc_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+#include <stdio.h>
+#include <string.h>
+
+
+#include "lua.h"
+
+#include "ldebug.h"
+#include "ldo.h"
+#include "lfunc.h"
+#include "lgc.h"
+#include "lmem.h"
+#include "lobject.h"
+#include "lstate.h"
+#include "lstring.h"
+#include "ltable.h"
+#include "ltm.h"
+
+
+/*
+** Maximum number of elements to sweep in each single step.
+** (Large enough to dissipate fixed overheads but small enough
+** to allow small steps for the collector.)
+*/
+#define GCSWEEPMAX	100
+
+/*
+** Maximum number of finalizers to call in each single step.
+*/
+#define GCFINMAX	10
+
+
+/*
+** Cost of calling one finalizer.
+*/
+#define GCFINALIZECOST	50
+
+
+/*
+** The equivalent, in bytes, of one unit of "work" (visiting a slot,
+** sweeping an object, etc.)
+*/
+#define WORK2MEM	sizeof(TValue)
+
+
+/*
+** macro to adjust 'pause': 'pause' is actually used like
+** 'pause / PAUSEADJ' (value chosen by tests)
+*/
+#define PAUSEADJ		100
+
+
+/* mask with all color bits */
+#define maskcolors	(bitmask(BLACKBIT) | WHITEBITS)
+
+/* mask with all GC bits */
+#define maskgcbits      (maskcolors | AGEBITS)
+
+
+/* macro to erase all color bits then set only the current white bit */
+#define makewhite(g,x)	\
+  (x->marked = cast_byte((x->marked & ~maskcolors) | luaC_white(g)))
+
+/* make an object gray (neither white nor black) */
+#define set2gray(x)	resetbits(x->marked, maskcolors)
+
+
+/* make an object black (coming from any color) */
+#define set2black(x)  \
+  (x->marked = cast_byte((x->marked & ~WHITEBITS) | bitmask(BLACKBIT)))
+
+
+#define valiswhite(x)   (iscollectable(x) && iswhite(gcvalue(x)))
+
+#define keyiswhite(n)   (keyiscollectable(n) && iswhite(gckey(n)))
+
+
+/*
+** Protected access to objects in values
+*/
+#define gcvalueN(o)     (iscollectable(o) ? gcvalue(o) : NULL)
+
+
+#define markvalue(g,o) { checkliveness(g->mainthread,o); \
+  if (valiswhite(o)) reallymarkobject(g,gcvalue(o)); }
+
+#define markkey(g, n)	{ if keyiswhite(n) reallymarkobject(g,gckey(n)); }
+
+#define markobject(g,t)	{ if (iswhite(t)) reallymarkobject(g, obj2gco(t)); }
+
+/*
+** mark an object that can be NULL (either because it is really optional,
+** or it was stripped as debug info, or inside an uncompleted structure)
+*/
+#define markobjectN(g,t)	{ if (t) markobject(g,t); }
+
+static void reallymarkobject (global_State *g, GCObject *o);
+static lu_mem atomic (lua_State *L);
+static void entersweep (lua_State *L);
+
+
+/*
+** {======================================================
+** Generic functions
+** =======================================================
+*/
+
+
+/*
+** one after last element in a hash array
+*/
+#define gnodelast(h)	gnode(h, cast_sizet(sizenode(h)))
+
+
+static GCObject **getgclist (GCObject *o) {
+  switch (o->tt) {
+    case LUA_VTABLE: return &gco2t(o)->gclist;
+    case LUA_VLCL: return &gco2lcl(o)->gclist;
+    case LUA_VCCL: return &gco2ccl(o)->gclist;
+    case LUA_VTHREAD: return &gco2th(o)->gclist;
+    case LUA_VPROTO: return &gco2p(o)->gclist;
+    case LUA_VUSERDATA: {
+      Udata *u = gco2u(o);
+      lua_assert(u->nuvalue > 0);
+      return &u->gclist;
+    }
+    default: lua_assert(0); return 0;
+  }
+}
+
+
+/*
+** Link a collectable object 'o' with a known type into the list 'p'.
+** (Must be a macro to access the 'gclist' field in different types.)
+*/
+#define linkgclist(o,p)	linkgclist_(obj2gco(o), &(o)->gclist, &(p))
+
+static void linkgclist_ (GCObject *o, GCObject **pnext, GCObject **list) {
+  lua_assert(!isgray(o));  /* cannot be in a gray list */
+  *pnext = *list;
+  *list = o;
+  set2gray(o);  /* now it is */
+}
+
+
+/*
+** Link a generic collectable object 'o' into the list 'p'.
+*/
+#define linkobjgclist(o,p) linkgclist_(obj2gco(o), getgclist(o), &(p))
+
+
+
+/*
+** Clear keys for empty entries in tables. If entry is empty, mark its
+** entry as dead. This allows the collection of the key, but keeps its
+** entry in the table: its removal could break a chain and could break
+** a table traversal.  Other places never manipulate dead keys, because
+** its associated empty value is enough to signal that the entry is
+** logically empty.
+*/
+static void clearkey (Node *n) {
+  lua_assert(isempty(gval(n)));
+  if (keyiscollectable(n))
+    setdeadkey(n);  /* unused key; remove it */
+}
+
+
+/*
+** tells whether a key or value can be cleared from a weak
+** table. Non-collectable objects are never removed from weak
+** tables. Strings behave as 'values', so are never removed too. for
+** other objects: if really collected, cannot keep them; for objects
+** being finalized, keep them in keys, but not in values
+*/
+static int iscleared (global_State *g, const GCObject *o) {
+  if (o == NULL) return 0;  /* non-collectable value */
+  else if (novariant(o->tt) == LUA_TSTRING) {
+    markobject(g, o);  /* strings are 'values', so are never weak */
+    return 0;
+  }
+  else return iswhite(o);
+}
+
+
+/*
+** Barrier that moves collector forward, that is, marks the white object
+** 'v' being pointed by the black object 'o'.  In the generational
+** mode, 'v' must also become old, if 'o' is old; however, it cannot
+** be changed directly to OLD, because it may still point to non-old
+** objects. So, it is marked as OLD0. In the next cycle it will become
+** OLD1, and in the next it will finally become OLD (regular old). By
+** then, any object it points to will also be old.  If called in the
+** incremental sweep phase, it clears the black object to white (sweep
+** it) to avoid other barrier calls for this same object. (That cannot
+** be done is generational mode, as its sweep does not distinguish
+** whites from deads.)
+*/
+void luaC_barrier_ (lua_State *L, GCObject *o, GCObject *v) {
+  global_State *g = G(L);
+  lua_assert(isblack(o) && iswhite(v) && !isdead(g, v) && !isdead(g, o));
+  if (keepinvariant(g)) {  /* must keep invariant? */
+    reallymarkobject(g, v);  /* restore invariant */
+    if (isold(o)) {
+      lua_assert(!isold(v));  /* white object could not be old */
+      setage(v, G_OLD0);  /* restore generational invariant */
+    }
+  }
+  else {  /* sweep phase */
+    lua_assert(issweepphase(g));
+    if (g->gckind == KGC_INC)  /* incremental mode? */
+      makewhite(g, o);  /* mark 'o' as white to avoid other barriers */
+  }
+}
+
+
+/*
+** barrier that moves collector backward, that is, mark the black object
+** pointing to a white object as gray again.
+*/
+void luaC_barrierback_ (lua_State *L, GCObject *o) {
+  global_State *g = G(L);
+  lua_assert(isblack(o) && !isdead(g, o));
+  lua_assert((g->gckind == KGC_GEN) == (isold(o) && getage(o) != G_TOUCHED1));
+  if (getage(o) == G_TOUCHED2)  /* already in gray list? */
+    set2gray(o);  /* make it gray to become touched1 */
+  else  /* link it in 'grayagain' and paint it gray */
+    linkobjgclist(o, g->grayagain);
+  if (isold(o))  /* generational mode? */
+    setage(o, G_TOUCHED1);  /* touched in current cycle */
+}
+
+
+void luaC_fix (lua_State *L, GCObject *o) {
+  global_State *g = G(L);
+  lua_assert(g->allgc == o);  /* object must be 1st in 'allgc' list! */
+  set2gray(o);  /* they will be gray forever */
+  setage(o, G_OLD);  /* and old forever */
+  g->allgc = o->next;  /* remove object from 'allgc' list */
+  o->next = g->fixedgc;  /* link it to 'fixedgc' list */
+  g->fixedgc = o;
+}
+
+
+/*
+** create a new collectable object (with given type, size, and offset)
+** and link it to 'allgc' list.
+*/
+GCObject *luaC_newobjdt (lua_State *L, int tt, size_t sz, size_t offset) {
+  global_State *g = G(L);
+  char *p = cast_charp(luaM_newobject(L, novariant(tt), sz));
+  GCObject *o = cast(GCObject *, p + offset);
+  o->marked = luaC_white(g);
+  o->tt = tt;
+  o->next = g->allgc;
+  g->allgc = o;
+  return o;
+}
+
+
+GCObject *luaC_newobj (lua_State *L, int tt, size_t sz) {
+  return luaC_newobjdt(L, tt, sz, 0);
+}
+
+/* }====================================================== */
+
+
+
+/*
+** {======================================================
+** Mark functions
+** =======================================================
+*/
+
+
+/*
+** Mark an object.  Userdata with no user values, strings, and closed
+** upvalues are visited and turned black here.  Open upvalues are
+** already indirectly linked through their respective threads in the
+** 'twups' list, so they don't go to the gray list; nevertheless, they
+** are kept gray to avoid barriers, as their values will be revisited
+** by the thread or by 'remarkupvals'.  Other objects are added to the
+** gray list to be visited (and turned black) later.  Both userdata and
+** upvalues can call this function recursively, but this recursion goes
+** for at most two levels: An upvalue cannot refer to another upvalue
+** (only closures can), and a userdata's metatable must be a table.
+*/
+static void reallymarkobject (global_State *g, GCObject *o) {
+  switch (o->tt) {
+    case LUA_VSHRSTR:
+    case LUA_VLNGSTR: {
+      set2black(o);  /* nothing to visit */
+      break;
+    }
+    case LUA_VUPVAL: {
+      UpVal *uv = gco2upv(o);
+      if (upisopen(uv))
+        set2gray(uv);  /* open upvalues are kept gray */
+      else
+        set2black(uv);  /* closed upvalues are visited here */
+      markvalue(g, uv->v.p);  /* mark its content */
+      break;
+    }
+    case LUA_VUSERDATA: {
+      Udata *u = gco2u(o);
+      if (u->nuvalue == 0) {  /* no user values? */
+        markobjectN(g, u->metatable);  /* mark its metatable */
+        set2black(u);  /* nothing else to mark */
+        break;
+      }
+      /* else... */
+    }  /* FALLTHROUGH */
+    case LUA_VLCL: case LUA_VCCL: case LUA_VTABLE:
+    case LUA_VTHREAD: case LUA_VPROTO: {
+      linkobjgclist(o, g->gray);  /* to be visited later */
+      break;
+    }
+    default: lua_assert(0); break;
+  }
+}
+
+
+/*
+** mark metamethods for basic types
+*/
+static void markmt (global_State *g) {
+  int i;
+  for (i=0; i < LUA_NUMTAGS; i++)
+    markobjectN(g, g->mt[i]);
+}
+
+
+/*
+** mark all objects in list of being-finalized
+*/
+static lu_mem markbeingfnz (global_State *g) {
+  GCObject *o;
+  lu_mem count = 0;
+  for (o = g->tobefnz; o != NULL; o = o->next) {
+    count++;
+    markobject(g, o);
+  }
+  return count;
+}
+
+
+/*
+** For each non-marked thread, simulates a barrier between each open
+** upvalue and its value. (If the thread is collected, the value will be
+** assigned to the upvalue, but then it can be too late for the barrier
+** to act. The "barrier" does not need to check colors: A non-marked
+** thread must be young; upvalues cannot be older than their threads; so
+** any visited upvalue must be young too.) Also removes the thread from
+** the list, as it was already visited. Removes also threads with no
+** upvalues, as they have nothing to be checked. (If the thread gets an
+** upvalue later, it will be linked in the list again.)
+*/
+static int remarkupvals (global_State *g) {
+  lua_State *thread;
+  lua_State **p = &g->twups;
+  int work = 0;  /* estimate of how much work was done here */
+  while ((thread = *p) != NULL) {
+    work++;
+    if (!iswhite(thread) && thread->openupval != NULL)
+      p = &thread->twups;  /* keep marked thread with upvalues in the list */
+    else {  /* thread is not marked or without upvalues */
+      UpVal *uv;
+      lua_assert(!isold(thread) || thread->openupval == NULL);
+      *p = thread->twups;  /* remove thread from the list */
+      thread->twups = thread;  /* mark that it is out of list */
+      for (uv = thread->openupval; uv != NULL; uv = uv->u.open.next) {
+        lua_assert(getage(uv) <= getage(thread));
+        work++;
+        if (!iswhite(uv)) {  /* upvalue already visited? */
+          lua_assert(upisopen(uv) && isgray(uv));
+          markvalue(g, uv->v.p);  /* mark its value */
+        }
+      }
+    }
+  }
+  return work;
+}
+
+
+static void cleargraylists (global_State *g) {
+  g->gray = g->grayagain = NULL;
+  g->weak = g->allweak = g->ephemeron = NULL;
+}
+
+
+/*
+** mark root set and reset all gray lists, to start a new collection
+*/
+static void restartcollection (global_State *g) {
+  cleargraylists(g);
+  markobject(g, g->mainthread);
+  markvalue(g, &g->l_registry);
+  markmt(g);
+  markbeingfnz(g);  /* mark any finalizing object left from previous cycle */
+}
+
+/* }====================================================== */
+
+
+/*
+** {======================================================
+** Traverse functions
+** =======================================================
+*/
+
+
+/*
+** Check whether object 'o' should be kept in the 'grayagain' list for
+** post-processing by 'correctgraylist'. (It could put all old objects
+** in the list and leave all the work to 'correctgraylist', but it is
+** more efficient to avoid adding elements that will be removed.) Only
+** TOUCHED1 objects need to be in the list. TOUCHED2 doesn't need to go
+** back to a gray list, but then it must become OLD. (That is what
+** 'correctgraylist' does when it finds a TOUCHED2 object.)
+*/
+static void genlink (global_State *g, GCObject *o) {
+  lua_assert(isblack(o));
+  if (getage(o) == G_TOUCHED1) {  /* touched in this cycle? */
+    linkobjgclist(o, g->grayagain);  /* link it back in 'grayagain' */
+  }  /* everything else do not need to be linked back */
+  else if (getage(o) == G_TOUCHED2)
+    changeage(o, G_TOUCHED2, G_OLD);  /* advance age */
+}
+
+
+/*
+** Traverse a table with weak values and link it to proper list. During
+** propagate phase, keep it in 'grayagain' list, to be revisited in the
+** atomic phase. In the atomic phase, if table has any white value,
+** put it in 'weak' list, to be cleared.
+*/
+static void traverseweakvalue (global_State *g, Table *h) {
+  Node *n, *limit = gnodelast(h);
+  /* if there is array part, assume it may have white values (it is not
+     worth traversing it now just to check) */
+  int hasclears = (h->alimit > 0);
+  for (n = gnode(h, 0); n < limit; n++) {  /* traverse hash part */
+    if (isempty(gval(n)))  /* entry is empty? */
+      clearkey(n);  /* clear its key */
+    else {
+      lua_assert(!keyisnil(n));
+      markkey(g, n);
+      if (!hasclears && iscleared(g, gcvalueN(gval(n))))  /* a white value? */
+        hasclears = 1;  /* table will have to be cleared */
+    }
+  }
+  if (g->gcstate == GCSatomic && hasclears)
+    linkgclist(h, g->weak);  /* has to be cleared later */
+  else
+    linkgclist(h, g->grayagain);  /* must retraverse it in atomic phase */
+}
+
+
+/*
+** Traverse an ephemeron table and link it to proper list. Returns true
+** iff any object was marked during this traversal (which implies that
+** convergence has to continue). During propagation phase, keep table
+** in 'grayagain' list, to be visited again in the atomic phase. In
+** the atomic phase, if table has any white->white entry, it has to
+** be revisited during ephemeron convergence (as that key may turn
+** black). Otherwise, if it has any white key, table has to be cleared
+** (in the atomic phase). In generational mode, some tables
+** must be kept in some gray list for post-processing; this is done
+** by 'genlink'.
+*/
+static int traverseephemeron (global_State *g, Table *h, int inv) {
+  int marked = 0;  /* true if an object is marked in this traversal */
+  int hasclears = 0;  /* true if table has white keys */
+  int hasww = 0;  /* true if table has entry "white-key -> white-value" */
+  unsigned int i;
+  unsigned int asize = luaH_realasize(h);
+  unsigned int nsize = sizenode(h);
+  /* traverse array part */
+  for (i = 0; i < asize; i++) {
+    if (valiswhite(&h->array[i])) {
+      marked = 1;
+      reallymarkobject(g, gcvalue(&h->array[i]));
+    }
+  }
+  /* traverse hash part; if 'inv', traverse descending
+     (see 'convergeephemerons') */
+  for (i = 0; i < nsize; i++) {
+    Node *n = inv ? gnode(h, nsize - 1 - i) : gnode(h, i);
+    if (isempty(gval(n)))  /* entry is empty? */
+      clearkey(n);  /* clear its key */
+    else if (iscleared(g, gckeyN(n))) {  /* key is not marked (yet)? */
+      hasclears = 1;  /* table must be cleared */
+      if (valiswhite(gval(n)))  /* value not marked yet? */
+        hasww = 1;  /* white-white entry */
+    }
+    else if (valiswhite(gval(n))) {  /* value not marked yet? */
+      marked = 1;
+      reallymarkobject(g, gcvalue(gval(n)));  /* mark it now */
+    }
+  }
+  /* link table into proper list */
+  if (g->gcstate == GCSpropagate)
+    linkgclist(h, g->grayagain);  /* must retraverse it in atomic phase */
+  else if (hasww)  /* table has white->white entries? */
+    linkgclist(h, g->ephemeron);  /* have to propagate again */
+  else if (hasclears)  /* table has white keys? */
+    linkgclist(h, g->allweak);  /* may have to clean white keys */
+  else
+    genlink(g, obj2gco(h));  /* check whether collector still needs to see it */
+  return marked;
+}
+
+
+static void traversestrongtable (global_State *g, Table *h) {
+  Node *n, *limit = gnodelast(h);
+  unsigned int i;
+  unsigned int asize = luaH_realasize(h);
+  for (i = 0; i < asize; i++)  /* traverse array part */
+    markvalue(g, &h->array[i]);
+  for (n = gnode(h, 0); n < limit; n++) {  /* traverse hash part */
+    if (isempty(gval(n)))  /* entry is empty? */
+      clearkey(n);  /* clear its key */
+    else {
+      lua_assert(!keyisnil(n));
+      markkey(g, n);
+      markvalue(g, gval(n));
+    }
+  }
+  genlink(g, obj2gco(h));
+}
+
+
+static lu_mem traversetable (global_State *g, Table *h) {
+  const char *weakkey, *weakvalue;
+  const TValue *mode = gfasttm(g, h->metatable, TM_MODE);
+  markobjectN(g, h->metatable);
+  if (mode && ttisstring(mode) &&  /* is there a weak mode? */
+      (cast_void(weakkey = strchr(svalue(mode), 'k')),
+       cast_void(weakvalue = strchr(svalue(mode), 'v')),
+       (weakkey || weakvalue))) {  /* is really weak? */
+    if (!weakkey)  /* strong keys? */
+      traverseweakvalue(g, h);
+    else if (!weakvalue)  /* strong values? */
+      traverseephemeron(g, h, 0);
+    else  /* all weak */
+      linkgclist(h, g->allweak);  /* nothing to traverse now */
+  }
+  else  /* not weak */
+    traversestrongtable(g, h);
+  return 1 + h->alimit + 2 * allocsizenode(h);
+}
+
+
+static int traverseudata (global_State *g, Udata *u) {
+  int i;
+  markobjectN(g, u->metatable);  /* mark its metatable */
+  for (i = 0; i < u->nuvalue; i++)
+    markvalue(g, &u->uv[i].uv);
+  genlink(g, obj2gco(u));
+  return 1 + u->nuvalue;
+}
+
+
+/*
+** Traverse a prototype. (While a prototype is being build, its
+** arrays can be larger than needed; the extra slots are filled with
+** NULL, so the use of 'markobjectN')
+*/
+static int traverseproto (global_State *g, Proto *f) {
+  int i;
+  markobjectN(g, f->source);
+  for (i = 0; i < f->sizek; i++)  /* mark literals */
+    markvalue(g, &f->k[i]);
+  for (i = 0; i < f->sizeupvalues; i++)  /* mark upvalue names */
+    markobjectN(g, f->upvalues[i].name);
+  for (i = 0; i < f->sizep; i++)  /* mark nested protos */
+    markobjectN(g, f->p[i]);
+  for (i = 0; i < f->sizelocvars; i++)  /* mark local-variable names */
+    markobjectN(g, f->locvars[i].varname);
+  return 1 + f->sizek + f->sizeupvalues + f->sizep + f->sizelocvars;
+}
+
+
+static int traverseCclosure (global_State *g, CClosure *cl) {
+  int i;
+  for (i = 0; i < cl->nupvalues; i++)  /* mark its upvalues */
+    markvalue(g, &cl->upvalue[i]);
+  return 1 + cl->nupvalues;
+}
+
+/*
+** Traverse a Lua closure, marking its prototype and its upvalues.
+** (Both can be NULL while closure is being created.)
+*/
+static int traverseLclosure (global_State *g, LClosure *cl) {
+  int i;
+  markobjectN(g, cl->p);  /* mark its prototype */
+  for (i = 0; i < cl->nupvalues; i++) {  /* visit its upvalues */
+    UpVal *uv = cl->upvals[i];
+    markobjectN(g, uv);  /* mark upvalue */
+  }
+  return 1 + cl->nupvalues;
+}
+
+
+/*
+** Traverse a thread, marking the elements in the stack up to its top
+** and cleaning the rest of the stack in the final traversal. That
+** ensures that the entire stack have valid (non-dead) objects.
+** Threads have no barriers. In gen. mode, old threads must be visited
+** at every cycle, because they might point to young objects.  In inc.
+** mode, the thread can still be modified before the end of the cycle,
+** and therefore it must be visited again in the atomic phase. To ensure
+** these visits, threads must return to a gray list if they are not new
+** (which can only happen in generational mode) or if the traverse is in
+** the propagate phase (which can only happen in incremental mode).
+*/
+static int traversethread (global_State *g, lua_State *th) {
+  UpVal *uv;
+  StkId o = th->stack.p;
+  if (isold(th) || g->gcstate == GCSpropagate)
+    linkgclist(th, g->grayagain);  /* insert into 'grayagain' list */
+  if (o == NULL)
+    return 1;  /* stack not completely built yet */
+  lua_assert(g->gcstate == GCSatomic ||
+             th->openupval == NULL || isintwups(th));
+  for (; o < th->top.p; o++)  /* mark live elements in the stack */
+    markvalue(g, s2v(o));
+  for (uv = th->openupval; uv != NULL; uv = uv->u.open.next)
+    markobject(g, uv);  /* open upvalues cannot be collected */
+  if (g->gcstate == GCSatomic) {  /* final traversal? */
+    for (; o < th->stack_last.p + EXTRA_STACK; o++)
+      setnilvalue(s2v(o));  /* clear dead stack slice */
+    /* 'remarkupvals' may have removed thread from 'twups' list */
+    if (!isintwups(th) && th->openupval != NULL) {
+      th->twups = g->twups;  /* link it back to the list */
+      g->twups = th;
+    }
+  }
+  else if (!g->gcemergency)
+    luaD_shrinkstack(th); /* do not change stack in emergency cycle */
+  return 1 + stacksize(th);
+}
+
+
+/*
+** traverse one gray object, turning it to black.
+*/
+static lu_mem propagatemark (global_State *g) {
+  GCObject *o = g->gray;
+  nw2black(o);
+  g->gray = *getgclist(o);  /* remove from 'gray' list */
+  switch (o->tt) {
+    case LUA_VTABLE: return traversetable(g, gco2t(o));
+    case LUA_VUSERDATA: return traverseudata(g, gco2u(o));
+    case LUA_VLCL: return traverseLclosure(g, gco2lcl(o));
+    case LUA_VCCL: return traverseCclosure(g, gco2ccl(o));
+    case LUA_VPROTO: return traverseproto(g, gco2p(o));
+    case LUA_VTHREAD: return traversethread(g, gco2th(o));
+    default: lua_assert(0); return 0;
+  }
+}
+
+
+static lu_mem propagateall (global_State *g) {
+  lu_mem tot = 0;
+  while (g->gray)
+    tot += propagatemark(g);
+  return tot;
+}
+
+
+/*
+** Traverse all ephemeron tables propagating marks from keys to values.
+** Repeat until it converges, that is, nothing new is marked. 'dir'
+** inverts the direction of the traversals, trying to speed up
+** convergence on chains in the same table.
+**
+*/
+static void convergeephemerons (global_State *g) {
+  int changed;
+  int dir = 0;
+  do {
+    GCObject *w;
+    GCObject *next = g->ephemeron;  /* get ephemeron list */
+    g->ephemeron = NULL;  /* tables may return to this list when traversed */
+    changed = 0;
+    while ((w = next) != NULL) {  /* for each ephemeron table */
+      Table *h = gco2t(w);
+      next = h->gclist;  /* list is rebuilt during loop */
+      nw2black(h);  /* out of the list (for now) */
+      if (traverseephemeron(g, h, dir)) {  /* marked some value? */
+        propagateall(g);  /* propagate changes */
+        changed = 1;  /* will have to revisit all ephemeron tables */
+      }
+    }
+    dir = !dir;  /* invert direction next time */
+  } while (changed);  /* repeat until no more changes */
+}
+
+/* }====================================================== */
+
+
+/*
+** {======================================================
+** Sweep Functions
+** =======================================================
+*/
+
+
+/*
+** clear entries with unmarked keys from all weaktables in list 'l'
+*/
+static void clearbykeys (global_State *g, GCObject *l) {
+  for (; l; l = gco2t(l)->gclist) {
+    Table *h = gco2t(l);
+    Node *limit = gnodelast(h);
+    Node *n;
+    for (n = gnode(h, 0); n < limit; n++) {
+      if (iscleared(g, gckeyN(n)))  /* unmarked key? */
+        setempty(gval(n));  /* remove entry */
+      if (isempty(gval(n)))  /* is entry empty? */
+        clearkey(n);  /* clear its key */
+    }
+  }
+}
+
+
+/*
+** clear entries with unmarked values from all weaktables in list 'l' up
+** to element 'f'
+*/
+static void clearbyvalues (global_State *g, GCObject *l, GCObject *f) {
+  for (; l != f; l = gco2t(l)->gclist) {
+    Table *h = gco2t(l);
+    Node *n, *limit = gnodelast(h);
+    unsigned int i;
+    unsigned int asize = luaH_realasize(h);
+    for (i = 0; i < asize; i++) {
+      TValue *o = &h->array[i];
+      if (iscleared(g, gcvalueN(o)))  /* value was collected? */
+        setempty(o);  /* remove entry */
+    }
+    for (n = gnode(h, 0); n < limit; n++) {
+      if (iscleared(g, gcvalueN(gval(n))))  /* unmarked value? */
+        setempty(gval(n));  /* remove entry */
+      if (isempty(gval(n)))  /* is entry empty? */
+        clearkey(n);  /* clear its key */
+    }
+  }
+}
+
+
+static void freeupval (lua_State *L, UpVal *uv) {
+  if (upisopen(uv))
+    luaF_unlinkupval(uv);
+  luaM_free(L, uv);
+}
+
+
+static void freeobj (lua_State *L, GCObject *o) {
+  switch (o->tt) {
+    case LUA_VPROTO:
+      luaF_freeproto(L, gco2p(o));
+      break;
+    case LUA_VUPVAL:
+      freeupval(L, gco2upv(o));
+      break;
+    case LUA_VLCL: {
+      LClosure *cl = gco2lcl(o);
+      luaM_freemem(L, cl, sizeLclosure(cl->nupvalues));
+      break;
+    }
+    case LUA_VCCL: {
+      CClosure *cl = gco2ccl(o);
+      luaM_freemem(L, cl, sizeCclosure(cl->nupvalues));
+      break;
+    }
+    case LUA_VTABLE:
+      luaH_free(L, gco2t(o));
+      break;
+    case LUA_VTHREAD:
+      luaE_freethread(L, gco2th(o));
+      break;
+    case LUA_VUSERDATA: {
+      Udata *u = gco2u(o);
+      luaM_freemem(L, o, sizeudata(u->nuvalue, u->len));
+      break;
+    }
+    case LUA_VSHRSTR: {
+      TString *ts = gco2ts(o);
+      luaS_remove(L, ts);  /* remove it from hash table */
+      luaM_freemem(L, ts, sizelstring(ts->shrlen));
+      break;
+    }
+    case LUA_VLNGSTR: {
+      TString *ts = gco2ts(o);
+      luaM_freemem(L, ts, sizelstring(ts->u.lnglen));
+      break;
+    }
+    default: lua_assert(0);
+  }
+}
+
+
+/*
+** sweep at most 'countin' elements from a list of GCObjects erasing dead
+** objects, where a dead object is one marked with the old (non current)
+** white; change all non-dead objects back to white, preparing for next
+** collection cycle. Return where to continue the traversal or NULL if
+** list is finished. ('*countout' gets the number of elements traversed.)
+*/
+static GCObject **sweeplist (lua_State *L, GCObject **p, int countin,
+                             int *countout) {
+  global_State *g = G(L);
+  int ow = otherwhite(g);
+  int i;
+  int white = luaC_white(g);  /* current white */
+  for (i = 0; *p != NULL && i < countin; i++) {
+    GCObject *curr = *p;
+    int marked = curr->marked;
+    if (isdeadm(ow, marked)) {  /* is 'curr' dead? */
+      *p = curr->next;  /* remove 'curr' from list */
+      freeobj(L, curr);  /* erase 'curr' */
+    }
+    else {  /* change mark to 'white' */
+      curr->marked = cast_byte((marked & ~maskgcbits) | white);
+      p = &curr->next;  /* go to next element */
+    }
+  }
+  if (countout)
+    *countout = i;  /* number of elements traversed */
+  return (*p == NULL) ? NULL : p;
+}
+
+
+/*
+** sweep a list until a live object (or end of list)
+*/
+static GCObject **sweeptolive (lua_State *L, GCObject **p) {
+  GCObject **old = p;
+  do {
+    p = sweeplist(L, p, 1, NULL);
+  } while (p == old);
+  return p;
+}
+
+/* }====================================================== */
+
+
+/*
+** {======================================================
+** Finalization
+** =======================================================
+*/
+
+/*
+** If possible, shrink string table.
+*/
+static void checkSizes (lua_State *L, global_State *g) {
+  if (!g->gcemergency) {
+    if (g->strt.nuse < g->strt.size / 4) {  /* string table too big? */
+      l_mem olddebt = g->GCdebt;
+      luaS_resize(L, g->strt.size / 2);
+      g->GCestimate += g->GCdebt - olddebt;  /* correct estimate */
+    }
+  }
+}
+
+
+/*
+** Get the next udata to be finalized from the 'tobefnz' list, and
+** link it back into the 'allgc' list.
+*/
+static GCObject *udata2finalize (global_State *g) {
+  GCObject *o = g->tobefnz;  /* get first element */
+  lua_assert(tofinalize(o));
+  g->tobefnz = o->next;  /* remove it from 'tobefnz' list */
+  o->next = g->allgc;  /* return it to 'allgc' list */
+  g->allgc = o;
+  resetbit(o->marked, FINALIZEDBIT);  /* object is "normal" again */
+  if (issweepphase(g))
+    makewhite(g, o);  /* "sweep" object */
+  else if (getage(o) == G_OLD1)
+    g->firstold1 = o;  /* it is the first OLD1 object in the list */
+  return o;
+}
+
+
+static void dothecall (lua_State *L, void *ud) {
+  UNUSED(ud);
+  luaD_callnoyield(L, L->top.p - 2, 0);
+}
+
+
+static void GCTM (lua_State *L) {
+  global_State *g = G(L);
+  const TValue *tm;
+  TValue v;
+  lua_assert(!g->gcemergency);
+  setgcovalue(L, &v, udata2finalize(g));
+  tm = luaT_gettmbyobj(L, &v, TM_GC);
+  if (!notm(tm)) {  /* is there a finalizer? */
+    int status;
+    lu_byte oldah = L->allowhook;
+    int oldgcstp  = g->gcstp;
+    g->gcstp |= GCSTPGC;  /* avoid GC steps */
+    L->allowhook = 0;  /* stop debug hooks during GC metamethod */
+    setobj2s(L, L->top.p++, tm);  /* push finalizer... */
+    setobj2s(L, L->top.p++, &v);  /* ... and its argument */
+    L->ci->callstatus |= CIST_FIN;  /* will run a finalizer */
+    status = luaD_pcall(L, dothecall, NULL, savestack(L, L->top.p - 2), 0);
+    L->ci->callstatus &= ~CIST_FIN;  /* not running a finalizer anymore */
+    L->allowhook = oldah;  /* restore hooks */
+    g->gcstp = oldgcstp;  /* restore state */
+    if (l_unlikely(status != LUA_OK)) {  /* error while running __gc? */
+      luaE_warnerror(L, "__gc");
+      L->top.p--;  /* pops error object */
+    }
+  }
+}
+
+
+/*
+** Call a few finalizers
+*/
+static int runafewfinalizers (lua_State *L, int n) {
+  global_State *g = G(L);
+  int i;
+  for (i = 0; i < n && g->tobefnz; i++)
+    GCTM(L);  /* call one finalizer */
+  return i;
+}
+
+
+/*
+** call all pending finalizers
+*/
+static void callallpendingfinalizers (lua_State *L) {
+  global_State *g = G(L);
+  while (g->tobefnz)
+    GCTM(L);
+}
+
+
+/*
+** find last 'next' field in list 'p' list (to add elements in its end)
+*/
+static GCObject **findlast (GCObject **p) {
+  while (*p != NULL)
+    p = &(*p)->next;
+  return p;
+}
+
+
+/*
+** Move all unreachable objects (or 'all' objects) that need
+** finalization from list 'finobj' to list 'tobefnz' (to be finalized).
+** (Note that objects after 'finobjold1' cannot be white, so they
+** don't need to be traversed. In incremental mode, 'finobjold1' is NULL,
+** so the whole list is traversed.)
+*/
+static void separatetobefnz (global_State *g, int all) {
+  GCObject *curr;
+  GCObject **p = &g->finobj;
+  GCObject **lastnext = findlast(&g->tobefnz);
+  while ((curr = *p) != g->finobjold1) {  /* traverse all finalizable objects */
+    lua_assert(tofinalize(curr));
+    if (!(iswhite(curr) || all))  /* not being collected? */
+      p = &curr->next;  /* don't bother with it */
+    else {
+      if (curr == g->finobjsur)  /* removing 'finobjsur'? */
+        g->finobjsur = curr->next;  /* correct it */
+      *p = curr->next;  /* remove 'curr' from 'finobj' list */
+      curr->next = *lastnext;  /* link at the end of 'tobefnz' list */
+      *lastnext = curr;
+      lastnext = &curr->next;
+    }
+  }
+}
+
+
+/*
+** If pointer 'p' points to 'o', move it to the next element.
+*/
+static void checkpointer (GCObject **p, GCObject *o) {
+  if (o == *p)
+    *p = o->next;
+}
+
+
+/*
+** Correct pointers to objects inside 'allgc' list when
+** object 'o' is being removed from the list.
+*/
+static void correctpointers (global_State *g, GCObject *o) {
+  checkpointer(&g->survival, o);
+  checkpointer(&g->old1, o);
+  checkpointer(&g->reallyold, o);
+  checkpointer(&g->firstold1, o);
+}
+
+
+/*
+** if object 'o' has a finalizer, remove it from 'allgc' list (must
+** search the list to find it) and link it in 'finobj' list.
+*/
+void luaC_checkfinalizer (lua_State *L, GCObject *o, Table *mt) {
+  global_State *g = G(L);
+  if (tofinalize(o) ||                 /* obj. is already marked... */
+      gfasttm(g, mt, TM_GC) == NULL ||    /* or has no finalizer... */
+      (g->gcstp & GCSTPCLS))                   /* or closing state? */
+    return;  /* nothing to be done */
+  else {  /* move 'o' to 'finobj' list */
+    GCObject **p;
+    if (issweepphase(g)) {
+      makewhite(g, o);  /* "sweep" object 'o' */
+      if (g->sweepgc == &o->next)  /* should not remove 'sweepgc' object */
+        g->sweepgc = sweeptolive(L, g->sweepgc);  /* change 'sweepgc' */
+    }
+    else
+      correctpointers(g, o);
+    /* search for pointer pointing to 'o' */
+    for (p = &g->allgc; *p != o; p = &(*p)->next) { /* empty */ }
+    *p = o->next;  /* remove 'o' from 'allgc' list */
+    o->next = g->finobj;  /* link it in 'finobj' list */
+    g->finobj = o;
+    l_setbit(o->marked, FINALIZEDBIT);  /* mark it as such */
+  }
+}
+
+/* }====================================================== */
+
+
+/*
+** {======================================================
+** Generational Collector
+** =======================================================
+*/
+
+
+/*
+** Set the "time" to wait before starting a new GC cycle; cycle will
+** start when memory use hits the threshold of ('estimate' * pause /
+** PAUSEADJ). (Division by 'estimate' should be OK: it cannot be zero,
+** because Lua cannot even start with less than PAUSEADJ bytes).
+*/
+static void setpause (global_State *g) {
+  l_mem threshold, debt;
+  int pause = getgcparam(g->gcpause);
+  l_mem estimate = g->GCestimate / PAUSEADJ;  /* adjust 'estimate' */
+  lua_assert(estimate > 0);
+  threshold = (pause < MAX_LMEM / estimate)  /* overflow? */
+            ? estimate * pause  /* no overflow */
+            : MAX_LMEM;  /* overflow; truncate to maximum */
+  debt = gettotalbytes(g) - threshold;
+  if (debt > 0) debt = 0;
+  luaE_setdebt(g, debt);
+}
+
+
+/*
+** Sweep a list of objects to enter generational mode.  Deletes dead
+** objects and turns the non dead to old. All non-dead threads---which
+** are now old---must be in a gray list. Everything else is not in a
+** gray list. Open upvalues are also kept gray.
+*/
+static void sweep2old (lua_State *L, GCObject **p) {
+  GCObject *curr;
+  global_State *g = G(L);
+  while ((curr = *p) != NULL) {
+    if (iswhite(curr)) {  /* is 'curr' dead? */
+      lua_assert(isdead(g, curr));
+      *p = curr->next;  /* remove 'curr' from list */
+      freeobj(L, curr);  /* erase 'curr' */
+    }
+    else {  /* all surviving objects become old */
+      setage(curr, G_OLD);
+      if (curr->tt == LUA_VTHREAD) {  /* threads must be watched */
+        lua_State *th = gco2th(curr);
+        linkgclist(th, g->grayagain);  /* insert into 'grayagain' list */
+      }
+      else if (curr->tt == LUA_VUPVAL && upisopen(gco2upv(curr)))
+        set2gray(curr);  /* open upvalues are always gray */
+      else  /* everything else is black */
+        nw2black(curr);
+      p = &curr->next;  /* go to next element */
+    }
+  }
+}
+
+
+/*
+** Sweep for generational mode. Delete dead objects. (Because the
+** collection is not incremental, there are no "new white" objects
+** during the sweep. So, any white object must be dead.) For
+** non-dead objects, advance their ages and clear the color of
+** new objects. (Old objects keep their colors.)
+** The ages of G_TOUCHED1 and G_TOUCHED2 objects cannot be advanced
+** here, because these old-generation objects are usually not swept
+** here.  They will all be advanced in 'correctgraylist'. That function
+** will also remove objects turned white here from any gray list.
+*/
+static GCObject **sweepgen (lua_State *L, global_State *g, GCObject **p,
+                            GCObject *limit, GCObject **pfirstold1) {
+  static const lu_byte nextage[] = {
+    G_SURVIVAL,  /* from G_NEW */
+    G_OLD1,      /* from G_SURVIVAL */
+    G_OLD1,      /* from G_OLD0 */
+    G_OLD,       /* from G_OLD1 */
+    G_OLD,       /* from G_OLD (do not change) */
+    G_TOUCHED1,  /* from G_TOUCHED1 (do not change) */
+    G_TOUCHED2   /* from G_TOUCHED2 (do not change) */
+  };
+  int white = luaC_white(g);
+  GCObject *curr;
+  while ((curr = *p) != limit) {
+    if (iswhite(curr)) {  /* is 'curr' dead? */
+      lua_assert(!isold(curr) && isdead(g, curr));
+      *p = curr->next;  /* remove 'curr' from list */
+      freeobj(L, curr);  /* erase 'curr' */
+    }
+    else {  /* correct mark and age */
+      if (getage(curr) == G_NEW) {  /* new objects go back to white */
+        int marked = curr->marked & ~maskgcbits;  /* erase GC bits */
+        curr->marked = cast_byte(marked | G_SURVIVAL | white);
+      }
+      else {  /* all other objects will be old, and so keep their color */
+        setage(curr, nextage[getage(curr)]);
+        if (getage(curr) == G_OLD1 && *pfirstold1 == NULL)
+          *pfirstold1 = curr;  /* first OLD1 object in the list */
+      }
+      p = &curr->next;  /* go to next element */
+    }
+  }
+  return p;
+}
+
+
+/*
+** Traverse a list making all its elements white and clearing their
+** age. In incremental mode, all objects are 'new' all the time,
+** except for fixed strings (which are always old).
+*/
+static void whitelist (global_State *g, GCObject *p) {
+  int white = luaC_white(g);
+  for (; p != NULL; p = p->next)
+    p->marked = cast_byte((p->marked & ~maskgcbits) | white);
+}
+
+
+/*
+** Correct a list of gray objects. Return pointer to where rest of the
+** list should be linked.
+** Because this correction is done after sweeping, young objects might
+** be turned white and still be in the list. They are only removed.
+** 'TOUCHED1' objects are advanced to 'TOUCHED2' and remain on the list;
+** Non-white threads also remain on the list; 'TOUCHED2' objects become
+** regular old; they and anything else are removed from the list.
+*/
+static GCObject **correctgraylist (GCObject **p) {
+  GCObject *curr;
+  while ((curr = *p) != NULL) {
+    GCObject **next = getgclist(curr);
+    if (iswhite(curr))
+      goto remove;  /* remove all white objects */
+    else if (getage(curr) == G_TOUCHED1) {  /* touched in this cycle? */
+      lua_assert(isgray(curr));
+      nw2black(curr);  /* make it black, for next barrier */
+      changeage(curr, G_TOUCHED1, G_TOUCHED2);
+      goto remain;  /* keep it in the list and go to next element */
+    }
+    else if (curr->tt == LUA_VTHREAD) {
+      lua_assert(isgray(curr));
+      goto remain;  /* keep non-white threads on the list */
+    }
+    else {  /* everything else is removed */
+      lua_assert(isold(curr));  /* young objects should be white here */
+      if (getage(curr) == G_TOUCHED2)  /* advance from TOUCHED2... */
+        changeage(curr, G_TOUCHED2, G_OLD);  /* ... to OLD */
+      nw2black(curr);  /* make object black (to be removed) */
+      goto remove;
+    }
+    remove: *p = *next; continue;
+    remain: p = next; continue;
+  }
+  return p;
+}
+
+
+/*
+** Correct all gray lists, coalescing them into 'grayagain'.
+*/
+static void correctgraylists (global_State *g) {
+  GCObject **list = correctgraylist(&g->grayagain);
+  *list = g->weak; g->weak = NULL;
+  list = correctgraylist(list);
+  *list = g->allweak; g->allweak = NULL;
+  list = correctgraylist(list);
+  *list = g->ephemeron; g->ephemeron = NULL;
+  correctgraylist(list);
+}
+
+
+/*
+** Mark black 'OLD1' objects when starting a new young collection.
+** Gray objects are already in some gray list, and so will be visited
+** in the atomic step.
+*/
+static void markold (global_State *g, GCObject *from, GCObject *to) {
+  GCObject *p;
+  for (p = from; p != to; p = p->next) {
+    if (getage(p) == G_OLD1) {
+      lua_assert(!iswhite(p));
+      changeage(p, G_OLD1, G_OLD);  /* now they are old */
+      if (isblack(p))
+        reallymarkobject(g, p);
+    }
+  }
+}
+
+
+/*
+** Finish a young-generation collection.
+*/
+static void finishgencycle (lua_State *L, global_State *g) {
+  correctgraylists(g);
+  checkSizes(L, g);
+  g->gcstate = GCSpropagate;  /* skip restart */
+  if (!g->gcemergency)
+    callallpendingfinalizers(L);
+}
+
+
+/*
+** Does a young collection. First, mark 'OLD1' objects. Then does the
+** atomic step. Then, sweep all lists and advance pointers. Finally,
+** finish the collection.
+*/
+static void youngcollection (lua_State *L, global_State *g) {
+  GCObject **psurvival;  /* to point to first non-dead survival object */
+  GCObject *dummy;  /* dummy out parameter to 'sweepgen' */
+  lua_assert(g->gcstate == GCSpropagate);
+  if (g->firstold1) {  /* are there regular OLD1 objects? */
+    markold(g, g->firstold1, g->reallyold);  /* mark them */
+    g->firstold1 = NULL;  /* no more OLD1 objects (for now) */
+  }
+  markold(g, g->finobj, g->finobjrold);
+  markold(g, g->tobefnz, NULL);
+  atomic(L);
+
+  /* sweep nursery and get a pointer to its last live element */
+  g->gcstate = GCSswpallgc;
+  psurvival = sweepgen(L, g, &g->allgc, g->survival, &g->firstold1);
+  /* sweep 'survival' */
+  sweepgen(L, g, psurvival, g->old1, &g->firstold1);
+  g->reallyold = g->old1;
+  g->old1 = *psurvival;  /* 'survival' survivals are old now */
+  g->survival = g->allgc;  /* all news are survivals */
+
+  /* repeat for 'finobj' lists */
+  dummy = NULL;  /* no 'firstold1' optimization for 'finobj' lists */
+  psurvival = sweepgen(L, g, &g->finobj, g->finobjsur, &dummy);
+  /* sweep 'survival' */
+  sweepgen(L, g, psurvival, g->finobjold1, &dummy);
+  g->finobjrold = g->finobjold1;
+  g->finobjold1 = *psurvival;  /* 'survival' survivals are old now */
+  g->finobjsur = g->finobj;  /* all news are survivals */
+
+  sweepgen(L, g, &g->tobefnz, NULL, &dummy);
+  finishgencycle(L, g);
+}
+
+
+/*
+** Clears all gray lists, sweeps objects, and prepare sublists to enter
+** generational mode. The sweeps remove dead objects and turn all
+** surviving objects to old. Threads go back to 'grayagain'; everything
+** else is turned black (not in any gray list).
+*/
+static void atomic2gen (lua_State *L, global_State *g) {
+  cleargraylists(g);
+  /* sweep all elements making them old */
+  g->gcstate = GCSswpallgc;
+  sweep2old(L, &g->allgc);
+  /* everything alive now is old */
+  g->reallyold = g->old1 = g->survival = g->allgc;
+  g->firstold1 = NULL;  /* there are no OLD1 objects anywhere */
+
+  /* repeat for 'finobj' lists */
+  sweep2old(L, &g->finobj);
+  g->finobjrold = g->finobjold1 = g->finobjsur = g->finobj;
+
+  sweep2old(L, &g->tobefnz);
+
+  g->gckind = KGC_GEN;
+  g->lastatomic = 0;
+  g->GCestimate = gettotalbytes(g);  /* base for memory control */
+  finishgencycle(L, g);
+}
+
+
+/*
+** Set debt for the next minor collection, which will happen when
+** memory grows 'genminormul'%.
+*/
+static void setminordebt (global_State *g) {
+  luaE_setdebt(g, -(cast(l_mem, (gettotalbytes(g) / 100)) * g->genminormul));
+}
+
+
+/*
+** Enter generational mode. Must go until the end of an atomic cycle
+** to ensure that all objects are correctly marked and weak tables
+** are cleared. Then, turn all objects into old and finishes the
+** collection.
+*/
+static lu_mem entergen (lua_State *L, global_State *g) {
+  lu_mem numobjs;
+  luaC_runtilstate(L, bitmask(GCSpause));  /* prepare to start a new cycle */
+  luaC_runtilstate(L, bitmask(GCSpropagate));  /* start new cycle */
+  numobjs = atomic(L);  /* propagates all and then do the atomic stuff */
+  atomic2gen(L, g);
+  setminordebt(g);  /* set debt assuming next cycle will be minor */
+  return numobjs;
+}
+
+
+/*
+** Enter incremental mode. Turn all objects white, make all
+** intermediate lists point to NULL (to avoid invalid pointers),
+** and go to the pause state.
+*/
+static void enterinc (global_State *g) {
+  whitelist(g, g->allgc);
+  g->reallyold = g->old1 = g->survival = NULL;
+  whitelist(g, g->finobj);
+  whitelist(g, g->tobefnz);
+  g->finobjrold = g->finobjold1 = g->finobjsur = NULL;
+  g->gcstate = GCSpause;
+  g->gckind = KGC_INC;
+  g->lastatomic = 0;
+}
+
+
+/*
+** Change collector mode to 'newmode'.
+*/
+void luaC_changemode (lua_State *L, int newmode) {
+  global_State *g = G(L);
+  if (newmode != g->gckind) {
+    if (newmode == KGC_GEN)  /* entering generational mode? */
+      entergen(L, g);
+    else
+      enterinc(g);  /* entering incremental mode */
+  }
+  g->lastatomic = 0;
+}
+
+
+/*
+** Does a full collection in generational mode.
+*/
+static lu_mem fullgen (lua_State *L, global_State *g) {
+  enterinc(g);
+  return entergen(L, g);
+}
+
+
+/*
+** Does a major collection after last collection was a "bad collection".
+**
+** When the program is building a big structure, it allocates lots of
+** memory but generates very little garbage. In those scenarios,
+** the generational mode just wastes time doing small collections, and
+** major collections are frequently what we call a "bad collection", a
+** collection that frees too few objects. To avoid the cost of switching
+** between generational mode and the incremental mode needed for full
+** (major) collections, the collector tries to stay in incremental mode
+** after a bad collection, and to switch back to generational mode only
+** after a "good" collection (one that traverses less than 9/8 objects
+** of the previous one).
+** The collector must choose whether to stay in incremental mode or to
+** switch back to generational mode before sweeping. At this point, it
+** does not know the real memory in use, so it cannot use memory to
+** decide whether to return to generational mode. Instead, it uses the
+** number of objects traversed (returned by 'atomic') as a proxy. The
+** field 'g->lastatomic' keeps this count from the last collection.
+** ('g->lastatomic != 0' also means that the last collection was bad.)
+*/
+static void stepgenfull (lua_State *L, global_State *g) {
+  lu_mem newatomic;  /* count of traversed objects */
+  lu_mem lastatomic = g->lastatomic;  /* count from last collection */
+  if (g->gckind == KGC_GEN)  /* still in generational mode? */
+    enterinc(g);  /* enter incremental mode */
+  luaC_runtilstate(L, bitmask(GCSpropagate));  /* start new cycle */
+  newatomic = atomic(L);  /* mark everybody */
+  if (newatomic < lastatomic + (lastatomic >> 3)) {  /* good collection? */
+    atomic2gen(L, g);  /* return to generational mode */
+    setminordebt(g);
+  }
+  else {  /* another bad collection; stay in incremental mode */
+    g->GCestimate = gettotalbytes(g);  /* first estimate */;
+    entersweep(L);
+    luaC_runtilstate(L, bitmask(GCSpause));  /* finish collection */
+    setpause(g);
+    g->lastatomic = newatomic;
+  }
+}
+
+
+/*
+** Does a generational "step".
+** Usually, this means doing a minor collection and setting the debt to
+** make another collection when memory grows 'genminormul'% larger.
+**
+** However, there are exceptions.  If memory grows 'genmajormul'%
+** larger than it was at the end of the last major collection (kept
+** in 'g->GCestimate'), the function does a major collection. At the
+** end, it checks whether the major collection was able to free a
+** decent amount of memory (at least half the growth in memory since
+** previous major collection). If so, the collector keeps its state,
+** and the next collection will probably be minor again. Otherwise,
+** we have what we call a "bad collection". In that case, set the field
+** 'g->lastatomic' to signal that fact, so that the next collection will
+** go to 'stepgenfull'.
+**
+** 'GCdebt <= 0' means an explicit call to GC step with "size" zero;
+** in that case, do a minor collection.
+*/
+static void genstep (lua_State *L, global_State *g) {
+  if (g->lastatomic != 0)  /* last collection was a bad one? */
+    stepgenfull(L, g);  /* do a full step */
+  else {
+    lu_mem majorbase = g->GCestimate;  /* memory after last major collection */
+    lu_mem majorinc = (majorbase / 100) * getgcparam(g->genmajormul);
+    if (g->GCdebt > 0 && gettotalbytes(g) > majorbase + majorinc) {
+      lu_mem numobjs = fullgen(L, g);  /* do a major collection */
+      if (gettotalbytes(g) < majorbase + (majorinc / 2)) {
+        /* collected at least half of memory growth since last major
+           collection; keep doing minor collections. */
+        lua_assert(g->lastatomic == 0);
+      }
+      else {  /* bad collection */
+        g->lastatomic = numobjs;  /* signal that last collection was bad */
+        setpause(g);  /* do a long wait for next (major) collection */
+      }
+    }
+    else {  /* regular case; do a minor collection */
+      youngcollection(L, g);
+      setminordebt(g);
+      g->GCestimate = majorbase;  /* preserve base value */
+    }
+  }
+  lua_assert(isdecGCmodegen(g));
+}
+
+/* }====================================================== */
+
+
+/*
+** {======================================================
+** GC control
+** =======================================================
+*/
+
+
+/*
+** Enter first sweep phase.
+** The call to 'sweeptolive' makes the pointer point to an object
+** inside the list (instead of to the header), so that the real sweep do
+** not need to skip objects created between "now" and the start of the
+** real sweep.
+*/
+static void entersweep (lua_State *L) {
+  global_State *g = G(L);
+  g->gcstate = GCSswpallgc;
+  lua_assert(g->sweepgc == NULL);
+  g->sweepgc = sweeptolive(L, &g->allgc);
+}
+
+
+/*
+** Delete all objects in list 'p' until (but not including) object
+** 'limit'.
+*/
+static void deletelist (lua_State *L, GCObject *p, GCObject *limit) {
+  while (p != limit) {
+    GCObject *next = p->next;
+    freeobj(L, p);
+    p = next;
+  }
+}
+
+
+/*
+** Call all finalizers of the objects in the given Lua state, and
+** then free all objects, except for the main thread.
+*/
+void luaC_freeallobjects (lua_State *L) {
+  global_State *g = G(L);
+  g->gcstp = GCSTPCLS;  /* no extra finalizers after here */
+  luaC_changemode(L, KGC_INC);
+  separatetobefnz(g, 1);  /* separate all objects with finalizers */
+  lua_assert(g->finobj == NULL);
+  callallpendingfinalizers(L);
+  deletelist(L, g->allgc, obj2gco(g->mainthread));
+  lua_assert(g->finobj == NULL);  /* no new finalizers */
+  deletelist(L, g->fixedgc, NULL);  /* collect fixed objects */
+  lua_assert(g->strt.nuse == 0);
+}
+
+
+static lu_mem atomic (lua_State *L) {
+  global_State *g = G(L);
+  lu_mem work = 0;
+  GCObject *origweak, *origall;
+  GCObject *grayagain = g->grayagain;  /* save original list */
+  g->grayagain = NULL;
+  lua_assert(g->ephemeron == NULL && g->weak == NULL);
+  lua_assert(!iswhite(g->mainthread));
+  g->gcstate = GCSatomic;
+  markobject(g, L);  /* mark running thread */
+  /* registry and global metatables may be changed by API */
+  markvalue(g, &g->l_registry);
+  markmt(g);  /* mark global metatables */
+  work += propagateall(g);  /* empties 'gray' list */
+  /* remark occasional upvalues of (maybe) dead threads */
+  work += remarkupvals(g);
+  work += propagateall(g);  /* propagate changes */
+  g->gray = grayagain;
+  work += propagateall(g);  /* traverse 'grayagain' list */
+  convergeephemerons(g);
+  /* at this point, all strongly accessible objects are marked. */
+  /* Clear values from weak tables, before checking finalizers */
+  clearbyvalues(g, g->weak, NULL);
+  clearbyvalues(g, g->allweak, NULL);
+  origweak = g->weak; origall = g->allweak;
+  separatetobefnz(g, 0);  /* separate objects to be finalized */
+  work += markbeingfnz(g);  /* mark objects that will be finalized */
+  work += propagateall(g);  /* remark, to propagate 'resurrection' */
+  convergeephemerons(g);
+  /* at this point, all resurrected objects are marked. */
+  /* remove dead objects from weak tables */
+  clearbykeys(g, g->ephemeron);  /* clear keys from all ephemeron tables */
+  clearbykeys(g, g->allweak);  /* clear keys from all 'allweak' tables */
+  /* clear values from resurrected weak tables */
+  clearbyvalues(g, g->weak, origweak);
+  clearbyvalues(g, g->allweak, origall);
+  luaS_clearcache(g);
+  g->currentwhite = cast_byte(otherwhite(g));  /* flip current white */
+  lua_assert(g->gray == NULL);
+  return work;  /* estimate of slots marked by 'atomic' */
+}
+
+
+static int sweepstep (lua_State *L, global_State *g,
+                      int nextstate, GCObject **nextlist) {
+  if (g->sweepgc) {
+    l_mem olddebt = g->GCdebt;
+    int count;
+    g->sweepgc = sweeplist(L, g->sweepgc, GCSWEEPMAX, &count);
+    g->GCestimate += g->GCdebt - olddebt;  /* update estimate */
+    return count;
+  }
+  else {  /* enter next state */
+    g->gcstate = nextstate;
+    g->sweepgc = nextlist;
+    return 0;  /* no work done */
+  }
+}
+
+
+static lu_mem singlestep (lua_State *L) {
+  global_State *g = G(L);
+  lu_mem work;
+  lua_assert(!g->gcstopem);  /* collector is not reentrant */
+  g->gcstopem = 1;  /* no emergency collections while collecting */
+  switch (g->gcstate) {
+    case GCSpause: {
+      restartcollection(g);
+      g->gcstate = GCSpropagate;
+      work = 1;
+      break;
+    }
+    case GCSpropagate: {
+      if (g->gray == NULL) {  /* no more gray objects? */
+        g->gcstate = GCSenteratomic;  /* finish propagate phase */
+        work = 0;
+      }
+      else
+        work = propagatemark(g);  /* traverse one gray object */
+      break;
+    }
+    case GCSenteratomic: {
+      work = atomic(L);  /* work is what was traversed by 'atomic' */
+      entersweep(L);
+      g->GCestimate = gettotalbytes(g);  /* first estimate */;
+      break;
+    }
+    case GCSswpallgc: {  /* sweep "regular" objects */
+      work = sweepstep(L, g, GCSswpfinobj, &g->finobj);
+      break;
+    }
+    case GCSswpfinobj: {  /* sweep objects with finalizers */
+      work = sweepstep(L, g, GCSswptobefnz, &g->tobefnz);
+      break;
+    }
+    case GCSswptobefnz: {  /* sweep objects to be finalized */
+      work = sweepstep(L, g, GCSswpend, NULL);
+      break;
+    }
+    case GCSswpend: {  /* finish sweeps */
+      checkSizes(L, g);
+      g->gcstate = GCScallfin;
+      work = 0;
+      break;
+    }
+    case GCScallfin: {  /* call remaining finalizers */
+      if (g->tobefnz && !g->gcemergency) {
+        g->gcstopem = 0;  /* ok collections during finalizers */
+        work = runafewfinalizers(L, GCFINMAX) * GCFINALIZECOST;
+      }
+      else {  /* emergency mode or no more finalizers */
+        g->gcstate = GCSpause;  /* finish collection */
+        work = 0;
+      }
+      break;
+    }
+    default: lua_assert(0); return 0;
+  }
+  g->gcstopem = 0;
+  return work;
+}
+
+
+/*
+** advances the garbage collector until it reaches a state allowed
+** by 'statemask'
+*/
+void luaC_runtilstate (lua_State *L, int statesmask) {
+  global_State *g = G(L);
+  while (!testbit(statesmask, g->gcstate))
+    singlestep(L);
+}
+
+
+
+/*
+** Performs a basic incremental step. The debt and step size are
+** converted from bytes to "units of work"; then the function loops
+** running single steps until adding that many units of work or
+** finishing a cycle (pause state). Finally, it sets the debt that
+** controls when next step will be performed.
+*/
+static void incstep (lua_State *L, global_State *g) {
+  int stepmul = (getgcparam(g->gcstepmul) | 1);  /* avoid division by 0 */
+  l_mem debt = (g->GCdebt / WORK2MEM) * stepmul;
+  l_mem stepsize = (g->gcstepsize <= log2maxs(l_mem))
+                 ? ((cast(l_mem, 1) << g->gcstepsize) / WORK2MEM) * stepmul
+                 : MAX_LMEM;  /* overflow; keep maximum value */
+  do {  /* repeat until pause or enough "credit" (negative debt) */
+    lu_mem work = singlestep(L);  /* perform one single step */
+    debt -= work;
+  } while (debt > -stepsize && g->gcstate != GCSpause);
+  if (g->gcstate == GCSpause)
+    setpause(g);  /* pause until next cycle */
+  else {
+    debt = (debt / stepmul) * WORK2MEM;  /* convert 'work units' to bytes */
+    luaE_setdebt(g, debt);
+  }
+}
+
+/*
+** Performs a basic GC step if collector is running. (If collector is
+** not running, set a reasonable debt to avoid it being called at
+** every single check.)
+*/
+void luaC_step (lua_State *L) {
+  global_State *g = G(L);
+  if (!gcrunning(g))  /* not running? */
+    luaE_setdebt(g, -2000);
+  else {
+    if(isdecGCmodegen(g))
+      genstep(L, g);
+    else
+      incstep(L, g);
+  }
+}
+
+
+/*
+** Perform a full collection in incremental mode.
+** Before running the collection, check 'keepinvariant'; if it is true,
+** there may be some objects marked as black, so the collector has
+** to sweep all objects to turn them back to white (as white has not
+** changed, nothing will be collected).
+*/
+static void fullinc (lua_State *L, global_State *g) {
+  if (keepinvariant(g))  /* black objects? */
+    entersweep(L); /* sweep everything to turn them back to white */
+  /* finish any pending sweep phase to start a new cycle */
+  luaC_runtilstate(L, bitmask(GCSpause));
+  luaC_runtilstate(L, bitmask(GCScallfin));  /* run up to finalizers */
+  /* estimate must be correct after a full GC cycle */
+  lua_assert(g->GCestimate == gettotalbytes(g));
+  luaC_runtilstate(L, bitmask(GCSpause));  /* finish collection */
+  setpause(g);
+}
+
+
+/*
+** Performs a full GC cycle; if 'isemergency', set a flag to avoid
+** some operations which could change the interpreter state in some
+** unexpected ways (running finalizers and shrinking some structures).
+*/
+void luaC_fullgc (lua_State *L, int isemergency) {
+  global_State *g = G(L);
+  lua_assert(!g->gcemergency);
+  g->gcemergency = isemergency;  /* set flag */
+  if (g->gckind == KGC_INC)
+    fullinc(L, g);
+  else
+    fullgen(L, g);
+  g->gcemergency = 0;
+}
+
+/* }====================================================== */
+
+
diff --git a/src/libs/3rdparty/lua/src/lgc.h b/src/libs/3rdparty/lua/src/lgc.h
new file mode 100644
index 0000000000..538f6edccc
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lgc.h
@@ -0,0 +1,202 @@
+/*
+** $Id: lgc.h $
+** Garbage Collector
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lgc_h
+#define lgc_h
+
+
+#include "lobject.h"
+#include "lstate.h"
+
+/*
+** Collectable objects may have one of three colors: white, which means
+** the object is not marked; gray, which means the object is marked, but
+** its references may be not marked; and black, which means that the
+** object and all its references are marked.  The main invariant of the
+** garbage collector, while marking objects, is that a black object can
+** never point to a white one. Moreover, any gray object must be in a
+** "gray list" (gray, grayagain, weak, allweak, ephemeron) so that it
+** can be visited again before finishing the collection cycle. (Open
+** upvalues are an exception to this rule.)  These lists have no meaning
+** when the invariant is not being enforced (e.g., sweep phase).
+*/
+
+
+/*
+** Possible states of the Garbage Collector
+*/
+#define GCSpropagate	0
+#define GCSenteratomic	1
+#define GCSatomic	2
+#define GCSswpallgc	3
+#define GCSswpfinobj	4
+#define GCSswptobefnz	5
+#define GCSswpend	6
+#define GCScallfin	7
+#define GCSpause	8
+
+
+#define issweepphase(g)  \
+	(GCSswpallgc <= (g)->gcstate && (g)->gcstate <= GCSswpend)
+
+
+/*
+** macro to tell when main invariant (white objects cannot point to black
+** ones) must be kept. During a collection, the sweep
+** phase may break the invariant, as objects turned white may point to
+** still-black objects. The invariant is restored when sweep ends and
+** all objects are white again.
+*/
+
+#define keepinvariant(g)	((g)->gcstate <= GCSatomic)
+
+
+/*
+** some useful bit tricks
+*/
+#define resetbits(x,m)		((x) &= cast_byte(~(m)))
+#define setbits(x,m)		((x) |= (m))
+#define testbits(x,m)		((x) & (m))
+#define bitmask(b)		(1<<(b))
+#define bit2mask(b1,b2)		(bitmask(b1) | bitmask(b2))
+#define l_setbit(x,b)		setbits(x, bitmask(b))
+#define resetbit(x,b)		resetbits(x, bitmask(b))
+#define testbit(x,b)		testbits(x, bitmask(b))
+
+
+/*
+** Layout for bit use in 'marked' field. First three bits are
+** used for object "age" in generational mode. Last bit is used
+** by tests.
+*/
+#define WHITE0BIT	3  /* object is white (type 0) */
+#define WHITE1BIT	4  /* object is white (type 1) */
+#define BLACKBIT	5  /* object is black */
+#define FINALIZEDBIT	6  /* object has been marked for finalization */
+
+#define TESTBIT		7
+
+
+
+#define WHITEBITS	bit2mask(WHITE0BIT, WHITE1BIT)
+
+
+#define iswhite(x)      testbits((x)->marked, WHITEBITS)
+#define isblack(x)      testbit((x)->marked, BLACKBIT)
+#define isgray(x)  /* neither white nor black */  \
+	(!testbits((x)->marked, WHITEBITS | bitmask(BLACKBIT)))
+
+#define tofinalize(x)	testbit((x)->marked, FINALIZEDBIT)
+
+#define otherwhite(g)	((g)->currentwhite ^ WHITEBITS)
+#define isdeadm(ow,m)	((m) & (ow))
+#define isdead(g,v)	isdeadm(otherwhite(g), (v)->marked)
+
+#define changewhite(x)	((x)->marked ^= WHITEBITS)
+#define nw2black(x)  \
+	check_exp(!iswhite(x), l_setbit((x)->marked, BLACKBIT))
+
+#define luaC_white(g)	cast_byte((g)->currentwhite & WHITEBITS)
+
+
+/* object age in generational mode */
+#define G_NEW		0	/* created in current cycle */
+#define G_SURVIVAL	1	/* created in previous cycle */
+#define G_OLD0		2	/* marked old by frw. barrier in this cycle */
+#define G_OLD1		3	/* first full cycle as old */
+#define G_OLD		4	/* really old object (not to be visited) */
+#define G_TOUCHED1	5	/* old object touched this cycle */
+#define G_TOUCHED2	6	/* old object touched in previous cycle */
+
+#define AGEBITS		7  /* all age bits (111) */
+
+#define getage(o)	((o)->marked & AGEBITS)
+#define setage(o,a)  ((o)->marked = cast_byte(((o)->marked & (~AGEBITS)) | a))
+#define isold(o)	(getage(o) > G_SURVIVAL)
+
+#define changeage(o,f,t)  \
+	check_exp(getage(o) == (f), (o)->marked ^= ((f)^(t)))
+
+
+/* Default Values for GC parameters */
+#define LUAI_GENMAJORMUL         100
+#define LUAI_GENMINORMUL         20
+
+/* wait memory to double before starting new cycle */
+#define LUAI_GCPAUSE    200
+
+/*
+** some gc parameters are stored divided by 4 to allow a maximum value
+** up to 1023 in a 'lu_byte'.
+*/
+#define getgcparam(p)	((p) * 4)
+#define setgcparam(p,v)	((p) = (v) / 4)
+
+#define LUAI_GCMUL      100
+
+/* how much to allocate before next GC step (log2) */
+#define LUAI_GCSTEPSIZE 13      /* 8 KB */
+
+
+/*
+** Check whether the declared GC mode is generational. While in
+** generational mode, the collector can go temporarily to incremental
+** mode to improve performance. This is signaled by 'g->lastatomic != 0'.
+*/
+#define isdecGCmodegen(g)	(g->gckind == KGC_GEN || g->lastatomic != 0)
+
+
+/*
+** Control when GC is running:
+*/
+#define GCSTPUSR	1  /* bit true when GC stopped by user */
+#define GCSTPGC		2  /* bit true when GC stopped by itself */
+#define GCSTPCLS	4  /* bit true when closing Lua state */
+#define gcrunning(g)	((g)->gcstp == 0)
+
+
+/*
+** Does one step of collection when debt becomes positive. 'pre'/'pos'
+** allows some adjustments to be done only when needed. macro
+** 'condchangemem' is used only for heavy tests (forcing a full
+** GC cycle on every opportunity)
+*/
+#define luaC_condGC(L,pre,pos) \
+	{ if (G(L)->GCdebt > 0) { pre; luaC_step(L); pos;}; \
+	  condchangemem(L,pre,pos); }
+
+/* more often than not, 'pre'/'pos' are empty */
+#define luaC_checkGC(L)		luaC_condGC(L,(void)0,(void)0)
+
+
+#define luaC_objbarrier(L,p,o) (  \
+	(isblack(p) && iswhite(o)) ? \
+	luaC_barrier_(L,obj2gco(p),obj2gco(o)) : cast_void(0))
+
+#define luaC_barrier(L,p,v) (  \
+	iscollectable(v) ? luaC_objbarrier(L,p,gcvalue(v)) : cast_void(0))
+
+#define luaC_objbarrierback(L,p,o) (  \
+	(isblack(p) && iswhite(o)) ? luaC_barrierback_(L,p) : cast_void(0))
+
+#define luaC_barrierback(L,p,v) (  \
+	iscollectable(v) ? luaC_objbarrierback(L, p, gcvalue(v)) : cast_void(0))
+
+LUAI_FUNC void luaC_fix (lua_State *L, GCObject *o);
+LUAI_FUNC void luaC_freeallobjects (lua_State *L);
+LUAI_FUNC void luaC_step (lua_State *L);
+LUAI_FUNC void luaC_runtilstate (lua_State *L, int statesmask);
+LUAI_FUNC void luaC_fullgc (lua_State *L, int isemergency);
+LUAI_FUNC GCObject *luaC_newobj (lua_State *L, int tt, size_t sz);
+LUAI_FUNC GCObject *luaC_newobjdt (lua_State *L, int tt, size_t sz,
+                                                 size_t offset);
+LUAI_FUNC void luaC_barrier_ (lua_State *L, GCObject *o, GCObject *v);
+LUAI_FUNC void luaC_barrierback_ (lua_State *L, GCObject *o);
+LUAI_FUNC void luaC_checkfinalizer (lua_State *L, GCObject *o, Table *mt);
+LUAI_FUNC void luaC_changemode (lua_State *L, int newmode);
+
+
+#endif
diff --git a/src/libs/3rdparty/lua/src/linit.c b/src/libs/3rdparty/lua/src/linit.c
new file mode 100644
index 0000000000..69808f84f4
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/linit.c
@@ -0,0 +1,65 @@
+/*
+** $Id: linit.c $
+** Initialization of libraries for lua.c and other clients
+** See Copyright Notice in lua.h
+*/
+
+
+#define linit_c
+#define LUA_LIB
+
+/*
+** If you embed Lua in your program and need to open the standard
+** libraries, call luaL_openlibs in your program. If you need a
+** different set of libraries, copy this file to your project and edit
+** it to suit your needs.
+**
+** You can also *preload* libraries, so that a later 'require' can
+** open the library, which is already linked to the application.
+** For that, do the following code:
+**
+**  luaL_getsubtable(L, LUA_REGISTRYINDEX, LUA_PRELOAD_TABLE);
+**  lua_pushcfunction(L, luaopen_modname);
+**  lua_setfield(L, -2, modname);
+**  lua_pop(L, 1);  // remove PRELOAD table
+*/
+
+#include "lprefix.h"
+
+
+#include <stddef.h>
+
+#include "lua.h"
+
+#include "lualib.h"
+#include "lauxlib.h"
+
+
+/*
+** these libs are loaded by lua.c and are readily available to any Lua
+** program
+*/
+static const luaL_Reg loadedlibs[] = {
+  {LUA_GNAME, luaopen_base},
+  {LUA_LOADLIBNAME, luaopen_package},
+  {LUA_COLIBNAME, luaopen_coroutine},
+  {LUA_TABLIBNAME, luaopen_table},
+  {LUA_IOLIBNAME, luaopen_io},
+  {LUA_OSLIBNAME, luaopen_os},
+  {LUA_STRLIBNAME, luaopen_string},
+  {LUA_MATHLIBNAME, luaopen_math},
+  {LUA_UTF8LIBNAME, luaopen_utf8},
+  {LUA_DBLIBNAME, luaopen_debug},
+  {NULL, NULL}
+};
+
+
+LUALIB_API void luaL_openlibs (lua_State *L) {
+  const luaL_Reg *lib;
+  /* "require" functions from 'loadedlibs' and set results to global table */
+  for (lib = loadedlibs; lib->func; lib++) {
+    luaL_requiref(L, lib->name, lib->func, 1);
+    lua_pop(L, 1);  /* remove lib */
+  }
+}
+
diff --git a/src/libs/3rdparty/lua/src/liolib.c b/src/libs/3rdparty/lua/src/liolib.c
new file mode 100644
index 0000000000..b08397da45
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/liolib.c
@@ -0,0 +1,828 @@
+/*
+** $Id: liolib.c $
+** Standard I/O (and system) library
+** See Copyright Notice in lua.h
+*/
+
+#define liolib_c
+#define LUA_LIB
+
+#include "lprefix.h"
+
+
+#include <ctype.h>
+#include <errno.h>
+#include <locale.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "lua.h"
+
+#include "lauxlib.h"
+#include "lualib.h"
+
+
+
+
+/*
+** Change this macro to accept other modes for 'fopen' besides
+** the standard ones.
+*/
+#if !defined(l_checkmode)
+
+/* accepted extensions to 'mode' in 'fopen' */
+#if !defined(L_MODEEXT)
+#define L_MODEEXT	"b"
+#endif
+
+/* Check whether 'mode' matches '[rwa]%+?[L_MODEEXT]*' */
+static int l_checkmode (const char *mode) {
+  return (*mode != '\0' && strchr("rwa", *(mode++)) != NULL &&
+         (*mode != '+' || ((void)(++mode), 1)) &&  /* skip if char is '+' */
+         (strspn(mode, L_MODEEXT) == strlen(mode)));  /* check extensions */
+}
+
+#endif
+
+/*
+** {======================================================
+** l_popen spawns a new process connected to the current
+** one through the file streams.
+** =======================================================
+*/
+
+#if !defined(l_popen)		/* { */
+
+#if defined(LUA_USE_POSIX)	/* { */
+
+#define l_popen(L,c,m)		(fflush(NULL), popen(c,m))
+#define l_pclose(L,file)	(pclose(file))
+
+#elif defined(LUA_USE_WINDOWS)	/* }{ */
+
+#define l_popen(L,c,m)		(_popen(c,m))
+#define l_pclose(L,file)	(_pclose(file))
+
+#if !defined(l_checkmodep)
+/* Windows accepts "[rw][bt]?" as valid modes */
+#define l_checkmodep(m)	((m[0] == 'r' || m[0] == 'w') && \
+  (m[1] == '\0' || ((m[1] == 'b' || m[1] == 't') && m[2] == '\0')))
+#endif
+
+#else				/* }{ */
+
+/* ISO C definitions */
+#define l_popen(L,c,m)  \
+	  ((void)c, (void)m, \
+	  luaL_error(L, "'popen' not supported"), \
+	  (FILE*)0)
+#define l_pclose(L,file)		((void)L, (void)file, -1)
+
+#endif				/* } */
+
+#endif				/* } */
+
+
+#if !defined(l_checkmodep)
+/* By default, Lua accepts only "r" or "w" as valid modes */
+#define l_checkmodep(m)        ((m[0] == 'r' || m[0] == 'w') && m[1] == '\0')
+#endif
+
+/* }====================================================== */
+
+
+#if !defined(l_getc)		/* { */
+
+#if defined(LUA_USE_POSIX)
+#define l_getc(f)		getc_unlocked(f)
+#define l_lockfile(f)		flockfile(f)
+#define l_unlockfile(f)		funlockfile(f)
+#else
+#define l_getc(f)		getc(f)
+#define l_lockfile(f)		((void)0)
+#define l_unlockfile(f)		((void)0)
+#endif
+
+#endif				/* } */
+
+
+/*
+** {======================================================
+** l_fseek: configuration for longer offsets
+** =======================================================
+*/
+
+#if !defined(l_fseek)		/* { */
+
+#if defined(LUA_USE_POSIX)	/* { */
+
+#include <sys/types.h>
+
+#define l_fseek(f,o,w)		fseeko(f,o,w)
+#define l_ftell(f)		ftello(f)
+#define l_seeknum		off_t
+
+#elif defined(LUA_USE_WINDOWS) && !defined(_CRTIMP_TYPEINFO) \
+   && defined(_MSC_VER) && (_MSC_VER >= 1400)	/* }{ */
+
+/* Windows (but not DDK) and Visual C++ 2005 or higher */
+#define l_fseek(f,o,w)		_fseeki64(f,o,w)
+#define l_ftell(f)		_ftelli64(f)
+#define l_seeknum		__int64
+
+#else				/* }{ */
+
+/* ISO C definitions */
+#define l_fseek(f,o,w)		fseek(f,o,w)
+#define l_ftell(f)		ftell(f)
+#define l_seeknum		long
+
+#endif				/* } */
+
+#endif				/* } */
+
+/* }====================================================== */
+
+
+
+#define IO_PREFIX	"_IO_"
+#define IOPREF_LEN	(sizeof(IO_PREFIX)/sizeof(char) - 1)
+#define IO_INPUT	(IO_PREFIX "input")
+#define IO_OUTPUT	(IO_PREFIX "output")
+
+
+typedef luaL_Stream LStream;
+
+
+#define tolstream(L)	((LStream *)luaL_checkudata(L, 1, LUA_FILEHANDLE))
+
+#define isclosed(p)	((p)->closef == NULL)
+
+
+static int io_type (lua_State *L) {
+  LStream *p;
+  luaL_checkany(L, 1);
+  p = (LStream *)luaL_testudata(L, 1, LUA_FILEHANDLE);
+  if (p == NULL)
+    luaL_pushfail(L);  /* not a file */
+  else if (isclosed(p))
+    lua_pushliteral(L, "closed file");
+  else
+    lua_pushliteral(L, "file");
+  return 1;
+}
+
+
+static int f_tostring (lua_State *L) {
+  LStream *p = tolstream(L);
+  if (isclosed(p))
+    lua_pushliteral(L, "file (closed)");
+  else
+    lua_pushfstring(L, "file (%p)", p->f);
+  return 1;
+}
+
+
+static FILE *tofile (lua_State *L) {
+  LStream *p = tolstream(L);
+  if (l_unlikely(isclosed(p)))
+    luaL_error(L, "attempt to use a closed file");
+  lua_assert(p->f);
+  return p->f;
+}
+
+
+/*
+** When creating file handles, always creates a 'closed' file handle
+** before opening the actual file; so, if there is a memory error, the
+** handle is in a consistent state.
+*/
+static LStream *newprefile (lua_State *L) {
+  LStream *p = (LStream *)lua_newuserdatauv(L, sizeof(LStream), 0);
+  p->closef = NULL;  /* mark file handle as 'closed' */
+  luaL_setmetatable(L, LUA_FILEHANDLE);
+  return p;
+}
+
+
+/*
+** Calls the 'close' function from a file handle. The 'volatile' avoids
+** a bug in some versions of the Clang compiler (e.g., clang 3.0 for
+** 32 bits).
+*/
+static int aux_close (lua_State *L) {
+  LStream *p = tolstream(L);
+  volatile lua_CFunction cf = p->closef;
+  p->closef = NULL;  /* mark stream as closed */
+  return (*cf)(L);  /* close it */
+}
+
+
+static int f_close (lua_State *L) {
+  tofile(L);  /* make sure argument is an open stream */
+  return aux_close(L);
+}
+
+
+static int io_close (lua_State *L) {
+  if (lua_isnone(L, 1))  /* no argument? */
+    lua_getfield(L, LUA_REGISTRYINDEX, IO_OUTPUT);  /* use default output */
+  return f_close(L);
+}
+
+
+static int f_gc (lua_State *L) {
+  LStream *p = tolstream(L);
+  if (!isclosed(p) && p->f != NULL)
+    aux_close(L);  /* ignore closed and incompletely open files */
+  return 0;
+}
+
+
+/*
+** function to close regular files
+*/
+static int io_fclose (lua_State *L) {
+  LStream *p = tolstream(L);
+  int res = fclose(p->f);
+  return luaL_fileresult(L, (res == 0), NULL);
+}
+
+
+static LStream *newfile (lua_State *L) {
+  LStream *p = newprefile(L);
+  p->f = NULL;
+  p->closef = &io_fclose;
+  return p;
+}
+
+
+static void opencheck (lua_State *L, const char *fname, const char *mode) {
+  LStream *p = newfile(L);
+  p->f = fopen(fname, mode);
+  if (l_unlikely(p->f == NULL))
+    luaL_error(L, "cannot open file '%s' (%s)", fname, strerror(errno));
+}
+
+
+static int io_open (lua_State *L) {
+  const char *filename = luaL_checkstring(L, 1);
+  const char *mode = luaL_optstring(L, 2, "r");
+  LStream *p = newfile(L);
+  const char *md = mode;  /* to traverse/check mode */
+  luaL_argcheck(L, l_checkmode(md), 2, "invalid mode");
+  p->f = fopen(filename, mode);
+  return (p->f == NULL) ? luaL_fileresult(L, 0, filename) : 1;
+}
+
+
+/*
+** function to close 'popen' files
+*/
+static int io_pclose (lua_State *L) {
+  LStream *p = tolstream(L);
+  errno = 0;
+  return luaL_execresult(L, l_pclose(L, p->f));
+}
+
+
+static int io_popen (lua_State *L) {
+  const char *filename = luaL_checkstring(L, 1);
+  const char *mode = luaL_optstring(L, 2, "r");
+  LStream *p = newprefile(L);
+  luaL_argcheck(L, l_checkmodep(mode), 2, "invalid mode");
+  p->f = l_popen(L, filename, mode);
+  p->closef = &io_pclose;
+  return (p->f == NULL) ? luaL_fileresult(L, 0, filename) : 1;
+}
+
+
+static int io_tmpfile (lua_State *L) {
+  LStream *p = newfile(L);
+  p->f = tmpfile();
+  return (p->f == NULL) ? luaL_fileresult(L, 0, NULL) : 1;
+}
+
+
+static FILE *getiofile (lua_State *L, const char *findex) {
+  LStream *p;
+  lua_getfield(L, LUA_REGISTRYINDEX, findex);
+  p = (LStream *)lua_touserdata(L, -1);
+  if (l_unlikely(isclosed(p)))
+    luaL_error(L, "default %s file is closed", findex + IOPREF_LEN);
+  return p->f;
+}
+
+
+static int g_iofile (lua_State *L, const char *f, const char *mode) {
+  if (!lua_isnoneornil(L, 1)) {
+    const char *filename = lua_tostring(L, 1);
+    if (filename)
+      opencheck(L, filename, mode);
+    else {
+      tofile(L);  /* check that it's a valid file handle */
+      lua_pushvalue(L, 1);
+    }
+    lua_setfield(L, LUA_REGISTRYINDEX, f);
+  }
+  /* return current value */
+  lua_getfield(L, LUA_REGISTRYINDEX, f);
+  return 1;
+}
+
+
+static int io_input (lua_State *L) {
+  return g_iofile(L, IO_INPUT, "r");
+}
+
+
+static int io_output (lua_State *L) {
+  return g_iofile(L, IO_OUTPUT, "w");
+}
+
+
+static int io_readline (lua_State *L);
+
+
+/*
+** maximum number of arguments to 'f:lines'/'io.lines' (it + 3 must fit
+** in the limit for upvalues of a closure)
+*/
+#define MAXARGLINE	250
+
+/*
+** Auxiliary function to create the iteration function for 'lines'.
+** The iteration function is a closure over 'io_readline', with
+** the following upvalues:
+** 1) The file being read (first value in the stack)
+** 2) the number of arguments to read
+** 3) a boolean, true iff file has to be closed when finished ('toclose')
+** *) a variable number of format arguments (rest of the stack)
+*/
+static void aux_lines (lua_State *L, int toclose) {
+  int n = lua_gettop(L) - 1;  /* number of arguments to read */
+  luaL_argcheck(L, n <= MAXARGLINE, MAXARGLINE + 2, "too many arguments");
+  lua_pushvalue(L, 1);  /* file */
+  lua_pushinteger(L, n);  /* number of arguments to read */
+  lua_pushboolean(L, toclose);  /* close/not close file when finished */
+  lua_rotate(L, 2, 3);  /* move the three values to their positions */
+  lua_pushcclosure(L, io_readline, 3 + n);
+}
+
+
+static int f_lines (lua_State *L) {
+  tofile(L);  /* check that it's a valid file handle */
+  aux_lines(L, 0);
+  return 1;
+}
+
+
+/*
+** Return an iteration function for 'io.lines'. If file has to be
+** closed, also returns the file itself as a second result (to be
+** closed as the state at the exit of a generic for).
+*/
+static int io_lines (lua_State *L) {
+  int toclose;
+  if (lua_isnone(L, 1)) lua_pushnil(L);  /* at least one argument */
+  if (lua_isnil(L, 1)) {  /* no file name? */
+    lua_getfield(L, LUA_REGISTRYINDEX, IO_INPUT);  /* get default input */
+    lua_replace(L, 1);  /* put it at index 1 */
+    tofile(L);  /* check that it's a valid file handle */
+    toclose = 0;  /* do not close it after iteration */
+  }
+  else {  /* open a new file */
+    const char *filename = luaL_checkstring(L, 1);
+    opencheck(L, filename, "r");
+    lua_replace(L, 1);  /* put file at index 1 */
+    toclose = 1;  /* close it after iteration */
+  }
+  aux_lines(L, toclose);  /* push iteration function */
+  if (toclose) {
+    lua_pushnil(L);  /* state */
+    lua_pushnil(L);  /* control */
+    lua_pushvalue(L, 1);  /* file is the to-be-closed variable (4th result) */
+    return 4;
+  }
+  else
+    return 1;
+}
+
+
+/*
+** {======================================================
+** READ
+** =======================================================
+*/
+
+
+/* maximum length of a numeral */
+#if !defined (L_MAXLENNUM)
+#define L_MAXLENNUM     200
+#endif
+
+
+/* auxiliary structure used by 'read_number' */
+typedef struct {
+  FILE *f;  /* file being read */
+  int c;  /* current character (look ahead) */
+  int n;  /* number of elements in buffer 'buff' */
+  char buff[L_MAXLENNUM + 1];  /* +1 for ending '\0' */
+} RN;
+
+
+/*
+** Add current char to buffer (if not out of space) and read next one
+*/
+static int nextc (RN *rn) {
+  if (l_unlikely(rn->n >= L_MAXLENNUM)) {  /* buffer overflow? */
+    rn->buff[0] = '\0';  /* invalidate result */
+    return 0;  /* fail */
+  }
+  else {
+    rn->buff[rn->n++] = rn->c;  /* save current char */
+    rn->c = l_getc(rn->f);  /* read next one */
+    return 1;
+  }
+}
+
+
+/*
+** Accept current char if it is in 'set' (of size 2)
+*/
+static int test2 (RN *rn, const char *set) {
+  if (rn->c == set[0] || rn->c == set[1])
+    return nextc(rn);
+  else return 0;
+}
+
+
+/*
+** Read a sequence of (hex)digits
+*/
+static int readdigits (RN *rn, int hex) {
+  int count = 0;
+  while ((hex ? isxdigit(rn->c) : isdigit(rn->c)) && nextc(rn))
+    count++;
+  return count;
+}
+
+
+/*
+** Read a number: first reads a valid prefix of a numeral into a buffer.
+** Then it calls 'lua_stringtonumber' to check whether the format is
+** correct and to convert it to a Lua number.
+*/
+static int read_number (lua_State *L, FILE *f) {
+  RN rn;
+  int count = 0;
+  int hex = 0;
+  char decp[2];
+  rn.f = f; rn.n = 0;
+  decp[0] = lua_getlocaledecpoint();  /* get decimal point from locale */
+  decp[1] = '.';  /* always accept a dot */
+  l_lockfile(rn.f);
+  do { rn.c = l_getc(rn.f); } while (isspace(rn.c));  /* skip spaces */
+  test2(&rn, "-+");  /* optional sign */
+  if (test2(&rn, "00")) {
+    if (test2(&rn, "xX")) hex = 1;  /* numeral is hexadecimal */
+    else count = 1;  /* count initial '0' as a valid digit */
+  }
+  count += readdigits(&rn, hex);  /* integral part */
+  if (test2(&rn, decp))  /* decimal point? */
+    count += readdigits(&rn, hex);  /* fractional part */
+  if (count > 0 && test2(&rn, (hex ? "pP" : "eE"))) {  /* exponent mark? */
+    test2(&rn, "-+");  /* exponent sign */
+    readdigits(&rn, 0);  /* exponent digits */
+  }
+  ungetc(rn.c, rn.f);  /* unread look-ahead char */
+  l_unlockfile(rn.f);
+  rn.buff[rn.n] = '\0';  /* finish string */
+  if (l_likely(lua_stringtonumber(L, rn.buff)))
+    return 1;  /* ok, it is a valid number */
+  else {  /* invalid format */
+   lua_pushnil(L);  /* "result" to be removed */
+   return 0;  /* read fails */
+  }
+}
+
+
+static int test_eof (lua_State *L, FILE *f) {
+  int c = getc(f);
+  ungetc(c, f);  /* no-op when c == EOF */
+  lua_pushliteral(L, "");
+  return (c != EOF);
+}
+
+
+static int read_line (lua_State *L, FILE *f, int chop) {
+  luaL_Buffer b;
+  int c;
+  luaL_buffinit(L, &b);
+  do {  /* may need to read several chunks to get whole line */
+    char *buff = luaL_prepbuffer(&b);  /* preallocate buffer space */
+    int i = 0;
+    l_lockfile(f);  /* no memory errors can happen inside the lock */
+    while (i < LUAL_BUFFERSIZE && (c = l_getc(f)) != EOF && c != '\n')
+      buff[i++] = c;  /* read up to end of line or buffer limit */
+    l_unlockfile(f);
+    luaL_addsize(&b, i);
+  } while (c != EOF && c != '\n');  /* repeat until end of line */
+  if (!chop && c == '\n')  /* want a newline and have one? */
+    luaL_addchar(&b, c);  /* add ending newline to result */
+  luaL_pushresult(&b);  /* close buffer */
+  /* return ok if read something (either a newline or something else) */
+  return (c == '\n' || lua_rawlen(L, -1) > 0);
+}
+
+
+static void read_all (lua_State *L, FILE *f) {
+  size_t nr;
+  luaL_Buffer b;
+  luaL_buffinit(L, &b);
+  do {  /* read file in chunks of LUAL_BUFFERSIZE bytes */
+    char *p = luaL_prepbuffer(&b);
+    nr = fread(p, sizeof(char), LUAL_BUFFERSIZE, f);
+    luaL_addsize(&b, nr);
+  } while (nr == LUAL_BUFFERSIZE);
+  luaL_pushresult(&b);  /* close buffer */
+}
+
+
+static int read_chars (lua_State *L, FILE *f, size_t n) {
+  size_t nr;  /* number of chars actually read */
+  char *p;
+  luaL_Buffer b;
+  luaL_buffinit(L, &b);
+  p = luaL_prepbuffsize(&b, n);  /* prepare buffer to read whole block */
+  nr = fread(p, sizeof(char), n, f);  /* try to read 'n' chars */
+  luaL_addsize(&b, nr);
+  luaL_pushresult(&b);  /* close buffer */
+  return (nr > 0);  /* true iff read something */
+}
+
+
+static int g_read (lua_State *L, FILE *f, int first) {
+  int nargs = lua_gettop(L) - 1;
+  int n, success;
+  clearerr(f);
+  if (nargs == 0) {  /* no arguments? */
+    success = read_line(L, f, 1);
+    n = first + 1;  /* to return 1 result */
+  }
+  else {
+    /* ensure stack space for all results and for auxlib's buffer */
+    luaL_checkstack(L, nargs+LUA_MINSTACK, "too many arguments");
+    success = 1;
+    for (n = first; nargs-- && success; n++) {
+      if (lua_type(L, n) == LUA_TNUMBER) {
+        size_t l = (size_t)luaL_checkinteger(L, n);
+        success = (l == 0) ? test_eof(L, f) : read_chars(L, f, l);
+      }
+      else {
+        const char *p = luaL_checkstring(L, n);
+        if (*p == '*') p++;  /* skip optional '*' (for compatibility) */
+        switch (*p) {
+          case 'n':  /* number */
+            success = read_number(L, f);
+            break;
+          case 'l':  /* line */
+            success = read_line(L, f, 1);
+            break;
+          case 'L':  /* line with end-of-line */
+            success = read_line(L, f, 0);
+            break;
+          case 'a':  /* file */
+            read_all(L, f);  /* read entire file */
+            success = 1; /* always success */
+            break;
+          default:
+            return luaL_argerror(L, n, "invalid format");
+        }
+      }
+    }
+  }
+  if (ferror(f))
+    return luaL_fileresult(L, 0, NULL);
+  if (!success) {
+    lua_pop(L, 1);  /* remove last result */
+    luaL_pushfail(L);  /* push nil instead */
+  }
+  return n - first;
+}
+
+
+static int io_read (lua_State *L) {
+  return g_read(L, getiofile(L, IO_INPUT), 1);
+}
+
+
+static int f_read (lua_State *L) {
+  return g_read(L, tofile(L), 2);
+}
+
+
+/*
+** Iteration function for 'lines'.
+*/
+static int io_readline (lua_State *L) {
+  LStream *p = (LStream *)lua_touserdata(L, lua_upvalueindex(1));
+  int i;
+  int n = (int)lua_tointeger(L, lua_upvalueindex(2));
+  if (isclosed(p))  /* file is already closed? */
+    return luaL_error(L, "file is already closed");
+  lua_settop(L , 1);
+  luaL_checkstack(L, n, "too many arguments");
+  for (i = 1; i <= n; i++)  /* push arguments to 'g_read' */
+    lua_pushvalue(L, lua_upvalueindex(3 + i));
+  n = g_read(L, p->f, 2);  /* 'n' is number of results */
+  lua_assert(n > 0);  /* should return at least a nil */
+  if (lua_toboolean(L, -n))  /* read at least one value? */
+    return n;  /* return them */
+  else {  /* first result is false: EOF or error */
+    if (n > 1) {  /* is there error information? */
+      /* 2nd result is error message */
+      return luaL_error(L, "%s", lua_tostring(L, -n + 1));
+    }
+    if (lua_toboolean(L, lua_upvalueindex(3))) {  /* generator created file? */
+      lua_settop(L, 0);  /* clear stack */
+      lua_pushvalue(L, lua_upvalueindex(1));  /* push file at index 1 */
+      aux_close(L);  /* close it */
+    }
+    return 0;
+  }
+}
+
+/* }====================================================== */
+
+
+static int g_write (lua_State *L, FILE *f, int arg) {
+  int nargs = lua_gettop(L) - arg;
+  int status = 1;
+  for (; nargs--; arg++) {
+    if (lua_type(L, arg) == LUA_TNUMBER) {
+      /* optimization: could be done exactly as for strings */
+      int len = lua_isinteger(L, arg)
+                ? fprintf(f, LUA_INTEGER_FMT,
+                             (LUAI_UACINT)lua_tointeger(L, arg))
+                : fprintf(f, LUA_NUMBER_FMT,
+                             (LUAI_UACNUMBER)lua_tonumber(L, arg));
+      status = status && (len > 0);
+    }
+    else {
+      size_t l;
+      const char *s = luaL_checklstring(L, arg, &l);
+      status = status && (fwrite(s, sizeof(char), l, f) == l);
+    }
+  }
+  if (l_likely(status))
+    return 1;  /* file handle already on stack top */
+  else return luaL_fileresult(L, status, NULL);
+}
+
+
+static int io_write (lua_State *L) {
+  return g_write(L, getiofile(L, IO_OUTPUT), 1);
+}
+
+
+static int f_write (lua_State *L) {
+  FILE *f = tofile(L);
+  lua_pushvalue(L, 1);  /* push file at the stack top (to be returned) */
+  return g_write(L, f, 2);
+}
+
+
+static int f_seek (lua_State *L) {
+  static const int mode[] = {SEEK_SET, SEEK_CUR, SEEK_END};
+  static const char *const modenames[] = {"set", "cur", "end", NULL};
+  FILE *f = tofile(L);
+  int op = luaL_checkoption(L, 2, "cur", modenames);
+  lua_Integer p3 = luaL_optinteger(L, 3, 0);
+  l_seeknum offset = (l_seeknum)p3;
+  luaL_argcheck(L, (lua_Integer)offset == p3, 3,
+                  "not an integer in proper range");
+  op = l_fseek(f, offset, mode[op]);
+  if (l_unlikely(op))
+    return luaL_fileresult(L, 0, NULL);  /* error */
+  else {
+    lua_pushinteger(L, (lua_Integer)l_ftell(f));
+    return 1;
+  }
+}
+
+
+static int f_setvbuf (lua_State *L) {
+  static const int mode[] = {_IONBF, _IOFBF, _IOLBF};
+  static const char *const modenames[] = {"no", "full", "line", NULL};
+  FILE *f = tofile(L);
+  int op = luaL_checkoption(L, 2, NULL, modenames);
+  lua_Integer sz = luaL_optinteger(L, 3, LUAL_BUFFERSIZE);
+  int res = setvbuf(f, NULL, mode[op], (size_t)sz);
+  return luaL_fileresult(L, res == 0, NULL);
+}
+
+
+
+static int io_flush (lua_State *L) {
+  return luaL_fileresult(L, fflush(getiofile(L, IO_OUTPUT)) == 0, NULL);
+}
+
+
+static int f_flush (lua_State *L) {
+  return luaL_fileresult(L, fflush(tofile(L)) == 0, NULL);
+}
+
+
+/*
+** functions for 'io' library
+*/
+static const luaL_Reg iolib[] = {
+  {"close", io_close},
+  {"flush", io_flush},
+  {"input", io_input},
+  {"lines", io_lines},
+  {"open", io_open},
+  {"output", io_output},
+  {"popen", io_popen},
+  {"read", io_read},
+  {"tmpfile", io_tmpfile},
+  {"type", io_type},
+  {"write", io_write},
+  {NULL, NULL}
+};
+
+
+/*
+** methods for file handles
+*/
+static const luaL_Reg meth[] = {
+  {"read", f_read},
+  {"write", f_write},
+  {"lines", f_lines},
+  {"flush", f_flush},
+  {"seek", f_seek},
+  {"close", f_close},
+  {"setvbuf", f_setvbuf},
+  {NULL, NULL}
+};
+
+
+/*
+** metamethods for file handles
+*/
+static const luaL_Reg metameth[] = {
+  {"__index", NULL},  /* place holder */
+  {"__gc", f_gc},
+  {"__close", f_gc},
+  {"__tostring", f_tostring},
+  {NULL, NULL}
+};
+
+
+static void createmeta (lua_State *L) {
+  luaL_newmetatable(L, LUA_FILEHANDLE);  /* metatable for file handles */
+  luaL_setfuncs(L, metameth, 0);  /* add metamethods to new metatable */
+  luaL_newlibtable(L, meth);  /* create method table */
+  luaL_setfuncs(L, meth, 0);  /* add file methods to method table */
+  lua_setfield(L, -2, "__index");  /* metatable.__index = method table */
+  lua_pop(L, 1);  /* pop metatable */
+}
+
+
+/*
+** function to (not) close the standard files stdin, stdout, and stderr
+*/
+static int io_noclose (lua_State *L) {
+  LStream *p = tolstream(L);
+  p->closef = &io_noclose;  /* keep file opened */
+  luaL_pushfail(L);
+  lua_pushliteral(L, "cannot close standard file");
+  return 2;
+}
+
+
+static void createstdfile (lua_State *L, FILE *f, const char *k,
+                           const char *fname) {
+  LStream *p = newprefile(L);
+  p->f = f;
+  p->closef = &io_noclose;
+  if (k != NULL) {
+    lua_pushvalue(L, -1);
+    lua_setfield(L, LUA_REGISTRYINDEX, k);  /* add file to registry */
+  }
+  lua_setfield(L, -2, fname);  /* add file to module */
+}
+
+
+LUAMOD_API int luaopen_io (lua_State *L) {
+  luaL_newlib(L, iolib);  /* new module */
+  createmeta(L);
+  /* create (and set) default files */
+  createstdfile(L, stdin, IO_INPUT, "stdin");
+  createstdfile(L, stdout, IO_OUTPUT, "stdout");
+  createstdfile(L, stderr, NULL, "stderr");
+  return 1;
+}
+
diff --git a/src/libs/3rdparty/lua/src/ljumptab.h b/src/libs/3rdparty/lua/src/ljumptab.h
new file mode 100644
index 0000000000..8306f250cc
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/ljumptab.h
@@ -0,0 +1,112 @@
+/*
+** $Id: ljumptab.h $
+** Jump Table for the Lua interpreter
+** See Copyright Notice in lua.h
+*/
+
+
+#undef vmdispatch
+#undef vmcase
+#undef vmbreak
+
+#define vmdispatch(x)     goto *disptab[x];
+
+#define vmcase(l)     L_##l:
+
+#define vmbreak		vmfetch(); vmdispatch(GET_OPCODE(i));
+
+
+static const void *const disptab[NUM_OPCODES] = {
+
+#if 0
+** you can update the following list with this command:
+**
+**  sed -n '/^OP_/\!d; s/OP_/\&\&L_OP_/ ; s/,.*/,/ ; s/\/.*// ; p'  lopcodes.h
+**
+#endif
+
+&&L_OP_MOVE,
+&&L_OP_LOADI,
+&&L_OP_LOADF,
+&&L_OP_LOADK,
+&&L_OP_LOADKX,
+&&L_OP_LOADFALSE,
+&&L_OP_LFALSESKIP,
+&&L_OP_LOADTRUE,
+&&L_OP_LOADNIL,
+&&L_OP_GETUPVAL,
+&&L_OP_SETUPVAL,
+&&L_OP_GETTABUP,
+&&L_OP_GETTABLE,
+&&L_OP_GETI,
+&&L_OP_GETFIELD,
+&&L_OP_SETTABUP,
+&&L_OP_SETTABLE,
+&&L_OP_SETI,
+&&L_OP_SETFIELD,
+&&L_OP_NEWTABLE,
+&&L_OP_SELF,
+&&L_OP_ADDI,
+&&L_OP_ADDK,
+&&L_OP_SUBK,
+&&L_OP_MULK,
+&&L_OP_MODK,
+&&L_OP_POWK,
+&&L_OP_DIVK,
+&&L_OP_IDIVK,
+&&L_OP_BANDK,
+&&L_OP_BORK,
+&&L_OP_BXORK,
+&&L_OP_SHRI,
+&&L_OP_SHLI,
+&&L_OP_ADD,
+&&L_OP_SUB,
+&&L_OP_MUL,
+&&L_OP_MOD,
+&&L_OP_POW,
+&&L_OP_DIV,
+&&L_OP_IDIV,
+&&L_OP_BAND,
+&&L_OP_BOR,
+&&L_OP_BXOR,
+&&L_OP_SHL,
+&&L_OP_SHR,
+&&L_OP_MMBIN,
+&&L_OP_MMBINI,
+&&L_OP_MMBINK,
+&&L_OP_UNM,
+&&L_OP_BNOT,
+&&L_OP_NOT,
+&&L_OP_LEN,
+&&L_OP_CONCAT,
+&&L_OP_CLOSE,
+&&L_OP_TBC,
+&&L_OP_JMP,
+&&L_OP_EQ,
+&&L_OP_LT,
+&&L_OP_LE,
+&&L_OP_EQK,
+&&L_OP_EQI,
+&&L_OP_LTI,
+&&L_OP_LEI,
+&&L_OP_GTI,
+&&L_OP_GEI,
+&&L_OP_TEST,
+&&L_OP_TESTSET,
+&&L_OP_CALL,
+&&L_OP_TAILCALL,
+&&L_OP_RETURN,
+&&L_OP_RETURN0,
+&&L_OP_RETURN1,
+&&L_OP_FORLOOP,
+&&L_OP_FORPREP,
+&&L_OP_TFORPREP,
+&&L_OP_TFORCALL,
+&&L_OP_TFORLOOP,
+&&L_OP_SETLIST,
+&&L_OP_CLOSURE,
+&&L_OP_VARARG,
+&&L_OP_VARARGPREP,
+&&L_OP_EXTRAARG
+
+};
diff --git a/src/libs/3rdparty/lua/src/llex.c b/src/libs/3rdparty/lua/src/llex.c
new file mode 100644
index 0000000000..5fc39a5cde
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/llex.c
@@ -0,0 +1,581 @@
+/*
+** $Id: llex.c $
+** Lexical Analyzer
+** See Copyright Notice in lua.h
+*/
+
+#define llex_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include <locale.h>
+#include <string.h>
+
+#include "lua.h"
+
+#include "lctype.h"
+#include "ldebug.h"
+#include "ldo.h"
+#include "lgc.h"
+#include "llex.h"
+#include "lobject.h"
+#include "lparser.h"
+#include "lstate.h"
+#include "lstring.h"
+#include "ltable.h"
+#include "lzio.h"
+
+
+
+#define next(ls)	(ls->current = zgetc(ls->z))
+
+
+
+#define currIsNewline(ls)	(ls->current == '\n' || ls->current == '\r')
+
+
+/* ORDER RESERVED */
+static const char *const luaX_tokens [] = {
+    "and", "break", "do", "else", "elseif",
+    "end", "false", "for", "function", "goto", "if",
+    "in", "local", "nil", "not", "or", "repeat",
+    "return", "then", "true", "until", "while",
+    "//", "..", "...", "==", ">=", "<=", "~=",
+    "<<", ">>", "::", "<eof>",
+    "<number>", "<integer>", "<name>", "<string>"
+};
+
+
+#define save_and_next(ls) (save(ls, ls->current), next(ls))
+
+
+static l_noret lexerror (LexState *ls, const char *msg, int token);
+
+
+static void save (LexState *ls, int c) {
+  Mbuffer *b = ls->buff;
+  if (luaZ_bufflen(b) + 1 > luaZ_sizebuffer(b)) {
+    size_t newsize;
+    if (luaZ_sizebuffer(b) >= MAX_SIZE/2)
+      lexerror(ls, "lexical element too long", 0);
+    newsize = luaZ_sizebuffer(b) * 2;
+    luaZ_resizebuffer(ls->L, b, newsize);
+  }
+  b->buffer[luaZ_bufflen(b)++] = cast_char(c);
+}
+
+
+void luaX_init (lua_State *L) {
+  int i;
+  TString *e = luaS_newliteral(L, LUA_ENV);  /* create env name */
+  luaC_fix(L, obj2gco(e));  /* never collect this name */
+  for (i=0; i<NUM_RESERVED; i++) {
+    TString *ts = luaS_new(L, luaX_tokens[i]);
+    luaC_fix(L, obj2gco(ts));  /* reserved words are never collected */
+    ts->extra = cast_byte(i+1);  /* reserved word */
+  }
+}
+
+
+const char *luaX_token2str (LexState *ls, int token) {
+  if (token < FIRST_RESERVED) {  /* single-byte symbols? */
+    if (lisprint(token))
+      return luaO_pushfstring(ls->L, "'%c'", token);
+    else  /* control character */
+      return luaO_pushfstring(ls->L, "'<\\%d>'", token);
+  }
+  else {
+    const char *s = luaX_tokens[token - FIRST_RESERVED];
+    if (token < TK_EOS)  /* fixed format (symbols and reserved words)? */
+      return luaO_pushfstring(ls->L, "'%s'", s);
+    else  /* names, strings, and numerals */
+      return s;
+  }
+}
+
+
+static const char *txtToken (LexState *ls, int token) {
+  switch (token) {
+    case TK_NAME: case TK_STRING:
+    case TK_FLT: case TK_INT:
+      save(ls, '\0');
+      return luaO_pushfstring(ls->L, "'%s'", luaZ_buffer(ls->buff));
+    default:
+      return luaX_token2str(ls, token);
+  }
+}
+
+
+static l_noret lexerror (LexState *ls, const char *msg, int token) {
+  msg = luaG_addinfo(ls->L, msg, ls->source, ls->linenumber);
+  if (token)
+    luaO_pushfstring(ls->L, "%s near %s", msg, txtToken(ls, token));
+  luaD_throw(ls->L, LUA_ERRSYNTAX);
+}
+
+
+l_noret luaX_syntaxerror (LexState *ls, const char *msg) {
+  lexerror(ls, msg, ls->t.token);
+}
+
+
+/*
+** Creates a new string and anchors it in scanner's table so that it
+** will not be collected until the end of the compilation; by that time
+** it should be anchored somewhere. It also internalizes long strings,
+** ensuring there is only one copy of each unique string.  The table
+** here is used as a set: the string enters as the key, while its value
+** is irrelevant. We use the string itself as the value only because it
+** is a TValue readily available. Later, the code generation can change
+** this value.
+*/
+TString *luaX_newstring (LexState *ls, const char *str, size_t l) {
+  lua_State *L = ls->L;
+  TString *ts = luaS_newlstr(L, str, l);  /* create new string */
+  const TValue *o = luaH_getstr(ls->h, ts);
+  if (!ttisnil(o))  /* string already present? */
+    ts = keystrval(nodefromval(o));  /* get saved copy */
+  else {  /* not in use yet */
+    TValue *stv = s2v(L->top.p++);  /* reserve stack space for string */
+    setsvalue(L, stv, ts);  /* temporarily anchor the string */
+    luaH_finishset(L, ls->h, stv, o, stv);  /* t[string] = string */
+    /* table is not a metatable, so it does not need to invalidate cache */
+    luaC_checkGC(L);
+    L->top.p--;  /* remove string from stack */
+  }
+  return ts;
+}
+
+
+/*
+** increment line number and skips newline sequence (any of
+** \n, \r, \n\r, or \r\n)
+*/
+static void inclinenumber (LexState *ls) {
+  int old = ls->current;
+  lua_assert(currIsNewline(ls));
+  next(ls);  /* skip '\n' or '\r' */
+  if (currIsNewline(ls) && ls->current != old)
+    next(ls);  /* skip '\n\r' or '\r\n' */
+  if (++ls->linenumber >= MAX_INT)
+    lexerror(ls, "chunk has too many lines", 0);
+}
+
+
+void luaX_setinput (lua_State *L, LexState *ls, ZIO *z, TString *source,
+                    int firstchar) {
+  ls->t.token = 0;
+  ls->L = L;
+  ls->current = firstchar;
+  ls->lookahead.token = TK_EOS;  /* no look-ahead token */
+  ls->z = z;
+  ls->fs = NULL;
+  ls->linenumber = 1;
+  ls->lastline = 1;
+  ls->source = source;
+  ls->envn = luaS_newliteral(L, LUA_ENV);  /* get env name */
+  luaZ_resizebuffer(ls->L, ls->buff, LUA_MINBUFFER);  /* initialize buffer */
+}
+
+
+
+/*
+** =======================================================
+** LEXICAL ANALYZER
+** =======================================================
+*/
+
+
+static int check_next1 (LexState *ls, int c) {
+  if (ls->current == c) {
+    next(ls);
+    return 1;
+  }
+  else return 0;
+}
+
+
+/*
+** Check whether current char is in set 'set' (with two chars) and
+** saves it
+*/
+static int check_next2 (LexState *ls, const char *set) {
+  lua_assert(set[2] == '\0');
+  if (ls->current == set[0] || ls->current == set[1]) {
+    save_and_next(ls);
+    return 1;
+  }
+  else return 0;
+}
+
+
+/* LUA_NUMBER */
+/*
+** This function is quite liberal in what it accepts, as 'luaO_str2num'
+** will reject ill-formed numerals. Roughly, it accepts the following
+** pattern:
+**
+**   %d(%x|%.|([Ee][+-]?))* | 0[Xx](%x|%.|([Pp][+-]?))*
+**
+** The only tricky part is to accept [+-] only after a valid exponent
+** mark, to avoid reading '3-4' or '0xe+1' as a single number.
+**
+** The caller might have already read an initial dot.
+*/
+static int read_numeral (LexState *ls, SemInfo *seminfo) {
+  TValue obj;
+  const char *expo = "Ee";
+  int first = ls->current;
+  lua_assert(lisdigit(ls->current));
+  save_and_next(ls);
+  if (first == '0' && check_next2(ls, "xX"))  /* hexadecimal? */
+    expo = "Pp";
+  for (;;) {
+    if (check_next2(ls, expo))  /* exponent mark? */
+      check_next2(ls, "-+");  /* optional exponent sign */
+    else if (lisxdigit(ls->current) || ls->current == '.')  /* '%x|%.' */
+      save_and_next(ls);
+    else break;
+  }
+  if (lislalpha(ls->current))  /* is numeral touching a letter? */
+    save_and_next(ls);  /* force an error */
+  save(ls, '\0');
+  if (luaO_str2num(luaZ_buffer(ls->buff), &obj) == 0)  /* format error? */
+    lexerror(ls, "malformed number", TK_FLT);
+  if (ttisinteger(&obj)) {
+    seminfo->i = ivalue(&obj);
+    return TK_INT;
+  }
+  else {
+    lua_assert(ttisfloat(&obj));
+    seminfo->r = fltvalue(&obj);
+    return TK_FLT;
+  }
+}
+
+
+/*
+** read a sequence '[=*[' or ']=*]', leaving the last bracket. If
+** sequence is well formed, return its number of '='s + 2; otherwise,
+** return 1 if it is a single bracket (no '='s and no 2nd bracket);
+** otherwise (an unfinished '[==...') return 0.
+*/
+static size_t skip_sep (LexState *ls) {
+  size_t count = 0;
+  int s = ls->current;
+  lua_assert(s == '[' || s == ']');
+  save_and_next(ls);
+  while (ls->current == '=') {
+    save_and_next(ls);
+    count++;
+  }
+  return (ls->current == s) ? count + 2
+         : (count == 0) ? 1
+         : 0;
+}
+
+
+static void read_long_string (LexState *ls, SemInfo *seminfo, size_t sep) {
+  int line = ls->linenumber;  /* initial line (for error message) */
+  save_and_next(ls);  /* skip 2nd '[' */
+  if (currIsNewline(ls))  /* string starts with a newline? */
+    inclinenumber(ls);  /* skip it */
+  for (;;) {
+    switch (ls->current) {
+      case EOZ: {  /* error */
+        const char *what = (seminfo ? "string" : "comment");
+        const char *msg = luaO_pushfstring(ls->L,
+                     "unfinished long %s (starting at line %d)", what, line);
+        lexerror(ls, msg, TK_EOS);
+        break;  /* to avoid warnings */
+      }
+      case ']': {
+        if (skip_sep(ls) == sep) {
+          save_and_next(ls);  /* skip 2nd ']' */
+          goto endloop;
+        }
+        break;
+      }
+      case '\n': case '\r': {
+        save(ls, '\n');
+        inclinenumber(ls);
+        if (!seminfo) luaZ_resetbuffer(ls->buff);  /* avoid wasting space */
+        break;
+      }
+      default: {
+        if (seminfo) save_and_next(ls);
+        else next(ls);
+      }
+    }
+  } endloop:
+  if (seminfo)
+    seminfo->ts = luaX_newstring(ls, luaZ_buffer(ls->buff) + sep,
+                                     luaZ_bufflen(ls->buff) - 2 * sep);
+}
+
+
+static void esccheck (LexState *ls, int c, const char *msg) {
+  if (!c) {
+    if (ls->current != EOZ)
+      save_and_next(ls);  /* add current to buffer for error message */
+    lexerror(ls, msg, TK_STRING);
+  }
+}
+
+
+static int gethexa (LexState *ls) {
+  save_and_next(ls);
+  esccheck (ls, lisxdigit(ls->current), "hexadecimal digit expected");
+  return luaO_hexavalue(ls->current);
+}
+
+
+static int readhexaesc (LexState *ls) {
+  int r = gethexa(ls);
+  r = (r << 4) + gethexa(ls);
+  luaZ_buffremove(ls->buff, 2);  /* remove saved chars from buffer */
+  return r;
+}
+
+
+static unsigned long readutf8esc (LexState *ls) {
+  unsigned long r;
+  int i = 4;  /* chars to be removed: '\', 'u', '{', and first digit */
+  save_and_next(ls);  /* skip 'u' */
+  esccheck(ls, ls->current == '{', "missing '{'");
+  r = gethexa(ls);  /* must have at least one digit */
+  while (cast_void(save_and_next(ls)), lisxdigit(ls->current)) {
+    i++;
+    esccheck(ls, r <= (0x7FFFFFFFu >> 4), "UTF-8 value too large");
+    r = (r << 4) + luaO_hexavalue(ls->current);
+  }
+  esccheck(ls, ls->current == '}', "missing '}'");
+  next(ls);  /* skip '}' */
+  luaZ_buffremove(ls->buff, i);  /* remove saved chars from buffer */
+  return r;
+}
+
+
+static void utf8esc (LexState *ls) {
+  char buff[UTF8BUFFSZ];
+  int n = luaO_utf8esc(buff, readutf8esc(ls));
+  for (; n > 0; n--)  /* add 'buff' to string */
+    save(ls, buff[UTF8BUFFSZ - n]);
+}
+
+
+static int readdecesc (LexState *ls) {
+  int i;
+  int r = 0;  /* result accumulator */
+  for (i = 0; i < 3 && lisdigit(ls->current); i++) {  /* read up to 3 digits */
+    r = 10*r + ls->current - '0';
+    save_and_next(ls);
+  }
+  esccheck(ls, r <= UCHAR_MAX, "decimal escape too large");
+  luaZ_buffremove(ls->buff, i);  /* remove read digits from buffer */
+  return r;
+}
+
+
+static void read_string (LexState *ls, int del, SemInfo *seminfo) {
+  save_and_next(ls);  /* keep delimiter (for error messages) */
+  while (ls->current != del) {
+    switch (ls->current) {
+      case EOZ:
+        lexerror(ls, "unfinished string", TK_EOS);
+        break;  /* to avoid warnings */
+      case '\n':
+      case '\r':
+        lexerror(ls, "unfinished string", TK_STRING);
+        break;  /* to avoid warnings */
+      case '\\': {  /* escape sequences */
+        int c;  /* final character to be saved */
+        save_and_next(ls);  /* keep '\\' for error messages */
+        switch (ls->current) {
+          case 'a': c = '\a'; goto read_save;
+          case 'b': c = '\b'; goto read_save;
+          case 'f': c = '\f'; goto read_save;
+          case 'n': c = '\n'; goto read_save;
+          case 'r': c = '\r'; goto read_save;
+          case 't': c = '\t'; goto read_save;
+          case 'v': c = '\v'; goto read_save;
+          case 'x': c = readhexaesc(ls); goto read_save;
+          case 'u': utf8esc(ls);  goto no_save;
+          case '\n': case '\r':
+            inclinenumber(ls); c = '\n'; goto only_save;
+          case '\\': case '\"': case '\'':
+            c = ls->current; goto read_save;
+          case EOZ: goto no_save;  /* will raise an error next loop */
+          case 'z': {  /* zap following span of spaces */
+            luaZ_buffremove(ls->buff, 1);  /* remove '\\' */
+            next(ls);  /* skip the 'z' */
+            while (lisspace(ls->current)) {
+              if (currIsNewline(ls)) inclinenumber(ls);
+              else next(ls);
+            }
+            goto no_save;
+          }
+          default: {
+            esccheck(ls, lisdigit(ls->current), "invalid escape sequence");
+            c = readdecesc(ls);  /* digital escape '\ddd' */
+            goto only_save;
+          }
+        }
+       read_save:
+         next(ls);
+         /* go through */
+       only_save:
+         luaZ_buffremove(ls->buff, 1);  /* remove '\\' */
+         save(ls, c);
+         /* go through */
+       no_save: break;
+      }
+      default:
+        save_and_next(ls);
+    }
+  }
+  save_and_next(ls);  /* skip delimiter */
+  seminfo->ts = luaX_newstring(ls, luaZ_buffer(ls->buff) + 1,
+                                   luaZ_bufflen(ls->buff) - 2);
+}
+
+
+static int llex (LexState *ls, SemInfo *seminfo) {
+  luaZ_resetbuffer(ls->buff);
+  for (;;) {
+    switch (ls->current) {
+      case '\n': case '\r': {  /* line breaks */
+        inclinenumber(ls);
+        break;
+      }
+      case ' ': case '\f': case '\t': case '\v': {  /* spaces */
+        next(ls);
+        break;
+      }
+      case '-': {  /* '-' or '--' (comment) */
+        next(ls);
+        if (ls->current != '-') return '-';
+        /* else is a comment */
+        next(ls);
+        if (ls->current == '[') {  /* long comment? */
+          size_t sep = skip_sep(ls);
+          luaZ_resetbuffer(ls->buff);  /* 'skip_sep' may dirty the buffer */
+          if (sep >= 2) {
+            read_long_string(ls, NULL, sep);  /* skip long comment */
+            luaZ_resetbuffer(ls->buff);  /* previous call may dirty the buff. */
+            break;
+          }
+        }
+        /* else short comment */
+        while (!currIsNewline(ls) && ls->current != EOZ)
+          next(ls);  /* skip until end of line (or end of file) */
+        break;
+      }
+      case '[': {  /* long string or simply '[' */
+        size_t sep = skip_sep(ls);
+        if (sep >= 2) {
+          read_long_string(ls, seminfo, sep);
+          return TK_STRING;
+        }
+        else if (sep == 0)  /* '[=...' missing second bracket? */
+          lexerror(ls, "invalid long string delimiter", TK_STRING);
+        return '[';
+      }
+      case '=': {
+        next(ls);
+        if (check_next1(ls, '=')) return TK_EQ;  /* '==' */
+        else return '=';
+      }
+      case '<': {
+        next(ls);
+        if (check_next1(ls, '=')) return TK_LE;  /* '<=' */
+        else if (check_next1(ls, '<')) return TK_SHL;  /* '<<' */
+        else return '<';
+      }
+      case '>': {
+        next(ls);
+        if (check_next1(ls, '=')) return TK_GE;  /* '>=' */
+        else if (check_next1(ls, '>')) return TK_SHR;  /* '>>' */
+        else return '>';
+      }
+      case '/': {
+        next(ls);
+        if (check_next1(ls, '/')) return TK_IDIV;  /* '//' */
+        else return '/';
+      }
+      case '~': {
+        next(ls);
+        if (check_next1(ls, '=')) return TK_NE;  /* '~=' */
+        else return '~';
+      }
+      case ':': {
+        next(ls);
+        if (check_next1(ls, ':')) return TK_DBCOLON;  /* '::' */
+        else return ':';
+      }
+      case '"': case '\'': {  /* short literal strings */
+        read_string(ls, ls->current, seminfo);
+        return TK_STRING;
+      }
+      case '.': {  /* '.', '..', '...', or number */
+        save_and_next(ls);
+        if (check_next1(ls, '.')) {
+          if (check_next1(ls, '.'))
+            return TK_DOTS;   /* '...' */
+          else return TK_CONCAT;   /* '..' */
+        }
+        else if (!lisdigit(ls->current)) return '.';
+        else return read_numeral(ls, seminfo);
+      }
+      case '0': case '1': case '2': case '3': case '4':
+      case '5': case '6': case '7': case '8': case '9': {
+        return read_numeral(ls, seminfo);
+      }
+      case EOZ: {
+        return TK_EOS;
+      }
+      default: {
+        if (lislalpha(ls->current)) {  /* identifier or reserved word? */
+          TString *ts;
+          do {
+            save_and_next(ls);
+          } while (lislalnum(ls->current));
+          ts = luaX_newstring(ls, luaZ_buffer(ls->buff),
+                                  luaZ_bufflen(ls->buff));
+          seminfo->ts = ts;
+          if (isreserved(ts))  /* reserved word? */
+            return ts->extra - 1 + FIRST_RESERVED;
+          else {
+            return TK_NAME;
+          }
+        }
+        else {  /* single-char tokens ('+', '*', '%', '{', '}', ...) */
+          int c = ls->current;
+          next(ls);
+          return c;
+        }
+      }
+    }
+  }
+}
+
+
+void luaX_next (LexState *ls) {
+  ls->lastline = ls->linenumber;
+  if (ls->lookahead.token != TK_EOS) {  /* is there a look-ahead token? */
+    ls->t = ls->lookahead;  /* use this one */
+    ls->lookahead.token = TK_EOS;  /* and discharge it */
+  }
+  else
+    ls->t.token = llex(ls, &ls->t.seminfo);  /* read next token */
+}
+
+
+int luaX_lookahead (LexState *ls) {
+  lua_assert(ls->lookahead.token == TK_EOS);
+  ls->lookahead.token = llex(ls, &ls->lookahead.seminfo);
+  return ls->lookahead.token;
+}
+
diff --git a/src/libs/3rdparty/lua/src/llex.h b/src/libs/3rdparty/lua/src/llex.h
new file mode 100644
index 0000000000..389d2f8635
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/llex.h
@@ -0,0 +1,91 @@
+/*
+** $Id: llex.h $
+** Lexical Analyzer
+** See Copyright Notice in lua.h
+*/
+
+#ifndef llex_h
+#define llex_h
+
+#include <limits.h>
+
+#include "lobject.h"
+#include "lzio.h"
+
+
+/*
+** Single-char tokens (terminal symbols) are represented by their own
+** numeric code. Other tokens start at the following value.
+*/
+#define FIRST_RESERVED	(UCHAR_MAX + 1)
+
+
+#if !defined(LUA_ENV)
+#define LUA_ENV		"_ENV"
+#endif
+
+
+/*
+* WARNING: if you change the order of this enumeration,
+* grep "ORDER RESERVED"
+*/
+enum RESERVED {
+  /* terminal symbols denoted by reserved words */
+  TK_AND = FIRST_RESERVED, TK_BREAK,
+  TK_DO, TK_ELSE, TK_ELSEIF, TK_END, TK_FALSE, TK_FOR, TK_FUNCTION,
+  TK_GOTO, TK_IF, TK_IN, TK_LOCAL, TK_NIL, TK_NOT, TK_OR, TK_REPEAT,
+  TK_RETURN, TK_THEN, TK_TRUE, TK_UNTIL, TK_WHILE,
+  /* other terminal symbols */
+  TK_IDIV, TK_CONCAT, TK_DOTS, TK_EQ, TK_GE, TK_LE, TK_NE,
+  TK_SHL, TK_SHR,
+  TK_DBCOLON, TK_EOS,
+  TK_FLT, TK_INT, TK_NAME, TK_STRING
+};
+
+/* number of reserved words */
+#define NUM_RESERVED	(cast_int(TK_WHILE-FIRST_RESERVED + 1))
+
+
+typedef union {
+  lua_Number r;
+  lua_Integer i;
+  TString *ts;
+} SemInfo;  /* semantics information */
+
+
+typedef struct Token {
+  int token;
+  SemInfo seminfo;
+} Token;
+
+
+/* state of the lexer plus state of the parser when shared by all
+   functions */
+typedef struct LexState {
+  int current;  /* current character (charint) */
+  int linenumber;  /* input line counter */
+  int lastline;  /* line of last token 'consumed' */
+  Token t;  /* current token */
+  Token lookahead;  /* look ahead token */
+  struct FuncState *fs;  /* current function (parser) */
+  struct lua_State *L;
+  ZIO *z;  /* input stream */
+  Mbuffer *buff;  /* buffer for tokens */
+  Table *h;  /* to avoid collection/reuse strings */
+  struct Dyndata *dyd;  /* dynamic structures used by the parser */
+  TString *source;  /* current source name */
+  TString *envn;  /* environment variable name */
+} LexState;
+
+
+LUAI_FUNC void luaX_init (lua_State *L);
+LUAI_FUNC void luaX_setinput (lua_State *L, LexState *ls, ZIO *z,
+                              TString *source, int firstchar);
+LUAI_FUNC TString *luaX_newstring (LexState *ls, const char *str, size_t l);
+LUAI_FUNC void luaX_next (LexState *ls);
+LUAI_FUNC int luaX_lookahead (LexState *ls);
+LUAI_FUNC l_noret luaX_syntaxerror (LexState *ls, const char *s);
+LUAI_FUNC const char *luaX_token2str (LexState *ls, int token);
+
+
+#endif
diff --git a/src/libs/3rdparty/lua/src/llimits.h b/src/libs/3rdparty/lua/src/llimits.h
new file mode 100644
index 0000000000..1c826f7be2
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/llimits.h
@@ -0,0 +1,380 @@
+/*
+** $Id: llimits.h $
+** Limits, basic types, and some other 'installation-dependent' definitions
+** See Copyright Notice in lua.h
+*/
+
+#ifndef llimits_h
+#define llimits_h
+
+
+#include <limits.h>
+#include <stddef.h>
+
+
+#include "lua.h"
+
+
+/*
+** 'lu_mem' and 'l_mem' are unsigned/signed integers big enough to count
+** the total memory used by Lua (in bytes). Usually, 'size_t' and
+** 'ptrdiff_t' should work, but we use 'long' for 16-bit machines.
+*/
+#if defined(LUAI_MEM)		/* { external definitions? */
+typedef LUAI_UMEM lu_mem;
+typedef LUAI_MEM l_mem;
+#elif LUAI_IS32INT	/* }{ */
+typedef size_t lu_mem;
+typedef ptrdiff_t l_mem;
+#else  /* 16-bit ints */	/* }{ */
+typedef unsigned long lu_mem;
+typedef long l_mem;
+#endif				/* } */
+
+
+/* chars used as small naturals (so that 'char' is reserved for characters) */
+typedef unsigned char lu_byte;
+typedef signed char ls_byte;
+
+
+/* maximum value for size_t */
+#define MAX_SIZET	((size_t)(~(size_t)0))
+
+/* maximum size visible for Lua (must be representable in a lua_Integer) */
+#define MAX_SIZE	(sizeof(size_t) < sizeof(lua_Integer) ? MAX_SIZET \
+                          : (size_t)(LUA_MAXINTEGER))
+
+
+#define MAX_LUMEM	((lu_mem)(~(lu_mem)0))
+
+#define MAX_LMEM	((l_mem)(MAX_LUMEM >> 1))
+
+
+#define MAX_INT		INT_MAX  /* maximum value of an int */
+
+
+/*
+** floor of the log2 of the maximum signed value for integral type 't'.
+** (That is, maximum 'n' such that '2^n' fits in the given signed type.)
+*/
+#define log2maxs(t)	(sizeof(t) * 8 - 2)
+
+
+/*
+** test whether an unsigned value is a power of 2 (or zero)
+*/
+#define ispow2(x)	(((x) & ((x) - 1)) == 0)
+
+
+/* number of chars of a literal string without the ending \0 */
+#define LL(x)   (sizeof(x)/sizeof(char) - 1)
+
+
+/*
+** conversion of pointer to unsigned integer: this is for hashing only;
+** there is no problem if the integer cannot hold the whole pointer
+** value. (In strict ISO C this may cause undefined behavior, but no
+** actual machine seems to bother.)
+*/
+#if !defined(LUA_USE_C89) && defined(__STDC_VERSION__) && \
+    __STDC_VERSION__ >= 199901L
+#include <stdint.h>
+#if defined(UINTPTR_MAX)  /* even in C99 this type is optional */
+#define L_P2I	uintptr_t
+#else  /* no 'intptr'? */
+#define L_P2I	uintmax_t  /* use the largest available integer */
+#endif
+#else  /* C89 option */
+#define L_P2I	size_t
+#endif
+
+#define point2uint(p)	((unsigned int)((L_P2I)(p) & UINT_MAX))
+
+
+
+/* types of 'usual argument conversions' for lua_Number and lua_Integer */
+typedef LUAI_UACNUMBER l_uacNumber;
+typedef LUAI_UACINT l_uacInt;
+
+
+/*
+** Internal assertions for in-house debugging
+*/
+#if defined LUAI_ASSERT
+#undef NDEBUG
+#include <assert.h>
+#define lua_assert(c)           assert(c)
+#endif
+
+#if defined(lua_assert)
+#define check_exp(c,e)		(lua_assert(c), (e))
+/* to avoid problems with conditions too long */
+#define lua_longassert(c)	((c) ? (void)0 : lua_assert(0))
+#else
+#define lua_assert(c)		((void)0)
+#define check_exp(c,e)		(e)
+#define lua_longassert(c)	((void)0)
+#endif
+
+/*
+** assertion for checking API calls
+*/
+#if !defined(luai_apicheck)
+#define luai_apicheck(l,e)	((void)l, lua_assert(e))
+#endif
+
+#define api_check(l,e,msg)	luai_apicheck(l,(e) && msg)
+
+
+/* macro to avoid warnings about unused variables */
+#if !defined(UNUSED)
+#define UNUSED(x)	((void)(x))
+#endif
+
+
+/* type casts (a macro highlights casts in the code) */
+#define cast(t, exp)	((t)(exp))
+
+#define cast_void(i)	cast(void, (i))
+#define cast_voidp(i)	cast(void *, (i))
+#define cast_num(i)	cast(lua_Number, (i))
+#define cast_int(i)	cast(int, (i))
+#define cast_uint(i)	cast(unsigned int, (i))
+#define cast_byte(i)	cast(lu_byte, (i))
+#define cast_uchar(i)	cast(unsigned char, (i))
+#define cast_char(i)	cast(char, (i))
+#define cast_charp(i)	cast(char *, (i))
+#define cast_sizet(i)	cast(size_t, (i))
+
+
+/* cast a signed lua_Integer to lua_Unsigned */
+#if !defined(l_castS2U)
+#define l_castS2U(i)	((lua_Unsigned)(i))
+#endif
+
+/*
+** cast a lua_Unsigned to a signed lua_Integer; this cast is
+** not strict ISO C, but two-complement architectures should
+** work fine.
+*/
+#if !defined(l_castU2S)
+#define l_castU2S(i)	((lua_Integer)(i))
+#endif
+
+
+/*
+** non-return type
+*/
+#if !defined(l_noret)
+
+#if defined(__GNUC__)
+#define l_noret		void __attribute__((noreturn))
+#elif defined(_MSC_VER) && _MSC_VER >= 1200
+#define l_noret		void __declspec(noreturn)
+#else
+#define l_noret		void
+#endif
+
+#endif
+
+
+/*
+** Inline functions
+*/
+#if !defined(LUA_USE_C89)
+#define l_inline	inline
+#elif defined(__GNUC__)
+#define l_inline	__inline__
+#else
+#define l_inline	/* empty */
+#endif
+
+#define l_sinline	static l_inline
+
+
+/*
+** type for virtual-machine instructions;
+** must be an unsigned with (at least) 4 bytes (see details in lopcodes.h)
+*/
+#if LUAI_IS32INT
+typedef unsigned int l_uint32;
+#else
+typedef unsigned long l_uint32;
+#endif
+
+typedef l_uint32 Instruction;
+
+
+
+/*
+** Maximum length for short strings, that is, strings that are
+** internalized. (Cannot be smaller than reserved words or tags for
+** metamethods, as these strings must be internalized;
+** #("function") = 8, #("__newindex") = 10.)
+*/
+#if !defined(LUAI_MAXSHORTLEN)
+#define LUAI_MAXSHORTLEN	40
+#endif
+
+
+/*
+** Initial size for the string table (must be power of 2).
+** The Lua core alone registers ~50 strings (reserved words +
+** metaevent keys + a few others). Libraries would typically add
+** a few dozens more.
+*/
+#if !defined(MINSTRTABSIZE)
+#define MINSTRTABSIZE	128
+#endif
+
+
+/*
+** Size of cache for strings in the API. 'N' is the number of
+** sets (better be a prime) and "M" is the size of each set (M == 1
+** makes a direct cache.)
+*/
+#if !defined(STRCACHE_N)
+#define STRCACHE_N		53
+#define STRCACHE_M		2
+#endif
+
+
+/* minimum size for string buffer */
+#if !defined(LUA_MINBUFFER)
+#define LUA_MINBUFFER	32
+#endif
+
+
+/*
+** Maximum depth for nested C calls, syntactical nested non-terminals,
+** and other features implemented through recursion in C. (Value must
+** fit in a 16-bit unsigned integer. It must also be compatible with
+** the size of the C stack.)
+*/
+#if !defined(LUAI_MAXCCALLS)
+#define LUAI_MAXCCALLS		200
+#endif
+
+
+/*
+** macros that are executed whenever program enters the Lua core
+** ('lua_lock') and leaves the core ('lua_unlock')
+*/
+#if !defined(lua_lock)
+#define lua_lock(L)	((void) 0)
+#define lua_unlock(L)	((void) 0)
+#endif
+
+/*
+** macro executed during Lua functions at points where the
+** function can yield.
+*/
+#if !defined(luai_threadyield)
+#define luai_threadyield(L)	{lua_unlock(L); lua_lock(L);}
+#endif
+
+
+/*
+** these macros allow user-specific actions when a thread is
+** created/deleted/resumed/yielded.
+*/
+#if !defined(luai_userstateopen)
+#define luai_userstateopen(L)		((void)L)
+#endif
+
+#if !defined(luai_userstateclose)
+#define luai_userstateclose(L)		((void)L)
+#endif
+
+#if !defined(luai_userstatethread)
+#define luai_userstatethread(L,L1)	((void)L)
+#endif
+
+#if !defined(luai_userstatefree)
+#define luai_userstatefree(L,L1)	((void)L)
+#endif
+
+#if !defined(luai_userstateresume)
+#define luai_userstateresume(L,n)	((void)L)
+#endif
+
+#if !defined(luai_userstateyield)
+#define luai_userstateyield(L,n)	((void)L)
+#endif
+
+
+
+/*
+** The luai_num* macros define the primitive operations over numbers.
+*/
+
+/* floor division (defined as 'floor(a/b)') */
+#if !defined(luai_numidiv)
+#define luai_numidiv(L,a,b)     ((void)L, l_floor(luai_numdiv(L,a,b)))
+#endif
+
+/* float division */
+#if !defined(luai_numdiv)
+#define luai_numdiv(L,a,b)      ((a)/(b))
+#endif
+
+/*
+** modulo: defined as 'a - floor(a/b)*b'; the direct computation
+** using this definition has several problems with rounding errors,
+** so it is better to use 'fmod'. 'fmod' gives the result of
+** 'a - trunc(a/b)*b', and therefore must be corrected when
+** 'trunc(a/b) ~= floor(a/b)'. That happens when the division has a
+** non-integer negative result: non-integer result is equivalent to
+** a non-zero remainder 'm'; negative result is equivalent to 'a' and
+** 'b' with different signs, or 'm' and 'b' with different signs
+** (as the result 'm' of 'fmod' has the same sign of 'a').
+*/
+#if !defined(luai_nummod)
+#define luai_nummod(L,a,b,m)  \
+  { (void)L; (m) = l_mathop(fmod)(a,b); \
+    if (((m) > 0) ? (b) < 0 : ((m) < 0 && (b) > 0)) (m) += (b); }
+#endif
+
+/* exponentiation */
+#if !defined(luai_numpow)
+#define luai_numpow(L,a,b)  \
+  ((void)L, (b == 2) ? (a)*(a) : l_mathop(pow)(a,b))
+#endif
+
+/* the others are quite standard operations */
+#if !defined(luai_numadd)
+#define luai_numadd(L,a,b)      ((a)+(b))
+#define luai_numsub(L,a,b)      ((a)-(b))
+#define luai_nummul(L,a,b)      ((a)*(b))
+#define luai_numunm(L,a)        (-(a))
+#define luai_numeq(a,b)         ((a)==(b))
+#define luai_numlt(a,b)         ((a)<(b))
+#define luai_numle(a,b)         ((a)<=(b))
+#define luai_numgt(a,b)         ((a)>(b))
+#define luai_numge(a,b)         ((a)>=(b))
+#define luai_numisnan(a)        (!luai_numeq((a), (a)))
+#endif
+
+
+
+
+
+/*
+** macro to control inclusion of some hard tests on stack reallocation
+*/
+#if !defined(HARDSTACKTESTS)
+#define condmovestack(L,pre,pos)	((void)0)
+#else
+/* realloc stack keeping its size */
+#define condmovestack(L,pre,pos)  \
+  { int sz_ = stacksize(L); pre; luaD_reallocstack((L), sz_, 0); pos; }
+#endif
+
+#if !defined(HARDMEMTESTS)
+#define condchangemem(L,pre,pos)	((void)0)
+#else
+#define condchangemem(L,pre,pos)  \
+	{ if (gcrunning(G(L))) { pre; luaC_fullgc(L, 0); pos; } }
+#endif
+
+#endif
diff --git a/src/libs/3rdparty/lua/src/lmathlib.c b/src/libs/3rdparty/lua/src/lmathlib.c
new file mode 100644
index 0000000000..d0b1e1e5d6
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lmathlib.c
@@ -0,0 +1,764 @@
+/*
+** $Id: lmathlib.c $
+** Standard mathematical library
+** See Copyright Notice in lua.h
+*/
+
+#define lmathlib_c
+#define LUA_LIB
+
+#include "lprefix.h"
+
+
+#include <float.h>
+#include <limits.h>
+#include <math.h>
+#include <stdlib.h>
+#include <time.h>
+
+#include "lua.h"
+
+#include "lauxlib.h"
+#include "lualib.h"
+
+
+#undef PI
+#define PI	(l_mathop(3.141592653589793238462643383279502884))
+
+
+static int math_abs (lua_State *L) {
+  if (lua_isinteger(L, 1)) {
+    lua_Integer n = lua_tointeger(L, 1);
+    if (n < 0) n = (lua_Integer)(0u - (lua_Unsigned)n);
+    lua_pushinteger(L, n);
+  }
+  else
+    lua_pushnumber(L, l_mathop(fabs)(luaL_checknumber(L, 1)));
+  return 1;
+}
+
+static int math_sin (lua_State *L) {
+  lua_pushnumber(L, l_mathop(sin)(luaL_checknumber(L, 1)));
+  return 1;
+}
+
+static int math_cos (lua_State *L) {
+  lua_pushnumber(L, l_mathop(cos)(luaL_checknumber(L, 1)));
+  return 1;
+}
+
+static int math_tan (lua_State *L) {
+  lua_pushnumber(L, l_mathop(tan)(luaL_checknumber(L, 1)));
+  return 1;
+}
+
+static int math_asin (lua_State *L) {
+  lua_pushnumber(L, l_mathop(asin)(luaL_checknumber(L, 1)));
+  return 1;
+}
+
+static int math_acos (lua_State *L) {
+  lua_pushnumber(L, l_mathop(acos)(luaL_checknumber(L, 1)));
+  return 1;
+}
+
+static int math_atan (lua_State *L) {
+  lua_Number y = luaL_checknumber(L, 1);
+  lua_Number x = luaL_optnumber(L, 2, 1);
+  lua_pushnumber(L, l_mathop(atan2)(y, x));
+  return 1;
+}
+
+
+static int math_toint (lua_State *L) {
+  int valid;
+  lua_Integer n = lua_tointegerx(L, 1, &valid);
+  if (l_likely(valid))
+    lua_pushinteger(L, n);
+  else {
+    luaL_checkany(L, 1);
+    luaL_pushfail(L);  /* value is not convertible to integer */
+  }
+  return 1;
+}
+
+
+static void pushnumint (lua_State *L, lua_Number d) {
+  lua_Integer n;
+  if (lua_numbertointeger(d, &n))  /* does 'd' fit in an integer? */
+    lua_pushinteger(L, n);  /* result is integer */
+  else
+    lua_pushnumber(L, d);  /* result is float */
+}
+
+
+static int math_floor (lua_State *L) {
+  if (lua_isinteger(L, 1))
+    lua_settop(L, 1);  /* integer is its own floor */
+  else {
+    lua_Number d = l_mathop(floor)(luaL_checknumber(L, 1));
+    pushnumint(L, d);
+  }
+  return 1;
+}
+
+
+static int math_ceil (lua_State *L) {
+  if (lua_isinteger(L, 1))
+    lua_settop(L, 1);  /* integer is its own ceil */
+  else {
+    lua_Number d = l_mathop(ceil)(luaL_checknumber(L, 1));
+    pushnumint(L, d);
+  }
+  return 1;
+}
+
+
+static int math_fmod (lua_State *L) {
+  if (lua_isinteger(L, 1) && lua_isinteger(L, 2)) {
+    lua_Integer d = lua_tointeger(L, 2);
+    if ((lua_Unsigned)d + 1u <= 1u) {  /* special cases: -1 or 0 */
+      luaL_argcheck(L, d != 0, 2, "zero");
+      lua_pushinteger(L, 0);  /* avoid overflow with 0x80000... / -1 */
+    }
+    else
+      lua_pushinteger(L, lua_tointeger(L, 1) % d);
+  }
+  else
+    lua_pushnumber(L, l_mathop(fmod)(luaL_checknumber(L, 1),
+                                     luaL_checknumber(L, 2)));
+  return 1;
+}
+
+
+/*
+** next function does not use 'modf', avoiding problems with 'double*'
+** (which is not compatible with 'float*') when lua_Number is not
+** 'double'.
+*/
+static int math_modf (lua_State *L) {
+  if (lua_isinteger(L ,1)) {
+    lua_settop(L, 1);  /* number is its own integer part */
+    lua_pushnumber(L, 0);  /* no fractional part */
+  }
+  else {
+    lua_Number n = luaL_checknumber(L, 1);
+    /* integer part (rounds toward zero) */
+    lua_Number ip = (n < 0) ? l_mathop(ceil)(n) : l_mathop(floor)(n);
+    pushnumint(L, ip);
+    /* fractional part (test needed for inf/-inf) */
+    lua_pushnumber(L, (n == ip) ? l_mathop(0.0) : (n - ip));
+  }
+  return 2;
+}
+
+
+static int math_sqrt (lua_State *L) {
+  lua_pushnumber(L, l_mathop(sqrt)(luaL_checknumber(L, 1)));
+  return 1;
+}
+
+
+static int math_ult (lua_State *L) {
+  lua_Integer a = luaL_checkinteger(L, 1);
+  lua_Integer b = luaL_checkinteger(L, 2);
+  lua_pushboolean(L, (lua_Unsigned)a < (lua_Unsigned)b);
+  return 1;
+}
+
+static int math_log (lua_State *L) {
+  lua_Number x = luaL_checknumber(L, 1);
+  lua_Number res;
+  if (lua_isnoneornil(L, 2))
+    res = l_mathop(log)(x);
+  else {
+    lua_Number base = luaL_checknumber(L, 2);
+#if !defined(LUA_USE_C89)
+    if (base == l_mathop(2.0))
+      res = l_mathop(log2)(x);
+    else
+#endif
+    if (base == l_mathop(10.0))
+      res = l_mathop(log10)(x);
+    else
+      res = l_mathop(log)(x)/l_mathop(log)(base);
+  }
+  lua_pushnumber(L, res);
+  return 1;
+}
+
+static int math_exp (lua_State *L) {
+  lua_pushnumber(L, l_mathop(exp)(luaL_checknumber(L, 1)));
+  return 1;
+}
+
+static int math_deg (lua_State *L) {
+  lua_pushnumber(L, luaL_checknumber(L, 1) * (l_mathop(180.0) / PI));
+  return 1;
+}
+
+static int math_rad (lua_State *L) {
+  lua_pushnumber(L, luaL_checknumber(L, 1) * (PI / l_mathop(180.0)));
+  return 1;
+}
+
+
+static int math_min (lua_State *L) {
+  int n = lua_gettop(L);  /* number of arguments */
+  int imin = 1;  /* index of current minimum value */
+  int i;
+  luaL_argcheck(L, n >= 1, 1, "value expected");
+  for (i = 2; i <= n; i++) {
+    if (lua_compare(L, i, imin, LUA_OPLT))
+      imin = i;
+  }
+  lua_pushvalue(L, imin);
+  return 1;
+}
+
+
+static int math_max (lua_State *L) {
+  int n = lua_gettop(L);  /* number of arguments */
+  int imax = 1;  /* index of current maximum value */
+  int i;
+  luaL_argcheck(L, n >= 1, 1, "value expected");
+  for (i = 2; i <= n; i++) {
+    if (lua_compare(L, imax, i, LUA_OPLT))
+      imax = i;
+  }
+  lua_pushvalue(L, imax);
+  return 1;
+}
+
+
+static int math_type (lua_State *L) {
+  if (lua_type(L, 1) == LUA_TNUMBER)
+    lua_pushstring(L, (lua_isinteger(L, 1)) ? "integer" : "float");
+  else {
+    luaL_checkany(L, 1);
+    luaL_pushfail(L);
+  }
+  return 1;
+}
+
+
+
+/*
+** {==================================================================
+** Pseudo-Random Number Generator based on 'xoshiro256**'.
+** ===================================================================
+*/
+
+/* number of binary digits in the mantissa of a float */
+#define FIGS	l_floatatt(MANT_DIG)
+
+#if FIGS > 64
+/* there are only 64 random bits; use them all */
+#undef FIGS
+#define FIGS	64
+#endif
+
+
+/*
+** LUA_RAND32 forces the use of 32-bit integers in the implementation
+** of the PRN generator (mainly for testing).
+*/
+#if !defined(LUA_RAND32) && !defined(Rand64)
+
+/* try to find an integer type with at least 64 bits */
+
+#if ((ULONG_MAX >> 31) >> 31) >= 3
+
+/* 'long' has at least 64 bits */
+#define Rand64		unsigned long
+
+#elif !defined(LUA_USE_C89) && defined(LLONG_MAX)
+
+/* there is a 'long long' type (which must have at least 64 bits) */
+#define Rand64		unsigned long long
+
+#elif ((LUA_MAXUNSIGNED >> 31) >> 31) >= 3
+
+/* 'lua_Unsigned' has at least 64 bits */
+#define Rand64		lua_Unsigned
+
+#endif
+
+#endif
+
+
+#if defined(Rand64)  /* { */
+
+/*
+** Standard implementation, using 64-bit integers.
+** If 'Rand64' has more than 64 bits, the extra bits do not interfere
+** with the 64 initial bits, except in a right shift. Moreover, the
+** final result has to discard the extra bits.
+*/
+
+/* avoid using extra bits when needed */
+#define trim64(x)	((x) & 0xffffffffffffffffu)
+
+
+/* rotate left 'x' by 'n' bits */
+static Rand64 rotl (Rand64 x, int n) {
+  return (x << n) | (trim64(x) >> (64 - n));
+}
+
+static Rand64 nextrand (Rand64 *state) {
+  Rand64 state0 = state[0];
+  Rand64 state1 = state[1];
+  Rand64 state2 = state[2] ^ state0;
+  Rand64 state3 = state[3] ^ state1;
+  Rand64 res = rotl(state1 * 5, 7) * 9;
+  state[0] = state0 ^ state3;
+  state[1] = state1 ^ state2;
+  state[2] = state2 ^ (state1 << 17);
+  state[3] = rotl(state3, 45);
+  return res;
+}
+
+
+/* must take care to not shift stuff by more than 63 slots */
+
+
+/*
+** Convert bits from a random integer into a float in the
+** interval [0,1), getting the higher FIG bits from the
+** random unsigned integer and converting that to a float.
+*/
+
+/* must throw out the extra (64 - FIGS) bits */
+#define shift64_FIG	(64 - FIGS)
+
+/* to scale to [0, 1), multiply by scaleFIG = 2^(-FIGS) */
+#define scaleFIG	(l_mathop(0.5) / ((Rand64)1 << (FIGS - 1)))
+
+static lua_Number I2d (Rand64 x) {
+  return (lua_Number)(trim64(x) >> shift64_FIG) * scaleFIG;
+}
+
+/* convert a 'Rand64' to a 'lua_Unsigned' */
+#define I2UInt(x)	((lua_Unsigned)trim64(x))
+
+/* convert a 'lua_Unsigned' to a 'Rand64' */
+#define Int2I(x)	((Rand64)(x))
+
+
+#else	/* no 'Rand64'   }{ */
+
+/* get an integer with at least 32 bits */
+#if LUAI_IS32INT
+typedef unsigned int lu_int32;
+#else
+typedef unsigned long lu_int32;
+#endif
+
+
+/*
+** Use two 32-bit integers to represent a 64-bit quantity.
+*/
+typedef struct Rand64 {
+  lu_int32 h;  /* higher half */
+  lu_int32 l;  /* lower half */
+} Rand64;
+
+
+/*
+** If 'lu_int32' has more than 32 bits, the extra bits do not interfere
+** with the 32 initial bits, except in a right shift and comparisons.
+** Moreover, the final result has to discard the extra bits.
+*/
+
+/* avoid using extra bits when needed */
+#define trim32(x)	((x) & 0xffffffffu)
+
+
+/*
+** basic operations on 'Rand64' values
+*/
+
+/* build a new Rand64 value */
+static Rand64 packI (lu_int32 h, lu_int32 l) {
+  Rand64 result;
+  result.h = h;
+  result.l = l;
+  return result;
+}
+
+/* return i << n */
+static Rand64 Ishl (Rand64 i, int n) {
+  lua_assert(n > 0 && n < 32);
+  return packI((i.h << n) | (trim32(i.l) >> (32 - n)), i.l << n);
+}
+
+/* i1 ^= i2 */
+static void Ixor (Rand64 *i1, Rand64 i2) {
+  i1->h ^= i2.h;
+  i1->l ^= i2.l;
+}
+
+/* return i1 + i2 */
+static Rand64 Iadd (Rand64 i1, Rand64 i2) {
+  Rand64 result = packI(i1.h + i2.h, i1.l + i2.l);
+  if (trim32(result.l) < trim32(i1.l))  /* carry? */
+    result.h++;
+  return result;
+}
+
+/* return i * 5 */
+static Rand64 times5 (Rand64 i) {
+  return Iadd(Ishl(i, 2), i);  /* i * 5 == (i << 2) + i */
+}
+
+/* return i * 9 */
+static Rand64 times9 (Rand64 i) {
+  return Iadd(Ishl(i, 3), i);  /* i * 9 == (i << 3) + i */
+}
+
+/* return 'i' rotated left 'n' bits */
+static Rand64 rotl (Rand64 i, int n) {
+  lua_assert(n > 0 && n < 32);
+  return packI((i.h << n) | (trim32(i.l) >> (32 - n)),
+               (trim32(i.h) >> (32 - n)) | (i.l << n));
+}
+
+/* for offsets larger than 32, rotate right by 64 - offset */
+static Rand64 rotl1 (Rand64 i, int n) {
+  lua_assert(n > 32 && n < 64);
+  n = 64 - n;
+  return packI((trim32(i.h) >> n) | (i.l << (32 - n)),
+               (i.h << (32 - n)) | (trim32(i.l) >> n));
+}
+
+/*
+** implementation of 'xoshiro256**' algorithm on 'Rand64' values
+*/
+static Rand64 nextrand (Rand64 *state) {
+  Rand64 res = times9(rotl(times5(state[1]), 7));
+  Rand64 t = Ishl(state[1], 17);
+  Ixor(&state[2], state[0]);
+  Ixor(&state[3], state[1]);
+  Ixor(&state[1], state[2]);
+  Ixor(&state[0], state[3]);
+  Ixor(&state[2], t);
+  state[3] = rotl1(state[3], 45);
+  return res;
+}
+
+
+/*
+** Converts a 'Rand64' into a float.
+*/
+
+/* an unsigned 1 with proper type */
+#define UONE		((lu_int32)1)
+
+
+#if FIGS <= 32
+
+/* 2^(-FIGS) */
+#define scaleFIG       (l_mathop(0.5) / (UONE << (FIGS - 1)))
+
+/*
+** get up to 32 bits from higher half, shifting right to
+** throw out the extra bits.
+*/
+static lua_Number I2d (Rand64 x) {
+  lua_Number h = (lua_Number)(trim32(x.h) >> (32 - FIGS));
+  return h * scaleFIG;
+}
+
+#else	/* 32 < FIGS <= 64 */
+
+/* must take care to not shift stuff by more than 31 slots */
+
+/* 2^(-FIGS) = 1.0 / 2^30 / 2^3 / 2^(FIGS-33) */
+#define scaleFIG  \
+    (l_mathop(1.0) / (UONE << 30) / l_mathop(8.0) / (UONE << (FIGS - 33)))
+
+/*
+** use FIGS - 32 bits from lower half, throwing out the other
+** (32 - (FIGS - 32)) = (64 - FIGS) bits
+*/
+#define shiftLOW	(64 - FIGS)
+
+/*
+** higher 32 bits go after those (FIGS - 32) bits: shiftHI = 2^(FIGS - 32)
+*/
+#define shiftHI		((lua_Number)(UONE << (FIGS - 33)) * l_mathop(2.0))
+
+
+static lua_Number I2d (Rand64 x) {
+  lua_Number h = (lua_Number)trim32(x.h) * shiftHI;
+  lua_Number l = (lua_Number)(trim32(x.l) >> shiftLOW);
+  return (h + l) * scaleFIG;
+}
+
+#endif
+
+
+/* convert a 'Rand64' to a 'lua_Unsigned' */
+static lua_Unsigned I2UInt (Rand64 x) {
+  return (((lua_Unsigned)trim32(x.h) << 31) << 1) | (lua_Unsigned)trim32(x.l);
+}
+
+/* convert a 'lua_Unsigned' to a 'Rand64' */
+static Rand64 Int2I (lua_Unsigned n) {
+  return packI((lu_int32)((n >> 31) >> 1), (lu_int32)n);
+}
+
+#endif  /* } */
+
+
+/*
+** A state uses four 'Rand64' values.
+*/
+typedef struct {
+  Rand64 s[4];
+} RanState;
+
+
+/*
+** Project the random integer 'ran' into the interval [0, n].
+** Because 'ran' has 2^B possible values, the projection can only be
+** uniform when the size of the interval is a power of 2 (exact
+** division). Otherwise, to get a uniform projection into [0, n], we
+** first compute 'lim', the smallest Mersenne number not smaller than
+** 'n'. We then project 'ran' into the interval [0, lim].  If the result
+** is inside [0, n], we are done. Otherwise, we try with another 'ran',
+** until we have a result inside the interval.
+*/
+static lua_Unsigned project (lua_Unsigned ran, lua_Unsigned n,
+                             RanState *state) {
+  if ((n & (n + 1)) == 0)  /* is 'n + 1' a power of 2? */
+    return ran & n;  /* no bias */
+  else {
+    lua_Unsigned lim = n;
+    /* compute the smallest (2^b - 1) not smaller than 'n' */
+    lim |= (lim >> 1);
+    lim |= (lim >> 2);
+    lim |= (lim >> 4);
+    lim |= (lim >> 8);
+    lim |= (lim >> 16);
+#if (LUA_MAXUNSIGNED >> 31) >= 3
+    lim |= (lim >> 32);  /* integer type has more than 32 bits */
+#endif
+    lua_assert((lim & (lim + 1)) == 0  /* 'lim + 1' is a power of 2, */
+      && lim >= n  /* not smaller than 'n', */
+      && (lim >> 1) < n);  /* and it is the smallest one */
+    while ((ran &= lim) > n)  /* project 'ran' into [0..lim] */
+      ran = I2UInt(nextrand(state->s));  /* not inside [0..n]? try again */
+    return ran;
+  }
+}
+
+
+static int math_random (lua_State *L) {
+  lua_Integer low, up;
+  lua_Unsigned p;
+  RanState *state = (RanState *)lua_touserdata(L, lua_upvalueindex(1));
+  Rand64 rv = nextrand(state->s);  /* next pseudo-random value */
+  switch (lua_gettop(L)) {  /* check number of arguments */
+    case 0: {  /* no arguments */
+      lua_pushnumber(L, I2d(rv));  /* float between 0 and 1 */
+      return 1;
+    }
+    case 1: {  /* only upper limit */
+      low = 1;
+      up = luaL_checkinteger(L, 1);
+      if (up == 0) {  /* single 0 as argument? */
+        lua_pushinteger(L, I2UInt(rv));  /* full random integer */
+        return 1;
+      }
+      break;
+    }
+    case 2: {  /* lower and upper limits */
+      low = luaL_checkinteger(L, 1);
+      up = luaL_checkinteger(L, 2);
+      break;
+    }
+    default: return luaL_error(L, "wrong number of arguments");
+  }
+  /* random integer in the interval [low, up] */
+  luaL_argcheck(L, low <= up, 1, "interval is empty");
+  /* project random integer into the interval [0, up - low] */
+  p = project(I2UInt(rv), (lua_Unsigned)up - (lua_Unsigned)low, state);
+  lua_pushinteger(L, p + (lua_Unsigned)low);
+  return 1;
+}
+
+
+static void setseed (lua_State *L, Rand64 *state,
+                     lua_Unsigned n1, lua_Unsigned n2) {
+  int i;
+  state[0] = Int2I(n1);
+  state[1] = Int2I(0xff);  /* avoid a zero state */
+  state[2] = Int2I(n2);
+  state[3] = Int2I(0);
+  for (i = 0; i < 16; i++)
+    nextrand(state);  /* discard initial values to "spread" seed */
+  lua_pushinteger(L, n1);
+  lua_pushinteger(L, n2);
+}
+
+
+/*
+** Set a "random" seed. To get some randomness, use the current time
+** and the address of 'L' (in case the machine does address space layout
+** randomization).
+*/
+static void randseed (lua_State *L, RanState *state) {
+  lua_Unsigned seed1 = (lua_Unsigned)time(NULL);
+  lua_Unsigned seed2 = (lua_Unsigned)(size_t)L;
+  setseed(L, state->s, seed1, seed2);
+}
+
+
+static int math_randomseed (lua_State *L) {
+  RanState *state = (RanState *)lua_touserdata(L, lua_upvalueindex(1));
+  if (lua_isnone(L, 1)) {
+    randseed(L, state);
+  }
+  else {
+    lua_Integer n1 = luaL_checkinteger(L, 1);
+    lua_Integer n2 = luaL_optinteger(L, 2, 0);
+    setseed(L, state->s, n1, n2);
+  }
+  return 2;  /* return seeds */
+}
+
+
+static const luaL_Reg randfuncs[] = {
+  {"random", math_random},
+  {"randomseed", math_randomseed},
+  {NULL, NULL}
+};
+
+
+/*
+** Register the random functions and initialize their state.
+*/
+static void setrandfunc (lua_State *L) {
+  RanState *state = (RanState *)lua_newuserdatauv(L, sizeof(RanState), 0);
+  randseed(L, state);  /* initialize with a "random" seed */
+  lua_pop(L, 2);  /* remove pushed seeds */
+  luaL_setfuncs(L, randfuncs, 1);
+}
+
+/* }================================================================== */
+
+
+/*
+** {==================================================================
+** Deprecated functions (for compatibility only)
+** ===================================================================
+*/
+#if defined(LUA_COMPAT_MATHLIB)
+
+static int math_cosh (lua_State *L) {
+  lua_pushnumber(L, l_mathop(cosh)(luaL_checknumber(L, 1)));
+  return 1;
+}
+
+static int math_sinh (lua_State *L) {
+  lua_pushnumber(L, l_mathop(sinh)(luaL_checknumber(L, 1)));
+  return 1;
+}
+
+static int math_tanh (lua_State *L) {
+  lua_pushnumber(L, l_mathop(tanh)(luaL_checknumber(L, 1)));
+  return 1;
+}
+
+static int math_pow (lua_State *L) {
+  lua_Number x = luaL_checknumber(L, 1);
+  lua_Number y = luaL_checknumber(L, 2);
+  lua_pushnumber(L, l_mathop(pow)(x, y));
+  return 1;
+}
+
+static int math_frexp (lua_State *L) {
+  int e;
+  lua_pushnumber(L, l_mathop(frexp)(luaL_checknumber(L, 1), &e));
+  lua_pushinteger(L, e);
+  return 2;
+}
+
+static int math_ldexp (lua_State *L) {
+  lua_Number x = luaL_checknumber(L, 1);
+  int ep = (int)luaL_checkinteger(L, 2);
+  lua_pushnumber(L, l_mathop(ldexp)(x, ep));
+  return 1;
+}
+
+static int math_log10 (lua_State *L) {
+  lua_pushnumber(L, l_mathop(log10)(luaL_checknumber(L, 1)));
+  return 1;
+}
+
+#endif
+/* }================================================================== */
+
+
+
+static const luaL_Reg mathlib[] = {
+  {"abs",   math_abs},
+  {"acos",  math_acos},
+  {"asin",  math_asin},
+  {"atan",  math_atan},
+  {"ceil",  math_ceil},
+  {"cos",   math_cos},
+  {"deg",   math_deg},
+  {"exp",   math_exp},
+  {"tointeger", math_toint},
+  {"floor", math_floor},
+  {"fmod",   math_fmod},
+  {"ult",   math_ult},
+  {"log",   math_log},
+  {"max",   math_max},
+  {"min",   math_min},
+  {"modf",   math_modf},
+  {"rad",   math_rad},
+  {"sin",   math_sin},
+  {"sqrt",  math_sqrt},
+  {"tan",   math_tan},
+  {"type", math_type},
+#if defined(LUA_COMPAT_MATHLIB)
+  {"atan2", math_atan},
+  {"cosh",   math_cosh},
+  {"sinh",   math_sinh},
+  {"tanh",   math_tanh},
+  {"pow",   math_pow},
+  {"frexp", math_frexp},
+  {"ldexp", math_ldexp},
+  {"log10", math_log10},
+#endif
+  /* placeholders */
+  {"random", NULL},
+  {"randomseed", NULL},
+  {"pi", NULL},
+  {"huge", NULL},
+  {"maxinteger", NULL},
+  {"mininteger", NULL},
+  {NULL, NULL}
+};
+
+
+/*
+** Open math library
+*/
+LUAMOD_API int luaopen_math (lua_State *L) {
+  luaL_newlib(L, mathlib);
+  lua_pushnumber(L, PI);
+  lua_setfield(L, -2, "pi");
+  lua_pushnumber(L, (lua_Number)HUGE_VAL);
+  lua_setfield(L, -2, "huge");
+  lua_pushinteger(L, LUA_MAXINTEGER);
+  lua_setfield(L, -2, "maxinteger");
+  lua_pushinteger(L, LUA_MININTEGER);
+  lua_setfield(L, -2, "mininteger");
+  setrandfunc(L);
+  return 1;
+}
+
diff --git a/src/libs/3rdparty/lua/src/lmem.c b/src/libs/3rdparty/lua/src/lmem.c
new file mode 100644
index 0000000000..9800a86fc0
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lmem.c
@@ -0,0 +1,215 @@
+/*
+** $Id: lmem.c $
+** Interface to Memory Manager
+** See Copyright Notice in lua.h
+*/
+
+#define lmem_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include <stddef.h>
+
+#include "lua.h"
+
+#include "ldebug.h"
+#include "ldo.h"
+#include "lgc.h"
+#include "lmem.h"
+#include "lobject.h"
+#include "lstate.h"
+
+
+
+/*
+** About the realloc function:
+** void *frealloc (void *ud, void *ptr, size_t osize, size_t nsize);
+** ('osize' is the old size, 'nsize' is the new size)
+**
+** - frealloc(ud, p, x, 0) frees the block 'p' and returns NULL.
+** Particularly, frealloc(ud, NULL, 0, 0) does nothing,
+** which is equivalent to free(NULL) in ISO C.
+**
+** - frealloc(ud, NULL, x, s) creates a new block of size 's'
+** (no matter 'x'). Returns NULL if it cannot create the new block.
+**
+** - otherwise, frealloc(ud, b, x, y) reallocates the block 'b' from
+** size 'x' to size 'y'. Returns NULL if it cannot reallocate the
+** block to the new size.
+*/
+
+
+/*
+** Macro to call the allocation function.
+*/
+#define callfrealloc(g,block,os,ns)    ((*g->frealloc)(g->ud, block, os, ns))
+
+
+/*
+** When an allocation fails, it will try again after an emergency
+** collection, except when it cannot run a collection.  The GC should
+** not be called while the state is not fully built, as the collector
+** is not yet fully initialized. Also, it should not be called when
+** 'gcstopem' is true, because then the interpreter is in the middle of
+** a collection step.
+*/
+#define cantryagain(g)	(completestate(g) && !g->gcstopem)
+
+
+
+
+#if defined(EMERGENCYGCTESTS)
+/*
+** First allocation will fail except when freeing a block (frees never
+** fail) and when it cannot try again; this fail will trigger 'tryagain'
+** and a full GC cycle at every allocation.
+*/
+static void *firsttry (global_State *g, void *block, size_t os, size_t ns) {
+  if (ns > 0 && cantryagain(g))
+    return NULL;  /* fail */
+  else  /* normal allocation */
+    return callfrealloc(g, block, os, ns);
+}
+#else
+#define firsttry(g,block,os,ns)    callfrealloc(g, block, os, ns)
+#endif
+
+
+
+
+
+/*
+** {==================================================================
+** Functions to allocate/deallocate arrays for the Parser
+** ===================================================================
+*/
+
+/*
+** Minimum size for arrays during parsing, to avoid overhead of
+** reallocating to size 1, then 2, and then 4. All these arrays
+** will be reallocated to exact sizes or erased when parsing ends.
+*/
+#define MINSIZEARRAY	4
+
+
+void *luaM_growaux_ (lua_State *L, void *block, int nelems, int *psize,
+                     int size_elems, int limit, const char *what) {
+  void *newblock;
+  int size = *psize;
+  if (nelems + 1 <= size)  /* does one extra element still fit? */
+    return block;  /* nothing to be done */
+  if (size >= limit / 2) {  /* cannot double it? */
+    if (l_unlikely(size >= limit))  /* cannot grow even a little? */
+      luaG_runerror(L, "too many %s (limit is %d)", what, limit);
+    size = limit;  /* still have at least one free place */
+  }
+  else {
+    size *= 2;
+    if (size < MINSIZEARRAY)
+      size = MINSIZEARRAY;  /* minimum size */
+  }
+  lua_assert(nelems + 1 <= size && size <= limit);
+  /* 'limit' ensures that multiplication will not overflow */
+  newblock = luaM_saferealloc_(L, block, cast_sizet(*psize) * size_elems,
+                                         cast_sizet(size) * size_elems);
+  *psize = size;  /* update only when everything else is OK */
+  return newblock;
+}
+
+
+/*
+** In prototypes, the size of the array is also its number of
+** elements (to save memory). So, if it cannot shrink an array
+** to its number of elements, the only option is to raise an
+** error.
+*/
+void *luaM_shrinkvector_ (lua_State *L, void *block, int *size,
+                          int final_n, int size_elem) {
+  void *newblock;
+  size_t oldsize = cast_sizet((*size) * size_elem);
+  size_t newsize = cast_sizet(final_n * size_elem);
+  lua_assert(newsize <= oldsize);
+  newblock = luaM_saferealloc_(L, block, oldsize, newsize);
+  *size = final_n;
+  return newblock;
+}
+
+/* }================================================================== */
+
+
+l_noret luaM_toobig (lua_State *L) {
+  luaG_runerror(L, "memory allocation error: block too big");
+}
+
+
+/*
+** Free memory
+*/
+void luaM_free_ (lua_State *L, void *block, size_t osize) {
+  global_State *g = G(L);
+  lua_assert((osize == 0) == (block == NULL));
+  callfrealloc(g, block, osize, 0);
+  g->GCdebt -= osize;
+}
+
+
+/*
+** In case of allocation fail, this function will do an emergency
+** collection to free some memory and then try the allocation again.
+*/
+static void *tryagain (lua_State *L, void *block,
+                       size_t osize, size_t nsize) {
+  global_State *g = G(L);
+  if (cantryagain(g)) {
+    luaC_fullgc(L, 1);  /* try to free some memory... */
+    return callfrealloc(g, block, osize, nsize);  /* try again */
+  }
+  else return NULL;  /* cannot run an emergency collection */
+}
+
+
+/*
+** Generic allocation routine.
+*/
+void *luaM_realloc_ (lua_State *L, void *block, size_t osize, size_t nsize) {
+  void *newblock;
+  global_State *g = G(L);
+  lua_assert((osize == 0) == (block == NULL));
+  newblock = firsttry(g, block, osize, nsize);
+  if (l_unlikely(newblock == NULL && nsize > 0)) {
+    newblock = tryagain(L, block, osize, nsize);
+    if (newblock == NULL)  /* still no memory? */
+      return NULL;  /* do not update 'GCdebt' */
+  }
+  lua_assert((nsize == 0) == (newblock == NULL));
+  g->GCdebt = (g->GCdebt + nsize) - osize;
+  return newblock;
+}
+
+
+void *luaM_saferealloc_ (lua_State *L, void *block, size_t osize,
+                                                    size_t nsize) {
+  void *newblock = luaM_realloc_(L, block, osize, nsize);
+  if (l_unlikely(newblock == NULL && nsize > 0))  /* allocation failed? */
+    luaM_error(L);
+  return newblock;
+}
+
+
+void *luaM_malloc_ (lua_State *L, size_t size, int tag) {
+  if (size == 0)
+    return NULL;  /* that's all */
+  else {
+    global_State *g = G(L);
+    void *newblock = firsttry(g, NULL, tag, size);
+    if (l_unlikely(newblock == NULL)) {
+      newblock = tryagain(L, NULL, tag, size);
+      if (newblock == NULL)
+        luaM_error(L);
+    }
+    g->GCdebt += size;
+    return newblock;
+  }
+}
diff --git a/src/libs/3rdparty/lua/src/lmem.h b/src/libs/3rdparty/lua/src/lmem.h
new file mode 100644
index 0000000000..8c75a44beb
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lmem.h
@@ -0,0 +1,93 @@
+/*
+** $Id: lmem.h $
+** Interface to Memory Manager
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lmem_h
+#define lmem_h
+
+
+#include <stddef.h>
+
+#include "llimits.h"
+#include "lua.h"
+
+
+#define luaM_error(L)	luaD_throw(L, LUA_ERRMEM)
+
+
+/*
+** This macro tests whether it is safe to multiply 'n' by the size of
+** type 't' without overflows. Because 'e' is always constant, it avoids
+** the runtime division MAX_SIZET/(e).
+** (The macro is somewhat complex to avoid warnings:  The 'sizeof'
+** comparison avoids a runtime comparison when overflow cannot occur.
+** The compiler should be able to optimize the real test by itself, but
+** when it does it, it may give a warning about "comparison is always
+** false due to limited range of data type"; the +1 tricks the compiler,
+** avoiding this warning but also this optimization.)
+*/
+#define luaM_testsize(n,e)  \
+	(sizeof(n) >= sizeof(size_t) && cast_sizet((n)) + 1 > MAX_SIZET/(e))
+
+#define luaM_checksize(L,n,e)  \
+	(luaM_testsize(n,e) ? luaM_toobig(L) : cast_void(0))
+
+
+/*
+** Computes the minimum between 'n' and 'MAX_SIZET/sizeof(t)', so that
+** the result is not larger than 'n' and cannot overflow a 'size_t'
+** when multiplied by the size of type 't'. (Assumes that 'n' is an
+** 'int' or 'unsigned int' and that 'int' is not larger than 'size_t'.)
+*/
+#define luaM_limitN(n,t)  \
+  ((cast_sizet(n) <= MAX_SIZET/sizeof(t)) ? (n) :  \
+     cast_uint((MAX_SIZET/sizeof(t))))
+
+
+/*
+** Arrays of chars do not need any test
+*/
+#define luaM_reallocvchar(L,b,on,n)  \
+  cast_charp(luaM_saferealloc_(L, (b), (on)*sizeof(char), (n)*sizeof(char)))
+
+#define luaM_freemem(L, b, s)	luaM_free_(L, (b), (s))
+#define luaM_free(L, b)		luaM_free_(L, (b), sizeof(*(b)))
+#define luaM_freearray(L, b, n)   luaM_free_(L, (b), (n)*sizeof(*(b)))
+
+#define luaM_new(L,t)		cast(t*, luaM_malloc_(L, sizeof(t), 0))
+#define luaM_newvector(L,n,t)	cast(t*, luaM_malloc_(L, (n)*sizeof(t), 0))
+#define luaM_newvectorchecked(L,n,t) \
+  (luaM_checksize(L,n,sizeof(t)), luaM_newvector(L,n,t))
+
+#define luaM_newobject(L,tag,s)	luaM_malloc_(L, (s), tag)
+
+#define luaM_growvector(L,v,nelems,size,t,limit,e) \
+	((v)=cast(t *, luaM_growaux_(L,v,nelems,&(size),sizeof(t), \
+                         luaM_limitN(limit,t),e)))
+
+#define luaM_reallocvector(L, v,oldn,n,t) \
+   (cast(t *, luaM_realloc_(L, v, cast_sizet(oldn) * sizeof(t), \
+                                  cast_sizet(n) * sizeof(t))))
+
+#define luaM_shrinkvector(L,v,size,fs,t) \
+   ((v)=cast(t *, luaM_shrinkvector_(L, v, &(size), fs, sizeof(t))))
+
+LUAI_FUNC l_noret luaM_toobig (lua_State *L);
+
+/* not to be called directly */
+LUAI_FUNC void *luaM_realloc_ (lua_State *L, void *block, size_t oldsize,
+                                                          size_t size);
+LUAI_FUNC void *luaM_saferealloc_ (lua_State *L, void *block, size_t oldsize,
+                                                              size_t size);
+LUAI_FUNC void luaM_free_ (lua_State *L, void *block, size_t osize);
+LUAI_FUNC void *luaM_growaux_ (lua_State *L, void *block, int nelems,
+                               int *size, int size_elem, int limit,
+                               const char *what);
+LUAI_FUNC void *luaM_shrinkvector_ (lua_State *L, void *block, int *nelem,
+                                    int final_n, int size_elem);
+LUAI_FUNC void *luaM_malloc_ (lua_State *L, size_t size, int tag);
+
+#endif
+
diff --git a/src/libs/3rdparty/lua/src/loadlib.c b/src/libs/3rdparty/lua/src/loadlib.c
new file mode 100644
index 0000000000..d792dffaa0
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/loadlib.c
@@ -0,0 +1,767 @@
+/*
+** $Id: loadlib.c $
+** Dynamic library loader for Lua
+** See Copyright Notice in lua.h
+**
+** This module contains an implementation of loadlib for Unix systems
+** that have dlfcn, an implementation for Windows, and a stub for other
+** systems.
+*/
+
+#define loadlib_c
+#define LUA_LIB
+
+#include "lprefix.h"
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "lua.h"
+
+#include "lauxlib.h"
+#include "lualib.h"
+
+
+/*
+** LUA_IGMARK is a mark to ignore all before it when building the
+** luaopen_ function name.
+*/
+#if !defined (LUA_IGMARK)
+#define LUA_IGMARK		"-"
+#endif
+
+
+/*
+** LUA_CSUBSEP is the character that replaces dots in submodule names
+** when searching for a C loader.
+** LUA_LSUBSEP is the character that replaces dots in submodule names
+** when searching for a Lua loader.
+*/
+#if !defined(LUA_CSUBSEP)
+#define LUA_CSUBSEP		LUA_DIRSEP
+#endif
+
+#if !defined(LUA_LSUBSEP)
+#define LUA_LSUBSEP		LUA_DIRSEP
+#endif
+
+
+/* prefix for open functions in C libraries */
+#define LUA_POF		"luaopen_"
+
+/* separator for open functions in C libraries */
+#define LUA_OFSEP	"_"
+
+
+/*
+** key for table in the registry that keeps handles
+** for all loaded C libraries
+*/
+static const char *const CLIBS = "_CLIBS";
+
+#define LIB_FAIL	"open"
+
+
+#define setprogdir(L)           ((void)0)
+
+
+/*
+** Special type equivalent to '(void*)' for functions in gcc
+** (to suppress warnings when converting function pointers)
+*/
+typedef void (*voidf)(void);
+
+
+/*
+** system-dependent functions
+*/
+
+/*
+** unload library 'lib'
+*/
+static void lsys_unloadlib (void *lib);
+
+/*
+** load C library in file 'path'. If 'seeglb', load with all names in
+** the library global.
+** Returns the library; in case of error, returns NULL plus an
+** error string in the stack.
+*/
+static void *lsys_load (lua_State *L, const char *path, int seeglb);
+
+/*
+** Try to find a function named 'sym' in library 'lib'.
+** Returns the function; in case of error, returns NULL plus an
+** error string in the stack.
+*/
+static lua_CFunction lsys_sym (lua_State *L, void *lib, const char *sym);
+
+
+
+
+#if defined(LUA_USE_DLOPEN)	/* { */
+/*
+** {========================================================================
+** This is an implementation of loadlib based on the dlfcn interface.
+** The dlfcn interface is available in Linux, SunOS, Solaris, IRIX, FreeBSD,
+** NetBSD, AIX 4.2, HPUX 11, and  probably most other Unix flavors, at least
+** as an emulation layer on top of native functions.
+** =========================================================================
+*/
+
+#include <dlfcn.h>
+
+/*
+** Macro to convert pointer-to-void* to pointer-to-function. This cast
+** is undefined according to ISO C, but POSIX assumes that it works.
+** (The '__extension__' in gnu compilers is only to avoid warnings.)
+*/
+#if defined(__GNUC__)
+#define cast_func(p) (__extension__ (lua_CFunction)(p))
+#else
+#define cast_func(p) ((lua_CFunction)(p))
+#endif
+
+
+static void lsys_unloadlib (void *lib) {
+  dlclose(lib);
+}
+
+
+static void *lsys_load (lua_State *L, const char *path, int seeglb) {
+  void *lib = dlopen(path, RTLD_NOW | (seeglb ? RTLD_GLOBAL : RTLD_LOCAL));
+  if (l_unlikely(lib == NULL))
+    lua_pushstring(L, dlerror());
+  return lib;
+}
+
+
+static lua_CFunction lsys_sym (lua_State *L, void *lib, const char *sym) {
+  lua_CFunction f = cast_func(dlsym(lib, sym));
+  if (l_unlikely(f == NULL))
+    lua_pushstring(L, dlerror());
+  return f;
+}
+
+/* }====================================================== */
+
+
+
+#elif defined(LUA_DL_DLL)	/* }{ */
+/*
+** {======================================================================
+** This is an implementation of loadlib for Windows using native functions.
+** =======================================================================
+*/
+
+#include <windows.h>
+
+
+/*
+** optional flags for LoadLibraryEx
+*/
+#if !defined(LUA_LLE_FLAGS)
+#define LUA_LLE_FLAGS	0
+#endif
+
+
+#undef setprogdir
+
+
+/*
+** Replace in the path (on the top of the stack) any occurrence
+** of LUA_EXEC_DIR with the executable's path.
+*/
+static void setprogdir (lua_State *L) {
+  char buff[MAX_PATH + 1];
+  char *lb;
+  DWORD nsize = sizeof(buff)/sizeof(char);
+  DWORD n = GetModuleFileNameA(NULL, buff, nsize);  /* get exec. name */
+  if (n == 0 || n == nsize || (lb = strrchr(buff, '\\')) == NULL)
+    luaL_error(L, "unable to get ModuleFileName");
+  else {
+    *lb = '\0';  /* cut name on the last '\\' to get the path */
+    luaL_gsub(L, lua_tostring(L, -1), LUA_EXEC_DIR, buff);
+    lua_remove(L, -2);  /* remove original string */
+  }
+}
+
+
+
+
+static void pusherror (lua_State *L) {
+  int error = GetLastError();
+  char buffer[128];
+  if (FormatMessageA(FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_FROM_SYSTEM,
+      NULL, error, 0, buffer, sizeof(buffer)/sizeof(char), NULL))
+    lua_pushstring(L, buffer);
+  else
+    lua_pushfstring(L, "system error %d\n", error);
+}
+
+static void lsys_unloadlib (void *lib) {
+  FreeLibrary((HMODULE)lib);
+}
+
+
+static void *lsys_load (lua_State *L, const char *path, int seeglb) {
+  HMODULE lib = LoadLibraryExA(path, NULL, LUA_LLE_FLAGS);
+  (void)(seeglb);  /* not used: symbols are 'global' by default */
+  if (lib == NULL) pusherror(L);
+  return lib;
+}
+
+
+static lua_CFunction lsys_sym (lua_State *L, void *lib, const char *sym) {
+  lua_CFunction f = (lua_CFunction)(voidf)GetProcAddress((HMODULE)lib, sym);
+  if (f == NULL) pusherror(L);
+  return f;
+}
+
+/* }====================================================== */
+
+
+#else				/* }{ */
+/*
+** {======================================================
+** Fallback for other systems
+** =======================================================
+*/
+
+#undef LIB_FAIL
+#define LIB_FAIL	"absent"
+
+
+#define DLMSG	"dynamic libraries not enabled; check your Lua installation"
+
+
+static void lsys_unloadlib (void *lib) {
+  (void)(lib);  /* not used */
+}
+
+
+static void *lsys_load (lua_State *L, const char *path, int seeglb) {
+  (void)(path); (void)(seeglb);  /* not used */
+  lua_pushliteral(L, DLMSG);
+  return NULL;
+}
+
+
+static lua_CFunction lsys_sym (lua_State *L, void *lib, const char *sym) {
+  (void)(lib); (void)(sym);  /* not used */
+  lua_pushliteral(L, DLMSG);
+  return NULL;
+}
+
+/* }====================================================== */
+#endif				/* } */
+
+
+/*
+** {==================================================================
+** Set Paths
+** ===================================================================
+*/
+
+/*
+** LUA_PATH_VAR and LUA_CPATH_VAR are the names of the environment
+** variables that Lua check to set its paths.
+*/
+#if !defined(LUA_PATH_VAR)
+#define LUA_PATH_VAR    "LUA_PATH"
+#endif
+
+#if !defined(LUA_CPATH_VAR)
+#define LUA_CPATH_VAR   "LUA_CPATH"
+#endif
+
+
+
+/*
+** return registry.LUA_NOENV as a boolean
+*/
+static int noenv (lua_State *L) {
+  int b;
+  lua_getfield(L, LUA_REGISTRYINDEX, "LUA_NOENV");
+  b = lua_toboolean(L, -1);
+  lua_pop(L, 1);  /* remove value */
+  return b;
+}
+
+
+/*
+** Set a path
+*/
+static void setpath (lua_State *L, const char *fieldname,
+                                   const char *envname,
+                                   const char *dft) {
+  const char *dftmark;
+  const char *nver = lua_pushfstring(L, "%s%s", envname, LUA_VERSUFFIX);
+  const char *path = getenv(nver);  /* try versioned name */
+  if (path == NULL)  /* no versioned environment variable? */
+    path = getenv(envname);  /* try unversioned name */
+  if (path == NULL || noenv(L))  /* no environment variable? */
+    lua_pushstring(L, dft);  /* use default */
+  else if ((dftmark = strstr(path, LUA_PATH_SEP LUA_PATH_SEP)) == NULL)
+    lua_pushstring(L, path);  /* nothing to change */
+  else {  /* path contains a ";;": insert default path in its place */
+    size_t len = strlen(path);
+    luaL_Buffer b;
+    luaL_buffinit(L, &b);
+    if (path < dftmark) {  /* is there a prefix before ';;'? */
+      luaL_addlstring(&b, path, dftmark - path);  /* add it */
+      luaL_addchar(&b, *LUA_PATH_SEP);
+    }
+    luaL_addstring(&b, dft);  /* add default */
+    if (dftmark < path + len - 2) {  /* is there a suffix after ';;'? */
+      luaL_addchar(&b, *LUA_PATH_SEP);
+      luaL_addlstring(&b, dftmark + 2, (path + len - 2) - dftmark);
+    }
+    luaL_pushresult(&b);
+  }
+  setprogdir(L);
+  lua_setfield(L, -3, fieldname);  /* package[fieldname] = path value */
+  lua_pop(L, 1);  /* pop versioned variable name ('nver') */
+}
+
+/* }================================================================== */
+
+
+/*
+** return registry.CLIBS[path]
+*/
+static void *checkclib (lua_State *L, const char *path) {
+  void *plib;
+  lua_getfield(L, LUA_REGISTRYINDEX, CLIBS);
+  lua_getfield(L, -1, path);
+  plib = lua_touserdata(L, -1);  /* plib = CLIBS[path] */
+  lua_pop(L, 2);  /* pop CLIBS table and 'plib' */
+  return plib;
+}
+
+
+/*
+** registry.CLIBS[path] = plib        -- for queries
+** registry.CLIBS[#CLIBS + 1] = plib  -- also keep a list of all libraries
+*/
+static void addtoclib (lua_State *L, const char *path, void *plib) {
+  lua_getfield(L, LUA_REGISTRYINDEX, CLIBS);
+  lua_pushlightuserdata(L, plib);
+  lua_pushvalue(L, -1);
+  lua_setfield(L, -3, path);  /* CLIBS[path] = plib */
+  lua_rawseti(L, -2, luaL_len(L, -2) + 1);  /* CLIBS[#CLIBS + 1] = plib */
+  lua_pop(L, 1);  /* pop CLIBS table */
+}
+
+
+/*
+** __gc tag method for CLIBS table: calls 'lsys_unloadlib' for all lib
+** handles in list CLIBS
+*/
+static int gctm (lua_State *L) {
+  lua_Integer n = luaL_len(L, 1);
+  for (; n >= 1; n--) {  /* for each handle, in reverse order */
+    lua_rawgeti(L, 1, n);  /* get handle CLIBS[n] */
+    lsys_unloadlib(lua_touserdata(L, -1));
+    lua_pop(L, 1);  /* pop handle */
+  }
+  return 0;
+}
+
+
+
+/* error codes for 'lookforfunc' */
+#define ERRLIB		1
+#define ERRFUNC		2
+
+/*
+** Look for a C function named 'sym' in a dynamically loaded library
+** 'path'.
+** First, check whether the library is already loaded; if not, try
+** to load it.
+** Then, if 'sym' is '*', return true (as library has been loaded).
+** Otherwise, look for symbol 'sym' in the library and push a
+** C function with that symbol.
+** Return 0 and 'true' or a function in the stack; in case of
+** errors, return an error code and an error message in the stack.
+*/
+static int lookforfunc (lua_State *L, const char *path, const char *sym) {
+  void *reg = checkclib(L, path);  /* check loaded C libraries */
+  if (reg == NULL) {  /* must load library? */
+    reg = lsys_load(L, path, *sym == '*');  /* global symbols if 'sym'=='*' */
+    if (reg == NULL) return ERRLIB;  /* unable to load library */
+    addtoclib(L, path, reg);
+  }
+  if (*sym == '*') {  /* loading only library (no function)? */
+    lua_pushboolean(L, 1);  /* return 'true' */
+    return 0;  /* no errors */
+  }
+  else {
+    lua_CFunction f = lsys_sym(L, reg, sym);
+    if (f == NULL)
+      return ERRFUNC;  /* unable to find function */
+    lua_pushcfunction(L, f);  /* else create new function */
+    return 0;  /* no errors */
+  }
+}
+
+
+static int ll_loadlib (lua_State *L) {
+  const char *path = luaL_checkstring(L, 1);
+  const char *init = luaL_checkstring(L, 2);
+  int stat = lookforfunc(L, path, init);
+  if (l_likely(stat == 0))  /* no errors? */
+    return 1;  /* return the loaded function */
+  else {  /* error; error message is on stack top */
+    luaL_pushfail(L);
+    lua_insert(L, -2);
+    lua_pushstring(L, (stat == ERRLIB) ?  LIB_FAIL : "init");
+    return 3;  /* return fail, error message, and where */
+  }
+}
+
+
+
+/*
+** {======================================================
+** 'require' function
+** =======================================================
+*/
+
+
+static int readable (const char *filename) {
+  FILE *f = fopen(filename, "r");  /* try to open file */
+  if (f == NULL) return 0;  /* open failed */
+  fclose(f);
+  return 1;
+}
+
+
+/*
+** Get the next name in '*path' = 'name1;name2;name3;...', changing
+** the ending ';' to '\0' to create a zero-terminated string. Return
+** NULL when list ends.
+*/
+static const char *getnextfilename (char **path, char *end) {
+  char *sep;
+  char *name = *path;
+  if (name == end)
+    return NULL;  /* no more names */
+  else if (*name == '\0') {  /* from previous iteration? */
+    *name = *LUA_PATH_SEP;  /* restore separator */
+    name++;  /* skip it */
+  }
+  sep = strchr(name, *LUA_PATH_SEP);  /* find next separator */
+  if (sep == NULL)  /* separator not found? */
+    sep = end;  /* name goes until the end */
+  *sep = '\0';  /* finish file name */
+  *path = sep;  /* will start next search from here */
+  return name;
+}
+
+
+/*
+** Given a path such as ";blabla.so;blublu.so", pushes the string
+**
+** no file 'blabla.so'
+**	no file 'blublu.so'
+*/
+static void pusherrornotfound (lua_State *L, const char *path) {
+  luaL_Buffer b;
+  luaL_buffinit(L, &b);
+  luaL_addstring(&b, "no file '");
+  luaL_addgsub(&b, path, LUA_PATH_SEP, "'\n\tno file '");
+  luaL_addstring(&b, "'");
+  luaL_pushresult(&b);
+}
+
+
+static const char *searchpath (lua_State *L, const char *name,
+                                             const char *path,
+                                             const char *sep,
+                                             const char *dirsep) {
+  luaL_Buffer buff;
+  char *pathname;  /* path with name inserted */
+  char *endpathname;  /* its end */
+  const char *filename;
+  /* separator is non-empty and appears in 'name'? */
+  if (*sep != '\0' && strchr(name, *sep) != NULL)
+    name = luaL_gsub(L, name, sep, dirsep);  /* replace it by 'dirsep' */
+  luaL_buffinit(L, &buff);
+  /* add path to the buffer, replacing marks ('?') with the file name */
+  luaL_addgsub(&buff, path, LUA_PATH_MARK, name);
+  luaL_addchar(&buff, '\0');
+  pathname = luaL_buffaddr(&buff);  /* writable list of file names */
+  endpathname = pathname + luaL_bufflen(&buff) - 1;
+  while ((filename = getnextfilename(&pathname, endpathname)) != NULL) {
+    if (readable(filename))  /* does file exist and is readable? */
+      return lua_pushstring(L, filename);  /* save and return name */
+  }
+  luaL_pushresult(&buff);  /* push path to create error message */
+  pusherrornotfound(L, lua_tostring(L, -1));  /* create error message */
+  return NULL;  /* not found */
+}
+
+
+static int ll_searchpath (lua_State *L) {
+  const char *f = searchpath(L, luaL_checkstring(L, 1),
+                                luaL_checkstring(L, 2),
+                                luaL_optstring(L, 3, "."),
+                                luaL_optstring(L, 4, LUA_DIRSEP));
+  if (f != NULL) return 1;
+  else {  /* error message is on top of the stack */
+    luaL_pushfail(L);
+    lua_insert(L, -2);
+    return 2;  /* return fail + error message */
+  }
+}
+
+
+static const char *findfile (lua_State *L, const char *name,
+                                           const char *pname,
+                                           const char *dirsep) {
+  const char *path;
+  lua_getfield(L, lua_upvalueindex(1), pname);
+  path = lua_tostring(L, -1);
+  if (l_unlikely(path == NULL))
+    luaL_error(L, "'package.%s' must be a string", pname);
+  return searchpath(L, name, path, ".", dirsep);
+}
+
+
+static int checkload (lua_State *L, int stat, const char *filename) {
+  if (l_likely(stat)) {  /* module loaded successfully? */
+    lua_pushstring(L, filename);  /* will be 2nd argument to module */
+    return 2;  /* return open function and file name */
+  }
+  else
+    return luaL_error(L, "error loading module '%s' from file '%s':\n\t%s",
+                          lua_tostring(L, 1), filename, lua_tostring(L, -1));
+}
+
+
+static int searcher_Lua (lua_State *L) {
+  const char *filename;
+  const char *name = luaL_checkstring(L, 1);
+  filename = findfile(L, name, "path", LUA_LSUBSEP);
+  if (filename == NULL) return 1;  /* module not found in this path */
+  return checkload(L, (luaL_loadfile(L, filename) == LUA_OK), filename);
+}
+
+
+/*
+** Try to find a load function for module 'modname' at file 'filename'.
+** First, change '.' to '_' in 'modname'; then, if 'modname' has
+** the form X-Y (that is, it has an "ignore mark"), build a function
+** name "luaopen_X" and look for it. (For compatibility, if that
+** fails, it also tries "luaopen_Y".) If there is no ignore mark,
+** look for a function named "luaopen_modname".
+*/
+static int loadfunc (lua_State *L, const char *filename, const char *modname) {
+  const char *openfunc;
+  const char *mark;
+  modname = luaL_gsub(L, modname, ".", LUA_OFSEP);
+  mark = strchr(modname, *LUA_IGMARK);
+  if (mark) {
+    int stat;
+    openfunc = lua_pushlstring(L, modname, mark - modname);
+    openfunc = lua_pushfstring(L, LUA_POF"%s", openfunc);
+    stat = lookforfunc(L, filename, openfunc);
+    if (stat != ERRFUNC) return stat;
+    modname = mark + 1;  /* else go ahead and try old-style name */
+  }
+  openfunc = lua_pushfstring(L, LUA_POF"%s", modname);
+  return lookforfunc(L, filename, openfunc);
+}
+
+
+static int searcher_C (lua_State *L) {
+  const char *name = luaL_checkstring(L, 1);
+  const char *filename = findfile(L, name, "cpath", LUA_CSUBSEP);
+  if (filename == NULL) return 1;  /* module not found in this path */
+  return checkload(L, (loadfunc(L, filename, name) == 0), filename);
+}
+
+
+static int searcher_Croot (lua_State *L) {
+  const char *filename;
+  const char *name = luaL_checkstring(L, 1);
+  const char *p = strchr(name, '.');
+  int stat;
+  if (p == NULL) return 0;  /* is root */
+  lua_pushlstring(L, name, p - name);
+  filename = findfile(L, lua_tostring(L, -1), "cpath", LUA_CSUBSEP);
+  if (filename == NULL) return 1;  /* root not found */
+  if ((stat = loadfunc(L, filename, name)) != 0) {
+    if (stat != ERRFUNC)
+      return checkload(L, 0, filename);  /* real error */
+    else {  /* open function not found */
+      lua_pushfstring(L, "no module '%s' in file '%s'", name, filename);
+      return 1;
+    }
+  }
+  lua_pushstring(L, filename);  /* will be 2nd argument to module */
+  return 2;
+}
+
+
+static int searcher_preload (lua_State *L) {
+  const char *name = luaL_checkstring(L, 1);
+  lua_getfield(L, LUA_REGISTRYINDEX, LUA_PRELOAD_TABLE);
+  if (lua_getfield(L, -1, name) == LUA_TNIL) {  /* not found? */
+    lua_pushfstring(L, "no field package.preload['%s']", name);
+    return 1;
+  }
+  else {
+    lua_pushliteral(L, ":preload:");
+    return 2;
+  }
+}
+
+
+static void findloader (lua_State *L, const char *name) {
+  int i;
+  luaL_Buffer msg;  /* to build error message */
+  /* push 'package.searchers' to index 3 in the stack */
+  if (l_unlikely(lua_getfield(L, lua_upvalueindex(1), "searchers")
+                 != LUA_TTABLE))
+    luaL_error(L, "'package.searchers' must be a table");
+  luaL_buffinit(L, &msg);
+  /*  iterate over available searchers to find a loader */
+  for (i = 1; ; i++) {
+    luaL_addstring(&msg, "\n\t");  /* error-message prefix */
+    if (l_unlikely(lua_rawgeti(L, 3, i) == LUA_TNIL)) {  /* no more searchers? */
+      lua_pop(L, 1);  /* remove nil */
+      luaL_buffsub(&msg, 2);  /* remove prefix */
+      luaL_pushresult(&msg);  /* create error message */
+      luaL_error(L, "module '%s' not found:%s", name, lua_tostring(L, -1));
+    }
+    lua_pushstring(L, name);
+    lua_call(L, 1, 2);  /* call it */
+    if (lua_isfunction(L, -2))  /* did it find a loader? */
+      return;  /* module loader found */
+    else if (lua_isstring(L, -2)) {  /* searcher returned error message? */
+      lua_pop(L, 1);  /* remove extra return */
+      luaL_addvalue(&msg);  /* concatenate error message */
+    }
+    else {  /* no error message */
+      lua_pop(L, 2);  /* remove both returns */
+      luaL_buffsub(&msg, 2);  /* remove prefix */
+    }
+  }
+}
+
+
+static int ll_require (lua_State *L) {
+  const char *name = luaL_checkstring(L, 1);
+  lua_settop(L, 1);  /* LOADED table will be at index 2 */
+  lua_getfield(L, LUA_REGISTRYINDEX, LUA_LOADED_TABLE);
+  lua_getfield(L, 2, name);  /* LOADED[name] */
+  if (lua_toboolean(L, -1))  /* is it there? */
+    return 1;  /* package is already loaded */
+  /* else must load package */
+  lua_pop(L, 1);  /* remove 'getfield' result */
+  findloader(L, name);
+  lua_rotate(L, -2, 1);  /* function <-> loader data */
+  lua_pushvalue(L, 1);  /* name is 1st argument to module loader */
+  lua_pushvalue(L, -3);  /* loader data is 2nd argument */
+  /* stack: ...; loader data; loader function; mod. name; loader data */
+  lua_call(L, 2, 1);  /* run loader to load module */
+  /* stack: ...; loader data; result from loader */
+  if (!lua_isnil(L, -1))  /* non-nil return? */
+    lua_setfield(L, 2, name);  /* LOADED[name] = returned value */
+  else
+    lua_pop(L, 1);  /* pop nil */
+  if (lua_getfield(L, 2, name) == LUA_TNIL) {   /* module set no value? */
+    lua_pushboolean(L, 1);  /* use true as result */
+    lua_copy(L, -1, -2);  /* replace loader result */
+    lua_setfield(L, 2, name);  /* LOADED[name] = true */
+  }
+  lua_rotate(L, -2, 1);  /* loader data <-> module result  */
+  return 2;  /* return module result and loader data */
+}
+
+/* }====================================================== */
+
+
+
+
+static const luaL_Reg pk_funcs[] = {
+  {"loadlib", ll_loadlib},
+  {"searchpath", ll_searchpath},
+  /* placeholders */
+  {"preload", NULL},
+  {"cpath", NULL},
+  {"path", NULL},
+  {"searchers", NULL},
+  {"loaded", NULL},
+  {NULL, NULL}
+};
+
+
+static const luaL_Reg ll_funcs[] = {
+  {"require", ll_require},
+  {NULL, NULL}
+};
+
+
+static void createsearcherstable (lua_State *L) {
+  static const lua_CFunction searchers[] = {
+    searcher_preload,
+    searcher_Lua,
+    searcher_C,
+    searcher_Croot,
+    NULL
+  };
+  int i;
+  /* create 'searchers' table */
+  lua_createtable(L, sizeof(searchers)/sizeof(searchers[0]) - 1, 0);
+  /* fill it with predefined searchers */
+  for (i=0; searchers[i] != NULL; i++) {
+    lua_pushvalue(L, -2);  /* set 'package' as upvalue for all searchers */
+    lua_pushcclosure(L, searchers[i], 1);
+    lua_rawseti(L, -2, i+1);
+  }
+  lua_setfield(L, -2, "searchers");  /* put it in field 'searchers' */
+}
+
+
+/*
+** create table CLIBS to keep track of loaded C libraries,
+** setting a finalizer to close all libraries when closing state.
+*/
+static void createclibstable (lua_State *L) {
+  luaL_getsubtable(L, LUA_REGISTRYINDEX, CLIBS);  /* create CLIBS table */
+  lua_createtable(L, 0, 1);  /* create metatable for CLIBS */
+  lua_pushcfunction(L, gctm);
+  lua_setfield(L, -2, "__gc");  /* set finalizer for CLIBS table */
+  lua_setmetatable(L, -2);
+}
+
+
+LUAMOD_API int luaopen_package (lua_State *L) {
+  createclibstable(L);
+  luaL_newlib(L, pk_funcs);  /* create 'package' table */
+  createsearcherstable(L);
+  /* set paths */
+  setpath(L, "path", LUA_PATH_VAR, LUA_PATH_DEFAULT);
+  setpath(L, "cpath", LUA_CPATH_VAR, LUA_CPATH_DEFAULT);
+  /* store config information */
+  lua_pushliteral(L, LUA_DIRSEP "\n" LUA_PATH_SEP "\n" LUA_PATH_MARK "\n"
+                     LUA_EXEC_DIR "\n" LUA_IGMARK "\n");
+  lua_setfield(L, -2, "config");
+  /* set field 'loaded' */
+  luaL_getsubtable(L, LUA_REGISTRYINDEX, LUA_LOADED_TABLE);
+  lua_setfield(L, -2, "loaded");
+  /* set field 'preload' */
+  luaL_getsubtable(L, LUA_REGISTRYINDEX, LUA_PRELOAD_TABLE);
+  lua_setfield(L, -2, "preload");
+  lua_pushglobaltable(L);
+  lua_pushvalue(L, -2);  /* set 'package' as upvalue for next lib */
+  luaL_setfuncs(L, ll_funcs, 1);  /* open lib into global table */
+  lua_pop(L, 1);  /* pop global table */
+  return 1;  /* return 'package' table */
+}
+
diff --git a/src/libs/3rdparty/lua/src/lobject.c b/src/libs/3rdparty/lua/src/lobject.c
new file mode 100644
index 0000000000..f73ffc6d92
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lobject.c
@@ -0,0 +1,602 @@
+/*
+** $Id: lobject.c $
+** Some generic functions over Lua objects
+** See Copyright Notice in lua.h
+*/
+
+#define lobject_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include <locale.h>
+#include <math.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "lua.h"
+
+#include "lctype.h"
+#include "ldebug.h"
+#include "ldo.h"
+#include "lmem.h"
+#include "lobject.h"
+#include "lstate.h"
+#include "lstring.h"
+#include "lvm.h"
+
+
+/*
+** Computes ceil(log2(x))
+*/
+int luaO_ceillog2 (unsigned int x) {
+  static const lu_byte log_2[256] = {  /* log_2[i] = ceil(log2(i - 1)) */
+    0,1,2,2,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
+    6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
+    7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
+    7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
+    8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
+    8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
+    8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
+    8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8
+  };
+  int l = 0;
+  x--;
+  while (x >= 256) { l += 8; x >>= 8; }
+  return l + log_2[x];
+}
+
+
+static lua_Integer intarith (lua_State *L, int op, lua_Integer v1,
+                                                   lua_Integer v2) {
+  switch (op) {
+    case LUA_OPADD: return intop(+, v1, v2);
+    case LUA_OPSUB:return intop(-, v1, v2);
+    case LUA_OPMUL:return intop(*, v1, v2);
+    case LUA_OPMOD: return luaV_mod(L, v1, v2);
+    case LUA_OPIDIV: return luaV_idiv(L, v1, v2);
+    case LUA_OPBAND: return intop(&, v1, v2);
+    case LUA_OPBOR: return intop(|, v1, v2);
+    case LUA_OPBXOR: return intop(^, v1, v2);
+    case LUA_OPSHL: return luaV_shiftl(v1, v2);
+    case LUA_OPSHR: return luaV_shiftr(v1, v2);
+    case LUA_OPUNM: return intop(-, 0, v1);
+    case LUA_OPBNOT: return intop(^, ~l_castS2U(0), v1);
+    default: lua_assert(0); return 0;
+  }
+}
+
+
+static lua_Number numarith (lua_State *L, int op, lua_Number v1,
+                                                  lua_Number v2) {
+  switch (op) {
+    case LUA_OPADD: return luai_numadd(L, v1, v2);
+    case LUA_OPSUB: return luai_numsub(L, v1, v2);
+    case LUA_OPMUL: return luai_nummul(L, v1, v2);
+    case LUA_OPDIV: return luai_numdiv(L, v1, v2);
+    case LUA_OPPOW: return luai_numpow(L, v1, v2);
+    case LUA_OPIDIV: return luai_numidiv(L, v1, v2);
+    case LUA_OPUNM: return luai_numunm(L, v1);
+    case LUA_OPMOD: return luaV_modf(L, v1, v2);
+    default: lua_assert(0); return 0;
+  }
+}
+
+
+int luaO_rawarith (lua_State *L, int op, const TValue *p1, const TValue *p2,
+                   TValue *res) {
+  switch (op) {
+    case LUA_OPBAND: case LUA_OPBOR: case LUA_OPBXOR:
+    case LUA_OPSHL: case LUA_OPSHR:
+    case LUA_OPBNOT: {  /* operate only on integers */
+      lua_Integer i1; lua_Integer i2;
+      if (tointegerns(p1, &i1) && tointegerns(p2, &i2)) {
+        setivalue(res, intarith(L, op, i1, i2));
+        return 1;
+      }
+      else return 0;  /* fail */
+    }
+    case LUA_OPDIV: case LUA_OPPOW: {  /* operate only on floats */
+      lua_Number n1; lua_Number n2;
+      if (tonumberns(p1, n1) && tonumberns(p2, n2)) {
+        setfltvalue(res, numarith(L, op, n1, n2));
+        return 1;
+      }
+      else return 0;  /* fail */
+    }
+    default: {  /* other operations */
+      lua_Number n1; lua_Number n2;
+      if (ttisinteger(p1) && ttisinteger(p2)) {
+        setivalue(res, intarith(L, op, ivalue(p1), ivalue(p2)));
+        return 1;
+      }
+      else if (tonumberns(p1, n1) && tonumberns(p2, n2)) {
+        setfltvalue(res, numarith(L, op, n1, n2));
+        return 1;
+      }
+      else return 0;  /* fail */
+    }
+  }
+}
+
+
+void luaO_arith (lua_State *L, int op, const TValue *p1, const TValue *p2,
+                 StkId res) {
+  if (!luaO_rawarith(L, op, p1, p2, s2v(res))) {
+    /* could not perform raw operation; try metamethod */
+    luaT_trybinTM(L, p1, p2, res, cast(TMS, (op - LUA_OPADD) + TM_ADD));
+  }
+}
+
+
+int luaO_hexavalue (int c) {
+  if (lisdigit(c)) return c - '0';
+  else return (ltolower(c) - 'a') + 10;
+}
+
+
+static int isneg (const char **s) {
+  if (**s == '-') { (*s)++; return 1; }
+  else if (**s == '+') (*s)++;
+  return 0;
+}
+
+
+
+/*
+** {==================================================================
+** Lua's implementation for 'lua_strx2number'
+** ===================================================================
+*/
+
+#if !defined(lua_strx2number)
+
+/* maximum number of significant digits to read (to avoid overflows
+   even with single floats) */
+#define MAXSIGDIG	30
+
+/*
+** convert a hexadecimal numeric string to a number, following
+** C99 specification for 'strtod'
+*/
+static lua_Number lua_strx2number (const char *s, char **endptr) {
+  int dot = lua_getlocaledecpoint();
+  lua_Number r = l_mathop(0.0);  /* result (accumulator) */
+  int sigdig = 0;  /* number of significant digits */
+  int nosigdig = 0;  /* number of non-significant digits */
+  int e = 0;  /* exponent correction */
+  int neg;  /* 1 if number is negative */
+  int hasdot = 0;  /* true after seen a dot */
+  *endptr = cast_charp(s);  /* nothing is valid yet */
+  while (lisspace(cast_uchar(*s))) s++;  /* skip initial spaces */
+  neg = isneg(&s);  /* check sign */
+  if (!(*s == '0' && (*(s + 1) == 'x' || *(s + 1) == 'X')))  /* check '0x' */
+    return l_mathop(0.0);  /* invalid format (no '0x') */
+  for (s += 2; ; s++) {  /* skip '0x' and read numeral */
+    if (*s == dot) {
+      if (hasdot) break;  /* second dot? stop loop */
+      else hasdot = 1;
+    }
+    else if (lisxdigit(cast_uchar(*s))) {
+      if (sigdig == 0 && *s == '0')  /* non-significant digit (zero)? */
+        nosigdig++;
+      else if (++sigdig <= MAXSIGDIG)  /* can read it without overflow? */
+          r = (r * l_mathop(16.0)) + luaO_hexavalue(*s);
+      else e++; /* too many digits; ignore, but still count for exponent */
+      if (hasdot) e--;  /* decimal digit? correct exponent */
+    }
+    else break;  /* neither a dot nor a digit */
+  }
+  if (nosigdig + sigdig == 0)  /* no digits? */
+    return l_mathop(0.0);  /* invalid format */
+  *endptr = cast_charp(s);  /* valid up to here */
+  e *= 4;  /* each digit multiplies/divides value by 2^4 */
+  if (*s == 'p' || *s == 'P') {  /* exponent part? */
+    int exp1 = 0;  /* exponent value */
+    int neg1;  /* exponent sign */
+    s++;  /* skip 'p' */
+    neg1 = isneg(&s);  /* sign */
+    if (!lisdigit(cast_uchar(*s)))
+      return l_mathop(0.0);  /* invalid; must have at least one digit */
+    while (lisdigit(cast_uchar(*s)))  /* read exponent */
+      exp1 = exp1 * 10 + *(s++) - '0';
+    if (neg1) exp1 = -exp1;
+    e += exp1;
+    *endptr = cast_charp(s);  /* valid up to here */
+  }
+  if (neg) r = -r;
+  return l_mathop(ldexp)(r, e);
+}
+
+#endif
+/* }====================================================== */
+
+
+/* maximum length of a numeral to be converted to a number */
+#if !defined (L_MAXLENNUM)
+#define L_MAXLENNUM	200
+#endif
+
+/*
+** Convert string 's' to a Lua number (put in 'result'). Return NULL on
+** fail or the address of the ending '\0' on success. ('mode' == 'x')
+** means a hexadecimal numeral.
+*/
+static const char *l_str2dloc (const char *s, lua_Number *result, int mode) {
+  char *endptr;
+  *result = (mode == 'x') ? lua_strx2number(s, &endptr)  /* try to convert */
+                          : lua_str2number(s, &endptr);
+  if (endptr == s) return NULL;  /* nothing recognized? */
+  while (lisspace(cast_uchar(*endptr))) endptr++;  /* skip trailing spaces */
+  return (*endptr == '\0') ? endptr : NULL;  /* OK iff no trailing chars */
+}
+
+
+/*
+** Convert string 's' to a Lua number (put in 'result') handling the
+** current locale.
+** This function accepts both the current locale or a dot as the radix
+** mark. If the conversion fails, it may mean number has a dot but
+** locale accepts something else. In that case, the code copies 's'
+** to a buffer (because 's' is read-only), changes the dot to the
+** current locale radix mark, and tries to convert again.
+** The variable 'mode' checks for special characters in the string:
+** - 'n' means 'inf' or 'nan' (which should be rejected)
+** - 'x' means a hexadecimal numeral
+** - '.' just optimizes the search for the common case (no special chars)
+*/
+static const char *l_str2d (const char *s, lua_Number *result) {
+  const char *endptr;
+  const char *pmode = strpbrk(s, ".xXnN");  /* look for special chars */
+  int mode = pmode ? ltolower(cast_uchar(*pmode)) : 0;
+  if (mode == 'n')  /* reject 'inf' and 'nan' */
+    return NULL;
+  endptr = l_str2dloc(s, result, mode);  /* try to convert */
+  if (endptr == NULL) {  /* failed? may be a different locale */
+    char buff[L_MAXLENNUM + 1];
+    const char *pdot = strchr(s, '.');
+    if (pdot == NULL || strlen(s) > L_MAXLENNUM)
+      return NULL;  /* string too long or no dot; fail */
+    strcpy(buff, s);  /* copy string to buffer */
+    buff[pdot - s] = lua_getlocaledecpoint();  /* correct decimal point */
+    endptr = l_str2dloc(buff, result, mode);  /* try again */
+    if (endptr != NULL)
+      endptr = s + (endptr - buff);  /* make relative to 's' */
+  }
+  return endptr;
+}
+
+
+#define MAXBY10		cast(lua_Unsigned, LUA_MAXINTEGER / 10)
+#define MAXLASTD	cast_int(LUA_MAXINTEGER % 10)
+
+static const char *l_str2int (const char *s, lua_Integer *result) {
+  lua_Unsigned a = 0;
+  int empty = 1;
+  int neg;
+  while (lisspace(cast_uchar(*s))) s++;  /* skip initial spaces */
+  neg = isneg(&s);
+  if (s[0] == '0' &&
+      (s[1] == 'x' || s[1] == 'X')) {  /* hex? */
+    s += 2;  /* skip '0x' */
+    for (; lisxdigit(cast_uchar(*s)); s++) {
+      a = a * 16 + luaO_hexavalue(*s);
+      empty = 0;
+    }
+  }
+  else {  /* decimal */
+    for (; lisdigit(cast_uchar(*s)); s++) {
+      int d = *s - '0';
+      if (a >= MAXBY10 && (a > MAXBY10 || d > MAXLASTD + neg))  /* overflow? */
+        return NULL;  /* do not accept it (as integer) */
+      a = a * 10 + d;
+      empty = 0;
+    }
+  }
+  while (lisspace(cast_uchar(*s))) s++;  /* skip trailing spaces */
+  if (empty || *s != '\0') return NULL;  /* something wrong in the numeral */
+  else {
+    *result = l_castU2S((neg) ? 0u - a : a);
+    return s;
+  }
+}
+
+
+size_t luaO_str2num (const char *s, TValue *o) {
+  lua_Integer i; lua_Number n;
+  const char *e;
+  if ((e = l_str2int(s, &i)) != NULL) {  /* try as an integer */
+    setivalue(o, i);
+  }
+  else if ((e = l_str2d(s, &n)) != NULL) {  /* else try as a float */
+    setfltvalue(o, n);
+  }
+  else
+    return 0;  /* conversion failed */
+  return (e - s) + 1;  /* success; return string size */
+}
+
+
+int luaO_utf8esc (char *buff, unsigned long x) {
+  int n = 1;  /* number of bytes put in buffer (backwards) */
+  lua_assert(x <= 0x7FFFFFFFu);
+  if (x < 0x80)  /* ascii? */
+    buff[UTF8BUFFSZ - 1] = cast_char(x);
+  else {  /* need continuation bytes */
+    unsigned int mfb = 0x3f;  /* maximum that fits in first byte */
+    do {  /* add continuation bytes */
+      buff[UTF8BUFFSZ - (n++)] = cast_char(0x80 | (x & 0x3f));
+      x >>= 6;  /* remove added bits */
+      mfb >>= 1;  /* now there is one less bit available in first byte */
+    } while (x > mfb);  /* still needs continuation byte? */
+    buff[UTF8BUFFSZ - n] = cast_char((~mfb << 1) | x);  /* add first byte */
+  }
+  return n;
+}
+
+
+/*
+** Maximum length of the conversion of a number to a string. Must be
+** enough to accommodate both LUA_INTEGER_FMT and LUA_NUMBER_FMT.
+** (For a long long int, this is 19 digits plus a sign and a final '\0',
+** adding to 21. For a long double, it can go to a sign, 33 digits,
+** the dot, an exponent letter, an exponent sign, 5 exponent digits,
+** and a final '\0', adding to 43.)
+*/
+#define MAXNUMBER2STR	44
+
+
+/*
+** Convert a number object to a string, adding it to a buffer
+*/
+static int tostringbuff (TValue *obj, char *buff) {
+  int len;
+  lua_assert(ttisnumber(obj));
+  if (ttisinteger(obj))
+    len = lua_integer2str(buff, MAXNUMBER2STR, ivalue(obj));
+  else {
+    len = lua_number2str(buff, MAXNUMBER2STR, fltvalue(obj));
+    if (buff[strspn(buff, "-0123456789")] == '\0') {  /* looks like an int? */
+      buff[len++] = lua_getlocaledecpoint();
+      buff[len++] = '0';  /* adds '.0' to result */
+    }
+  }
+  return len;
+}
+
+
+/*
+** Convert a number object to a Lua string, replacing the value at 'obj'
+*/
+void luaO_tostring (lua_State *L, TValue *obj) {
+  char buff[MAXNUMBER2STR];
+  int len = tostringbuff(obj, buff);
+  setsvalue(L, obj, luaS_newlstr(L, buff, len));
+}
+
+
+
+
+/*
+** {==================================================================
+** 'luaO_pushvfstring'
+** ===================================================================
+*/
+
+/*
+** Size for buffer space used by 'luaO_pushvfstring'. It should be
+** (LUA_IDSIZE + MAXNUMBER2STR) + a minimal space for basic messages,
+** so that 'luaG_addinfo' can work directly on the buffer.
+*/
+#define BUFVFS		(LUA_IDSIZE + MAXNUMBER2STR + 95)
+
+/* buffer used by 'luaO_pushvfstring' */
+typedef struct BuffFS {
+  lua_State *L;
+  int pushed;  /* true if there is a part of the result on the stack */
+  int blen;  /* length of partial string in 'space' */
+  char space[BUFVFS];  /* holds last part of the result */
+} BuffFS;
+
+
+/*
+** Push given string to the stack, as part of the result, and
+** join it to previous partial result if there is one.
+** It may call 'luaV_concat' while using one slot from EXTRA_STACK.
+** This call cannot invoke metamethods, as both operands must be
+** strings. It can, however, raise an error if the result is too
+** long. In that case, 'luaV_concat' frees the extra slot before
+** raising the error.
+*/
+static void pushstr (BuffFS *buff, const char *str, size_t lstr) {
+  lua_State *L = buff->L;
+  setsvalue2s(L, L->top.p, luaS_newlstr(L, str, lstr));
+  L->top.p++;  /* may use one slot from EXTRA_STACK */
+  if (!buff->pushed)  /* no previous string on the stack? */
+    buff->pushed = 1;  /* now there is one */
+  else  /* join previous string with new one */
+    luaV_concat(L, 2);
+}
+
+
+/*
+** empty the buffer space into the stack
+*/
+static void clearbuff (BuffFS *buff) {
+  pushstr(buff, buff->space, buff->blen);  /* push buffer contents */
+  buff->blen = 0;  /* space now is empty */
+}
+
+
+/*
+** Get a space of size 'sz' in the buffer. If buffer has not enough
+** space, empty it. 'sz' must fit in an empty buffer.
+*/
+static char *getbuff (BuffFS *buff, int sz) {
+  lua_assert(buff->blen <= BUFVFS); lua_assert(sz <= BUFVFS);
+  if (sz > BUFVFS - buff->blen)  /* not enough space? */
+    clearbuff(buff);
+  return buff->space + buff->blen;
+}
+
+
+#define addsize(b,sz)	((b)->blen += (sz))
+
+
+/*
+** Add 'str' to the buffer. If string is larger than the buffer space,
+** push the string directly to the stack.
+*/
+static void addstr2buff (BuffFS *buff, const char *str, size_t slen) {
+  if (slen <= BUFVFS) {  /* does string fit into buffer? */
+    char *bf = getbuff(buff, cast_int(slen));
+    memcpy(bf, str, slen);  /* add string to buffer */
+    addsize(buff, cast_int(slen));
+  }
+  else {  /* string larger than buffer */
+    clearbuff(buff);  /* string comes after buffer's content */
+    pushstr(buff, str, slen);  /* push string */
+  }
+}
+
+
+/*
+** Add a numeral to the buffer.
+*/
+static void addnum2buff (BuffFS *buff, TValue *num) {
+  char *numbuff = getbuff(buff, MAXNUMBER2STR);
+  int len = tostringbuff(num, numbuff);  /* format number into 'numbuff' */
+  addsize(buff, len);
+}
+
+
+/*
+** this function handles only '%d', '%c', '%f', '%p', '%s', and '%%'
+   conventional formats, plus Lua-specific '%I' and '%U'
+*/
+const char *luaO_pushvfstring (lua_State *L, const char *fmt, va_list argp) {
+  BuffFS buff;  /* holds last part of the result */
+  const char *e;  /* points to next '%' */
+  buff.pushed = buff.blen = 0;
+  buff.L = L;
+  while ((e = strchr(fmt, '%')) != NULL) {
+    addstr2buff(&buff, fmt, e - fmt);  /* add 'fmt' up to '%' */
+    switch (*(e + 1)) {  /* conversion specifier */
+      case 's': {  /* zero-terminated string */
+        const char *s = va_arg(argp, char *);
+        if (s == NULL) s = "(null)";
+        addstr2buff(&buff, s, strlen(s));
+        break;
+      }
+      case 'c': {  /* an 'int' as a character */
+        char c = cast_uchar(va_arg(argp, int));
+        addstr2buff(&buff, &c, sizeof(char));
+        break;
+      }
+      case 'd': {  /* an 'int' */
+        TValue num;
+        setivalue(&num, va_arg(argp, int));
+        addnum2buff(&buff, &num);
+        break;
+      }
+      case 'I': {  /* a 'lua_Integer' */
+        TValue num;
+        setivalue(&num, cast(lua_Integer, va_arg(argp, l_uacInt)));
+        addnum2buff(&buff, &num);
+        break;
+      }
+      case 'f': {  /* a 'lua_Number' */
+        TValue num;
+        setfltvalue(&num, cast_num(va_arg(argp, l_uacNumber)));
+        addnum2buff(&buff, &num);
+        break;
+      }
+      case 'p': {  /* a pointer */
+        const int sz = 3 * sizeof(void*) + 8; /* enough space for '%p' */
+        char *bf = getbuff(&buff, sz);
+        void *p = va_arg(argp, void *);
+        int len = lua_pointer2str(bf, sz, p);
+        addsize(&buff, len);
+        break;
+      }
+      case 'U': {  /* a 'long' as a UTF-8 sequence */
+        char bf[UTF8BUFFSZ];
+        int len = luaO_utf8esc(bf, va_arg(argp, long));
+        addstr2buff(&buff, bf + UTF8BUFFSZ - len, len);
+        break;
+      }
+      case '%': {
+        addstr2buff(&buff, "%", 1);
+        break;
+      }
+      default: {
+        luaG_runerror(L, "invalid option '%%%c' to 'lua_pushfstring'",
+                         *(e + 1));
+      }
+    }
+    fmt = e + 2;  /* skip '%' and the specifier */
+  }
+  addstr2buff(&buff, fmt, strlen(fmt));  /* rest of 'fmt' */
+  clearbuff(&buff);  /* empty buffer into the stack */
+  lua_assert(buff.pushed == 1);
+  return svalue(s2v(L->top.p - 1));
+}
+
+
+const char *luaO_pushfstring (lua_State *L, const char *fmt, ...) {
+  const char *msg;
+  va_list argp;
+  va_start(argp, fmt);
+  msg = luaO_pushvfstring(L, fmt, argp);
+  va_end(argp);
+  return msg;
+}
+
+/* }================================================================== */
+
+
+#define RETS	"..."
+#define PRE	"[string \""
+#define POS	"\"]"
+
+#define addstr(a,b,l)	( memcpy(a,b,(l) * sizeof(char)), a += (l) )
+
+void luaO_chunkid (char *out, const char *source, size_t srclen) {
+  size_t bufflen = LUA_IDSIZE;  /* free space in buffer */
+  if (*source == '=') {  /* 'literal' source */
+    if (srclen <= bufflen)  /* small enough? */
+      memcpy(out, source + 1, srclen * sizeof(char));
+    else {  /* truncate it */
+      addstr(out, source + 1, bufflen - 1);
+      *out = '\0';
+    }
+  }
+  else if (*source == '@') {  /* file name */
+    if (srclen <= bufflen)  /* small enough? */
+      memcpy(out, source + 1, srclen * sizeof(char));
+    else {  /* add '...' before rest of name */
+      addstr(out, RETS, LL(RETS));
+      bufflen -= LL(RETS);
+      memcpy(out, source + 1 + srclen - bufflen, bufflen * sizeof(char));
+    }
+  }
+  else {  /* string; format as [string "source"] */
+    const char *nl = strchr(source, '\n');  /* find first new line (if any) */
+    addstr(out, PRE, LL(PRE));  /* add prefix */
+    bufflen -= LL(PRE RETS POS) + 1;  /* save space for prefix+suffix+'\0' */
+    if (srclen < bufflen && nl == NULL) {  /* small one-line source? */
+      addstr(out, source, srclen);  /* keep it */
+    }
+    else {
+      if (nl != NULL) srclen = nl - source;  /* stop at first newline */
+      if (srclen > bufflen) srclen = bufflen;
+      addstr(out, source, srclen);
+      addstr(out, RETS, LL(RETS));
+    }
+    memcpy(out, POS, (LL(POS) + 1) * sizeof(char));
+  }
+}
+
diff --git a/src/libs/3rdparty/lua/src/lobject.h b/src/libs/3rdparty/lua/src/lobject.h
new file mode 100644
index 0000000000..556608e4aa
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lobject.h
@@ -0,0 +1,815 @@
+/*
+** $Id: lobject.h $
+** Type definitions for Lua objects
+** See Copyright Notice in lua.h
+*/
+
+
+#ifndef lobject_h
+#define lobject_h
+
+
+#include <stdarg.h>
+
+
+#include "llimits.h"
+#include "lua.h"
+
+
+/*
+** Extra types for collectable non-values
+*/
+#define LUA_TUPVAL	LUA_NUMTYPES  /* upvalues */
+#define LUA_TPROTO	(LUA_NUMTYPES+1)  /* function prototypes */
+#define LUA_TDEADKEY	(LUA_NUMTYPES+2)  /* removed keys in tables */
+
+
+
+/*
+** number of all possible types (including LUA_TNONE but excluding DEADKEY)
+*/
+#define LUA_TOTALTYPES		(LUA_TPROTO + 2)
+
+
+/*
+** tags for Tagged Values have the following use of bits:
+** bits 0-3: actual tag (a LUA_T* constant)
+** bits 4-5: variant bits
+** bit 6: whether value is collectable
+*/
+
+/* add variant bits to a type */
+#define makevariant(t,v)	((t) | ((v) << 4))
+
+
+
+/*
+** Union of all Lua values
+*/
+typedef union Value {
+  struct GCObject *gc;    /* collectable objects */
+  void *p;         /* light userdata */
+  lua_CFunction f; /* light C functions */
+  lua_Integer i;   /* integer numbers */
+  lua_Number n;    /* float numbers */
+  /* not used, but may avoid warnings for uninitialized value */
+  lu_byte ub;
+} Value;
+
+
+/*
+** Tagged Values. This is the basic representation of values in Lua:
+** an actual value plus a tag with its type.
+*/
+
+#define TValuefields	Value value_; lu_byte tt_
+
+typedef struct TValue {
+  TValuefields;
+} TValue;
+
+
+#define val_(o)		((o)->value_)
+#define valraw(o)	(val_(o))
+
+
+/* raw type tag of a TValue */
+#define rawtt(o)	((o)->tt_)
+
+/* tag with no variants (bits 0-3) */
+#define novariant(t)	((t) & 0x0F)
+
+/* type tag of a TValue (bits 0-3 for tags + variant bits 4-5) */
+#define withvariant(t)	((t) & 0x3F)
+#define ttypetag(o)	withvariant(rawtt(o))
+
+/* type of a TValue */
+#define ttype(o)	(novariant(rawtt(o)))
+
+
+/* Macros to test type */
+#define checktag(o,t)		(rawtt(o) == (t))
+#define checktype(o,t)		(ttype(o) == (t))
+
+
+/* Macros for internal tests */
+
+/* collectable object has the same tag as the original value */
+#define righttt(obj)		(ttypetag(obj) == gcvalue(obj)->tt)
+
+/*
+** Any value being manipulated by the program either is non
+** collectable, or the collectable object has the right tag
+** and it is not dead. The option 'L == NULL' allows other
+** macros using this one to be used where L is not available.
+*/
+#define checkliveness(L,obj) \
+	((void)L, lua_longassert(!iscollectable(obj) || \
+		(righttt(obj) && (L == NULL || !isdead(G(L),gcvalue(obj))))))
+
+
+/* Macros to set values */
+
+/* set a value's tag */
+#define settt_(o,t)	((o)->tt_=(t))
+
+
+/* main macro to copy values (from 'obj2' to 'obj1') */
+#define setobj(L,obj1,obj2) \
+	{ TValue *io1=(obj1); const TValue *io2=(obj2); \
+          io1->value_ = io2->value_; settt_(io1, io2->tt_); \
+	  checkliveness(L,io1); lua_assert(!isnonstrictnil(io1)); }
+
+/*
+** Different types of assignments, according to source and destination.
+** (They are mostly equal now, but may be different in the future.)
+*/
+
+/* from stack to stack */
+#define setobjs2s(L,o1,o2)	setobj(L,s2v(o1),s2v(o2))
+/* to stack (not from same stack) */
+#define setobj2s(L,o1,o2)	setobj(L,s2v(o1),o2)
+/* from table to same table */
+#define setobjt2t	setobj
+/* to new object */
+#define setobj2n	setobj
+/* to table */
+#define setobj2t	setobj
+
+
+/*
+** Entries in a Lua stack. Field 'tbclist' forms a list of all
+** to-be-closed variables active in this stack. Dummy entries are
+** used when the distance between two tbc variables does not fit
+** in an unsigned short. They are represented by delta==0, and
+** their real delta is always the maximum value that fits in
+** that field.
+*/
+typedef union StackValue {
+  TValue val;
+  struct {
+    TValuefields;
+    unsigned short delta;
+  } tbclist;
+} StackValue;
+
+
+/* index to stack elements */
+typedef StackValue *StkId;
+
+
+/*
+** When reallocating the stack, change all pointers to the stack into
+** proper offsets.
+*/
+typedef union {
+  StkId p;  /* actual pointer */
+  ptrdiff_t offset;  /* used while the stack is being reallocated */
+} StkIdRel;
+
+
+/* convert a 'StackValue' to a 'TValue' */
+#define s2v(o)	(&(o)->val)
+
+
+
+/*
+** {==================================================================
+** Nil
+** ===================================================================
+*/
+
+/* Standard nil */
+#define LUA_VNIL	makevariant(LUA_TNIL, 0)
+
+/* Empty slot (which might be different from a slot containing nil) */
+#define LUA_VEMPTY	makevariant(LUA_TNIL, 1)
+
+/* Value returned for a key not found in a table (absent key) */
+#define LUA_VABSTKEY	makevariant(LUA_TNIL, 2)
+
+
+/* macro to test for (any kind of) nil */
+#define ttisnil(v)		checktype((v), LUA_TNIL)
+
+
+/* macro to test for a standard nil */
+#define ttisstrictnil(o)	checktag((o), LUA_VNIL)
+
+
+#define setnilvalue(obj) settt_(obj, LUA_VNIL)
+
+
+#define isabstkey(v)		checktag((v), LUA_VABSTKEY)
+
+
+/*
+** macro to detect non-standard nils (used only in assertions)
+*/
+#define isnonstrictnil(v)	(ttisnil(v) && !ttisstrictnil(v))
+
+
+/*
+** By default, entries with any kind of nil are considered empty.
+** (In any definition, values associated with absent keys must also
+** be accepted as empty.)
+*/
+#define isempty(v)		ttisnil(v)
+
+
+/* macro defining a value corresponding to an absent key */
+#define ABSTKEYCONSTANT		{NULL}, LUA_VABSTKEY
+
+
+/* mark an entry as empty */
+#define setempty(v)		settt_(v, LUA_VEMPTY)
+
+
+
+/* }================================================================== */
+
+
+/*
+** {==================================================================
+** Booleans
+** ===================================================================
+*/
+
+
+#define LUA_VFALSE	makevariant(LUA_TBOOLEAN, 0)
+#define LUA_VTRUE	makevariant(LUA_TBOOLEAN, 1)
+
+#define ttisboolean(o)		checktype((o), LUA_TBOOLEAN)
+#define ttisfalse(o)		checktag((o), LUA_VFALSE)
+#define ttistrue(o)		checktag((o), LUA_VTRUE)
+
+
+#define l_isfalse(o)	(ttisfalse(o) || ttisnil(o))
+
+
+#define setbfvalue(obj)		settt_(obj, LUA_VFALSE)
+#define setbtvalue(obj)		settt_(obj, LUA_VTRUE)
+
+/* }================================================================== */
+
+
+/*
+** {==================================================================
+** Threads
+** ===================================================================
+*/
+
+#define LUA_VTHREAD		makevariant(LUA_TTHREAD, 0)
+
+#define ttisthread(o)		checktag((o), ctb(LUA_VTHREAD))
+
+#define thvalue(o)	check_exp(ttisthread(o), gco2th(val_(o).gc))
+
+#define setthvalue(L,obj,x) \
+  { TValue *io = (obj); lua_State *x_ = (x); \
+    val_(io).gc = obj2gco(x_); settt_(io, ctb(LUA_VTHREAD)); \
+    checkliveness(L,io); }
+
+#define setthvalue2s(L,o,t)	setthvalue(L,s2v(o),t)
+
+/* }================================================================== */
+
+
+/*
+** {==================================================================
+** Collectable Objects
+** ===================================================================
+*/
+
+/*
+** Common Header for all collectable objects (in macro form, to be
+** included in other objects)
+*/
+#define CommonHeader	struct GCObject *next; lu_byte tt; lu_byte marked
+
+
+/* Common type for all collectable objects */
+typedef struct GCObject {
+  CommonHeader;
+} GCObject;
+
+
+/* Bit mark for collectable types */
+#define BIT_ISCOLLECTABLE	(1 << 6)
+
+#define iscollectable(o)	(rawtt(o) & BIT_ISCOLLECTABLE)
+
+/* mark a tag as collectable */
+#define ctb(t)			((t) | BIT_ISCOLLECTABLE)
+
+#define gcvalue(o)	check_exp(iscollectable(o), val_(o).gc)
+
+#define gcvalueraw(v)	((v).gc)
+
+#define setgcovalue(L,obj,x) \
+  { TValue *io = (obj); GCObject *i_g=(x); \
+    val_(io).gc = i_g; settt_(io, ctb(i_g->tt)); }
+
+/* }================================================================== */
+
+
+/*
+** {==================================================================
+** Numbers
+** ===================================================================
+*/
+
+/* Variant tags for numbers */
+#define LUA_VNUMINT	makevariant(LUA_TNUMBER, 0)  /* integer numbers */
+#define LUA_VNUMFLT	makevariant(LUA_TNUMBER, 1)  /* float numbers */
+
+#define ttisnumber(o)		checktype((o), LUA_TNUMBER)
+#define ttisfloat(o)		checktag((o), LUA_VNUMFLT)
+#define ttisinteger(o)		checktag((o), LUA_VNUMINT)
+
+#define nvalue(o)	check_exp(ttisnumber(o), \
+	(ttisinteger(o) ? cast_num(ivalue(o)) : fltvalue(o)))
+#define fltvalue(o)	check_exp(ttisfloat(o), val_(o).n)
+#define ivalue(o)	check_exp(ttisinteger(o), val_(o).i)
+
+#define fltvalueraw(v)	((v).n)
+#define ivalueraw(v)	((v).i)
+
+#define setfltvalue(obj,x) \
+  { TValue *io=(obj); val_(io).n=(x); settt_(io, LUA_VNUMFLT); }
+
+#define chgfltvalue(obj,x) \
+  { TValue *io=(obj); lua_assert(ttisfloat(io)); val_(io).n=(x); }
+
+#define setivalue(obj,x) \
+  { TValue *io=(obj); val_(io).i=(x); settt_(io, LUA_VNUMINT); }
+
+#define chgivalue(obj,x) \
+  { TValue *io=(obj); lua_assert(ttisinteger(io)); val_(io).i=(x); }
+
+/* }================================================================== */
+
+
+/*
+** {==================================================================
+** Strings
+** ===================================================================
+*/
+
+/* Variant tags for strings */
+#define LUA_VSHRSTR	makevariant(LUA_TSTRING, 0)  /* short strings */
+#define LUA_VLNGSTR	makevariant(LUA_TSTRING, 1)  /* long strings */
+
+#define ttisstring(o)		checktype((o), LUA_TSTRING)
+#define ttisshrstring(o)	checktag((o), ctb(LUA_VSHRSTR))
+#define ttislngstring(o)	checktag((o), ctb(LUA_VLNGSTR))
+
+#define tsvalueraw(v)	(gco2ts((v).gc))
+
+#define tsvalue(o)	check_exp(ttisstring(o), gco2ts(val_(o).gc))
+
+#define setsvalue(L,obj,x) \
+  { TValue *io = (obj); TString *x_ = (x); \
+    val_(io).gc = obj2gco(x_); settt_(io, ctb(x_->tt)); \
+    checkliveness(L,io); }
+
+/* set a string to the stack */
+#define setsvalue2s(L,o,s)	setsvalue(L,s2v(o),s)
+
+/* set a string to a new object */
+#define setsvalue2n	setsvalue
+
+
+/*
+** Header for a string value.
+*/
+typedef struct TString {
+  CommonHeader;
+  lu_byte extra;  /* reserved words for short strings; "has hash" for longs */
+  lu_byte shrlen;  /* length for short strings */
+  unsigned int hash;
+  union {
+    size_t lnglen;  /* length for long strings */
+    struct TString *hnext;  /* linked list for hash table */
+  } u;
+  char contents[1];
+} TString;
+
+
+
+/*
+** Get the actual string (array of bytes) from a 'TString'.
+*/
+#define getstr(ts)  ((ts)->contents)
+
+
+/* get the actual string (array of bytes) from a Lua value */
+#define svalue(o)       getstr(tsvalue(o))
+
+/* get string length from 'TString *s' */
+#define tsslen(s)	((s)->tt == LUA_VSHRSTR ? (s)->shrlen : (s)->u.lnglen)
+
+/* get string length from 'TValue *o' */
+#define vslen(o)	tsslen(tsvalue(o))
+
+/* }================================================================== */
+
+
+/*
+** {==================================================================
+** Userdata
+** ===================================================================
+*/
+
+
+/*
+** Light userdata should be a variant of userdata, but for compatibility
+** reasons they are also different types.
+*/
+#define LUA_VLIGHTUSERDATA	makevariant(LUA_TLIGHTUSERDATA, 0)
+
+#define LUA_VUSERDATA		makevariant(LUA_TUSERDATA, 0)
+
+#define ttislightuserdata(o)	checktag((o), LUA_VLIGHTUSERDATA)
+#define ttisfulluserdata(o)	checktag((o), ctb(LUA_VUSERDATA))
+
+#define pvalue(o)	check_exp(ttislightuserdata(o), val_(o).p)
+#define uvalue(o)	check_exp(ttisfulluserdata(o), gco2u(val_(o).gc))
+
+#define pvalueraw(v)	((v).p)
+
+#define setpvalue(obj,x) \
+  { TValue *io=(obj); val_(io).p=(x); settt_(io, LUA_VLIGHTUSERDATA); }
+
+#define setuvalue(L,obj,x) \
+  { TValue *io = (obj); Udata *x_ = (x); \
+    val_(io).gc = obj2gco(x_); settt_(io, ctb(LUA_VUSERDATA)); \
+    checkliveness(L,io); }
+
+
+/* Ensures that addresses after this type are always fully aligned. */
+typedef union UValue {
+  TValue uv;
+  LUAI_MAXALIGN;  /* ensures maximum alignment for udata bytes */
+} UValue;
+
+
+/*
+** Header for userdata with user values;
+** memory area follows the end of this structure.
+*/
+typedef struct Udata {
+  CommonHeader;
+  unsigned short nuvalue;  /* number of user values */
+  size_t len;  /* number of bytes */
+  struct Table *metatable;
+  GCObject *gclist;
+  UValue uv[1];  /* user values */
+} Udata;
+
+
+/*
+** Header for userdata with no user values. These userdata do not need
+** to be gray during GC, and therefore do not need a 'gclist' field.
+** To simplify, the code always use 'Udata' for both kinds of userdata,
+** making sure it never accesses 'gclist' on userdata with no user values.
+** This structure here is used only to compute the correct size for
+** this representation. (The 'bindata' field in its end ensures correct
+** alignment for binary data following this header.)
+*/
+typedef struct Udata0 {
+  CommonHeader;
+  unsigned short nuvalue;  /* number of user values */
+  size_t len;  /* number of bytes */
+  struct Table *metatable;
+  union {LUAI_MAXALIGN;} bindata;
+} Udata0;
+
+
+/* compute the offset of the memory area of a userdata */
+#define udatamemoffset(nuv) \
+	((nuv) == 0 ? offsetof(Udata0, bindata)  \
+                    : offsetof(Udata, uv) + (sizeof(UValue) * (nuv)))
+
+/* get the address of the memory block inside 'Udata' */
+#define getudatamem(u)	(cast_charp(u) + udatamemoffset((u)->nuvalue))
+
+/* compute the size of a userdata */
+#define sizeudata(nuv,nb)	(udatamemoffset(nuv) + (nb))
+
+/* }================================================================== */
+
+
+/*
+** {==================================================================
+** Prototypes
+** ===================================================================
+*/
+
+#define LUA_VPROTO	makevariant(LUA_TPROTO, 0)
+
+
+/*
+** Description of an upvalue for function prototypes
+*/
+typedef struct Upvaldesc {
+  TString *name;  /* upvalue name (for debug information) */
+  lu_byte instack;  /* whether it is in stack (register) */
+  lu_byte idx;  /* index of upvalue (in stack or in outer function's list) */
+  lu_byte kind;  /* kind of corresponding variable */
+} Upvaldesc;
+
+
+/*
+** Description of a local variable for function prototypes
+** (used for debug information)
+*/
+typedef struct LocVar {
+  TString *varname;
+  int startpc;  /* first point where variable is active */
+  int endpc;    /* first point where variable is dead */
+} LocVar;
+
+
+/*
+** Associates the absolute line source for a given instruction ('pc').
+** The array 'lineinfo' gives, for each instruction, the difference in
+** lines from the previous instruction. When that difference does not
+** fit into a byte, Lua saves the absolute line for that instruction.
+** (Lua also saves the absolute line periodically, to speed up the
+** computation of a line number: we can use binary search in the
+** absolute-line array, but we must traverse the 'lineinfo' array
+** linearly to compute a line.)
+*/
+typedef struct AbsLineInfo {
+  int pc;
+  int line;
+} AbsLineInfo;
+
+/*
+** Function Prototypes
+*/
+typedef struct Proto {
+  CommonHeader;
+  lu_byte numparams;  /* number of fixed (named) parameters */
+  lu_byte is_vararg;
+  lu_byte maxstacksize;  /* number of registers needed by this function */
+  int sizeupvalues;  /* size of 'upvalues' */
+  int sizek;  /* size of 'k' */
+  int sizecode;
+  int sizelineinfo;
+  int sizep;  /* size of 'p' */
+  int sizelocvars;
+  int sizeabslineinfo;  /* size of 'abslineinfo' */
+  int linedefined;  /* debug information  */
+  int lastlinedefined;  /* debug information  */
+  TValue *k;  /* constants used by the function */
+  Instruction *code;  /* opcodes */
+  struct Proto **p;  /* functions defined inside the function */
+  Upvaldesc *upvalues;  /* upvalue information */
+  ls_byte *lineinfo;  /* information about source lines (debug information) */
+  AbsLineInfo *abslineinfo;  /* idem */
+  LocVar *locvars;  /* information about local variables (debug information) */
+  TString  *source;  /* used for debug information */
+  GCObject *gclist;
+} Proto;
+
+/* }================================================================== */
+
+
+/*
+** {==================================================================
+** Functions
+** ===================================================================
+*/
+
+#define LUA_VUPVAL	makevariant(LUA_TUPVAL, 0)
+
+
+/* Variant tags for functions */
+#define LUA_VLCL	makevariant(LUA_TFUNCTION, 0)  /* Lua closure */
+#define LUA_VLCF	makevariant(LUA_TFUNCTION, 1)  /* light C function */
+#define LUA_VCCL	makevariant(LUA_TFUNCTION, 2)  /* C closure */
+
+#define ttisfunction(o)		checktype(o, LUA_TFUNCTION)
+#define ttisLclosure(o)		checktag((o), ctb(LUA_VLCL))
+#define ttislcf(o)		checktag((o), LUA_VLCF)
+#define ttisCclosure(o)		checktag((o), ctb(LUA_VCCL))
+#define ttisclosure(o)         (ttisLclosure(o) || ttisCclosure(o))
+
+
+#define isLfunction(o)	ttisLclosure(o)
+
+#define clvalue(o)	check_exp(ttisclosure(o), gco2cl(val_(o).gc))
+#define clLvalue(o)	check_exp(ttisLclosure(o), gco2lcl(val_(o).gc))
+#define fvalue(o)	check_exp(ttislcf(o), val_(o).f)
+#define clCvalue(o)	check_exp(ttisCclosure(o), gco2ccl(val_(o).gc))
+
+#define fvalueraw(v)	((v).f)
+
+#define setclLvalue(L,obj,x) \
+  { TValue *io = (obj); LClosure *x_ = (x); \
+    val_(io).gc = obj2gco(x_); settt_(io, ctb(LUA_VLCL)); \
+    checkliveness(L,io); }
+
+#define setclLvalue2s(L,o,cl)	setclLvalue(L,s2v(o),cl)
+
+#define setfvalue(obj,x) \
+  { TValue *io=(obj); val_(io).f=(x); settt_(io, LUA_VLCF); }
+
+#define setclCvalue(L,obj,x) \
+  { TValue *io = (obj); CClosure *x_ = (x); \
+    val_(io).gc = obj2gco(x_); settt_(io, ctb(LUA_VCCL)); \
+    checkliveness(L,io); }
+
+
+/*
+** Upvalues for Lua closures
+*/
+typedef struct UpVal {
+  CommonHeader;
+  union {
+    TValue *p;  /* points to stack or to its own value */
+    ptrdiff_t offset;  /* used while the stack is being reallocated */
+  } v;
+  union {
+    struct {  /* (when open) */
+      struct UpVal *next;  /* linked list */
+      struct UpVal **previous;
+    } open;
+    TValue value;  /* the value (when closed) */
+  } u;
+} UpVal;
+
+
+
+#define ClosureHeader \
+	CommonHeader; lu_byte nupvalues; GCObject *gclist
+
+typedef struct CClosure {
+  ClosureHeader;
+  lua_CFunction f;
+  TValue upvalue[1];  /* list of upvalues */
+} CClosure;
+
+
+typedef struct LClosure {
+  ClosureHeader;
+  struct Proto *p;
+  UpVal *upvals[1];  /* list of upvalues */
+} LClosure;
+
+
+typedef union Closure {
+  CClosure c;
+  LClosure l;
+} Closure;
+
+
+#define getproto(o)	(clLvalue(o)->p)
+
+/* }================================================================== */
+
+
+/*
+** {==================================================================
+** Tables
+** ===================================================================
+*/
+
+#define LUA_VTABLE	makevariant(LUA_TTABLE, 0)
+
+#define ttistable(o)		checktag((o), ctb(LUA_VTABLE))
+
+#define hvalue(o)	check_exp(ttistable(o), gco2t(val_(o).gc))
+
+#define sethvalue(L,obj,x) \
+  { TValue *io = (obj); Table *x_ = (x); \
+    val_(io).gc = obj2gco(x_); settt_(io, ctb(LUA_VTABLE)); \
+    checkliveness(L,io); }
+
+#define sethvalue2s(L,o,h)	sethvalue(L,s2v(o),h)
+
+
+/*
+** Nodes for Hash tables: A pack of two TValue's (key-value pairs)
+** plus a 'next' field to link colliding entries. The distribution
+** of the key's fields ('key_tt' and 'key_val') not forming a proper
+** 'TValue' allows for a smaller size for 'Node' both in 4-byte
+** and 8-byte alignments.
+*/
+typedef union Node {
+  struct NodeKey {
+    TValuefields;  /* fields for value */
+    lu_byte key_tt;  /* key type */
+    int next;  /* for chaining */
+    Value key_val;  /* key value */
+  } u;
+  TValue i_val;  /* direct access to node's value as a proper 'TValue' */
+} Node;
+
+
+/* copy a value into a key */
+#define setnodekey(L,node,obj) \
+	{ Node *n_=(node); const TValue *io_=(obj); \
+	  n_->u.key_val = io_->value_; n_->u.key_tt = io_->tt_; \
+	  checkliveness(L,io_); }
+
+
+/* copy a value from a key */
+#define getnodekey(L,obj,node) \
+	{ TValue *io_=(obj); const Node *n_=(node); \
+	  io_->value_ = n_->u.key_val; io_->tt_ = n_->u.key_tt; \
+	  checkliveness(L,io_); }
+
+
+/*
+** About 'alimit': if 'isrealasize(t)' is true, then 'alimit' is the
+** real size of 'array'. Otherwise, the real size of 'array' is the
+** smallest power of two not smaller than 'alimit' (or zero iff 'alimit'
+** is zero); 'alimit' is then used as a hint for #t.
+*/
+
+#define BITRAS		(1 << 7)
+#define isrealasize(t)		(!((t)->flags & BITRAS))
+#define setrealasize(t)		((t)->flags &= cast_byte(~BITRAS))
+#define setnorealasize(t)	((t)->flags |= BITRAS)
+
+
+typedef struct Table {
+  CommonHeader;
+  lu_byte flags;  /* 1<<p means tagmethod(p) is not present */
+  lu_byte lsizenode;  /* log2 of size of 'node' array */
+  unsigned int alimit;  /* "limit" of 'array' array */
+  TValue *array;  /* array part */
+  Node *node;
+  Node *lastfree;  /* any free position is before this position */
+  struct Table *metatable;
+  GCObject *gclist;
+} Table;
+
+
+/*
+** Macros to manipulate keys inserted in nodes
+*/
+#define keytt(node)		((node)->u.key_tt)
+#define keyval(node)		((node)->u.key_val)
+
+#define keyisnil(node)		(keytt(node) == LUA_TNIL)
+#define keyisinteger(node)	(keytt(node) == LUA_VNUMINT)
+#define keyival(node)		(keyval(node).i)
+#define keyisshrstr(node)	(keytt(node) == ctb(LUA_VSHRSTR))
+#define keystrval(node)		(gco2ts(keyval(node).gc))
+
+#define setnilkey(node)		(keytt(node) = LUA_TNIL)
+
+#define keyiscollectable(n)	(keytt(n) & BIT_ISCOLLECTABLE)
+
+#define gckey(n)	(keyval(n).gc)
+#define gckeyN(n)	(keyiscollectable(n) ? gckey(n) : NULL)
+
+
+/*
+** Dead keys in tables have the tag DEADKEY but keep their original
+** gcvalue. This distinguishes them from regular keys but allows them to
+** be found when searched in a special way. ('next' needs that to find
+** keys removed from a table during a traversal.)
+*/
+#define setdeadkey(node)	(keytt(node) = LUA_TDEADKEY)
+#define keyisdead(node)		(keytt(node) == LUA_TDEADKEY)
+
+/* }================================================================== */
+
+
+
+/*
+** 'module' operation for hashing (size is always a power of 2)
+*/
+#define lmod(s,size) \
+	(check_exp((size&(size-1))==0, (cast_int((s) & ((size)-1)))))
+
+
+#define twoto(x)	(1<<(x))
+#define sizenode(t)	(twoto((t)->lsizenode))
+
+
+/* size of buffer for 'luaO_utf8esc' function */
+#define UTF8BUFFSZ	8
+
+LUAI_FUNC int luaO_utf8esc (char *buff, unsigned long x);
+LUAI_FUNC int luaO_ceillog2 (unsigned int x);
+LUAI_FUNC int luaO_rawarith (lua_State *L, int op, const TValue *p1,
+                             const TValue *p2, TValue *res);
+LUAI_FUNC void luaO_arith (lua_State *L, int op, const TValue *p1,
+                           const TValue *p2, StkId res);
+LUAI_FUNC size_t luaO_str2num (const char *s, TValue *o);
+LUAI_FUNC int luaO_hexavalue (int c);
+LUAI_FUNC void luaO_tostring (lua_State *L, TValue *obj);
+LUAI_FUNC const char *luaO_pushvfstring (lua_State *L, const char *fmt,
+                                                       va_list argp);
+LUAI_FUNC const char *luaO_pushfstring (lua_State *L, const char *fmt, ...);
+LUAI_FUNC void luaO_chunkid (char *out, const char *source, size_t srclen);
+
+
+#endif
+
diff --git a/src/libs/3rdparty/lua/src/lopcodes.c b/src/libs/3rdparty/lua/src/lopcodes.c
new file mode 100644
index 0000000000..c67aa227c5
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lopcodes.c
@@ -0,0 +1,104 @@
+/*
+** $Id: lopcodes.c $
+** Opcodes for Lua virtual machine
+** See Copyright Notice in lua.h
+*/
+
+#define lopcodes_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include "lopcodes.h"
+
+
+/* ORDER OP */
+
+LUAI_DDEF const lu_byte luaP_opmodes[NUM_OPCODES] = {
+/*       MM OT IT T  A  mode		   opcode  */
+  opmode(0, 0, 0, 0, 1, iABC)		/* OP_MOVE */
+ ,opmode(0, 0, 0, 0, 1, iAsBx)		/* OP_LOADI */
+ ,opmode(0, 0, 0, 0, 1, iAsBx)		/* OP_LOADF */
+ ,opmode(0, 0, 0, 0, 1, iABx)		/* OP_LOADK */
+ ,opmode(0, 0, 0, 0, 1, iABx)		/* OP_LOADKX */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_LOADFALSE */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_LFALSESKIP */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_LOADTRUE */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_LOADNIL */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_GETUPVAL */
+ ,opmode(0, 0, 0, 0, 0, iABC)		/* OP_SETUPVAL */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_GETTABUP */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_GETTABLE */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_GETI */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_GETFIELD */
+ ,opmode(0, 0, 0, 0, 0, iABC)		/* OP_SETTABUP */
+ ,opmode(0, 0, 0, 0, 0, iABC)		/* OP_SETTABLE */
+ ,opmode(0, 0, 0, 0, 0, iABC)		/* OP_SETI */
+ ,opmode(0, 0, 0, 0, 0, iABC)		/* OP_SETFIELD */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_NEWTABLE */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_SELF */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_ADDI */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_ADDK */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_SUBK */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_MULK */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_MODK */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_POWK */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_DIVK */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_IDIVK */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_BANDK */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_BORK */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_BXORK */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_SHRI */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_SHLI */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_ADD */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_SUB */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_MUL */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_MOD */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_POW */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_DIV */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_IDIV */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_BAND */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_BOR */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_BXOR */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_SHL */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_SHR */
+ ,opmode(1, 0, 0, 0, 0, iABC)		/* OP_MMBIN */
+ ,opmode(1, 0, 0, 0, 0, iABC)		/* OP_MMBINI*/
+ ,opmode(1, 0, 0, 0, 0, iABC)		/* OP_MMBINK*/
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_UNM */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_BNOT */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_NOT */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_LEN */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_CONCAT */
+ ,opmode(0, 0, 0, 0, 0, iABC)		/* OP_CLOSE */
+ ,opmode(0, 0, 0, 0, 0, iABC)		/* OP_TBC */
+ ,opmode(0, 0, 0, 0, 0, isJ)		/* OP_JMP */
+ ,opmode(0, 0, 0, 1, 0, iABC)		/* OP_EQ */
+ ,opmode(0, 0, 0, 1, 0, iABC)		/* OP_LT */
+ ,opmode(0, 0, 0, 1, 0, iABC)		/* OP_LE */
+ ,opmode(0, 0, 0, 1, 0, iABC)		/* OP_EQK */
+ ,opmode(0, 0, 0, 1, 0, iABC)		/* OP_EQI */
+ ,opmode(0, 0, 0, 1, 0, iABC)		/* OP_LTI */
+ ,opmode(0, 0, 0, 1, 0, iABC)		/* OP_LEI */
+ ,opmode(0, 0, 0, 1, 0, iABC)		/* OP_GTI */
+ ,opmode(0, 0, 0, 1, 0, iABC)		/* OP_GEI */
+ ,opmode(0, 0, 0, 1, 0, iABC)		/* OP_TEST */
+ ,opmode(0, 0, 0, 1, 1, iABC)		/* OP_TESTSET */
+ ,opmode(0, 1, 1, 0, 1, iABC)		/* OP_CALL */
+ ,opmode(0, 1, 1, 0, 1, iABC)		/* OP_TAILCALL */
+ ,opmode(0, 0, 1, 0, 0, iABC)		/* OP_RETURN */
+ ,opmode(0, 0, 0, 0, 0, iABC)		/* OP_RETURN0 */
+ ,opmode(0, 0, 0, 0, 0, iABC)		/* OP_RETURN1 */
+ ,opmode(0, 0, 0, 0, 1, iABx)		/* OP_FORLOOP */
+ ,opmode(0, 0, 0, 0, 1, iABx)		/* OP_FORPREP */
+ ,opmode(0, 0, 0, 0, 0, iABx)		/* OP_TFORPREP */
+ ,opmode(0, 0, 0, 0, 0, iABC)		/* OP_TFORCALL */
+ ,opmode(0, 0, 0, 0, 1, iABx)		/* OP_TFORLOOP */
+ ,opmode(0, 0, 1, 0, 0, iABC)		/* OP_SETLIST */
+ ,opmode(0, 0, 0, 0, 1, iABx)		/* OP_CLOSURE */
+ ,opmode(0, 1, 0, 0, 1, iABC)		/* OP_VARARG */
+ ,opmode(0, 0, 1, 0, 1, iABC)		/* OP_VARARGPREP */
+ ,opmode(0, 0, 0, 0, 0, iAx)		/* OP_EXTRAARG */
+};
+
diff --git a/src/libs/3rdparty/lua/src/lopcodes.h b/src/libs/3rdparty/lua/src/lopcodes.h
new file mode 100644
index 0000000000..4c55145399
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lopcodes.h
@@ -0,0 +1,405 @@
+/*
+** $Id: lopcodes.h $
+** Opcodes for Lua virtual machine
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lopcodes_h
+#define lopcodes_h
+
+#include "llimits.h"
+
+
+/*===========================================================================
+  We assume that instructions are unsigned 32-bit integers.
+  All instructions have an opcode in the first 7 bits.
+  Instructions can have the following formats:
+
+        3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0
+        1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
+iABC          C(8)     |      B(8)     |k|     A(8)      |   Op(7)     |
+iABx                Bx(17)               |     A(8)      |   Op(7)     |
+iAsBx              sBx (signed)(17)      |     A(8)      |   Op(7)     |
+iAx                           Ax(25)                     |   Op(7)     |
+isJ                           sJ (signed)(25)            |   Op(7)     |
+
+  A signed argument is represented in excess K: the represented value is
+  the written unsigned value minus K, where K is half the maximum for the
+  corresponding unsigned argument.
+===========================================================================*/
+
+
+enum OpMode {iABC, iABx, iAsBx, iAx, isJ};  /* basic instruction formats */
+
+
+/*
+** size and position of opcode arguments.
+*/
+#define SIZE_C		8
+#define SIZE_B		8
+#define SIZE_Bx		(SIZE_C + SIZE_B + 1)
+#define SIZE_A		8
+#define SIZE_Ax		(SIZE_Bx + SIZE_A)
+#define SIZE_sJ		(SIZE_Bx + SIZE_A)
+
+#define SIZE_OP		7
+
+#define POS_OP		0
+
+#define POS_A		(POS_OP + SIZE_OP)
+#define POS_k		(POS_A + SIZE_A)
+#define POS_B		(POS_k + 1)
+#define POS_C		(POS_B + SIZE_B)
+
+#define POS_Bx		POS_k
+
+#define POS_Ax		POS_A
+
+#define POS_sJ		POS_A
+
+
+/*
+** limits for opcode arguments.
+** we use (signed) 'int' to manipulate most arguments,
+** so they must fit in ints.
+*/
+
+/* Check whether type 'int' has at least 'b' bits ('b' < 32) */
+#define L_INTHASBITS(b)		((UINT_MAX >> ((b) - 1)) >= 1)
+
+
+#if L_INTHASBITS(SIZE_Bx)
+#define MAXARG_Bx	((1<<SIZE_Bx)-1)
+#else
+#define MAXARG_Bx	MAX_INT
+#endif
+
+#define OFFSET_sBx	(MAXARG_Bx>>1)         /* 'sBx' is signed */
+
+
+#if L_INTHASBITS(SIZE_Ax)
+#define MAXARG_Ax	((1<<SIZE_Ax)-1)
+#else
+#define MAXARG_Ax	MAX_INT
+#endif
+
+#if L_INTHASBITS(SIZE_sJ)
+#define MAXARG_sJ	((1 << SIZE_sJ) - 1)
+#else
+#define MAXARG_sJ	MAX_INT
+#endif
+
+#define OFFSET_sJ	(MAXARG_sJ >> 1)
+
+
+#define MAXARG_A	((1<<SIZE_A)-1)
+#define MAXARG_B	((1<<SIZE_B)-1)
+#define MAXARG_C	((1<<SIZE_C)-1)
+#define OFFSET_sC	(MAXARG_C >> 1)
+
+#define int2sC(i)	((i) + OFFSET_sC)
+#define sC2int(i)	((i) - OFFSET_sC)
+
+
+/* creates a mask with 'n' 1 bits at position 'p' */
+#define MASK1(n,p)	((~((~(Instruction)0)<<(n)))<<(p))
+
+/* creates a mask with 'n' 0 bits at position 'p' */
+#define MASK0(n,p)	(~MASK1(n,p))
+
+/*
+** the following macros help to manipulate instructions
+*/
+
+#define GET_OPCODE(i)	(cast(OpCode, ((i)>>POS_OP) & MASK1(SIZE_OP,0)))
+#define SET_OPCODE(i,o)	((i) = (((i)&MASK0(SIZE_OP,POS_OP)) | \
+		((cast(Instruction, o)<<POS_OP)&MASK1(SIZE_OP,POS_OP))))
+
+#define checkopm(i,m)	(getOpMode(GET_OPCODE(i)) == m)
+
+
+#define getarg(i,pos,size)	(cast_int(((i)>>(pos)) & MASK1(size,0)))
+#define setarg(i,v,pos,size)	((i) = (((i)&MASK0(size,pos)) | \
+                ((cast(Instruction, v)<<pos)&MASK1(size,pos))))
+
+#define GETARG_A(i)	getarg(i, POS_A, SIZE_A)
+#define SETARG_A(i,v)	setarg(i, v, POS_A, SIZE_A)
+
+#define GETARG_B(i)	check_exp(checkopm(i, iABC), getarg(i, POS_B, SIZE_B))
+#define GETARG_sB(i)	sC2int(GETARG_B(i))
+#define SETARG_B(i,v)	setarg(i, v, POS_B, SIZE_B)
+
+#define GETARG_C(i)	check_exp(checkopm(i, iABC), getarg(i, POS_C, SIZE_C))
+#define GETARG_sC(i)	sC2int(GETARG_C(i))
+#define SETARG_C(i,v)	setarg(i, v, POS_C, SIZE_C)
+
+#define TESTARG_k(i)	check_exp(checkopm(i, iABC), (cast_int(((i) & (1u << POS_k)))))
+#define GETARG_k(i)	check_exp(checkopm(i, iABC), getarg(i, POS_k, 1))
+#define SETARG_k(i,v)	setarg(i, v, POS_k, 1)
+
+#define GETARG_Bx(i)	check_exp(checkopm(i, iABx), getarg(i, POS_Bx, SIZE_Bx))
+#define SETARG_Bx(i,v)	setarg(i, v, POS_Bx, SIZE_Bx)
+
+#define GETARG_Ax(i)	check_exp(checkopm(i, iAx), getarg(i, POS_Ax, SIZE_Ax))
+#define SETARG_Ax(i,v)	setarg(i, v, POS_Ax, SIZE_Ax)
+
+#define GETARG_sBx(i)  \
+	check_exp(checkopm(i, iAsBx), getarg(i, POS_Bx, SIZE_Bx) - OFFSET_sBx)
+#define SETARG_sBx(i,b)	SETARG_Bx((i),cast_uint((b)+OFFSET_sBx))
+
+#define GETARG_sJ(i)  \
+	check_exp(checkopm(i, isJ), getarg(i, POS_sJ, SIZE_sJ) - OFFSET_sJ)
+#define SETARG_sJ(i,j) \
+	setarg(i, cast_uint((j)+OFFSET_sJ), POS_sJ, SIZE_sJ)
+
+
+#define CREATE_ABCk(o,a,b,c,k)	((cast(Instruction, o)<<POS_OP) \
+			| (cast(Instruction, a)<<POS_A) \
+			| (cast(Instruction, b)<<POS_B) \
+			| (cast(Instruction, c)<<POS_C) \
+			| (cast(Instruction, k)<<POS_k))
+
+#define CREATE_ABx(o,a,bc)	((cast(Instruction, o)<<POS_OP) \
+			| (cast(Instruction, a)<<POS_A) \
+			| (cast(Instruction, bc)<<POS_Bx))
+
+#define CREATE_Ax(o,a)		((cast(Instruction, o)<<POS_OP) \
+			| (cast(Instruction, a)<<POS_Ax))
+
+#define CREATE_sJ(o,j,k)	((cast(Instruction, o) << POS_OP) \
+			| (cast(Instruction, j) << POS_sJ) \
+			| (cast(Instruction, k) << POS_k))
+
+
+#if !defined(MAXINDEXRK)  /* (for debugging only) */
+#define MAXINDEXRK	MAXARG_B
+#endif
+
+
+/*
+** invalid register that fits in 8 bits
+*/
+#define NO_REG		MAXARG_A
+
+
+/*
+** R[x] - register
+** K[x] - constant (in constant table)
+** RK(x) == if k(i) then K[x] else R[x]
+*/
+
+
+/*
+** Grep "ORDER OP" if you change these enums. Opcodes marked with a (*)
+** has extra descriptions in the notes after the enumeration.
+*/
+
+typedef enum {
+/*----------------------------------------------------------------------
+  name		args	description
+------------------------------------------------------------------------*/
+OP_MOVE,/*	A B	R[A] := R[B]					*/
+OP_LOADI,/*	A sBx	R[A] := sBx					*/
+OP_LOADF,/*	A sBx	R[A] := (lua_Number)sBx				*/
+OP_LOADK,/*	A Bx	R[A] := K[Bx]					*/
+OP_LOADKX,/*	A	R[A] := K[extra arg]				*/
+OP_LOADFALSE,/*	A	R[A] := false					*/
+OP_LFALSESKIP,/*A	R[A] := false; pc++	(*)			*/
+OP_LOADTRUE,/*	A	R[A] := true					*/
+OP_LOADNIL,/*	A B	R[A], R[A+1], ..., R[A+B] := nil		*/
+OP_GETUPVAL,/*	A B	R[A] := UpValue[B]				*/
+OP_SETUPVAL,/*	A B	UpValue[B] := R[A]				*/
+
+OP_GETTABUP,/*	A B C	R[A] := UpValue[B][K[C]:string]			*/
+OP_GETTABLE,/*	A B C	R[A] := R[B][R[C]]				*/
+OP_GETI,/*	A B C	R[A] := R[B][C]					*/
+OP_GETFIELD,/*	A B C	R[A] := R[B][K[C]:string]			*/
+
+OP_SETTABUP,/*	A B C	UpValue[A][K[B]:string] := RK(C)		*/
+OP_SETTABLE,/*	A B C	R[A][R[B]] := RK(C)				*/
+OP_SETI,/*	A B C	R[A][B] := RK(C)				*/
+OP_SETFIELD,/*	A B C	R[A][K[B]:string] := RK(C)			*/
+
+OP_NEWTABLE,/*	A B C k	R[A] := {}					*/
+
+OP_SELF,/*	A B C	R[A+1] := R[B]; R[A] := R[B][RK(C):string]	*/
+
+OP_ADDI,/*	A B sC	R[A] := R[B] + sC				*/
+
+OP_ADDK,/*	A B C	R[A] := R[B] + K[C]:number			*/
+OP_SUBK,/*	A B C	R[A] := R[B] - K[C]:number			*/
+OP_MULK,/*	A B C	R[A] := R[B] * K[C]:number			*/
+OP_MODK,/*	A B C	R[A] := R[B] % K[C]:number			*/
+OP_POWK,/*	A B C	R[A] := R[B] ^ K[C]:number			*/
+OP_DIVK,/*	A B C	R[A] := R[B] / K[C]:number			*/
+OP_IDIVK,/*	A B C	R[A] := R[B] // K[C]:number			*/
+
+OP_BANDK,/*	A B C	R[A] := R[B] & K[C]:integer			*/
+OP_BORK,/*	A B C	R[A] := R[B] | K[C]:integer			*/
+OP_BXORK,/*	A B C	R[A] := R[B] ~ K[C]:integer			*/
+
+OP_SHRI,/*	A B sC	R[A] := R[B] >> sC				*/
+OP_SHLI,/*	A B sC	R[A] := sC << R[B]				*/
+
+OP_ADD,/*	A B C	R[A] := R[B] + R[C]				*/
+OP_SUB,/*	A B C	R[A] := R[B] - R[C]				*/
+OP_MUL,/*	A B C	R[A] := R[B] * R[C]				*/
+OP_MOD,/*	A B C	R[A] := R[B] % R[C]				*/
+OP_POW,/*	A B C	R[A] := R[B] ^ R[C]				*/
+OP_DIV,/*	A B C	R[A] := R[B] / R[C]				*/
+OP_IDIV,/*	A B C	R[A] := R[B] // R[C]				*/
+
+OP_BAND,/*	A B C	R[A] := R[B] & R[C]				*/
+OP_BOR,/*	A B C	R[A] := R[B] | R[C]				*/
+OP_BXOR,/*	A B C	R[A] := R[B] ~ R[C]				*/
+OP_SHL,/*	A B C	R[A] := R[B] << R[C]				*/
+OP_SHR,/*	A B C	R[A] := R[B] >> R[C]				*/
+
+OP_MMBIN,/*	A B C	call C metamethod over R[A] and R[B]	(*)	*/
+OP_MMBINI,/*	A sB C k	call C metamethod over R[A] and sB	*/
+OP_MMBINK,/*	A B C k		call C metamethod over R[A] and K[B]	*/
+
+OP_UNM,/*	A B	R[A] := -R[B]					*/
+OP_BNOT,/*	A B	R[A] := ~R[B]					*/
+OP_NOT,/*	A B	R[A] := not R[B]				*/
+OP_LEN,/*	A B	R[A] := #R[B] (length operator)			*/
+
+OP_CONCAT,/*	A B	R[A] := R[A].. ... ..R[A + B - 1]		*/
+
+OP_CLOSE,/*	A	close all upvalues >= R[A]			*/
+OP_TBC,/*	A	mark variable A "to be closed"			*/
+OP_JMP,/*	sJ	pc += sJ					*/
+OP_EQ,/*	A B k	if ((R[A] == R[B]) ~= k) then pc++		*/
+OP_LT,/*	A B k	if ((R[A] <  R[B]) ~= k) then pc++		*/
+OP_LE,/*	A B k	if ((R[A] <= R[B]) ~= k) then pc++		*/
+
+OP_EQK,/*	A B k	if ((R[A] == K[B]) ~= k) then pc++		*/
+OP_EQI,/*	A sB k	if ((R[A] == sB) ~= k) then pc++		*/
+OP_LTI,/*	A sB k	if ((R[A] < sB) ~= k) then pc++			*/
+OP_LEI,/*	A sB k	if ((R[A] <= sB) ~= k) then pc++		*/
+OP_GTI,/*	A sB k	if ((R[A] > sB) ~= k) then pc++			*/
+OP_GEI,/*	A sB k	if ((R[A] >= sB) ~= k) then pc++		*/
+
+OP_TEST,/*	A k	if (not R[A] == k) then pc++			*/
+OP_TESTSET,/*	A B k	if (not R[B] == k) then pc++ else R[A] := R[B] (*) */
+
+OP_CALL,/*	A B C	R[A], ... ,R[A+C-2] := R[A](R[A+1], ... ,R[A+B-1]) */
+OP_TAILCALL,/*	A B C k	return R[A](R[A+1], ... ,R[A+B-1])		*/
+
+OP_RETURN,/*	A B C k	return R[A], ... ,R[A+B-2]	(see note)	*/
+OP_RETURN0,/*		return						*/
+OP_RETURN1,/*	A	return R[A]					*/
+
+OP_FORLOOP,/*	A Bx	update counters; if loop continues then pc-=Bx; */
+OP_FORPREP,/*	A Bx	<check values and prepare counters>;
+                        if not to run then pc+=Bx+1;			*/
+
+OP_TFORPREP,/*	A Bx	create upvalue for R[A + 3]; pc+=Bx		*/
+OP_TFORCALL,/*	A C	R[A+4], ... ,R[A+3+C] := R[A](R[A+1], R[A+2]);	*/
+OP_TFORLOOP,/*	A Bx	if R[A+2] ~= nil then { R[A]=R[A+2]; pc -= Bx }	*/
+
+OP_SETLIST,/*	A B C k	R[A][C+i] := R[A+i], 1 <= i <= B		*/
+
+OP_CLOSURE,/*	A Bx	R[A] := closure(KPROTO[Bx])			*/
+
+OP_VARARG,/*	A C	R[A], R[A+1], ..., R[A+C-2] = vararg		*/
+
+OP_VARARGPREP,/*A	(adjust vararg parameters)			*/
+
+OP_EXTRAARG/*	Ax	extra (larger) argument for previous opcode	*/
+} OpCode;
+
+
+#define NUM_OPCODES	((int)(OP_EXTRAARG) + 1)
+
+
+
+/*===========================================================================
+  Notes:
+
+  (*) Opcode OP_LFALSESKIP is used to convert a condition to a boolean
+  value, in a code equivalent to (not cond ? false : true).  (It
+  produces false and skips the next instruction producing true.)
+
+  (*) Opcodes OP_MMBIN and variants follow each arithmetic and
+  bitwise opcode. If the operation succeeds, it skips this next
+  opcode. Otherwise, this opcode calls the corresponding metamethod.
+
+  (*) Opcode OP_TESTSET is used in short-circuit expressions that need
+  both to jump and to produce a value, such as (a = b or c).
+
+  (*) In OP_CALL, if (B == 0) then B = top - A. If (C == 0), then
+  'top' is set to last_result+1, so next open instruction (OP_CALL,
+  OP_RETURN*, OP_SETLIST) may use 'top'.
+
+  (*) In OP_VARARG, if (C == 0) then use actual number of varargs and
+  set top (like in OP_CALL with C == 0).
+
+  (*) In OP_RETURN, if (B == 0) then return up to 'top'.
+
+  (*) In OP_LOADKX and OP_NEWTABLE, the next instruction is always
+  OP_EXTRAARG.
+
+  (*) In OP_SETLIST, if (B == 0) then real B = 'top'; if k, then
+  real C = EXTRAARG _ C (the bits of EXTRAARG concatenated with the
+  bits of C).
+
+  (*) In OP_NEWTABLE, B is log2 of the hash size (which is always a
+  power of 2) plus 1, or zero for size zero. If not k, the array size
+  is C. Otherwise, the array size is EXTRAARG _ C.
+
+  (*) For comparisons, k specifies what condition the test should accept
+  (true or false).
+
+  (*) In OP_MMBINI/OP_MMBINK, k means the arguments were flipped
+   (the constant is the first operand).
+
+  (*) All 'skips' (pc++) assume that next instruction is a jump.
+
+  (*) In instructions OP_RETURN/OP_TAILCALL, 'k' specifies that the
+  function builds upvalues, which may need to be closed. C > 0 means
+  the function is vararg, so that its 'func' must be corrected before
+  returning; in this case, (C - 1) is its number of fixed parameters.
+
+  (*) In comparisons with an immediate operand, C signals whether the
+  original operand was a float. (It must be corrected in case of
+  metamethods.)
+
+===========================================================================*/
+
+
+/*
+** masks for instruction properties. The format is:
+** bits 0-2: op mode
+** bit 3: instruction set register A
+** bit 4: operator is a test (next instruction must be a jump)
+** bit 5: instruction uses 'L->top' set by previous instruction (when B == 0)
+** bit 6: instruction sets 'L->top' for next instruction (when C == 0)
+** bit 7: instruction is an MM instruction (call a metamethod)
+*/
+
+LUAI_DDEC(const lu_byte luaP_opmodes[NUM_OPCODES];)
+
+#define getOpMode(m)	(cast(enum OpMode, luaP_opmodes[m] & 7))
+#define testAMode(m)	(luaP_opmodes[m] & (1 << 3))
+#define testTMode(m)	(luaP_opmodes[m] & (1 << 4))
+#define testITMode(m)	(luaP_opmodes[m] & (1 << 5))
+#define testOTMode(m)	(luaP_opmodes[m] & (1 << 6))
+#define testMMMode(m)	(luaP_opmodes[m] & (1 << 7))
+
+/* "out top" (set top for next instruction) */
+#define isOT(i)  \
+	((testOTMode(GET_OPCODE(i)) && GETARG_C(i) == 0) || \
+          GET_OPCODE(i) == OP_TAILCALL)
+
+/* "in top" (uses top from previous instruction) */
+#define isIT(i)		(testITMode(GET_OPCODE(i)) && GETARG_B(i) == 0)
+
+#define opmode(mm,ot,it,t,a,m)  \
+    (((mm) << 7) | ((ot) << 6) | ((it) << 5) | ((t) << 4) | ((a) << 3) | (m))
+
+
+/* number of list items to accumulate before a SETLIST instruction */
+#define LFIELDS_PER_FLUSH	50
+
+#endif
diff --git a/src/libs/3rdparty/lua/src/lopnames.h b/src/libs/3rdparty/lua/src/lopnames.h
new file mode 100644
index 0000000000..965cec9bf2
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lopnames.h
@@ -0,0 +1,103 @@
+/*
+** $Id: lopnames.h $
+** Opcode names
+** See Copyright Notice in lua.h
+*/
+
+#if !defined(lopnames_h)
+#define lopnames_h
+
+#include <stddef.h>
+
+
+/* ORDER OP */
+
+static const char *const opnames[] = {
+  "MOVE",
+  "LOADI",
+  "LOADF",
+  "LOADK",
+  "LOADKX",
+  "LOADFALSE",
+  "LFALSESKIP",
+  "LOADTRUE",
+  "LOADNIL",
+  "GETUPVAL",
+  "SETUPVAL",
+  "GETTABUP",
+  "GETTABLE",
+  "GETI",
+  "GETFIELD",
+  "SETTABUP",
+  "SETTABLE",
+  "SETI",
+  "SETFIELD",
+  "NEWTABLE",
+  "SELF",
+  "ADDI",
+  "ADDK",
+  "SUBK",
+  "MULK",
+  "MODK",
+  "POWK",
+  "DIVK",
+  "IDIVK",
+  "BANDK",
+  "BORK",
+  "BXORK",
+  "SHRI",
+  "SHLI",
+  "ADD",
+  "SUB",
+  "MUL",
+  "MOD",
+  "POW",
+  "DIV",
+  "IDIV",
+  "BAND",
+  "BOR",
+  "BXOR",
+  "SHL",
+  "SHR",
+  "MMBIN",
+  "MMBINI",
+  "MMBINK",
+  "UNM",
+  "BNOT",
+  "NOT",
+  "LEN",
+  "CONCAT",
+  "CLOSE",
+  "TBC",
+  "JMP",
+  "EQ",
+  "LT",
+  "LE",
+  "EQK",
+  "EQI",
+  "LTI",
+  "LEI",
+  "GTI",
+  "GEI",
+  "TEST",
+  "TESTSET",
+  "CALL",
+  "TAILCALL",
+  "RETURN",
+  "RETURN0",
+  "RETURN1",
+  "FORLOOP",
+  "FORPREP",
+  "TFORPREP",
+  "TFORCALL",
+  "TFORLOOP",
+  "SETLIST",
+  "CLOSURE",
+  "VARARG",
+  "VARARGPREP",
+  "EXTRAARG",
+  NULL
+};
+
+#endif
+
diff --git a/src/libs/3rdparty/lua/src/loslib.c b/src/libs/3rdparty/lua/src/loslib.c
new file mode 100644
index 0000000000..ad5a927688
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/loslib.c
@@ -0,0 +1,428 @@
+/*
+** $Id: loslib.c $
+** Standard Operating System library
+** See Copyright Notice in lua.h
+*/
+
+#define loslib_c
+#define LUA_LIB
+
+#include "lprefix.h"
+
+
+#include <errno.h>
+#include <locale.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+#include "lua.h"
+
+#include "lauxlib.h"
+#include "lualib.h"
+
+
+/*
+** {==================================================================
+** List of valid conversion specifiers for the 'strftime' function;
+** options are grouped by length; group of length 2 start with '||'.
+** ===================================================================
+*/
+#if !defined(LUA_STRFTIMEOPTIONS)	/* { */
+
+#if defined(LUA_USE_WINDOWS)
+#define LUA_STRFTIMEOPTIONS  "aAbBcdHIjmMpSUwWxXyYzZ%" \
+    "||" "#c#x#d#H#I#j#m#M#S#U#w#W#y#Y"  /* two-char options */
+#elif defined(LUA_USE_C89)  /* ANSI C 89 (only 1-char options) */
+#define LUA_STRFTIMEOPTIONS  "aAbBcdHIjmMpSUwWxXyYZ%"
+#else  /* C99 specification */
+#define LUA_STRFTIMEOPTIONS  "aAbBcCdDeFgGhHIjmMnprRStTuUVwWxXyYzZ%" \
+    "||" "EcECExEXEyEY" "OdOeOHOIOmOMOSOuOUOVOwOWOy"  /* two-char options */
+#endif
+
+#endif					/* } */
+/* }================================================================== */
+
+
+/*
+** {==================================================================
+** Configuration for time-related stuff
+** ===================================================================
+*/
+
+/*
+** type to represent time_t in Lua
+*/
+#if !defined(LUA_NUMTIME)	/* { */
+
+#define l_timet			lua_Integer
+#define l_pushtime(L,t)		lua_pushinteger(L,(lua_Integer)(t))
+#define l_gettime(L,arg)	luaL_checkinteger(L, arg)
+
+#else				/* }{ */
+
+#define l_timet			lua_Number
+#define l_pushtime(L,t)		lua_pushnumber(L,(lua_Number)(t))
+#define l_gettime(L,arg)	luaL_checknumber(L, arg)
+
+#endif				/* } */
+
+
+#if !defined(l_gmtime)		/* { */
+/*
+** By default, Lua uses gmtime/localtime, except when POSIX is available,
+** where it uses gmtime_r/localtime_r
+*/
+
+#if defined(LUA_USE_POSIX)	/* { */
+
+#define l_gmtime(t,r)		gmtime_r(t,r)
+#define l_localtime(t,r)	localtime_r(t,r)
+
+#else				/* }{ */
+
+/* ISO C definitions */
+#define l_gmtime(t,r)		((void)(r)->tm_sec, gmtime(t))
+#define l_localtime(t,r)	((void)(r)->tm_sec, localtime(t))
+
+#endif				/* } */
+
+#endif				/* } */
+
+/* }================================================================== */
+
+
+/*
+** {==================================================================
+** Configuration for 'tmpnam':
+** By default, Lua uses tmpnam except when POSIX is available, where
+** it uses mkstemp.
+** ===================================================================
+*/
+#if !defined(lua_tmpnam)	/* { */
+
+#if defined(LUA_USE_POSIX)	/* { */
+
+#include <unistd.h>
+
+#define LUA_TMPNAMBUFSIZE	32
+
+#if !defined(LUA_TMPNAMTEMPLATE)
+#define LUA_TMPNAMTEMPLATE	"/tmp/lua_XXXXXX"
+#endif
+
+#define lua_tmpnam(b,e) { \
+        strcpy(b, LUA_TMPNAMTEMPLATE); \
+        e = mkstemp(b); \
+        if (e != -1) close(e); \
+        e = (e == -1); }
+
+#else				/* }{ */
+
+/* ISO C definitions */
+#define LUA_TMPNAMBUFSIZE	L_tmpnam
+#define lua_tmpnam(b,e)		{ e = (tmpnam(b) == NULL); }
+
+#endif				/* } */
+
+#endif				/* } */
+/* }================================================================== */
+
+
+#if !defined(l_system)
+#if defined(LUA_USE_IOS)
+/* Despite claiming to be ISO C, iOS does not implement 'system'. */
+#define l_system(cmd) ((cmd) == NULL ? 0 : -1)
+#else
+#define l_system(cmd)	system(cmd)  /* default definition */
+#endif
+#endif
+
+
+static int os_execute (lua_State *L) {
+  const char *cmd = luaL_optstring(L, 1, NULL);
+  int stat;
+  errno = 0;
+  stat = l_system(cmd);
+  if (cmd != NULL)
+    return luaL_execresult(L, stat);
+  else {
+    lua_pushboolean(L, stat);  /* true if there is a shell */
+    return 1;
+  }
+}
+
+
+static int os_remove (lua_State *L) {
+  const char *filename = luaL_checkstring(L, 1);
+  return luaL_fileresult(L, remove(filename) == 0, filename);
+}
+
+
+static int os_rename (lua_State *L) {
+  const char *fromname = luaL_checkstring(L, 1);
+  const char *toname = luaL_checkstring(L, 2);
+  return luaL_fileresult(L, rename(fromname, toname) == 0, NULL);
+}
+
+
+static int os_tmpname (lua_State *L) {
+  char buff[LUA_TMPNAMBUFSIZE];
+  int err;
+  lua_tmpnam(buff, err);
+  if (l_unlikely(err))
+    return luaL_error(L, "unable to generate a unique filename");
+  lua_pushstring(L, buff);
+  return 1;
+}
+
+
+static int os_getenv (lua_State *L) {
+  lua_pushstring(L, getenv(luaL_checkstring(L, 1)));  /* if NULL push nil */
+  return 1;
+}
+
+
+static int os_clock (lua_State *L) {
+  lua_pushnumber(L, ((lua_Number)clock())/(lua_Number)CLOCKS_PER_SEC);
+  return 1;
+}
+
+
+/*
+** {======================================================
+** Time/Date operations
+** { year=%Y, month=%m, day=%d, hour=%H, min=%M, sec=%S,
+**   wday=%w+1, yday=%j, isdst=? }
+** =======================================================
+*/
+
+/*
+** About the overflow check: an overflow cannot occur when time
+** is represented by a lua_Integer, because either lua_Integer is
+** large enough to represent all int fields or it is not large enough
+** to represent a time that cause a field to overflow.  However, if
+** times are represented as doubles and lua_Integer is int, then the
+** time 0x1.e1853b0d184f6p+55 would cause an overflow when adding 1900
+** to compute the year.
+*/
+static void setfield (lua_State *L, const char *key, int value, int delta) {
+  #if (defined(LUA_NUMTIME) && LUA_MAXINTEGER <= INT_MAX)
+    if (l_unlikely(value > LUA_MAXINTEGER - delta))
+      luaL_error(L, "field '%s' is out-of-bound", key);
+  #endif
+  lua_pushinteger(L, (lua_Integer)value + delta);
+  lua_setfield(L, -2, key);
+}
+
+
+static void setboolfield (lua_State *L, const char *key, int value) {
+  if (value < 0)  /* undefined? */
+    return;  /* does not set field */
+  lua_pushboolean(L, value);
+  lua_setfield(L, -2, key);
+}
+
+
+/*
+** Set all fields from structure 'tm' in the table on top of the stack
+*/
+static void setallfields (lua_State *L, struct tm *stm) {
+  setfield(L, "year", stm->tm_year, 1900);
+  setfield(L, "month", stm->tm_mon, 1);
+  setfield(L, "day", stm->tm_mday, 0);
+  setfield(L, "hour", stm->tm_hour, 0);
+  setfield(L, "min", stm->tm_min, 0);
+  setfield(L, "sec", stm->tm_sec, 0);
+  setfield(L, "yday", stm->tm_yday, 1);
+  setfield(L, "wday", stm->tm_wday, 1);
+  setboolfield(L, "isdst", stm->tm_isdst);
+}
+
+
+static int getboolfield (lua_State *L, const char *key) {
+  int res;
+  res = (lua_getfield(L, -1, key) == LUA_TNIL) ? -1 : lua_toboolean(L, -1);
+  lua_pop(L, 1);
+  return res;
+}
+
+
+static int getfield (lua_State *L, const char *key, int d, int delta) {
+  int isnum;
+  int t = lua_getfield(L, -1, key);  /* get field and its type */
+  lua_Integer res = lua_tointegerx(L, -1, &isnum);
+  if (!isnum) {  /* field is not an integer? */
+    if (l_unlikely(t != LUA_TNIL))  /* some other value? */
+      return luaL_error(L, "field '%s' is not an integer", key);
+    else if (l_unlikely(d < 0))  /* absent field; no default? */
+      return luaL_error(L, "field '%s' missing in date table", key);
+    res = d;
+  }
+  else {
+    if (!(res >= 0 ? res - delta <= INT_MAX : INT_MIN + delta <= res))
+      return luaL_error(L, "field '%s' is out-of-bound", key);
+    res -= delta;
+  }
+  lua_pop(L, 1);
+  return (int)res;
+}
+
+
+static const char *checkoption (lua_State *L, const char *conv,
+                                ptrdiff_t convlen, char *buff) {
+  const char *option = LUA_STRFTIMEOPTIONS;
+  int oplen = 1;  /* length of options being checked */
+  for (; *option != '\0' && oplen <= convlen; option += oplen) {
+    if (*option == '|')  /* next block? */
+      oplen++;  /* will check options with next length (+1) */
+    else if (memcmp(conv, option, oplen) == 0) {  /* match? */
+      memcpy(buff, conv, oplen);  /* copy valid option to buffer */
+      buff[oplen] = '\0';
+      return conv + oplen;  /* return next item */
+    }
+  }
+  luaL_argerror(L, 1,
+    lua_pushfstring(L, "invalid conversion specifier '%%%s'", conv));
+  return conv;  /* to avoid warnings */
+}
+
+
+static time_t l_checktime (lua_State *L, int arg) {
+  l_timet t = l_gettime(L, arg);
+  luaL_argcheck(L, (time_t)t == t, arg, "time out-of-bounds");
+  return (time_t)t;
+}
+
+
+/* maximum size for an individual 'strftime' item */
+#define SIZETIMEFMT	250
+
+
+static int os_date (lua_State *L) {
+  size_t slen;
+  const char *s = luaL_optlstring(L, 1, "%c", &slen);
+  time_t t = luaL_opt(L, l_checktime, 2, time(NULL));
+  const char *se = s + slen;  /* 's' end */
+  struct tm tmr, *stm;
+  if (*s == '!') {  /* UTC? */
+    stm = l_gmtime(&t, &tmr);
+    s++;  /* skip '!' */
+  }
+  else
+    stm = l_localtime(&t, &tmr);
+  if (stm == NULL)  /* invalid date? */
+    return luaL_error(L,
+                 "date result cannot be represented in this installation");
+  if (strcmp(s, "*t") == 0) {
+    lua_createtable(L, 0, 9);  /* 9 = number of fields */
+    setallfields(L, stm);
+  }
+  else {
+    char cc[4];  /* buffer for individual conversion specifiers */
+    luaL_Buffer b;
+    cc[0] = '%';
+    luaL_buffinit(L, &b);
+    while (s < se) {
+      if (*s != '%')  /* not a conversion specifier? */
+        luaL_addchar(&b, *s++);
+      else {
+        size_t reslen;
+        char *buff = luaL_prepbuffsize(&b, SIZETIMEFMT);
+        s++;  /* skip '%' */
+        s = checkoption(L, s, se - s, cc + 1);  /* copy specifier to 'cc' */
+        reslen = strftime(buff, SIZETIMEFMT, cc, stm);
+        luaL_addsize(&b, reslen);
+      }
+    }
+    luaL_pushresult(&b);
+  }
+  return 1;
+}
+
+
+static int os_time (lua_State *L) {
+  time_t t;
+  if (lua_isnoneornil(L, 1))  /* called without args? */
+    t = time(NULL);  /* get current time */
+  else {
+    struct tm ts;
+    luaL_checktype(L, 1, LUA_TTABLE);
+    lua_settop(L, 1);  /* make sure table is at the top */
+    ts.tm_year = getfield(L, "year", -1, 1900);
+    ts.tm_mon = getfield(L, "month", -1, 1);
+    ts.tm_mday = getfield(L, "day", -1, 0);
+    ts.tm_hour = getfield(L, "hour", 12, 0);
+    ts.tm_min = getfield(L, "min", 0, 0);
+    ts.tm_sec = getfield(L, "sec", 0, 0);
+    ts.tm_isdst = getboolfield(L, "isdst");
+    t = mktime(&ts);
+    setallfields(L, &ts);  /* update fields with normalized values */
+  }
+  if (t != (time_t)(l_timet)t || t == (time_t)(-1))
+    return luaL_error(L,
+                  "time result cannot be represented in this installation");
+  l_pushtime(L, t);
+  return 1;
+}
+
+
+static int os_difftime (lua_State *L) {
+  time_t t1 = l_checktime(L, 1);
+  time_t t2 = l_checktime(L, 2);
+  lua_pushnumber(L, (lua_Number)difftime(t1, t2));
+  return 1;
+}
+
+/* }====================================================== */
+
+
+static int os_setlocale (lua_State *L) {
+  static const int cat[] = {LC_ALL, LC_COLLATE, LC_CTYPE, LC_MONETARY,
+                      LC_NUMERIC, LC_TIME};
+  static const char *const catnames[] = {"all", "collate", "ctype", "monetary",
+     "numeric", "time", NULL};
+  const char *l = luaL_optstring(L, 1, NULL);
+  int op = luaL_checkoption(L, 2, "all", catnames);
+  lua_pushstring(L, setlocale(cat[op], l));
+  return 1;
+}
+
+
+static int os_exit (lua_State *L) {
+  int status;
+  if (lua_isboolean(L, 1))
+    status = (lua_toboolean(L, 1) ? EXIT_SUCCESS : EXIT_FAILURE);
+  else
+    status = (int)luaL_optinteger(L, 1, EXIT_SUCCESS);
+  if (lua_toboolean(L, 2))
+    lua_close(L);
+  if (L) exit(status);  /* 'if' to avoid warnings for unreachable 'return' */
+  return 0;
+}
+
+
+static const luaL_Reg syslib[] = {
+  {"clock",     os_clock},
+  {"date",      os_date},
+  {"difftime",  os_difftime},
+  {"execute",   os_execute},
+  {"exit",      os_exit},
+  {"getenv",    os_getenv},
+  {"remove",    os_remove},
+  {"rename",    os_rename},
+  {"setlocale", os_setlocale},
+  {"time",      os_time},
+  {"tmpname",   os_tmpname},
+  {NULL, NULL}
+};
+
+/* }====================================================== */
+
+
+
+LUAMOD_API int luaopen_os (lua_State *L) {
+  luaL_newlib(L, syslib);
+  return 1;
+}
+
diff --git a/src/libs/3rdparty/lua/src/lparser.c b/src/libs/3rdparty/lua/src/lparser.c
new file mode 100644
index 0000000000..b745f236f0
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lparser.c
@@ -0,0 +1,1967 @@
+/*
+** $Id: lparser.c $
+** Lua Parser
+** See Copyright Notice in lua.h
+*/
+
+#define lparser_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include <limits.h>
+#include <string.h>
+
+#include "lua.h"
+
+#include "lcode.h"
+#include "ldebug.h"
+#include "ldo.h"
+#include "lfunc.h"
+#include "llex.h"
+#include "lmem.h"
+#include "lobject.h"
+#include "lopcodes.h"
+#include "lparser.h"
+#include "lstate.h"
+#include "lstring.h"
+#include "ltable.h"
+
+
+
+/* maximum number of local variables per function (must be smaller
+   than 250, due to the bytecode format) */
+#define MAXVARS		200
+
+
+#define hasmultret(k)		((k) == VCALL || (k) == VVARARG)
+
+
+/* because all strings are unified by the scanner, the parser
+   can use pointer equality for string equality */
+#define eqstr(a,b)	((a) == (b))
+
+
+/*
+** nodes for block list (list of active blocks)
+*/
+typedef struct BlockCnt {
+  struct BlockCnt *previous;  /* chain */
+  int firstlabel;  /* index of first label in this block */
+  int firstgoto;  /* index of first pending goto in this block */
+  lu_byte nactvar;  /* # active locals outside the block */
+  lu_byte upval;  /* true if some variable in the block is an upvalue */
+  lu_byte isloop;  /* true if 'block' is a loop */
+  lu_byte insidetbc;  /* true if inside the scope of a to-be-closed var. */
+} BlockCnt;
+
+
+
+/*
+** prototypes for recursive non-terminal functions
+*/
+static void statement (LexState *ls);
+static void expr (LexState *ls, expdesc *v);
+
+
+static l_noret error_expected (LexState *ls, int token) {
+  luaX_syntaxerror(ls,
+      luaO_pushfstring(ls->L, "%s expected", luaX_token2str(ls, token)));
+}
+
+
+static l_noret errorlimit (FuncState *fs, int limit, const char *what) {
+  lua_State *L = fs->ls->L;
+  const char *msg;
+  int line = fs->f->linedefined;
+  const char *where = (line == 0)
+                      ? "main function"
+                      : luaO_pushfstring(L, "function at line %d", line);
+  msg = luaO_pushfstring(L, "too many %s (limit is %d) in %s",
+                             what, limit, where);
+  luaX_syntaxerror(fs->ls, msg);
+}
+
+
+static void checklimit (FuncState *fs, int v, int l, const char *what) {
+  if (v > l) errorlimit(fs, l, what);
+}
+
+
+/*
+** Test whether next token is 'c'; if so, skip it.
+*/
+static int testnext (LexState *ls, int c) {
+  if (ls->t.token == c) {
+    luaX_next(ls);
+    return 1;
+  }
+  else return 0;
+}
+
+
+/*
+** Check that next token is 'c'.
+*/
+static void check (LexState *ls, int c) {
+  if (ls->t.token != c)
+    error_expected(ls, c);
+}
+
+
+/*
+** Check that next token is 'c' and skip it.
+*/
+static void checknext (LexState *ls, int c) {
+  check(ls, c);
+  luaX_next(ls);
+}
+
+
+#define check_condition(ls,c,msg)	{ if (!(c)) luaX_syntaxerror(ls, msg); }
+
+
+/*
+** Check that next token is 'what' and skip it. In case of error,
+** raise an error that the expected 'what' should match a 'who'
+** in line 'where' (if that is not the current line).
+*/
+static void check_match (LexState *ls, int what, int who, int where) {
+  if (l_unlikely(!testnext(ls, what))) {
+    if (where == ls->linenumber)  /* all in the same line? */
+      error_expected(ls, what);  /* do not need a complex message */
+    else {
+      luaX_syntaxerror(ls, luaO_pushfstring(ls->L,
+             "%s expected (to close %s at line %d)",
+              luaX_token2str(ls, what), luaX_token2str(ls, who), where));
+    }
+  }
+}
+
+
+static TString *str_checkname (LexState *ls) {
+  TString *ts;
+  check(ls, TK_NAME);
+  ts = ls->t.seminfo.ts;
+  luaX_next(ls);
+  return ts;
+}
+
+
+static void init_exp (expdesc *e, expkind k, int i) {
+  e->f = e->t = NO_JUMP;
+  e->k = k;
+  e->u.info = i;
+}
+
+
+static void codestring (expdesc *e, TString *s) {
+  e->f = e->t = NO_JUMP;
+  e->k = VKSTR;
+  e->u.strval = s;
+}
+
+
+static void codename (LexState *ls, expdesc *e) {
+  codestring(e, str_checkname(ls));
+}
+
+
+/*
+** Register a new local variable in the active 'Proto' (for debug
+** information).
+*/
+static int registerlocalvar (LexState *ls, FuncState *fs, TString *varname) {
+  Proto *f = fs->f;
+  int oldsize = f->sizelocvars;
+  luaM_growvector(ls->L, f->locvars, fs->ndebugvars, f->sizelocvars,
+                  LocVar, SHRT_MAX, "local variables");
+  while (oldsize < f->sizelocvars)
+    f->locvars[oldsize++].varname = NULL;
+  f->locvars[fs->ndebugvars].varname = varname;
+  f->locvars[fs->ndebugvars].startpc = fs->pc;
+  luaC_objbarrier(ls->L, f, varname);
+  return fs->ndebugvars++;
+}
+
+
+/*
+** Create a new local variable with the given 'name'. Return its index
+** in the function.
+*/
+static int new_localvar (LexState *ls, TString *name) {
+  lua_State *L = ls->L;
+  FuncState *fs = ls->fs;
+  Dyndata *dyd = ls->dyd;
+  Vardesc *var;
+  checklimit(fs, dyd->actvar.n + 1 - fs->firstlocal,
+                 MAXVARS, "local variables");
+  luaM_growvector(L, dyd->actvar.arr, dyd->actvar.n + 1,
+                  dyd->actvar.size, Vardesc, USHRT_MAX, "local variables");
+  var = &dyd->actvar.arr[dyd->actvar.n++];
+  var->vd.kind = VDKREG;  /* default */
+  var->vd.name = name;
+  return dyd->actvar.n - 1 - fs->firstlocal;
+}
+
+#define new_localvarliteral(ls,v) \
+    new_localvar(ls,  \
+      luaX_newstring(ls, "" v, (sizeof(v)/sizeof(char)) - 1));
+
+
+
+/*
+** Return the "variable description" (Vardesc) of a given variable.
+** (Unless noted otherwise, all variables are referred to by their
+** compiler indices.)
+*/
+static Vardesc *getlocalvardesc (FuncState *fs, int vidx) {
+  return &fs->ls->dyd->actvar.arr[fs->firstlocal + vidx];
+}
+
+
+/*
+** Convert 'nvar', a compiler index level, to its corresponding
+** register. For that, search for the highest variable below that level
+** that is in a register and uses its register index ('ridx') plus one.
+*/
+static int reglevel (FuncState *fs, int nvar) {
+  while (nvar-- > 0) {
+    Vardesc *vd = getlocalvardesc(fs, nvar);  /* get previous variable */
+    if (vd->vd.kind != RDKCTC)  /* is in a register? */
+      return vd->vd.ridx + 1;
+  }
+  return 0;  /* no variables in registers */
+}
+
+
+/*
+** Return the number of variables in the register stack for the given
+** function.
+*/
+int luaY_nvarstack (FuncState *fs) {
+  return reglevel(fs, fs->nactvar);
+}
+
+
+/*
+** Get the debug-information entry for current variable 'vidx'.
+*/
+static LocVar *localdebuginfo (FuncState *fs, int vidx) {
+  Vardesc *vd = getlocalvardesc(fs,  vidx);
+  if (vd->vd.kind == RDKCTC)
+    return NULL;  /* no debug info. for constants */
+  else {
+    int idx = vd->vd.pidx;
+    lua_assert(idx < fs->ndebugvars);
+    return &fs->f->locvars[idx];
+  }
+}
+
+
+/*
+** Create an expression representing variable 'vidx'
+*/
+static void init_var (FuncState *fs, expdesc *e, int vidx) {
+  e->f = e->t = NO_JUMP;
+  e->k = VLOCAL;
+  e->u.var.vidx = vidx;
+  e->u.var.ridx = getlocalvardesc(fs, vidx)->vd.ridx;
+}
+
+
+/*
+** Raises an error if variable described by 'e' is read only
+*/
+static void check_readonly (LexState *ls, expdesc *e) {
+  FuncState *fs = ls->fs;
+  TString *varname = NULL;  /* to be set if variable is const */
+  switch (e->k) {
+    case VCONST: {
+      varname = ls->dyd->actvar.arr[e->u.info].vd.name;
+      break;
+    }
+    case VLOCAL: {
+      Vardesc *vardesc = getlocalvardesc(fs, e->u.var.vidx);
+      if (vardesc->vd.kind != VDKREG)  /* not a regular variable? */
+        varname = vardesc->vd.name;
+      break;
+    }
+    case VUPVAL: {
+      Upvaldesc *up = &fs->f->upvalues[e->u.info];
+      if (up->kind != VDKREG)
+        varname = up->name;
+      break;
+    }
+    default:
+      return;  /* other cases cannot be read-only */
+  }
+  if (varname) {
+    const char *msg = luaO_pushfstring(ls->L,
+       "attempt to assign to const variable '%s'", getstr(varname));
+    luaK_semerror(ls, msg);  /* error */
+  }
+}
+
+
+/*
+** Start the scope for the last 'nvars' created variables.
+*/
+static void adjustlocalvars (LexState *ls, int nvars) {
+  FuncState *fs = ls->fs;
+  int reglevel = luaY_nvarstack(fs);
+  int i;
+  for (i = 0; i < nvars; i++) {
+    int vidx = fs->nactvar++;
+    Vardesc *var = getlocalvardesc(fs, vidx);
+    var->vd.ridx = reglevel++;
+    var->vd.pidx = registerlocalvar(ls, fs, var->vd.name);
+  }
+}
+
+
+/*
+** Close the scope for all variables up to level 'tolevel'.
+** (debug info.)
+*/
+static void removevars (FuncState *fs, int tolevel) {
+  fs->ls->dyd->actvar.n -= (fs->nactvar - tolevel);
+  while (fs->nactvar > tolevel) {
+    LocVar *var = localdebuginfo(fs, --fs->nactvar);
+    if (var)  /* does it have debug information? */
+      var->endpc = fs->pc;
+  }
+}
+
+
+/*
+** Search the upvalues of the function 'fs' for one
+** with the given 'name'.
+*/
+static int searchupvalue (FuncState *fs, TString *name) {
+  int i;
+  Upvaldesc *up = fs->f->upvalues;
+  for (i = 0; i < fs->nups; i++) {
+    if (eqstr(up[i].name, name)) return i;
+  }
+  return -1;  /* not found */
+}
+
+
+static Upvaldesc *allocupvalue (FuncState *fs) {
+  Proto *f = fs->f;
+  int oldsize = f->sizeupvalues;
+  checklimit(fs, fs->nups + 1, MAXUPVAL, "upvalues");
+  luaM_growvector(fs->ls->L, f->upvalues, fs->nups, f->sizeupvalues,
+                  Upvaldesc, MAXUPVAL, "upvalues");
+  while (oldsize < f->sizeupvalues)
+    f->upvalues[oldsize++].name = NULL;
+  return &f->upvalues[fs->nups++];
+}
+
+
+static int newupvalue (FuncState *fs, TString *name, expdesc *v) {
+  Upvaldesc *up = allocupvalue(fs);
+  FuncState *prev = fs->prev;
+  if (v->k == VLOCAL) {
+    up->instack = 1;
+    up->idx = v->u.var.ridx;
+    up->kind = getlocalvardesc(prev, v->u.var.vidx)->vd.kind;
+    lua_assert(eqstr(name, getlocalvardesc(prev, v->u.var.vidx)->vd.name));
+  }
+  else {
+    up->instack = 0;
+    up->idx = cast_byte(v->u.info);
+    up->kind = prev->f->upvalues[v->u.info].kind;
+    lua_assert(eqstr(name, prev->f->upvalues[v->u.info].name));
+  }
+  up->name = name;
+  luaC_objbarrier(fs->ls->L, fs->f, name);
+  return fs->nups - 1;
+}
+
+
+/*
+** Look for an active local variable with the name 'n' in the
+** function 'fs'. If found, initialize 'var' with it and return
+** its expression kind; otherwise return -1.
+*/
+static int searchvar (FuncState *fs, TString *n, expdesc *var) {
+  int i;
+  for (i = cast_int(fs->nactvar) - 1; i >= 0; i--) {
+    Vardesc *vd = getlocalvardesc(fs, i);
+    if (eqstr(n, vd->vd.name)) {  /* found? */
+      if (vd->vd.kind == RDKCTC)  /* compile-time constant? */
+        init_exp(var, VCONST, fs->firstlocal + i);
+      else  /* real variable */
+        init_var(fs, var, i);
+      return var->k;
+    }
+  }
+  return -1;  /* not found */
+}
+
+
+/*
+** Mark block where variable at given level was defined
+** (to emit close instructions later).
+*/
+static void markupval (FuncState *fs, int level) {
+  BlockCnt *bl = fs->bl;
+  while (bl->nactvar > level)
+    bl = bl->previous;
+  bl->upval = 1;
+  fs->needclose = 1;
+}
+
+
+/*
+** Mark that current block has a to-be-closed variable.
+*/
+static void marktobeclosed (FuncState *fs) {
+  BlockCnt *bl = fs->bl;
+  bl->upval = 1;
+  bl->insidetbc = 1;
+  fs->needclose = 1;
+}
+
+
+/*
+** Find a variable with the given name 'n'. If it is an upvalue, add
+** this upvalue into all intermediate functions. If it is a global, set
+** 'var' as 'void' as a flag.
+*/
+static void singlevaraux (FuncState *fs, TString *n, expdesc *var, int base) {
+  if (fs == NULL)  /* no more levels? */
+    init_exp(var, VVOID, 0);  /* default is global */
+  else {
+    int v = searchvar(fs, n, var);  /* look up locals at current level */
+    if (v >= 0) {  /* found? */
+      if (v == VLOCAL && !base)
+        markupval(fs, var->u.var.vidx);  /* local will be used as an upval */
+    }
+    else {  /* not found as local at current level; try upvalues */
+      int idx = searchupvalue(fs, n);  /* try existing upvalues */
+      if (idx < 0) {  /* not found? */
+        singlevaraux(fs->prev, n, var, 0);  /* try upper levels */
+        if (var->k == VLOCAL || var->k == VUPVAL)  /* local or upvalue? */
+          idx  = newupvalue(fs, n, var);  /* will be a new upvalue */
+        else  /* it is a global or a constant */
+          return;  /* don't need to do anything at this level */
+      }
+      init_exp(var, VUPVAL, idx);  /* new or old upvalue */
+    }
+  }
+}
+
+
+/*
+** Find a variable with the given name 'n', handling global variables
+** too.
+*/
+static void singlevar (LexState *ls, expdesc *var) {
+  TString *varname = str_checkname(ls);
+  FuncState *fs = ls->fs;
+  singlevaraux(fs, varname, var, 1);
+  if (var->k == VVOID) {  /* global name? */
+    expdesc key;
+    singlevaraux(fs, ls->envn, var, 1);  /* get environment variable */
+    lua_assert(var->k != VVOID);  /* this one must exist */
+    luaK_exp2anyregup(fs, var);  /* but could be a constant */
+    codestring(&key, varname);  /* key is variable name */
+    luaK_indexed(fs, var, &key);  /* env[varname] */
+  }
+}
+
+
+/*
+** Adjust the number of results from an expression list 'e' with 'nexps'
+** expressions to 'nvars' values.
+*/
+static void adjust_assign (LexState *ls, int nvars, int nexps, expdesc *e) {
+  FuncState *fs = ls->fs;
+  int needed = nvars - nexps;  /* extra values needed */
+  if (hasmultret(e->k)) {  /* last expression has multiple returns? */
+    int extra = needed + 1;  /* discount last expression itself */
+    if (extra < 0)
+      extra = 0;
+    luaK_setreturns(fs, e, extra);  /* last exp. provides the difference */
+  }
+  else {
+    if (e->k != VVOID)  /* at least one expression? */
+      luaK_exp2nextreg(fs, e);  /* close last expression */
+    if (needed > 0)  /* missing values? */
+      luaK_nil(fs, fs->freereg, needed);  /* complete with nils */
+  }
+  if (needed > 0)
+    luaK_reserveregs(fs, needed);  /* registers for extra values */
+  else  /* adding 'needed' is actually a subtraction */
+    fs->freereg += needed;  /* remove extra values */
+}
+
+
+#define enterlevel(ls)	luaE_incCstack(ls->L)
+
+
+#define leavelevel(ls) ((ls)->L->nCcalls--)
+
+
+/*
+** Generates an error that a goto jumps into the scope of some
+** local variable.
+*/
+static l_noret jumpscopeerror (LexState *ls, Labeldesc *gt) {
+  const char *varname = getstr(getlocalvardesc(ls->fs, gt->nactvar)->vd.name);
+  const char *msg = "<goto %s> at line %d jumps into the scope of local '%s'";
+  msg = luaO_pushfstring(ls->L, msg, getstr(gt->name), gt->line, varname);
+  luaK_semerror(ls, msg);  /* raise the error */
+}
+
+
+/*
+** Solves the goto at index 'g' to given 'label' and removes it
+** from the list of pending gotos.
+** If it jumps into the scope of some variable, raises an error.
+*/
+static void solvegoto (LexState *ls, int g, Labeldesc *label) {
+  int i;
+  Labellist *gl = &ls->dyd->gt;  /* list of gotos */
+  Labeldesc *gt = &gl->arr[g];  /* goto to be resolved */
+  lua_assert(eqstr(gt->name, label->name));
+  if (l_unlikely(gt->nactvar < label->nactvar))  /* enter some scope? */
+    jumpscopeerror(ls, gt);
+  luaK_patchlist(ls->fs, gt->pc, label->pc);
+  for (i = g; i < gl->n - 1; i++)  /* remove goto from pending list */
+    gl->arr[i] = gl->arr[i + 1];
+  gl->n--;
+}
+
+
+/*
+** Search for an active label with the given name.
+*/
+static Labeldesc *findlabel (LexState *ls, TString *name) {
+  int i;
+  Dyndata *dyd = ls->dyd;
+  /* check labels in current function for a match */
+  for (i = ls->fs->firstlabel; i < dyd->label.n; i++) {
+    Labeldesc *lb = &dyd->label.arr[i];
+    if (eqstr(lb->name, name))  /* correct label? */
+      return lb;
+  }
+  return NULL;  /* label not found */
+}
+
+
+/*
+** Adds a new label/goto in the corresponding list.
+*/
+static int newlabelentry (LexState *ls, Labellist *l, TString *name,
+                          int line, int pc) {
+  int n = l->n;
+  luaM_growvector(ls->L, l->arr, n, l->size,
+                  Labeldesc, SHRT_MAX, "labels/gotos");
+  l->arr[n].name = name;
+  l->arr[n].line = line;
+  l->arr[n].nactvar = ls->fs->nactvar;
+  l->arr[n].close = 0;
+  l->arr[n].pc = pc;
+  l->n = n + 1;
+  return n;
+}
+
+
+static int newgotoentry (LexState *ls, TString *name, int line, int pc) {
+  return newlabelentry(ls, &ls->dyd->gt, name, line, pc);
+}
+
+
+/*
+** Solves forward jumps. Check whether new label 'lb' matches any
+** pending gotos in current block and solves them. Return true
+** if any of the gotos need to close upvalues.
+*/
+static int solvegotos (LexState *ls, Labeldesc *lb) {
+  Labellist *gl = &ls->dyd->gt;
+  int i = ls->fs->bl->firstgoto;
+  int needsclose = 0;
+  while (i < gl->n) {
+    if (eqstr(gl->arr[i].name, lb->name)) {
+      needsclose |= gl->arr[i].close;
+      solvegoto(ls, i, lb);  /* will remove 'i' from the list */
+    }
+    else
+      i++;
+  }
+  return needsclose;
+}
+
+
+/*
+** Create a new label with the given 'name' at the given 'line'.
+** 'last' tells whether label is the last non-op statement in its
+** block. Solves all pending gotos to this new label and adds
+** a close instruction if necessary.
+** Returns true iff it added a close instruction.
+*/
+static int createlabel (LexState *ls, TString *name, int line,
+                        int last) {
+  FuncState *fs = ls->fs;
+  Labellist *ll = &ls->dyd->label;
+  int l = newlabelentry(ls, ll, name, line, luaK_getlabel(fs));
+  if (last) {  /* label is last no-op statement in the block? */
+    /* assume that locals are already out of scope */
+    ll->arr[l].nactvar = fs->bl->nactvar;
+  }
+  if (solvegotos(ls, &ll->arr[l])) {  /* need close? */
+    luaK_codeABC(fs, OP_CLOSE, luaY_nvarstack(fs), 0, 0);
+    return 1;
+  }
+  return 0;
+}
+
+
+/*
+** Adjust pending gotos to outer level of a block.
+*/
+static void movegotosout (FuncState *fs, BlockCnt *bl) {
+  int i;
+  Labellist *gl = &fs->ls->dyd->gt;
+  /* correct pending gotos to current block */
+  for (i = bl->firstgoto; i < gl->n; i++) {  /* for each pending goto */
+    Labeldesc *gt = &gl->arr[i];
+    /* leaving a variable scope? */
+    if (reglevel(fs, gt->nactvar) > reglevel(fs, bl->nactvar))
+      gt->close |= bl->upval;  /* jump may need a close */
+    gt->nactvar = bl->nactvar;  /* update goto level */
+  }
+}
+
+
+static void enterblock (FuncState *fs, BlockCnt *bl, lu_byte isloop) {
+  bl->isloop = isloop;
+  bl->nactvar = fs->nactvar;
+  bl->firstlabel = fs->ls->dyd->label.n;
+  bl->firstgoto = fs->ls->dyd->gt.n;
+  bl->upval = 0;
+  bl->insidetbc = (fs->bl != NULL && fs->bl->insidetbc);
+  bl->previous = fs->bl;
+  fs->bl = bl;
+  lua_assert(fs->freereg == luaY_nvarstack(fs));
+}
+
+
+/*
+** generates an error for an undefined 'goto'.
+*/
+static l_noret undefgoto (LexState *ls, Labeldesc *gt) {
+  const char *msg;
+  if (eqstr(gt->name, luaS_newliteral(ls->L, "break"))) {
+    msg = "break outside loop at line %d";
+    msg = luaO_pushfstring(ls->L, msg, gt->line);
+  }
+  else {
+    msg = "no visible label '%s' for <goto> at line %d";
+    msg = luaO_pushfstring(ls->L, msg, getstr(gt->name), gt->line);
+  }
+  luaK_semerror(ls, msg);
+}
+
+
+static void leaveblock (FuncState *fs) {
+  BlockCnt *bl = fs->bl;
+  LexState *ls = fs->ls;
+  int hasclose = 0;
+  int stklevel = reglevel(fs, bl->nactvar);  /* level outside the block */
+  removevars(fs, bl->nactvar);  /* remove block locals */
+  lua_assert(bl->nactvar == fs->nactvar);  /* back to level on entry */
+  if (bl->isloop)  /* has to fix pending breaks? */
+    hasclose = createlabel(ls, luaS_newliteral(ls->L, "break"), 0, 0);
+  if (!hasclose && bl->previous && bl->upval)  /* still need a 'close'? */
+    luaK_codeABC(fs, OP_CLOSE, stklevel, 0, 0);
+  fs->freereg = stklevel;  /* free registers */
+  ls->dyd->label.n = bl->firstlabel;  /* remove local labels */
+  fs->bl = bl->previous;  /* current block now is previous one */
+  if (bl->previous)  /* was it a nested block? */
+    movegotosout(fs, bl);  /* update pending gotos to enclosing block */
+  else {
+    if (bl->firstgoto < ls->dyd->gt.n)  /* still pending gotos? */
+      undefgoto(ls, &ls->dyd->gt.arr[bl->firstgoto]);  /* error */
+  }
+}
+
+
+/*
+** adds a new prototype into list of prototypes
+*/
+static Proto *addprototype (LexState *ls) {
+  Proto *clp;
+  lua_State *L = ls->L;
+  FuncState *fs = ls->fs;
+  Proto *f = fs->f;  /* prototype of current function */
+  if (fs->np >= f->sizep) {
+    int oldsize = f->sizep;
+    luaM_growvector(L, f->p, fs->np, f->sizep, Proto *, MAXARG_Bx, "functions");
+    while (oldsize < f->sizep)
+      f->p[oldsize++] = NULL;
+  }
+  f->p[fs->np++] = clp = luaF_newproto(L);
+  luaC_objbarrier(L, f, clp);
+  return clp;
+}
+
+
+/*
+** codes instruction to create new closure in parent function.
+** The OP_CLOSURE instruction uses the last available register,
+** so that, if it invokes the GC, the GC knows which registers
+** are in use at that time.
+
+*/
+static void codeclosure (LexState *ls, expdesc *v) {
+  FuncState *fs = ls->fs->prev;
+  init_exp(v, VRELOC, luaK_codeABx(fs, OP_CLOSURE, 0, fs->np - 1));
+  luaK_exp2nextreg(fs, v);  /* fix it at the last register */
+}
+
+
+static void open_func (LexState *ls, FuncState *fs, BlockCnt *bl) {
+  Proto *f = fs->f;
+  fs->prev = ls->fs;  /* linked list of funcstates */
+  fs->ls = ls;
+  ls->fs = fs;
+  fs->pc = 0;
+  fs->previousline = f->linedefined;
+  fs->iwthabs = 0;
+  fs->lasttarget = 0;
+  fs->freereg = 0;
+  fs->nk = 0;
+  fs->nabslineinfo = 0;
+  fs->np = 0;
+  fs->nups = 0;
+  fs->ndebugvars = 0;
+  fs->nactvar = 0;
+  fs->needclose = 0;
+  fs->firstlocal = ls->dyd->actvar.n;
+  fs->firstlabel = ls->dyd->label.n;
+  fs->bl = NULL;
+  f->source = ls->source;
+  luaC_objbarrier(ls->L, f, f->source);
+  f->maxstacksize = 2;  /* registers 0/1 are always valid */
+  enterblock(fs, bl, 0);
+}
+
+
+static void close_func (LexState *ls) {
+  lua_State *L = ls->L;
+  FuncState *fs = ls->fs;
+  Proto *f = fs->f;
+  luaK_ret(fs, luaY_nvarstack(fs), 0);  /* final return */
+  leaveblock(fs);
+  lua_assert(fs->bl == NULL);
+  luaK_finish(fs);
+  luaM_shrinkvector(L, f->code, f->sizecode, fs->pc, Instruction);
+  luaM_shrinkvector(L, f->lineinfo, f->sizelineinfo, fs->pc, ls_byte);
+  luaM_shrinkvector(L, f->abslineinfo, f->sizeabslineinfo,
+                       fs->nabslineinfo, AbsLineInfo);
+  luaM_shrinkvector(L, f->k, f->sizek, fs->nk, TValue);
+  luaM_shrinkvector(L, f->p, f->sizep, fs->np, Proto *);
+  luaM_shrinkvector(L, f->locvars, f->sizelocvars, fs->ndebugvars, LocVar);
+  luaM_shrinkvector(L, f->upvalues, f->sizeupvalues, fs->nups, Upvaldesc);
+  ls->fs = fs->prev;
+  luaC_checkGC(L);
+}
+
+
+
+/*============================================================*/
+/* GRAMMAR RULES */
+/*============================================================*/
+
+
+/*
+** check whether current token is in the follow set of a block.
+** 'until' closes syntactical blocks, but do not close scope,
+** so it is handled in separate.
+*/
+static int block_follow (LexState *ls, int withuntil) {
+  switch (ls->t.token) {
+    case TK_ELSE: case TK_ELSEIF:
+    case TK_END: case TK_EOS:
+      return 1;
+    case TK_UNTIL: return withuntil;
+    default: return 0;
+  }
+}
+
+
+static void statlist (LexState *ls) {
+  /* statlist -> { stat [';'] } */
+  while (!block_follow(ls, 1)) {
+    if (ls->t.token == TK_RETURN) {
+      statement(ls);
+      return;  /* 'return' must be last statement */
+    }
+    statement(ls);
+  }
+}
+
+
+static void fieldsel (LexState *ls, expdesc *v) {
+  /* fieldsel -> ['.' | ':'] NAME */
+  FuncState *fs = ls->fs;
+  expdesc key;
+  luaK_exp2anyregup(fs, v);
+  luaX_next(ls);  /* skip the dot or colon */
+  codename(ls, &key);
+  luaK_indexed(fs, v, &key);
+}
+
+
+static void yindex (LexState *ls, expdesc *v) {
+  /* index -> '[' expr ']' */
+  luaX_next(ls);  /* skip the '[' */
+  expr(ls, v);
+  luaK_exp2val(ls->fs, v);
+  checknext(ls, ']');
+}
+
+
+/*
+** {======================================================================
+** Rules for Constructors
+** =======================================================================
+*/
+
+
+typedef struct ConsControl {
+  expdesc v;  /* last list item read */
+  expdesc *t;  /* table descriptor */
+  int nh;  /* total number of 'record' elements */
+  int na;  /* number of array elements already stored */
+  int tostore;  /* number of array elements pending to be stored */
+} ConsControl;
+
+
+static void recfield (LexState *ls, ConsControl *cc) {
+  /* recfield -> (NAME | '['exp']') = exp */
+  FuncState *fs = ls->fs;
+  int reg = ls->fs->freereg;
+  expdesc tab, key, val;
+  if (ls->t.token == TK_NAME) {
+    checklimit(fs, cc->nh, MAX_INT, "items in a constructor");
+    codename(ls, &key);
+  }
+  else  /* ls->t.token == '[' */
+    yindex(ls, &key);
+  cc->nh++;
+  checknext(ls, '=');
+  tab = *cc->t;
+  luaK_indexed(fs, &tab, &key);
+  expr(ls, &val);
+  luaK_storevar(fs, &tab, &val);
+  fs->freereg = reg;  /* free registers */
+}
+
+
+static void closelistfield (FuncState *fs, ConsControl *cc) {
+  if (cc->v.k == VVOID) return;  /* there is no list item */
+  luaK_exp2nextreg(fs, &cc->v);
+  cc->v.k = VVOID;
+  if (cc->tostore == LFIELDS_PER_FLUSH) {
+    luaK_setlist(fs, cc->t->u.info, cc->na, cc->tostore);  /* flush */
+    cc->na += cc->tostore;
+    cc->tostore = 0;  /* no more items pending */
+  }
+}
+
+
+static void lastlistfield (FuncState *fs, ConsControl *cc) {
+  if (cc->tostore == 0) return;
+  if (hasmultret(cc->v.k)) {
+    luaK_setmultret(fs, &cc->v);
+    luaK_setlist(fs, cc->t->u.info, cc->na, LUA_MULTRET);
+    cc->na--;  /* do not count last expression (unknown number of elements) */
+  }
+  else {
+    if (cc->v.k != VVOID)
+      luaK_exp2nextreg(fs, &cc->v);
+    luaK_setlist(fs, cc->t->u.info, cc->na, cc->tostore);
+  }
+  cc->na += cc->tostore;
+}
+
+
+static void listfield (LexState *ls, ConsControl *cc) {
+  /* listfield -> exp */
+  expr(ls, &cc->v);
+  cc->tostore++;
+}
+
+
+static void field (LexState *ls, ConsControl *cc) {
+  /* field -> listfield | recfield */
+  switch(ls->t.token) {
+    case TK_NAME: {  /* may be 'listfield' or 'recfield' */
+      if (luaX_lookahead(ls) != '=')  /* expression? */
+        listfield(ls, cc);
+      else
+        recfield(ls, cc);
+      break;
+    }
+    case '[': {
+      recfield(ls, cc);
+      break;
+    }
+    default: {
+      listfield(ls, cc);
+      break;
+    }
+  }
+}
+
+
+static void constructor (LexState *ls, expdesc *t) {
+  /* constructor -> '{' [ field { sep field } [sep] ] '}'
+     sep -> ',' | ';' */
+  FuncState *fs = ls->fs;
+  int line = ls->linenumber;
+  int pc = luaK_codeABC(fs, OP_NEWTABLE, 0, 0, 0);
+  ConsControl cc;
+  luaK_code(fs, 0);  /* space for extra arg. */
+  cc.na = cc.nh = cc.tostore = 0;
+  cc.t = t;
+  init_exp(t, VNONRELOC, fs->freereg);  /* table will be at stack top */
+  luaK_reserveregs(fs, 1);
+  init_exp(&cc.v, VVOID, 0);  /* no value (yet) */
+  checknext(ls, '{');
+  do {
+    lua_assert(cc.v.k == VVOID || cc.tostore > 0);
+    if (ls->t.token == '}') break;
+    closelistfield(fs, &cc);
+    field(ls, &cc);
+  } while (testnext(ls, ',') || testnext(ls, ';'));
+  check_match(ls, '}', '{', line);
+  lastlistfield(fs, &cc);
+  luaK_settablesize(fs, pc, t->u.info, cc.na, cc.nh);
+}
+
+/* }====================================================================== */
+
+
+static void setvararg (FuncState *fs, int nparams) {
+  fs->f->is_vararg = 1;
+  luaK_codeABC(fs, OP_VARARGPREP, nparams, 0, 0);
+}
+
+
+static void parlist (LexState *ls) {
+  /* parlist -> [ {NAME ','} (NAME | '...') ] */
+  FuncState *fs = ls->fs;
+  Proto *f = fs->f;
+  int nparams = 0;
+  int isvararg = 0;
+  if (ls->t.token != ')') {  /* is 'parlist' not empty? */
+    do {
+      switch (ls->t.token) {
+        case TK_NAME: {
+          new_localvar(ls, str_checkname(ls));
+          nparams++;
+          break;
+        }
+        case TK_DOTS: {
+          luaX_next(ls);
+          isvararg = 1;
+          break;
+        }
+        default: luaX_syntaxerror(ls, "<name> or '...' expected");
+      }
+    } while (!isvararg && testnext(ls, ','));
+  }
+  adjustlocalvars(ls, nparams);
+  f->numparams = cast_byte(fs->nactvar);
+  if (isvararg)
+    setvararg(fs, f->numparams);  /* declared vararg */
+  luaK_reserveregs(fs, fs->nactvar);  /* reserve registers for parameters */
+}
+
+
+static void body (LexState *ls, expdesc *e, int ismethod, int line) {
+  /* body ->  '(' parlist ')' block END */
+  FuncState new_fs;
+  BlockCnt bl;
+  new_fs.f = addprototype(ls);
+  new_fs.f->linedefined = line;
+  open_func(ls, &new_fs, &bl);
+  checknext(ls, '(');
+  if (ismethod) {
+    new_localvarliteral(ls, "self");  /* create 'self' parameter */
+    adjustlocalvars(ls, 1);
+  }
+  parlist(ls);
+  checknext(ls, ')');
+  statlist(ls);
+  new_fs.f->lastlinedefined = ls->linenumber;
+  check_match(ls, TK_END, TK_FUNCTION, line);
+  codeclosure(ls, e);
+  close_func(ls);
+}
+
+
+static int explist (LexState *ls, expdesc *v) {
+  /* explist -> expr { ',' expr } */
+  int n = 1;  /* at least one expression */
+  expr(ls, v);
+  while (testnext(ls, ',')) {
+    luaK_exp2nextreg(ls->fs, v);
+    expr(ls, v);
+    n++;
+  }
+  return n;
+}
+
+
+static void funcargs (LexState *ls, expdesc *f, int line) {
+  FuncState *fs = ls->fs;
+  expdesc args;
+  int base, nparams;
+  switch (ls->t.token) {
+    case '(': {  /* funcargs -> '(' [ explist ] ')' */
+      luaX_next(ls);
+      if (ls->t.token == ')')  /* arg list is empty? */
+        args.k = VVOID;
+      else {
+        explist(ls, &args);
+        if (hasmultret(args.k))
+          luaK_setmultret(fs, &args);
+      }
+      check_match(ls, ')', '(', line);
+      break;
+    }
+    case '{': {  /* funcargs -> constructor */
+      constructor(ls, &args);
+      break;
+    }
+    case TK_STRING: {  /* funcargs -> STRING */
+      codestring(&args, ls->t.seminfo.ts);
+      luaX_next(ls);  /* must use 'seminfo' before 'next' */
+      break;
+    }
+    default: {
+      luaX_syntaxerror(ls, "function arguments expected");
+    }
+  }
+  lua_assert(f->k == VNONRELOC);
+  base = f->u.info;  /* base register for call */
+  if (hasmultret(args.k))
+    nparams = LUA_MULTRET;  /* open call */
+  else {
+    if (args.k != VVOID)
+      luaK_exp2nextreg(fs, &args);  /* close last argument */
+    nparams = fs->freereg - (base+1);
+  }
+  init_exp(f, VCALL, luaK_codeABC(fs, OP_CALL, base, nparams+1, 2));
+  luaK_fixline(fs, line);
+  fs->freereg = base+1;  /* call remove function and arguments and leaves
+                            (unless changed) one result */
+}
+
+
+
+
+/*
+** {======================================================================
+** Expression parsing
+** =======================================================================
+*/
+
+
+static void primaryexp (LexState *ls, expdesc *v) {
+  /* primaryexp -> NAME | '(' expr ')' */
+  switch (ls->t.token) {
+    case '(': {
+      int line = ls->linenumber;
+      luaX_next(ls);
+      expr(ls, v);
+      check_match(ls, ')', '(', line);
+      luaK_dischargevars(ls->fs, v);
+      return;
+    }
+    case TK_NAME: {
+      singlevar(ls, v);
+      return;
+    }
+    default: {
+      luaX_syntaxerror(ls, "unexpected symbol");
+    }
+  }
+}
+
+
+static void suffixedexp (LexState *ls, expdesc *v) {
+  /* suffixedexp ->
+       primaryexp { '.' NAME | '[' exp ']' | ':' NAME funcargs | funcargs } */
+  FuncState *fs = ls->fs;
+  int line = ls->linenumber;
+  primaryexp(ls, v);
+  for (;;) {
+    switch (ls->t.token) {
+      case '.': {  /* fieldsel */
+        fieldsel(ls, v);
+        break;
+      }
+      case '[': {  /* '[' exp ']' */
+        expdesc key;
+        luaK_exp2anyregup(fs, v);
+        yindex(ls, &key);
+        luaK_indexed(fs, v, &key);
+        break;
+      }
+      case ':': {  /* ':' NAME funcargs */
+        expdesc key;
+        luaX_next(ls);
+        codename(ls, &key);
+        luaK_self(fs, v, &key);
+        funcargs(ls, v, line);
+        break;
+      }
+      case '(': case TK_STRING: case '{': {  /* funcargs */
+        luaK_exp2nextreg(fs, v);
+        funcargs(ls, v, line);
+        break;
+      }
+      default: return;
+    }
+  }
+}
+
+
+static void simpleexp (LexState *ls, expdesc *v) {
+  /* simpleexp -> FLT | INT | STRING | NIL | TRUE | FALSE | ... |
+                  constructor | FUNCTION body | suffixedexp */
+  switch (ls->t.token) {
+    case TK_FLT: {
+      init_exp(v, VKFLT, 0);
+      v->u.nval = ls->t.seminfo.r;
+      break;
+    }
+    case TK_INT: {
+      init_exp(v, VKINT, 0);
+      v->u.ival = ls->t.seminfo.i;
+      break;
+    }
+    case TK_STRING: {
+      codestring(v, ls->t.seminfo.ts);
+      break;
+    }
+    case TK_NIL: {
+      init_exp(v, VNIL, 0);
+      break;
+    }
+    case TK_TRUE: {
+      init_exp(v, VTRUE, 0);
+      break;
+    }
+    case TK_FALSE: {
+      init_exp(v, VFALSE, 0);
+      break;
+    }
+    case TK_DOTS: {  /* vararg */
+      FuncState *fs = ls->fs;
+      check_condition(ls, fs->f->is_vararg,
+                      "cannot use '...' outside a vararg function");
+      init_exp(v, VVARARG, luaK_codeABC(fs, OP_VARARG, 0, 0, 1));
+      break;
+    }
+    case '{': {  /* constructor */
+      constructor(ls, v);
+      return;
+    }
+    case TK_FUNCTION: {
+      luaX_next(ls);
+      body(ls, v, 0, ls->linenumber);
+      return;
+    }
+    default: {
+      suffixedexp(ls, v);
+      return;
+    }
+  }
+  luaX_next(ls);
+}
+
+
+static UnOpr getunopr (int op) {
+  switch (op) {
+    case TK_NOT: return OPR_NOT;
+    case '-': return OPR_MINUS;
+    case '~': return OPR_BNOT;
+    case '#': return OPR_LEN;
+    default: return OPR_NOUNOPR;
+  }
+}
+
+
+static BinOpr getbinopr (int op) {
+  switch (op) {
+    case '+': return OPR_ADD;
+    case '-': return OPR_SUB;
+    case '*': return OPR_MUL;
+    case '%': return OPR_MOD;
+    case '^': return OPR_POW;
+    case '/': return OPR_DIV;
+    case TK_IDIV: return OPR_IDIV;
+    case '&': return OPR_BAND;
+    case '|': return OPR_BOR;
+    case '~': return OPR_BXOR;
+    case TK_SHL: return OPR_SHL;
+    case TK_SHR: return OPR_SHR;
+    case TK_CONCAT: return OPR_CONCAT;
+    case TK_NE: return OPR_NE;
+    case TK_EQ: return OPR_EQ;
+    case '<': return OPR_LT;
+    case TK_LE: return OPR_LE;
+    case '>': return OPR_GT;
+    case TK_GE: return OPR_GE;
+    case TK_AND: return OPR_AND;
+    case TK_OR: return OPR_OR;
+    default: return OPR_NOBINOPR;
+  }
+}
+
+
+/*
+** Priority table for binary operators.
+*/
+static const struct {
+  lu_byte left;  /* left priority for each binary operator */
+  lu_byte right; /* right priority */
+} priority[] = {  /* ORDER OPR */
+   {10, 10}, {10, 10},           /* '+' '-' */
+   {11, 11}, {11, 11},           /* '*' '%' */
+   {14, 13},                  /* '^' (right associative) */
+   {11, 11}, {11, 11},           /* '/' '//' */
+   {6, 6}, {4, 4}, {5, 5},   /* '&' '|' '~' */
+   {7, 7}, {7, 7},           /* '<<' '>>' */
+   {9, 8},                   /* '..' (right associative) */
+   {3, 3}, {3, 3}, {3, 3},   /* ==, <, <= */
+   {3, 3}, {3, 3}, {3, 3},   /* ~=, >, >= */
+   {2, 2}, {1, 1}            /* and, or */
+};
+
+#define UNARY_PRIORITY	12  /* priority for unary operators */
+
+
+/*
+** subexpr -> (simpleexp | unop subexpr) { binop subexpr }
+** where 'binop' is any binary operator with a priority higher than 'limit'
+*/
+static BinOpr subexpr (LexState *ls, expdesc *v, int limit) {
+  BinOpr op;
+  UnOpr uop;
+  enterlevel(ls);
+  uop = getunopr(ls->t.token);
+  if (uop != OPR_NOUNOPR) {  /* prefix (unary) operator? */
+    int line = ls->linenumber;
+    luaX_next(ls);  /* skip operator */
+    subexpr(ls, v, UNARY_PRIORITY);
+    luaK_prefix(ls->fs, uop, v, line);
+  }
+  else simpleexp(ls, v);
+  /* expand while operators have priorities higher than 'limit' */
+  op = getbinopr(ls->t.token);
+  while (op != OPR_NOBINOPR && priority[op].left > limit) {
+    expdesc v2;
+    BinOpr nextop;
+    int line = ls->linenumber;
+    luaX_next(ls);  /* skip operator */
+    luaK_infix(ls->fs, op, v);
+    /* read sub-expression with higher priority */
+    nextop = subexpr(ls, &v2, priority[op].right);
+    luaK_posfix(ls->fs, op, v, &v2, line);
+    op = nextop;
+  }
+  leavelevel(ls);
+  return op;  /* return first untreated operator */
+}
+
+
+static void expr (LexState *ls, expdesc *v) {
+  subexpr(ls, v, 0);
+}
+
+/* }==================================================================== */
+
+
+
+/*
+** {======================================================================
+** Rules for Statements
+** =======================================================================
+*/
+
+
+static void block (LexState *ls) {
+  /* block -> statlist */
+  FuncState *fs = ls->fs;
+  BlockCnt bl;
+  enterblock(fs, &bl, 0);
+  statlist(ls);
+  leaveblock(fs);
+}
+
+
+/*
+** structure to chain all variables in the left-hand side of an
+** assignment
+*/
+struct LHS_assign {
+  struct LHS_assign *prev;
+  expdesc v;  /* variable (global, local, upvalue, or indexed) */
+};
+
+
+/*
+** check whether, in an assignment to an upvalue/local variable, the
+** upvalue/local variable is begin used in a previous assignment to a
+** table. If so, save original upvalue/local value in a safe place and
+** use this safe copy in the previous assignment.
+*/
+static void check_conflict (LexState *ls, struct LHS_assign *lh, expdesc *v) {
+  FuncState *fs = ls->fs;
+  int extra = fs->freereg;  /* eventual position to save local variable */
+  int conflict = 0;
+  for (; lh; lh = lh->prev) {  /* check all previous assignments */
+    if (vkisindexed(lh->v.k)) {  /* assignment to table field? */
+      if (lh->v.k == VINDEXUP) {  /* is table an upvalue? */
+        if (v->k == VUPVAL && lh->v.u.ind.t == v->u.info) {
+          conflict = 1;  /* table is the upvalue being assigned now */
+          lh->v.k = VINDEXSTR;
+          lh->v.u.ind.t = extra;  /* assignment will use safe copy */
+        }
+      }
+      else {  /* table is a register */
+        if (v->k == VLOCAL && lh->v.u.ind.t == v->u.var.ridx) {
+          conflict = 1;  /* table is the local being assigned now */
+          lh->v.u.ind.t = extra;  /* assignment will use safe copy */
+        }
+        /* is index the local being assigned? */
+        if (lh->v.k == VINDEXED && v->k == VLOCAL &&
+            lh->v.u.ind.idx == v->u.var.ridx) {
+          conflict = 1;
+          lh->v.u.ind.idx = extra;  /* previous assignment will use safe copy */
+        }
+      }
+    }
+  }
+  if (conflict) {
+    /* copy upvalue/local value to a temporary (in position 'extra') */
+    if (v->k == VLOCAL)
+      luaK_codeABC(fs, OP_MOVE, extra, v->u.var.ridx, 0);
+    else
+      luaK_codeABC(fs, OP_GETUPVAL, extra, v->u.info, 0);
+    luaK_reserveregs(fs, 1);
+  }
+}
+
+/*
+** Parse and compile a multiple assignment. The first "variable"
+** (a 'suffixedexp') was already read by the caller.
+**
+** assignment -> suffixedexp restassign
+** restassign -> ',' suffixedexp restassign | '=' explist
+*/
+static void restassign (LexState *ls, struct LHS_assign *lh, int nvars) {
+  expdesc e;
+  check_condition(ls, vkisvar(lh->v.k), "syntax error");
+  check_readonly(ls, &lh->v);
+  if (testnext(ls, ',')) {  /* restassign -> ',' suffixedexp restassign */
+    struct LHS_assign nv;
+    nv.prev = lh;
+    suffixedexp(ls, &nv.v);
+    if (!vkisindexed(nv.v.k))
+      check_conflict(ls, lh, &nv.v);
+    enterlevel(ls);  /* control recursion depth */
+    restassign(ls, &nv, nvars+1);
+    leavelevel(ls);
+  }
+  else {  /* restassign -> '=' explist */
+    int nexps;
+    checknext(ls, '=');
+    nexps = explist(ls, &e);
+    if (nexps != nvars)
+      adjust_assign(ls, nvars, nexps, &e);
+    else {
+      luaK_setoneret(ls->fs, &e);  /* close last expression */
+      luaK_storevar(ls->fs, &lh->v, &e);
+      return;  /* avoid default */
+    }
+  }
+  init_exp(&e, VNONRELOC, ls->fs->freereg-1);  /* default assignment */
+  luaK_storevar(ls->fs, &lh->v, &e);
+}
+
+
+static int cond (LexState *ls) {
+  /* cond -> exp */
+  expdesc v;
+  expr(ls, &v);  /* read condition */
+  if (v.k == VNIL) v.k = VFALSE;  /* 'falses' are all equal here */
+  luaK_goiftrue(ls->fs, &v);
+  return v.f;
+}
+
+
+static void gotostat (LexState *ls) {
+  FuncState *fs = ls->fs;
+  int line = ls->linenumber;
+  TString *name = str_checkname(ls);  /* label's name */
+  Labeldesc *lb = findlabel(ls, name);
+  if (lb == NULL)  /* no label? */
+    /* forward jump; will be resolved when the label is declared */
+    newgotoentry(ls, name, line, luaK_jump(fs));
+  else {  /* found a label */
+    /* backward jump; will be resolved here */
+    int lblevel = reglevel(fs, lb->nactvar);  /* label level */
+    if (luaY_nvarstack(fs) > lblevel)  /* leaving the scope of a variable? */
+      luaK_codeABC(fs, OP_CLOSE, lblevel, 0, 0);
+    /* create jump and link it to the label */
+    luaK_patchlist(fs, luaK_jump(fs), lb->pc);
+  }
+}
+
+
+/*
+** Break statement. Semantically equivalent to "goto break".
+*/
+static void breakstat (LexState *ls) {
+  int line = ls->linenumber;
+  luaX_next(ls);  /* skip break */
+  newgotoentry(ls, luaS_newliteral(ls->L, "break"), line, luaK_jump(ls->fs));
+}
+
+
+/*
+** Check whether there is already a label with the given 'name'.
+*/
+static void checkrepeated (LexState *ls, TString *name) {
+  Labeldesc *lb = findlabel(ls, name);
+  if (l_unlikely(lb != NULL)) {  /* already defined? */
+    const char *msg = "label '%s' already defined on line %d";
+    msg = luaO_pushfstring(ls->L, msg, getstr(name), lb->line);
+    luaK_semerror(ls, msg);  /* error */
+  }
+}
+
+
+static void labelstat (LexState *ls, TString *name, int line) {
+  /* label -> '::' NAME '::' */
+  checknext(ls, TK_DBCOLON);  /* skip double colon */
+  while (ls->t.token == ';' || ls->t.token == TK_DBCOLON)
+    statement(ls);  /* skip other no-op statements */
+  checkrepeated(ls, name);  /* check for repeated labels */
+  createlabel(ls, name, line, block_follow(ls, 0));
+}
+
+
+static void whilestat (LexState *ls, int line) {
+  /* whilestat -> WHILE cond DO block END */
+  FuncState *fs = ls->fs;
+  int whileinit;
+  int condexit;
+  BlockCnt bl;
+  luaX_next(ls);  /* skip WHILE */
+  whileinit = luaK_getlabel(fs);
+  condexit = cond(ls);
+  enterblock(fs, &bl, 1);
+  checknext(ls, TK_DO);
+  block(ls);
+  luaK_jumpto(fs, whileinit);
+  check_match(ls, TK_END, TK_WHILE, line);
+  leaveblock(fs);
+  luaK_patchtohere(fs, condexit);  /* false conditions finish the loop */
+}
+
+
+static void repeatstat (LexState *ls, int line) {
+  /* repeatstat -> REPEAT block UNTIL cond */
+  int condexit;
+  FuncState *fs = ls->fs;
+  int repeat_init = luaK_getlabel(fs);
+  BlockCnt bl1, bl2;
+  enterblock(fs, &bl1, 1);  /* loop block */
+  enterblock(fs, &bl2, 0);  /* scope block */
+  luaX_next(ls);  /* skip REPEAT */
+  statlist(ls);
+  check_match(ls, TK_UNTIL, TK_REPEAT, line);
+  condexit = cond(ls);  /* read condition (inside scope block) */
+  leaveblock(fs);  /* finish scope */
+  if (bl2.upval) {  /* upvalues? */
+    int exit = luaK_jump(fs);  /* normal exit must jump over fix */
+    luaK_patchtohere(fs, condexit);  /* repetition must close upvalues */
+    luaK_codeABC(fs, OP_CLOSE, reglevel(fs, bl2.nactvar), 0, 0);
+    condexit = luaK_jump(fs);  /* repeat after closing upvalues */
+    luaK_patchtohere(fs, exit);  /* normal exit comes to here */
+  }
+  luaK_patchlist(fs, condexit, repeat_init);  /* close the loop */
+  leaveblock(fs);  /* finish loop */
+}
+
+
+/*
+** Read an expression and generate code to put its results in next
+** stack slot.
+**
+*/
+static void exp1 (LexState *ls) {
+  expdesc e;
+  expr(ls, &e);
+  luaK_exp2nextreg(ls->fs, &e);
+  lua_assert(e.k == VNONRELOC);
+}
+
+
+/*
+** Fix for instruction at position 'pc' to jump to 'dest'.
+** (Jump addresses are relative in Lua). 'back' true means
+** a back jump.
+*/
+static void fixforjump (FuncState *fs, int pc, int dest, int back) {
+  Instruction *jmp = &fs->f->code[pc];
+  int offset = dest - (pc + 1);
+  if (back)
+    offset = -offset;
+  if (l_unlikely(offset > MAXARG_Bx))
+    luaX_syntaxerror(fs->ls, "control structure too long");
+  SETARG_Bx(*jmp, offset);
+}
+
+
+/*
+** Generate code for a 'for' loop.
+*/
+static void forbody (LexState *ls, int base, int line, int nvars, int isgen) {
+  /* forbody -> DO block */
+  static const OpCode forprep[2] = {OP_FORPREP, OP_TFORPREP};
+  static const OpCode forloop[2] = {OP_FORLOOP, OP_TFORLOOP};
+  BlockCnt bl;
+  FuncState *fs = ls->fs;
+  int prep, endfor;
+  checknext(ls, TK_DO);
+  prep = luaK_codeABx(fs, forprep[isgen], base, 0);
+  enterblock(fs, &bl, 0);  /* scope for declared variables */
+  adjustlocalvars(ls, nvars);
+  luaK_reserveregs(fs, nvars);
+  block(ls);
+  leaveblock(fs);  /* end of scope for declared variables */
+  fixforjump(fs, prep, luaK_getlabel(fs), 0);
+  if (isgen) {  /* generic for? */
+    luaK_codeABC(fs, OP_TFORCALL, base, 0, nvars);
+    luaK_fixline(fs, line);
+  }
+  endfor = luaK_codeABx(fs, forloop[isgen], base, 0);
+  fixforjump(fs, endfor, prep + 1, 1);
+  luaK_fixline(fs, line);
+}
+
+
+static void fornum (LexState *ls, TString *varname, int line) {
+  /* fornum -> NAME = exp,exp[,exp] forbody */
+  FuncState *fs = ls->fs;
+  int base = fs->freereg;
+  new_localvarliteral(ls, "(for state)");
+  new_localvarliteral(ls, "(for state)");
+  new_localvarliteral(ls, "(for state)");
+  new_localvar(ls, varname);
+  checknext(ls, '=');
+  exp1(ls);  /* initial value */
+  checknext(ls, ',');
+  exp1(ls);  /* limit */
+  if (testnext(ls, ','))
+    exp1(ls);  /* optional step */
+  else {  /* default step = 1 */
+    luaK_int(fs, fs->freereg, 1);
+    luaK_reserveregs(fs, 1);
+  }
+  adjustlocalvars(ls, 3);  /* control variables */
+  forbody(ls, base, line, 1, 0);
+}
+
+
+static void forlist (LexState *ls, TString *indexname) {
+  /* forlist -> NAME {,NAME} IN explist forbody */
+  FuncState *fs = ls->fs;
+  expdesc e;
+  int nvars = 5;  /* gen, state, control, toclose, 'indexname' */
+  int line;
+  int base = fs->freereg;
+  /* create control variables */
+  new_localvarliteral(ls, "(for state)");
+  new_localvarliteral(ls, "(for state)");
+  new_localvarliteral(ls, "(for state)");
+  new_localvarliteral(ls, "(for state)");
+  /* create declared variables */
+  new_localvar(ls, indexname);
+  while (testnext(ls, ',')) {
+    new_localvar(ls, str_checkname(ls));
+    nvars++;
+  }
+  checknext(ls, TK_IN);
+  line = ls->linenumber;
+  adjust_assign(ls, 4, explist(ls, &e), &e);
+  adjustlocalvars(ls, 4);  /* control variables */
+  marktobeclosed(fs);  /* last control var. must be closed */
+  luaK_checkstack(fs, 3);  /* extra space to call generator */
+  forbody(ls, base, line, nvars - 4, 1);
+}
+
+
+static void forstat (LexState *ls, int line) {
+  /* forstat -> FOR (fornum | forlist) END */
+  FuncState *fs = ls->fs;
+  TString *varname;
+  BlockCnt bl;
+  enterblock(fs, &bl, 1);  /* scope for loop and control variables */
+  luaX_next(ls);  /* skip 'for' */
+  varname = str_checkname(ls);  /* first variable name */
+  switch (ls->t.token) {
+    case '=': fornum(ls, varname, line); break;
+    case ',': case TK_IN: forlist(ls, varname); break;
+    default: luaX_syntaxerror(ls, "'=' or 'in' expected");
+  }
+  check_match(ls, TK_END, TK_FOR, line);
+  leaveblock(fs);  /* loop scope ('break' jumps to this point) */
+}
+
+
+static void test_then_block (LexState *ls, int *escapelist) {
+  /* test_then_block -> [IF | ELSEIF] cond THEN block */
+  BlockCnt bl;
+  FuncState *fs = ls->fs;
+  expdesc v;
+  int jf;  /* instruction to skip 'then' code (if condition is false) */
+  luaX_next(ls);  /* skip IF or ELSEIF */
+  expr(ls, &v);  /* read condition */
+  checknext(ls, TK_THEN);
+  if (ls->t.token == TK_BREAK) {  /* 'if x then break' ? */
+    int line = ls->linenumber;
+    luaK_goiffalse(ls->fs, &v);  /* will jump if condition is true */
+    luaX_next(ls);  /* skip 'break' */
+    enterblock(fs, &bl, 0);  /* must enter block before 'goto' */
+    newgotoentry(ls, luaS_newliteral(ls->L, "break"), line, v.t);
+    while (testnext(ls, ';')) {}  /* skip semicolons */
+    if (block_follow(ls, 0)) {  /* jump is the entire block? */
+      leaveblock(fs);
+      return;  /* and that is it */
+    }
+    else  /* must skip over 'then' part if condition is false */
+      jf = luaK_jump(fs);
+  }
+  else {  /* regular case (not a break) */
+    luaK_goiftrue(ls->fs, &v);  /* skip over block if condition is false */
+    enterblock(fs, &bl, 0);
+    jf = v.f;
+  }
+  statlist(ls);  /* 'then' part */
+  leaveblock(fs);
+  if (ls->t.token == TK_ELSE ||
+      ls->t.token == TK_ELSEIF)  /* followed by 'else'/'elseif'? */
+    luaK_concat(fs, escapelist, luaK_jump(fs));  /* must jump over it */
+  luaK_patchtohere(fs, jf);
+}
+
+
+static void ifstat (LexState *ls, int line) {
+  /* ifstat -> IF cond THEN block {ELSEIF cond THEN block} [ELSE block] END */
+  FuncState *fs = ls->fs;
+  int escapelist = NO_JUMP;  /* exit list for finished parts */
+  test_then_block(ls, &escapelist);  /* IF cond THEN block */
+  while (ls->t.token == TK_ELSEIF)
+    test_then_block(ls, &escapelist);  /* ELSEIF cond THEN block */
+  if (testnext(ls, TK_ELSE))
+    block(ls);  /* 'else' part */
+  check_match(ls, TK_END, TK_IF, line);
+  luaK_patchtohere(fs, escapelist);  /* patch escape list to 'if' end */
+}
+
+
+static void localfunc (LexState *ls) {
+  expdesc b;
+  FuncState *fs = ls->fs;
+  int fvar = fs->nactvar;  /* function's variable index */
+  new_localvar(ls, str_checkname(ls));  /* new local variable */
+  adjustlocalvars(ls, 1);  /* enter its scope */
+  body(ls, &b, 0, ls->linenumber);  /* function created in next register */
+  /* debug information will only see the variable after this point! */
+  localdebuginfo(fs, fvar)->startpc = fs->pc;
+}
+
+
+static int getlocalattribute (LexState *ls) {
+  /* ATTRIB -> ['<' Name '>'] */
+  if (testnext(ls, '<')) {
+    const char *attr = getstr(str_checkname(ls));
+    checknext(ls, '>');
+    if (strcmp(attr, "const") == 0)
+      return RDKCONST;  /* read-only variable */
+    else if (strcmp(attr, "close") == 0)
+      return RDKTOCLOSE;  /* to-be-closed variable */
+    else
+      luaK_semerror(ls,
+        luaO_pushfstring(ls->L, "unknown attribute '%s'", attr));
+  }
+  return VDKREG;  /* regular variable */
+}
+
+
+static void checktoclose (FuncState *fs, int level) {
+  if (level != -1) {  /* is there a to-be-closed variable? */
+    marktobeclosed(fs);
+    luaK_codeABC(fs, OP_TBC, reglevel(fs, level), 0, 0);
+  }
+}
+
+
+static void localstat (LexState *ls) {
+  /* stat -> LOCAL NAME ATTRIB { ',' NAME ATTRIB } ['=' explist] */
+  FuncState *fs = ls->fs;
+  int toclose = -1;  /* index of to-be-closed variable (if any) */
+  Vardesc *var;  /* last variable */
+  int vidx, kind;  /* index and kind of last variable */
+  int nvars = 0;
+  int nexps;
+  expdesc e;
+  do {
+    vidx = new_localvar(ls, str_checkname(ls));
+    kind = getlocalattribute(ls);
+    getlocalvardesc(fs, vidx)->vd.kind = kind;
+    if (kind == RDKTOCLOSE) {  /* to-be-closed? */
+      if (toclose != -1)  /* one already present? */
+        luaK_semerror(ls, "multiple to-be-closed variables in local list");
+      toclose = fs->nactvar + nvars;
+    }
+    nvars++;
+  } while (testnext(ls, ','));
+  if (testnext(ls, '='))
+    nexps = explist(ls, &e);
+  else {
+    e.k = VVOID;
+    nexps = 0;
+  }
+  var = getlocalvardesc(fs, vidx);  /* get last variable */
+  if (nvars == nexps &&  /* no adjustments? */
+      var->vd.kind == RDKCONST &&  /* last variable is const? */
+      luaK_exp2const(fs, &e, &var->k)) {  /* compile-time constant? */
+    var->vd.kind = RDKCTC;  /* variable is a compile-time constant */
+    adjustlocalvars(ls, nvars - 1);  /* exclude last variable */
+    fs->nactvar++;  /* but count it */
+  }
+  else {
+    adjust_assign(ls, nvars, nexps, &e);
+    adjustlocalvars(ls, nvars);
+  }
+  checktoclose(fs, toclose);
+}
+
+
+static int funcname (LexState *ls, expdesc *v) {
+  /* funcname -> NAME {fieldsel} [':' NAME] */
+  int ismethod = 0;
+  singlevar(ls, v);
+  while (ls->t.token == '.')
+    fieldsel(ls, v);
+  if (ls->t.token == ':') {
+    ismethod = 1;
+    fieldsel(ls, v);
+  }
+  return ismethod;
+}
+
+
+static void funcstat (LexState *ls, int line) {
+  /* funcstat -> FUNCTION funcname body */
+  int ismethod;
+  expdesc v, b;
+  luaX_next(ls);  /* skip FUNCTION */
+  ismethod = funcname(ls, &v);
+  body(ls, &b, ismethod, line);
+  check_readonly(ls, &v);
+  luaK_storevar(ls->fs, &v, &b);
+  luaK_fixline(ls->fs, line);  /* definition "happens" in the first line */
+}
+
+
+static void exprstat (LexState *ls) {
+  /* stat -> func | assignment */
+  FuncState *fs = ls->fs;
+  struct LHS_assign v;
+  suffixedexp(ls, &v.v);
+  if (ls->t.token == '=' || ls->t.token == ',') { /* stat -> assignment ? */
+    v.prev = NULL;
+    restassign(ls, &v, 1);
+  }
+  else {  /* stat -> func */
+    Instruction *inst;
+    check_condition(ls, v.v.k == VCALL, "syntax error");
+    inst = &getinstruction(fs, &v.v);
+    SETARG_C(*inst, 1);  /* call statement uses no results */
+  }
+}
+
+
+static void retstat (LexState *ls) {
+  /* stat -> RETURN [explist] [';'] */
+  FuncState *fs = ls->fs;
+  expdesc e;
+  int nret;  /* number of values being returned */
+  int first = luaY_nvarstack(fs);  /* first slot to be returned */
+  if (block_follow(ls, 1) || ls->t.token == ';')
+    nret = 0;  /* return no values */
+  else {
+    nret = explist(ls, &e);  /* optional return values */
+    if (hasmultret(e.k)) {
+      luaK_setmultret(fs, &e);
+      if (e.k == VCALL && nret == 1 && !fs->bl->insidetbc) {  /* tail call? */
+        SET_OPCODE(getinstruction(fs,&e), OP_TAILCALL);
+        lua_assert(GETARG_A(getinstruction(fs,&e)) == luaY_nvarstack(fs));
+      }
+      nret = LUA_MULTRET;  /* return all values */
+    }
+    else {
+      if (nret == 1)  /* only one single value? */
+        first = luaK_exp2anyreg(fs, &e);  /* can use original slot */
+      else {  /* values must go to the top of the stack */
+        luaK_exp2nextreg(fs, &e);
+        lua_assert(nret == fs->freereg - first);
+      }
+    }
+  }
+  luaK_ret(fs, first, nret);
+  testnext(ls, ';');  /* skip optional semicolon */
+}
+
+
+static void statement (LexState *ls) {
+  int line = ls->linenumber;  /* may be needed for error messages */
+  enterlevel(ls);
+  switch (ls->t.token) {
+    case ';': {  /* stat -> ';' (empty statement) */
+      luaX_next(ls);  /* skip ';' */
+      break;
+    }
+    case TK_IF: {  /* stat -> ifstat */
+      ifstat(ls, line);
+      break;
+    }
+    case TK_WHILE: {  /* stat -> whilestat */
+      whilestat(ls, line);
+      break;
+    }
+    case TK_DO: {  /* stat -> DO block END */
+      luaX_next(ls);  /* skip DO */
+      block(ls);
+      check_match(ls, TK_END, TK_DO, line);
+      break;
+    }
+    case TK_FOR: {  /* stat -> forstat */
+      forstat(ls, line);
+      break;
+    }
+    case TK_REPEAT: {  /* stat -> repeatstat */
+      repeatstat(ls, line);
+      break;
+    }
+    case TK_FUNCTION: {  /* stat -> funcstat */
+      funcstat(ls, line);
+      break;
+    }
+    case TK_LOCAL: {  /* stat -> localstat */
+      luaX_next(ls);  /* skip LOCAL */
+      if (testnext(ls, TK_FUNCTION))  /* local function? */
+        localfunc(ls);
+      else
+        localstat(ls);
+      break;
+    }
+    case TK_DBCOLON: {  /* stat -> label */
+      luaX_next(ls);  /* skip double colon */
+      labelstat(ls, str_checkname(ls), line);
+      break;
+    }
+    case TK_RETURN: {  /* stat -> retstat */
+      luaX_next(ls);  /* skip RETURN */
+      retstat(ls);
+      break;
+    }
+    case TK_BREAK: {  /* stat -> breakstat */
+      breakstat(ls);
+      break;
+    }
+    case TK_GOTO: {  /* stat -> 'goto' NAME */
+      luaX_next(ls);  /* skip 'goto' */
+      gotostat(ls);
+      break;
+    }
+    default: {  /* stat -> func | assignment */
+      exprstat(ls);
+      break;
+    }
+  }
+  lua_assert(ls->fs->f->maxstacksize >= ls->fs->freereg &&
+             ls->fs->freereg >= luaY_nvarstack(ls->fs));
+  ls->fs->freereg = luaY_nvarstack(ls->fs);  /* free registers */
+  leavelevel(ls);
+}
+
+/* }====================================================================== */
+
+
+/*
+** compiles the main function, which is a regular vararg function with an
+** upvalue named LUA_ENV
+*/
+static void mainfunc (LexState *ls, FuncState *fs) {
+  BlockCnt bl;
+  Upvaldesc *env;
+  open_func(ls, fs, &bl);
+  setvararg(fs, 0);  /* main function is always declared vararg */
+  env = allocupvalue(fs);  /* ...set environment upvalue */
+  env->instack = 1;
+  env->idx = 0;
+  env->kind = VDKREG;
+  env->name = ls->envn;
+  luaC_objbarrier(ls->L, fs->f, env->name);
+  luaX_next(ls);  /* read first token */
+  statlist(ls);  /* parse main body */
+  check(ls, TK_EOS);
+  close_func(ls);
+}
+
+
+LClosure *luaY_parser (lua_State *L, ZIO *z, Mbuffer *buff,
+                       Dyndata *dyd, const char *name, int firstchar) {
+  LexState lexstate;
+  FuncState funcstate;
+  LClosure *cl = luaF_newLclosure(L, 1);  /* create main closure */
+  setclLvalue2s(L, L->top.p, cl);  /* anchor it (to avoid being collected) */
+  luaD_inctop(L);
+  lexstate.h = luaH_new(L);  /* create table for scanner */
+  sethvalue2s(L, L->top.p, lexstate.h);  /* anchor it */
+  luaD_inctop(L);
+  funcstate.f = cl->p = luaF_newproto(L);
+  luaC_objbarrier(L, cl, cl->p);
+  funcstate.f->source = luaS_new(L, name);  /* create and anchor TString */
+  luaC_objbarrier(L, funcstate.f, funcstate.f->source);
+  lexstate.buff = buff;
+  lexstate.dyd = dyd;
+  dyd->actvar.n = dyd->gt.n = dyd->label.n = 0;
+  luaX_setinput(L, &lexstate, z, funcstate.f->source, firstchar);
+  mainfunc(&lexstate, &funcstate);
+  lua_assert(!funcstate.prev && funcstate.nups == 1 && !lexstate.fs);
+  /* all scopes should be correctly finished */
+  lua_assert(dyd->actvar.n == 0 && dyd->gt.n == 0 && dyd->label.n == 0);
+  L->top.p--;  /* remove scanner's table */
+  return cl;  /* closure is on the stack, too */
+}
+
diff --git a/src/libs/3rdparty/lua/src/lparser.h b/src/libs/3rdparty/lua/src/lparser.h
new file mode 100644
index 0000000000..5e4500f181
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lparser.h
@@ -0,0 +1,171 @@
+/*
+** $Id: lparser.h $
+** Lua Parser
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lparser_h
+#define lparser_h
+
+#include "llimits.h"
+#include "lobject.h"
+#include "lzio.h"
+
+
+/*
+** Expression and variable descriptor.
+** Code generation for variables and expressions can be delayed to allow
+** optimizations; An 'expdesc' structure describes a potentially-delayed
+** variable/expression. It has a description of its "main" value plus a
+** list of conditional jumps that can also produce its value (generated
+** by short-circuit operators 'and'/'or').
+*/
+
+/* kinds of variables/expressions */
+typedef enum {
+  VVOID,  /* when 'expdesc' describes the last expression of a list,
+             this kind means an empty list (so, no expression) */
+  VNIL,  /* constant nil */
+  VTRUE,  /* constant true */
+  VFALSE,  /* constant false */
+  VK,  /* constant in 'k'; info = index of constant in 'k' */
+  VKFLT,  /* floating constant; nval = numerical float value */
+  VKINT,  /* integer constant; ival = numerical integer value */
+  VKSTR,  /* string constant; strval = TString address;
+             (string is fixed by the lexer) */
+  VNONRELOC,  /* expression has its value in a fixed register;
+                 info = result register */
+  VLOCAL,  /* local variable; var.ridx = register index;
+              var.vidx = relative index in 'actvar.arr'  */
+  VUPVAL,  /* upvalue variable; info = index of upvalue in 'upvalues' */
+  VCONST,  /* compile-time <const> variable;
+              info = absolute index in 'actvar.arr'  */
+  VINDEXED,  /* indexed variable;
+                ind.t = table register;
+                ind.idx = key's R index */
+  VINDEXUP,  /* indexed upvalue;
+                ind.t = table upvalue;
+                ind.idx = key's K index */
+  VINDEXI, /* indexed variable with constant integer;
+                ind.t = table register;
+                ind.idx = key's value */
+  VINDEXSTR, /* indexed variable with literal string;
+                ind.t = table register;
+                ind.idx = key's K index */
+  VJMP,  /* expression is a test/comparison;
+            info = pc of corresponding jump instruction */
+  VRELOC,  /* expression can put result in any register;
+              info = instruction pc */
+  VCALL,  /* expression is a function call; info = instruction pc */
+  VVARARG  /* vararg expression; info = instruction pc */
+} expkind;
+
+
+#define vkisvar(k)	(VLOCAL <= (k) && (k) <= VINDEXSTR)
+#define vkisindexed(k)	(VINDEXED <= (k) && (k) <= VINDEXSTR)
+
+
+typedef struct expdesc {
+  expkind k;
+  union {
+    lua_Integer ival;    /* for VKINT */
+    lua_Number nval;  /* for VKFLT */
+    TString *strval;  /* for VKSTR */
+    int info;  /* for generic use */
+    struct {  /* for indexed variables */
+      short idx;  /* index (R or "long" K) */
+      lu_byte t;  /* table (register or upvalue) */
+    } ind;
+    struct {  /* for local variables */
+      lu_byte ridx;  /* register holding the variable */
+      unsigned short vidx;  /* compiler index (in 'actvar.arr')  */
+    } var;
+  } u;
+  int t;  /* patch list of 'exit when true' */
+  int f;  /* patch list of 'exit when false' */
+} expdesc;
+
+
+/* kinds of variables */
+#define VDKREG		0   /* regular */
+#define RDKCONST	1   /* constant */
+#define RDKTOCLOSE	2   /* to-be-closed */
+#define RDKCTC		3   /* compile-time constant */
+
+/* description of an active local variable */
+typedef union Vardesc {
+  struct {
+    TValuefields;  /* constant value (if it is a compile-time constant) */
+    lu_byte kind;
+    lu_byte ridx;  /* register holding the variable */
+    short pidx;  /* index of the variable in the Proto's 'locvars' array */
+    TString *name;  /* variable name */
+  } vd;
+  TValue k;  /* constant value (if any) */
+} Vardesc;
+
+
+
+/* description of pending goto statements and label statements */
+typedef struct Labeldesc {
+  TString *name;  /* label identifier */
+  int pc;  /* position in code */
+  int line;  /* line where it appeared */
+  lu_byte nactvar;  /* number of active variables in that position */
+  lu_byte close;  /* goto that escapes upvalues */
+} Labeldesc;
+
+
+/* list of labels or gotos */
+typedef struct Labellist {
+  Labeldesc *arr;  /* array */
+  int n;  /* number of entries in use */
+  int size;  /* array size */
+} Labellist;
+
+
+/* dynamic structures used by the parser */
+typedef struct Dyndata {
+  struct {  /* list of all active local variables */
+    Vardesc *arr;
+    int n;
+    int size;
+  } actvar;
+  Labellist gt;  /* list of pending gotos */
+  Labellist label;   /* list of active labels */
+} Dyndata;
+
+
+/* control of blocks */
+struct BlockCnt;  /* defined in lparser.c */
+
+
+/* state needed to generate code for a given function */
+typedef struct FuncState {
+  Proto *f;  /* current function header */
+  struct FuncState *prev;  /* enclosing function */
+  struct LexState *ls;  /* lexical state */
+  struct BlockCnt *bl;  /* chain of current blocks */
+  int pc;  /* next position to code (equivalent to 'ncode') */
+  int lasttarget;   /* 'label' of last 'jump label' */
+  int previousline;  /* last line that was saved in 'lineinfo' */
+  int nk;  /* number of elements in 'k' */
+  int np;  /* number of elements in 'p' */
+  int nabslineinfo;  /* number of elements in 'abslineinfo' */
+  int firstlocal;  /* index of first local var (in Dyndata array) */
+  int firstlabel;  /* index of first label (in 'dyd->label->arr') */
+  short ndebugvars;  /* number of elements in 'f->locvars' */
+  lu_byte nactvar;  /* number of active local variables */
+  lu_byte nups;  /* number of upvalues */
+  lu_byte freereg;  /* first free register */
+  lu_byte iwthabs;  /* instructions issued since last absolute line info */
+  lu_byte needclose;  /* function needs to close upvalues when returning */
+} FuncState;
+
+
+LUAI_FUNC int luaY_nvarstack (FuncState *fs);
+LUAI_FUNC LClosure *luaY_parser (lua_State *L, ZIO *z, Mbuffer *buff,
+                                 Dyndata *dyd, const char *name, int firstchar);
+
+
+#endif
diff --git a/src/libs/3rdparty/lua/src/lprefix.h b/src/libs/3rdparty/lua/src/lprefix.h
new file mode 100644
index 0000000000..484f2ad6fb
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lprefix.h
@@ -0,0 +1,45 @@
+/*
+** $Id: lprefix.h $
+** Definitions for Lua code that must come before any other header file
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lprefix_h
+#define lprefix_h
+
+
+/*
+** Allows POSIX/XSI stuff
+*/
+#if !defined(LUA_USE_C89)	/* { */
+
+#if !defined(_XOPEN_SOURCE)
+#define _XOPEN_SOURCE           600
+#elif _XOPEN_SOURCE == 0
+#undef _XOPEN_SOURCE  /* use -D_XOPEN_SOURCE=0 to undefine it */
+#endif
+
+/*
+** Allows manipulation of large files in gcc and some other compilers
+*/
+#if !defined(LUA_32BITS) && !defined(_FILE_OFFSET_BITS)
+#define _LARGEFILE_SOURCE       1
+#define _FILE_OFFSET_BITS       64
+#endif
+
+#endif				/* } */
+
+
+/*
+** Windows stuff
+*/
+#if defined(_WIN32)	/* { */
+
+#if !defined(_CRT_SECURE_NO_WARNINGS)
+#define _CRT_SECURE_NO_WARNINGS  /* avoid warnings about ISO C functions */
+#endif
+
+#endif			/* } */
+
+#endif
+
diff --git a/src/libs/3rdparty/lua/src/lstate.c b/src/libs/3rdparty/lua/src/lstate.c
new file mode 100644
index 0000000000..1e925e5ad4
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lstate.c
@@ -0,0 +1,445 @@
+/*
+** $Id: lstate.c $
+** Global State
+** See Copyright Notice in lua.h
+*/
+
+#define lstate_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include <stddef.h>
+#include <string.h>
+
+#include "lua.h"
+
+#include "lapi.h"
+#include "ldebug.h"
+#include "ldo.h"
+#include "lfunc.h"
+#include "lgc.h"
+#include "llex.h"
+#include "lmem.h"
+#include "lstate.h"
+#include "lstring.h"
+#include "ltable.h"
+#include "ltm.h"
+
+
+
+/*
+** thread state + extra space
+*/
+typedef struct LX {
+  lu_byte extra_[LUA_EXTRASPACE];
+  lua_State l;
+} LX;
+
+
+/*
+** Main thread combines a thread state and the global state
+*/
+typedef struct LG {
+  LX l;
+  global_State g;
+} LG;
+
+
+
+#define fromstate(L)	(cast(LX *, cast(lu_byte *, (L)) - offsetof(LX, l)))
+
+
+/*
+** A macro to create a "random" seed when a state is created;
+** the seed is used to randomize string hashes.
+*/
+#if !defined(luai_makeseed)
+
+#include <time.h>
+
+/*
+** Compute an initial seed with some level of randomness.
+** Rely on Address Space Layout Randomization (if present) and
+** current time.
+*/
+#define addbuff(b,p,e) \
+  { size_t t = cast_sizet(e); \
+    memcpy(b + p, &t, sizeof(t)); p += sizeof(t); }
+
+static unsigned int luai_makeseed (lua_State *L) {
+  char buff[3 * sizeof(size_t)];
+  unsigned int h = cast_uint(time(NULL));
+  int p = 0;
+  addbuff(buff, p, L);  /* heap variable */
+  addbuff(buff, p, &h);  /* local variable */
+  addbuff(buff, p, &lua_newstate);  /* public function */
+  lua_assert(p == sizeof(buff));
+  return luaS_hash(buff, p, h);
+}
+
+#endif
+
+
+/*
+** set GCdebt to a new value keeping the value (totalbytes + GCdebt)
+** invariant (and avoiding underflows in 'totalbytes')
+*/
+void luaE_setdebt (global_State *g, l_mem debt) {
+  l_mem tb = gettotalbytes(g);
+  lua_assert(tb > 0);
+  if (debt < tb - MAX_LMEM)
+    debt = tb - MAX_LMEM;  /* will make 'totalbytes == MAX_LMEM' */
+  g->totalbytes = tb - debt;
+  g->GCdebt = debt;
+}
+
+
+LUA_API int lua_setcstacklimit (lua_State *L, unsigned int limit) {
+  UNUSED(L); UNUSED(limit);
+  return LUAI_MAXCCALLS;  /* warning?? */
+}
+
+
+CallInfo *luaE_extendCI (lua_State *L) {
+  CallInfo *ci;
+  lua_assert(L->ci->next == NULL);
+  ci = luaM_new(L, CallInfo);
+  lua_assert(L->ci->next == NULL);
+  L->ci->next = ci;
+  ci->previous = L->ci;
+  ci->next = NULL;
+  ci->u.l.trap = 0;
+  L->nci++;
+  return ci;
+}
+
+
+/*
+** free all CallInfo structures not in use by a thread
+*/
+void luaE_freeCI (lua_State *L) {
+  CallInfo *ci = L->ci;
+  CallInfo *next = ci->next;
+  ci->next = NULL;
+  while ((ci = next) != NULL) {
+    next = ci->next;
+    luaM_free(L, ci);
+    L->nci--;
+  }
+}
+
+
+/*
+** free half of the CallInfo structures not in use by a thread,
+** keeping the first one.
+*/
+void luaE_shrinkCI (lua_State *L) {
+  CallInfo *ci = L->ci->next;  /* first free CallInfo */
+  CallInfo *next;
+  if (ci == NULL)
+    return;  /* no extra elements */
+  while ((next = ci->next) != NULL) {  /* two extra elements? */
+    CallInfo *next2 = next->next;  /* next's next */
+    ci->next = next2;  /* remove next from the list */
+    L->nci--;
+    luaM_free(L, next);  /* free next */
+    if (next2 == NULL)
+      break;  /* no more elements */
+    else {
+      next2->previous = ci;
+      ci = next2;  /* continue */
+    }
+  }
+}
+
+
+/*
+** Called when 'getCcalls(L)' larger or equal to LUAI_MAXCCALLS.
+** If equal, raises an overflow error. If value is larger than
+** LUAI_MAXCCALLS (which means it is handling an overflow) but
+** not much larger, does not report an error (to allow overflow
+** handling to work).
+*/
+void luaE_checkcstack (lua_State *L) {
+  if (getCcalls(L) == LUAI_MAXCCALLS)
+    luaG_runerror(L, "C stack overflow");
+  else if (getCcalls(L) >= (LUAI_MAXCCALLS / 10 * 11))
+    luaD_throw(L, LUA_ERRERR);  /* error while handling stack error */
+}
+
+
+LUAI_FUNC void luaE_incCstack (lua_State *L) {
+  L->nCcalls++;
+  if (l_unlikely(getCcalls(L) >= LUAI_MAXCCALLS))
+    luaE_checkcstack(L);
+}
+
+
+static void stack_init (lua_State *L1, lua_State *L) {
+  int i; CallInfo *ci;
+  /* initialize stack array */
+  L1->stack.p = luaM_newvector(L, BASIC_STACK_SIZE + EXTRA_STACK, StackValue);
+  L1->tbclist.p = L1->stack.p;
+  for (i = 0; i < BASIC_STACK_SIZE + EXTRA_STACK; i++)
+    setnilvalue(s2v(L1->stack.p + i));  /* erase new stack */
+  L1->top.p = L1->stack.p;
+  L1->stack_last.p = L1->stack.p + BASIC_STACK_SIZE;
+  /* initialize first ci */
+  ci = &L1->base_ci;
+  ci->next = ci->previous = NULL;
+  ci->callstatus = CIST_C;
+  ci->func.p = L1->top.p;
+  ci->u.c.k = NULL;
+  ci->nresults = 0;
+  setnilvalue(s2v(L1->top.p));  /* 'function' entry for this 'ci' */
+  L1->top.p++;
+  ci->top.p = L1->top.p + LUA_MINSTACK;
+  L1->ci = ci;
+}
+
+
+static void freestack (lua_State *L) {
+  if (L->stack.p == NULL)
+    return;  /* stack not completely built yet */
+  L->ci = &L->base_ci;  /* free the entire 'ci' list */
+  luaE_freeCI(L);
+  lua_assert(L->nci == 0);
+  luaM_freearray(L, L->stack.p, stacksize(L) + EXTRA_STACK);  /* free stack */
+}
+
+
+/*
+** Create registry table and its predefined values
+*/
+static void init_registry (lua_State *L, global_State *g) {
+  /* create registry */
+  Table *registry = luaH_new(L);
+  sethvalue(L, &g->l_registry, registry);
+  luaH_resize(L, registry, LUA_RIDX_LAST, 0);
+  /* registry[LUA_RIDX_MAINTHREAD] = L */
+  setthvalue(L, &registry->array[LUA_RIDX_MAINTHREAD - 1], L);
+  /* registry[LUA_RIDX_GLOBALS] = new table (table of globals) */
+  sethvalue(L, &registry->array[LUA_RIDX_GLOBALS - 1], luaH_new(L));
+}
+
+
+/*
+** open parts of the state that may cause memory-allocation errors.
+*/
+static void f_luaopen (lua_State *L, void *ud) {
+  global_State *g = G(L);
+  UNUSED(ud);
+  stack_init(L, L);  /* init stack */
+  init_registry(L, g);
+  luaS_init(L);
+  luaT_init(L);
+  luaX_init(L);
+  g->gcstp = 0;  /* allow gc */
+  setnilvalue(&g->nilvalue);  /* now state is complete */
+  luai_userstateopen(L);
+}
+
+
+/*
+** preinitialize a thread with consistent values without allocating
+** any memory (to avoid errors)
+*/
+static void preinit_thread (lua_State *L, global_State *g) {
+  G(L) = g;
+  L->stack.p = NULL;
+  L->ci = NULL;
+  L->nci = 0;
+  L->twups = L;  /* thread has no upvalues */
+  L->nCcalls = 0;
+  L->errorJmp = NULL;
+  L->hook = NULL;
+  L->hookmask = 0;
+  L->basehookcount = 0;
+  L->allowhook = 1;
+  resethookcount(L);
+  L->openupval = NULL;
+  L->status = LUA_OK;
+  L->errfunc = 0;
+  L->oldpc = 0;
+}
+
+
+static void close_state (lua_State *L) {
+  global_State *g = G(L);
+  if (!completestate(g))  /* closing a partially built state? */
+    luaC_freeallobjects(L);  /* just collect its objects */
+  else {  /* closing a fully built state */
+    L->ci = &L->base_ci;  /* unwind CallInfo list */
+    luaD_closeprotected(L, 1, LUA_OK);  /* close all upvalues */
+    luaC_freeallobjects(L);  /* collect all objects */
+    luai_userstateclose(L);
+  }
+  luaM_freearray(L, G(L)->strt.hash, G(L)->strt.size);
+  freestack(L);
+  lua_assert(gettotalbytes(g) == sizeof(LG));
+  (*g->frealloc)(g->ud, fromstate(L), sizeof(LG), 0);  /* free main block */
+}
+
+
+LUA_API lua_State *lua_newthread (lua_State *L) {
+  global_State *g = G(L);
+  GCObject *o;
+  lua_State *L1;
+  lua_lock(L);
+  luaC_checkGC(L);
+  /* create new thread */
+  o = luaC_newobjdt(L, LUA_TTHREAD, sizeof(LX), offsetof(LX, l));
+  L1 = gco2th(o);
+  /* anchor it on L stack */
+  setthvalue2s(L, L->top.p, L1);
+  api_incr_top(L);
+  preinit_thread(L1, g);
+  L1->hookmask = L->hookmask;
+  L1->basehookcount = L->basehookcount;
+  L1->hook = L->hook;
+  resethookcount(L1);
+  /* initialize L1 extra space */
+  memcpy(lua_getextraspace(L1), lua_getextraspace(g->mainthread),
+         LUA_EXTRASPACE);
+  luai_userstatethread(L, L1);
+  stack_init(L1, L);  /* init stack */
+  lua_unlock(L);
+  return L1;
+}
+
+
+void luaE_freethread (lua_State *L, lua_State *L1) {
+  LX *l = fromstate(L1);
+  luaF_closeupval(L1, L1->stack.p);  /* close all upvalues */
+  lua_assert(L1->openupval == NULL);
+  luai_userstatefree(L, L1);
+  freestack(L1);
+  luaM_free(L, l);
+}
+
+
+int luaE_resetthread (lua_State *L, int status) {
+  CallInfo *ci = L->ci = &L->base_ci;  /* unwind CallInfo list */
+  setnilvalue(s2v(L->stack.p));  /* 'function' entry for basic 'ci' */
+  ci->func.p = L->stack.p;
+  ci->callstatus = CIST_C;
+  if (status == LUA_YIELD)
+    status = LUA_OK;
+  L->status = LUA_OK;  /* so it can run __close metamethods */
+  status = luaD_closeprotected(L, 1, status);
+  if (status != LUA_OK)  /* errors? */
+    luaD_seterrorobj(L, status, L->stack.p + 1);
+  else
+    L->top.p = L->stack.p + 1;
+  ci->top.p = L->top.p + LUA_MINSTACK;
+  luaD_reallocstack(L, cast_int(ci->top.p - L->stack.p), 0);
+  return status;
+}
+
+
+LUA_API int lua_closethread (lua_State *L, lua_State *from) {
+  int status;
+  lua_lock(L);
+  L->nCcalls = (from) ? getCcalls(from) : 0;
+  status = luaE_resetthread(L, L->status);
+  lua_unlock(L);
+  return status;
+}
+
+
+/*
+** Deprecated! Use 'lua_closethread' instead.
+*/
+LUA_API int lua_resetthread (lua_State *L) {
+  return lua_closethread(L, NULL);
+}
+
+
+LUA_API lua_State *lua_newstate (lua_Alloc f, void *ud) {
+  int i;
+  lua_State *L;
+  global_State *g;
+  LG *l = cast(LG *, (*f)(ud, NULL, LUA_TTHREAD, sizeof(LG)));
+  if (l == NULL) return NULL;
+  L = &l->l.l;
+  g = &l->g;
+  L->tt = LUA_VTHREAD;
+  g->currentwhite = bitmask(WHITE0BIT);
+  L->marked = luaC_white(g);
+  preinit_thread(L, g);
+  g->allgc = obj2gco(L);  /* by now, only object is the main thread */
+  L->next = NULL;
+  incnny(L);  /* main thread is always non yieldable */
+  g->frealloc = f;
+  g->ud = ud;
+  g->warnf = NULL;
+  g->ud_warn = NULL;
+  g->mainthread = L;
+  g->seed = luai_makeseed(L);
+  g->gcstp = GCSTPGC;  /* no GC while building state */
+  g->strt.size = g->strt.nuse = 0;
+  g->strt.hash = NULL;
+  setnilvalue(&g->l_registry);
+  g->panic = NULL;
+  g->gcstate = GCSpause;
+  g->gckind = KGC_INC;
+  g->gcstopem = 0;
+  g->gcemergency = 0;
+  g->finobj = g->tobefnz = g->fixedgc = NULL;
+  g->firstold1 = g->survival = g->old1 = g->reallyold = NULL;
+  g->finobjsur = g->finobjold1 = g->finobjrold = NULL;
+  g->sweepgc = NULL;
+  g->gray = g->grayagain = NULL;
+  g->weak = g->ephemeron = g->allweak = NULL;
+  g->twups = NULL;
+  g->totalbytes = sizeof(LG);
+  g->GCdebt = 0;
+  g->lastatomic = 0;
+  setivalue(&g->nilvalue, 0);  /* to signal that state is not yet built */
+  setgcparam(g->gcpause, LUAI_GCPAUSE);
+  setgcparam(g->gcstepmul, LUAI_GCMUL);
+  g->gcstepsize = LUAI_GCSTEPSIZE;
+  setgcparam(g->genmajormul, LUAI_GENMAJORMUL);
+  g->genminormul = LUAI_GENMINORMUL;
+  for (i=0; i < LUA_NUMTAGS; i++) g->mt[i] = NULL;
+  if (luaD_rawrunprotected(L, f_luaopen, NULL) != LUA_OK) {
+    /* memory allocation error: free partial state */
+    close_state(L);
+    L = NULL;
+  }
+  return L;
+}
+
+
+LUA_API void lua_close (lua_State *L) {
+  lua_lock(L);
+  L = G(L)->mainthread;  /* only the main thread can be closed */
+  close_state(L);
+}
+
+
+void luaE_warning (lua_State *L, const char *msg, int tocont) {
+  lua_WarnFunction wf = G(L)->warnf;
+  if (wf != NULL)
+    wf(G(L)->ud_warn, msg, tocont);
+}
+
+
+/*
+** Generate a warning from an error message
+*/
+void luaE_warnerror (lua_State *L, const char *where) {
+  TValue *errobj = s2v(L->top.p - 1);  /* error object */
+  const char *msg = (ttisstring(errobj))
+                  ? svalue(errobj)
+                  : "error object is not a string";
+  /* produce warning "error in %s (%s)" (where, msg) */
+  luaE_warning(L, "error in ", 1);
+  luaE_warning(L, where, 1);
+  luaE_warning(L, " (", 1);
+  luaE_warning(L, msg, 1);
+  luaE_warning(L, ")", 0);
+}
+
diff --git a/src/libs/3rdparty/lua/src/lstate.h b/src/libs/3rdparty/lua/src/lstate.h
new file mode 100644
index 0000000000..8bf6600e34
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lstate.h
@@ -0,0 +1,409 @@
+/*
+** $Id: lstate.h $
+** Global State
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lstate_h
+#define lstate_h
+
+#include "lua.h"
+
+
+/* Some header files included here need this definition */
+typedef struct CallInfo CallInfo;
+
+
+#include "lobject.h"
+#include "ltm.h"
+#include "lzio.h"
+
+
+/*
+** Some notes about garbage-collected objects: All objects in Lua must
+** be kept somehow accessible until being freed, so all objects always
+** belong to one (and only one) of these lists, using field 'next' of
+** the 'CommonHeader' for the link:
+**
+** 'allgc': all objects not marked for finalization;
+** 'finobj': all objects marked for finalization;
+** 'tobefnz': all objects ready to be finalized;
+** 'fixedgc': all objects that are not to be collected (currently
+** only small strings, such as reserved words).
+**
+** For the generational collector, some of these lists have marks for
+** generations. Each mark points to the first element in the list for
+** that particular generation; that generation goes until the next mark.
+**
+** 'allgc' -> 'survival': new objects;
+** 'survival' -> 'old': objects that survived one collection;
+** 'old1' -> 'reallyold': objects that became old in last collection;
+** 'reallyold' -> NULL: objects old for more than one cycle.
+**
+** 'finobj' -> 'finobjsur': new objects marked for finalization;
+** 'finobjsur' -> 'finobjold1': survived   """";
+** 'finobjold1' -> 'finobjrold': just old  """";
+** 'finobjrold' -> NULL: really old       """".
+**
+** All lists can contain elements older than their main ages, due
+** to 'luaC_checkfinalizer' and 'udata2finalize', which move
+** objects between the normal lists and the "marked for finalization"
+** lists. Moreover, barriers can age young objects in young lists as
+** OLD0, which then become OLD1. However, a list never contains
+** elements younger than their main ages.
+**
+** The generational collector also uses a pointer 'firstold1', which
+** points to the first OLD1 object in the list. It is used to optimize
+** 'markold'. (Potentially OLD1 objects can be anywhere between 'allgc'
+** and 'reallyold', but often the list has no OLD1 objects or they are
+** after 'old1'.) Note the difference between it and 'old1':
+** 'firstold1': no OLD1 objects before this point; there can be all
+**   ages after it.
+** 'old1': no objects younger than OLD1 after this point.
+*/
+
+/*
+** Moreover, there is another set of lists that control gray objects.
+** These lists are linked by fields 'gclist'. (All objects that
+** can become gray have such a field. The field is not the same
+** in all objects, but it always has this name.)  Any gray object
+** must belong to one of these lists, and all objects in these lists
+** must be gray (with two exceptions explained below):
+**
+** 'gray': regular gray objects, still waiting to be visited.
+** 'grayagain': objects that must be revisited at the atomic phase.
+**   That includes
+**   - black objects got in a write barrier;
+**   - all kinds of weak tables during propagation phase;
+**   - all threads.
+** 'weak': tables with weak values to be cleared;
+** 'ephemeron': ephemeron tables with white->white entries;
+** 'allweak': tables with weak keys and/or weak values to be cleared.
+**
+** The exceptions to that "gray rule" are:
+** - TOUCHED2 objects in generational mode stay in a gray list (because
+** they must be visited again at the end of the cycle), but they are
+** marked black because assignments to them must activate barriers (to
+** move them back to TOUCHED1).
+** - Open upvales are kept gray to avoid barriers, but they stay out
+** of gray lists. (They don't even have a 'gclist' field.)
+*/
+
+
+
+/*
+** About 'nCcalls':  This count has two parts: the lower 16 bits counts
+** the number of recursive invocations in the C stack; the higher
+** 16 bits counts the number of non-yieldable calls in the stack.
+** (They are together so that we can change and save both with one
+** instruction.)
+*/
+
+
+/* true if this thread does not have non-yieldable calls in the stack */
+#define yieldable(L)		(((L)->nCcalls & 0xffff0000) == 0)
+
+/* real number of C calls */
+#define getCcalls(L)	((L)->nCcalls & 0xffff)
+
+
+/* Increment the number of non-yieldable calls */
+#define incnny(L)	((L)->nCcalls += 0x10000)
+
+/* Decrement the number of non-yieldable calls */
+#define decnny(L)	((L)->nCcalls -= 0x10000)
+
+/* Non-yieldable call increment */
+#define nyci	(0x10000 | 1)
+
+
+
+
+struct lua_longjmp;  /* defined in ldo.c */
+
+
+/*
+** Atomic type (relative to signals) to better ensure that 'lua_sethook'
+** is thread safe
+*/
+#if !defined(l_signalT)
+#include <signal.h>
+#define l_signalT	sig_atomic_t
+#endif
+
+
+/*
+** Extra stack space to handle TM calls and some other extras. This
+** space is not included in 'stack_last'. It is used only to avoid stack
+** checks, either because the element will be promptly popped or because
+** there will be a stack check soon after the push. Function frames
+** never use this extra space, so it does not need to be kept clean.
+*/
+#define EXTRA_STACK   5
+
+
+#define BASIC_STACK_SIZE        (2*LUA_MINSTACK)
+
+#define stacksize(th)	cast_int((th)->stack_last.p - (th)->stack.p)
+
+
+/* kinds of Garbage Collection */
+#define KGC_INC		0	/* incremental gc */
+#define KGC_GEN		1	/* generational gc */
+
+
+typedef struct stringtable {
+  TString **hash;
+  int nuse;  /* number of elements */
+  int size;
+} stringtable;
+
+
+/*
+** Information about a call.
+** About union 'u':
+** - field 'l' is used only for Lua functions;
+** - field 'c' is used only for C functions.
+** About union 'u2':
+** - field 'funcidx' is used only by C functions while doing a
+** protected call;
+** - field 'nyield' is used only while a function is "doing" an
+** yield (from the yield until the next resume);
+** - field 'nres' is used only while closing tbc variables when
+** returning from a function;
+** - field 'transferinfo' is used only during call/returnhooks,
+** before the function starts or after it ends.
+*/
+struct CallInfo {
+  StkIdRel func;  /* function index in the stack */
+  StkIdRel	top;  /* top for this function */
+  struct CallInfo *previous, *next;  /* dynamic call link */
+  union {
+    struct {  /* only for Lua functions */
+      const Instruction *savedpc;
+      volatile l_signalT trap;
+      int nextraargs;  /* # of extra arguments in vararg functions */
+    } l;
+    struct {  /* only for C functions */
+      lua_KFunction k;  /* continuation in case of yields */
+      ptrdiff_t old_errfunc;
+      lua_KContext ctx;  /* context info. in case of yields */
+    } c;
+  } u;
+  union {
+    int funcidx;  /* called-function index */
+    int nyield;  /* number of values yielded */
+    int nres;  /* number of values returned */
+    struct {  /* info about transferred values (for call/return hooks) */
+      unsigned short ftransfer;  /* offset of first value transferred */
+      unsigned short ntransfer;  /* number of values transferred */
+    } transferinfo;
+  } u2;
+  short nresults;  /* expected number of results from this function */
+  unsigned short callstatus;
+};
+
+
+/*
+** Bits in CallInfo status
+*/
+#define CIST_OAH	(1<<0)	/* original value of 'allowhook' */
+#define CIST_C		(1<<1)	/* call is running a C function */
+#define CIST_FRESH	(1<<2)	/* call is on a fresh "luaV_execute" frame */
+#define CIST_HOOKED	(1<<3)	/* call is running a debug hook */
+#define CIST_YPCALL	(1<<4)	/* doing a yieldable protected call */
+#define CIST_TAIL	(1<<5)	/* call was tail called */
+#define CIST_HOOKYIELD	(1<<6)	/* last hook called yielded */
+#define CIST_FIN	(1<<7)	/* function "called" a finalizer */
+#define CIST_TRAN	(1<<8)	/* 'ci' has transfer information */
+#define CIST_CLSRET	(1<<9)  /* function is closing tbc variables */
+/* Bits 10-12 are used for CIST_RECST (see below) */
+#define CIST_RECST	10
+#if defined(LUA_COMPAT_LT_LE)
+#define CIST_LEQ	(1<<13)  /* using __lt for __le */
+#endif
+
+
+/*
+** Field CIST_RECST stores the "recover status", used to keep the error
+** status while closing to-be-closed variables in coroutines, so that
+** Lua can correctly resume after an yield from a __close method called
+** because of an error.  (Three bits are enough for error status.)
+*/
+#define getcistrecst(ci)     (((ci)->callstatus >> CIST_RECST) & 7)
+#define setcistrecst(ci,st)  \
+  check_exp(((st) & 7) == (st),   /* status must fit in three bits */  \
+            ((ci)->callstatus = ((ci)->callstatus & ~(7 << CIST_RECST))  \
+                                                  | ((st) << CIST_RECST)))
+
+
+/* active function is a Lua function */
+#define isLua(ci)	(!((ci)->callstatus & CIST_C))
+
+/* call is running Lua code (not a hook) */
+#define isLuacode(ci)	(!((ci)->callstatus & (CIST_C | CIST_HOOKED)))
+
+/* assume that CIST_OAH has offset 0 and that 'v' is strictly 0/1 */
+#define setoah(st,v)	((st) = ((st) & ~CIST_OAH) | (v))
+#define getoah(st)	((st) & CIST_OAH)
+
+
+/*
+** 'global state', shared by all threads of this state
+*/
+typedef struct global_State {
+  lua_Alloc frealloc;  /* function to reallocate memory */
+  void *ud;         /* auxiliary data to 'frealloc' */
+  l_mem totalbytes;  /* number of bytes currently allocated - GCdebt */
+  l_mem GCdebt;  /* bytes allocated not yet compensated by the collector */
+  lu_mem GCestimate;  /* an estimate of the non-garbage memory in use */
+  lu_mem lastatomic;  /* see function 'genstep' in file 'lgc.c' */
+  stringtable strt;  /* hash table for strings */
+  TValue l_registry;
+  TValue nilvalue;  /* a nil value */
+  unsigned int seed;  /* randomized seed for hashes */
+  lu_byte currentwhite;
+  lu_byte gcstate;  /* state of garbage collector */
+  lu_byte gckind;  /* kind of GC running */
+  lu_byte gcstopem;  /* stops emergency collections */
+  lu_byte genminormul;  /* control for minor generational collections */
+  lu_byte genmajormul;  /* control for major generational collections */
+  lu_byte gcstp;  /* control whether GC is running */
+  lu_byte gcemergency;  /* true if this is an emergency collection */
+  lu_byte gcpause;  /* size of pause between successive GCs */
+  lu_byte gcstepmul;  /* GC "speed" */
+  lu_byte gcstepsize;  /* (log2 of) GC granularity */
+  GCObject *allgc;  /* list of all collectable objects */
+  GCObject **sweepgc;  /* current position of sweep in list */
+  GCObject *finobj;  /* list of collectable objects with finalizers */
+  GCObject *gray;  /* list of gray objects */
+  GCObject *grayagain;  /* list of objects to be traversed atomically */
+  GCObject *weak;  /* list of tables with weak values */
+  GCObject *ephemeron;  /* list of ephemeron tables (weak keys) */
+  GCObject *allweak;  /* list of all-weak tables */
+  GCObject *tobefnz;  /* list of userdata to be GC */
+  GCObject *fixedgc;  /* list of objects not to be collected */
+  /* fields for generational collector */
+  GCObject *survival;  /* start of objects that survived one GC cycle */
+  GCObject *old1;  /* start of old1 objects */
+  GCObject *reallyold;  /* objects more than one cycle old ("really old") */
+  GCObject *firstold1;  /* first OLD1 object in the list (if any) */
+  GCObject *finobjsur;  /* list of survival objects with finalizers */
+  GCObject *finobjold1;  /* list of old1 objects with finalizers */
+  GCObject *finobjrold;  /* list of really old objects with finalizers */
+  struct lua_State *twups;  /* list of threads with open upvalues */
+  lua_CFunction panic;  /* to be called in unprotected errors */
+  struct lua_State *mainthread;
+  TString *memerrmsg;  /* message for memory-allocation errors */
+  TString *tmname[TM_N];  /* array with tag-method names */
+  struct Table *mt[LUA_NUMTYPES];  /* metatables for basic types */
+  TString *strcache[STRCACHE_N][STRCACHE_M];  /* cache for strings in API */
+  lua_WarnFunction warnf;  /* warning function */
+  void *ud_warn;         /* auxiliary data to 'warnf' */
+} global_State;
+
+
+/*
+** 'per thread' state
+*/
+struct lua_State {
+  CommonHeader;
+  lu_byte status;
+  lu_byte allowhook;
+  unsigned short nci;  /* number of items in 'ci' list */
+  StkIdRel top;  /* first free slot in the stack */
+  global_State *l_G;
+  CallInfo *ci;  /* call info for current function */
+  StkIdRel stack_last;  /* end of stack (last element + 1) */
+  StkIdRel stack;  /* stack base */
+  UpVal *openupval;  /* list of open upvalues in this stack */
+  StkIdRel tbclist;  /* list of to-be-closed variables */
+  GCObject *gclist;
+  struct lua_State *twups;  /* list of threads with open upvalues */
+  struct lua_longjmp *errorJmp;  /* current error recover point */
+  CallInfo base_ci;  /* CallInfo for first level (C calling Lua) */
+  volatile lua_Hook hook;
+  ptrdiff_t errfunc;  /* current error handling function (stack index) */
+  l_uint32 nCcalls;  /* number of nested (non-yieldable | C)  calls */
+  int oldpc;  /* last pc traced */
+  int basehookcount;
+  int hookcount;
+  volatile l_signalT hookmask;
+};
+
+
+#define G(L)	(L->l_G)
+
+/*
+** 'g->nilvalue' being a nil value flags that the state was completely
+** build.
+*/
+#define completestate(g)	ttisnil(&g->nilvalue)
+
+
+/*
+** Union of all collectable objects (only for conversions)
+** ISO C99, 6.5.2.3 p.5:
+** "if a union contains several structures that share a common initial
+** sequence [...], and if the union object currently contains one
+** of these structures, it is permitted to inspect the common initial
+** part of any of them anywhere that a declaration of the complete type
+** of the union is visible."
+*/
+union GCUnion {
+  GCObject gc;  /* common header */
+  struct TString ts;
+  struct Udata u;
+  union Closure cl;
+  struct Table h;
+  struct Proto p;
+  struct lua_State th;  /* thread */
+  struct UpVal upv;
+};
+
+
+/*
+** ISO C99, 6.7.2.1 p.14:
+** "A pointer to a union object, suitably converted, points to each of
+** its members [...], and vice versa."
+*/
+#define cast_u(o)	cast(union GCUnion *, (o))
+
+/* macros to convert a GCObject into a specific value */
+#define gco2ts(o)  \
+	check_exp(novariant((o)->tt) == LUA_TSTRING, &((cast_u(o))->ts))
+#define gco2u(o)  check_exp((o)->tt == LUA_VUSERDATA, &((cast_u(o))->u))
+#define gco2lcl(o)  check_exp((o)->tt == LUA_VLCL, &((cast_u(o))->cl.l))
+#define gco2ccl(o)  check_exp((o)->tt == LUA_VCCL, &((cast_u(o))->cl.c))
+#define gco2cl(o)  \
+	check_exp(novariant((o)->tt) == LUA_TFUNCTION, &((cast_u(o))->cl))
+#define gco2t(o)  check_exp((o)->tt == LUA_VTABLE, &((cast_u(o))->h))
+#define gco2p(o)  check_exp((o)->tt == LUA_VPROTO, &((cast_u(o))->p))
+#define gco2th(o)  check_exp((o)->tt == LUA_VTHREAD, &((cast_u(o))->th))
+#define gco2upv(o)	check_exp((o)->tt == LUA_VUPVAL, &((cast_u(o))->upv))
+
+
+/*
+** macro to convert a Lua object into a GCObject
+** (The access to 'tt' tries to ensure that 'v' is actually a Lua object.)
+*/
+#define obj2gco(v)	check_exp((v)->tt >= LUA_TSTRING, &(cast_u(v)->gc))
+
+
+/* actual number of total bytes allocated */
+#define gettotalbytes(g)	cast(lu_mem, (g)->totalbytes + (g)->GCdebt)
+
+LUAI_FUNC void luaE_setdebt (global_State *g, l_mem debt);
+LUAI_FUNC void luaE_freethread (lua_State *L, lua_State *L1);
+LUAI_FUNC CallInfo *luaE_extendCI (lua_State *L);
+LUAI_FUNC void luaE_freeCI (lua_State *L);
+LUAI_FUNC void luaE_shrinkCI (lua_State *L);
+LUAI_FUNC void luaE_checkcstack (lua_State *L);
+LUAI_FUNC void luaE_incCstack (lua_State *L);
+LUAI_FUNC void luaE_warning (lua_State *L, const char *msg, int tocont);
+LUAI_FUNC void luaE_warnerror (lua_State *L, const char *where);
+LUAI_FUNC int luaE_resetthread (lua_State *L, int status);
+
+
+#endif
+
diff --git a/src/libs/3rdparty/lua/src/lstring.c b/src/libs/3rdparty/lua/src/lstring.c
new file mode 100644
index 0000000000..13dcaf4259
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lstring.c
@@ -0,0 +1,273 @@
+/*
+** $Id: lstring.c $
+** String table (keeps all strings handled by Lua)
+** See Copyright Notice in lua.h
+*/
+
+#define lstring_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include <string.h>
+
+#include "lua.h"
+
+#include "ldebug.h"
+#include "ldo.h"
+#include "lmem.h"
+#include "lobject.h"
+#include "lstate.h"
+#include "lstring.h"
+
+
+/*
+** Maximum size for string table.
+*/
+#define MAXSTRTB	cast_int(luaM_limitN(MAX_INT, TString*))
+
+
+/*
+** equality for long strings
+*/
+int luaS_eqlngstr (TString *a, TString *b) {
+  size_t len = a->u.lnglen;
+  lua_assert(a->tt == LUA_VLNGSTR && b->tt == LUA_VLNGSTR);
+  return (a == b) ||  /* same instance or... */
+    ((len == b->u.lnglen) &&  /* equal length and ... */
+     (memcmp(getstr(a), getstr(b), len) == 0));  /* equal contents */
+}
+
+
+unsigned int luaS_hash (const char *str, size_t l, unsigned int seed) {
+  unsigned int h = seed ^ cast_uint(l);
+  for (; l > 0; l--)
+    h ^= ((h<<5) + (h>>2) + cast_byte(str[l - 1]));
+  return h;
+}
+
+
+unsigned int luaS_hashlongstr (TString *ts) {
+  lua_assert(ts->tt == LUA_VLNGSTR);
+  if (ts->extra == 0) {  /* no hash? */
+    size_t len = ts->u.lnglen;
+    ts->hash = luaS_hash(getstr(ts), len, ts->hash);
+    ts->extra = 1;  /* now it has its hash */
+  }
+  return ts->hash;
+}
+
+
+static void tablerehash (TString **vect, int osize, int nsize) {
+  int i;
+  for (i = osize; i < nsize; i++)  /* clear new elements */
+    vect[i] = NULL;
+  for (i = 0; i < osize; i++) {  /* rehash old part of the array */
+    TString *p = vect[i];
+    vect[i] = NULL;
+    while (p) {  /* for each string in the list */
+      TString *hnext = p->u.hnext;  /* save next */
+      unsigned int h = lmod(p->hash, nsize);  /* new position */
+      p->u.hnext = vect[h];  /* chain it into array */
+      vect[h] = p;
+      p = hnext;
+    }
+  }
+}
+
+
+/*
+** Resize the string table. If allocation fails, keep the current size.
+** (This can degrade performance, but any non-zero size should work
+** correctly.)
+*/
+void luaS_resize (lua_State *L, int nsize) {
+  stringtable *tb = &G(L)->strt;
+  int osize = tb->size;
+  TString **newvect;
+  if (nsize < osize)  /* shrinking table? */
+    tablerehash(tb->hash, osize, nsize);  /* depopulate shrinking part */
+  newvect = luaM_reallocvector(L, tb->hash, osize, nsize, TString*);
+  if (l_unlikely(newvect == NULL)) {  /* reallocation failed? */
+    if (nsize < osize)  /* was it shrinking table? */
+      tablerehash(tb->hash, nsize, osize);  /* restore to original size */
+    /* leave table as it was */
+  }
+  else {  /* allocation succeeded */
+    tb->hash = newvect;
+    tb->size = nsize;
+    if (nsize > osize)
+      tablerehash(newvect, osize, nsize);  /* rehash for new size */
+  }
+}
+
+
+/*
+** Clear API string cache. (Entries cannot be empty, so fill them with
+** a non-collectable string.)
+*/
+void luaS_clearcache (global_State *g) {
+  int i, j;
+  for (i = 0; i < STRCACHE_N; i++)
+    for (j = 0; j < STRCACHE_M; j++) {
+      if (iswhite(g->strcache[i][j]))  /* will entry be collected? */
+        g->strcache[i][j] = g->memerrmsg;  /* replace it with something fixed */
+    }
+}
+
+
+/*
+** Initialize the string table and the string cache
+*/
+void luaS_init (lua_State *L) {
+  global_State *g = G(L);
+  int i, j;
+  stringtable *tb = &G(L)->strt;
+  tb->hash = luaM_newvector(L, MINSTRTABSIZE, TString*);
+  tablerehash(tb->hash, 0, MINSTRTABSIZE);  /* clear array */
+  tb->size = MINSTRTABSIZE;
+  /* pre-create memory-error message */
+  g->memerrmsg = luaS_newliteral(L, MEMERRMSG);
+  luaC_fix(L, obj2gco(g->memerrmsg));  /* it should never be collected */
+  for (i = 0; i < STRCACHE_N; i++)  /* fill cache with valid strings */
+    for (j = 0; j < STRCACHE_M; j++)
+      g->strcache[i][j] = g->memerrmsg;
+}
+
+
+
+/*
+** creates a new string object
+*/
+static TString *createstrobj (lua_State *L, size_t l, int tag, unsigned int h) {
+  TString *ts;
+  GCObject *o;
+  size_t totalsize;  /* total size of TString object */
+  totalsize = sizelstring(l);
+  o = luaC_newobj(L, tag, totalsize);
+  ts = gco2ts(o);
+  ts->hash = h;
+  ts->extra = 0;
+  getstr(ts)[l] = '\0';  /* ending 0 */
+  return ts;
+}
+
+
+TString *luaS_createlngstrobj (lua_State *L, size_t l) {
+  TString *ts = createstrobj(L, l, LUA_VLNGSTR, G(L)->seed);
+  ts->u.lnglen = l;
+  return ts;
+}
+
+
+void luaS_remove (lua_State *L, TString *ts) {
+  stringtable *tb = &G(L)->strt;
+  TString **p = &tb->hash[lmod(ts->hash, tb->size)];
+  while (*p != ts)  /* find previous element */
+    p = &(*p)->u.hnext;
+  *p = (*p)->u.hnext;  /* remove element from its list */
+  tb->nuse--;
+}
+
+
+static void growstrtab (lua_State *L, stringtable *tb) {
+  if (l_unlikely(tb->nuse == MAX_INT)) {  /* too many strings? */
+    luaC_fullgc(L, 1);  /* try to free some... */
+    if (tb->nuse == MAX_INT)  /* still too many? */
+      luaM_error(L);  /* cannot even create a message... */
+  }
+  if (tb->size <= MAXSTRTB / 2)  /* can grow string table? */
+    luaS_resize(L, tb->size * 2);
+}
+
+
+/*
+** Checks whether short string exists and reuses it or creates a new one.
+*/
+static TString *internshrstr (lua_State *L, const char *str, size_t l) {
+  TString *ts;
+  global_State *g = G(L);
+  stringtable *tb = &g->strt;
+  unsigned int h = luaS_hash(str, l, g->seed);
+  TString **list = &tb->hash[lmod(h, tb->size)];
+  lua_assert(str != NULL);  /* otherwise 'memcmp'/'memcpy' are undefined */
+  for (ts = *list; ts != NULL; ts = ts->u.hnext) {
+    if (l == ts->shrlen && (memcmp(str, getstr(ts), l * sizeof(char)) == 0)) {
+      /* found! */
+      if (isdead(g, ts))  /* dead (but not collected yet)? */
+        changewhite(ts);  /* resurrect it */
+      return ts;
+    }
+  }
+  /* else must create a new string */
+  if (tb->nuse >= tb->size) {  /* need to grow string table? */
+    growstrtab(L, tb);
+    list = &tb->hash[lmod(h, tb->size)];  /* rehash with new size */
+  }
+  ts = createstrobj(L, l, LUA_VSHRSTR, h);
+  memcpy(getstr(ts), str, l * sizeof(char));
+  ts->shrlen = cast_byte(l);
+  ts->u.hnext = *list;
+  *list = ts;
+  tb->nuse++;
+  return ts;
+}
+
+
+/*
+** new string (with explicit length)
+*/
+TString *luaS_newlstr (lua_State *L, const char *str, size_t l) {
+  if (l <= LUAI_MAXSHORTLEN)  /* short string? */
+    return internshrstr(L, str, l);
+  else {
+    TString *ts;
+    if (l_unlikely(l >= (MAX_SIZE - sizeof(TString))/sizeof(char)))
+      luaM_toobig(L);
+    ts = luaS_createlngstrobj(L, l);
+    memcpy(getstr(ts), str, l * sizeof(char));
+    return ts;
+  }
+}
+
+
+/*
+** Create or reuse a zero-terminated string, first checking in the
+** cache (using the string address as a key). The cache can contain
+** only zero-terminated strings, so it is safe to use 'strcmp' to
+** check hits.
+*/
+TString *luaS_new (lua_State *L, const char *str) {
+  unsigned int i = point2uint(str) % STRCACHE_N;  /* hash */
+  int j;
+  TString **p = G(L)->strcache[i];
+  for (j = 0; j < STRCACHE_M; j++) {
+    if (strcmp(str, getstr(p[j])) == 0)  /* hit? */
+      return p[j];  /* that is it */
+  }
+  /* normal route */
+  for (j = STRCACHE_M - 1; j > 0; j--)
+    p[j] = p[j - 1];  /* move out last element */
+  /* new element is first in the list */
+  p[0] = luaS_newlstr(L, str, strlen(str));
+  return p[0];
+}
+
+
+Udata *luaS_newudata (lua_State *L, size_t s, int nuvalue) {
+  Udata *u;
+  int i;
+  GCObject *o;
+  if (l_unlikely(s > MAX_SIZE - udatamemoffset(nuvalue)))
+    luaM_toobig(L);
+  o = luaC_newobj(L, LUA_VUSERDATA, sizeudata(nuvalue, s));
+  u = gco2u(o);
+  u->len = s;
+  u->nuvalue = nuvalue;
+  u->metatable = NULL;
+  for (i = 0; i < nuvalue; i++)
+    setnilvalue(&u->uv[i].uv);
+  return u;
+}
+
diff --git a/src/libs/3rdparty/lua/src/lstring.h b/src/libs/3rdparty/lua/src/lstring.h
new file mode 100644
index 0000000000..450c2390d1
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lstring.h
@@ -0,0 +1,57 @@
+/*
+** $Id: lstring.h $
+** String table (keep all strings handled by Lua)
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lstring_h
+#define lstring_h
+
+#include "lgc.h"
+#include "lobject.h"
+#include "lstate.h"
+
+
+/*
+** Memory-allocation error message must be preallocated (it cannot
+** be created after memory is exhausted)
+*/
+#define MEMERRMSG       "not enough memory"
+
+
+/*
+** Size of a TString: Size of the header plus space for the string
+** itself (including final '\0').
+*/
+#define sizelstring(l)  (offsetof(TString, contents) + ((l) + 1) * sizeof(char))
+
+#define luaS_newliteral(L, s)	(luaS_newlstr(L, "" s, \
+                                 (sizeof(s)/sizeof(char))-1))
+
+
+/*
+** test whether a string is a reserved word
+*/
+#define isreserved(s)	((s)->tt == LUA_VSHRSTR && (s)->extra > 0)
+
+
+/*
+** equality for short strings, which are always internalized
+*/
+#define eqshrstr(a,b)	check_exp((a)->tt == LUA_VSHRSTR, (a) == (b))
+
+
+LUAI_FUNC unsigned int luaS_hash (const char *str, size_t l, unsigned int seed);
+LUAI_FUNC unsigned int luaS_hashlongstr (TString *ts);
+LUAI_FUNC int luaS_eqlngstr (TString *a, TString *b);
+LUAI_FUNC void luaS_resize (lua_State *L, int newsize);
+LUAI_FUNC void luaS_clearcache (global_State *g);
+LUAI_FUNC void luaS_init (lua_State *L);
+LUAI_FUNC void luaS_remove (lua_State *L, TString *ts);
+LUAI_FUNC Udata *luaS_newudata (lua_State *L, size_t s, int nuvalue);
+LUAI_FUNC TString *luaS_newlstr (lua_State *L, const char *str, size_t l);
+LUAI_FUNC TString *luaS_new (lua_State *L, const char *str);
+LUAI_FUNC TString *luaS_createlngstrobj (lua_State *L, size_t l);
+
+
+#endif
diff --git a/src/libs/3rdparty/lua/src/lstrlib.c b/src/libs/3rdparty/lua/src/lstrlib.c
new file mode 100644
index 0000000000..03167161df
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lstrlib.c
@@ -0,0 +1,1874 @@
+/*
+** $Id: lstrlib.c $
+** Standard library for string operations and pattern-matching
+** See Copyright Notice in lua.h
+*/
+
+#define lstrlib_c
+#define LUA_LIB
+
+#include "lprefix.h"
+
+
+#include <ctype.h>
+#include <float.h>
+#include <limits.h>
+#include <locale.h>
+#include <math.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "lua.h"
+
+#include "lauxlib.h"
+#include "lualib.h"
+
+
+/*
+** maximum number of captures that a pattern can do during
+** pattern-matching. This limit is arbitrary, but must fit in
+** an unsigned char.
+*/
+#if !defined(LUA_MAXCAPTURES)
+#define LUA_MAXCAPTURES		32
+#endif
+
+
+/* macro to 'unsign' a character */
+#define uchar(c)	((unsigned char)(c))
+
+
+/*
+** Some sizes are better limited to fit in 'int', but must also fit in
+** 'size_t'. (We assume that 'lua_Integer' cannot be smaller than 'int'.)
+*/
+#define MAX_SIZET	((size_t)(~(size_t)0))
+
+#define MAXSIZE  \
+	(sizeof(size_t) < sizeof(int) ? MAX_SIZET : (size_t)(INT_MAX))
+
+
+
+
+static int str_len (lua_State *L) {
+  size_t l;
+  luaL_checklstring(L, 1, &l);
+  lua_pushinteger(L, (lua_Integer)l);
+  return 1;
+}
+
+
+/*
+** translate a relative initial string position
+** (negative means back from end): clip result to [1, inf).
+** The length of any string in Lua must fit in a lua_Integer,
+** so there are no overflows in the casts.
+** The inverted comparison avoids a possible overflow
+** computing '-pos'.
+*/
+static size_t posrelatI (lua_Integer pos, size_t len) {
+  if (pos > 0)
+    return (size_t)pos;
+  else if (pos == 0)
+    return 1;
+  else if (pos < -(lua_Integer)len)  /* inverted comparison */
+    return 1;  /* clip to 1 */
+  else return len + (size_t)pos + 1;
+}
+
+
+/*
+** Gets an optional ending string position from argument 'arg',
+** with default value 'def'.
+** Negative means back from end: clip result to [0, len]
+*/
+static size_t getendpos (lua_State *L, int arg, lua_Integer def,
+                         size_t len) {
+  lua_Integer pos = luaL_optinteger(L, arg, def);
+  if (pos > (lua_Integer)len)
+    return len;
+  else if (pos >= 0)
+    return (size_t)pos;
+  else if (pos < -(lua_Integer)len)
+    return 0;
+  else return len + (size_t)pos + 1;
+}
+
+
+static int str_sub (lua_State *L) {
+  size_t l;
+  const char *s = luaL_checklstring(L, 1, &l);
+  size_t start = posrelatI(luaL_checkinteger(L, 2), l);
+  size_t end = getendpos(L, 3, -1, l);
+  if (start <= end)
+    lua_pushlstring(L, s + start - 1, (end - start) + 1);
+  else lua_pushliteral(L, "");
+  return 1;
+}
+
+
+static int str_reverse (lua_State *L) {
+  size_t l, i;
+  luaL_Buffer b;
+  const char *s = luaL_checklstring(L, 1, &l);
+  char *p = luaL_buffinitsize(L, &b, l);
+  for (i = 0; i < l; i++)
+    p[i] = s[l - i - 1];
+  luaL_pushresultsize(&b, l);
+  return 1;
+}
+
+
+static int str_lower (lua_State *L) {
+  size_t l;
+  size_t i;
+  luaL_Buffer b;
+  const char *s = luaL_checklstring(L, 1, &l);
+  char *p = luaL_buffinitsize(L, &b, l);
+  for (i=0; i<l; i++)
+    p[i] = tolower(uchar(s[i]));
+  luaL_pushresultsize(&b, l);
+  return 1;
+}
+
+
+static int str_upper (lua_State *L) {
+  size_t l;
+  size_t i;
+  luaL_Buffer b;
+  const char *s = luaL_checklstring(L, 1, &l);
+  char *p = luaL_buffinitsize(L, &b, l);
+  for (i=0; i<l; i++)
+    p[i] = toupper(uchar(s[i]));
+  luaL_pushresultsize(&b, l);
+  return 1;
+}
+
+
+static int str_rep (lua_State *L) {
+  size_t l, lsep;
+  const char *s = luaL_checklstring(L, 1, &l);
+  lua_Integer n = luaL_checkinteger(L, 2);
+  const char *sep = luaL_optlstring(L, 3, "", &lsep);
+  if (n <= 0)
+    lua_pushliteral(L, "");
+  else if (l_unlikely(l + lsep < l || l + lsep > MAXSIZE / n))
+    return luaL_error(L, "resulting string too large");
+  else {
+    size_t totallen = (size_t)n * l + (size_t)(n - 1) * lsep;
+    luaL_Buffer b;
+    char *p = luaL_buffinitsize(L, &b, totallen);
+    while (n-- > 1) {  /* first n-1 copies (followed by separator) */
+      memcpy(p, s, l * sizeof(char)); p += l;
+      if (lsep > 0) {  /* empty 'memcpy' is not that cheap */
+        memcpy(p, sep, lsep * sizeof(char));
+        p += lsep;
+      }
+    }
+    memcpy(p, s, l * sizeof(char));  /* last copy (not followed by separator) */
+    luaL_pushresultsize(&b, totallen);
+  }
+  return 1;
+}
+
+
+static int str_byte (lua_State *L) {
+  size_t l;
+  const char *s = luaL_checklstring(L, 1, &l);
+  lua_Integer pi = luaL_optinteger(L, 2, 1);
+  size_t posi = posrelatI(pi, l);
+  size_t pose = getendpos(L, 3, pi, l);
+  int n, i;
+  if (posi > pose) return 0;  /* empty interval; return no values */
+  if (l_unlikely(pose - posi >= (size_t)INT_MAX))  /* arithmetic overflow? */
+    return luaL_error(L, "string slice too long");
+  n = (int)(pose -  posi) + 1;
+  luaL_checkstack(L, n, "string slice too long");
+  for (i=0; i<n; i++)
+    lua_pushinteger(L, uchar(s[posi+i-1]));
+  return n;
+}
+
+
+static int str_char (lua_State *L) {
+  int n = lua_gettop(L);  /* number of arguments */
+  int i;
+  luaL_Buffer b;
+  char *p = luaL_buffinitsize(L, &b, n);
+  for (i=1; i<=n; i++) {
+    lua_Unsigned c = (lua_Unsigned)luaL_checkinteger(L, i);
+    luaL_argcheck(L, c <= (lua_Unsigned)UCHAR_MAX, i, "value out of range");
+    p[i - 1] = uchar(c);
+  }
+  luaL_pushresultsize(&b, n);
+  return 1;
+}
+
+
+/*
+** Buffer to store the result of 'string.dump'. It must be initialized
+** after the call to 'lua_dump', to ensure that the function is on the
+** top of the stack when 'lua_dump' is called. ('luaL_buffinit' might
+** push stuff.)
+*/
+struct str_Writer {
+  int init;  /* true iff buffer has been initialized */
+  luaL_Buffer B;
+};
+
+
+static int writer (lua_State *L, const void *b, size_t size, void *ud) {
+  struct str_Writer *state = (struct str_Writer *)ud;
+  if (!state->init) {
+    state->init = 1;
+    luaL_buffinit(L, &state->B);
+  }
+  luaL_addlstring(&state->B, (const char *)b, size);
+  return 0;
+}
+
+
+static int str_dump (lua_State *L) {
+  struct str_Writer state;
+  int strip = lua_toboolean(L, 2);
+  luaL_checktype(L, 1, LUA_TFUNCTION);
+  lua_settop(L, 1);  /* ensure function is on the top of the stack */
+  state.init = 0;
+  if (l_unlikely(lua_dump(L, writer, &state, strip) != 0))
+    return luaL_error(L, "unable to dump given function");
+  luaL_pushresult(&state.B);
+  return 1;
+}
+
+
+
+/*
+** {======================================================
+** METAMETHODS
+** =======================================================
+*/
+
+#if defined(LUA_NOCVTS2N)	/* { */
+
+/* no coercion from strings to numbers */
+
+static const luaL_Reg stringmetamethods[] = {
+  {"__index", NULL},  /* placeholder */
+  {NULL, NULL}
+};
+
+#else		/* }{ */
+
+static int tonum (lua_State *L, int arg) {
+  if (lua_type(L, arg) == LUA_TNUMBER) {  /* already a number? */
+    lua_pushvalue(L, arg);
+    return 1;
+  }
+  else {  /* check whether it is a numerical string */
+    size_t len;
+    const char *s = lua_tolstring(L, arg, &len);
+    return (s != NULL && lua_stringtonumber(L, s) == len + 1);
+  }
+}
+
+
+static void trymt (lua_State *L, const char *mtname) {
+  lua_settop(L, 2);  /* back to the original arguments */
+  if (l_unlikely(lua_type(L, 2) == LUA_TSTRING ||
+                 !luaL_getmetafield(L, 2, mtname)))
+    luaL_error(L, "attempt to %s a '%s' with a '%s'", mtname + 2,
+                  luaL_typename(L, -2), luaL_typename(L, -1));
+  lua_insert(L, -3);  /* put metamethod before arguments */
+  lua_call(L, 2, 1);  /* call metamethod */
+}
+
+
+static int arith (lua_State *L, int op, const char *mtname) {
+  if (tonum(L, 1) && tonum(L, 2))
+    lua_arith(L, op);  /* result will be on the top */
+  else
+    trymt(L, mtname);
+  return 1;
+}
+
+
+static int arith_add (lua_State *L) {
+  return arith(L, LUA_OPADD, "__add");
+}
+
+static int arith_sub (lua_State *L) {
+  return arith(L, LUA_OPSUB, "__sub");
+}
+
+static int arith_mul (lua_State *L) {
+  return arith(L, LUA_OPMUL, "__mul");
+}
+
+static int arith_mod (lua_State *L) {
+  return arith(L, LUA_OPMOD, "__mod");
+}
+
+static int arith_pow (lua_State *L) {
+  return arith(L, LUA_OPPOW, "__pow");
+}
+
+static int arith_div (lua_State *L) {
+  return arith(L, LUA_OPDIV, "__div");
+}
+
+static int arith_idiv (lua_State *L) {
+  return arith(L, LUA_OPIDIV, "__idiv");
+}
+
+static int arith_unm (lua_State *L) {
+  return arith(L, LUA_OPUNM, "__unm");
+}
+
+
+static const luaL_Reg stringmetamethods[] = {
+  {"__add", arith_add},
+  {"__sub", arith_sub},
+  {"__mul", arith_mul},
+  {"__mod", arith_mod},
+  {"__pow", arith_pow},
+  {"__div", arith_div},
+  {"__idiv", arith_idiv},
+  {"__unm", arith_unm},
+  {"__index", NULL},  /* placeholder */
+  {NULL, NULL}
+};
+
+#endif		/* } */
+
+/* }====================================================== */
+
+/*
+** {======================================================
+** PATTERN MATCHING
+** =======================================================
+*/
+
+
+#define CAP_UNFINISHED	(-1)
+#define CAP_POSITION	(-2)
+
+
+typedef struct MatchState {
+  const char *src_init;  /* init of source string */
+  const char *src_end;  /* end ('\0') of source string */
+  const char *p_end;  /* end ('\0') of pattern */
+  lua_State *L;
+  int matchdepth;  /* control for recursive depth (to avoid C stack overflow) */
+  unsigned char level;  /* total number of captures (finished or unfinished) */
+  struct {
+    const char *init;
+    ptrdiff_t len;
+  } capture[LUA_MAXCAPTURES];
+} MatchState;
+
+
+/* recursive function */
+static const char *match (MatchState *ms, const char *s, const char *p);
+
+
+/* maximum recursion depth for 'match' */
+#if !defined(MAXCCALLS)
+#define MAXCCALLS	200
+#endif
+
+
+#define L_ESC		'%'
+#define SPECIALS	"^$*+?.([%-"
+
+
+static int check_capture (MatchState *ms, int l) {
+  l -= '1';
+  if (l_unlikely(l < 0 || l >= ms->level ||
+                 ms->capture[l].len == CAP_UNFINISHED))
+    return luaL_error(ms->L, "invalid capture index %%%d", l + 1);
+  return l;
+}
+
+
+static int capture_to_close (MatchState *ms) {
+  int level = ms->level;
+  for (level--; level>=0; level--)
+    if (ms->capture[level].len == CAP_UNFINISHED) return level;
+  return luaL_error(ms->L, "invalid pattern capture");
+}
+
+
+static const char *classend (MatchState *ms, const char *p) {
+  switch (*p++) {
+    case L_ESC: {
+      if (l_unlikely(p == ms->p_end))
+        luaL_error(ms->L, "malformed pattern (ends with '%%')");
+      return p+1;
+    }
+    case '[': {
+      if (*p == '^') p++;
+      do {  /* look for a ']' */
+        if (l_unlikely(p == ms->p_end))
+          luaL_error(ms->L, "malformed pattern (missing ']')");
+        if (*(p++) == L_ESC && p < ms->p_end)
+          p++;  /* skip escapes (e.g. '%]') */
+      } while (*p != ']');
+      return p+1;
+    }
+    default: {
+      return p;
+    }
+  }
+}
+
+
+static int match_class (int c, int cl) {
+  int res;
+  switch (tolower(cl)) {
+    case 'a' : res = isalpha(c); break;
+    case 'c' : res = iscntrl(c); break;
+    case 'd' : res = isdigit(c); break;
+    case 'g' : res = isgraph(c); break;
+    case 'l' : res = islower(c); break;
+    case 'p' : res = ispunct(c); break;
+    case 's' : res = isspace(c); break;
+    case 'u' : res = isupper(c); break;
+    case 'w' : res = isalnum(c); break;
+    case 'x' : res = isxdigit(c); break;
+    case 'z' : res = (c == 0); break;  /* deprecated option */
+    default: return (cl == c);
+  }
+  return (islower(cl) ? res : !res);
+}
+
+
+static int matchbracketclass (int c, const char *p, const char *ec) {
+  int sig = 1;
+  if (*(p+1) == '^') {
+    sig = 0;
+    p++;  /* skip the '^' */
+  }
+  while (++p < ec) {
+    if (*p == L_ESC) {
+      p++;
+      if (match_class(c, uchar(*p)))
+        return sig;
+    }
+    else if ((*(p+1) == '-') && (p+2 < ec)) {
+      p+=2;
+      if (uchar(*(p-2)) <= c && c <= uchar(*p))
+        return sig;
+    }
+    else if (uchar(*p) == c) return sig;
+  }
+  return !sig;
+}
+
+
+static int singlematch (MatchState *ms, const char *s, const char *p,
+                        const char *ep) {
+  if (s >= ms->src_end)
+    return 0;
+  else {
+    int c = uchar(*s);
+    switch (*p) {
+      case '.': return 1;  /* matches any char */
+      case L_ESC: return match_class(c, uchar(*(p+1)));
+      case '[': return matchbracketclass(c, p, ep-1);
+      default:  return (uchar(*p) == c);
+    }
+  }
+}
+
+
+static const char *matchbalance (MatchState *ms, const char *s,
+                                   const char *p) {
+  if (l_unlikely(p >= ms->p_end - 1))
+    luaL_error(ms->L, "malformed pattern (missing arguments to '%%b')");
+  if (*s != *p) return NULL;
+  else {
+    int b = *p;
+    int e = *(p+1);
+    int cont = 1;
+    while (++s < ms->src_end) {
+      if (*s == e) {
+        if (--cont == 0) return s+1;
+      }
+      else if (*s == b) cont++;
+    }
+  }
+  return NULL;  /* string ends out of balance */
+}
+
+
+static const char *max_expand (MatchState *ms, const char *s,
+                                 const char *p, const char *ep) {
+  ptrdiff_t i = 0;  /* counts maximum expand for item */
+  while (singlematch(ms, s + i, p, ep))
+    i++;
+  /* keeps trying to match with the maximum repetitions */
+  while (i>=0) {
+    const char *res = match(ms, (s+i), ep+1);
+    if (res) return res;
+    i--;  /* else didn't match; reduce 1 repetition to try again */
+  }
+  return NULL;
+}
+
+
+static const char *min_expand (MatchState *ms, const char *s,
+                                 const char *p, const char *ep) {
+  for (;;) {
+    const char *res = match(ms, s, ep+1);
+    if (res != NULL)
+      return res;
+    else if (singlematch(ms, s, p, ep))
+      s++;  /* try with one more repetition */
+    else return NULL;
+  }
+}
+
+
+static const char *start_capture (MatchState *ms, const char *s,
+                                    const char *p, int what) {
+  const char *res;
+  int level = ms->level;
+  if (level >= LUA_MAXCAPTURES) luaL_error(ms->L, "too many captures");
+  ms->capture[level].init = s;
+  ms->capture[level].len = what;
+  ms->level = level+1;
+  if ((res=match(ms, s, p)) == NULL)  /* match failed? */
+    ms->level--;  /* undo capture */
+  return res;
+}
+
+
+static const char *end_capture (MatchState *ms, const char *s,
+                                  const char *p) {
+  int l = capture_to_close(ms);
+  const char *res;
+  ms->capture[l].len = s - ms->capture[l].init;  /* close capture */
+  if ((res = match(ms, s, p)) == NULL)  /* match failed? */
+    ms->capture[l].len = CAP_UNFINISHED;  /* undo capture */
+  return res;
+}
+
+
+static const char *match_capture (MatchState *ms, const char *s, int l) {
+  size_t len;
+  l = check_capture(ms, l);
+  len = ms->capture[l].len;
+  if ((size_t)(ms->src_end-s) >= len &&
+      memcmp(ms->capture[l].init, s, len) == 0)
+    return s+len;
+  else return NULL;
+}
+
+
+static const char *match (MatchState *ms, const char *s, const char *p) {
+  if (l_unlikely(ms->matchdepth-- == 0))
+    luaL_error(ms->L, "pattern too complex");
+  init: /* using goto to optimize tail recursion */
+  if (p != ms->p_end) {  /* end of pattern? */
+    switch (*p) {
+      case '(': {  /* start capture */
+        if (*(p + 1) == ')')  /* position capture? */
+          s = start_capture(ms, s, p + 2, CAP_POSITION);
+        else
+          s = start_capture(ms, s, p + 1, CAP_UNFINISHED);
+        break;
+      }
+      case ')': {  /* end capture */
+        s = end_capture(ms, s, p + 1);
+        break;
+      }
+      case '$': {
+        if ((p + 1) != ms->p_end)  /* is the '$' the last char in pattern? */
+          goto dflt;  /* no; go to default */
+        s = (s == ms->src_end) ? s : NULL;  /* check end of string */
+        break;
+      }
+      case L_ESC: {  /* escaped sequences not in the format class[*+?-]? */
+        switch (*(p + 1)) {
+          case 'b': {  /* balanced string? */
+            s = matchbalance(ms, s, p + 2);
+            if (s != NULL) {
+              p += 4; goto init;  /* return match(ms, s, p + 4); */
+            }  /* else fail (s == NULL) */
+            break;
+          }
+          case 'f': {  /* frontier? */
+            const char *ep; char previous;
+            p += 2;
+            if (l_unlikely(*p != '['))
+              luaL_error(ms->L, "missing '[' after '%%f' in pattern");
+            ep = classend(ms, p);  /* points to what is next */
+            previous = (s == ms->src_init) ? '\0' : *(s - 1);
+            if (!matchbracketclass(uchar(previous), p, ep - 1) &&
+               matchbracketclass(uchar(*s), p, ep - 1)) {
+              p = ep; goto init;  /* return match(ms, s, ep); */
+            }
+            s = NULL;  /* match failed */
+            break;
+          }
+          case '0': case '1': case '2': case '3':
+          case '4': case '5': case '6': case '7':
+          case '8': case '9': {  /* capture results (%0-%9)? */
+            s = match_capture(ms, s, uchar(*(p + 1)));
+            if (s != NULL) {
+              p += 2; goto init;  /* return match(ms, s, p + 2) */
+            }
+            break;
+          }
+          default: goto dflt;
+        }
+        break;
+      }
+      default: dflt: {  /* pattern class plus optional suffix */
+        const char *ep = classend(ms, p);  /* points to optional suffix */
+        /* does not match at least once? */
+        if (!singlematch(ms, s, p, ep)) {
+          if (*ep == '*' || *ep == '?' || *ep == '-') {  /* accept empty? */
+            p = ep + 1; goto init;  /* return match(ms, s, ep + 1); */
+          }
+          else  /* '+' or no suffix */
+            s = NULL;  /* fail */
+        }
+        else {  /* matched once */
+          switch (*ep) {  /* handle optional suffix */
+            case '?': {  /* optional */
+              const char *res;
+              if ((res = match(ms, s + 1, ep + 1)) != NULL)
+                s = res;
+              else {
+                p = ep + 1; goto init;  /* else return match(ms, s, ep + 1); */
+              }
+              break;
+            }
+            case '+':  /* 1 or more repetitions */
+              s++;  /* 1 match already done */
+              /* FALLTHROUGH */
+            case '*':  /* 0 or more repetitions */
+              s = max_expand(ms, s, p, ep);
+              break;
+            case '-':  /* 0 or more repetitions (minimum) */
+              s = min_expand(ms, s, p, ep);
+              break;
+            default:  /* no suffix */
+              s++; p = ep; goto init;  /* return match(ms, s + 1, ep); */
+          }
+        }
+        break;
+      }
+    }
+  }
+  ms->matchdepth++;
+  return s;
+}
+
+
+
+static const char *lmemfind (const char *s1, size_t l1,
+                               const char *s2, size_t l2) {
+  if (l2 == 0) return s1;  /* empty strings are everywhere */
+  else if (l2 > l1) return NULL;  /* avoids a negative 'l1' */
+  else {
+    const char *init;  /* to search for a '*s2' inside 's1' */
+    l2--;  /* 1st char will be checked by 'memchr' */
+    l1 = l1-l2;  /* 's2' cannot be found after that */
+    while (l1 > 0 && (init = (const char *)memchr(s1, *s2, l1)) != NULL) {
+      init++;   /* 1st char is already checked */
+      if (memcmp(init, s2+1, l2) == 0)
+        return init-1;
+      else {  /* correct 'l1' and 's1' to try again */
+        l1 -= init-s1;
+        s1 = init;
+      }
+    }
+    return NULL;  /* not found */
+  }
+}
+
+
+/*
+** get information about the i-th capture. If there are no captures
+** and 'i==0', return information about the whole match, which
+** is the range 's'..'e'. If the capture is a string, return
+** its length and put its address in '*cap'. If it is an integer
+** (a position), push it on the stack and return CAP_POSITION.
+*/
+static size_t get_onecapture (MatchState *ms, int i, const char *s,
+                              const char *e, const char **cap) {
+  if (i >= ms->level) {
+    if (l_unlikely(i != 0))
+      luaL_error(ms->L, "invalid capture index %%%d", i + 1);
+    *cap = s;
+    return e - s;
+  }
+  else {
+    ptrdiff_t capl = ms->capture[i].len;
+    *cap = ms->capture[i].init;
+    if (l_unlikely(capl == CAP_UNFINISHED))
+      luaL_error(ms->L, "unfinished capture");
+    else if (capl == CAP_POSITION)
+      lua_pushinteger(ms->L, (ms->capture[i].init - ms->src_init) + 1);
+    return capl;
+  }
+}
+
+
+/*
+** Push the i-th capture on the stack.
+*/
+static void push_onecapture (MatchState *ms, int i, const char *s,
+                                                    const char *e) {
+  const char *cap;
+  ptrdiff_t l = get_onecapture(ms, i, s, e, &cap);
+  if (l != CAP_POSITION)
+    lua_pushlstring(ms->L, cap, l);
+  /* else position was already pushed */
+}
+
+
+static int push_captures (MatchState *ms, const char *s, const char *e) {
+  int i;
+  int nlevels = (ms->level == 0 && s) ? 1 : ms->level;
+  luaL_checkstack(ms->L, nlevels, "too many captures");
+  for (i = 0; i < nlevels; i++)
+    push_onecapture(ms, i, s, e);
+  return nlevels;  /* number of strings pushed */
+}
+
+
+/* check whether pattern has no special characters */
+static int nospecials (const char *p, size_t l) {
+  size_t upto = 0;
+  do {
+    if (strpbrk(p + upto, SPECIALS))
+      return 0;  /* pattern has a special character */
+    upto += strlen(p + upto) + 1;  /* may have more after \0 */
+  } while (upto <= l);
+  return 1;  /* no special chars found */
+}
+
+
+static void prepstate (MatchState *ms, lua_State *L,
+                       const char *s, size_t ls, const char *p, size_t lp) {
+  ms->L = L;
+  ms->matchdepth = MAXCCALLS;
+  ms->src_init = s;
+  ms->src_end = s + ls;
+  ms->p_end = p + lp;
+}
+
+
+static void reprepstate (MatchState *ms) {
+  ms->level = 0;
+  lua_assert(ms->matchdepth == MAXCCALLS);
+}
+
+
+static int str_find_aux (lua_State *L, int find) {
+  size_t ls, lp;
+  const char *s = luaL_checklstring(L, 1, &ls);
+  const char *p = luaL_checklstring(L, 2, &lp);
+  size_t init = posrelatI(luaL_optinteger(L, 3, 1), ls) - 1;
+  if (init > ls) {  /* start after string's end? */
+    luaL_pushfail(L);  /* cannot find anything */
+    return 1;
+  }
+  /* explicit request or no special characters? */
+  if (find && (lua_toboolean(L, 4) || nospecials(p, lp))) {
+    /* do a plain search */
+    const char *s2 = lmemfind(s + init, ls - init, p, lp);
+    if (s2) {
+      lua_pushinteger(L, (s2 - s) + 1);
+      lua_pushinteger(L, (s2 - s) + lp);
+      return 2;
+    }
+  }
+  else {
+    MatchState ms;
+    const char *s1 = s + init;
+    int anchor = (*p == '^');
+    if (anchor) {
+      p++; lp--;  /* skip anchor character */
+    }
+    prepstate(&ms, L, s, ls, p, lp);
+    do {
+      const char *res;
+      reprepstate(&ms);
+      if ((res=match(&ms, s1, p)) != NULL) {
+        if (find) {
+          lua_pushinteger(L, (s1 - s) + 1);  /* start */
+          lua_pushinteger(L, res - s);   /* end */
+          return push_captures(&ms, NULL, 0) + 2;
+        }
+        else
+          return push_captures(&ms, s1, res);
+      }
+    } while (s1++ < ms.src_end && !anchor);
+  }
+  luaL_pushfail(L);  /* not found */
+  return 1;
+}
+
+
+static int str_find (lua_State *L) {
+  return str_find_aux(L, 1);
+}
+
+
+static int str_match (lua_State *L) {
+  return str_find_aux(L, 0);
+}
+
+
+/* state for 'gmatch' */
+typedef struct GMatchState {
+  const char *src;  /* current position */
+  const char *p;  /* pattern */
+  const char *lastmatch;  /* end of last match */
+  MatchState ms;  /* match state */
+} GMatchState;
+
+
+static int gmatch_aux (lua_State *L) {
+  GMatchState *gm = (GMatchState *)lua_touserdata(L, lua_upvalueindex(3));
+  const char *src;
+  gm->ms.L = L;
+  for (src = gm->src; src <= gm->ms.src_end; src++) {
+    const char *e;
+    reprepstate(&gm->ms);
+    if ((e = match(&gm->ms, src, gm->p)) != NULL && e != gm->lastmatch) {
+      gm->src = gm->lastmatch = e;
+      return push_captures(&gm->ms, src, e);
+    }
+  }
+  return 0;  /* not found */
+}
+
+
+static int gmatch (lua_State *L) {
+  size_t ls, lp;
+  const char *s = luaL_checklstring(L, 1, &ls);
+  const char *p = luaL_checklstring(L, 2, &lp);
+  size_t init = posrelatI(luaL_optinteger(L, 3, 1), ls) - 1;
+  GMatchState *gm;
+  lua_settop(L, 2);  /* keep strings on closure to avoid being collected */
+  gm = (GMatchState *)lua_newuserdatauv(L, sizeof(GMatchState), 0);
+  if (init > ls)  /* start after string's end? */
+    init = ls + 1;  /* avoid overflows in 's + init' */
+  prepstate(&gm->ms, L, s, ls, p, lp);
+  gm->src = s + init; gm->p = p; gm->lastmatch = NULL;
+  lua_pushcclosure(L, gmatch_aux, 3);
+  return 1;
+}
+
+
+static void add_s (MatchState *ms, luaL_Buffer *b, const char *s,
+                                                   const char *e) {
+  size_t l;
+  lua_State *L = ms->L;
+  const char *news = lua_tolstring(L, 3, &l);
+  const char *p;
+  while ((p = (char *)memchr(news, L_ESC, l)) != NULL) {
+    luaL_addlstring(b, news, p - news);
+    p++;  /* skip ESC */
+    if (*p == L_ESC)  /* '%%' */
+      luaL_addchar(b, *p);
+    else if (*p == '0')  /* '%0' */
+        luaL_addlstring(b, s, e - s);
+    else if (isdigit(uchar(*p))) {  /* '%n' */
+      const char *cap;
+      ptrdiff_t resl = get_onecapture(ms, *p - '1', s, e, &cap);
+      if (resl == CAP_POSITION)
+        luaL_addvalue(b);  /* add position to accumulated result */
+      else
+        luaL_addlstring(b, cap, resl);
+    }
+    else
+      luaL_error(L, "invalid use of '%c' in replacement string", L_ESC);
+    l -= p + 1 - news;
+    news = p + 1;
+  }
+  luaL_addlstring(b, news, l);
+}
+
+
+/*
+** Add the replacement value to the string buffer 'b'.
+** Return true if the original string was changed. (Function calls and
+** table indexing resulting in nil or false do not change the subject.)
+*/
+static int add_value (MatchState *ms, luaL_Buffer *b, const char *s,
+                                      const char *e, int tr) {
+  lua_State *L = ms->L;
+  switch (tr) {
+    case LUA_TFUNCTION: {  /* call the function */
+      int n;
+      lua_pushvalue(L, 3);  /* push the function */
+      n = push_captures(ms, s, e);  /* all captures as arguments */
+      lua_call(L, n, 1);  /* call it */
+      break;
+    }
+    case LUA_TTABLE: {  /* index the table */
+      push_onecapture(ms, 0, s, e);  /* first capture is the index */
+      lua_gettable(L, 3);
+      break;
+    }
+    default: {  /* LUA_TNUMBER or LUA_TSTRING */
+      add_s(ms, b, s, e);  /* add value to the buffer */
+      return 1;  /* something changed */
+    }
+  }
+  if (!lua_toboolean(L, -1)) {  /* nil or false? */
+    lua_pop(L, 1);  /* remove value */
+    luaL_addlstring(b, s, e - s);  /* keep original text */
+    return 0;  /* no changes */
+  }
+  else if (l_unlikely(!lua_isstring(L, -1)))
+    return luaL_error(L, "invalid replacement value (a %s)",
+                         luaL_typename(L, -1));
+  else {
+    luaL_addvalue(b);  /* add result to accumulator */
+    return 1;  /* something changed */
+  }
+}
+
+
+static int str_gsub (lua_State *L) {
+  size_t srcl, lp;
+  const char *src = luaL_checklstring(L, 1, &srcl);  /* subject */
+  const char *p = luaL_checklstring(L, 2, &lp);  /* pattern */
+  const char *lastmatch = NULL;  /* end of last match */
+  int tr = lua_type(L, 3);  /* replacement type */
+  lua_Integer max_s = luaL_optinteger(L, 4, srcl + 1);  /* max replacements */
+  int anchor = (*p == '^');
+  lua_Integer n = 0;  /* replacement count */
+  int changed = 0;  /* change flag */
+  MatchState ms;
+  luaL_Buffer b;
+  luaL_argexpected(L, tr == LUA_TNUMBER || tr == LUA_TSTRING ||
+                   tr == LUA_TFUNCTION || tr == LUA_TTABLE, 3,
+                      "string/function/table");
+  luaL_buffinit(L, &b);
+  if (anchor) {
+    p++; lp--;  /* skip anchor character */
+  }
+  prepstate(&ms, L, src, srcl, p, lp);
+  while (n < max_s) {
+    const char *e;
+    reprepstate(&ms);  /* (re)prepare state for new match */
+    if ((e = match(&ms, src, p)) != NULL && e != lastmatch) {  /* match? */
+      n++;
+      changed = add_value(&ms, &b, src, e, tr) | changed;
+      src = lastmatch = e;
+    }
+    else if (src < ms.src_end)  /* otherwise, skip one character */
+      luaL_addchar(&b, *src++);
+    else break;  /* end of subject */
+    if (anchor) break;
+  }
+  if (!changed)  /* no changes? */
+    lua_pushvalue(L, 1);  /* return original string */
+  else {  /* something changed */
+    luaL_addlstring(&b, src, ms.src_end-src);
+    luaL_pushresult(&b);  /* create and return new string */
+  }
+  lua_pushinteger(L, n);  /* number of substitutions */
+  return 2;
+}
+
+/* }====================================================== */
+
+
+
+/*
+** {======================================================
+** STRING FORMAT
+** =======================================================
+*/
+
+#if !defined(lua_number2strx)	/* { */
+
+/*
+** Hexadecimal floating-point formatter
+*/
+
+#define SIZELENMOD	(sizeof(LUA_NUMBER_FRMLEN)/sizeof(char))
+
+
+/*
+** Number of bits that goes into the first digit. It can be any value
+** between 1 and 4; the following definition tries to align the number
+** to nibble boundaries by making what is left after that first digit a
+** multiple of 4.
+*/
+#define L_NBFD		((l_floatatt(MANT_DIG) - 1)%4 + 1)
+
+
+/*
+** Add integer part of 'x' to buffer and return new 'x'
+*/
+static lua_Number adddigit (char *buff, int n, lua_Number x) {
+  lua_Number dd = l_mathop(floor)(x);  /* get integer part from 'x' */
+  int d = (int)dd;
+  buff[n] = (d < 10 ? d + '0' : d - 10 + 'a');  /* add to buffer */
+  return x - dd;  /* return what is left */
+}
+
+
+static int num2straux (char *buff, int sz, lua_Number x) {
+  /* if 'inf' or 'NaN', format it like '%g' */
+  if (x != x || x == (lua_Number)HUGE_VAL || x == -(lua_Number)HUGE_VAL)
+    return l_sprintf(buff, sz, LUA_NUMBER_FMT, (LUAI_UACNUMBER)x);
+  else if (x == 0) {  /* can be -0... */
+    /* create "0" or "-0" followed by exponent */
+    return l_sprintf(buff, sz, LUA_NUMBER_FMT "x0p+0", (LUAI_UACNUMBER)x);
+  }
+  else {
+    int e;
+    lua_Number m = l_mathop(frexp)(x, &e);  /* 'x' fraction and exponent */
+    int n = 0;  /* character count */
+    if (m < 0) {  /* is number negative? */
+      buff[n++] = '-';  /* add sign */
+      m = -m;  /* make it positive */
+    }
+    buff[n++] = '0'; buff[n++] = 'x';  /* add "0x" */
+    m = adddigit(buff, n++, m * (1 << L_NBFD));  /* add first digit */
+    e -= L_NBFD;  /* this digit goes before the radix point */
+    if (m > 0) {  /* more digits? */
+      buff[n++] = lua_getlocaledecpoint();  /* add radix point */
+      do {  /* add as many digits as needed */
+        m = adddigit(buff, n++, m * 16);
+      } while (m > 0);
+    }
+    n += l_sprintf(buff + n, sz - n, "p%+d", e);  /* add exponent */
+    lua_assert(n < sz);
+    return n;
+  }
+}
+
+
+static int lua_number2strx (lua_State *L, char *buff, int sz,
+                            const char *fmt, lua_Number x) {
+  int n = num2straux(buff, sz, x);
+  if (fmt[SIZELENMOD] == 'A') {
+    int i;
+    for (i = 0; i < n; i++)
+      buff[i] = toupper(uchar(buff[i]));
+  }
+  else if (l_unlikely(fmt[SIZELENMOD] != 'a'))
+    return luaL_error(L, "modifiers for format '%%a'/'%%A' not implemented");
+  return n;
+}
+
+#endif				/* } */
+
+
+/*
+** Maximum size for items formatted with '%f'. This size is produced
+** by format('%.99f', -maxfloat), and is equal to 99 + 3 ('-', '.',
+** and '\0') + number of decimal digits to represent maxfloat (which
+** is maximum exponent + 1). (99+3+1, adding some extra, 110)
+*/
+#define MAX_ITEMF	(110 + l_floatatt(MAX_10_EXP))
+
+
+/*
+** All formats except '%f' do not need that large limit.  The other
+** float formats use exponents, so that they fit in the 99 limit for
+** significant digits; 's' for large strings and 'q' add items directly
+** to the buffer; all integer formats also fit in the 99 limit.  The
+** worst case are floats: they may need 99 significant digits, plus
+** '0x', '-', '.', 'e+XXXX', and '\0'. Adding some extra, 120.
+*/
+#define MAX_ITEM	120
+
+
+/* valid flags in a format specification */
+#if !defined(L_FMTFLAGSF)
+
+/* valid flags for a, A, e, E, f, F, g, and G conversions */
+#define L_FMTFLAGSF	"-+#0 "
+
+/* valid flags for o, x, and X conversions */
+#define L_FMTFLAGSX	"-#0"
+
+/* valid flags for d and i conversions */
+#define L_FMTFLAGSI	"-+0 "
+
+/* valid flags for u conversions */
+#define L_FMTFLAGSU	"-0"
+
+/* valid flags for c, p, and s conversions */
+#define L_FMTFLAGSC	"-"
+
+#endif
+
+
+/*
+** Maximum size of each format specification (such as "%-099.99d"):
+** Initial '%', flags (up to 5), width (2), period, precision (2),
+** length modifier (8), conversion specifier, and final '\0', plus some
+** extra.
+*/
+#define MAX_FORMAT	32
+
+
+static void addquoted (luaL_Buffer *b, const char *s, size_t len) {
+  luaL_addchar(b, '"');
+  while (len--) {
+    if (*s == '"' || *s == '\\' || *s == '\n') {
+      luaL_addchar(b, '\\');
+      luaL_addchar(b, *s);
+    }
+    else if (iscntrl(uchar(*s))) {
+      char buff[10];
+      if (!isdigit(uchar(*(s+1))))
+        l_sprintf(buff, sizeof(buff), "\\%d", (int)uchar(*s));
+      else
+        l_sprintf(buff, sizeof(buff), "\\%03d", (int)uchar(*s));
+      luaL_addstring(b, buff);
+    }
+    else
+      luaL_addchar(b, *s);
+    s++;
+  }
+  luaL_addchar(b, '"');
+}
+
+
+/*
+** Serialize a floating-point number in such a way that it can be
+** scanned back by Lua. Use hexadecimal format for "common" numbers
+** (to preserve precision); inf, -inf, and NaN are handled separately.
+** (NaN cannot be expressed as a numeral, so we write '(0/0)' for it.)
+*/
+static int quotefloat (lua_State *L, char *buff, lua_Number n) {
+  const char *s;  /* for the fixed representations */
+  if (n == (lua_Number)HUGE_VAL)  /* inf? */
+    s = "1e9999";
+  else if (n == -(lua_Number)HUGE_VAL)  /* -inf? */
+    s = "-1e9999";
+  else if (n != n)  /* NaN? */
+    s = "(0/0)";
+  else {  /* format number as hexadecimal */
+    int  nb = lua_number2strx(L, buff, MAX_ITEM,
+                                 "%" LUA_NUMBER_FRMLEN "a", n);
+    /* ensures that 'buff' string uses a dot as the radix character */
+    if (memchr(buff, '.', nb) == NULL) {  /* no dot? */
+      char point = lua_getlocaledecpoint();  /* try locale point */
+      char *ppoint = (char *)memchr(buff, point, nb);
+      if (ppoint) *ppoint = '.';  /* change it to a dot */
+    }
+    return nb;
+  }
+  /* for the fixed representations */
+  return l_sprintf(buff, MAX_ITEM, "%s", s);
+}
+
+
+static void addliteral (lua_State *L, luaL_Buffer *b, int arg) {
+  switch (lua_type(L, arg)) {
+    case LUA_TSTRING: {
+      size_t len;
+      const char *s = lua_tolstring(L, arg, &len);
+      addquoted(b, s, len);
+      break;
+    }
+    case LUA_TNUMBER: {
+      char *buff = luaL_prepbuffsize(b, MAX_ITEM);
+      int nb;
+      if (!lua_isinteger(L, arg))  /* float? */
+        nb = quotefloat(L, buff, lua_tonumber(L, arg));
+      else {  /* integers */
+        lua_Integer n = lua_tointeger(L, arg);
+        const char *format = (n == LUA_MININTEGER)  /* corner case? */
+                           ? "0x%" LUA_INTEGER_FRMLEN "x"  /* use hex */
+                           : LUA_INTEGER_FMT;  /* else use default format */
+        nb = l_sprintf(buff, MAX_ITEM, format, (LUAI_UACINT)n);
+      }
+      luaL_addsize(b, nb);
+      break;
+    }
+    case LUA_TNIL: case LUA_TBOOLEAN: {
+      luaL_tolstring(L, arg, NULL);
+      luaL_addvalue(b);
+      break;
+    }
+    default: {
+      luaL_argerror(L, arg, "value has no literal form");
+    }
+  }
+}
+
+
+static const char *get2digits (const char *s) {
+  if (isdigit(uchar(*s))) {
+    s++;
+    if (isdigit(uchar(*s))) s++;  /* (2 digits at most) */
+  }
+  return s;
+}
+
+
+/*
+** Check whether a conversion specification is valid. When called,
+** first character in 'form' must be '%' and last character must
+** be a valid conversion specifier. 'flags' are the accepted flags;
+** 'precision' signals whether to accept a precision.
+*/
+static void checkformat (lua_State *L, const char *form, const char *flags,
+                                       int precision) {
+  const char *spec = form + 1;  /* skip '%' */
+  spec += strspn(spec, flags);  /* skip flags */
+  if (*spec != '0') {  /* a width cannot start with '0' */
+    spec = get2digits(spec);  /* skip width */
+    if (*spec == '.' && precision) {
+      spec++;
+      spec = get2digits(spec);  /* skip precision */
+    }
+  }
+  if (!isalpha(uchar(*spec)))  /* did not go to the end? */
+    luaL_error(L, "invalid conversion specification: '%s'", form);
+}
+
+
+/*
+** Get a conversion specification and copy it to 'form'.
+** Return the address of its last character.
+*/
+static const char *getformat (lua_State *L, const char *strfrmt,
+                                            char *form) {
+  /* spans flags, width, and precision ('0' is included as a flag) */
+  size_t len = strspn(strfrmt, L_FMTFLAGSF "123456789.");
+  len++;  /* adds following character (should be the specifier) */
+  /* still needs space for '%', '\0', plus a length modifier */
+  if (len >= MAX_FORMAT - 10)
+    luaL_error(L, "invalid format (too long)");
+  *(form++) = '%';
+  memcpy(form, strfrmt, len * sizeof(char));
+  *(form + len) = '\0';
+  return strfrmt + len - 1;
+}
+
+
+/*
+** add length modifier into formats
+*/
+static void addlenmod (char *form, const char *lenmod) {
+  size_t l = strlen(form);
+  size_t lm = strlen(lenmod);
+  char spec = form[l - 1];
+  strcpy(form + l - 1, lenmod);
+  form[l + lm - 1] = spec;
+  form[l + lm] = '\0';
+}
+
+
+static int str_format (lua_State *L) {
+  int top = lua_gettop(L);
+  int arg = 1;
+  size_t sfl;
+  const char *strfrmt = luaL_checklstring(L, arg, &sfl);
+  const char *strfrmt_end = strfrmt+sfl;
+  const char *flags;
+  luaL_Buffer b;
+  luaL_buffinit(L, &b);
+  while (strfrmt < strfrmt_end) {
+    if (*strfrmt != L_ESC)
+      luaL_addchar(&b, *strfrmt++);
+    else if (*++strfrmt == L_ESC)
+      luaL_addchar(&b, *strfrmt++);  /* %% */
+    else { /* format item */
+      char form[MAX_FORMAT];  /* to store the format ('%...') */
+      int maxitem = MAX_ITEM;  /* maximum length for the result */
+      char *buff = luaL_prepbuffsize(&b, maxitem);  /* to put result */
+      int nb = 0;  /* number of bytes in result */
+      if (++arg > top)
+        return luaL_argerror(L, arg, "no value");
+      strfrmt = getformat(L, strfrmt, form);
+      switch (*strfrmt++) {
+        case 'c': {
+          checkformat(L, form, L_FMTFLAGSC, 0);
+          nb = l_sprintf(buff, maxitem, form, (int)luaL_checkinteger(L, arg));
+          break;
+        }
+        case 'd': case 'i':
+          flags = L_FMTFLAGSI;
+          goto intcase;
+        case 'u':
+          flags = L_FMTFLAGSU;
+          goto intcase;
+        case 'o': case 'x': case 'X':
+          flags = L_FMTFLAGSX;
+         intcase: {
+          lua_Integer n = luaL_checkinteger(L, arg);
+          checkformat(L, form, flags, 1);
+          addlenmod(form, LUA_INTEGER_FRMLEN);
+          nb = l_sprintf(buff, maxitem, form, (LUAI_UACINT)n);
+          break;
+        }
+        case 'a': case 'A':
+          checkformat(L, form, L_FMTFLAGSF, 1);
+          addlenmod(form, LUA_NUMBER_FRMLEN);
+          nb = lua_number2strx(L, buff, maxitem, form,
+                                  luaL_checknumber(L, arg));
+          break;
+        case 'f':
+          maxitem = MAX_ITEMF;  /* extra space for '%f' */
+          buff = luaL_prepbuffsize(&b, maxitem);
+          /* FALLTHROUGH */
+        case 'e': case 'E': case 'g': case 'G': {
+          lua_Number n = luaL_checknumber(L, arg);
+          checkformat(L, form, L_FMTFLAGSF, 1);
+          addlenmod(form, LUA_NUMBER_FRMLEN);
+          nb = l_sprintf(buff, maxitem, form, (LUAI_UACNUMBER)n);
+          break;
+        }
+        case 'p': {
+          const void *p = lua_topointer(L, arg);
+          checkformat(L, form, L_FMTFLAGSC, 0);
+          if (p == NULL) {  /* avoid calling 'printf' with argument NULL */
+            p = "(null)";  /* result */
+            form[strlen(form) - 1] = 's';  /* format it as a string */
+          }
+          nb = l_sprintf(buff, maxitem, form, p);
+          break;
+        }
+        case 'q': {
+          if (form[2] != '\0')  /* modifiers? */
+            return luaL_error(L, "specifier '%%q' cannot have modifiers");
+          addliteral(L, &b, arg);
+          break;
+        }
+        case 's': {
+          size_t l;
+          const char *s = luaL_tolstring(L, arg, &l);
+          if (form[2] == '\0')  /* no modifiers? */
+            luaL_addvalue(&b);  /* keep entire string */
+          else {
+            luaL_argcheck(L, l == strlen(s), arg, "string contains zeros");
+            checkformat(L, form, L_FMTFLAGSC, 1);
+            if (strchr(form, '.') == NULL && l >= 100) {
+              /* no precision and string is too long to be formatted */
+              luaL_addvalue(&b);  /* keep entire string */
+            }
+            else {  /* format the string into 'buff' */
+              nb = l_sprintf(buff, maxitem, form, s);
+              lua_pop(L, 1);  /* remove result from 'luaL_tolstring' */
+            }
+          }
+          break;
+        }
+        default: {  /* also treat cases 'pnLlh' */
+          return luaL_error(L, "invalid conversion '%s' to 'format'", form);
+        }
+      }
+      lua_assert(nb < maxitem);
+      luaL_addsize(&b, nb);
+    }
+  }
+  luaL_pushresult(&b);
+  return 1;
+}
+
+/* }====================================================== */
+
+
+/*
+** {======================================================
+** PACK/UNPACK
+** =======================================================
+*/
+
+
+/* value used for padding */
+#if !defined(LUAL_PACKPADBYTE)
+#define LUAL_PACKPADBYTE		0x00
+#endif
+
+/* maximum size for the binary representation of an integer */
+#define MAXINTSIZE	16
+
+/* number of bits in a character */
+#define NB	CHAR_BIT
+
+/* mask for one character (NB 1's) */
+#define MC	((1 << NB) - 1)
+
+/* size of a lua_Integer */
+#define SZINT	((int)sizeof(lua_Integer))
+
+
+/* dummy union to get native endianness */
+static const union {
+  int dummy;
+  char little;  /* true iff machine is little endian */
+} nativeendian = {1};
+
+
+/*
+** information to pack/unpack stuff
+*/
+typedef struct Header {
+  lua_State *L;
+  int islittle;
+  int maxalign;
+} Header;
+
+
+/*
+** options for pack/unpack
+*/
+typedef enum KOption {
+  Kint,		/* signed integers */
+  Kuint,	/* unsigned integers */
+  Kfloat,	/* single-precision floating-point numbers */
+  Knumber,	/* Lua "native" floating-point numbers */
+  Kdouble,	/* double-precision floating-point numbers */
+  Kchar,	/* fixed-length strings */
+  Kstring,	/* strings with prefixed length */
+  Kzstr,	/* zero-terminated strings */
+  Kpadding,	/* padding */
+  Kpaddalign,	/* padding for alignment */
+  Knop		/* no-op (configuration or spaces) */
+} KOption;
+
+
+/*
+** Read an integer numeral from string 'fmt' or return 'df' if
+** there is no numeral
+*/
+static int digit (int c) { return '0' <= c && c <= '9'; }
+
+static int getnum (const char **fmt, int df) {
+  if (!digit(**fmt))  /* no number? */
+    return df;  /* return default value */
+  else {
+    int a = 0;
+    do {
+      a = a*10 + (*((*fmt)++) - '0');
+    } while (digit(**fmt) && a <= ((int)MAXSIZE - 9)/10);
+    return a;
+  }
+}
+
+
+/*
+** Read an integer numeral and raises an error if it is larger
+** than the maximum size for integers.
+*/
+static int getnumlimit (Header *h, const char **fmt, int df) {
+  int sz = getnum(fmt, df);
+  if (l_unlikely(sz > MAXINTSIZE || sz <= 0))
+    return luaL_error(h->L, "integral size (%d) out of limits [1,%d]",
+                            sz, MAXINTSIZE);
+  return sz;
+}
+
+
+/*
+** Initialize Header
+*/
+static void initheader (lua_State *L, Header *h) {
+  h->L = L;
+  h->islittle = nativeendian.little;
+  h->maxalign = 1;
+}
+
+
+/*
+** Read and classify next option. 'size' is filled with option's size.
+*/
+static KOption getoption (Header *h, const char **fmt, int *size) {
+  /* dummy structure to get native alignment requirements */
+  struct cD { char c; union { LUAI_MAXALIGN; } u; };
+  int opt = *((*fmt)++);
+  *size = 0;  /* default */
+  switch (opt) {
+    case 'b': *size = sizeof(char); return Kint;
+    case 'B': *size = sizeof(char); return Kuint;
+    case 'h': *size = sizeof(short); return Kint;
+    case 'H': *size = sizeof(short); return Kuint;
+    case 'l': *size = sizeof(long); return Kint;
+    case 'L': *size = sizeof(long); return Kuint;
+    case 'j': *size = sizeof(lua_Integer); return Kint;
+    case 'J': *size = sizeof(lua_Integer); return Kuint;
+    case 'T': *size = sizeof(size_t); return Kuint;
+    case 'f': *size = sizeof(float); return Kfloat;
+    case 'n': *size = sizeof(lua_Number); return Knumber;
+    case 'd': *size = sizeof(double); return Kdouble;
+    case 'i': *size = getnumlimit(h, fmt, sizeof(int)); return Kint;
+    case 'I': *size = getnumlimit(h, fmt, sizeof(int)); return Kuint;
+    case 's': *size = getnumlimit(h, fmt, sizeof(size_t)); return Kstring;
+    case 'c':
+      *size = getnum(fmt, -1);
+      if (l_unlikely(*size == -1))
+        luaL_error(h->L, "missing size for format option 'c'");
+      return Kchar;
+    case 'z': return Kzstr;
+    case 'x': *size = 1; return Kpadding;
+    case 'X': return Kpaddalign;
+    case ' ': break;
+    case '<': h->islittle = 1; break;
+    case '>': h->islittle = 0; break;
+    case '=': h->islittle = nativeendian.little; break;
+    case '!': {
+      const int maxalign = offsetof(struct cD, u);
+      h->maxalign = getnumlimit(h, fmt, maxalign);
+      break;
+    }
+    default: luaL_error(h->L, "invalid format option '%c'", opt);
+  }
+  return Knop;
+}
+
+
+/*
+** Read, classify, and fill other details about the next option.
+** 'psize' is filled with option's size, 'notoalign' with its
+** alignment requirements.
+** Local variable 'size' gets the size to be aligned. (Kpadal option
+** always gets its full alignment, other options are limited by
+** the maximum alignment ('maxalign'). Kchar option needs no alignment
+** despite its size.
+*/
+static KOption getdetails (Header *h, size_t totalsize,
+                           const char **fmt, int *psize, int *ntoalign) {
+  KOption opt = getoption(h, fmt, psize);
+  int align = *psize;  /* usually, alignment follows size */
+  if (opt == Kpaddalign) {  /* 'X' gets alignment from following option */
+    if (**fmt == '\0' || getoption(h, fmt, &align) == Kchar || align == 0)
+      luaL_argerror(h->L, 1, "invalid next option for option 'X'");
+  }
+  if (align <= 1 || opt == Kchar)  /* need no alignment? */
+    *ntoalign = 0;
+  else {
+    if (align > h->maxalign)  /* enforce maximum alignment */
+      align = h->maxalign;
+    if (l_unlikely((align & (align - 1)) != 0))  /* not a power of 2? */
+      luaL_argerror(h->L, 1, "format asks for alignment not power of 2");
+    *ntoalign = (align - (int)(totalsize & (align - 1))) & (align - 1);
+  }
+  return opt;
+}
+
+
+/*
+** Pack integer 'n' with 'size' bytes and 'islittle' endianness.
+** The final 'if' handles the case when 'size' is larger than
+** the size of a Lua integer, correcting the extra sign-extension
+** bytes if necessary (by default they would be zeros).
+*/
+static void packint (luaL_Buffer *b, lua_Unsigned n,
+                     int islittle, int size, int neg) {
+  char *buff = luaL_prepbuffsize(b, size);
+  int i;
+  buff[islittle ? 0 : size - 1] = (char)(n & MC);  /* first byte */
+  for (i = 1; i < size; i++) {
+    n >>= NB;
+    buff[islittle ? i : size - 1 - i] = (char)(n & MC);
+  }
+  if (neg && size > SZINT) {  /* negative number need sign extension? */
+    for (i = SZINT; i < size; i++)  /* correct extra bytes */
+      buff[islittle ? i : size - 1 - i] = (char)MC;
+  }
+  luaL_addsize(b, size);  /* add result to buffer */
+}
+
+
+/*
+** Copy 'size' bytes from 'src' to 'dest', correcting endianness if
+** given 'islittle' is different from native endianness.
+*/
+static void copywithendian (char *dest, const char *src,
+                            int size, int islittle) {
+  if (islittle == nativeendian.little)
+    memcpy(dest, src, size);
+  else {
+    dest += size - 1;
+    while (size-- != 0)
+      *(dest--) = *(src++);
+  }
+}
+
+
+static int str_pack (lua_State *L) {
+  luaL_Buffer b;
+  Header h;
+  const char *fmt = luaL_checkstring(L, 1);  /* format string */
+  int arg = 1;  /* current argument to pack */
+  size_t totalsize = 0;  /* accumulate total size of result */
+  initheader(L, &h);
+  lua_pushnil(L);  /* mark to separate arguments from string buffer */
+  luaL_buffinit(L, &b);
+  while (*fmt != '\0') {
+    int size, ntoalign;
+    KOption opt = getdetails(&h, totalsize, &fmt, &size, &ntoalign);
+    totalsize += ntoalign + size;
+    while (ntoalign-- > 0)
+     luaL_addchar(&b, LUAL_PACKPADBYTE);  /* fill alignment */
+    arg++;
+    switch (opt) {
+      case Kint: {  /* signed integers */
+        lua_Integer n = luaL_checkinteger(L, arg);
+        if (size < SZINT) {  /* need overflow check? */
+          lua_Integer lim = (lua_Integer)1 << ((size * NB) - 1);
+          luaL_argcheck(L, -lim <= n && n < lim, arg, "integer overflow");
+        }
+        packint(&b, (lua_Unsigned)n, h.islittle, size, (n < 0));
+        break;
+      }
+      case Kuint: {  /* unsigned integers */
+        lua_Integer n = luaL_checkinteger(L, arg);
+        if (size < SZINT)  /* need overflow check? */
+          luaL_argcheck(L, (lua_Unsigned)n < ((lua_Unsigned)1 << (size * NB)),
+                           arg, "unsigned overflow");
+        packint(&b, (lua_Unsigned)n, h.islittle, size, 0);
+        break;
+      }
+      case Kfloat: {  /* C float */
+        float f = (float)luaL_checknumber(L, arg);  /* get argument */
+        char *buff = luaL_prepbuffsize(&b, sizeof(f));
+        /* move 'f' to final result, correcting endianness if needed */
+        copywithendian(buff, (char *)&f, sizeof(f), h.islittle);
+        luaL_addsize(&b, size);
+        break;
+      }
+      case Knumber: {  /* Lua float */
+        lua_Number f = luaL_checknumber(L, arg);  /* get argument */
+        char *buff = luaL_prepbuffsize(&b, sizeof(f));
+        /* move 'f' to final result, correcting endianness if needed */
+        copywithendian(buff, (char *)&f, sizeof(f), h.islittle);
+        luaL_addsize(&b, size);
+        break;
+      }
+      case Kdouble: {  /* C double */
+        double f = (double)luaL_checknumber(L, arg);  /* get argument */
+        char *buff = luaL_prepbuffsize(&b, sizeof(f));
+        /* move 'f' to final result, correcting endianness if needed */
+        copywithendian(buff, (char *)&f, sizeof(f), h.islittle);
+        luaL_addsize(&b, size);
+        break;
+      }
+      case Kchar: {  /* fixed-size string */
+        size_t len;
+        const char *s = luaL_checklstring(L, arg, &len);
+        luaL_argcheck(L, len <= (size_t)size, arg,
+                         "string longer than given size");
+        luaL_addlstring(&b, s, len);  /* add string */
+        while (len++ < (size_t)size)  /* pad extra space */
+          luaL_addchar(&b, LUAL_PACKPADBYTE);
+        break;
+      }
+      case Kstring: {  /* strings with length count */
+        size_t len;
+        const char *s = luaL_checklstring(L, arg, &len);
+        luaL_argcheck(L, size >= (int)sizeof(size_t) ||
+                         len < ((size_t)1 << (size * NB)),
+                         arg, "string length does not fit in given size");
+        packint(&b, (lua_Unsigned)len, h.islittle, size, 0);  /* pack length */
+        luaL_addlstring(&b, s, len);
+        totalsize += len;
+        break;
+      }
+      case Kzstr: {  /* zero-terminated string */
+        size_t len;
+        const char *s = luaL_checklstring(L, arg, &len);
+        luaL_argcheck(L, strlen(s) == len, arg, "string contains zeros");
+        luaL_addlstring(&b, s, len);
+        luaL_addchar(&b, '\0');  /* add zero at the end */
+        totalsize += len + 1;
+        break;
+      }
+      case Kpadding: luaL_addchar(&b, LUAL_PACKPADBYTE);  /* FALLTHROUGH */
+      case Kpaddalign: case Knop:
+        arg--;  /* undo increment */
+        break;
+    }
+  }
+  luaL_pushresult(&b);
+  return 1;
+}
+
+
+static int str_packsize (lua_State *L) {
+  Header h;
+  const char *fmt = luaL_checkstring(L, 1);  /* format string */
+  size_t totalsize = 0;  /* accumulate total size of result */
+  initheader(L, &h);
+  while (*fmt != '\0') {
+    int size, ntoalign;
+    KOption opt = getdetails(&h, totalsize, &fmt, &size, &ntoalign);
+    luaL_argcheck(L, opt != Kstring && opt != Kzstr, 1,
+                     "variable-length format");
+    size += ntoalign;  /* total space used by option */
+    luaL_argcheck(L, totalsize <= MAXSIZE - size, 1,
+                     "format result too large");
+    totalsize += size;
+  }
+  lua_pushinteger(L, (lua_Integer)totalsize);
+  return 1;
+}
+
+
+/*
+** Unpack an integer with 'size' bytes and 'islittle' endianness.
+** If size is smaller than the size of a Lua integer and integer
+** is signed, must do sign extension (propagating the sign to the
+** higher bits); if size is larger than the size of a Lua integer,
+** it must check the unread bytes to see whether they do not cause an
+** overflow.
+*/
+static lua_Integer unpackint (lua_State *L, const char *str,
+                              int islittle, int size, int issigned) {
+  lua_Unsigned res = 0;
+  int i;
+  int limit = (size  <= SZINT) ? size : SZINT;
+  for (i = limit - 1; i >= 0; i--) {
+    res <<= NB;
+    res |= (lua_Unsigned)(unsigned char)str[islittle ? i : size - 1 - i];
+  }
+  if (size < SZINT) {  /* real size smaller than lua_Integer? */
+    if (issigned) {  /* needs sign extension? */
+      lua_Unsigned mask = (lua_Unsigned)1 << (size*NB - 1);
+      res = ((res ^ mask) - mask);  /* do sign extension */
+    }
+  }
+  else if (size > SZINT) {  /* must check unread bytes */
+    int mask = (!issigned || (lua_Integer)res >= 0) ? 0 : MC;
+    for (i = limit; i < size; i++) {
+      if (l_unlikely((unsigned char)str[islittle ? i : size - 1 - i] != mask))
+        luaL_error(L, "%d-byte integer does not fit into Lua Integer", size);
+    }
+  }
+  return (lua_Integer)res;
+}
+
+
+static int str_unpack (lua_State *L) {
+  Header h;
+  const char *fmt = luaL_checkstring(L, 1);
+  size_t ld;
+  const char *data = luaL_checklstring(L, 2, &ld);
+  size_t pos = posrelatI(luaL_optinteger(L, 3, 1), ld) - 1;
+  int n = 0;  /* number of results */
+  luaL_argcheck(L, pos <= ld, 3, "initial position out of string");
+  initheader(L, &h);
+  while (*fmt != '\0') {
+    int size, ntoalign;
+    KOption opt = getdetails(&h, pos, &fmt, &size, &ntoalign);
+    luaL_argcheck(L, (size_t)ntoalign + size <= ld - pos, 2,
+                    "data string too short");
+    pos += ntoalign;  /* skip alignment */
+    /* stack space for item + next position */
+    luaL_checkstack(L, 2, "too many results");
+    n++;
+    switch (opt) {
+      case Kint:
+      case Kuint: {
+        lua_Integer res = unpackint(L, data + pos, h.islittle, size,
+                                       (opt == Kint));
+        lua_pushinteger(L, res);
+        break;
+      }
+      case Kfloat: {
+        float f;
+        copywithendian((char *)&f, data + pos, sizeof(f), h.islittle);
+        lua_pushnumber(L, (lua_Number)f);
+        break;
+      }
+      case Knumber: {
+        lua_Number f;
+        copywithendian((char *)&f, data + pos, sizeof(f), h.islittle);
+        lua_pushnumber(L, f);
+        break;
+      }
+      case Kdouble: {
+        double f;
+        copywithendian((char *)&f, data + pos, sizeof(f), h.islittle);
+        lua_pushnumber(L, (lua_Number)f);
+        break;
+      }
+      case Kchar: {
+        lua_pushlstring(L, data + pos, size);
+        break;
+      }
+      case Kstring: {
+        size_t len = (size_t)unpackint(L, data + pos, h.islittle, size, 0);
+        luaL_argcheck(L, len <= ld - pos - size, 2, "data string too short");
+        lua_pushlstring(L, data + pos + size, len);
+        pos += len;  /* skip string */
+        break;
+      }
+      case Kzstr: {
+        size_t len = strlen(data + pos);
+        luaL_argcheck(L, pos + len < ld, 2,
+                         "unfinished string for format 'z'");
+        lua_pushlstring(L, data + pos, len);
+        pos += len + 1;  /* skip string plus final '\0' */
+        break;
+      }
+      case Kpaddalign: case Kpadding: case Knop:
+        n--;  /* undo increment */
+        break;
+    }
+    pos += size;
+  }
+  lua_pushinteger(L, pos + 1);  /* next position */
+  return n + 1;
+}
+
+/* }====================================================== */
+
+
+static const luaL_Reg strlib[] = {
+  {"byte", str_byte},
+  {"char", str_char},
+  {"dump", str_dump},
+  {"find", str_find},
+  {"format", str_format},
+  {"gmatch", gmatch},
+  {"gsub", str_gsub},
+  {"len", str_len},
+  {"lower", str_lower},
+  {"match", str_match},
+  {"rep", str_rep},
+  {"reverse", str_reverse},
+  {"sub", str_sub},
+  {"upper", str_upper},
+  {"pack", str_pack},
+  {"packsize", str_packsize},
+  {"unpack", str_unpack},
+  {NULL, NULL}
+};
+
+
+static void createmetatable (lua_State *L) {
+  /* table to be metatable for strings */
+  luaL_newlibtable(L, stringmetamethods);
+  luaL_setfuncs(L, stringmetamethods, 0);
+  lua_pushliteral(L, "");  /* dummy string */
+  lua_pushvalue(L, -2);  /* copy table */
+  lua_setmetatable(L, -2);  /* set table as metatable for strings */
+  lua_pop(L, 1);  /* pop dummy string */
+  lua_pushvalue(L, -2);  /* get string library */
+  lua_setfield(L, -2, "__index");  /* metatable.__index = string */
+  lua_pop(L, 1);  /* pop metatable */
+}
+
+
+/*
+** Open string library
+*/
+LUAMOD_API int luaopen_string (lua_State *L) {
+  luaL_newlib(L, strlib);
+  createmetatable(L);
+  return 1;
+}
+
diff --git a/src/libs/3rdparty/lua/src/ltable.c b/src/libs/3rdparty/lua/src/ltable.c
new file mode 100644
index 0000000000..3c690c5f17
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/ltable.c
@@ -0,0 +1,980 @@
+/*
+** $Id: ltable.c $
+** Lua tables (hash)
+** See Copyright Notice in lua.h
+*/
+
+#define ltable_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+/*
+** Implementation of tables (aka arrays, objects, or hash tables).
+** Tables keep its elements in two parts: an array part and a hash part.
+** Non-negative integer keys are all candidates to be kept in the array
+** part. The actual size of the array is the largest 'n' such that
+** more than half the slots between 1 and n are in use.
+** Hash uses a mix of chained scatter table with Brent's variation.
+** A main invariant of these tables is that, if an element is not
+** in its main position (i.e. the 'original' position that its hash gives
+** to it), then the colliding element is in its own main position.
+** Hence even when the load factor reaches 100%, performance remains good.
+*/
+
+#include <math.h>
+#include <limits.h>
+
+#include "lua.h"
+
+#include "ldebug.h"
+#include "ldo.h"
+#include "lgc.h"
+#include "lmem.h"
+#include "lobject.h"
+#include "lstate.h"
+#include "lstring.h"
+#include "ltable.h"
+#include "lvm.h"
+
+
+/*
+** MAXABITS is the largest integer such that MAXASIZE fits in an
+** unsigned int.
+*/
+#define MAXABITS	cast_int(sizeof(int) * CHAR_BIT - 1)
+
+
+/*
+** MAXASIZE is the maximum size of the array part. It is the minimum
+** between 2^MAXABITS and the maximum size that, measured in bytes,
+** fits in a 'size_t'.
+*/
+#define MAXASIZE	luaM_limitN(1u << MAXABITS, TValue)
+
+/*
+** MAXHBITS is the largest integer such that 2^MAXHBITS fits in a
+** signed int.
+*/
+#define MAXHBITS	(MAXABITS - 1)
+
+
+/*
+** MAXHSIZE is the maximum size of the hash part. It is the minimum
+** between 2^MAXHBITS and the maximum size such that, measured in bytes,
+** it fits in a 'size_t'.
+*/
+#define MAXHSIZE	luaM_limitN(1u << MAXHBITS, Node)
+
+
+/*
+** When the original hash value is good, hashing by a power of 2
+** avoids the cost of '%'.
+*/
+#define hashpow2(t,n)		(gnode(t, lmod((n), sizenode(t))))
+
+/*
+** for other types, it is better to avoid modulo by power of 2, as
+** they can have many 2 factors.
+*/
+#define hashmod(t,n)	(gnode(t, ((n) % ((sizenode(t)-1)|1))))
+
+
+#define hashstr(t,str)		hashpow2(t, (str)->hash)
+#define hashboolean(t,p)	hashpow2(t, p)
+
+
+#define hashpointer(t,p)	hashmod(t, point2uint(p))
+
+
+#define dummynode		(&dummynode_)
+
+static const Node dummynode_ = {
+  {{NULL}, LUA_VEMPTY,  /* value's value and type */
+   LUA_VNIL, 0, {NULL}}  /* key type, next, and key value */
+};
+
+
+static const TValue absentkey = {ABSTKEYCONSTANT};
+
+
+/*
+** Hash for integers. To allow a good hash, use the remainder operator
+** ('%'). If integer fits as a non-negative int, compute an int
+** remainder, which is faster. Otherwise, use an unsigned-integer
+** remainder, which uses all bits and ensures a non-negative result.
+*/
+static Node *hashint (const Table *t, lua_Integer i) {
+  lua_Unsigned ui = l_castS2U(i);
+  if (ui <= cast_uint(INT_MAX))
+    return hashmod(t, cast_int(ui));
+  else
+    return hashmod(t, ui);
+}
+
+
+/*
+** Hash for floating-point numbers.
+** The main computation should be just
+**     n = frexp(n, &i); return (n * INT_MAX) + i
+** but there are some numerical subtleties.
+** In a two-complement representation, INT_MAX does not has an exact
+** representation as a float, but INT_MIN does; because the absolute
+** value of 'frexp' is smaller than 1 (unless 'n' is inf/NaN), the
+** absolute value of the product 'frexp * -INT_MIN' is smaller or equal
+** to INT_MAX. Next, the use of 'unsigned int' avoids overflows when
+** adding 'i'; the use of '~u' (instead of '-u') avoids problems with
+** INT_MIN.
+*/
+#if !defined(l_hashfloat)
+static int l_hashfloat (lua_Number n) {
+  int i;
+  lua_Integer ni;
+  n = l_mathop(frexp)(n, &i) * -cast_num(INT_MIN);
+  if (!lua_numbertointeger(n, &ni)) {  /* is 'n' inf/-inf/NaN? */
+    lua_assert(luai_numisnan(n) || l_mathop(fabs)(n) == cast_num(HUGE_VAL));
+    return 0;
+  }
+  else {  /* normal case */
+    unsigned int u = cast_uint(i) + cast_uint(ni);
+    return cast_int(u <= cast_uint(INT_MAX) ? u : ~u);
+  }
+}
+#endif
+
+
+/*
+** returns the 'main' position of an element in a table (that is,
+** the index of its hash value).
+*/
+static Node *mainpositionTV (const Table *t, const TValue *key) {
+  switch (ttypetag(key)) {
+    case LUA_VNUMINT: {
+      lua_Integer i = ivalue(key);
+      return hashint(t, i);
+    }
+    case LUA_VNUMFLT: {
+      lua_Number n = fltvalue(key);
+      return hashmod(t, l_hashfloat(n));
+    }
+    case LUA_VSHRSTR: {
+      TString *ts = tsvalue(key);
+      return hashstr(t, ts);
+    }
+    case LUA_VLNGSTR: {
+      TString *ts = tsvalue(key);
+      return hashpow2(t, luaS_hashlongstr(ts));
+    }
+    case LUA_VFALSE:
+      return hashboolean(t, 0);
+    case LUA_VTRUE:
+      return hashboolean(t, 1);
+    case LUA_VLIGHTUSERDATA: {
+      void *p = pvalue(key);
+      return hashpointer(t, p);
+    }
+    case LUA_VLCF: {
+      lua_CFunction f = fvalue(key);
+      return hashpointer(t, f);
+    }
+    default: {
+      GCObject *o = gcvalue(key);
+      return hashpointer(t, o);
+    }
+  }
+}
+
+
+l_sinline Node *mainpositionfromnode (const Table *t, Node *nd) {
+  TValue key;
+  getnodekey(cast(lua_State *, NULL), &key, nd);
+  return mainpositionTV(t, &key);
+}
+
+
+/*
+** Check whether key 'k1' is equal to the key in node 'n2'. This
+** equality is raw, so there are no metamethods. Floats with integer
+** values have been normalized, so integers cannot be equal to
+** floats. It is assumed that 'eqshrstr' is simply pointer equality, so
+** that short strings are handled in the default case.
+** A true 'deadok' means to accept dead keys as equal to their original
+** values. All dead keys are compared in the default case, by pointer
+** identity. (Only collectable objects can produce dead keys.) Note that
+** dead long strings are also compared by identity.
+** Once a key is dead, its corresponding value may be collected, and
+** then another value can be created with the same address. If this
+** other value is given to 'next', 'equalkey' will signal a false
+** positive. In a regular traversal, this situation should never happen,
+** as all keys given to 'next' came from the table itself, and therefore
+** could not have been collected. Outside a regular traversal, we
+** have garbage in, garbage out. What is relevant is that this false
+** positive does not break anything.  (In particular, 'next' will return
+** some other valid item on the table or nil.)
+*/
+static int equalkey (const TValue *k1, const Node *n2, int deadok) {
+  if ((rawtt(k1) != keytt(n2)) &&  /* not the same variants? */
+       !(deadok && keyisdead(n2) && iscollectable(k1)))
+   return 0;  /* cannot be same key */
+  switch (keytt(n2)) {
+    case LUA_VNIL: case LUA_VFALSE: case LUA_VTRUE:
+      return 1;
+    case LUA_VNUMINT:
+      return (ivalue(k1) == keyival(n2));
+    case LUA_VNUMFLT:
+      return luai_numeq(fltvalue(k1), fltvalueraw(keyval(n2)));
+    case LUA_VLIGHTUSERDATA:
+      return pvalue(k1) == pvalueraw(keyval(n2));
+    case LUA_VLCF:
+      return fvalue(k1) == fvalueraw(keyval(n2));
+    case ctb(LUA_VLNGSTR):
+      return luaS_eqlngstr(tsvalue(k1), keystrval(n2));
+    default:
+      return gcvalue(k1) == gcvalueraw(keyval(n2));
+  }
+}
+
+
+/*
+** True if value of 'alimit' is equal to the real size of the array
+** part of table 't'. (Otherwise, the array part must be larger than
+** 'alimit'.)
+*/
+#define limitequalsasize(t)	(isrealasize(t) || ispow2((t)->alimit))
+
+
+/*
+** Returns the real size of the 'array' array
+*/
+LUAI_FUNC unsigned int luaH_realasize (const Table *t) {
+  if (limitequalsasize(t))
+    return t->alimit;  /* this is the size */
+  else {
+    unsigned int size = t->alimit;
+    /* compute the smallest power of 2 not smaller than 'n' */
+    size |= (size >> 1);
+    size |= (size >> 2);
+    size |= (size >> 4);
+    size |= (size >> 8);
+#if (UINT_MAX >> 14) > 3  /* unsigned int has more than 16 bits */
+    size |= (size >> 16);
+#if (UINT_MAX >> 30) > 3
+    size |= (size >> 32);  /* unsigned int has more than 32 bits */
+#endif
+#endif
+    size++;
+    lua_assert(ispow2(size) && size/2 < t->alimit && t->alimit < size);
+    return size;
+  }
+}
+
+
+/*
+** Check whether real size of the array is a power of 2.
+** (If it is not, 'alimit' cannot be changed to any other value
+** without changing the real size.)
+*/
+static int ispow2realasize (const Table *t) {
+  return (!isrealasize(t) || ispow2(t->alimit));
+}
+
+
+static unsigned int setlimittosize (Table *t) {
+  t->alimit = luaH_realasize(t);
+  setrealasize(t);
+  return t->alimit;
+}
+
+
+#define limitasasize(t)	check_exp(isrealasize(t), t->alimit)
+
+
+
+/*
+** "Generic" get version. (Not that generic: not valid for integers,
+** which may be in array part, nor for floats with integral values.)
+** See explanation about 'deadok' in function 'equalkey'.
+*/
+static const TValue *getgeneric (Table *t, const TValue *key, int deadok) {
+  Node *n = mainpositionTV(t, key);
+  for (;;) {  /* check whether 'key' is somewhere in the chain */
+    if (equalkey(key, n, deadok))
+      return gval(n);  /* that's it */
+    else {
+      int nx = gnext(n);
+      if (nx == 0)
+        return &absentkey;  /* not found */
+      n += nx;
+    }
+  }
+}
+
+
+/*
+** returns the index for 'k' if 'k' is an appropriate key to live in
+** the array part of a table, 0 otherwise.
+*/
+static unsigned int arrayindex (lua_Integer k) {
+  if (l_castS2U(k) - 1u < MAXASIZE)  /* 'k' in [1, MAXASIZE]? */
+    return cast_uint(k);  /* 'key' is an appropriate array index */
+  else
+    return 0;
+}
+
+
+/*
+** returns the index of a 'key' for table traversals. First goes all
+** elements in the array part, then elements in the hash part. The
+** beginning of a traversal is signaled by 0.
+*/
+static unsigned int findindex (lua_State *L, Table *t, TValue *key,
+                               unsigned int asize) {
+  unsigned int i;
+  if (ttisnil(key)) return 0;  /* first iteration */
+  i = ttisinteger(key) ? arrayindex(ivalue(key)) : 0;
+  if (i - 1u < asize)  /* is 'key' inside array part? */
+    return i;  /* yes; that's the index */
+  else {
+    const TValue *n = getgeneric(t, key, 1);
+    if (l_unlikely(isabstkey(n)))
+      luaG_runerror(L, "invalid key to 'next'");  /* key not found */
+    i = cast_int(nodefromval(n) - gnode(t, 0));  /* key index in hash table */
+    /* hash elements are numbered after array ones */
+    return (i + 1) + asize;
+  }
+}
+
+
+int luaH_next (lua_State *L, Table *t, StkId key) {
+  unsigned int asize = luaH_realasize(t);
+  unsigned int i = findindex(L, t, s2v(key), asize);  /* find original key */
+  for (; i < asize; i++) {  /* try first array part */
+    if (!isempty(&t->array[i])) {  /* a non-empty entry? */
+      setivalue(s2v(key), i + 1);
+      setobj2s(L, key + 1, &t->array[i]);
+      return 1;
+    }
+  }
+  for (i -= asize; cast_int(i) < sizenode(t); i++) {  /* hash part */
+    if (!isempty(gval(gnode(t, i)))) {  /* a non-empty entry? */
+      Node *n = gnode(t, i);
+      getnodekey(L, s2v(key), n);
+      setobj2s(L, key + 1, gval(n));
+      return 1;
+    }
+  }
+  return 0;  /* no more elements */
+}
+
+
+static void freehash (lua_State *L, Table *t) {
+  if (!isdummy(t))
+    luaM_freearray(L, t->node, cast_sizet(sizenode(t)));
+}
+
+
+/*
+** {=============================================================
+** Rehash
+** ==============================================================
+*/
+
+/*
+** Compute the optimal size for the array part of table 't'. 'nums' is a
+** "count array" where 'nums[i]' is the number of integers in the table
+** between 2^(i - 1) + 1 and 2^i. 'pna' enters with the total number of
+** integer keys in the table and leaves with the number of keys that
+** will go to the array part; return the optimal size.  (The condition
+** 'twotoi > 0' in the for loop stops the loop if 'twotoi' overflows.)
+*/
+static unsigned int computesizes (unsigned int nums[], unsigned int *pna) {
+  int i;
+  unsigned int twotoi;  /* 2^i (candidate for optimal size) */
+  unsigned int a = 0;  /* number of elements smaller than 2^i */
+  unsigned int na = 0;  /* number of elements to go to array part */
+  unsigned int optimal = 0;  /* optimal size for array part */
+  /* loop while keys can fill more than half of total size */
+  for (i = 0, twotoi = 1;
+       twotoi > 0 && *pna > twotoi / 2;
+       i++, twotoi *= 2) {
+    a += nums[i];
+    if (a > twotoi/2) {  /* more than half elements present? */
+      optimal = twotoi;  /* optimal size (till now) */
+      na = a;  /* all elements up to 'optimal' will go to array part */
+    }
+  }
+  lua_assert((optimal == 0 || optimal / 2 < na) && na <= optimal);
+  *pna = na;
+  return optimal;
+}
+
+
+static int countint (lua_Integer key, unsigned int *nums) {
+  unsigned int k = arrayindex(key);
+  if (k != 0) {  /* is 'key' an appropriate array index? */
+    nums[luaO_ceillog2(k)]++;  /* count as such */
+    return 1;
+  }
+  else
+    return 0;
+}
+
+
+/*
+** Count keys in array part of table 't': Fill 'nums[i]' with
+** number of keys that will go into corresponding slice and return
+** total number of non-nil keys.
+*/
+static unsigned int numusearray (const Table *t, unsigned int *nums) {
+  int lg;
+  unsigned int ttlg;  /* 2^lg */
+  unsigned int ause = 0;  /* summation of 'nums' */
+  unsigned int i = 1;  /* count to traverse all array keys */
+  unsigned int asize = limitasasize(t);  /* real array size */
+  /* traverse each slice */
+  for (lg = 0, ttlg = 1; lg <= MAXABITS; lg++, ttlg *= 2) {
+    unsigned int lc = 0;  /* counter */
+    unsigned int lim = ttlg;
+    if (lim > asize) {
+      lim = asize;  /* adjust upper limit */
+      if (i > lim)
+        break;  /* no more elements to count */
+    }
+    /* count elements in range (2^(lg - 1), 2^lg] */
+    for (; i <= lim; i++) {
+      if (!isempty(&t->array[i-1]))
+        lc++;
+    }
+    nums[lg] += lc;
+    ause += lc;
+  }
+  return ause;
+}
+
+
+static int numusehash (const Table *t, unsigned int *nums, unsigned int *pna) {
+  int totaluse = 0;  /* total number of elements */
+  int ause = 0;  /* elements added to 'nums' (can go to array part) */
+  int i = sizenode(t);
+  while (i--) {
+    Node *n = &t->node[i];
+    if (!isempty(gval(n))) {
+      if (keyisinteger(n))
+        ause += countint(keyival(n), nums);
+      totaluse++;
+    }
+  }
+  *pna += ause;
+  return totaluse;
+}
+
+
+/*
+** Creates an array for the hash part of a table with the given
+** size, or reuses the dummy node if size is zero.
+** The computation for size overflow is in two steps: the first
+** comparison ensures that the shift in the second one does not
+** overflow.
+*/
+static void setnodevector (lua_State *L, Table *t, unsigned int size) {
+  if (size == 0) {  /* no elements to hash part? */
+    t->node = cast(Node *, dummynode);  /* use common 'dummynode' */
+    t->lsizenode = 0;
+    t->lastfree = NULL;  /* signal that it is using dummy node */
+  }
+  else {
+    int i;
+    int lsize = luaO_ceillog2(size);
+    if (lsize > MAXHBITS || (1u << lsize) > MAXHSIZE)
+      luaG_runerror(L, "table overflow");
+    size = twoto(lsize);
+    t->node = luaM_newvector(L, size, Node);
+    for (i = 0; i < cast_int(size); i++) {
+      Node *n = gnode(t, i);
+      gnext(n) = 0;
+      setnilkey(n);
+      setempty(gval(n));
+    }
+    t->lsizenode = cast_byte(lsize);
+    t->lastfree = gnode(t, size);  /* all positions are free */
+  }
+}
+
+
+/*
+** (Re)insert all elements from the hash part of 'ot' into table 't'.
+*/
+static void reinsert (lua_State *L, Table *ot, Table *t) {
+  int j;
+  int size = sizenode(ot);
+  for (j = 0; j < size; j++) {
+    Node *old = gnode(ot, j);
+    if (!isempty(gval(old))) {
+      /* doesn't need barrier/invalidate cache, as entry was
+         already present in the table */
+      TValue k;
+      getnodekey(L, &k, old);
+      luaH_set(L, t, &k, gval(old));
+    }
+  }
+}
+
+
+/*
+** Exchange the hash part of 't1' and 't2'.
+*/
+static void exchangehashpart (Table *t1, Table *t2) {
+  lu_byte lsizenode = t1->lsizenode;
+  Node *node = t1->node;
+  Node *lastfree = t1->lastfree;
+  t1->lsizenode = t2->lsizenode;
+  t1->node = t2->node;
+  t1->lastfree = t2->lastfree;
+  t2->lsizenode = lsizenode;
+  t2->node = node;
+  t2->lastfree = lastfree;
+}
+
+
+/*
+** Resize table 't' for the new given sizes. Both allocations (for
+** the hash part and for the array part) can fail, which creates some
+** subtleties. If the first allocation, for the hash part, fails, an
+** error is raised and that is it. Otherwise, it copies the elements from
+** the shrinking part of the array (if it is shrinking) into the new
+** hash. Then it reallocates the array part.  If that fails, the table
+** is in its original state; the function frees the new hash part and then
+** raises the allocation error. Otherwise, it sets the new hash part
+** into the table, initializes the new part of the array (if any) with
+** nils and reinserts the elements of the old hash back into the new
+** parts of the table.
+*/
+void luaH_resize (lua_State *L, Table *t, unsigned int newasize,
+                                          unsigned int nhsize) {
+  unsigned int i;
+  Table newt;  /* to keep the new hash part */
+  unsigned int oldasize = setlimittosize(t);
+  TValue *newarray;
+  /* create new hash part with appropriate size into 'newt' */
+  setnodevector(L, &newt, nhsize);
+  if (newasize < oldasize) {  /* will array shrink? */
+    t->alimit = newasize;  /* pretend array has new size... */
+    exchangehashpart(t, &newt);  /* and new hash */
+    /* re-insert into the new hash the elements from vanishing slice */
+    for (i = newasize; i < oldasize; i++) {
+      if (!isempty(&t->array[i]))
+        luaH_setint(L, t, i + 1, &t->array[i]);
+    }
+    t->alimit = oldasize;  /* restore current size... */
+    exchangehashpart(t, &newt);  /* and hash (in case of errors) */
+  }
+  /* allocate new array */
+  newarray = luaM_reallocvector(L, t->array, oldasize, newasize, TValue);
+  if (l_unlikely(newarray == NULL && newasize > 0)) {  /* allocation failed? */
+    freehash(L, &newt);  /* release new hash part */
+    luaM_error(L);  /* raise error (with array unchanged) */
+  }
+  /* allocation ok; initialize new part of the array */
+  exchangehashpart(t, &newt);  /* 't' has the new hash ('newt' has the old) */
+  t->array = newarray;  /* set new array part */
+  t->alimit = newasize;
+  for (i = oldasize; i < newasize; i++)  /* clear new slice of the array */
+     setempty(&t->array[i]);
+  /* re-insert elements from old hash part into new parts */
+  reinsert(L, &newt, t);  /* 'newt' now has the old hash */
+  freehash(L, &newt);  /* free old hash part */
+}
+
+
+void luaH_resizearray (lua_State *L, Table *t, unsigned int nasize) {
+  int nsize = allocsizenode(t);
+  luaH_resize(L, t, nasize, nsize);
+}
+
+/*
+** nums[i] = number of keys 'k' where 2^(i - 1) < k <= 2^i
+*/
+static void rehash (lua_State *L, Table *t, const TValue *ek) {
+  unsigned int asize;  /* optimal size for array part */
+  unsigned int na;  /* number of keys in the array part */
+  unsigned int nums[MAXABITS + 1];
+  int i;
+  int totaluse;
+  for (i = 0; i <= MAXABITS; i++) nums[i] = 0;  /* reset counts */
+  setlimittosize(t);
+  na = numusearray(t, nums);  /* count keys in array part */
+  totaluse = na;  /* all those keys are integer keys */
+  totaluse += numusehash(t, nums, &na);  /* count keys in hash part */
+  /* count extra key */
+  if (ttisinteger(ek))
+    na += countint(ivalue(ek), nums);
+  totaluse++;
+  /* compute new size for array part */
+  asize = computesizes(nums, &na);
+  /* resize the table to new computed sizes */
+  luaH_resize(L, t, asize, totaluse - na);
+}
+
+
+
+/*
+** }=============================================================
+*/
+
+
+Table *luaH_new (lua_State *L) {
+  GCObject *o = luaC_newobj(L, LUA_VTABLE, sizeof(Table));
+  Table *t = gco2t(o);
+  t->metatable = NULL;
+  t->flags = cast_byte(maskflags);  /* table has no metamethod fields */
+  t->array = NULL;
+  t->alimit = 0;
+  setnodevector(L, t, 0);
+  return t;
+}
+
+
+void luaH_free (lua_State *L, Table *t) {
+  freehash(L, t);
+  luaM_freearray(L, t->array, luaH_realasize(t));
+  luaM_free(L, t);
+}
+
+
+static Node *getfreepos (Table *t) {
+  if (!isdummy(t)) {
+    while (t->lastfree > t->node) {
+      t->lastfree--;
+      if (keyisnil(t->lastfree))
+        return t->lastfree;
+    }
+  }
+  return NULL;  /* could not find a free place */
+}
+
+
+
+/*
+** inserts a new key into a hash table; first, check whether key's main
+** position is free. If not, check whether colliding node is in its main
+** position or not: if it is not, move colliding node to an empty place and
+** put new key in its main position; otherwise (colliding node is in its main
+** position), new key goes to an empty position.
+*/
+void luaH_newkey (lua_State *L, Table *t, const TValue *key, TValue *value) {
+  Node *mp;
+  TValue aux;
+  if (l_unlikely(ttisnil(key)))
+    luaG_runerror(L, "table index is nil");
+  else if (ttisfloat(key)) {
+    lua_Number f = fltvalue(key);
+    lua_Integer k;
+    if (luaV_flttointeger(f, &k, F2Ieq)) {  /* does key fit in an integer? */
+      setivalue(&aux, k);
+      key = &aux;  /* insert it as an integer */
+    }
+    else if (l_unlikely(luai_numisnan(f)))
+      luaG_runerror(L, "table index is NaN");
+  }
+  if (ttisnil(value))
+    return;  /* do not insert nil values */
+  mp = mainpositionTV(t, key);
+  if (!isempty(gval(mp)) || isdummy(t)) {  /* main position is taken? */
+    Node *othern;
+    Node *f = getfreepos(t);  /* get a free place */
+    if (f == NULL) {  /* cannot find a free place? */
+      rehash(L, t, key);  /* grow table */
+      /* whatever called 'newkey' takes care of TM cache */
+      luaH_set(L, t, key, value);  /* insert key into grown table */
+      return;
+    }
+    lua_assert(!isdummy(t));
+    othern = mainpositionfromnode(t, mp);
+    if (othern != mp) {  /* is colliding node out of its main position? */
+      /* yes; move colliding node into free position */
+      while (othern + gnext(othern) != mp)  /* find previous */
+        othern += gnext(othern);
+      gnext(othern) = cast_int(f - othern);  /* rechain to point to 'f' */
+      *f = *mp;  /* copy colliding node into free pos. (mp->next also goes) */
+      if (gnext(mp) != 0) {
+        gnext(f) += cast_int(mp - f);  /* correct 'next' */
+        gnext(mp) = 0;  /* now 'mp' is free */
+      }
+      setempty(gval(mp));
+    }
+    else {  /* colliding node is in its own main position */
+      /* new node will go into free position */
+      if (gnext(mp) != 0)
+        gnext(f) = cast_int((mp + gnext(mp)) - f);  /* chain new position */
+      else lua_assert(gnext(f) == 0);
+      gnext(mp) = cast_int(f - mp);
+      mp = f;
+    }
+  }
+  setnodekey(L, mp, key);
+  luaC_barrierback(L, obj2gco(t), key);
+  lua_assert(isempty(gval(mp)));
+  setobj2t(L, gval(mp), value);
+}
+
+
+/*
+** Search function for integers. If integer is inside 'alimit', get it
+** directly from the array part. Otherwise, if 'alimit' is not equal to
+** the real size of the array, key still can be in the array part. In
+** this case, try to avoid a call to 'luaH_realasize' when key is just
+** one more than the limit (so that it can be incremented without
+** changing the real size of the array).
+*/
+const TValue *luaH_getint (Table *t, lua_Integer key) {
+  if (l_castS2U(key) - 1u < t->alimit)  /* 'key' in [1, t->alimit]? */
+    return &t->array[key - 1];
+  else if (!limitequalsasize(t) &&  /* key still may be in the array part? */
+           (l_castS2U(key) == t->alimit + 1 ||
+            l_castS2U(key) - 1u < luaH_realasize(t))) {
+    t->alimit = cast_uint(key);  /* probably '#t' is here now */
+    return &t->array[key - 1];
+  }
+  else {
+    Node *n = hashint(t, key);
+    for (;;) {  /* check whether 'key' is somewhere in the chain */
+      if (keyisinteger(n) && keyival(n) == key)
+        return gval(n);  /* that's it */
+      else {
+        int nx = gnext(n);
+        if (nx == 0) break;
+        n += nx;
+      }
+    }
+    return &absentkey;
+  }
+}
+
+
+/*
+** search function for short strings
+*/
+const TValue *luaH_getshortstr (Table *t, TString *key) {
+  Node *n = hashstr(t, key);
+  lua_assert(key->tt == LUA_VSHRSTR);
+  for (;;) {  /* check whether 'key' is somewhere in the chain */
+    if (keyisshrstr(n) && eqshrstr(keystrval(n), key))
+      return gval(n);  /* that's it */
+    else {
+      int nx = gnext(n);
+      if (nx == 0)
+        return &absentkey;  /* not found */
+      n += nx;
+    }
+  }
+}
+
+
+const TValue *luaH_getstr (Table *t, TString *key) {
+  if (key->tt == LUA_VSHRSTR)
+    return luaH_getshortstr(t, key);
+  else {  /* for long strings, use generic case */
+    TValue ko;
+    setsvalue(cast(lua_State *, NULL), &ko, key);
+    return getgeneric(t, &ko, 0);
+  }
+}
+
+
+/*
+** main search function
+*/
+const TValue *luaH_get (Table *t, const TValue *key) {
+  switch (ttypetag(key)) {
+    case LUA_VSHRSTR: return luaH_getshortstr(t, tsvalue(key));
+    case LUA_VNUMINT: return luaH_getint(t, ivalue(key));
+    case LUA_VNIL: return &absentkey;
+    case LUA_VNUMFLT: {
+      lua_Integer k;
+      if (luaV_flttointeger(fltvalue(key), &k, F2Ieq)) /* integral index? */
+        return luaH_getint(t, k);  /* use specialized version */
+      /* else... */
+    }  /* FALLTHROUGH */
+    default:
+      return getgeneric(t, key, 0);
+  }
+}
+
+
+/*
+** Finish a raw "set table" operation, where 'slot' is where the value
+** should have been (the result of a previous "get table").
+** Beware: when using this function you probably need to check a GC
+** barrier and invalidate the TM cache.
+*/
+void luaH_finishset (lua_State *L, Table *t, const TValue *key,
+                                   const TValue *slot, TValue *value) {
+  if (isabstkey(slot))
+    luaH_newkey(L, t, key, value);
+  else
+    setobj2t(L, cast(TValue *, slot), value);
+}
+
+
+/*
+** beware: when using this function you probably need to check a GC
+** barrier and invalidate the TM cache.
+*/
+void luaH_set (lua_State *L, Table *t, const TValue *key, TValue *value) {
+  const TValue *slot = luaH_get(t, key);
+  luaH_finishset(L, t, key, slot, value);
+}
+
+
+void luaH_setint (lua_State *L, Table *t, lua_Integer key, TValue *value) {
+  const TValue *p = luaH_getint(t, key);
+  if (isabstkey(p)) {
+    TValue k;
+    setivalue(&k, key);
+    luaH_newkey(L, t, &k, value);
+  }
+  else
+    setobj2t(L, cast(TValue *, p), value);
+}
+
+
+/*
+** Try to find a boundary in the hash part of table 't'. From the
+** caller, we know that 'j' is zero or present and that 'j + 1' is
+** present. We want to find a larger key that is absent from the
+** table, so that we can do a binary search between the two keys to
+** find a boundary. We keep doubling 'j' until we get an absent index.
+** If the doubling would overflow, we try LUA_MAXINTEGER. If it is
+** absent, we are ready for the binary search. ('j', being max integer,
+** is larger or equal to 'i', but it cannot be equal because it is
+** absent while 'i' is present; so 'j > i'.) Otherwise, 'j' is a
+** boundary. ('j + 1' cannot be a present integer key because it is
+** not a valid integer in Lua.)
+*/
+static lua_Unsigned hash_search (Table *t, lua_Unsigned j) {
+  lua_Unsigned i;
+  if (j == 0) j++;  /* the caller ensures 'j + 1' is present */
+  do {
+    i = j;  /* 'i' is a present index */
+    if (j <= l_castS2U(LUA_MAXINTEGER) / 2)
+      j *= 2;
+    else {
+      j = LUA_MAXINTEGER;
+      if (isempty(luaH_getint(t, j)))  /* t[j] not present? */
+        break;  /* 'j' now is an absent index */
+      else  /* weird case */
+        return j;  /* well, max integer is a boundary... */
+    }
+  } while (!isempty(luaH_getint(t, j)));  /* repeat until an absent t[j] */
+  /* i < j  &&  t[i] present  &&  t[j] absent */
+  while (j - i > 1u) {  /* do a binary search between them */
+    lua_Unsigned m = (i + j) / 2;
+    if (isempty(luaH_getint(t, m))) j = m;
+    else i = m;
+  }
+  return i;
+}
+
+
+static unsigned int binsearch (const TValue *array, unsigned int i,
+                                                    unsigned int j) {
+  while (j - i > 1u) {  /* binary search */
+    unsigned int m = (i + j) / 2;
+    if (isempty(&array[m - 1])) j = m;
+    else i = m;
+  }
+  return i;
+}
+
+
+/*
+** Try to find a boundary in table 't'. (A 'boundary' is an integer index
+** such that t[i] is present and t[i+1] is absent, or 0 if t[1] is absent
+** and 'maxinteger' if t[maxinteger] is present.)
+** (In the next explanation, we use Lua indices, that is, with base 1.
+** The code itself uses base 0 when indexing the array part of the table.)
+** The code starts with 'limit = t->alimit', a position in the array
+** part that may be a boundary.
+**
+** (1) If 't[limit]' is empty, there must be a boundary before it.
+** As a common case (e.g., after 't[#t]=nil'), check whether 'limit-1'
+** is present. If so, it is a boundary. Otherwise, do a binary search
+** between 0 and limit to find a boundary. In both cases, try to
+** use this boundary as the new 'alimit', as a hint for the next call.
+**
+** (2) If 't[limit]' is not empty and the array has more elements
+** after 'limit', try to find a boundary there. Again, try first
+** the special case (which should be quite frequent) where 'limit+1'
+** is empty, so that 'limit' is a boundary. Otherwise, check the
+** last element of the array part. If it is empty, there must be a
+** boundary between the old limit (present) and the last element
+** (absent), which is found with a binary search. (This boundary always
+** can be a new limit.)
+**
+** (3) The last case is when there are no elements in the array part
+** (limit == 0) or its last element (the new limit) is present.
+** In this case, must check the hash part. If there is no hash part
+** or 'limit+1' is absent, 'limit' is a boundary.  Otherwise, call
+** 'hash_search' to find a boundary in the hash part of the table.
+** (In those cases, the boundary is not inside the array part, and
+** therefore cannot be used as a new limit.)
+*/
+lua_Unsigned luaH_getn (Table *t) {
+  unsigned int limit = t->alimit;
+  if (limit > 0 && isempty(&t->array[limit - 1])) {  /* (1)? */
+    /* there must be a boundary before 'limit' */
+    if (limit >= 2 && !isempty(&t->array[limit - 2])) {
+      /* 'limit - 1' is a boundary; can it be a new limit? */
+      if (ispow2realasize(t) && !ispow2(limit - 1)) {
+        t->alimit = limit - 1;
+        setnorealasize(t);  /* now 'alimit' is not the real size */
+      }
+      return limit - 1;
+    }
+    else {  /* must search for a boundary in [0, limit] */
+      unsigned int boundary = binsearch(t->array, 0, limit);
+      /* can this boundary represent the real size of the array? */
+      if (ispow2realasize(t) && boundary > luaH_realasize(t) / 2) {
+        t->alimit = boundary;  /* use it as the new limit */
+        setnorealasize(t);
+      }
+      return boundary;
+    }
+  }
+  /* 'limit' is zero or present in table */
+  if (!limitequalsasize(t)) {  /* (2)? */
+    /* 'limit' > 0 and array has more elements after 'limit' */
+    if (isempty(&t->array[limit]))  /* 'limit + 1' is empty? */
+      return limit;  /* this is the boundary */
+    /* else, try last element in the array */
+    limit = luaH_realasize(t);
+    if (isempty(&t->array[limit - 1])) {  /* empty? */
+      /* there must be a boundary in the array after old limit,
+         and it must be a valid new limit */
+      unsigned int boundary = binsearch(t->array, t->alimit, limit);
+      t->alimit = boundary;
+      return boundary;
+    }
+    /* else, new limit is present in the table; check the hash part */
+  }
+  /* (3) 'limit' is the last element and either is zero or present in table */
+  lua_assert(limit == luaH_realasize(t) &&
+             (limit == 0 || !isempty(&t->array[limit - 1])));
+  if (isdummy(t) || isempty(luaH_getint(t, cast(lua_Integer, limit + 1))))
+    return limit;  /* 'limit + 1' is absent */
+  else  /* 'limit + 1' is also present */
+    return hash_search(t, limit);
+}
+
+
+
+#if defined(LUA_DEBUG)
+
+/* export these functions for the test library */
+
+Node *luaH_mainposition (const Table *t, const TValue *key) {
+  return mainpositionTV(t, key);
+}
+
+#endif
diff --git a/src/libs/3rdparty/lua/src/ltable.h b/src/libs/3rdparty/lua/src/ltable.h
new file mode 100644
index 0000000000..75dd9e26e0
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/ltable.h
@@ -0,0 +1,65 @@
+/*
+** $Id: ltable.h $
+** Lua tables (hash)
+** See Copyright Notice in lua.h
+*/
+
+#ifndef ltable_h
+#define ltable_h
+
+#include "lobject.h"
+
+
+#define gnode(t,i)	(&(t)->node[i])
+#define gval(n)		(&(n)->i_val)
+#define gnext(n)	((n)->u.next)
+
+
+/*
+** Clear all bits of fast-access metamethods, which means that the table
+** may have any of these metamethods. (First access that fails after the
+** clearing will set the bit again.)
+*/
+#define invalidateTMcache(t)	((t)->flags &= ~maskflags)
+
+
+/* true when 't' is using 'dummynode' as its hash part */
+#define isdummy(t)		((t)->lastfree == NULL)
+
+
+/* allocated size for hash nodes */
+#define allocsizenode(t)	(isdummy(t) ? 0 : sizenode(t))
+
+
+/* returns the Node, given the value of a table entry */
+#define nodefromval(v)	cast(Node *, (v))
+
+
+LUAI_FUNC const TValue *luaH_getint (Table *t, lua_Integer key);
+LUAI_FUNC void luaH_setint (lua_State *L, Table *t, lua_Integer key,
+                                                    TValue *value);
+LUAI_FUNC const TValue *luaH_getshortstr (Table *t, TString *key);
+LUAI_FUNC const TValue *luaH_getstr (Table *t, TString *key);
+LUAI_FUNC const TValue *luaH_get (Table *t, const TValue *key);
+LUAI_FUNC void luaH_newkey (lua_State *L, Table *t, const TValue *key,
+                                                    TValue *value);
+LUAI_FUNC void luaH_set (lua_State *L, Table *t, const TValue *key,
+                                                 TValue *value);
+LUAI_FUNC void luaH_finishset (lua_State *L, Table *t, const TValue *key,
+                                       const TValue *slot, TValue *value);
+LUAI_FUNC Table *luaH_new (lua_State *L);
+LUAI_FUNC void luaH_resize (lua_State *L, Table *t, unsigned int nasize,
+                                                    unsigned int nhsize);
+LUAI_FUNC void luaH_resizearray (lua_State *L, Table *t, unsigned int nasize);
+LUAI_FUNC void luaH_free (lua_State *L, Table *t);
+LUAI_FUNC int luaH_next (lua_State *L, Table *t, StkId key);
+LUAI_FUNC lua_Unsigned luaH_getn (Table *t);
+LUAI_FUNC unsigned int luaH_realasize (const Table *t);
+
+
+#if defined(LUA_DEBUG)
+LUAI_FUNC Node *luaH_mainposition (const Table *t, const TValue *key);
+#endif
+
+
+#endif
diff --git a/src/libs/3rdparty/lua/src/ltablib.c b/src/libs/3rdparty/lua/src/ltablib.c
new file mode 100644
index 0000000000..e6bc4d04af
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/ltablib.c
@@ -0,0 +1,430 @@
+/*
+** $Id: ltablib.c $
+** Library for Table Manipulation
+** See Copyright Notice in lua.h
+*/
+
+#define ltablib_c
+#define LUA_LIB
+
+#include "lprefix.h"
+
+
+#include <limits.h>
+#include <stddef.h>
+#include <string.h>
+
+#include "lua.h"
+
+#include "lauxlib.h"
+#include "lualib.h"
+
+
+/*
+** Operations that an object must define to mimic a table
+** (some functions only need some of them)
+*/
+#define TAB_R	1			/* read */
+#define TAB_W	2			/* write */
+#define TAB_L	4			/* length */
+#define TAB_RW	(TAB_R | TAB_W)		/* read/write */
+
+
+#define aux_getn(L,n,w)	(checktab(L, n, (w) | TAB_L), luaL_len(L, n))
+
+
+static int checkfield (lua_State *L, const char *key, int n) {
+  lua_pushstring(L, key);
+  return (lua_rawget(L, -n) != LUA_TNIL);
+}
+
+
+/*
+** Check that 'arg' either is a table or can behave like one (that is,
+** has a metatable with the required metamethods)
+*/
+static void checktab (lua_State *L, int arg, int what) {
+  if (lua_type(L, arg) != LUA_TTABLE) {  /* is it not a table? */
+    int n = 1;  /* number of elements to pop */
+    if (lua_getmetatable(L, arg) &&  /* must have metatable */
+        (!(what & TAB_R) || checkfield(L, "__index", ++n)) &&
+        (!(what & TAB_W) || checkfield(L, "__newindex", ++n)) &&
+        (!(what & TAB_L) || checkfield(L, "__len", ++n))) {
+      lua_pop(L, n);  /* pop metatable and tested metamethods */
+    }
+    else
+      luaL_checktype(L, arg, LUA_TTABLE);  /* force an error */
+  }
+}
+
+
+static int tinsert (lua_State *L) {
+  lua_Integer pos;  /* where to insert new element */
+  lua_Integer e = aux_getn(L, 1, TAB_RW);
+  e = luaL_intop(+, e, 1);  /* first empty element */
+  switch (lua_gettop(L)) {
+    case 2: {  /* called with only 2 arguments */
+      pos = e;  /* insert new element at the end */
+      break;
+    }
+    case 3: {
+      lua_Integer i;
+      pos = luaL_checkinteger(L, 2);  /* 2nd argument is the position */
+      /* check whether 'pos' is in [1, e] */
+      luaL_argcheck(L, (lua_Unsigned)pos - 1u < (lua_Unsigned)e, 2,
+                       "position out of bounds");
+      for (i = e; i > pos; i--) {  /* move up elements */
+        lua_geti(L, 1, i - 1);
+        lua_seti(L, 1, i);  /* t[i] = t[i - 1] */
+      }
+      break;
+    }
+    default: {
+      return luaL_error(L, "wrong number of arguments to 'insert'");
+    }
+  }
+  lua_seti(L, 1, pos);  /* t[pos] = v */
+  return 0;
+}
+
+
+static int tremove (lua_State *L) {
+  lua_Integer size = aux_getn(L, 1, TAB_RW);
+  lua_Integer pos = luaL_optinteger(L, 2, size);
+  if (pos != size)  /* validate 'pos' if given */
+    /* check whether 'pos' is in [1, size + 1] */
+    luaL_argcheck(L, (lua_Unsigned)pos - 1u <= (lua_Unsigned)size, 2,
+                     "position out of bounds");
+  lua_geti(L, 1, pos);  /* result = t[pos] */
+  for ( ; pos < size; pos++) {
+    lua_geti(L, 1, pos + 1);
+    lua_seti(L, 1, pos);  /* t[pos] = t[pos + 1] */
+  }
+  lua_pushnil(L);
+  lua_seti(L, 1, pos);  /* remove entry t[pos] */
+  return 1;
+}
+
+
+/*
+** Copy elements (1[f], ..., 1[e]) into (tt[t], tt[t+1], ...). Whenever
+** possible, copy in increasing order, which is better for rehashing.
+** "possible" means destination after original range, or smaller
+** than origin, or copying to another table.
+*/
+static int tmove (lua_State *L) {
+  lua_Integer f = luaL_checkinteger(L, 2);
+  lua_Integer e = luaL_checkinteger(L, 3);
+  lua_Integer t = luaL_checkinteger(L, 4);
+  int tt = !lua_isnoneornil(L, 5) ? 5 : 1;  /* destination table */
+  checktab(L, 1, TAB_R);
+  checktab(L, tt, TAB_W);
+  if (e >= f) {  /* otherwise, nothing to move */
+    lua_Integer n, i;
+    luaL_argcheck(L, f > 0 || e < LUA_MAXINTEGER + f, 3,
+                  "too many elements to move");
+    n = e - f + 1;  /* number of elements to move */
+    luaL_argcheck(L, t <= LUA_MAXINTEGER - n + 1, 4,
+                  "destination wrap around");
+    if (t > e || t <= f || (tt != 1 && !lua_compare(L, 1, tt, LUA_OPEQ))) {
+      for (i = 0; i < n; i++) {
+        lua_geti(L, 1, f + i);
+        lua_seti(L, tt, t + i);
+      }
+    }
+    else {
+      for (i = n - 1; i >= 0; i--) {
+        lua_geti(L, 1, f + i);
+        lua_seti(L, tt, t + i);
+      }
+    }
+  }
+  lua_pushvalue(L, tt);  /* return destination table */
+  return 1;
+}
+
+
+static void addfield (lua_State *L, luaL_Buffer *b, lua_Integer i) {
+  lua_geti(L, 1, i);
+  if (l_unlikely(!lua_isstring(L, -1)))
+    luaL_error(L, "invalid value (%s) at index %I in table for 'concat'",
+                  luaL_typename(L, -1), (LUAI_UACINT)i);
+  luaL_addvalue(b);
+}
+
+
+static int tconcat (lua_State *L) {
+  luaL_Buffer b;
+  lua_Integer last = aux_getn(L, 1, TAB_R);
+  size_t lsep;
+  const char *sep = luaL_optlstring(L, 2, "", &lsep);
+  lua_Integer i = luaL_optinteger(L, 3, 1);
+  last = luaL_optinteger(L, 4, last);
+  luaL_buffinit(L, &b);
+  for (; i < last; i++) {
+    addfield(L, &b, i);
+    luaL_addlstring(&b, sep, lsep);
+  }
+  if (i == last)  /* add last value (if interval was not empty) */
+    addfield(L, &b, i);
+  luaL_pushresult(&b);
+  return 1;
+}
+
+
+/*
+** {======================================================
+** Pack/unpack
+** =======================================================
+*/
+
+static int tpack (lua_State *L) {
+  int i;
+  int n = lua_gettop(L);  /* number of elements to pack */
+  lua_createtable(L, n, 1);  /* create result table */
+  lua_insert(L, 1);  /* put it at index 1 */
+  for (i = n; i >= 1; i--)  /* assign elements */
+    lua_seti(L, 1, i);
+  lua_pushinteger(L, n);
+  lua_setfield(L, 1, "n");  /* t.n = number of elements */
+  return 1;  /* return table */
+}
+
+
+static int tunpack (lua_State *L) {
+  lua_Unsigned n;
+  lua_Integer i = luaL_optinteger(L, 2, 1);
+  lua_Integer e = luaL_opt(L, luaL_checkinteger, 3, luaL_len(L, 1));
+  if (i > e) return 0;  /* empty range */
+  n = (lua_Unsigned)e - i;  /* number of elements minus 1 (avoid overflows) */
+  if (l_unlikely(n >= (unsigned int)INT_MAX  ||
+                 !lua_checkstack(L, (int)(++n))))
+    return luaL_error(L, "too many results to unpack");
+  for (; i < e; i++) {  /* push arg[i..e - 1] (to avoid overflows) */
+    lua_geti(L, 1, i);
+  }
+  lua_geti(L, 1, e);  /* push last element */
+  return (int)n;
+}
+
+/* }====================================================== */
+
+
+
+/*
+** {======================================================
+** Quicksort
+** (based on 'Algorithms in MODULA-3', Robert Sedgewick;
+**  Addison-Wesley, 1993.)
+** =======================================================
+*/
+
+
+/* type for array indices */
+typedef unsigned int IdxT;
+
+
+/*
+** Produce a "random" 'unsigned int' to randomize pivot choice. This
+** macro is used only when 'sort' detects a big imbalance in the result
+** of a partition. (If you don't want/need this "randomness", ~0 is a
+** good choice.)
+*/
+#if !defined(l_randomizePivot)		/* { */
+
+#include <time.h>
+
+/* size of 'e' measured in number of 'unsigned int's */
+#define sof(e)		(sizeof(e) / sizeof(unsigned int))
+
+/*
+** Use 'time' and 'clock' as sources of "randomness". Because we don't
+** know the types 'clock_t' and 'time_t', we cannot cast them to
+** anything without risking overflows. A safe way to use their values
+** is to copy them to an array of a known type and use the array values.
+*/
+static unsigned int l_randomizePivot (void) {
+  clock_t c = clock();
+  time_t t = time(NULL);
+  unsigned int buff[sof(c) + sof(t)];
+  unsigned int i, rnd = 0;
+  memcpy(buff, &c, sof(c) * sizeof(unsigned int));
+  memcpy(buff + sof(c), &t, sof(t) * sizeof(unsigned int));
+  for (i = 0; i < sof(buff); i++)
+    rnd += buff[i];
+  return rnd;
+}
+
+#endif					/* } */
+
+
+/* arrays larger than 'RANLIMIT' may use randomized pivots */
+#define RANLIMIT	100u
+
+
+static void set2 (lua_State *L, IdxT i, IdxT j) {
+  lua_seti(L, 1, i);
+  lua_seti(L, 1, j);
+}
+
+
+/*
+** Return true iff value at stack index 'a' is less than the value at
+** index 'b' (according to the order of the sort).
+*/
+static int sort_comp (lua_State *L, int a, int b) {
+  if (lua_isnil(L, 2))  /* no function? */
+    return lua_compare(L, a, b, LUA_OPLT);  /* a < b */
+  else {  /* function */
+    int res;
+    lua_pushvalue(L, 2);    /* push function */
+    lua_pushvalue(L, a-1);  /* -1 to compensate function */
+    lua_pushvalue(L, b-2);  /* -2 to compensate function and 'a' */
+    lua_call(L, 2, 1);      /* call function */
+    res = lua_toboolean(L, -1);  /* get result */
+    lua_pop(L, 1);          /* pop result */
+    return res;
+  }
+}
+
+
+/*
+** Does the partition: Pivot P is at the top of the stack.
+** precondition: a[lo] <= P == a[up-1] <= a[up],
+** so it only needs to do the partition from lo + 1 to up - 2.
+** Pos-condition: a[lo .. i - 1] <= a[i] == P <= a[i + 1 .. up]
+** returns 'i'.
+*/
+static IdxT partition (lua_State *L, IdxT lo, IdxT up) {
+  IdxT i = lo;  /* will be incremented before first use */
+  IdxT j = up - 1;  /* will be decremented before first use */
+  /* loop invariant: a[lo .. i] <= P <= a[j .. up] */
+  for (;;) {
+    /* next loop: repeat ++i while a[i] < P */
+    while ((void)lua_geti(L, 1, ++i), sort_comp(L, -1, -2)) {
+      if (l_unlikely(i == up - 1))  /* a[i] < P  but a[up - 1] == P  ?? */
+        luaL_error(L, "invalid order function for sorting");
+      lua_pop(L, 1);  /* remove a[i] */
+    }
+    /* after the loop, a[i] >= P and a[lo .. i - 1] < P */
+    /* next loop: repeat --j while P < a[j] */
+    while ((void)lua_geti(L, 1, --j), sort_comp(L, -3, -1)) {
+      if (l_unlikely(j < i))  /* j < i  but  a[j] > P ?? */
+        luaL_error(L, "invalid order function for sorting");
+      lua_pop(L, 1);  /* remove a[j] */
+    }
+    /* after the loop, a[j] <= P and a[j + 1 .. up] >= P */
+    if (j < i) {  /* no elements out of place? */
+      /* a[lo .. i - 1] <= P <= a[j + 1 .. i .. up] */
+      lua_pop(L, 1);  /* pop a[j] */
+      /* swap pivot (a[up - 1]) with a[i] to satisfy pos-condition */
+      set2(L, up - 1, i);
+      return i;
+    }
+    /* otherwise, swap a[i] - a[j] to restore invariant and repeat */
+    set2(L, i, j);
+  }
+}
+
+
+/*
+** Choose an element in the middle (2nd-3th quarters) of [lo,up]
+** "randomized" by 'rnd'
+*/
+static IdxT choosePivot (IdxT lo, IdxT up, unsigned int rnd) {
+  IdxT r4 = (up - lo) / 4;  /* range/4 */
+  IdxT p = rnd % (r4 * 2) + (lo + r4);
+  lua_assert(lo + r4 <= p && p <= up - r4);
+  return p;
+}
+
+
+/*
+** Quicksort algorithm (recursive function)
+*/
+static void auxsort (lua_State *L, IdxT lo, IdxT up,
+                                   unsigned int rnd) {
+  while (lo < up) {  /* loop for tail recursion */
+    IdxT p;  /* Pivot index */
+    IdxT n;  /* to be used later */
+    /* sort elements 'lo', 'p', and 'up' */
+    lua_geti(L, 1, lo);
+    lua_geti(L, 1, up);
+    if (sort_comp(L, -1, -2))  /* a[up] < a[lo]? */
+      set2(L, lo, up);  /* swap a[lo] - a[up] */
+    else
+      lua_pop(L, 2);  /* remove both values */
+    if (up - lo == 1)  /* only 2 elements? */
+      return;  /* already sorted */
+    if (up - lo < RANLIMIT || rnd == 0)  /* small interval or no randomize? */
+      p = (lo + up)/2;  /* middle element is a good pivot */
+    else  /* for larger intervals, it is worth a random pivot */
+      p = choosePivot(lo, up, rnd);
+    lua_geti(L, 1, p);
+    lua_geti(L, 1, lo);
+    if (sort_comp(L, -2, -1))  /* a[p] < a[lo]? */
+      set2(L, p, lo);  /* swap a[p] - a[lo] */
+    else {
+      lua_pop(L, 1);  /* remove a[lo] */
+      lua_geti(L, 1, up);
+      if (sort_comp(L, -1, -2))  /* a[up] < a[p]? */
+        set2(L, p, up);  /* swap a[up] - a[p] */
+      else
+        lua_pop(L, 2);
+    }
+    if (up - lo == 2)  /* only 3 elements? */
+      return;  /* already sorted */
+    lua_geti(L, 1, p);  /* get middle element (Pivot) */
+    lua_pushvalue(L, -1);  /* push Pivot */
+    lua_geti(L, 1, up - 1);  /* push a[up - 1] */
+    set2(L, p, up - 1);  /* swap Pivot (a[p]) with a[up - 1] */
+    p = partition(L, lo, up);
+    /* a[lo .. p - 1] <= a[p] == P <= a[p + 1 .. up] */
+    if (p - lo < up - p) {  /* lower interval is smaller? */
+      auxsort(L, lo, p - 1, rnd);  /* call recursively for lower interval */
+      n = p - lo;  /* size of smaller interval */
+      lo = p + 1;  /* tail call for [p + 1 .. up] (upper interval) */
+    }
+    else {
+      auxsort(L, p + 1, up, rnd);  /* call recursively for upper interval */
+      n = up - p;  /* size of smaller interval */
+      up = p - 1;  /* tail call for [lo .. p - 1]  (lower interval) */
+    }
+    if ((up - lo) / 128 > n) /* partition too imbalanced? */
+      rnd = l_randomizePivot();  /* try a new randomization */
+  }  /* tail call auxsort(L, lo, up, rnd) */
+}
+
+
+static int sort (lua_State *L) {
+  lua_Integer n = aux_getn(L, 1, TAB_RW);
+  if (n > 1) {  /* non-trivial interval? */
+    luaL_argcheck(L, n < INT_MAX, 1, "array too big");
+    if (!lua_isnoneornil(L, 2))  /* is there a 2nd argument? */
+      luaL_checktype(L, 2, LUA_TFUNCTION);  /* must be a function */
+    lua_settop(L, 2);  /* make sure there are two arguments */
+    auxsort(L, 1, (IdxT)n, 0);
+  }
+  return 0;
+}
+
+/* }====================================================== */
+
+
+static const luaL_Reg tab_funcs[] = {
+  {"concat", tconcat},
+  {"insert", tinsert},
+  {"pack", tpack},
+  {"unpack", tunpack},
+  {"remove", tremove},
+  {"move", tmove},
+  {"sort", sort},
+  {NULL, NULL}
+};
+
+
+LUAMOD_API int luaopen_table (lua_State *L) {
+  luaL_newlib(L, tab_funcs);
+  return 1;
+}
+
diff --git a/src/libs/3rdparty/lua/src/ltm.c b/src/libs/3rdparty/lua/src/ltm.c
new file mode 100644
index 0000000000..07a060811d
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/ltm.c
@@ -0,0 +1,271 @@
+/*
+** $Id: ltm.c $
+** Tag methods
+** See Copyright Notice in lua.h
+*/
+
+#define ltm_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include <string.h>
+
+#include "lua.h"
+
+#include "ldebug.h"
+#include "ldo.h"
+#include "lgc.h"
+#include "lobject.h"
+#include "lstate.h"
+#include "lstring.h"
+#include "ltable.h"
+#include "ltm.h"
+#include "lvm.h"
+
+
+static const char udatatypename[] = "userdata";
+
+LUAI_DDEF const char *const luaT_typenames_[LUA_TOTALTYPES] = {
+  "no value",
+  "nil", "boolean", udatatypename, "number",
+  "string", "table", "function", udatatypename, "thread",
+  "upvalue", "proto" /* these last cases are used for tests only */
+};
+
+
+void luaT_init (lua_State *L) {
+  static const char *const luaT_eventname[] = {  /* ORDER TM */
+    "__index", "__newindex",
+    "__gc", "__mode", "__len", "__eq",
+    "__add", "__sub", "__mul", "__mod", "__pow",
+    "__div", "__idiv",
+    "__band", "__bor", "__bxor", "__shl", "__shr",
+    "__unm", "__bnot", "__lt", "__le",
+    "__concat", "__call", "__close"
+  };
+  int i;
+  for (i=0; i<TM_N; i++) {
+    G(L)->tmname[i] = luaS_new(L, luaT_eventname[i]);
+    luaC_fix(L, obj2gco(G(L)->tmname[i]));  /* never collect these names */
+  }
+}
+
+
+/*
+** function to be used with macro "fasttm": optimized for absence of
+** tag methods
+*/
+const TValue *luaT_gettm (Table *events, TMS event, TString *ename) {
+  const TValue *tm = luaH_getshortstr(events, ename);
+  lua_assert(event <= TM_EQ);
+  if (notm(tm)) {  /* no tag method? */
+    events->flags |= cast_byte(1u<<event);  /* cache this fact */
+    return NULL;
+  }
+  else return tm;
+}
+
+
+const TValue *luaT_gettmbyobj (lua_State *L, const TValue *o, TMS event) {
+  Table *mt;
+  switch (ttype(o)) {
+    case LUA_TTABLE:
+      mt = hvalue(o)->metatable;
+      break;
+    case LUA_TUSERDATA:
+      mt = uvalue(o)->metatable;
+      break;
+    default:
+      mt = G(L)->mt[ttype(o)];
+  }
+  return (mt ? luaH_getshortstr(mt, G(L)->tmname[event]) : &G(L)->nilvalue);
+}
+
+
+/*
+** Return the name of the type of an object. For tables and userdata
+** with metatable, use their '__name' metafield, if present.
+*/
+const char *luaT_objtypename (lua_State *L, const TValue *o) {
+  Table *mt;
+  if ((ttistable(o) && (mt = hvalue(o)->metatable) != NULL) ||
+      (ttisfulluserdata(o) && (mt = uvalue(o)->metatable) != NULL)) {
+    const TValue *name = luaH_getshortstr(mt, luaS_new(L, "__name"));
+    if (ttisstring(name))  /* is '__name' a string? */
+      return getstr(tsvalue(name));  /* use it as type name */
+  }
+  return ttypename(ttype(o));  /* else use standard type name */
+}
+
+
+void luaT_callTM (lua_State *L, const TValue *f, const TValue *p1,
+                  const TValue *p2, const TValue *p3) {
+  StkId func = L->top.p;
+  setobj2s(L, func, f);  /* push function (assume EXTRA_STACK) */
+  setobj2s(L, func + 1, p1);  /* 1st argument */
+  setobj2s(L, func + 2, p2);  /* 2nd argument */
+  setobj2s(L, func + 3, p3);  /* 3rd argument */
+  L->top.p = func + 4;
+  /* metamethod may yield only when called from Lua code */
+  if (isLuacode(L->ci))
+    luaD_call(L, func, 0);
+  else
+    luaD_callnoyield(L, func, 0);
+}
+
+
+void luaT_callTMres (lua_State *L, const TValue *f, const TValue *p1,
+                     const TValue *p2, StkId res) {
+  ptrdiff_t result = savestack(L, res);
+  StkId func = L->top.p;
+  setobj2s(L, func, f);  /* push function (assume EXTRA_STACK) */
+  setobj2s(L, func + 1, p1);  /* 1st argument */
+  setobj2s(L, func + 2, p2);  /* 2nd argument */
+  L->top.p += 3;
+  /* metamethod may yield only when called from Lua code */
+  if (isLuacode(L->ci))
+    luaD_call(L, func, 1);
+  else
+    luaD_callnoyield(L, func, 1);
+  res = restorestack(L, result);
+  setobjs2s(L, res, --L->top.p);  /* move result to its place */
+}
+
+
+static int callbinTM (lua_State *L, const TValue *p1, const TValue *p2,
+                      StkId res, TMS event) {
+  const TValue *tm = luaT_gettmbyobj(L, p1, event);  /* try first operand */
+  if (notm(tm))
+    tm = luaT_gettmbyobj(L, p2, event);  /* try second operand */
+  if (notm(tm)) return 0;
+  luaT_callTMres(L, tm, p1, p2, res);
+  return 1;
+}
+
+
+void luaT_trybinTM (lua_State *L, const TValue *p1, const TValue *p2,
+                    StkId res, TMS event) {
+  if (l_unlikely(!callbinTM(L, p1, p2, res, event))) {
+    switch (event) {
+      case TM_BAND: case TM_BOR: case TM_BXOR:
+      case TM_SHL: case TM_SHR: case TM_BNOT: {
+        if (ttisnumber(p1) && ttisnumber(p2))
+          luaG_tointerror(L, p1, p2);
+        else
+          luaG_opinterror(L, p1, p2, "perform bitwise operation on");
+      }
+      /* calls never return, but to avoid warnings: *//* FALLTHROUGH */
+      default:
+        luaG_opinterror(L, p1, p2, "perform arithmetic on");
+    }
+  }
+}
+
+
+void luaT_tryconcatTM (lua_State *L) {
+  StkId top = L->top.p;
+  if (l_unlikely(!callbinTM(L, s2v(top - 2), s2v(top - 1), top - 2,
+                               TM_CONCAT)))
+    luaG_concaterror(L, s2v(top - 2), s2v(top - 1));
+}
+
+
+void luaT_trybinassocTM (lua_State *L, const TValue *p1, const TValue *p2,
+                                       int flip, StkId res, TMS event) {
+  if (flip)
+    luaT_trybinTM(L, p2, p1, res, event);
+  else
+    luaT_trybinTM(L, p1, p2, res, event);
+}
+
+
+void luaT_trybiniTM (lua_State *L, const TValue *p1, lua_Integer i2,
+                                   int flip, StkId res, TMS event) {
+  TValue aux;
+  setivalue(&aux, i2);
+  luaT_trybinassocTM(L, p1, &aux, flip, res, event);
+}
+
+
+/*
+** Calls an order tag method.
+** For lessequal, LUA_COMPAT_LT_LE keeps compatibility with old
+** behavior: if there is no '__le', try '__lt', based on l <= r iff
+** !(r < l) (assuming a total order). If the metamethod yields during
+** this substitution, the continuation has to know about it (to negate
+** the result of r<l); bit CIST_LEQ in the call status keeps that
+** information.
+*/
+int luaT_callorderTM (lua_State *L, const TValue *p1, const TValue *p2,
+                      TMS event) {
+  if (callbinTM(L, p1, p2, L->top.p, event))  /* try original event */
+    return !l_isfalse(s2v(L->top.p));
+#if defined(LUA_COMPAT_LT_LE)
+  else if (event == TM_LE) {
+      /* try '!(p2 < p1)' for '(p1 <= p2)' */
+      L->ci->callstatus |= CIST_LEQ;  /* mark it is doing 'lt' for 'le' */
+      if (callbinTM(L, p2, p1, L->top.p, TM_LT)) {
+        L->ci->callstatus ^= CIST_LEQ;  /* clear mark */
+        return l_isfalse(s2v(L->top.p));
+      }
+      /* else error will remove this 'ci'; no need to clear mark */
+  }
+#endif
+  luaG_ordererror(L, p1, p2);  /* no metamethod found */
+  return 0;  /* to avoid warnings */
+}
+
+
+int luaT_callorderiTM (lua_State *L, const TValue *p1, int v2,
+                       int flip, int isfloat, TMS event) {
+  TValue aux; const TValue *p2;
+  if (isfloat) {
+    setfltvalue(&aux, cast_num(v2));
+  }
+  else
+    setivalue(&aux, v2);
+  if (flip) {  /* arguments were exchanged? */
+    p2 = p1; p1 = &aux;  /* correct them */
+  }
+  else
+    p2 = &aux;
+  return luaT_callorderTM(L, p1, p2, event);
+}
+
+
+void luaT_adjustvarargs (lua_State *L, int nfixparams, CallInfo *ci,
+                         const Proto *p) {
+  int i;
+  int actual = cast_int(L->top.p - ci->func.p) - 1;  /* number of arguments */
+  int nextra = actual - nfixparams;  /* number of extra arguments */
+  ci->u.l.nextraargs = nextra;
+  luaD_checkstack(L, p->maxstacksize + 1);
+  /* copy function to the top of the stack */
+  setobjs2s(L, L->top.p++, ci->func.p);
+  /* move fixed parameters to the top of the stack */
+  for (i = 1; i <= nfixparams; i++) {
+    setobjs2s(L, L->top.p++, ci->func.p + i);
+    setnilvalue(s2v(ci->func.p + i));  /* erase original parameter (for GC) */
+  }
+  ci->func.p += actual + 1;
+  ci->top.p += actual + 1;
+  lua_assert(L->top.p <= ci->top.p && ci->top.p <= L->stack_last.p);
+}
+
+
+void luaT_getvarargs (lua_State *L, CallInfo *ci, StkId where, int wanted) {
+  int i;
+  int nextra = ci->u.l.nextraargs;
+  if (wanted < 0) {
+    wanted = nextra;  /* get all extra arguments available */
+    checkstackGCp(L, nextra, where);  /* ensure stack space */
+    L->top.p = where + nextra;  /* next instruction will need top */
+  }
+  for (i = 0; i < wanted && i < nextra; i++)
+    setobjs2s(L, where + i, ci->func.p - nextra + i);
+  for (; i < wanted; i++)   /* complete required results with nil */
+    setnilvalue(s2v(where + i));
+}
+
diff --git a/src/libs/3rdparty/lua/src/ltm.h b/src/libs/3rdparty/lua/src/ltm.h
new file mode 100644
index 0000000000..c309e2ae10
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/ltm.h
@@ -0,0 +1,104 @@
+/*
+** $Id: ltm.h $
+** Tag methods
+** See Copyright Notice in lua.h
+*/
+
+#ifndef ltm_h
+#define ltm_h
+
+
+#include "lobject.h"
+#include "lstate.h"
+
+
+/*
+* WARNING: if you change the order of this enumeration,
+* grep "ORDER TM" and "ORDER OP"
+*/
+typedef enum {
+  TM_INDEX,
+  TM_NEWINDEX,
+  TM_GC,
+  TM_MODE,
+  TM_LEN,
+  TM_EQ,  /* last tag method with fast access */
+  TM_ADD,
+  TM_SUB,
+  TM_MUL,
+  TM_MOD,
+  TM_POW,
+  TM_DIV,
+  TM_IDIV,
+  TM_BAND,
+  TM_BOR,
+  TM_BXOR,
+  TM_SHL,
+  TM_SHR,
+  TM_UNM,
+  TM_BNOT,
+  TM_LT,
+  TM_LE,
+  TM_CONCAT,
+  TM_CALL,
+  TM_CLOSE,
+  TM_N		/* number of elements in the enum */
+} TMS;
+
+
+/*
+** Mask with 1 in all fast-access methods. A 1 in any of these bits
+** in the flag of a (meta)table means the metatable does not have the
+** corresponding metamethod field. (Bit 7 of the flag is used for
+** 'isrealasize'.)
+*/
+#define maskflags	(~(~0u << (TM_EQ + 1)))
+
+
+/*
+** Test whether there is no tagmethod.
+** (Because tagmethods use raw accesses, the result may be an "empty" nil.)
+*/
+#define notm(tm)	ttisnil(tm)
+
+
+#define gfasttm(g,et,e) ((et) == NULL ? NULL : \
+  ((et)->flags & (1u<<(e))) ? NULL : luaT_gettm(et, e, (g)->tmname[e]))
+
+#define fasttm(l,et,e)	gfasttm(G(l), et, e)
+
+#define ttypename(x)	luaT_typenames_[(x) + 1]
+
+LUAI_DDEC(const char *const luaT_typenames_[LUA_TOTALTYPES];)
+
+
+LUAI_FUNC const char *luaT_objtypename (lua_State *L, const TValue *o);
+
+LUAI_FUNC const TValue *luaT_gettm (Table *events, TMS event, TString *ename);
+LUAI_FUNC const TValue *luaT_gettmbyobj (lua_State *L, const TValue *o,
+                                                       TMS event);
+LUAI_FUNC void luaT_init (lua_State *L);
+
+LUAI_FUNC void luaT_callTM (lua_State *L, const TValue *f, const TValue *p1,
+                            const TValue *p2, const TValue *p3);
+LUAI_FUNC void luaT_callTMres (lua_State *L, const TValue *f,
+                            const TValue *p1, const TValue *p2, StkId p3);
+LUAI_FUNC void luaT_trybinTM (lua_State *L, const TValue *p1, const TValue *p2,
+                              StkId res, TMS event);
+LUAI_FUNC void luaT_tryconcatTM (lua_State *L);
+LUAI_FUNC void luaT_trybinassocTM (lua_State *L, const TValue *p1,
+       const TValue *p2, int inv, StkId res, TMS event);
+LUAI_FUNC void luaT_trybiniTM (lua_State *L, const TValue *p1, lua_Integer i2,
+                               int inv, StkId res, TMS event);
+LUAI_FUNC int luaT_callorderTM (lua_State *L, const TValue *p1,
+                                const TValue *p2, TMS event);
+LUAI_FUNC int luaT_callorderiTM (lua_State *L, const TValue *p1, int v2,
+                                 int inv, int isfloat, TMS event);
+
+LUAI_FUNC void luaT_adjustvarargs (lua_State *L, int nfixparams,
+                                   CallInfo *ci, const Proto *p);
+LUAI_FUNC void luaT_getvarargs (lua_State *L, CallInfo *ci,
+                                              StkId where, int wanted);
+
+
+#endif
diff --git a/src/libs/3rdparty/lua/src/lua.c b/src/libs/3rdparty/lua/src/lua.c
new file mode 100644
index 0000000000..0ff8845453
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lua.c
@@ -0,0 +1,679 @@
+/*
+** $Id: lua.c $
+** Lua stand-alone interpreter
+** See Copyright Notice in lua.h
+*/
+
+#define lua_c
+
+#include "lprefix.h"
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <signal.h>
+
+#include "lua.h"
+
+#include "lauxlib.h"
+#include "lualib.h"
+
+
+#if !defined(LUA_PROGNAME)
+#define LUA_PROGNAME		"lua"
+#endif
+
+#if !defined(LUA_INIT_VAR)
+#define LUA_INIT_VAR		"LUA_INIT"
+#endif
+
+#define LUA_INITVARVERSION	LUA_INIT_VAR LUA_VERSUFFIX
+
+
+static lua_State *globalL = NULL;
+
+static const char *progname = LUA_PROGNAME;
+
+
+#if defined(LUA_USE_POSIX)   /* { */
+
+/*
+** Use 'sigaction' when available.
+*/
+static void setsignal (int sig, void (*handler)(int)) {
+  struct sigaction sa;
+  sa.sa_handler = handler;
+  sa.sa_flags = 0;
+  sigemptyset(&sa.sa_mask);  /* do not mask any signal */
+  sigaction(sig, &sa, NULL);
+}
+
+#else           /* }{ */
+
+#define setsignal            signal
+
+#endif                               /* } */
+
+
+/*
+** Hook set by signal function to stop the interpreter.
+*/
+static void lstop (lua_State *L, lua_Debug *ar) {
+  (void)ar;  /* unused arg. */
+  lua_sethook(L, NULL, 0, 0);  /* reset hook */
+  luaL_error(L, "interrupted!");
+}
+
+
+/*
+** Function to be called at a C signal. Because a C signal cannot
+** just change a Lua state (as there is no proper synchronization),
+** this function only sets a hook that, when called, will stop the
+** interpreter.
+*/
+static void laction (int i) {
+  int flag = LUA_MASKCALL | LUA_MASKRET | LUA_MASKLINE | LUA_MASKCOUNT;
+  setsignal(i, SIG_DFL); /* if another SIGINT happens, terminate process */
+  lua_sethook(globalL, lstop, flag, 1);
+}
+
+
+static void print_usage (const char *badoption) {
+  lua_writestringerror("%s: ", progname);
+  if (badoption[1] == 'e' || badoption[1] == 'l')
+    lua_writestringerror("'%s' needs argument\n", badoption);
+  else
+    lua_writestringerror("unrecognized option '%s'\n", badoption);
+  lua_writestringerror(
+  "usage: %s [options] [script [args]]\n"
+  "Available options are:\n"
+  "  -e stat   execute string 'stat'\n"
+  "  -i        enter interactive mode after executing 'script'\n"
+  "  -l mod    require library 'mod' into global 'mod'\n"
+  "  -l g=mod  require library 'mod' into global 'g'\n"
+  "  -v        show version information\n"
+  "  -E        ignore environment variables\n"
+  "  -W        turn warnings on\n"
+  "  --        stop handling options\n"
+  "  -         stop handling options and execute stdin\n"
+  ,
+  progname);
+}
+
+
+/*
+** Prints an error message, adding the program name in front of it
+** (if present)
+*/
+static void l_message (const char *pname, const char *msg) {
+  if (pname) lua_writestringerror("%s: ", pname);
+  lua_writestringerror("%s\n", msg);
+}
+
+
+/*
+** Check whether 'status' is not OK and, if so, prints the error
+** message on the top of the stack. It assumes that the error object
+** is a string, as it was either generated by Lua or by 'msghandler'.
+*/
+static int report (lua_State *L, int status) {
+  if (status != LUA_OK) {
+    const char *msg = lua_tostring(L, -1);
+    l_message(progname, msg);
+    lua_pop(L, 1);  /* remove message */
+  }
+  return status;
+}
+
+
+/*
+** Message handler used to run all chunks
+*/
+static int msghandler (lua_State *L) {
+  const char *msg = lua_tostring(L, 1);
+  if (msg == NULL) {  /* is error object not a string? */
+    if (luaL_callmeta(L, 1, "__tostring") &&  /* does it have a metamethod */
+        lua_type(L, -1) == LUA_TSTRING)  /* that produces a string? */
+      return 1;  /* that is the message */
+    else
+      msg = lua_pushfstring(L, "(error object is a %s value)",
+                               luaL_typename(L, 1));
+  }
+  luaL_traceback(L, L, msg, 1);  /* append a standard traceback */
+  return 1;  /* return the traceback */
+}
+
+
+/*
+** Interface to 'lua_pcall', which sets appropriate message function
+** and C-signal handler. Used to run all chunks.
+*/
+static int docall (lua_State *L, int narg, int nres) {
+  int status;
+  int base = lua_gettop(L) - narg;  /* function index */
+  lua_pushcfunction(L, msghandler);  /* push message handler */
+  lua_insert(L, base);  /* put it under function and args */
+  globalL = L;  /* to be available to 'laction' */
+  setsignal(SIGINT, laction);  /* set C-signal handler */
+  status = lua_pcall(L, narg, nres, base);
+  setsignal(SIGINT, SIG_DFL); /* reset C-signal handler */
+  lua_remove(L, base);  /* remove message handler from the stack */
+  return status;
+}
+
+
+static void print_version (void) {
+  lua_writestring(LUA_COPYRIGHT, strlen(LUA_COPYRIGHT));
+  lua_writeline();
+}
+
+
+/*
+** Create the 'arg' table, which stores all arguments from the
+** command line ('argv'). It should be aligned so that, at index 0,
+** it has 'argv[script]', which is the script name. The arguments
+** to the script (everything after 'script') go to positive indices;
+** other arguments (before the script name) go to negative indices.
+** If there is no script name, assume interpreter's name as base.
+** (If there is no interpreter's name either, 'script' is -1, so
+** table sizes are zero.)
+*/
+static void createargtable (lua_State *L, char **argv, int argc, int script) {
+  int i, narg;
+  narg = argc - (script + 1);  /* number of positive indices */
+  lua_createtable(L, narg, script + 1);
+  for (i = 0; i < argc; i++) {
+    lua_pushstring(L, argv[i]);
+    lua_rawseti(L, -2, i - script);
+  }
+  lua_setglobal(L, "arg");
+}
+
+
+static int dochunk (lua_State *L, int status) {
+  if (status == LUA_OK) status = docall(L, 0, 0);
+  return report(L, status);
+}
+
+
+static int dofile (lua_State *L, const char *name) {
+  return dochunk(L, luaL_loadfile(L, name));
+}
+
+
+static int dostring (lua_State *L, const char *s, const char *name) {
+  return dochunk(L, luaL_loadbuffer(L, s, strlen(s), name));
+}
+
+
+/*
+** Receives 'globname[=modname]' and runs 'globname = require(modname)'.
+*/
+static int dolibrary (lua_State *L, char *globname) {
+  int status;
+  char *modname = strchr(globname, '=');
+  if (modname == NULL)  /* no explicit name? */
+    modname = globname;  /* module name is equal to global name */
+  else {
+    *modname = '\0';  /* global name ends here */
+    modname++;  /* module name starts after the '=' */
+  }
+  lua_getglobal(L, "require");
+  lua_pushstring(L, modname);
+  status = docall(L, 1, 1);  /* call 'require(modname)' */
+  if (status == LUA_OK)
+    lua_setglobal(L, globname);  /* globname = require(modname) */
+  return report(L, status);
+}
+
+
+/*
+** Push on the stack the contents of table 'arg' from 1 to #arg
+*/
+static int pushargs (lua_State *L) {
+  int i, n;
+  if (lua_getglobal(L, "arg") != LUA_TTABLE)
+    luaL_error(L, "'arg' is not a table");
+  n = (int)luaL_len(L, -1);
+  luaL_checkstack(L, n + 3, "too many arguments to script");
+  for (i = 1; i <= n; i++)
+    lua_rawgeti(L, -i, i);
+  lua_remove(L, -i);  /* remove table from the stack */
+  return n;
+}
+
+
+static int handle_script (lua_State *L, char **argv) {
+  int status;
+  const char *fname = argv[0];
+  if (strcmp(fname, "-") == 0 && strcmp(argv[-1], "--") != 0)
+    fname = NULL;  /* stdin */
+  status = luaL_loadfile(L, fname);
+  if (status == LUA_OK) {
+    int n = pushargs(L);  /* push arguments to script */
+    status = docall(L, n, LUA_MULTRET);
+  }
+  return report(L, status);
+}
+
+
+/* bits of various argument indicators in 'args' */
+#define has_error	1	/* bad option */
+#define has_i		2	/* -i */
+#define has_v		4	/* -v */
+#define has_e		8	/* -e */
+#define has_E		16	/* -E */
+
+
+/*
+** Traverses all arguments from 'argv', returning a mask with those
+** needed before running any Lua code or an error code if it finds any
+** invalid argument. In case of error, 'first' is the index of the bad
+** argument.  Otherwise, 'first' is -1 if there is no program name,
+** 0 if there is no script name, or the index of the script name.
+*/
+static int collectargs (char **argv, int *first) {
+  int args = 0;
+  int i;
+  if (argv[0] != NULL) {  /* is there a program name? */
+    if (argv[0][0])  /* not empty? */
+      progname = argv[0];  /* save it */
+  }
+  else {  /* no program name */
+    *first = -1;
+    return 0;
+  }
+  for (i = 1; argv[i] != NULL; i++) {  /* handle arguments */
+    *first = i;
+    if (argv[i][0] != '-')  /* not an option? */
+        return args;  /* stop handling options */
+    switch (argv[i][1]) {  /* else check option */
+      case '-':  /* '--' */
+        if (argv[i][2] != '\0')  /* extra characters after '--'? */
+          return has_error;  /* invalid option */
+        *first = i + 1;
+        return args;
+      case '\0':  /* '-' */
+        return args;  /* script "name" is '-' */
+      case 'E':
+        if (argv[i][2] != '\0')  /* extra characters? */
+          return has_error;  /* invalid option */
+        args |= has_E;
+        break;
+      case 'W':
+        if (argv[i][2] != '\0')  /* extra characters? */
+          return has_error;  /* invalid option */
+        break;
+      case 'i':
+        args |= has_i;  /* (-i implies -v) *//* FALLTHROUGH */
+      case 'v':
+        if (argv[i][2] != '\0')  /* extra characters? */
+          return has_error;  /* invalid option */
+        args |= has_v;
+        break;
+      case 'e':
+        args |= has_e;  /* FALLTHROUGH */
+      case 'l':  /* both options need an argument */
+        if (argv[i][2] == '\0') {  /* no concatenated argument? */
+          i++;  /* try next 'argv' */
+          if (argv[i] == NULL || argv[i][0] == '-')
+            return has_error;  /* no next argument or it is another option */
+        }
+        break;
+      default:  /* invalid option */
+        return has_error;
+    }
+  }
+  *first = 0;  /* no script name */
+  return args;
+}
+
+
+/*
+** Processes options 'e' and 'l', which involve running Lua code, and
+** 'W', which also affects the state.
+** Returns 0 if some code raises an error.
+*/
+static int runargs (lua_State *L, char **argv, int n) {
+  int i;
+  for (i = 1; i < n; i++) {
+    int option = argv[i][1];
+    lua_assert(argv[i][0] == '-');  /* already checked */
+    switch (option) {
+      case 'e':  case 'l': {
+        int status;
+        char *extra = argv[i] + 2;  /* both options need an argument */
+        if (*extra == '\0') extra = argv[++i];
+        lua_assert(extra != NULL);
+        status = (option == 'e')
+                 ? dostring(L, extra, "=(command line)")
+                 : dolibrary(L, extra);
+        if (status != LUA_OK) return 0;
+        break;
+      }
+      case 'W':
+        lua_warning(L, "@on", 0);  /* warnings on */
+        break;
+    }
+  }
+  return 1;
+}
+
+
+static int handle_luainit (lua_State *L) {
+  const char *name = "=" LUA_INITVARVERSION;
+  const char *init = getenv(name + 1);
+  if (init == NULL) {
+    name = "=" LUA_INIT_VAR;
+    init = getenv(name + 1);  /* try alternative name */
+  }
+  if (init == NULL) return LUA_OK;
+  else if (init[0] == '@')
+    return dofile(L, init+1);
+  else
+    return dostring(L, init, name);
+}
+
+
+/*
+** {==================================================================
+** Read-Eval-Print Loop (REPL)
+** ===================================================================
+*/
+
+#if !defined(LUA_PROMPT)
+#define LUA_PROMPT		"> "
+#define LUA_PROMPT2		">> "
+#endif
+
+#if !defined(LUA_MAXINPUT)
+#define LUA_MAXINPUT		512
+#endif
+
+
+/*
+** lua_stdin_is_tty detects whether the standard input is a 'tty' (that
+** is, whether we're running lua interactively).
+*/
+#if !defined(lua_stdin_is_tty)	/* { */
+
+#if defined(LUA_USE_POSIX)	/* { */
+
+#include <unistd.h>
+#define lua_stdin_is_tty()	isatty(0)
+
+#elif defined(LUA_USE_WINDOWS)	/* }{ */
+
+#include <io.h>
+#include <windows.h>
+
+#define lua_stdin_is_tty()	_isatty(_fileno(stdin))
+
+#else				/* }{ */
+
+/* ISO C definition */
+#define lua_stdin_is_tty()	1  /* assume stdin is a tty */
+
+#endif				/* } */
+
+#endif				/* } */
+
+
+/*
+** lua_readline defines how to show a prompt and then read a line from
+** the standard input.
+** lua_saveline defines how to "save" a read line in a "history".
+** lua_freeline defines how to free a line read by lua_readline.
+*/
+#if !defined(lua_readline)	/* { */
+
+#if defined(LUA_USE_READLINE)	/* { */
+
+#include <readline/readline.h>
+#include <readline/history.h>
+#define lua_initreadline(L)	((void)L, rl_readline_name="lua")
+#define lua_readline(L,b,p)	((void)L, ((b)=readline(p)) != NULL)
+#define lua_saveline(L,line)	((void)L, add_history(line))
+#define lua_freeline(L,b)	((void)L, free(b))
+
+#else				/* }{ */
+
+#define lua_initreadline(L)  ((void)L)
+#define lua_readline(L,b,p) \
+        ((void)L, fputs(p, stdout), fflush(stdout),  /* show prompt */ \
+        fgets(b, LUA_MAXINPUT, stdin) != NULL)  /* get line */
+#define lua_saveline(L,line)	{ (void)L; (void)line; }
+#define lua_freeline(L,b)	{ (void)L; (void)b; }
+
+#endif				/* } */
+
+#endif				/* } */
+
+
+/*
+** Return the string to be used as a prompt by the interpreter. Leave
+** the string (or nil, if using the default value) on the stack, to keep
+** it anchored.
+*/
+static const char *get_prompt (lua_State *L, int firstline) {
+  if (lua_getglobal(L, firstline ? "_PROMPT" : "_PROMPT2") == LUA_TNIL)
+    return (firstline ? LUA_PROMPT : LUA_PROMPT2);  /* use the default */
+  else {  /* apply 'tostring' over the value */
+    const char *p = luaL_tolstring(L, -1, NULL);
+    lua_remove(L, -2);  /* remove original value */
+    return p;
+  }
+}
+
+/* mark in error messages for incomplete statements */
+#define EOFMARK		"<eof>"
+#define marklen		(sizeof(EOFMARK)/sizeof(char) - 1)
+
+
+/*
+** Check whether 'status' signals a syntax error and the error
+** message at the top of the stack ends with the above mark for
+** incomplete statements.
+*/
+static int incomplete (lua_State *L, int status) {
+  if (status == LUA_ERRSYNTAX) {
+    size_t lmsg;
+    const char *msg = lua_tolstring(L, -1, &lmsg);
+    if (lmsg >= marklen && strcmp(msg + lmsg - marklen, EOFMARK) == 0) {
+      lua_pop(L, 1);
+      return 1;
+    }
+  }
+  return 0;  /* else... */
+}
+
+
+/*
+** Prompt the user, read a line, and push it into the Lua stack.
+*/
+static int pushline (lua_State *L, int firstline) {
+  char buffer[LUA_MAXINPUT];
+  char *b = buffer;
+  size_t l;
+  const char *prmt = get_prompt(L, firstline);
+  int readstatus = lua_readline(L, b, prmt);
+  if (readstatus == 0)
+    return 0;  /* no input (prompt will be popped by caller) */
+  lua_pop(L, 1);  /* remove prompt */
+  l = strlen(b);
+  if (l > 0 && b[l-1] == '\n')  /* line ends with newline? */
+    b[--l] = '\0';  /* remove it */
+  if (firstline && b[0] == '=')  /* for compatibility with 5.2, ... */
+    lua_pushfstring(L, "return %s", b + 1);  /* change '=' to 'return' */
+  else
+    lua_pushlstring(L, b, l);
+  lua_freeline(L, b);
+  return 1;
+}
+
+
+/*
+** Try to compile line on the stack as 'return <line>;'; on return, stack
+** has either compiled chunk or original line (if compilation failed).
+*/
+static int addreturn (lua_State *L) {
+  const char *line = lua_tostring(L, -1);  /* original line */
+  const char *retline = lua_pushfstring(L, "return %s;", line);
+  int status = luaL_loadbuffer(L, retline, strlen(retline), "=stdin");
+  if (status == LUA_OK) {
+    lua_remove(L, -2);  /* remove modified line */
+    if (line[0] != '\0')  /* non empty? */
+      lua_saveline(L, line);  /* keep history */
+  }
+  else
+    lua_pop(L, 2);  /* pop result from 'luaL_loadbuffer' and modified line */
+  return status;
+}
+
+
+/*
+** Read multiple lines until a complete Lua statement
+*/
+static int multiline (lua_State *L) {
+  for (;;) {  /* repeat until gets a complete statement */
+    size_t len;
+    const char *line = lua_tolstring(L, 1, &len);  /* get what it has */
+    int status = luaL_loadbuffer(L, line, len, "=stdin");  /* try it */
+    if (!incomplete(L, status) || !pushline(L, 0)) {
+      lua_saveline(L, line);  /* keep history */
+      return status;  /* cannot or should not try to add continuation line */
+    }
+    lua_pushliteral(L, "\n");  /* add newline... */
+    lua_insert(L, -2);  /* ...between the two lines */
+    lua_concat(L, 3);  /* join them */
+  }
+}
+
+
+/*
+** Read a line and try to load (compile) it first as an expression (by
+** adding "return " in front of it) and second as a statement. Return
+** the final status of load/call with the resulting function (if any)
+** in the top of the stack.
+*/
+static int loadline (lua_State *L) {
+  int status;
+  lua_settop(L, 0);
+  if (!pushline(L, 1))
+    return -1;  /* no input */
+  if ((status = addreturn(L)) != LUA_OK)  /* 'return ...' did not work? */
+    status = multiline(L);  /* try as command, maybe with continuation lines */
+  lua_remove(L, 1);  /* remove line from the stack */
+  lua_assert(lua_gettop(L) == 1);
+  return status;
+}
+
+
+/*
+** Prints (calling the Lua 'print' function) any values on the stack
+*/
+static void l_print (lua_State *L) {
+  int n = lua_gettop(L);
+  if (n > 0) {  /* any result to be printed? */
+    luaL_checkstack(L, LUA_MINSTACK, "too many results to print");
+    lua_getglobal(L, "print");
+    lua_insert(L, 1);
+    if (lua_pcall(L, n, 0, 0) != LUA_OK)
+      l_message(progname, lua_pushfstring(L, "error calling 'print' (%s)",
+                                             lua_tostring(L, -1)));
+  }
+}
+
+
+/*
+** Do the REPL: repeatedly read (load) a line, evaluate (call) it, and
+** print any results.
+*/
+static void doREPL (lua_State *L) {
+  int status;
+  const char *oldprogname = progname;
+  progname = NULL;  /* no 'progname' on errors in interactive mode */
+  lua_initreadline(L);
+  while ((status = loadline(L)) != -1) {
+    if (status == LUA_OK)
+      status = docall(L, 0, LUA_MULTRET);
+    if (status == LUA_OK) l_print(L);
+    else report(L, status);
+  }
+  lua_settop(L, 0);  /* clear stack */
+  lua_writeline();
+  progname = oldprogname;
+}
+
+/* }================================================================== */
+
+
+/*
+** Main body of stand-alone interpreter (to be called in protected mode).
+** Reads the options and handles them all.
+*/
+static int pmain (lua_State *L) {
+  int argc = (int)lua_tointeger(L, 1);
+  char **argv = (char **)lua_touserdata(L, 2);
+  int script;
+  int args = collectargs(argv, &script);
+  int optlim = (script > 0) ? script : argc; /* first argv not an option */
+  luaL_checkversion(L);  /* check that interpreter has correct version */
+  if (args == has_error) {  /* bad arg? */
+    print_usage(argv[script]);  /* 'script' has index of bad arg. */
+    return 0;
+  }
+  if (args & has_v)  /* option '-v'? */
+    print_version();
+  if (args & has_E) {  /* option '-E'? */
+    lua_pushboolean(L, 1);  /* signal for libraries to ignore env. vars. */
+    lua_setfield(L, LUA_REGISTRYINDEX, "LUA_NOENV");
+  }
+  luaL_openlibs(L);  /* open standard libraries */
+  createargtable(L, argv, argc, script);  /* create table 'arg' */
+  lua_gc(L, LUA_GCRESTART);  /* start GC... */
+  lua_gc(L, LUA_GCGEN, 0, 0);  /* ...in generational mode */
+  if (!(args & has_E)) {  /* no option '-E'? */
+    if (handle_luainit(L) != LUA_OK)  /* run LUA_INIT */
+      return 0;  /* error running LUA_INIT */
+  }
+  if (!runargs(L, argv, optlim))  /* execute arguments -e and -l */
+    return 0;  /* something failed */
+  if (script > 0) {  /* execute main script (if there is one) */
+    if (handle_script(L, argv + script) != LUA_OK)
+      return 0;  /* interrupt in case of error */
+  }
+  if (args & has_i)  /* -i option? */
+    doREPL(L);  /* do read-eval-print loop */
+  else if (script < 1 && !(args & (has_e | has_v))) { /* no active option? */
+    if (lua_stdin_is_tty()) {  /* running in interactive mode? */
+      print_version();
+      doREPL(L);  /* do read-eval-print loop */
+    }
+    else dofile(L, NULL);  /* executes stdin as a file */
+  }
+  lua_pushboolean(L, 1);  /* signal no errors */
+  return 1;
+}
+
+
+int main (int argc, char **argv) {
+  int status, result;
+  lua_State *L = luaL_newstate();  /* create state */
+  if (L == NULL) {
+    l_message(argv[0], "cannot create state: not enough memory");
+    return EXIT_FAILURE;
+  }
+  lua_gc(L, LUA_GCSTOP);  /* stop GC while building state */
+  lua_pushcfunction(L, &pmain);  /* to call 'pmain' in protected mode */
+  lua_pushinteger(L, argc);  /* 1st argument */
+  lua_pushlightuserdata(L, argv); /* 2nd argument */
+  status = lua_pcall(L, 2, 1, 0);  /* do the call */
+  result = lua_toboolean(L, -1);  /* get result */
+  report(L, status);
+  lua_close(L);
+  return (result && status == LUA_OK) ? EXIT_SUCCESS : EXIT_FAILURE;
+}
+
diff --git a/src/libs/3rdparty/lua/src/lua.h b/src/libs/3rdparty/lua/src/lua.h
new file mode 100644
index 0000000000..fd16cf8050
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lua.h
@@ -0,0 +1,523 @@
+/*
+** $Id: lua.h $
+** Lua - A Scripting Language
+** Lua.org, PUC-Rio, Brazil (http://www.lua.org)
+** See Copyright Notice at the end of this file
+*/
+
+
+#ifndef lua_h
+#define lua_h
+
+#include <stdarg.h>
+#include <stddef.h>
+
+
+#include "luaconf.h"
+
+
+#define LUA_VERSION_MAJOR	"5"
+#define LUA_VERSION_MINOR	"4"
+#define LUA_VERSION_RELEASE	"6"
+
+#define LUA_VERSION_NUM			504
+#define LUA_VERSION_RELEASE_NUM		(LUA_VERSION_NUM * 100 + 6)
+
+#define LUA_VERSION	"Lua " LUA_VERSION_MAJOR "." LUA_VERSION_MINOR
+#define LUA_RELEASE	LUA_VERSION "." LUA_VERSION_RELEASE
+#define LUA_COPYRIGHT	LUA_RELEASE "  Copyright (C) 1994-2023 Lua.org, PUC-Rio"
+#define LUA_AUTHORS	"R. Ierusalimschy, L. H. de Figueiredo, W. Celes"
+
+
+/* mark for precompiled code ('<esc>Lua') */
+#define LUA_SIGNATURE	"\x1bLua"
+
+/* option for multiple returns in 'lua_pcall' and 'lua_call' */
+#define LUA_MULTRET	(-1)
+
+
+/*
+** Pseudo-indices
+** (-LUAI_MAXSTACK is the minimum valid index; we keep some free empty
+** space after that to help overflow detection)
+*/
+#define LUA_REGISTRYINDEX	(-LUAI_MAXSTACK - 1000)
+#define lua_upvalueindex(i)	(LUA_REGISTRYINDEX - (i))
+
+
+/* thread status */
+#define LUA_OK		0
+#define LUA_YIELD	1
+#define LUA_ERRRUN	2
+#define LUA_ERRSYNTAX	3
+#define LUA_ERRMEM	4
+#define LUA_ERRERR	5
+
+
+typedef struct lua_State lua_State;
+
+
+/*
+** basic types
+*/
+#define LUA_TNONE		(-1)
+
+#define LUA_TNIL		0
+#define LUA_TBOOLEAN		1
+#define LUA_TLIGHTUSERDATA	2
+#define LUA_TNUMBER		3
+#define LUA_TSTRING		4
+#define LUA_TTABLE		5
+#define LUA_TFUNCTION		6
+#define LUA_TUSERDATA		7
+#define LUA_TTHREAD		8
+
+#define LUA_NUMTYPES		9
+
+
+
+/* minimum Lua stack available to a C function */
+#define LUA_MINSTACK	20
+
+
+/* predefined values in the registry */
+#define LUA_RIDX_MAINTHREAD	1
+#define LUA_RIDX_GLOBALS	2
+#define LUA_RIDX_LAST		LUA_RIDX_GLOBALS
+
+
+/* type of numbers in Lua */
+typedef LUA_NUMBER lua_Number;
+
+
+/* type for integer functions */
+typedef LUA_INTEGER lua_Integer;
+
+/* unsigned integer type */
+typedef LUA_UNSIGNED lua_Unsigned;
+
+/* type for continuation-function contexts */
+typedef LUA_KCONTEXT lua_KContext;
+
+
+/*
+** Type for C functions registered with Lua
+*/
+typedef int (*lua_CFunction) (lua_State *L);
+
+/*
+** Type for continuation functions
+*/
+typedef int (*lua_KFunction) (lua_State *L, int status, lua_KContext ctx);
+
+
+/*
+** Type for functions that read/write blocks when loading/dumping Lua chunks
+*/
+typedef const char * (*lua_Reader) (lua_State *L, void *ud, size_t *sz);
+
+typedef int (*lua_Writer) (lua_State *L, const void *p, size_t sz, void *ud);
+
+
+/*
+** Type for memory-allocation functions
+*/
+typedef void * (*lua_Alloc) (void *ud, void *ptr, size_t osize, size_t nsize);
+
+
+/*
+** Type for warning functions
+*/
+typedef void (*lua_WarnFunction) (void *ud, const char *msg, int tocont);
+
+
+/*
+** Type used by the debug API to collect debug information
+*/
+typedef struct lua_Debug lua_Debug;
+
+
+/*
+** Functions to be called by the debugger in specific events
+*/
+typedef void (*lua_Hook) (lua_State *L, lua_Debug *ar);
+
+
+/*
+** generic extra include file
+*/
+#if defined(LUA_USER_H)
+#include LUA_USER_H
+#endif
+
+
+/*
+** RCS ident string
+*/
+extern const char lua_ident[];
+
+
+/*
+** state manipulation
+*/
+LUA_API lua_State *(lua_newstate) (lua_Alloc f, void *ud);
+LUA_API void       (lua_close) (lua_State *L);
+LUA_API lua_State *(lua_newthread) (lua_State *L);
+LUA_API int        (lua_closethread) (lua_State *L, lua_State *from);
+LUA_API int        (lua_resetthread) (lua_State *L);  /* Deprecated! */
+
+LUA_API lua_CFunction (lua_atpanic) (lua_State *L, lua_CFunction panicf);
+
+
+LUA_API lua_Number (lua_version) (lua_State *L);
+
+
+/*
+** basic stack manipulation
+*/
+LUA_API int   (lua_absindex) (lua_State *L, int idx);
+LUA_API int   (lua_gettop) (lua_State *L);
+LUA_API void  (lua_settop) (lua_State *L, int idx);
+LUA_API void  (lua_pushvalue) (lua_State *L, int idx);
+LUA_API void  (lua_rotate) (lua_State *L, int idx, int n);
+LUA_API void  (lua_copy) (lua_State *L, int fromidx, int toidx);
+LUA_API int   (lua_checkstack) (lua_State *L, int n);
+
+LUA_API void  (lua_xmove) (lua_State *from, lua_State *to, int n);
+
+
+/*
+** access functions (stack -> C)
+*/
+
+LUA_API int             (lua_isnumber) (lua_State *L, int idx);
+LUA_API int             (lua_isstring) (lua_State *L, int idx);
+LUA_API int             (lua_iscfunction) (lua_State *L, int idx);
+LUA_API int             (lua_isinteger) (lua_State *L, int idx);
+LUA_API int             (lua_isuserdata) (lua_State *L, int idx);
+LUA_API int             (lua_type) (lua_State *L, int idx);
+LUA_API const char     *(lua_typename) (lua_State *L, int tp);
+
+LUA_API lua_Number      (lua_tonumberx) (lua_State *L, int idx, int *isnum);
+LUA_API lua_Integer     (lua_tointegerx) (lua_State *L, int idx, int *isnum);
+LUA_API int             (lua_toboolean) (lua_State *L, int idx);
+LUA_API const char     *(lua_tolstring) (lua_State *L, int idx, size_t *len);
+LUA_API lua_Unsigned    (lua_rawlen) (lua_State *L, int idx);
+LUA_API lua_CFunction   (lua_tocfunction) (lua_State *L, int idx);
+LUA_API void	       *(lua_touserdata) (lua_State *L, int idx);
+LUA_API lua_State      *(lua_tothread) (lua_State *L, int idx);
+LUA_API const void     *(lua_topointer) (lua_State *L, int idx);
+
+
+/*
+** Comparison and arithmetic functions
+*/
+
+#define LUA_OPADD	0	/* ORDER TM, ORDER OP */
+#define LUA_OPSUB	1
+#define LUA_OPMUL	2
+#define LUA_OPMOD	3
+#define LUA_OPPOW	4
+#define LUA_OPDIV	5
+#define LUA_OPIDIV	6
+#define LUA_OPBAND	7
+#define LUA_OPBOR	8
+#define LUA_OPBXOR	9
+#define LUA_OPSHL	10
+#define LUA_OPSHR	11
+#define LUA_OPUNM	12
+#define LUA_OPBNOT	13
+
+LUA_API void  (lua_arith) (lua_State *L, int op);
+
+#define LUA_OPEQ	0
+#define LUA_OPLT	1
+#define LUA_OPLE	2
+
+LUA_API int   (lua_rawequal) (lua_State *L, int idx1, int idx2);
+LUA_API int   (lua_compare) (lua_State *L, int idx1, int idx2, int op);
+
+
+/*
+** push functions (C -> stack)
+*/
+LUA_API void        (lua_pushnil) (lua_State *L);
+LUA_API void        (lua_pushnumber) (lua_State *L, lua_Number n);
+LUA_API void        (lua_pushinteger) (lua_State *L, lua_Integer n);
+LUA_API const char *(lua_pushlstring) (lua_State *L, const char *s, size_t len);
+LUA_API const char *(lua_pushstring) (lua_State *L, const char *s);
+LUA_API const char *(lua_pushvfstring) (lua_State *L, const char *fmt,
+                                                      va_list argp);
+LUA_API const char *(lua_pushfstring) (lua_State *L, const char *fmt, ...);
+LUA_API void  (lua_pushcclosure) (lua_State *L, lua_CFunction fn, int n);
+LUA_API void  (lua_pushboolean) (lua_State *L, int b);
+LUA_API void  (lua_pushlightuserdata) (lua_State *L, void *p);
+LUA_API int   (lua_pushthread) (lua_State *L);
+
+
+/*
+** get functions (Lua -> stack)
+*/
+LUA_API int (lua_getglobal) (lua_State *L, const char *name);
+LUA_API int (lua_gettable) (lua_State *L, int idx);
+LUA_API int (lua_getfield) (lua_State *L, int idx, const char *k);
+LUA_API int (lua_geti) (lua_State *L, int idx, lua_Integer n);
+LUA_API int (lua_rawget) (lua_State *L, int idx);
+LUA_API int (lua_rawgeti) (lua_State *L, int idx, lua_Integer n);
+LUA_API int (lua_rawgetp) (lua_State *L, int idx, const void *p);
+
+LUA_API void  (lua_createtable) (lua_State *L, int narr, int nrec);
+LUA_API void *(lua_newuserdatauv) (lua_State *L, size_t sz, int nuvalue);
+LUA_API int   (lua_getmetatable) (lua_State *L, int objindex);
+LUA_API int  (lua_getiuservalue) (lua_State *L, int idx, int n);
+
+
+/*
+** set functions (stack -> Lua)
+*/
+LUA_API void  (lua_setglobal) (lua_State *L, const char *name);
+LUA_API void  (lua_settable) (lua_State *L, int idx);
+LUA_API void  (lua_setfield) (lua_State *L, int idx, const char *k);
+LUA_API void  (lua_seti) (lua_State *L, int idx, lua_Integer n);
+LUA_API void  (lua_rawset) (lua_State *L, int idx);
+LUA_API void  (lua_rawseti) (lua_State *L, int idx, lua_Integer n);
+LUA_API void  (lua_rawsetp) (lua_State *L, int idx, const void *p);
+LUA_API int   (lua_setmetatable) (lua_State *L, int objindex);
+LUA_API int   (lua_setiuservalue) (lua_State *L, int idx, int n);
+
+
+/*
+** 'load' and 'call' functions (load and run Lua code)
+*/
+LUA_API void  (lua_callk) (lua_State *L, int nargs, int nresults,
+                           lua_KContext ctx, lua_KFunction k);
+#define lua_call(L,n,r)		lua_callk(L, (n), (r), 0, NULL)
+
+LUA_API int   (lua_pcallk) (lua_State *L, int nargs, int nresults, int errfunc,
+                            lua_KContext ctx, lua_KFunction k);
+#define lua_pcall(L,n,r,f)	lua_pcallk(L, (n), (r), (f), 0, NULL)
+
+LUA_API int   (lua_load) (lua_State *L, lua_Reader reader, void *dt,
+                          const char *chunkname, const char *mode);
+
+LUA_API int (lua_dump) (lua_State *L, lua_Writer writer, void *data, int strip);
+
+
+/*
+** coroutine functions
+*/
+LUA_API int  (lua_yieldk)     (lua_State *L, int nresults, lua_KContext ctx,
+                               lua_KFunction k);
+LUA_API int  (lua_resume)     (lua_State *L, lua_State *from, int narg,
+                               int *nres);
+LUA_API int  (lua_status)     (lua_State *L);
+LUA_API int (lua_isyieldable) (lua_State *L);
+
+#define lua_yield(L,n)		lua_yieldk(L, (n), 0, NULL)
+
+
+/*
+** Warning-related functions
+*/
+LUA_API void (lua_setwarnf) (lua_State *L, lua_WarnFunction f, void *ud);
+LUA_API void (lua_warning)  (lua_State *L, const char *msg, int tocont);
+
+
+/*
+** garbage-collection function and options
+*/
+
+#define LUA_GCSTOP		0
+#define LUA_GCRESTART		1
+#define LUA_GCCOLLECT		2
+#define LUA_GCCOUNT		3
+#define LUA_GCCOUNTB		4
+#define LUA_GCSTEP		5
+#define LUA_GCSETPAUSE		6
+#define LUA_GCSETSTEPMUL	7
+#define LUA_GCISRUNNING		9
+#define LUA_GCGEN		10
+#define LUA_GCINC		11
+
+LUA_API int (lua_gc) (lua_State *L, int what, ...);
+
+
+/*
+** miscellaneous functions
+*/
+
+LUA_API int   (lua_error) (lua_State *L);
+
+LUA_API int   (lua_next) (lua_State *L, int idx);
+
+LUA_API void  (lua_concat) (lua_State *L, int n);
+LUA_API void  (lua_len)    (lua_State *L, int idx);
+
+LUA_API size_t   (lua_stringtonumber) (lua_State *L, const char *s);
+
+LUA_API lua_Alloc (lua_getallocf) (lua_State *L, void **ud);
+LUA_API void      (lua_setallocf) (lua_State *L, lua_Alloc f, void *ud);
+
+LUA_API void (lua_toclose) (lua_State *L, int idx);
+LUA_API void (lua_closeslot) (lua_State *L, int idx);
+
+
+/*
+** {==============================================================
+** some useful macros
+** ===============================================================
+*/
+
+#define lua_getextraspace(L)	((void *)((char *)(L) - LUA_EXTRASPACE))
+
+#define lua_tonumber(L,i)	lua_tonumberx(L,(i),NULL)
+#define lua_tointeger(L,i)	lua_tointegerx(L,(i),NULL)
+
+#define lua_pop(L,n)		lua_settop(L, -(n)-1)
+
+#define lua_newtable(L)		lua_createtable(L, 0, 0)
+
+#define lua_register(L,n,f) (lua_pushcfunction(L, (f)), lua_setglobal(L, (n)))
+
+#define lua_pushcfunction(L,f)	lua_pushcclosure(L, (f), 0)
+
+#define lua_isfunction(L,n)	(lua_type(L, (n)) == LUA_TFUNCTION)
+#define lua_istable(L,n)	(lua_type(L, (n)) == LUA_TTABLE)
+#define lua_islightuserdata(L,n)	(lua_type(L, (n)) == LUA_TLIGHTUSERDATA)
+#define lua_isnil(L,n)		(lua_type(L, (n)) == LUA_TNIL)
+#define lua_isboolean(L,n)	(lua_type(L, (n)) == LUA_TBOOLEAN)
+#define lua_isthread(L,n)	(lua_type(L, (n)) == LUA_TTHREAD)
+#define lua_isnone(L,n)		(lua_type(L, (n)) == LUA_TNONE)
+#define lua_isnoneornil(L, n)	(lua_type(L, (n)) <= 0)
+
+#define lua_pushliteral(L, s)	lua_pushstring(L, "" s)
+
+#define lua_pushglobaltable(L)  \
+	((void)lua_rawgeti(L, LUA_REGISTRYINDEX, LUA_RIDX_GLOBALS))
+
+#define lua_tostring(L,i)	lua_tolstring(L, (i), NULL)
+
+
+#define lua_insert(L,idx)	lua_rotate(L, (idx), 1)
+
+#define lua_remove(L,idx)	(lua_rotate(L, (idx), -1), lua_pop(L, 1))
+
+#define lua_replace(L,idx)	(lua_copy(L, -1, (idx)), lua_pop(L, 1))
+
+/* }============================================================== */
+
+
+/*
+** {==============================================================
+** compatibility macros
+** ===============================================================
+*/
+#if defined(LUA_COMPAT_APIINTCASTS)
+
+#define lua_pushunsigned(L,n)	lua_pushinteger(L, (lua_Integer)(n))
+#define lua_tounsignedx(L,i,is)	((lua_Unsigned)lua_tointegerx(L,i,is))
+#define lua_tounsigned(L,i)	lua_tounsignedx(L,(i),NULL)
+
+#endif
+
+#define lua_newuserdata(L,s)	lua_newuserdatauv(L,s,1)
+#define lua_getuservalue(L,idx)	lua_getiuservalue(L,idx,1)
+#define lua_setuservalue(L,idx)	lua_setiuservalue(L,idx,1)
+
+#define LUA_NUMTAGS		LUA_NUMTYPES
+
+/* }============================================================== */
+
+/*
+** {======================================================================
+** Debug API
+** =======================================================================
+*/
+
+
+/*
+** Event codes
+*/
+#define LUA_HOOKCALL	0
+#define LUA_HOOKRET	1
+#define LUA_HOOKLINE	2
+#define LUA_HOOKCOUNT	3
+#define LUA_HOOKTAILCALL 4
+
+
+/*
+** Event masks
+*/
+#define LUA_MASKCALL	(1 << LUA_HOOKCALL)
+#define LUA_MASKRET	(1 << LUA_HOOKRET)
+#define LUA_MASKLINE	(1 << LUA_HOOKLINE)
+#define LUA_MASKCOUNT	(1 << LUA_HOOKCOUNT)
+
+
+LUA_API int (lua_getstack) (lua_State *L, int level, lua_Debug *ar);
+LUA_API int (lua_getinfo) (lua_State *L, const char *what, lua_Debug *ar);
+LUA_API const char *(lua_getlocal) (lua_State *L, const lua_Debug *ar, int n);
+LUA_API const char *(lua_setlocal) (lua_State *L, const lua_Debug *ar, int n);
+LUA_API const char *(lua_getupvalue) (lua_State *L, int funcindex, int n);
+LUA_API const char *(lua_setupvalue) (lua_State *L, int funcindex, int n);
+
+LUA_API void *(lua_upvalueid) (lua_State *L, int fidx, int n);
+LUA_API void  (lua_upvaluejoin) (lua_State *L, int fidx1, int n1,
+                                               int fidx2, int n2);
+
+LUA_API void (lua_sethook) (lua_State *L, lua_Hook func, int mask, int count);
+LUA_API lua_Hook (lua_gethook) (lua_State *L);
+LUA_API int (lua_gethookmask) (lua_State *L);
+LUA_API int (lua_gethookcount) (lua_State *L);
+
+LUA_API int (lua_setcstacklimit) (lua_State *L, unsigned int limit);
+
+struct lua_Debug {
+  int event;
+  const char *name;	/* (n) */
+  const char *namewhat;	/* (n) 'global', 'local', 'field', 'method' */
+  const char *what;	/* (S) 'Lua', 'C', 'main', 'tail' */
+  const char *source;	/* (S) */
+  size_t srclen;	/* (S) */
+  int currentline;	/* (l) */
+  int linedefined;	/* (S) */
+  int lastlinedefined;	/* (S) */
+  unsigned char nups;	/* (u) number of upvalues */
+  unsigned char nparams;/* (u) number of parameters */
+  char isvararg;        /* (u) */
+  char istailcall;	/* (t) */
+  unsigned short ftransfer;   /* (r) index of first value transferred */
+  unsigned short ntransfer;   /* (r) number of transferred values */
+  char short_src[LUA_IDSIZE]; /* (S) */
+  /* private part */
+  struct CallInfo *i_ci;  /* active function */
+};
+
+/* }====================================================================== */
+
+
+/******************************************************************************
+* Copyright (C) 1994-2023 Lua.org, PUC-Rio.
+*
+* Permission is hereby granted, free of charge, to any person obtaining
+* a copy of this software and associated documentation files (the
+* "Software"), to deal in the Software without restriction, including
+* without limitation the rights to use, copy, modify, merge, publish,
+* distribute, sublicense, and/or sell copies of the Software, and to
+* permit persons to whom the Software is furnished to do so, subject to
+* the following conditions:
+*
+* The above copyright notice and this permission notice shall be
+* included in all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+******************************************************************************/
+
+
+#endif
diff --git a/src/libs/3rdparty/lua/src/lua.hpp b/src/libs/3rdparty/lua/src/lua.hpp
new file mode 100644
index 0000000000..ec417f5946
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lua.hpp
@@ -0,0 +1,9 @@
+// lua.hpp
+// Lua header files for C++
+// <<extern "C">> not supplied automatically because Lua also compiles as C++
+
+extern "C" {
+#include "lua.h"
+#include "lualib.h"
+#include "lauxlib.h"
+}
diff --git a/src/libs/3rdparty/lua/src/luac.c b/src/libs/3rdparty/lua/src/luac.c
new file mode 100644
index 0000000000..5f4a141bdd
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/luac.c
@@ -0,0 +1,723 @@
+/*
+** $Id: luac.c $
+** Lua compiler (saves bytecodes to files; also lists bytecodes)
+** See Copyright Notice in lua.h
+*/
+
+#define luac_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+#include <ctype.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "lua.h"
+#include "lauxlib.h"
+
+#include "ldebug.h"
+#include "lobject.h"
+#include "lopcodes.h"
+#include "lopnames.h"
+#include "lstate.h"
+#include "lundump.h"
+
+static void PrintFunction(const Proto* f, int full);
+#define luaU_print	PrintFunction
+
+#define PROGNAME	"luac"		/* default program name */
+#define OUTPUT		PROGNAME ".out"	/* default output file */
+
+static int listing=0;			/* list bytecodes? */
+static int dumping=1;			/* dump bytecodes? */
+static int stripping=0;			/* strip debug information? */
+static char Output[]={ OUTPUT };	/* default output file name */
+static const char* output=Output;	/* actual output file name */
+static const char* progname=PROGNAME;	/* actual program name */
+static TString **tmname;
+
+static void fatal(const char* message)
+{
+ fprintf(stderr,"%s: %s\n",progname,message);
+ exit(EXIT_FAILURE);
+}
+
+static void cannot(const char* what)
+{
+ fprintf(stderr,"%s: cannot %s %s: %s\n",progname,what,output,strerror(errno));
+ exit(EXIT_FAILURE);
+}
+
+static void usage(const char* message)
+{
+ if (*message=='-')
+  fprintf(stderr,"%s: unrecognized option '%s'\n",progname,message);
+ else
+  fprintf(stderr,"%s: %s\n",progname,message);
+ fprintf(stderr,
+  "usage: %s [options] [filenames]\n"
+  "Available options are:\n"
+  "  -l       list (use -l -l for full listing)\n"
+  "  -o name  output to file 'name' (default is \"%s\")\n"
+  "  -p       parse only\n"
+  "  -s       strip debug information\n"
+  "  -v       show version information\n"
+  "  --       stop handling options\n"
+  "  -        stop handling options and process stdin\n"
+  ,progname,Output);
+ exit(EXIT_FAILURE);
+}
+
+#define IS(s)	(strcmp(argv[i],s)==0)
+
+static int doargs(int argc, char* argv[])
+{
+ int i;
+ int version=0;
+ if (argv[0]!=NULL && *argv[0]!=0) progname=argv[0];
+ for (i=1; i<argc; i++)
+ {
+  if (*argv[i]!='-')			/* end of options; keep it */
+   break;
+  else if (IS("--"))			/* end of options; skip it */
+  {
+   ++i;
+   if (version) ++version;
+   break;
+  }
+  else if (IS("-"))			/* end of options; use stdin */
+   break;
+  else if (IS("-l"))			/* list */
+   ++listing;
+  else if (IS("-o"))			/* output file */
+  {
+   output=argv[++i];
+   if (output==NULL || *output==0 || (*output=='-' && output[1]!=0))
+    usage("'-o' needs argument");
+   if (IS("-")) output=NULL;
+  }
+  else if (IS("-p"))			/* parse only */
+   dumping=0;
+  else if (IS("-s"))			/* strip debug information */
+   stripping=1;
+  else if (IS("-v"))			/* show version */
+   ++version;
+  else					/* unknown option */
+   usage(argv[i]);
+ }
+ if (i==argc && (listing || !dumping))
+ {
+  dumping=0;
+  argv[--i]=Output;
+ }
+ if (version)
+ {
+  printf("%s\n",LUA_COPYRIGHT);
+  if (version==argc-1) exit(EXIT_SUCCESS);
+ }
+ return i;
+}
+
+#define FUNCTION "(function()end)();\n"
+
+static const char* reader(lua_State* L, void* ud, size_t* size)
+{
+ UNUSED(L);
+ if ((*(int*)ud)--)
+ {
+  *size=sizeof(FUNCTION)-1;
+  return FUNCTION;
+ }
+ else
+ {
+  *size=0;
+  return NULL;
+ }
+}
+
+#define toproto(L,i) getproto(s2v(L->top.p+(i)))
+
+static const Proto* combine(lua_State* L, int n)
+{
+ if (n==1)
+  return toproto(L,-1);
+ else
+ {
+  Proto* f;
+  int i=n;
+  if (lua_load(L,reader,&i,"=(" PROGNAME ")",NULL)!=LUA_OK) fatal(lua_tostring(L,-1));
+  f=toproto(L,-1);
+  for (i=0; i<n; i++)
+  {
+   f->p[i]=toproto(L,i-n-1);
+   if (f->p[i]->sizeupvalues>0) f->p[i]->upvalues[0].instack=0;
+  }
+  return f;
+ }
+}
+
+static int writer(lua_State* L, const void* p, size_t size, void* u)
+{
+ UNUSED(L);
+ return (fwrite(p,size,1,(FILE*)u)!=1) && (size!=0);
+}
+
+static int pmain(lua_State* L)
+{
+ int argc=(int)lua_tointeger(L,1);
+ char** argv=(char**)lua_touserdata(L,2);
+ const Proto* f;
+ int i;
+ tmname=G(L)->tmname;
+ if (!lua_checkstack(L,argc)) fatal("too many input files");
+ for (i=0; i<argc; i++)
+ {
+  const char* filename=IS("-") ? NULL : argv[i];
+  if (luaL_loadfile(L,filename)!=LUA_OK) fatal(lua_tostring(L,-1));
+ }
+ f=combine(L,argc);
+ if (listing) luaU_print(f,listing>1);
+ if (dumping)
+ {
+  FILE* D= (output==NULL) ? stdout : fopen(output,"wb");
+  if (D==NULL) cannot("open");
+  lua_lock(L);
+  luaU_dump(L,f,writer,D,stripping);
+  lua_unlock(L);
+  if (ferror(D)) cannot("write");
+  if (fclose(D)) cannot("close");
+ }
+ return 0;
+}
+
+int main(int argc, char* argv[])
+{
+ lua_State* L;
+ int i=doargs(argc,argv);
+ argc-=i; argv+=i;
+ if (argc<=0) usage("no input files given");
+ L=luaL_newstate();
+ if (L==NULL) fatal("cannot create state: not enough memory");
+ lua_pushcfunction(L,&pmain);
+ lua_pushinteger(L,argc);
+ lua_pushlightuserdata(L,argv);
+ if (lua_pcall(L,2,0,0)!=LUA_OK) fatal(lua_tostring(L,-1));
+ lua_close(L);
+ return EXIT_SUCCESS;
+}
+
+/*
+** print bytecodes
+*/
+
+#define UPVALNAME(x) ((f->upvalues[x].name) ? getstr(f->upvalues[x].name) : "-")
+#define VOID(p) ((const void*)(p))
+#define eventname(i) (getstr(tmname[i]))
+
+static void PrintString(const TString* ts)
+{
+ const char* s=getstr(ts);
+ size_t i,n=tsslen(ts);
+ printf("\"");
+ for (i=0; i<n; i++)
+ {
+  int c=(int)(unsigned char)s[i];
+  switch (c)
+  {
+   case '"':
+	printf("\\\"");
+	break;
+   case '\\':
+	printf("\\\\");
+	break;
+   case '\a':
+	printf("\\a");
+	break;
+   case '\b':
+	printf("\\b");
+	break;
+   case '\f':
+	printf("\\f");
+	break;
+   case '\n':
+	printf("\\n");
+	break;
+   case '\r':
+	printf("\\r");
+	break;
+   case '\t':
+	printf("\\t");
+	break;
+   case '\v':
+	printf("\\v");
+	break;
+   default:
+	if (isprint(c)) printf("%c",c); else printf("\\%03d",c);
+	break;
+  }
+ }
+ printf("\"");
+}
+
+static void PrintType(const Proto* f, int i)
+{
+ const TValue* o=&f->k[i];
+ switch (ttypetag(o))
+ {
+  case LUA_VNIL:
+	printf("N");
+	break;
+  case LUA_VFALSE:
+  case LUA_VTRUE:
+	printf("B");
+	break;
+  case LUA_VNUMFLT:
+	printf("F");
+	break;
+  case LUA_VNUMINT:
+	printf("I");
+	break;
+  case LUA_VSHRSTR:
+  case LUA_VLNGSTR:
+	printf("S");
+	break;
+  default:				/* cannot happen */
+	printf("?%d",ttypetag(o));
+	break;
+ }
+ printf("\t");
+}
+
+static void PrintConstant(const Proto* f, int i)
+{
+ const TValue* o=&f->k[i];
+ switch (ttypetag(o))
+ {
+  case LUA_VNIL:
+	printf("nil");
+	break;
+  case LUA_VFALSE:
+	printf("false");
+	break;
+  case LUA_VTRUE:
+	printf("true");
+	break;
+  case LUA_VNUMFLT:
+	{
+	char buff[100];
+	sprintf(buff,LUA_NUMBER_FMT,fltvalue(o));
+	printf("%s",buff);
+	if (buff[strspn(buff,"-0123456789")]=='\0') printf(".0");
+	break;
+	}
+  case LUA_VNUMINT:
+	printf(LUA_INTEGER_FMT,ivalue(o));
+	break;
+  case LUA_VSHRSTR:
+  case LUA_VLNGSTR:
+	PrintString(tsvalue(o));
+	break;
+  default:				/* cannot happen */
+	printf("?%d",ttypetag(o));
+	break;
+ }
+}
+
+#define COMMENT		"\t; "
+#define EXTRAARG	GETARG_Ax(code[pc+1])
+#define EXTRAARGC	(EXTRAARG*(MAXARG_C+1))
+#define ISK		(isk ? "k" : "")
+
+static void PrintCode(const Proto* f)
+{
+ const Instruction* code=f->code;
+ int pc,n=f->sizecode;
+ for (pc=0; pc<n; pc++)
+ {
+  Instruction i=code[pc];
+  OpCode o=GET_OPCODE(i);
+  int a=GETARG_A(i);
+  int b=GETARG_B(i);
+  int c=GETARG_C(i);
+  int ax=GETARG_Ax(i);
+  int bx=GETARG_Bx(i);
+  int sb=GETARG_sB(i);
+  int sc=GETARG_sC(i);
+  int sbx=GETARG_sBx(i);
+  int isk=GETARG_k(i);
+  int line=luaG_getfuncline(f,pc);
+  printf("\t%d\t",pc+1);
+  if (line>0) printf("[%d]\t",line); else printf("[-]\t");
+  printf("%-9s\t",opnames[o]);
+  switch (o)
+  {
+   case OP_MOVE:
+	printf("%d %d",a,b);
+	break;
+   case OP_LOADI:
+	printf("%d %d",a,sbx);
+	break;
+   case OP_LOADF:
+	printf("%d %d",a,sbx);
+	break;
+   case OP_LOADK:
+	printf("%d %d",a,bx);
+	printf(COMMENT); PrintConstant(f,bx);
+	break;
+   case OP_LOADKX:
+	printf("%d",a);
+	printf(COMMENT); PrintConstant(f,EXTRAARG);
+	break;
+   case OP_LOADFALSE:
+	printf("%d",a);
+	break;
+   case OP_LFALSESKIP:
+	printf("%d",a);
+	break;
+   case OP_LOADTRUE:
+	printf("%d",a);
+	break;
+   case OP_LOADNIL:
+	printf("%d %d",a,b);
+	printf(COMMENT "%d out",b+1);
+	break;
+   case OP_GETUPVAL:
+	printf("%d %d",a,b);
+	printf(COMMENT "%s",UPVALNAME(b));
+	break;
+   case OP_SETUPVAL:
+	printf("%d %d",a,b);
+	printf(COMMENT "%s",UPVALNAME(b));
+	break;
+   case OP_GETTABUP:
+	printf("%d %d %d",a,b,c);
+	printf(COMMENT "%s",UPVALNAME(b));
+	printf(" "); PrintConstant(f,c);
+	break;
+   case OP_GETTABLE:
+	printf("%d %d %d",a,b,c);
+	break;
+   case OP_GETI:
+	printf("%d %d %d",a,b,c);
+	break;
+   case OP_GETFIELD:
+	printf("%d %d %d",a,b,c);
+	printf(COMMENT); PrintConstant(f,c);
+	break;
+   case OP_SETTABUP:
+	printf("%d %d %d%s",a,b,c,ISK);
+	printf(COMMENT "%s",UPVALNAME(a));
+	printf(" "); PrintConstant(f,b);
+	if (isk) { printf(" "); PrintConstant(f,c); }
+	break;
+   case OP_SETTABLE:
+	printf("%d %d %d%s",a,b,c,ISK);
+	if (isk) { printf(COMMENT); PrintConstant(f,c); }
+	break;
+   case OP_SETI:
+	printf("%d %d %d%s",a,b,c,ISK);
+	if (isk) { printf(COMMENT); PrintConstant(f,c); }
+	break;
+   case OP_SETFIELD:
+	printf("%d %d %d%s",a,b,c,ISK);
+	printf(COMMENT); PrintConstant(f,b);
+	if (isk) { printf(" "); PrintConstant(f,c); }
+	break;
+   case OP_NEWTABLE:
+	printf("%d %d %d",a,b,c);
+	printf(COMMENT "%d",c+EXTRAARGC);
+	break;
+   case OP_SELF:
+	printf("%d %d %d%s",a,b,c,ISK);
+	if (isk) { printf(COMMENT); PrintConstant(f,c); }
+	break;
+   case OP_ADDI:
+	printf("%d %d %d",a,b,sc);
+	break;
+   case OP_ADDK:
+	printf("%d %d %d",a,b,c);
+	printf(COMMENT); PrintConstant(f,c);
+	break;
+   case OP_SUBK:
+	printf("%d %d %d",a,b,c);
+	printf(COMMENT); PrintConstant(f,c);
+	break;
+   case OP_MULK:
+	printf("%d %d %d",a,b,c);
+	printf(COMMENT); PrintConstant(f,c);
+	break;
+   case OP_MODK:
+	printf("%d %d %d",a,b,c);
+	printf(COMMENT); PrintConstant(f,c);
+	break;
+   case OP_POWK:
+	printf("%d %d %d",a,b,c);
+	printf(COMMENT); PrintConstant(f,c);
+	break;
+   case OP_DIVK:
+	printf("%d %d %d",a,b,c);
+	printf(COMMENT); PrintConstant(f,c);
+	break;
+   case OP_IDIVK:
+	printf("%d %d %d",a,b,c);
+	printf(COMMENT); PrintConstant(f,c);
+	break;
+   case OP_BANDK:
+	printf("%d %d %d",a,b,c);
+	printf(COMMENT); PrintConstant(f,c);
+	break;
+   case OP_BORK:
+	printf("%d %d %d",a,b,c);
+	printf(COMMENT); PrintConstant(f,c);
+	break;
+   case OP_BXORK:
+	printf("%d %d %d",a,b,c);
+	printf(COMMENT); PrintConstant(f,c);
+	break;
+   case OP_SHRI:
+	printf("%d %d %d",a,b,sc);
+	break;
+   case OP_SHLI:
+	printf("%d %d %d",a,b,sc);
+	break;
+   case OP_ADD:
+	printf("%d %d %d",a,b,c);
+	break;
+   case OP_SUB:
+	printf("%d %d %d",a,b,c);
+	break;
+   case OP_MUL:
+	printf("%d %d %d",a,b,c);
+	break;
+   case OP_MOD:
+	printf("%d %d %d",a,b,c);
+	break;
+   case OP_POW:
+	printf("%d %d %d",a,b,c);
+	break;
+   case OP_DIV:
+	printf("%d %d %d",a,b,c);
+	break;
+   case OP_IDIV:
+	printf("%d %d %d",a,b,c);
+	break;
+   case OP_BAND:
+	printf("%d %d %d",a,b,c);
+	break;
+   case OP_BOR:
+	printf("%d %d %d",a,b,c);
+	break;
+   case OP_BXOR:
+	printf("%d %d %d",a,b,c);
+	break;
+   case OP_SHL:
+	printf("%d %d %d",a,b,c);
+	break;
+   case OP_SHR:
+	printf("%d %d %d",a,b,c);
+	break;
+   case OP_MMBIN:
+	printf("%d %d %d",a,b,c);
+	printf(COMMENT "%s",eventname(c));
+	break;
+   case OP_MMBINI:
+	printf("%d %d %d %d",a,sb,c,isk);
+	printf(COMMENT "%s",eventname(c));
+	if (isk) printf(" flip");
+	break;
+   case OP_MMBINK:
+	printf("%d %d %d %d",a,b,c,isk);
+	printf(COMMENT "%s ",eventname(c)); PrintConstant(f,b);
+	if (isk) printf(" flip");
+	break;
+   case OP_UNM:
+	printf("%d %d",a,b);
+	break;
+   case OP_BNOT:
+	printf("%d %d",a,b);
+	break;
+   case OP_NOT:
+	printf("%d %d",a,b);
+	break;
+   case OP_LEN:
+	printf("%d %d",a,b);
+	break;
+   case OP_CONCAT:
+	printf("%d %d",a,b);
+	break;
+   case OP_CLOSE:
+	printf("%d",a);
+	break;
+   case OP_TBC:
+	printf("%d",a);
+	break;
+   case OP_JMP:
+	printf("%d",GETARG_sJ(i));
+	printf(COMMENT "to %d",GETARG_sJ(i)+pc+2);
+	break;
+   case OP_EQ:
+	printf("%d %d %d",a,b,isk);
+	break;
+   case OP_LT:
+	printf("%d %d %d",a,b,isk);
+	break;
+   case OP_LE:
+	printf("%d %d %d",a,b,isk);
+	break;
+   case OP_EQK:
+	printf("%d %d %d",a,b,isk);
+	printf(COMMENT); PrintConstant(f,b);
+	break;
+   case OP_EQI:
+	printf("%d %d %d",a,sb,isk);
+	break;
+   case OP_LTI:
+	printf("%d %d %d",a,sb,isk);
+	break;
+   case OP_LEI:
+	printf("%d %d %d",a,sb,isk);
+	break;
+   case OP_GTI:
+	printf("%d %d %d",a,sb,isk);
+	break;
+   case OP_GEI:
+	printf("%d %d %d",a,sb,isk);
+	break;
+   case OP_TEST:
+	printf("%d %d",a,isk);
+	break;
+   case OP_TESTSET:
+	printf("%d %d %d",a,b,isk);
+	break;
+   case OP_CALL:
+	printf("%d %d %d",a,b,c);
+	printf(COMMENT);
+	if (b==0) printf("all in "); else printf("%d in ",b-1);
+	if (c==0) printf("all out"); else printf("%d out",c-1);
+	break;
+   case OP_TAILCALL:
+	printf("%d %d %d%s",a,b,c,ISK);
+	printf(COMMENT "%d in",b-1);
+	break;
+   case OP_RETURN:
+	printf("%d %d %d%s",a,b,c,ISK);
+	printf(COMMENT);
+	if (b==0) printf("all out"); else printf("%d out",b-1);
+	break;
+   case OP_RETURN0:
+	break;
+   case OP_RETURN1:
+	printf("%d",a);
+	break;
+   case OP_FORLOOP:
+	printf("%d %d",a,bx);
+	printf(COMMENT "to %d",pc-bx+2);
+	break;
+   case OP_FORPREP:
+	printf("%d %d",a,bx);
+	printf(COMMENT "exit to %d",pc+bx+3);
+	break;
+   case OP_TFORPREP:
+	printf("%d %d",a,bx);
+	printf(COMMENT "to %d",pc+bx+2);
+	break;
+   case OP_TFORCALL:
+	printf("%d %d",a,c);
+	break;
+   case OP_TFORLOOP:
+	printf("%d %d",a,bx);
+	printf(COMMENT "to %d",pc-bx+2);
+	break;
+   case OP_SETLIST:
+	printf("%d %d %d",a,b,c);
+	if (isk) printf(COMMENT "%d",c+EXTRAARGC);
+	break;
+   case OP_CLOSURE:
+	printf("%d %d",a,bx);
+	printf(COMMENT "%p",VOID(f->p[bx]));
+	break;
+   case OP_VARARG:
+	printf("%d %d",a,c);
+	printf(COMMENT);
+	if (c==0) printf("all out"); else printf("%d out",c-1);
+	break;
+   case OP_VARARGPREP:
+	printf("%d",a);
+	break;
+   case OP_EXTRAARG:
+	printf("%d",ax);
+	break;
+#if 0
+   default:
+	printf("%d %d %d",a,b,c);
+	printf(COMMENT "not handled");
+	break;
+#endif
+  }
+  printf("\n");
+ }
+}
+
+
+#define SS(x)	((x==1)?"":"s")
+#define S(x)	(int)(x),SS(x)
+
+static void PrintHeader(const Proto* f)
+{
+ const char* s=f->source ? getstr(f->source) : "=?";
+ if (*s=='@' || *s=='=')
+  s++;
+ else if (*s==LUA_SIGNATURE[0])
+  s="(bstring)";
+ else
+  s="(string)";
+ printf("\n%s <%s:%d,%d> (%d instruction%s at %p)\n",
+	(f->linedefined==0)?"main":"function",s,
+	f->linedefined,f->lastlinedefined,
+	S(f->sizecode),VOID(f));
+ printf("%d%s param%s, %d slot%s, %d upvalue%s, ",
+	(int)(f->numparams),f->is_vararg?"+":"",SS(f->numparams),
+	S(f->maxstacksize),S(f->sizeupvalues));
+ printf("%d local%s, %d constant%s, %d function%s\n",
+	S(f->sizelocvars),S(f->sizek),S(f->sizep));
+}
+
+static void PrintDebug(const Proto* f)
+{
+ int i,n;
+ n=f->sizek;
+ printf("constants (%d) for %p:\n",n,VOID(f));
+ for (i=0; i<n; i++)
+ {
+  printf("\t%d\t",i);
+  PrintType(f,i);
+  PrintConstant(f,i);
+  printf("\n");
+ }
+ n=f->sizelocvars;
+ printf("locals (%d) for %p:\n",n,VOID(f));
+ for (i=0; i<n; i++)
+ {
+  printf("\t%d\t%s\t%d\t%d\n",
+  i,getstr(f->locvars[i].varname),f->locvars[i].startpc+1,f->locvars[i].endpc+1);
+ }
+ n=f->sizeupvalues;
+ printf("upvalues (%d) for %p:\n",n,VOID(f));
+ for (i=0; i<n; i++)
+ {
+  printf("\t%d\t%s\t%d\t%d\n",
+  i,UPVALNAME(i),f->upvalues[i].instack,f->upvalues[i].idx);
+ }
+}
+
+static void PrintFunction(const Proto* f, int full)
+{
+ int i,n=f->sizep;
+ PrintHeader(f);
+ PrintCode(f);
+ if (full) PrintDebug(f);
+ for (i=0; i<n; i++) PrintFunction(f->p[i],full);
+}
diff --git a/src/libs/3rdparty/lua/src/luaconf.h b/src/libs/3rdparty/lua/src/luaconf.h
new file mode 100644
index 0000000000..433df49295
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/luaconf.h
@@ -0,0 +1,793 @@
+/*
+** $Id: luaconf.h $
+** Configuration file for Lua
+** See Copyright Notice in lua.h
+*/
+
+
+#ifndef luaconf_h
+#define luaconf_h
+
+#include <limits.h>
+#include <stddef.h>
+
+
+/*
+** ===================================================================
+** General Configuration File for Lua
+**
+** Some definitions here can be changed externally, through the compiler
+** (e.g., with '-D' options): They are commented out or protected
+** by '#if !defined' guards. However, several other definitions
+** should be changed directly here, either because they affect the
+** Lua ABI (by making the changes here, you ensure that all software
+** connected to Lua, such as C libraries, will be compiled with the same
+** configuration); or because they are seldom changed.
+**
+** Search for "@@" to find all configurable definitions.
+** ===================================================================
+*/
+
+
+/*
+** {====================================================================
+** System Configuration: macros to adapt (if needed) Lua to some
+** particular platform, for instance restricting it to C89.
+** =====================================================================
+*/
+
+/*
+@@ LUA_USE_C89 controls the use of non-ISO-C89 features.
+** Define it if you want Lua to avoid the use of a few C99 features
+** or Windows-specific features on Windows.
+*/
+/* #define LUA_USE_C89 */
+
+
+/*
+** By default, Lua on Windows use (some) specific Windows features
+*/
+#if !defined(LUA_USE_C89) && defined(_WIN32) && !defined(_WIN32_WCE) &&!defined(LUA_USE_WINDOWS)
+#define LUA_USE_WINDOWS  /* enable goodies for regular Windows */
+#endif
+
+
+#if defined(LUA_USE_WINDOWS)
+#define LUA_DL_DLL	/* enable support for DLL */
+#define LUA_USE_C89	/* broadly, Windows is C89 */
+#endif
+
+
+#if defined(LUA_USE_LINUX)
+#define LUA_USE_POSIX
+#define LUA_USE_DLOPEN		/* needs an extra library: -ldl */
+#endif
+
+
+#if defined(LUA_USE_MACOSX)
+#define LUA_USE_POSIX
+#define LUA_USE_DLOPEN		/* MacOS does not need -ldl */
+#endif
+
+
+#if defined(LUA_USE_IOS)
+#define LUA_USE_POSIX
+#define LUA_USE_DLOPEN
+#endif
+
+
+/*
+@@ LUAI_IS32INT is true iff 'int' has (at least) 32 bits.
+*/
+#define LUAI_IS32INT	((UINT_MAX >> 30) >= 3)
+
+/* }================================================================== */
+
+
+
+/*
+** {==================================================================
+** Configuration for Number types. These options should not be
+** set externally, because any other code connected to Lua must
+** use the same configuration.
+** ===================================================================
+*/
+
+/*
+@@ LUA_INT_TYPE defines the type for Lua integers.
+@@ LUA_FLOAT_TYPE defines the type for Lua floats.
+** Lua should work fine with any mix of these options supported
+** by your C compiler. The usual configurations are 64-bit integers
+** and 'double' (the default), 32-bit integers and 'float' (for
+** restricted platforms), and 'long'/'double' (for C compilers not
+** compliant with C99, which may not have support for 'long long').
+*/
+
+/* predefined options for LUA_INT_TYPE */
+#define LUA_INT_INT		1
+#define LUA_INT_LONG		2
+#define LUA_INT_LONGLONG	3
+
+/* predefined options for LUA_FLOAT_TYPE */
+#define LUA_FLOAT_FLOAT		1
+#define LUA_FLOAT_DOUBLE	2
+#define LUA_FLOAT_LONGDOUBLE	3
+
+
+/* Default configuration ('long long' and 'double', for 64-bit Lua) */
+#define LUA_INT_DEFAULT		LUA_INT_LONGLONG
+#define LUA_FLOAT_DEFAULT	LUA_FLOAT_DOUBLE
+
+
+/*
+@@ LUA_32BITS enables Lua with 32-bit integers and 32-bit floats.
+*/
+#define LUA_32BITS	0
+
+
+/*
+@@ LUA_C89_NUMBERS ensures that Lua uses the largest types available for
+** C89 ('long' and 'double'); Windows always has '__int64', so it does
+** not need to use this case.
+*/
+#if defined(LUA_USE_C89) && !defined(LUA_USE_WINDOWS)
+#define LUA_C89_NUMBERS		1
+#else
+#define LUA_C89_NUMBERS		0
+#endif
+
+
+#if LUA_32BITS		/* { */
+/*
+** 32-bit integers and 'float'
+*/
+#if LUAI_IS32INT  /* use 'int' if big enough */
+#define LUA_INT_TYPE	LUA_INT_INT
+#else  /* otherwise use 'long' */
+#define LUA_INT_TYPE	LUA_INT_LONG
+#endif
+#define LUA_FLOAT_TYPE	LUA_FLOAT_FLOAT
+
+#elif LUA_C89_NUMBERS	/* }{ */
+/*
+** largest types available for C89 ('long' and 'double')
+*/
+#define LUA_INT_TYPE	LUA_INT_LONG
+#define LUA_FLOAT_TYPE	LUA_FLOAT_DOUBLE
+
+#else		/* }{ */
+/* use defaults */
+
+#define LUA_INT_TYPE	LUA_INT_DEFAULT
+#define LUA_FLOAT_TYPE	LUA_FLOAT_DEFAULT
+
+#endif				/* } */
+
+
+/* }================================================================== */
+
+
+
+/*
+** {==================================================================
+** Configuration for Paths.
+** ===================================================================
+*/
+
+/*
+** LUA_PATH_SEP is the character that separates templates in a path.
+** LUA_PATH_MARK is the string that marks the substitution points in a
+** template.
+** LUA_EXEC_DIR in a Windows path is replaced by the executable's
+** directory.
+*/
+#define LUA_PATH_SEP            ";"
+#define LUA_PATH_MARK           "?"
+#define LUA_EXEC_DIR            "!"
+
+
+/*
+@@ LUA_PATH_DEFAULT is the default path that Lua uses to look for
+** Lua libraries.
+@@ LUA_CPATH_DEFAULT is the default path that Lua uses to look for
+** C libraries.
+** CHANGE them if your machine has a non-conventional directory
+** hierarchy or if you want to install your libraries in
+** non-conventional directories.
+*/
+
+#define LUA_VDIR	LUA_VERSION_MAJOR "." LUA_VERSION_MINOR
+#if defined(_WIN32)	/* { */
+/*
+** In Windows, any exclamation mark ('!') in the path is replaced by the
+** path of the directory of the executable file of the current process.
+*/
+#define LUA_LDIR	"!\\lua\\"
+#define LUA_CDIR	"!\\"
+#define LUA_SHRDIR	"!\\..\\share\\lua\\" LUA_VDIR "\\"
+
+#if !defined(LUA_PATH_DEFAULT)
+#define LUA_PATH_DEFAULT  \
+		LUA_LDIR"?.lua;"  LUA_LDIR"?\\init.lua;" \
+		LUA_CDIR"?.lua;"  LUA_CDIR"?\\init.lua;" \
+		LUA_SHRDIR"?.lua;" LUA_SHRDIR"?\\init.lua;" \
+		".\\?.lua;" ".\\?\\init.lua"
+#endif
+
+#if !defined(LUA_CPATH_DEFAULT)
+#define LUA_CPATH_DEFAULT \
+		LUA_CDIR"?.dll;" \
+		LUA_CDIR"..\\lib\\lua\\" LUA_VDIR "\\?.dll;" \
+		LUA_CDIR"loadall.dll;" ".\\?.dll"
+#endif
+
+#else			/* }{ */
+
+#define LUA_ROOT	"/usr/local/"
+#define LUA_LDIR	LUA_ROOT "share/lua/" LUA_VDIR "/"
+#define LUA_CDIR	LUA_ROOT "lib/lua/" LUA_VDIR "/"
+
+#if !defined(LUA_PATH_DEFAULT)
+#define LUA_PATH_DEFAULT  \
+		LUA_LDIR"?.lua;"  LUA_LDIR"?/init.lua;" \
+		LUA_CDIR"?.lua;"  LUA_CDIR"?/init.lua;" \
+		"./?.lua;" "./?/init.lua"
+#endif
+
+#if !defined(LUA_CPATH_DEFAULT)
+#define LUA_CPATH_DEFAULT \
+		LUA_CDIR"?.so;" LUA_CDIR"loadall.so;" "./?.so"
+#endif
+
+#endif			/* } */
+
+
+/*
+@@ LUA_DIRSEP is the directory separator (for submodules).
+** CHANGE it if your machine does not use "/" as the directory separator
+** and is not Windows. (On Windows Lua automatically uses "\".)
+*/
+#if !defined(LUA_DIRSEP)
+
+#if defined(_WIN32)
+#define LUA_DIRSEP	"\\"
+#else
+#define LUA_DIRSEP	"/"
+#endif
+
+#endif
+
+/* }================================================================== */
+
+
+/*
+** {==================================================================
+** Marks for exported symbols in the C code
+** ===================================================================
+*/
+
+/*
+@@ LUA_API is a mark for all core API functions.
+@@ LUALIB_API is a mark for all auxiliary library functions.
+@@ LUAMOD_API is a mark for all standard library opening functions.
+** CHANGE them if you need to define those functions in some special way.
+** For instance, if you want to create one Windows DLL with the core and
+** the libraries, you may want to use the following definition (define
+** LUA_BUILD_AS_DLL to get it).
+*/
+#if defined(LUA_BUILD_AS_DLL)	/* { */
+
+#if defined(LUA_CORE) || defined(LUA_LIB)	/* { */
+#define LUA_API __declspec(dllexport)
+#else						/* }{ */
+#define LUA_API __declspec(dllimport)
+#endif						/* } */
+
+#else				/* }{ */
+
+#define LUA_API		extern
+
+#endif				/* } */
+
+
+/*
+** More often than not the libs go together with the core.
+*/
+#define LUALIB_API	LUA_API
+#define LUAMOD_API	LUA_API
+
+
+/*
+@@ LUAI_FUNC is a mark for all extern functions that are not to be
+** exported to outside modules.
+@@ LUAI_DDEF and LUAI_DDEC are marks for all extern (const) variables,
+** none of which to be exported to outside modules (LUAI_DDEF for
+** definitions and LUAI_DDEC for declarations).
+** CHANGE them if you need to mark them in some special way. Elf/gcc
+** (versions 3.2 and later) mark them as "hidden" to optimize access
+** when Lua is compiled as a shared library. Not all elf targets support
+** this attribute. Unfortunately, gcc does not offer a way to check
+** whether the target offers that support, and those without support
+** give a warning about it. To avoid these warnings, change to the
+** default definition.
+*/
+#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 302) && \
+    defined(__ELF__)		/* { */
+#define LUAI_FUNC	__attribute__((visibility("internal"))) extern
+#else				/* }{ */
+#define LUAI_FUNC	extern
+#endif				/* } */
+
+#define LUAI_DDEC(dec)	LUAI_FUNC dec
+#define LUAI_DDEF	/* empty */
+
+/* }================================================================== */
+
+
+/*
+** {==================================================================
+** Compatibility with previous versions
+** ===================================================================
+*/
+
+/*
+@@ LUA_COMPAT_5_3 controls other macros for compatibility with Lua 5.3.
+** You can define it to get all options, or change specific options
+** to fit your specific needs.
+*/
+#if defined(LUA_COMPAT_5_3)	/* { */
+
+/*
+@@ LUA_COMPAT_MATHLIB controls the presence of several deprecated
+** functions in the mathematical library.
+** (These functions were already officially removed in 5.3;
+** nevertheless they are still available here.)
+*/
+#define LUA_COMPAT_MATHLIB
+
+/*
+@@ LUA_COMPAT_APIINTCASTS controls the presence of macros for
+** manipulating other integer types (lua_pushunsigned, lua_tounsigned,
+** luaL_checkint, luaL_checklong, etc.)
+** (These macros were also officially removed in 5.3, but they are still
+** available here.)
+*/
+#define LUA_COMPAT_APIINTCASTS
+
+
+/*
+@@ LUA_COMPAT_LT_LE controls the emulation of the '__le' metamethod
+** using '__lt'.
+*/
+#define LUA_COMPAT_LT_LE
+
+
+/*
+@@ The following macros supply trivial compatibility for some
+** changes in the API. The macros themselves document how to
+** change your code to avoid using them.
+** (Once more, these macros were officially removed in 5.3, but they are
+** still available here.)
+*/
+#define lua_strlen(L,i)		lua_rawlen(L, (i))
+
+#define lua_objlen(L,i)		lua_rawlen(L, (i))
+
+#define lua_equal(L,idx1,idx2)		lua_compare(L,(idx1),(idx2),LUA_OPEQ)
+#define lua_lessthan(L,idx1,idx2)	lua_compare(L,(idx1),(idx2),LUA_OPLT)
+
+#endif				/* } */
+
+/* }================================================================== */
+
+
+
+/*
+** {==================================================================
+** Configuration for Numbers (low-level part).
+** Change these definitions if no predefined LUA_FLOAT_* / LUA_INT_*
+** satisfy your needs.
+** ===================================================================
+*/
+
+/*
+@@ LUAI_UACNUMBER is the result of a 'default argument promotion'
+@@ over a floating number.
+@@ l_floatatt(x) corrects float attribute 'x' to the proper float type
+** by prefixing it with one of FLT/DBL/LDBL.
+@@ LUA_NUMBER_FRMLEN is the length modifier for writing floats.
+@@ LUA_NUMBER_FMT is the format for writing floats.
+@@ lua_number2str converts a float to a string.
+@@ l_mathop allows the addition of an 'l' or 'f' to all math operations.
+@@ l_floor takes the floor of a float.
+@@ lua_str2number converts a decimal numeral to a number.
+*/
+
+
+/* The following definitions are good for most cases here */
+
+#define l_floor(x)		(l_mathop(floor)(x))
+
+#define lua_number2str(s,sz,n)  \
+	l_sprintf((s), sz, LUA_NUMBER_FMT, (LUAI_UACNUMBER)(n))
+
+/*
+@@ lua_numbertointeger converts a float number with an integral value
+** to an integer, or returns 0 if float is not within the range of
+** a lua_Integer.  (The range comparisons are tricky because of
+** rounding. The tests here assume a two-complement representation,
+** where MININTEGER always has an exact representation as a float;
+** MAXINTEGER may not have one, and therefore its conversion to float
+** may have an ill-defined value.)
+*/
+#define lua_numbertointeger(n,p) \
+  ((n) >= (LUA_NUMBER)(LUA_MININTEGER) && \
+   (n) < -(LUA_NUMBER)(LUA_MININTEGER) && \
+      (*(p) = (LUA_INTEGER)(n), 1))
+
+
+/* now the variable definitions */
+
+#if LUA_FLOAT_TYPE == LUA_FLOAT_FLOAT		/* { single float */
+
+#define LUA_NUMBER	float
+
+#define l_floatatt(n)		(FLT_##n)
+
+#define LUAI_UACNUMBER	double
+
+#define LUA_NUMBER_FRMLEN	""
+#define LUA_NUMBER_FMT		"%.7g"
+
+#define l_mathop(op)		op##f
+
+#define lua_str2number(s,p)	strtof((s), (p))
+
+
+#elif LUA_FLOAT_TYPE == LUA_FLOAT_LONGDOUBLE	/* }{ long double */
+
+#define LUA_NUMBER	long double
+
+#define l_floatatt(n)		(LDBL_##n)
+
+#define LUAI_UACNUMBER	long double
+
+#define LUA_NUMBER_FRMLEN	"L"
+#define LUA_NUMBER_FMT		"%.19Lg"
+
+#define l_mathop(op)		op##l
+
+#define lua_str2number(s,p)	strtold((s), (p))
+
+#elif LUA_FLOAT_TYPE == LUA_FLOAT_DOUBLE	/* }{ double */
+
+#define LUA_NUMBER	double
+
+#define l_floatatt(n)		(DBL_##n)
+
+#define LUAI_UACNUMBER	double
+
+#define LUA_NUMBER_FRMLEN	""
+#define LUA_NUMBER_FMT		"%.14g"
+
+#define l_mathop(op)		op
+
+#define lua_str2number(s,p)	strtod((s), (p))
+
+#else						/* }{ */
+
+#error "numeric float type not defined"
+
+#endif					/* } */
+
+
+
+/*
+@@ LUA_UNSIGNED is the unsigned version of LUA_INTEGER.
+@@ LUAI_UACINT is the result of a 'default argument promotion'
+@@ over a LUA_INTEGER.
+@@ LUA_INTEGER_FRMLEN is the length modifier for reading/writing integers.
+@@ LUA_INTEGER_FMT is the format for writing integers.
+@@ LUA_MAXINTEGER is the maximum value for a LUA_INTEGER.
+@@ LUA_MININTEGER is the minimum value for a LUA_INTEGER.
+@@ LUA_MAXUNSIGNED is the maximum value for a LUA_UNSIGNED.
+@@ lua_integer2str converts an integer to a string.
+*/
+
+
+/* The following definitions are good for most cases here */
+
+#define LUA_INTEGER_FMT		"%" LUA_INTEGER_FRMLEN "d"
+
+#define LUAI_UACINT		LUA_INTEGER
+
+#define lua_integer2str(s,sz,n)  \
+	l_sprintf((s), sz, LUA_INTEGER_FMT, (LUAI_UACINT)(n))
+
+/*
+** use LUAI_UACINT here to avoid problems with promotions (which
+** can turn a comparison between unsigneds into a signed comparison)
+*/
+#define LUA_UNSIGNED		unsigned LUAI_UACINT
+
+
+/* now the variable definitions */
+
+#if LUA_INT_TYPE == LUA_INT_INT		/* { int */
+
+#define LUA_INTEGER		int
+#define LUA_INTEGER_FRMLEN	""
+
+#define LUA_MAXINTEGER		INT_MAX
+#define LUA_MININTEGER		INT_MIN
+
+#define LUA_MAXUNSIGNED		UINT_MAX
+
+#elif LUA_INT_TYPE == LUA_INT_LONG	/* }{ long */
+
+#define LUA_INTEGER		long
+#define LUA_INTEGER_FRMLEN	"l"
+
+#define LUA_MAXINTEGER		LONG_MAX
+#define LUA_MININTEGER		LONG_MIN
+
+#define LUA_MAXUNSIGNED		ULONG_MAX
+
+#elif LUA_INT_TYPE == LUA_INT_LONGLONG	/* }{ long long */
+
+/* use presence of macro LLONG_MAX as proxy for C99 compliance */
+#if defined(LLONG_MAX)		/* { */
+/* use ISO C99 stuff */
+
+#define LUA_INTEGER		long long
+#define LUA_INTEGER_FRMLEN	"ll"
+
+#define LUA_MAXINTEGER		LLONG_MAX
+#define LUA_MININTEGER		LLONG_MIN
+
+#define LUA_MAXUNSIGNED		ULLONG_MAX
+
+#elif defined(LUA_USE_WINDOWS) /* }{ */
+/* in Windows, can use specific Windows types */
+
+#define LUA_INTEGER		__int64
+#define LUA_INTEGER_FRMLEN	"I64"
+
+#define LUA_MAXINTEGER		_I64_MAX
+#define LUA_MININTEGER		_I64_MIN
+
+#define LUA_MAXUNSIGNED		_UI64_MAX
+
+#else				/* }{ */
+
+#error "Compiler does not support 'long long'. Use option '-DLUA_32BITS' \
+  or '-DLUA_C89_NUMBERS' (see file 'luaconf.h' for details)"
+
+#endif				/* } */
+
+#else				/* }{ */
+
+#error "numeric integer type not defined"
+
+#endif				/* } */
+
+/* }================================================================== */
+
+
+/*
+** {==================================================================
+** Dependencies with C99 and other C details
+** ===================================================================
+*/
+
+/*
+@@ l_sprintf is equivalent to 'snprintf' or 'sprintf' in C89.
+** (All uses in Lua have only one format item.)
+*/
+#if !defined(LUA_USE_C89)
+#define l_sprintf(s,sz,f,i)	snprintf(s,sz,f,i)
+#else
+#define l_sprintf(s,sz,f,i)	((void)(sz), sprintf(s,f,i))
+#endif
+
+
+/*
+@@ lua_strx2number converts a hexadecimal numeral to a number.
+** In C99, 'strtod' does that conversion. Otherwise, you can
+** leave 'lua_strx2number' undefined and Lua will provide its own
+** implementation.
+*/
+#if !defined(LUA_USE_C89)
+#define lua_strx2number(s,p)		lua_str2number(s,p)
+#endif
+
+
+/*
+@@ lua_pointer2str converts a pointer to a readable string in a
+** non-specified way.
+*/
+#define lua_pointer2str(buff,sz,p)	l_sprintf(buff,sz,"%p",p)
+
+
+/*
+@@ lua_number2strx converts a float to a hexadecimal numeral.
+** In C99, 'sprintf' (with format specifiers '%a'/'%A') does that.
+** Otherwise, you can leave 'lua_number2strx' undefined and Lua will
+** provide its own implementation.
+*/
+#if !defined(LUA_USE_C89)
+#define lua_number2strx(L,b,sz,f,n)  \
+	((void)L, l_sprintf(b,sz,f,(LUAI_UACNUMBER)(n)))
+#endif
+
+
+/*
+** 'strtof' and 'opf' variants for math functions are not valid in
+** C89. Otherwise, the macro 'HUGE_VALF' is a good proxy for testing the
+** availability of these variants. ('math.h' is already included in
+** all files that use these macros.)
+*/
+#if defined(LUA_USE_C89) || (defined(HUGE_VAL) && !defined(HUGE_VALF))
+#undef l_mathop  /* variants not available */
+#undef lua_str2number
+#define l_mathop(op)		(lua_Number)op  /* no variant */
+#define lua_str2number(s,p)	((lua_Number)strtod((s), (p)))
+#endif
+
+
+/*
+@@ LUA_KCONTEXT is the type of the context ('ctx') for continuation
+** functions.  It must be a numerical type; Lua will use 'intptr_t' if
+** available, otherwise it will use 'ptrdiff_t' (the nearest thing to
+** 'intptr_t' in C89)
+*/
+#define LUA_KCONTEXT	ptrdiff_t
+
+#if !defined(LUA_USE_C89) && defined(__STDC_VERSION__) && \
+    __STDC_VERSION__ >= 199901L
+#include <stdint.h>
+#if defined(INTPTR_MAX)  /* even in C99 this type is optional */
+#undef LUA_KCONTEXT
+#define LUA_KCONTEXT	intptr_t
+#endif
+#endif
+
+
+/*
+@@ lua_getlocaledecpoint gets the locale "radix character" (decimal point).
+** Change that if you do not want to use C locales. (Code using this
+** macro must include the header 'locale.h'.)
+*/
+#if !defined(lua_getlocaledecpoint)
+#define lua_getlocaledecpoint()		(localeconv()->decimal_point[0])
+#endif
+
+
+/*
+** macros to improve jump prediction, used mostly for error handling
+** and debug facilities. (Some macros in the Lua API use these macros.
+** Define LUA_NOBUILTIN if you do not want '__builtin_expect' in your
+** code.)
+*/
+#if !defined(luai_likely)
+
+#if defined(__GNUC__) && !defined(LUA_NOBUILTIN)
+#define luai_likely(x)		(__builtin_expect(((x) != 0), 1))
+#define luai_unlikely(x)	(__builtin_expect(((x) != 0), 0))
+#else
+#define luai_likely(x)		(x)
+#define luai_unlikely(x)	(x)
+#endif
+
+#endif
+
+
+#if defined(LUA_CORE) || defined(LUA_LIB)
+/* shorter names for Lua's own use */
+#define l_likely(x)	luai_likely(x)
+#define l_unlikely(x)	luai_unlikely(x)
+#endif
+
+
+
+/* }================================================================== */
+
+
+/*
+** {==================================================================
+** Language Variations
+** =====================================================================
+*/
+
+/*
+@@ LUA_NOCVTN2S/LUA_NOCVTS2N control how Lua performs some
+** coercions. Define LUA_NOCVTN2S to turn off automatic coercion from
+** numbers to strings. Define LUA_NOCVTS2N to turn off automatic
+** coercion from strings to numbers.
+*/
+/* #define LUA_NOCVTN2S */
+/* #define LUA_NOCVTS2N */
+
+
+/*
+@@ LUA_USE_APICHECK turns on several consistency checks on the C API.
+** Define it as a help when debugging C code.
+*/
+#if defined(LUA_USE_APICHECK)
+#include <assert.h>
+#define luai_apicheck(l,e)	assert(e)
+#endif
+
+/* }================================================================== */
+
+
+/*
+** {==================================================================
+** Macros that affect the API and must be stable (that is, must be the
+** same when you compile Lua and when you compile code that links to
+** Lua).
+** =====================================================================
+*/
+
+/*
+@@ LUAI_MAXSTACK limits the size of the Lua stack.
+** CHANGE it if you need a different limit. This limit is arbitrary;
+** its only purpose is to stop Lua from consuming unlimited stack
+** space (and to reserve some numbers for pseudo-indices).
+** (It must fit into max(size_t)/32 and max(int)/2.)
+*/
+#if LUAI_IS32INT
+#define LUAI_MAXSTACK		1000000
+#else
+#define LUAI_MAXSTACK		15000
+#endif
+
+
+/*
+@@ LUA_EXTRASPACE defines the size of a raw memory area associated with
+** a Lua state with very fast access.
+** CHANGE it if you need a different size.
+*/
+#define LUA_EXTRASPACE		(sizeof(void *))
+
+
+/*
+@@ LUA_IDSIZE gives the maximum size for the description of the source
+** of a function in debug information.
+** CHANGE it if you want a different size.
+*/
+#define LUA_IDSIZE	60
+
+
+/*
+@@ LUAL_BUFFERSIZE is the initial buffer size used by the lauxlib
+** buffer system.
+*/
+#define LUAL_BUFFERSIZE   ((int)(16 * sizeof(void*) * sizeof(lua_Number)))
+
+
+/*
+@@ LUAI_MAXALIGN defines fields that, when used in a union, ensure
+** maximum alignment for the other items in that union.
+*/
+#define LUAI_MAXALIGN  lua_Number n; double u; void *s; lua_Integer i; long l
+
+/* }================================================================== */
+
+
+
+
+
+/* =================================================================== */
+
+/*
+** Local configuration. You can use this space to add your redefinitions
+** without modifying the main part of the file.
+*/
+
+
+
+
+
+#endif
+
diff --git a/src/libs/3rdparty/lua/src/lualib.h b/src/libs/3rdparty/lua/src/lualib.h
new file mode 100644
index 0000000000..2625529076
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lualib.h
@@ -0,0 +1,52 @@
+/*
+** $Id: lualib.h $
+** Lua standard libraries
+** See Copyright Notice in lua.h
+*/
+
+
+#ifndef lualib_h
+#define lualib_h
+
+#include "lua.h"
+
+
+/* version suffix for environment variable names */
+#define LUA_VERSUFFIX          "_" LUA_VERSION_MAJOR "_" LUA_VERSION_MINOR
+
+
+LUAMOD_API int (luaopen_base) (lua_State *L);
+
+#define LUA_COLIBNAME	"coroutine"
+LUAMOD_API int (luaopen_coroutine) (lua_State *L);
+
+#define LUA_TABLIBNAME	"table"
+LUAMOD_API int (luaopen_table) (lua_State *L);
+
+#define LUA_IOLIBNAME	"io"
+LUAMOD_API int (luaopen_io) (lua_State *L);
+
+#define LUA_OSLIBNAME	"os"
+LUAMOD_API int (luaopen_os) (lua_State *L);
+
+#define LUA_STRLIBNAME	"string"
+LUAMOD_API int (luaopen_string) (lua_State *L);
+
+#define LUA_UTF8LIBNAME	"utf8"
+LUAMOD_API int (luaopen_utf8) (lua_State *L);
+
+#define LUA_MATHLIBNAME	"math"
+LUAMOD_API int (luaopen_math) (lua_State *L);
+
+#define LUA_DBLIBNAME	"debug"
+LUAMOD_API int (luaopen_debug) (lua_State *L);
+
+#define LUA_LOADLIBNAME	"package"
+LUAMOD_API int (luaopen_package) (lua_State *L);
+
+
+/* open all previous libraries */
+LUALIB_API void (luaL_openlibs) (lua_State *L);
+
+
+#endif
diff --git a/src/libs/3rdparty/lua/src/lundump.c b/src/libs/3rdparty/lua/src/lundump.c
new file mode 100644
index 0000000000..02aed64fb6
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lundump.c
@@ -0,0 +1,335 @@
+/*
+** $Id: lundump.c $
+** load precompiled Lua chunks
+** See Copyright Notice in lua.h
+*/
+
+#define lundump_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include <limits.h>
+#include <string.h>
+
+#include "lua.h"
+
+#include "ldebug.h"
+#include "ldo.h"
+#include "lfunc.h"
+#include "lmem.h"
+#include "lobject.h"
+#include "lstring.h"
+#include "lundump.h"
+#include "lzio.h"
+
+
+#if !defined(luai_verifycode)
+#define luai_verifycode(L,f)  /* empty */
+#endif
+
+
+typedef struct {
+  lua_State *L;
+  ZIO *Z;
+  const char *name;
+} LoadState;
+
+
+static l_noret error (LoadState *S, const char *why) {
+  luaO_pushfstring(S->L, "%s: bad binary format (%s)", S->name, why);
+  luaD_throw(S->L, LUA_ERRSYNTAX);
+}
+
+
+/*
+** All high-level loads go through loadVector; you can change it to
+** adapt to the endianness of the input
+*/
+#define loadVector(S,b,n)	loadBlock(S,b,(n)*sizeof((b)[0]))
+
+static void loadBlock (LoadState *S, void *b, size_t size) {
+  if (luaZ_read(S->Z, b, size) != 0)
+    error(S, "truncated chunk");
+}
+
+
+#define loadVar(S,x)		loadVector(S,&x,1)
+
+
+static lu_byte loadByte (LoadState *S) {
+  int b = zgetc(S->Z);
+  if (b == EOZ)
+    error(S, "truncated chunk");
+  return cast_byte(b);
+}
+
+
+static size_t loadUnsigned (LoadState *S, size_t limit) {
+  size_t x = 0;
+  int b;
+  limit >>= 7;
+  do {
+    b = loadByte(S);
+    if (x >= limit)
+      error(S, "integer overflow");
+    x = (x << 7) | (b & 0x7f);
+  } while ((b & 0x80) == 0);
+  return x;
+}
+
+
+static size_t loadSize (LoadState *S) {
+  return loadUnsigned(S, ~(size_t)0);
+}
+
+
+static int loadInt (LoadState *S) {
+  return cast_int(loadUnsigned(S, INT_MAX));
+}
+
+
+static lua_Number loadNumber (LoadState *S) {
+  lua_Number x;
+  loadVar(S, x);
+  return x;
+}
+
+
+static lua_Integer loadInteger (LoadState *S) {
+  lua_Integer x;
+  loadVar(S, x);
+  return x;
+}
+
+
+/*
+** Load a nullable string into prototype 'p'.
+*/
+static TString *loadStringN (LoadState *S, Proto *p) {
+  lua_State *L = S->L;
+  TString *ts;
+  size_t size = loadSize(S);
+  if (size == 0)  /* no string? */
+    return NULL;
+  else if (--size <= LUAI_MAXSHORTLEN) {  /* short string? */
+    char buff[LUAI_MAXSHORTLEN];
+    loadVector(S, buff, size);  /* load string into buffer */
+    ts = luaS_newlstr(L, buff, size);  /* create string */
+  }
+  else {  /* long string */
+    ts = luaS_createlngstrobj(L, size);  /* create string */
+    setsvalue2s(L, L->top.p, ts);  /* anchor it ('loadVector' can GC) */
+    luaD_inctop(L);
+    loadVector(S, getstr(ts), size);  /* load directly in final place */
+    L->top.p--;  /* pop string */
+  }
+  luaC_objbarrier(L, p, ts);
+  return ts;
+}
+
+
+/*
+** Load a non-nullable string into prototype 'p'.
+*/
+static TString *loadString (LoadState *S, Proto *p) {
+  TString *st = loadStringN(S, p);
+  if (st == NULL)
+    error(S, "bad format for constant string");
+  return st;
+}
+
+
+static void loadCode (LoadState *S, Proto *f) {
+  int n = loadInt(S);
+  f->code = luaM_newvectorchecked(S->L, n, Instruction);
+  f->sizecode = n;
+  loadVector(S, f->code, n);
+}
+
+
+static void loadFunction(LoadState *S, Proto *f, TString *psource);
+
+
+static void loadConstants (LoadState *S, Proto *f) {
+  int i;
+  int n = loadInt(S);
+  f->k = luaM_newvectorchecked(S->L, n, TValue);
+  f->sizek = n;
+  for (i = 0; i < n; i++)
+    setnilvalue(&f->k[i]);
+  for (i = 0; i < n; i++) {
+    TValue *o = &f->k[i];
+    int t = loadByte(S);
+    switch (t) {
+      case LUA_VNIL:
+        setnilvalue(o);
+        break;
+      case LUA_VFALSE:
+        setbfvalue(o);
+        break;
+      case LUA_VTRUE:
+        setbtvalue(o);
+        break;
+      case LUA_VNUMFLT:
+        setfltvalue(o, loadNumber(S));
+        break;
+      case LUA_VNUMINT:
+        setivalue(o, loadInteger(S));
+        break;
+      case LUA_VSHRSTR:
+      case LUA_VLNGSTR:
+        setsvalue2n(S->L, o, loadString(S, f));
+        break;
+      default: lua_assert(0);
+    }
+  }
+}
+
+
+static void loadProtos (LoadState *S, Proto *f) {
+  int i;
+  int n = loadInt(S);
+  f->p = luaM_newvectorchecked(S->L, n, Proto *);
+  f->sizep = n;
+  for (i = 0; i < n; i++)
+    f->p[i] = NULL;
+  for (i = 0; i < n; i++) {
+    f->p[i] = luaF_newproto(S->L);
+    luaC_objbarrier(S->L, f, f->p[i]);
+    loadFunction(S, f->p[i], f->source);
+  }
+}
+
+
+/*
+** Load the upvalues for a function. The names must be filled first,
+** because the filling of the other fields can raise read errors and
+** the creation of the error message can call an emergency collection;
+** in that case all prototypes must be consistent for the GC.
+*/
+static void loadUpvalues (LoadState *S, Proto *f) {
+  int i, n;
+  n = loadInt(S);
+  f->upvalues = luaM_newvectorchecked(S->L, n, Upvaldesc);
+  f->sizeupvalues = n;
+  for (i = 0; i < n; i++)  /* make array valid for GC */
+    f->upvalues[i].name = NULL;
+  for (i = 0; i < n; i++) {  /* following calls can raise errors */
+    f->upvalues[i].instack = loadByte(S);
+    f->upvalues[i].idx = loadByte(S);
+    f->upvalues[i].kind = loadByte(S);
+  }
+}
+
+
+static void loadDebug (LoadState *S, Proto *f) {
+  int i, n;
+  n = loadInt(S);
+  f->lineinfo = luaM_newvectorchecked(S->L, n, ls_byte);
+  f->sizelineinfo = n;
+  loadVector(S, f->lineinfo, n);
+  n = loadInt(S);
+  f->abslineinfo = luaM_newvectorchecked(S->L, n, AbsLineInfo);
+  f->sizeabslineinfo = n;
+  for (i = 0; i < n; i++) {
+    f->abslineinfo[i].pc = loadInt(S);
+    f->abslineinfo[i].line = loadInt(S);
+  }
+  n = loadInt(S);
+  f->locvars = luaM_newvectorchecked(S->L, n, LocVar);
+  f->sizelocvars = n;
+  for (i = 0; i < n; i++)
+    f->locvars[i].varname = NULL;
+  for (i = 0; i < n; i++) {
+    f->locvars[i].varname = loadStringN(S, f);
+    f->locvars[i].startpc = loadInt(S);
+    f->locvars[i].endpc = loadInt(S);
+  }
+  n = loadInt(S);
+  if (n != 0)  /* does it have debug information? */
+    n = f->sizeupvalues;  /* must be this many */
+  for (i = 0; i < n; i++)
+    f->upvalues[i].name = loadStringN(S, f);
+}
+
+
+static void loadFunction (LoadState *S, Proto *f, TString *psource) {
+  f->source = loadStringN(S, f);
+  if (f->source == NULL)  /* no source in dump? */
+    f->source = psource;  /* reuse parent's source */
+  f->linedefined = loadInt(S);
+  f->lastlinedefined = loadInt(S);
+  f->numparams = loadByte(S);
+  f->is_vararg = loadByte(S);
+  f->maxstacksize = loadByte(S);
+  loadCode(S, f);
+  loadConstants(S, f);
+  loadUpvalues(S, f);
+  loadProtos(S, f);
+  loadDebug(S, f);
+}
+
+
+static void checkliteral (LoadState *S, const char *s, const char *msg) {
+  char buff[sizeof(LUA_SIGNATURE) + sizeof(LUAC_DATA)]; /* larger than both */
+  size_t len = strlen(s);
+  loadVector(S, buff, len);
+  if (memcmp(s, buff, len) != 0)
+    error(S, msg);
+}
+
+
+static void fchecksize (LoadState *S, size_t size, const char *tname) {
+  if (loadByte(S) != size)
+    error(S, luaO_pushfstring(S->L, "%s size mismatch", tname));
+}
+
+
+#define checksize(S,t)	fchecksize(S,sizeof(t),#t)
+
+static void checkHeader (LoadState *S) {
+  /* skip 1st char (already read and checked) */
+  checkliteral(S, &LUA_SIGNATURE[1], "not a binary chunk");
+  if (loadByte(S) != LUAC_VERSION)
+    error(S, "version mismatch");
+  if (loadByte(S) != LUAC_FORMAT)
+    error(S, "format mismatch");
+  checkliteral(S, LUAC_DATA, "corrupted chunk");
+  checksize(S, Instruction);
+  checksize(S, lua_Integer);
+  checksize(S, lua_Number);
+  if (loadInteger(S) != LUAC_INT)
+    error(S, "integer format mismatch");
+  if (loadNumber(S) != LUAC_NUM)
+    error(S, "float format mismatch");
+}
+
+
+/*
+** Load precompiled chunk.
+*/
+LClosure *luaU_undump(lua_State *L, ZIO *Z, const char *name) {
+  LoadState S;
+  LClosure *cl;
+  if (*name == '@' || *name == '=')
+    S.name = name + 1;
+  else if (*name == LUA_SIGNATURE[0])
+    S.name = "binary string";
+  else
+    S.name = name;
+  S.L = L;
+  S.Z = Z;
+  checkHeader(&S);
+  cl = luaF_newLclosure(L, loadByte(&S));
+  setclLvalue2s(L, L->top.p, cl);
+  luaD_inctop(L);
+  cl->p = luaF_newproto(L);
+  luaC_objbarrier(L, cl, cl->p);
+  loadFunction(&S, cl->p, NULL);
+  lua_assert(cl->nupvalues == cl->p->sizeupvalues);
+  luai_verifycode(L, cl->p);
+  return cl;
+}
+
diff --git a/src/libs/3rdparty/lua/src/lundump.h b/src/libs/3rdparty/lua/src/lundump.h
new file mode 100644
index 0000000000..f3748a9980
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lundump.h
@@ -0,0 +1,36 @@
+/*
+** $Id: lundump.h $
+** load precompiled Lua chunks
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lundump_h
+#define lundump_h
+
+#include "llimits.h"
+#include "lobject.h"
+#include "lzio.h"
+
+
+/* data to catch conversion errors */
+#define LUAC_DATA	"\x19\x93\r\n\x1a\n"
+
+#define LUAC_INT	0x5678
+#define LUAC_NUM	cast_num(370.5)
+
+/*
+** Encode major-minor version in one byte, one nibble for each
+*/
+#define MYINT(s)	(s[0]-'0')  /* assume one-digit numerals */
+#define LUAC_VERSION	(MYINT(LUA_VERSION_MAJOR)*16+MYINT(LUA_VERSION_MINOR))
+
+#define LUAC_FORMAT	0	/* this is the official format */
+
+/* load one chunk; from lundump.c */
+LUAI_FUNC LClosure* luaU_undump (lua_State* L, ZIO* Z, const char* name);
+
+/* dump one chunk; from ldump.c */
+LUAI_FUNC int luaU_dump (lua_State* L, const Proto* f, lua_Writer w,
+                         void* data, int strip);
+
+#endif
diff --git a/src/libs/3rdparty/lua/src/lutf8lib.c b/src/libs/3rdparty/lua/src/lutf8lib.c
new file mode 100644
index 0000000000..3a5b9bc38a
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lutf8lib.c
@@ -0,0 +1,291 @@
+/*
+** $Id: lutf8lib.c $
+** Standard library for UTF-8 manipulation
+** See Copyright Notice in lua.h
+*/
+
+#define lutf8lib_c
+#define LUA_LIB
+
+#include "lprefix.h"
+
+
+#include <assert.h>
+#include <limits.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "lua.h"
+
+#include "lauxlib.h"
+#include "lualib.h"
+
+
+#define MAXUNICODE	0x10FFFFu
+
+#define MAXUTF		0x7FFFFFFFu
+
+
+#define MSGInvalid	"invalid UTF-8 code"
+
+/*
+** Integer type for decoded UTF-8 values; MAXUTF needs 31 bits.
+*/
+#if (UINT_MAX >> 30) >= 1
+typedef unsigned int utfint;
+#else
+typedef unsigned long utfint;
+#endif
+
+
+#define iscont(c)	(((c) & 0xC0) == 0x80)
+#define iscontp(p)	iscont(*(p))
+
+
+/* from strlib */
+/* translate a relative string position: negative means back from end */
+static lua_Integer u_posrelat (lua_Integer pos, size_t len) {
+  if (pos >= 0) return pos;
+  else if (0u - (size_t)pos > len) return 0;
+  else return (lua_Integer)len + pos + 1;
+}
+
+
+/*
+** Decode one UTF-8 sequence, returning NULL if byte sequence is
+** invalid.  The array 'limits' stores the minimum value for each
+** sequence length, to check for overlong representations. Its first
+** entry forces an error for non-ascii bytes with no continuation
+** bytes (count == 0).
+*/
+static const char *utf8_decode (const char *s, utfint *val, int strict) {
+  static const utfint limits[] =
+        {~(utfint)0, 0x80, 0x800, 0x10000u, 0x200000u, 0x4000000u};
+  unsigned int c = (unsigned char)s[0];
+  utfint res = 0;  /* final result */
+  if (c < 0x80)  /* ascii? */
+    res = c;
+  else {
+    int count = 0;  /* to count number of continuation bytes */
+    for (; c & 0x40; c <<= 1) {  /* while it needs continuation bytes... */
+      unsigned int cc = (unsigned char)s[++count];  /* read next byte */
+      if (!iscont(cc))  /* not a continuation byte? */
+        return NULL;  /* invalid byte sequence */
+      res = (res << 6) | (cc & 0x3F);  /* add lower 6 bits from cont. byte */
+    }
+    res |= ((utfint)(c & 0x7F) << (count * 5));  /* add first byte */
+    if (count > 5 || res > MAXUTF || res < limits[count])
+      return NULL;  /* invalid byte sequence */
+    s += count;  /* skip continuation bytes read */
+  }
+  if (strict) {
+    /* check for invalid code points; too large or surrogates */
+    if (res > MAXUNICODE || (0xD800u <= res && res <= 0xDFFFu))
+      return NULL;
+  }
+  if (val) *val = res;
+  return s + 1;  /* +1 to include first byte */
+}
+
+
+/*
+** utf8len(s [, i [, j [, lax]]]) --> number of characters that
+** start in the range [i,j], or nil + current position if 's' is not
+** well formed in that interval
+*/
+static int utflen (lua_State *L) {
+  lua_Integer n = 0;  /* counter for the number of characters */
+  size_t len;  /* string length in bytes */
+  const char *s = luaL_checklstring(L, 1, &len);
+  lua_Integer posi = u_posrelat(luaL_optinteger(L, 2, 1), len);
+  lua_Integer posj = u_posrelat(luaL_optinteger(L, 3, -1), len);
+  int lax = lua_toboolean(L, 4);
+  luaL_argcheck(L, 1 <= posi && --posi <= (lua_Integer)len, 2,
+                   "initial position out of bounds");
+  luaL_argcheck(L, --posj < (lua_Integer)len, 3,
+                   "final position out of bounds");
+  while (posi <= posj) {
+    const char *s1 = utf8_decode(s + posi, NULL, !lax);
+    if (s1 == NULL) {  /* conversion error? */
+      luaL_pushfail(L);  /* return fail ... */
+      lua_pushinteger(L, posi + 1);  /* ... and current position */
+      return 2;
+    }
+    posi = s1 - s;
+    n++;
+  }
+  lua_pushinteger(L, n);
+  return 1;
+}
+
+
+/*
+** codepoint(s, [i, [j [, lax]]]) -> returns codepoints for all
+** characters that start in the range [i,j]
+*/
+static int codepoint (lua_State *L) {
+  size_t len;
+  const char *s = luaL_checklstring(L, 1, &len);
+  lua_Integer posi = u_posrelat(luaL_optinteger(L, 2, 1), len);
+  lua_Integer pose = u_posrelat(luaL_optinteger(L, 3, posi), len);
+  int lax = lua_toboolean(L, 4);
+  int n;
+  const char *se;
+  luaL_argcheck(L, posi >= 1, 2, "out of bounds");
+  luaL_argcheck(L, pose <= (lua_Integer)len, 3, "out of bounds");
+  if (posi > pose) return 0;  /* empty interval; return no values */
+  if (pose - posi >= INT_MAX)  /* (lua_Integer -> int) overflow? */
+    return luaL_error(L, "string slice too long");
+  n = (int)(pose -  posi) + 1;  /* upper bound for number of returns */
+  luaL_checkstack(L, n, "string slice too long");
+  n = 0;  /* count the number of returns */
+  se = s + pose;  /* string end */
+  for (s += posi - 1; s < se;) {
+    utfint code;
+    s = utf8_decode(s, &code, !lax);
+    if (s == NULL)
+      return luaL_error(L, MSGInvalid);
+    lua_pushinteger(L, code);
+    n++;
+  }
+  return n;
+}
+
+
+static void pushutfchar (lua_State *L, int arg) {
+  lua_Unsigned code = (lua_Unsigned)luaL_checkinteger(L, arg);
+  luaL_argcheck(L, code <= MAXUTF, arg, "value out of range");
+  lua_pushfstring(L, "%U", (long)code);
+}
+
+
+/*
+** utfchar(n1, n2, ...)  -> char(n1)..char(n2)...
+*/
+static int utfchar (lua_State *L) {
+  int n = lua_gettop(L);  /* number of arguments */
+  if (n == 1)  /* optimize common case of single char */
+    pushutfchar(L, 1);
+  else {
+    int i;
+    luaL_Buffer b;
+    luaL_buffinit(L, &b);
+    for (i = 1; i <= n; i++) {
+      pushutfchar(L, i);
+      luaL_addvalue(&b);
+    }
+    luaL_pushresult(&b);
+  }
+  return 1;
+}
+
+
+/*
+** offset(s, n, [i])  -> index where n-th character counting from
+**   position 'i' starts; 0 means character at 'i'.
+*/
+static int byteoffset (lua_State *L) {
+  size_t len;
+  const char *s = luaL_checklstring(L, 1, &len);
+  lua_Integer n  = luaL_checkinteger(L, 2);
+  lua_Integer posi = (n >= 0) ? 1 : len + 1;
+  posi = u_posrelat(luaL_optinteger(L, 3, posi), len);
+  luaL_argcheck(L, 1 <= posi && --posi <= (lua_Integer)len, 3,
+                   "position out of bounds");
+  if (n == 0) {
+    /* find beginning of current byte sequence */
+    while (posi > 0 && iscontp(s + posi)) posi--;
+  }
+  else {
+    if (iscontp(s + posi))
+      return luaL_error(L, "initial position is a continuation byte");
+    if (n < 0) {
+       while (n < 0 && posi > 0) {  /* move back */
+         do {  /* find beginning of previous character */
+           posi--;
+         } while (posi > 0 && iscontp(s + posi));
+         n++;
+       }
+     }
+     else {
+       n--;  /* do not move for 1st character */
+       while (n > 0 && posi < (lua_Integer)len) {
+         do {  /* find beginning of next character */
+           posi++;
+         } while (iscontp(s + posi));  /* (cannot pass final '\0') */
+         n--;
+       }
+     }
+  }
+  if (n == 0)  /* did it find given character? */
+    lua_pushinteger(L, posi + 1);
+  else  /* no such character */
+    luaL_pushfail(L);
+  return 1;
+}
+
+
+static int iter_aux (lua_State *L, int strict) {
+  size_t len;
+  const char *s = luaL_checklstring(L, 1, &len);
+  lua_Unsigned n = (lua_Unsigned)lua_tointeger(L, 2);
+  if (n < len) {
+    while (iscontp(s + n)) n++;  /* go to next character */
+  }
+  if (n >= len)  /* (also handles original 'n' being negative) */
+    return 0;  /* no more codepoints */
+  else {
+    utfint code;
+    const char *next = utf8_decode(s + n, &code, strict);
+    if (next == NULL || iscontp(next))
+      return luaL_error(L, MSGInvalid);
+    lua_pushinteger(L, n + 1);
+    lua_pushinteger(L, code);
+    return 2;
+  }
+}
+
+
+static int iter_auxstrict (lua_State *L) {
+  return iter_aux(L, 1);
+}
+
+static int iter_auxlax (lua_State *L) {
+  return iter_aux(L, 0);
+}
+
+
+static int iter_codes (lua_State *L) {
+  int lax = lua_toboolean(L, 2);
+  const char *s = luaL_checkstring(L, 1);
+  luaL_argcheck(L, !iscontp(s), 1, MSGInvalid);
+  lua_pushcfunction(L, lax ? iter_auxlax : iter_auxstrict);
+  lua_pushvalue(L, 1);
+  lua_pushinteger(L, 0);
+  return 3;
+}
+
+
+/* pattern to match a single UTF-8 character */
+#define UTF8PATT	"[\0-\x7F\xC2-\xFD][\x80-\xBF]*"
+
+
+static const luaL_Reg funcs[] = {
+  {"offset", byteoffset},
+  {"codepoint", codepoint},
+  {"char", utfchar},
+  {"len", utflen},
+  {"codes", iter_codes},
+  /* placeholders */
+  {"charpattern", NULL},
+  {NULL, NULL}
+};
+
+
+LUAMOD_API int luaopen_utf8 (lua_State *L) {
+  luaL_newlib(L, funcs);
+  lua_pushlstring(L, UTF8PATT, sizeof(UTF8PATT)/sizeof(char) - 1);
+  lua_setfield(L, -2, "charpattern");
+  return 1;
+}
+
diff --git a/src/libs/3rdparty/lua/src/lvm.c b/src/libs/3rdparty/lua/src/lvm.c
new file mode 100644
index 0000000000..8493a770c5
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lvm.c
@@ -0,0 +1,1901 @@
+/*
+** $Id: lvm.c $
+** Lua virtual machine
+** See Copyright Notice in lua.h
+*/
+
+#define lvm_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+#include <float.h>
+#include <limits.h>
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "lua.h"
+
+#include "ldebug.h"
+#include "ldo.h"
+#include "lfunc.h"
+#include "lgc.h"
+#include "lobject.h"
+#include "lopcodes.h"
+#include "lstate.h"
+#include "lstring.h"
+#include "ltable.h"
+#include "ltm.h"
+#include "lvm.h"
+
+
+/*
+** By default, use jump tables in the main interpreter loop on gcc
+** and compatible compilers.
+*/
+#if !defined(LUA_USE_JUMPTABLE)
+#if defined(__GNUC__)
+#define LUA_USE_JUMPTABLE	1
+#else
+#define LUA_USE_JUMPTABLE	0
+#endif
+#endif
+
+
+
+/* limit for table tag-method chains (to avoid infinite loops) */
+#define MAXTAGLOOP	2000
+
+
+/*
+** 'l_intfitsf' checks whether a given integer is in the range that
+** can be converted to a float without rounding. Used in comparisons.
+*/
+
+/* number of bits in the mantissa of a float */
+#define NBM		(l_floatatt(MANT_DIG))
+
+/*
+** Check whether some integers may not fit in a float, testing whether
+** (maxinteger >> NBM) > 0. (That implies (1 << NBM) <= maxinteger.)
+** (The shifts are done in parts, to avoid shifting by more than the size
+** of an integer. In a worst case, NBM == 113 for long double and
+** sizeof(long) == 32.)
+*/
+#if ((((LUA_MAXINTEGER >> (NBM / 4)) >> (NBM / 4)) >> (NBM / 4)) \
+	>> (NBM - (3 * (NBM / 4))))  >  0
+
+/* limit for integers that fit in a float */
+#define MAXINTFITSF	((lua_Unsigned)1 << NBM)
+
+/* check whether 'i' is in the interval [-MAXINTFITSF, MAXINTFITSF] */
+#define l_intfitsf(i)	((MAXINTFITSF + l_castS2U(i)) <= (2 * MAXINTFITSF))
+
+#else  /* all integers fit in a float precisely */
+
+#define l_intfitsf(i)	1
+
+#endif
+
+
+/*
+** Try to convert a value from string to a number value.
+** If the value is not a string or is a string not representing
+** a valid numeral (or if coercions from strings to numbers
+** are disabled via macro 'cvt2num'), do not modify 'result'
+** and return 0.
+*/
+static int l_strton (const TValue *obj, TValue *result) {
+  lua_assert(obj != result);
+  if (!cvt2num(obj))  /* is object not a string? */
+    return 0;
+  else
+    return (luaO_str2num(svalue(obj), result) == vslen(obj) + 1);
+}
+
+
+/*
+** Try to convert a value to a float. The float case is already handled
+** by the macro 'tonumber'.
+*/
+int luaV_tonumber_ (const TValue *obj, lua_Number *n) {
+  TValue v;
+  if (ttisinteger(obj)) {
+    *n = cast_num(ivalue(obj));
+    return 1;
+  }
+  else if (l_strton(obj, &v)) {  /* string coercible to number? */
+    *n = nvalue(&v);  /* convert result of 'luaO_str2num' to a float */
+    return 1;
+  }
+  else
+    return 0;  /* conversion failed */
+}
+
+
+/*
+** try to convert a float to an integer, rounding according to 'mode'.
+*/
+int luaV_flttointeger (lua_Number n, lua_Integer *p, F2Imod mode) {
+  lua_Number f = l_floor(n);
+  if (n != f) {  /* not an integral value? */
+    if (mode == F2Ieq) return 0;  /* fails if mode demands integral value */
+    else if (mode == F2Iceil)  /* needs ceil? */
+      f += 1;  /* convert floor to ceil (remember: n != f) */
+  }
+  return lua_numbertointeger(f, p);
+}
+
+
+/*
+** try to convert a value to an integer, rounding according to 'mode',
+** without string coercion.
+** ("Fast track" handled by macro 'tointegerns'.)
+*/
+int luaV_tointegerns (const TValue *obj, lua_Integer *p, F2Imod mode) {
+  if (ttisfloat(obj))
+    return luaV_flttointeger(fltvalue(obj), p, mode);
+  else if (ttisinteger(obj)) {
+    *p = ivalue(obj);
+    return 1;
+  }
+  else
+    return 0;
+}
+
+
+/*
+** try to convert a value to an integer.
+*/
+int luaV_tointeger (const TValue *obj, lua_Integer *p, F2Imod mode) {
+  TValue v;
+  if (l_strton(obj, &v))  /* does 'obj' point to a numerical string? */
+    obj = &v;  /* change it to point to its corresponding number */
+  return luaV_tointegerns(obj, p, mode);
+}
+
+
+/*
+** Try to convert a 'for' limit to an integer, preserving the semantics
+** of the loop. Return true if the loop must not run; otherwise, '*p'
+** gets the integer limit.
+** (The following explanation assumes a positive step; it is valid for
+** negative steps mutatis mutandis.)
+** If the limit is an integer or can be converted to an integer,
+** rounding down, that is the limit.
+** Otherwise, check whether the limit can be converted to a float. If
+** the float is too large, clip it to LUA_MAXINTEGER.  If the float
+** is too negative, the loop should not run, because any initial
+** integer value is greater than such limit; so, the function returns
+** true to signal that. (For this latter case, no integer limit would be
+** correct; even a limit of LUA_MININTEGER would run the loop once for
+** an initial value equal to LUA_MININTEGER.)
+*/
+static int forlimit (lua_State *L, lua_Integer init, const TValue *lim,
+                                   lua_Integer *p, lua_Integer step) {
+  if (!luaV_tointeger(lim, p, (step < 0 ? F2Iceil : F2Ifloor))) {
+    /* not coercible to in integer */
+    lua_Number flim;  /* try to convert to float */
+    if (!tonumber(lim, &flim)) /* cannot convert to float? */
+      luaG_forerror(L, lim, "limit");
+    /* else 'flim' is a float out of integer bounds */
+    if (luai_numlt(0, flim)) {  /* if it is positive, it is too large */
+      if (step < 0) return 1;  /* initial value must be less than it */
+      *p = LUA_MAXINTEGER;  /* truncate */
+    }
+    else {  /* it is less than min integer */
+      if (step > 0) return 1;  /* initial value must be greater than it */
+      *p = LUA_MININTEGER;  /* truncate */
+    }
+  }
+  return (step > 0 ? init > *p : init < *p);  /* not to run? */
+}
+
+
+/*
+** Prepare a numerical for loop (opcode OP_FORPREP).
+** Return true to skip the loop. Otherwise,
+** after preparation, stack will be as follows:
+**   ra : internal index (safe copy of the control variable)
+**   ra + 1 : loop counter (integer loops) or limit (float loops)
+**   ra + 2 : step
+**   ra + 3 : control variable
+*/
+static int forprep (lua_State *L, StkId ra) {
+  TValue *pinit = s2v(ra);
+  TValue *plimit = s2v(ra + 1);
+  TValue *pstep = s2v(ra + 2);
+  if (ttisinteger(pinit) && ttisinteger(pstep)) { /* integer loop? */
+    lua_Integer init = ivalue(pinit);
+    lua_Integer step = ivalue(pstep);
+    lua_Integer limit;
+    if (step == 0)
+      luaG_runerror(L, "'for' step is zero");
+    setivalue(s2v(ra + 3), init);  /* control variable */
+    if (forlimit(L, init, plimit, &limit, step))
+      return 1;  /* skip the loop */
+    else {  /* prepare loop counter */
+      lua_Unsigned count;
+      if (step > 0) {  /* ascending loop? */
+        count = l_castS2U(limit) - l_castS2U(init);
+        if (step != 1)  /* avoid division in the too common case */
+          count /= l_castS2U(step);
+      }
+      else {  /* step < 0; descending loop */
+        count = l_castS2U(init) - l_castS2U(limit);
+        /* 'step+1' avoids negating 'mininteger' */
+        count /= l_castS2U(-(step + 1)) + 1u;
+      }
+      /* store the counter in place of the limit (which won't be
+         needed anymore) */
+      setivalue(plimit, l_castU2S(count));
+    }
+  }
+  else {  /* try making all values floats */
+    lua_Number init; lua_Number limit; lua_Number step;
+    if (l_unlikely(!tonumber(plimit, &limit)))
+      luaG_forerror(L, plimit, "limit");
+    if (l_unlikely(!tonumber(pstep, &step)))
+      luaG_forerror(L, pstep, "step");
+    if (l_unlikely(!tonumber(pinit, &init)))
+      luaG_forerror(L, pinit, "initial value");
+    if (step == 0)
+      luaG_runerror(L, "'for' step is zero");
+    if (luai_numlt(0, step) ? luai_numlt(limit, init)
+                            : luai_numlt(init, limit))
+      return 1;  /* skip the loop */
+    else {
+      /* make sure internal values are all floats */
+      setfltvalue(plimit, limit);
+      setfltvalue(pstep, step);
+      setfltvalue(s2v(ra), init);  /* internal index */
+      setfltvalue(s2v(ra + 3), init);  /* control variable */
+    }
+  }
+  return 0;
+}
+
+
+/*
+** Execute a step of a float numerical for loop, returning
+** true iff the loop must continue. (The integer case is
+** written online with opcode OP_FORLOOP, for performance.)
+*/
+static int floatforloop (StkId ra) {
+  lua_Number step = fltvalue(s2v(ra + 2));
+  lua_Number limit = fltvalue(s2v(ra + 1));
+  lua_Number idx = fltvalue(s2v(ra));  /* internal index */
+  idx = luai_numadd(L, idx, step);  /* increment index */
+  if (luai_numlt(0, step) ? luai_numle(idx, limit)
+                          : luai_numle(limit, idx)) {
+    chgfltvalue(s2v(ra), idx);  /* update internal index */
+    setfltvalue(s2v(ra + 3), idx);  /* and control variable */
+    return 1;  /* jump back */
+  }
+  else
+    return 0;  /* finish the loop */
+}
+
+
+/*
+** Finish the table access 'val = t[key]'.
+** if 'slot' is NULL, 't' is not a table; otherwise, 'slot' points to
+** t[k] entry (which must be empty).
+*/
+void luaV_finishget (lua_State *L, const TValue *t, TValue *key, StkId val,
+                      const TValue *slot) {
+  int loop;  /* counter to avoid infinite loops */
+  const TValue *tm;  /* metamethod */
+  for (loop = 0; loop < MAXTAGLOOP; loop++) {
+    if (slot == NULL) {  /* 't' is not a table? */
+      lua_assert(!ttistable(t));
+      tm = luaT_gettmbyobj(L, t, TM_INDEX);
+      if (l_unlikely(notm(tm)))
+        luaG_typeerror(L, t, "index");  /* no metamethod */
+      /* else will try the metamethod */
+    }
+    else {  /* 't' is a table */
+      lua_assert(isempty(slot));
+      tm = fasttm(L, hvalue(t)->metatable, TM_INDEX);  /* table's metamethod */
+      if (tm == NULL) {  /* no metamethod? */
+        setnilvalue(s2v(val));  /* result is nil */
+        return;
+      }
+      /* else will try the metamethod */
+    }
+    if (ttisfunction(tm)) {  /* is metamethod a function? */
+      luaT_callTMres(L, tm, t, key, val);  /* call it */
+      return;
+    }
+    t = tm;  /* else try to access 'tm[key]' */
+    if (luaV_fastget(L, t, key, slot, luaH_get)) {  /* fast track? */
+      setobj2s(L, val, slot);  /* done */
+      return;
+    }
+    /* else repeat (tail call 'luaV_finishget') */
+  }
+  luaG_runerror(L, "'__index' chain too long; possible loop");
+}
+
+
+/*
+** Finish a table assignment 't[key] = val'.
+** If 'slot' is NULL, 't' is not a table.  Otherwise, 'slot' points
+** to the entry 't[key]', or to a value with an absent key if there
+** is no such entry.  (The value at 'slot' must be empty, otherwise
+** 'luaV_fastget' would have done the job.)
+*/
+void luaV_finishset (lua_State *L, const TValue *t, TValue *key,
+                     TValue *val, const TValue *slot) {
+  int loop;  /* counter to avoid infinite loops */
+  for (loop = 0; loop < MAXTAGLOOP; loop++) {
+    const TValue *tm;  /* '__newindex' metamethod */
+    if (slot != NULL) {  /* is 't' a table? */
+      Table *h = hvalue(t);  /* save 't' table */
+      lua_assert(isempty(slot));  /* slot must be empty */
+      tm = fasttm(L, h->metatable, TM_NEWINDEX);  /* get metamethod */
+      if (tm == NULL) {  /* no metamethod? */
+        luaH_finishset(L, h, key, slot, val);  /* set new value */
+        invalidateTMcache(h);
+        luaC_barrierback(L, obj2gco(h), val);
+        return;
+      }
+      /* else will try the metamethod */
+    }
+    else {  /* not a table; check metamethod */
+      tm = luaT_gettmbyobj(L, t, TM_NEWINDEX);
+      if (l_unlikely(notm(tm)))
+        luaG_typeerror(L, t, "index");
+    }
+    /* try the metamethod */
+    if (ttisfunction(tm)) {
+      luaT_callTM(L, tm, t, key, val);
+      return;
+    }
+    t = tm;  /* else repeat assignment over 'tm' */
+    if (luaV_fastget(L, t, key, slot, luaH_get)) {
+      luaV_finishfastset(L, t, slot, val);
+      return;  /* done */
+    }
+    /* else 'return luaV_finishset(L, t, key, val, slot)' (loop) */
+  }
+  luaG_runerror(L, "'__newindex' chain too long; possible loop");
+}
+
+
+/*
+** Compare two strings 'ls' x 'rs', returning an integer less-equal-
+** -greater than zero if 'ls' is less-equal-greater than 'rs'.
+** The code is a little tricky because it allows '\0' in the strings
+** and it uses 'strcoll' (to respect locales) for each segments
+** of the strings.
+*/
+static int l_strcmp (const TString *ls, const TString *rs) {
+  const char *l = getstr(ls);
+  size_t ll = tsslen(ls);
+  const char *r = getstr(rs);
+  size_t lr = tsslen(rs);
+  for (;;) {  /* for each segment */
+    int temp = strcoll(l, r);
+    if (temp != 0)  /* not equal? */
+      return temp;  /* done */
+    else {  /* strings are equal up to a '\0' */
+      size_t len = strlen(l);  /* index of first '\0' in both strings */
+      if (len == lr)  /* 'rs' is finished? */
+        return (len == ll) ? 0 : 1;  /* check 'ls' */
+      else if (len == ll)  /* 'ls' is finished? */
+        return -1;  /* 'ls' is less than 'rs' ('rs' is not finished) */
+      /* both strings longer than 'len'; go on comparing after the '\0' */
+      len++;
+      l += len; ll -= len; r += len; lr -= len;
+    }
+  }
+}
+
+
+/*
+** Check whether integer 'i' is less than float 'f'. If 'i' has an
+** exact representation as a float ('l_intfitsf'), compare numbers as
+** floats. Otherwise, use the equivalence 'i < f <=> i < ceil(f)'.
+** If 'ceil(f)' is out of integer range, either 'f' is greater than
+** all integers or less than all integers.
+** (The test with 'l_intfitsf' is only for performance; the else
+** case is correct for all values, but it is slow due to the conversion
+** from float to int.)
+** When 'f' is NaN, comparisons must result in false.
+*/
+l_sinline int LTintfloat (lua_Integer i, lua_Number f) {
+  if (l_intfitsf(i))
+    return luai_numlt(cast_num(i), f);  /* compare them as floats */
+  else {  /* i < f <=> i < ceil(f) */
+    lua_Integer fi;
+    if (luaV_flttointeger(f, &fi, F2Iceil))  /* fi = ceil(f) */
+      return i < fi;   /* compare them as integers */
+    else  /* 'f' is either greater or less than all integers */
+      return f > 0;  /* greater? */
+  }
+}
+
+
+/*
+** Check whether integer 'i' is less than or equal to float 'f'.
+** See comments on previous function.
+*/
+l_sinline int LEintfloat (lua_Integer i, lua_Number f) {
+  if (l_intfitsf(i))
+    return luai_numle(cast_num(i), f);  /* compare them as floats */
+  else {  /* i <= f <=> i <= floor(f) */
+    lua_Integer fi;
+    if (luaV_flttointeger(f, &fi, F2Ifloor))  /* fi = floor(f) */
+      return i <= fi;   /* compare them as integers */
+    else  /* 'f' is either greater or less than all integers */
+      return f > 0;  /* greater? */
+  }
+}
+
+
+/*
+** Check whether float 'f' is less than integer 'i'.
+** See comments on previous function.
+*/
+l_sinline int LTfloatint (lua_Number f, lua_Integer i) {
+  if (l_intfitsf(i))
+    return luai_numlt(f, cast_num(i));  /* compare them as floats */
+  else {  /* f < i <=> floor(f) < i */
+    lua_Integer fi;
+    if (luaV_flttointeger(f, &fi, F2Ifloor))  /* fi = floor(f) */
+      return fi < i;   /* compare them as integers */
+    else  /* 'f' is either greater or less than all integers */
+      return f < 0;  /* less? */
+  }
+}
+
+
+/*
+** Check whether float 'f' is less than or equal to integer 'i'.
+** See comments on previous function.
+*/
+l_sinline int LEfloatint (lua_Number f, lua_Integer i) {
+  if (l_intfitsf(i))
+    return luai_numle(f, cast_num(i));  /* compare them as floats */
+  else {  /* f <= i <=> ceil(f) <= i */
+    lua_Integer fi;
+    if (luaV_flttointeger(f, &fi, F2Iceil))  /* fi = ceil(f) */
+      return fi <= i;   /* compare them as integers */
+    else  /* 'f' is either greater or less than all integers */
+      return f < 0;  /* less? */
+  }
+}
+
+
+/*
+** Return 'l < r', for numbers.
+*/
+l_sinline int LTnum (const TValue *l, const TValue *r) {
+  lua_assert(ttisnumber(l) && ttisnumber(r));
+  if (ttisinteger(l)) {
+    lua_Integer li = ivalue(l);
+    if (ttisinteger(r))
+      return li < ivalue(r);  /* both are integers */
+    else  /* 'l' is int and 'r' is float */
+      return LTintfloat(li, fltvalue(r));  /* l < r ? */
+  }
+  else {
+    lua_Number lf = fltvalue(l);  /* 'l' must be float */
+    if (ttisfloat(r))
+      return luai_numlt(lf, fltvalue(r));  /* both are float */
+    else  /* 'l' is float and 'r' is int */
+      return LTfloatint(lf, ivalue(r));
+  }
+}
+
+
+/*
+** Return 'l <= r', for numbers.
+*/
+l_sinline int LEnum (const TValue *l, const TValue *r) {
+  lua_assert(ttisnumber(l) && ttisnumber(r));
+  if (ttisinteger(l)) {
+    lua_Integer li = ivalue(l);
+    if (ttisinteger(r))
+      return li <= ivalue(r);  /* both are integers */
+    else  /* 'l' is int and 'r' is float */
+      return LEintfloat(li, fltvalue(r));  /* l <= r ? */
+  }
+  else {
+    lua_Number lf = fltvalue(l);  /* 'l' must be float */
+    if (ttisfloat(r))
+      return luai_numle(lf, fltvalue(r));  /* both are float */
+    else  /* 'l' is float and 'r' is int */
+      return LEfloatint(lf, ivalue(r));
+  }
+}
+
+
+/*
+** return 'l < r' for non-numbers.
+*/
+static int lessthanothers (lua_State *L, const TValue *l, const TValue *r) {
+  lua_assert(!ttisnumber(l) || !ttisnumber(r));
+  if (ttisstring(l) && ttisstring(r))  /* both are strings? */
+    return l_strcmp(tsvalue(l), tsvalue(r)) < 0;
+  else
+    return luaT_callorderTM(L, l, r, TM_LT);
+}
+
+
+/*
+** Main operation less than; return 'l < r'.
+*/
+int luaV_lessthan (lua_State *L, const TValue *l, const TValue *r) {
+  if (ttisnumber(l) && ttisnumber(r))  /* both operands are numbers? */
+    return LTnum(l, r);
+  else return lessthanothers(L, l, r);
+}
+
+
+/*
+** return 'l <= r' for non-numbers.
+*/
+static int lessequalothers (lua_State *L, const TValue *l, const TValue *r) {
+  lua_assert(!ttisnumber(l) || !ttisnumber(r));
+  if (ttisstring(l) && ttisstring(r))  /* both are strings? */
+    return l_strcmp(tsvalue(l), tsvalue(r)) <= 0;
+  else
+    return luaT_callorderTM(L, l, r, TM_LE);
+}
+
+
+/*
+** Main operation less than or equal to; return 'l <= r'.
+*/
+int luaV_lessequal (lua_State *L, const TValue *l, const TValue *r) {
+  if (ttisnumber(l) && ttisnumber(r))  /* both operands are numbers? */
+    return LEnum(l, r);
+  else return lessequalothers(L, l, r);
+}
+
+
+/*
+** Main operation for equality of Lua values; return 't1 == t2'.
+** L == NULL means raw equality (no metamethods)
+*/
+int luaV_equalobj (lua_State *L, const TValue *t1, const TValue *t2) {
+  const TValue *tm;
+  if (ttypetag(t1) != ttypetag(t2)) {  /* not the same variant? */
+    if (ttype(t1) != ttype(t2) || ttype(t1) != LUA_TNUMBER)
+      return 0;  /* only numbers can be equal with different variants */
+    else {  /* two numbers with different variants */
+      /* One of them is an integer. If the other does not have an
+         integer value, they cannot be equal; otherwise, compare their
+         integer values. */
+      lua_Integer i1, i2;
+      return (luaV_tointegerns(t1, &i1, F2Ieq) &&
+              luaV_tointegerns(t2, &i2, F2Ieq) &&
+              i1 == i2);
+    }
+  }
+  /* values have same type and same variant */
+  switch (ttypetag(t1)) {
+    case LUA_VNIL: case LUA_VFALSE: case LUA_VTRUE: return 1;
+    case LUA_VNUMINT: return (ivalue(t1) == ivalue(t2));
+    case LUA_VNUMFLT: return luai_numeq(fltvalue(t1), fltvalue(t2));
+    case LUA_VLIGHTUSERDATA: return pvalue(t1) == pvalue(t2);
+    case LUA_VLCF: return fvalue(t1) == fvalue(t2);
+    case LUA_VSHRSTR: return eqshrstr(tsvalue(t1), tsvalue(t2));
+    case LUA_VLNGSTR: return luaS_eqlngstr(tsvalue(t1), tsvalue(t2));
+    case LUA_VUSERDATA: {
+      if (uvalue(t1) == uvalue(t2)) return 1;
+      else if (L == NULL) return 0;
+      tm = fasttm(L, uvalue(t1)->metatable, TM_EQ);
+      if (tm == NULL)
+        tm = fasttm(L, uvalue(t2)->metatable, TM_EQ);
+      break;  /* will try TM */
+    }
+    case LUA_VTABLE: {
+      if (hvalue(t1) == hvalue(t2)) return 1;
+      else if (L == NULL) return 0;
+      tm = fasttm(L, hvalue(t1)->metatable, TM_EQ);
+      if (tm == NULL)
+        tm = fasttm(L, hvalue(t2)->metatable, TM_EQ);
+      break;  /* will try TM */
+    }
+    default:
+      return gcvalue(t1) == gcvalue(t2);
+  }
+  if (tm == NULL)  /* no TM? */
+    return 0;  /* objects are different */
+  else {
+    luaT_callTMres(L, tm, t1, t2, L->top.p);  /* call TM */
+    return !l_isfalse(s2v(L->top.p));
+  }
+}
+
+
+/* macro used by 'luaV_concat' to ensure that element at 'o' is a string */
+#define tostring(L,o)  \
+	(ttisstring(o) || (cvt2str(o) && (luaO_tostring(L, o), 1)))
+
+#define isemptystr(o)	(ttisshrstring(o) && tsvalue(o)->shrlen == 0)
+
+/* copy strings in stack from top - n up to top - 1 to buffer */
+static void copy2buff (StkId top, int n, char *buff) {
+  size_t tl = 0;  /* size already copied */
+  do {
+    size_t l = vslen(s2v(top - n));  /* length of string being copied */
+    memcpy(buff + tl, svalue(s2v(top - n)), l * sizeof(char));
+    tl += l;
+  } while (--n > 0);
+}
+
+
+/*
+** Main operation for concatenation: concat 'total' values in the stack,
+** from 'L->top.p - total' up to 'L->top.p - 1'.
+*/
+void luaV_concat (lua_State *L, int total) {
+  if (total == 1)
+    return;  /* "all" values already concatenated */
+  do {
+    StkId top = L->top.p;
+    int n = 2;  /* number of elements handled in this pass (at least 2) */
+    if (!(ttisstring(s2v(top - 2)) || cvt2str(s2v(top - 2))) ||
+        !tostring(L, s2v(top - 1)))
+      luaT_tryconcatTM(L);  /* may invalidate 'top' */
+    else if (isemptystr(s2v(top - 1)))  /* second operand is empty? */
+      cast_void(tostring(L, s2v(top - 2)));  /* result is first operand */
+    else if (isemptystr(s2v(top - 2))) {  /* first operand is empty string? */
+      setobjs2s(L, top - 2, top - 1);  /* result is second op. */
+    }
+    else {
+      /* at least two non-empty string values; get as many as possible */
+      size_t tl = vslen(s2v(top - 1));
+      TString *ts;
+      /* collect total length and number of strings */
+      for (n = 1; n < total && tostring(L, s2v(top - n - 1)); n++) {
+        size_t l = vslen(s2v(top - n - 1));
+        if (l_unlikely(l >= (MAX_SIZE/sizeof(char)) - tl)) {
+          L->top.p = top - total;  /* pop strings to avoid wasting stack */
+          luaG_runerror(L, "string length overflow");
+        }
+        tl += l;
+      }
+      if (tl <= LUAI_MAXSHORTLEN) {  /* is result a short string? */
+        char buff[LUAI_MAXSHORTLEN];
+        copy2buff(top, n, buff);  /* copy strings to buffer */
+        ts = luaS_newlstr(L, buff, tl);
+      }
+      else {  /* long string; copy strings directly to final result */
+        ts = luaS_createlngstrobj(L, tl);
+        copy2buff(top, n, getstr(ts));
+      }
+      setsvalue2s(L, top - n, ts);  /* create result */
+    }
+    total -= n - 1;  /* got 'n' strings to create one new */
+    L->top.p -= n - 1;  /* popped 'n' strings and pushed one */
+  } while (total > 1);  /* repeat until only 1 result left */
+}
+
+
+/*
+** Main operation 'ra = #rb'.
+*/
+void luaV_objlen (lua_State *L, StkId ra, const TValue *rb) {
+  const TValue *tm;
+  switch (ttypetag(rb)) {
+    case LUA_VTABLE: {
+      Table *h = hvalue(rb);
+      tm = fasttm(L, h->metatable, TM_LEN);
+      if (tm) break;  /* metamethod? break switch to call it */
+      setivalue(s2v(ra), luaH_getn(h));  /* else primitive len */
+      return;
+    }
+    case LUA_VSHRSTR: {
+      setivalue(s2v(ra), tsvalue(rb)->shrlen);
+      return;
+    }
+    case LUA_VLNGSTR: {
+      setivalue(s2v(ra), tsvalue(rb)->u.lnglen);
+      return;
+    }
+    default: {  /* try metamethod */
+      tm = luaT_gettmbyobj(L, rb, TM_LEN);
+      if (l_unlikely(notm(tm)))  /* no metamethod? */
+        luaG_typeerror(L, rb, "get length of");
+      break;
+    }
+  }
+  luaT_callTMres(L, tm, rb, rb, ra);
+}
+
+
+/*
+** Integer division; return 'm // n', that is, floor(m/n).
+** C division truncates its result (rounds towards zero).
+** 'floor(q) == trunc(q)' when 'q >= 0' or when 'q' is integer,
+** otherwise 'floor(q) == trunc(q) - 1'.
+*/
+lua_Integer luaV_idiv (lua_State *L, lua_Integer m, lua_Integer n) {
+  if (l_unlikely(l_castS2U(n) + 1u <= 1u)) {  /* special cases: -1 or 0 */
+    if (n == 0)
+      luaG_runerror(L, "attempt to divide by zero");
+    return intop(-, 0, m);   /* n==-1; avoid overflow with 0x80000...//-1 */
+  }
+  else {
+    lua_Integer q = m / n;  /* perform C division */
+    if ((m ^ n) < 0 && m % n != 0)  /* 'm/n' would be negative non-integer? */
+      q -= 1;  /* correct result for different rounding */
+    return q;
+  }
+}
+
+
+/*
+** Integer modulus; return 'm % n'. (Assume that C '%' with
+** negative operands follows C99 behavior. See previous comment
+** about luaV_idiv.)
+*/
+lua_Integer luaV_mod (lua_State *L, lua_Integer m, lua_Integer n) {
+  if (l_unlikely(l_castS2U(n) + 1u <= 1u)) {  /* special cases: -1 or 0 */
+    if (n == 0)
+      luaG_runerror(L, "attempt to perform 'n%%0'");
+    return 0;   /* m % -1 == 0; avoid overflow with 0x80000...%-1 */
+  }
+  else {
+    lua_Integer r = m % n;
+    if (r != 0 && (r ^ n) < 0)  /* 'm/n' would be non-integer negative? */
+      r += n;  /* correct result for different rounding */
+    return r;
+  }
+}
+
+
+/*
+** Float modulus
+*/
+lua_Number luaV_modf (lua_State *L, lua_Number m, lua_Number n) {
+  lua_Number r;
+  luai_nummod(L, m, n, r);
+  return r;
+}
+
+
+/* number of bits in an integer */
+#define NBITS	cast_int(sizeof(lua_Integer) * CHAR_BIT)
+
+
+/*
+** Shift left operation. (Shift right just negates 'y'.)
+*/
+lua_Integer luaV_shiftl (lua_Integer x, lua_Integer y) {
+  if (y < 0) {  /* shift right? */
+    if (y <= -NBITS) return 0;
+    else return intop(>>, x, -y);
+  }
+  else {  /* shift left */
+    if (y >= NBITS) return 0;
+    else return intop(<<, x, y);
+  }
+}
+
+
+/*
+** create a new Lua closure, push it in the stack, and initialize
+** its upvalues.
+*/
+static void pushclosure (lua_State *L, Proto *p, UpVal **encup, StkId base,
+                         StkId ra) {
+  int nup = p->sizeupvalues;
+  Upvaldesc *uv = p->upvalues;
+  int i;
+  LClosure *ncl = luaF_newLclosure(L, nup);
+  ncl->p = p;
+  setclLvalue2s(L, ra, ncl);  /* anchor new closure in stack */
+  for (i = 0; i < nup; i++) {  /* fill in its upvalues */
+    if (uv[i].instack)  /* upvalue refers to local variable? */
+      ncl->upvals[i] = luaF_findupval(L, base + uv[i].idx);
+    else  /* get upvalue from enclosing function */
+      ncl->upvals[i] = encup[uv[i].idx];
+    luaC_objbarrier(L, ncl, ncl->upvals[i]);
+  }
+}
+
+
+/*
+** finish execution of an opcode interrupted by a yield
+*/
+void luaV_finishOp (lua_State *L) {
+  CallInfo *ci = L->ci;
+  StkId base = ci->func.p + 1;
+  Instruction inst = *(ci->u.l.savedpc - 1);  /* interrupted instruction */
+  OpCode op = GET_OPCODE(inst);
+  switch (op) {  /* finish its execution */
+    case OP_MMBIN: case OP_MMBINI: case OP_MMBINK: {
+      setobjs2s(L, base + GETARG_A(*(ci->u.l.savedpc - 2)), --L->top.p);
+      break;
+    }
+    case OP_UNM: case OP_BNOT: case OP_LEN:
+    case OP_GETTABUP: case OP_GETTABLE: case OP_GETI:
+    case OP_GETFIELD: case OP_SELF: {
+      setobjs2s(L, base + GETARG_A(inst), --L->top.p);
+      break;
+    }
+    case OP_LT: case OP_LE:
+    case OP_LTI: case OP_LEI:
+    case OP_GTI: case OP_GEI:
+    case OP_EQ: {  /* note that 'OP_EQI'/'OP_EQK' cannot yield */
+      int res = !l_isfalse(s2v(L->top.p - 1));
+      L->top.p--;
+#if defined(LUA_COMPAT_LT_LE)
+      if (ci->callstatus & CIST_LEQ) {  /* "<=" using "<" instead? */
+        ci->callstatus ^= CIST_LEQ;  /* clear mark */
+        res = !res;  /* negate result */
+      }
+#endif
+      lua_assert(GET_OPCODE(*ci->u.l.savedpc) == OP_JMP);
+      if (res != GETARG_k(inst))  /* condition failed? */
+        ci->u.l.savedpc++;  /* skip jump instruction */
+      break;
+    }
+    case OP_CONCAT: {
+      StkId top = L->top.p - 1;  /* top when 'luaT_tryconcatTM' was called */
+      int a = GETARG_A(inst);      /* first element to concatenate */
+      int total = cast_int(top - 1 - (base + a));  /* yet to concatenate */
+      setobjs2s(L, top - 2, top);  /* put TM result in proper position */
+      L->top.p = top - 1;  /* top is one after last element (at top-2) */
+      luaV_concat(L, total);  /* concat them (may yield again) */
+      break;
+    }
+    case OP_CLOSE: {  /* yielded closing variables */
+      ci->u.l.savedpc--;  /* repeat instruction to close other vars. */
+      break;
+    }
+    case OP_RETURN: {  /* yielded closing variables */
+      StkId ra = base + GETARG_A(inst);
+      /* adjust top to signal correct number of returns, in case the
+         return is "up to top" ('isIT') */
+      L->top.p = ra + ci->u2.nres;
+      /* repeat instruction to close other vars. and complete the return */
+      ci->u.l.savedpc--;
+      break;
+    }
+    default: {
+      /* only these other opcodes can yield */
+      lua_assert(op == OP_TFORCALL || op == OP_CALL ||
+           op == OP_TAILCALL || op == OP_SETTABUP || op == OP_SETTABLE ||
+           op == OP_SETI || op == OP_SETFIELD);
+      break;
+    }
+  }
+}
+
+
+
+
+/*
+** {==================================================================
+** Macros for arithmetic/bitwise/comparison opcodes in 'luaV_execute'
+** ===================================================================
+*/
+
+#define l_addi(L,a,b)	intop(+, a, b)
+#define l_subi(L,a,b)	intop(-, a, b)
+#define l_muli(L,a,b)	intop(*, a, b)
+#define l_band(a,b)	intop(&, a, b)
+#define l_bor(a,b)	intop(|, a, b)
+#define l_bxor(a,b)	intop(^, a, b)
+
+#define l_lti(a,b)	(a < b)
+#define l_lei(a,b)	(a <= b)
+#define l_gti(a,b)	(a > b)
+#define l_gei(a,b)	(a >= b)
+
+
+/*
+** Arithmetic operations with immediate operands. 'iop' is the integer
+** operation, 'fop' is the float operation.
+*/
+#define op_arithI(L,iop,fop) {  \
+  StkId ra = RA(i); \
+  TValue *v1 = vRB(i);  \
+  int imm = GETARG_sC(i);  \
+  if (ttisinteger(v1)) {  \
+    lua_Integer iv1 = ivalue(v1);  \
+    pc++; setivalue(s2v(ra), iop(L, iv1, imm));  \
+  }  \
+  else if (ttisfloat(v1)) {  \
+    lua_Number nb = fltvalue(v1);  \
+    lua_Number fimm = cast_num(imm);  \
+    pc++; setfltvalue(s2v(ra), fop(L, nb, fimm)); \
+  }}
+
+
+/*
+** Auxiliary function for arithmetic operations over floats and others
+** with two register operands.
+*/
+#define op_arithf_aux(L,v1,v2,fop) {  \
+  lua_Number n1; lua_Number n2;  \
+  if (tonumberns(v1, n1) && tonumberns(v2, n2)) {  \
+    pc++; setfltvalue(s2v(ra), fop(L, n1, n2));  \
+  }}
+
+
+/*
+** Arithmetic operations over floats and others with register operands.
+*/
+#define op_arithf(L,fop) {  \
+  StkId ra = RA(i); \
+  TValue *v1 = vRB(i);  \
+  TValue *v2 = vRC(i);  \
+  op_arithf_aux(L, v1, v2, fop); }
+
+
+/*
+** Arithmetic operations with K operands for floats.
+*/
+#define op_arithfK(L,fop) {  \
+  StkId ra = RA(i); \
+  TValue *v1 = vRB(i);  \
+  TValue *v2 = KC(i); lua_assert(ttisnumber(v2));  \
+  op_arithf_aux(L, v1, v2, fop); }
+
+
+/*
+** Arithmetic operations over integers and floats.
+*/
+#define op_arith_aux(L,v1,v2,iop,fop) {  \
+  StkId ra = RA(i); \
+  if (ttisinteger(v1) && ttisinteger(v2)) {  \
+    lua_Integer i1 = ivalue(v1); lua_Integer i2 = ivalue(v2);  \
+    pc++; setivalue(s2v(ra), iop(L, i1, i2));  \
+  }  \
+  else op_arithf_aux(L, v1, v2, fop); }
+
+
+/*
+** Arithmetic operations with register operands.
+*/
+#define op_arith(L,iop,fop) {  \
+  TValue *v1 = vRB(i);  \
+  TValue *v2 = vRC(i);  \
+  op_arith_aux(L, v1, v2, iop, fop); }
+
+
+/*
+** Arithmetic operations with K operands.
+*/
+#define op_arithK(L,iop,fop) {  \
+  TValue *v1 = vRB(i);  \
+  TValue *v2 = KC(i); lua_assert(ttisnumber(v2));  \
+  op_arith_aux(L, v1, v2, iop, fop); }
+
+
+/*
+** Bitwise operations with constant operand.
+*/
+#define op_bitwiseK(L,op) {  \
+  StkId ra = RA(i); \
+  TValue *v1 = vRB(i);  \
+  TValue *v2 = KC(i);  \
+  lua_Integer i1;  \
+  lua_Integer i2 = ivalue(v2);  \
+  if (tointegerns(v1, &i1)) {  \
+    pc++; setivalue(s2v(ra), op(i1, i2));  \
+  }}
+
+
+/*
+** Bitwise operations with register operands.
+*/
+#define op_bitwise(L,op) {  \
+  StkId ra = RA(i); \
+  TValue *v1 = vRB(i);  \
+  TValue *v2 = vRC(i);  \
+  lua_Integer i1; lua_Integer i2;  \
+  if (tointegerns(v1, &i1) && tointegerns(v2, &i2)) {  \
+    pc++; setivalue(s2v(ra), op(i1, i2));  \
+  }}
+
+
+/*
+** Order operations with register operands. 'opn' actually works
+** for all numbers, but the fast track improves performance for
+** integers.
+*/
+#define op_order(L,opi,opn,other) {  \
+  StkId ra = RA(i); \
+  int cond;  \
+  TValue *rb = vRB(i);  \
+  if (ttisinteger(s2v(ra)) && ttisinteger(rb)) {  \
+    lua_Integer ia = ivalue(s2v(ra));  \
+    lua_Integer ib = ivalue(rb);  \
+    cond = opi(ia, ib);  \
+  }  \
+  else if (ttisnumber(s2v(ra)) && ttisnumber(rb))  \
+    cond = opn(s2v(ra), rb);  \
+  else  \
+    Protect(cond = other(L, s2v(ra), rb));  \
+  docondjump(); }
+
+
+/*
+** Order operations with immediate operand. (Immediate operand is
+** always small enough to have an exact representation as a float.)
+*/
+#define op_orderI(L,opi,opf,inv,tm) {  \
+  StkId ra = RA(i); \
+  int cond;  \
+  int im = GETARG_sB(i);  \
+  if (ttisinteger(s2v(ra)))  \
+    cond = opi(ivalue(s2v(ra)), im);  \
+  else if (ttisfloat(s2v(ra))) {  \
+    lua_Number fa = fltvalue(s2v(ra));  \
+    lua_Number fim = cast_num(im);  \
+    cond = opf(fa, fim);  \
+  }  \
+  else {  \
+    int isf = GETARG_C(i);  \
+    Protect(cond = luaT_callorderiTM(L, s2v(ra), im, inv, isf, tm));  \
+  }  \
+  docondjump(); }
+
+/* }================================================================== */
+
+
+/*
+** {==================================================================
+** Function 'luaV_execute': main interpreter loop
+** ===================================================================
+*/
+
+/*
+** some macros for common tasks in 'luaV_execute'
+*/
+
+
+#define RA(i)	(base+GETARG_A(i))
+#define RB(i)	(base+GETARG_B(i))
+#define vRB(i)	s2v(RB(i))
+#define KB(i)	(k+GETARG_B(i))
+#define RC(i)	(base+GETARG_C(i))
+#define vRC(i)	s2v(RC(i))
+#define KC(i)	(k+GETARG_C(i))
+#define RKC(i)	((TESTARG_k(i)) ? k + GETARG_C(i) : s2v(base + GETARG_C(i)))
+
+
+
+#define updatetrap(ci)  (trap = ci->u.l.trap)
+
+#define updatebase(ci)	(base = ci->func.p + 1)
+
+
+#define updatestack(ci)  \
+	{ if (l_unlikely(trap)) { updatebase(ci); ra = RA(i); } }
+
+
+/*
+** Execute a jump instruction. The 'updatetrap' allows signals to stop
+** tight loops. (Without it, the local copy of 'trap' could never change.)
+*/
+#define dojump(ci,i,e)	{ pc += GETARG_sJ(i) + e; updatetrap(ci); }
+
+
+/* for test instructions, execute the jump instruction that follows it */
+#define donextjump(ci)	{ Instruction ni = *pc; dojump(ci, ni, 1); }
+
+/*
+** do a conditional jump: skip next instruction if 'cond' is not what
+** was expected (parameter 'k'), else do next instruction, which must
+** be a jump.
+*/
+#define docondjump()	if (cond != GETARG_k(i)) pc++; else donextjump(ci);
+
+
+/*
+** Correct global 'pc'.
+*/
+#define savepc(L)	(ci->u.l.savedpc = pc)
+
+
+/*
+** Whenever code can raise errors, the global 'pc' and the global
+** 'top' must be correct to report occasional errors.
+*/
+#define savestate(L,ci)		(savepc(L), L->top.p = ci->top.p)
+
+
+/*
+** Protect code that, in general, can raise errors, reallocate the
+** stack, and change the hooks.
+*/
+#define Protect(exp)  (savestate(L,ci), (exp), updatetrap(ci))
+
+/* special version that does not change the top */
+#define ProtectNT(exp)  (savepc(L), (exp), updatetrap(ci))
+
+/*
+** Protect code that can only raise errors. (That is, it cannot change
+** the stack or hooks.)
+*/
+#define halfProtect(exp)  (savestate(L,ci), (exp))
+
+/* 'c' is the limit of live values in the stack */
+#define checkGC(L,c)  \
+	{ luaC_condGC(L, (savepc(L), L->top.p = (c)), \
+                         updatetrap(ci)); \
+           luai_threadyield(L); }
+
+
+/* fetch an instruction and prepare its execution */
+#define vmfetch()	{ \
+  if (l_unlikely(trap)) {  /* stack reallocation or hooks? */ \
+    trap = luaG_traceexec(L, pc);  /* handle hooks */ \
+    updatebase(ci);  /* correct stack */ \
+  } \
+  i = *(pc++); \
+}
+
+#define vmdispatch(o)	switch(o)
+#define vmcase(l)	case l:
+#define vmbreak		break
+
+
+void luaV_execute (lua_State *L, CallInfo *ci) {
+  LClosure *cl;
+  TValue *k;
+  StkId base;
+  const Instruction *pc;
+  int trap;
+#if LUA_USE_JUMPTABLE
+#include "ljumptab.h"
+#endif
+ startfunc:
+  trap = L->hookmask;
+ returning:  /* trap already set */
+  cl = clLvalue(s2v(ci->func.p));
+  k = cl->p->k;
+  pc = ci->u.l.savedpc;
+  if (l_unlikely(trap)) {
+    if (pc == cl->p->code) {  /* first instruction (not resuming)? */
+      if (cl->p->is_vararg)
+        trap = 0;  /* hooks will start after VARARGPREP instruction */
+      else  /* check 'call' hook */
+        luaD_hookcall(L, ci);
+    }
+    ci->u.l.trap = 1;  /* assume trap is on, for now */
+  }
+  base = ci->func.p + 1;
+  /* main loop of interpreter */
+  for (;;) {
+    Instruction i;  /* instruction being executed */
+    vmfetch();
+    #if 0
+      /* low-level line tracing for debugging Lua */
+      printf("line: %d\n", luaG_getfuncline(cl->p, pcRel(pc, cl->p)));
+    #endif
+    lua_assert(base == ci->func.p + 1);
+    lua_assert(base <= L->top.p && L->top.p <= L->stack_last.p);
+    /* invalidate top for instructions not expecting it */
+    lua_assert(isIT(i) || (cast_void(L->top.p = base), 1));
+    vmdispatch (GET_OPCODE(i)) {
+      vmcase(OP_MOVE) {
+        StkId ra = RA(i);
+        setobjs2s(L, ra, RB(i));
+        vmbreak;
+      }
+      vmcase(OP_LOADI) {
+        StkId ra = RA(i);
+        lua_Integer b = GETARG_sBx(i);
+        setivalue(s2v(ra), b);
+        vmbreak;
+      }
+      vmcase(OP_LOADF) {
+        StkId ra = RA(i);
+        int b = GETARG_sBx(i);
+        setfltvalue(s2v(ra), cast_num(b));
+        vmbreak;
+      }
+      vmcase(OP_LOADK) {
+        StkId ra = RA(i);
+        TValue *rb = k + GETARG_Bx(i);
+        setobj2s(L, ra, rb);
+        vmbreak;
+      }
+      vmcase(OP_LOADKX) {
+        StkId ra = RA(i);
+        TValue *rb;
+        rb = k + GETARG_Ax(*pc); pc++;
+        setobj2s(L, ra, rb);
+        vmbreak;
+      }
+      vmcase(OP_LOADFALSE) {
+        StkId ra = RA(i);
+        setbfvalue(s2v(ra));
+        vmbreak;
+      }
+      vmcase(OP_LFALSESKIP) {
+        StkId ra = RA(i);
+        setbfvalue(s2v(ra));
+        pc++;  /* skip next instruction */
+        vmbreak;
+      }
+      vmcase(OP_LOADTRUE) {
+        StkId ra = RA(i);
+        setbtvalue(s2v(ra));
+        vmbreak;
+      }
+      vmcase(OP_LOADNIL) {
+        StkId ra = RA(i);
+        int b = GETARG_B(i);
+        do {
+          setnilvalue(s2v(ra++));
+        } while (b--);
+        vmbreak;
+      }
+      vmcase(OP_GETUPVAL) {
+        StkId ra = RA(i);
+        int b = GETARG_B(i);
+        setobj2s(L, ra, cl->upvals[b]->v.p);
+        vmbreak;
+      }
+      vmcase(OP_SETUPVAL) {
+        StkId ra = RA(i);
+        UpVal *uv = cl->upvals[GETARG_B(i)];
+        setobj(L, uv->v.p, s2v(ra));
+        luaC_barrier(L, uv, s2v(ra));
+        vmbreak;
+      }
+      vmcase(OP_GETTABUP) {
+        StkId ra = RA(i);
+        const TValue *slot;
+        TValue *upval = cl->upvals[GETARG_B(i)]->v.p;
+        TValue *rc = KC(i);
+        TString *key = tsvalue(rc);  /* key must be a string */
+        if (luaV_fastget(L, upval, key, slot, luaH_getshortstr)) {
+          setobj2s(L, ra, slot);
+        }
+        else
+          Protect(luaV_finishget(L, upval, rc, ra, slot));
+        vmbreak;
+      }
+      vmcase(OP_GETTABLE) {
+        StkId ra = RA(i);
+        const TValue *slot;
+        TValue *rb = vRB(i);
+        TValue *rc = vRC(i);
+        lua_Unsigned n;
+        if (ttisinteger(rc)  /* fast track for integers? */
+            ? (cast_void(n = ivalue(rc)), luaV_fastgeti(L, rb, n, slot))
+            : luaV_fastget(L, rb, rc, slot, luaH_get)) {
+          setobj2s(L, ra, slot);
+        }
+        else
+          Protect(luaV_finishget(L, rb, rc, ra, slot));
+        vmbreak;
+      }
+      vmcase(OP_GETI) {
+        StkId ra = RA(i);
+        const TValue *slot;
+        TValue *rb = vRB(i);
+        int c = GETARG_C(i);
+        if (luaV_fastgeti(L, rb, c, slot)) {
+          setobj2s(L, ra, slot);
+        }
+        else {
+          TValue key;
+          setivalue(&key, c);
+          Protect(luaV_finishget(L, rb, &key, ra, slot));
+        }
+        vmbreak;
+      }
+      vmcase(OP_GETFIELD) {
+        StkId ra = RA(i);
+        const TValue *slot;
+        TValue *rb = vRB(i);
+        TValue *rc = KC(i);
+        TString *key = tsvalue(rc);  /* key must be a string */
+        if (luaV_fastget(L, rb, key, slot, luaH_getshortstr)) {
+          setobj2s(L, ra, slot);
+        }
+        else
+          Protect(luaV_finishget(L, rb, rc, ra, slot));
+        vmbreak;
+      }
+      vmcase(OP_SETTABUP) {
+        const TValue *slot;
+        TValue *upval = cl->upvals[GETARG_A(i)]->v.p;
+        TValue *rb = KB(i);
+        TValue *rc = RKC(i);
+        TString *key = tsvalue(rb);  /* key must be a string */
+        if (luaV_fastget(L, upval, key, slot, luaH_getshortstr)) {
+          luaV_finishfastset(L, upval, slot, rc);
+        }
+        else
+          Protect(luaV_finishset(L, upval, rb, rc, slot));
+        vmbreak;
+      }
+      vmcase(OP_SETTABLE) {
+        StkId ra = RA(i);
+        const TValue *slot;
+        TValue *rb = vRB(i);  /* key (table is in 'ra') */
+        TValue *rc = RKC(i);  /* value */
+        lua_Unsigned n;
+        if (ttisinteger(rb)  /* fast track for integers? */
+            ? (cast_void(n = ivalue(rb)), luaV_fastgeti(L, s2v(ra), n, slot))
+            : luaV_fastget(L, s2v(ra), rb, slot, luaH_get)) {
+          luaV_finishfastset(L, s2v(ra), slot, rc);
+        }
+        else
+          Protect(luaV_finishset(L, s2v(ra), rb, rc, slot));
+        vmbreak;
+      }
+      vmcase(OP_SETI) {
+        StkId ra = RA(i);
+        const TValue *slot;
+        int c = GETARG_B(i);
+        TValue *rc = RKC(i);
+        if (luaV_fastgeti(L, s2v(ra), c, slot)) {
+          luaV_finishfastset(L, s2v(ra), slot, rc);
+        }
+        else {
+          TValue key;
+          setivalue(&key, c);
+          Protect(luaV_finishset(L, s2v(ra), &key, rc, slot));
+        }
+        vmbreak;
+      }
+      vmcase(OP_SETFIELD) {
+        StkId ra = RA(i);
+        const TValue *slot;
+        TValue *rb = KB(i);
+        TValue *rc = RKC(i);
+        TString *key = tsvalue(rb);  /* key must be a string */
+        if (luaV_fastget(L, s2v(ra), key, slot, luaH_getshortstr)) {
+          luaV_finishfastset(L, s2v(ra), slot, rc);
+        }
+        else
+          Protect(luaV_finishset(L, s2v(ra), rb, rc, slot));
+        vmbreak;
+      }
+      vmcase(OP_NEWTABLE) {
+        StkId ra = RA(i);
+        int b = GETARG_B(i);  /* log2(hash size) + 1 */
+        int c = GETARG_C(i);  /* array size */
+        Table *t;
+        if (b > 0)
+          b = 1 << (b - 1);  /* size is 2^(b - 1) */
+        lua_assert((!TESTARG_k(i)) == (GETARG_Ax(*pc) == 0));
+        if (TESTARG_k(i))  /* non-zero extra argument? */
+          c += GETARG_Ax(*pc) * (MAXARG_C + 1);  /* add it to size */
+        pc++;  /* skip extra argument */
+        L->top.p = ra + 1;  /* correct top in case of emergency GC */
+        t = luaH_new(L);  /* memory allocation */
+        sethvalue2s(L, ra, t);
+        if (b != 0 || c != 0)
+          luaH_resize(L, t, c, b);  /* idem */
+        checkGC(L, ra + 1);
+        vmbreak;
+      }
+      vmcase(OP_SELF) {
+        StkId ra = RA(i);
+        const TValue *slot;
+        TValue *rb = vRB(i);
+        TValue *rc = RKC(i);
+        TString *key = tsvalue(rc);  /* key must be a string */
+        setobj2s(L, ra + 1, rb);
+        if (luaV_fastget(L, rb, key, slot, luaH_getstr)) {
+          setobj2s(L, ra, slot);
+        }
+        else
+          Protect(luaV_finishget(L, rb, rc, ra, slot));
+        vmbreak;
+      }
+      vmcase(OP_ADDI) {
+        op_arithI(L, l_addi, luai_numadd);
+        vmbreak;
+      }
+      vmcase(OP_ADDK) {
+        op_arithK(L, l_addi, luai_numadd);
+        vmbreak;
+      }
+      vmcase(OP_SUBK) {
+        op_arithK(L, l_subi, luai_numsub);
+        vmbreak;
+      }
+      vmcase(OP_MULK) {
+        op_arithK(L, l_muli, luai_nummul);
+        vmbreak;
+      }
+      vmcase(OP_MODK) {
+        savestate(L, ci);  /* in case of division by 0 */
+        op_arithK(L, luaV_mod, luaV_modf);
+        vmbreak;
+      }
+      vmcase(OP_POWK) {
+        op_arithfK(L, luai_numpow);
+        vmbreak;
+      }
+      vmcase(OP_DIVK) {
+        op_arithfK(L, luai_numdiv);
+        vmbreak;
+      }
+      vmcase(OP_IDIVK) {
+        savestate(L, ci);  /* in case of division by 0 */
+        op_arithK(L, luaV_idiv, luai_numidiv);
+        vmbreak;
+      }
+      vmcase(OP_BANDK) {
+        op_bitwiseK(L, l_band);
+        vmbreak;
+      }
+      vmcase(OP_BORK) {
+        op_bitwiseK(L, l_bor);
+        vmbreak;
+      }
+      vmcase(OP_BXORK) {
+        op_bitwiseK(L, l_bxor);
+        vmbreak;
+      }
+      vmcase(OP_SHRI) {
+        StkId ra = RA(i);
+        TValue *rb = vRB(i);
+        int ic = GETARG_sC(i);
+        lua_Integer ib;
+        if (tointegerns(rb, &ib)) {
+          pc++; setivalue(s2v(ra), luaV_shiftl(ib, -ic));
+        }
+        vmbreak;
+      }
+      vmcase(OP_SHLI) {
+        StkId ra = RA(i);
+        TValue *rb = vRB(i);
+        int ic = GETARG_sC(i);
+        lua_Integer ib;
+        if (tointegerns(rb, &ib)) {
+          pc++; setivalue(s2v(ra), luaV_shiftl(ic, ib));
+        }
+        vmbreak;
+      }
+      vmcase(OP_ADD) {
+        op_arith(L, l_addi, luai_numadd);
+        vmbreak;
+      }
+      vmcase(OP_SUB) {
+        op_arith(L, l_subi, luai_numsub);
+        vmbreak;
+      }
+      vmcase(OP_MUL) {
+        op_arith(L, l_muli, luai_nummul);
+        vmbreak;
+      }
+      vmcase(OP_MOD) {
+        savestate(L, ci);  /* in case of division by 0 */
+        op_arith(L, luaV_mod, luaV_modf);
+        vmbreak;
+      }
+      vmcase(OP_POW) {
+        op_arithf(L, luai_numpow);
+        vmbreak;
+      }
+      vmcase(OP_DIV) {  /* float division (always with floats) */
+        op_arithf(L, luai_numdiv);
+        vmbreak;
+      }
+      vmcase(OP_IDIV) {  /* floor division */
+        savestate(L, ci);  /* in case of division by 0 */
+        op_arith(L, luaV_idiv, luai_numidiv);
+        vmbreak;
+      }
+      vmcase(OP_BAND) {
+        op_bitwise(L, l_band);
+        vmbreak;
+      }
+      vmcase(OP_BOR) {
+        op_bitwise(L, l_bor);
+        vmbreak;
+      }
+      vmcase(OP_BXOR) {
+        op_bitwise(L, l_bxor);
+        vmbreak;
+      }
+      vmcase(OP_SHR) {
+        op_bitwise(L, luaV_shiftr);
+        vmbreak;
+      }
+      vmcase(OP_SHL) {
+        op_bitwise(L, luaV_shiftl);
+        vmbreak;
+      }
+      vmcase(OP_MMBIN) {
+        StkId ra = RA(i);
+        Instruction pi = *(pc - 2);  /* original arith. expression */
+        TValue *rb = vRB(i);
+        TMS tm = (TMS)GETARG_C(i);
+        StkId result = RA(pi);
+        lua_assert(OP_ADD <= GET_OPCODE(pi) && GET_OPCODE(pi) <= OP_SHR);
+        Protect(luaT_trybinTM(L, s2v(ra), rb, result, tm));
+        vmbreak;
+      }
+      vmcase(OP_MMBINI) {
+        StkId ra = RA(i);
+        Instruction pi = *(pc - 2);  /* original arith. expression */
+        int imm = GETARG_sB(i);
+        TMS tm = (TMS)GETARG_C(i);
+        int flip = GETARG_k(i);
+        StkId result = RA(pi);
+        Protect(luaT_trybiniTM(L, s2v(ra), imm, flip, result, tm));
+        vmbreak;
+      }
+      vmcase(OP_MMBINK) {
+        StkId ra = RA(i);
+        Instruction pi = *(pc - 2);  /* original arith. expression */
+        TValue *imm = KB(i);
+        TMS tm = (TMS)GETARG_C(i);
+        int flip = GETARG_k(i);
+        StkId result = RA(pi);
+        Protect(luaT_trybinassocTM(L, s2v(ra), imm, flip, result, tm));
+        vmbreak;
+      }
+      vmcase(OP_UNM) {
+        StkId ra = RA(i);
+        TValue *rb = vRB(i);
+        lua_Number nb;
+        if (ttisinteger(rb)) {
+          lua_Integer ib = ivalue(rb);
+          setivalue(s2v(ra), intop(-, 0, ib));
+        }
+        else if (tonumberns(rb, nb)) {
+          setfltvalue(s2v(ra), luai_numunm(L, nb));
+        }
+        else
+          Protect(luaT_trybinTM(L, rb, rb, ra, TM_UNM));
+        vmbreak;
+      }
+      vmcase(OP_BNOT) {
+        StkId ra = RA(i);
+        TValue *rb = vRB(i);
+        lua_Integer ib;
+        if (tointegerns(rb, &ib)) {
+          setivalue(s2v(ra), intop(^, ~l_castS2U(0), ib));
+        }
+        else
+          Protect(luaT_trybinTM(L, rb, rb, ra, TM_BNOT));
+        vmbreak;
+      }
+      vmcase(OP_NOT) {
+        StkId ra = RA(i);
+        TValue *rb = vRB(i);
+        if (l_isfalse(rb))
+          setbtvalue(s2v(ra));
+        else
+          setbfvalue(s2v(ra));
+        vmbreak;
+      }
+      vmcase(OP_LEN) {
+        StkId ra = RA(i);
+        Protect(luaV_objlen(L, ra, vRB(i)));
+        vmbreak;
+      }
+      vmcase(OP_CONCAT) {
+        StkId ra = RA(i);
+        int n = GETARG_B(i);  /* number of elements to concatenate */
+        L->top.p = ra + n;  /* mark the end of concat operands */
+        ProtectNT(luaV_concat(L, n));
+        checkGC(L, L->top.p); /* 'luaV_concat' ensures correct top */
+        vmbreak;
+      }
+      vmcase(OP_CLOSE) {
+        StkId ra = RA(i);
+        Protect(luaF_close(L, ra, LUA_OK, 1));
+        vmbreak;
+      }
+      vmcase(OP_TBC) {
+        StkId ra = RA(i);
+        /* create new to-be-closed upvalue */
+        halfProtect(luaF_newtbcupval(L, ra));
+        vmbreak;
+      }
+      vmcase(OP_JMP) {
+        dojump(ci, i, 0);
+        vmbreak;
+      }
+      vmcase(OP_EQ) {
+        StkId ra = RA(i);
+        int cond;
+        TValue *rb = vRB(i);
+        Protect(cond = luaV_equalobj(L, s2v(ra), rb));
+        docondjump();
+        vmbreak;
+      }
+      vmcase(OP_LT) {
+        op_order(L, l_lti, LTnum, lessthanothers);
+        vmbreak;
+      }
+      vmcase(OP_LE) {
+        op_order(L, l_lei, LEnum, lessequalothers);
+        vmbreak;
+      }
+      vmcase(OP_EQK) {
+        StkId ra = RA(i);
+        TValue *rb = KB(i);
+        /* basic types do not use '__eq'; we can use raw equality */
+        int cond = luaV_rawequalobj(s2v(ra), rb);
+        docondjump();
+        vmbreak;
+      }
+      vmcase(OP_EQI) {
+        StkId ra = RA(i);
+        int cond;
+        int im = GETARG_sB(i);
+        if (ttisinteger(s2v(ra)))
+          cond = (ivalue(s2v(ra)) == im);
+        else if (ttisfloat(s2v(ra)))
+          cond = luai_numeq(fltvalue(s2v(ra)), cast_num(im));
+        else
+          cond = 0;  /* other types cannot be equal to a number */
+        docondjump();
+        vmbreak;
+      }
+      vmcase(OP_LTI) {
+        op_orderI(L, l_lti, luai_numlt, 0, TM_LT);
+        vmbreak;
+      }
+      vmcase(OP_LEI) {
+        op_orderI(L, l_lei, luai_numle, 0, TM_LE);
+        vmbreak;
+      }
+      vmcase(OP_GTI) {
+        op_orderI(L, l_gti, luai_numgt, 1, TM_LT);
+        vmbreak;
+      }
+      vmcase(OP_GEI) {
+        op_orderI(L, l_gei, luai_numge, 1, TM_LE);
+        vmbreak;
+      }
+      vmcase(OP_TEST) {
+        StkId ra = RA(i);
+        int cond = !l_isfalse(s2v(ra));
+        docondjump();
+        vmbreak;
+      }
+      vmcase(OP_TESTSET) {
+        StkId ra = RA(i);
+        TValue *rb = vRB(i);
+        if (l_isfalse(rb) == GETARG_k(i))
+          pc++;
+        else {
+          setobj2s(L, ra, rb);
+          donextjump(ci);
+        }
+        vmbreak;
+      }
+      vmcase(OP_CALL) {
+        StkId ra = RA(i);
+        CallInfo *newci;
+        int b = GETARG_B(i);
+        int nresults = GETARG_C(i) - 1;
+        if (b != 0)  /* fixed number of arguments? */
+          L->top.p = ra + b;  /* top signals number of arguments */
+        /* else previous instruction set top */
+        savepc(L);  /* in case of errors */
+        if ((newci = luaD_precall(L, ra, nresults)) == NULL)
+          updatetrap(ci);  /* C call; nothing else to be done */
+        else {  /* Lua call: run function in this same C frame */
+          ci = newci;
+          goto startfunc;
+        }
+        vmbreak;
+      }
+      vmcase(OP_TAILCALL) {
+        StkId ra = RA(i);
+        int b = GETARG_B(i);  /* number of arguments + 1 (function) */
+        int n;  /* number of results when calling a C function */
+        int nparams1 = GETARG_C(i);
+        /* delta is virtual 'func' - real 'func' (vararg functions) */
+        int delta = (nparams1) ? ci->u.l.nextraargs + nparams1 : 0;
+        if (b != 0)
+          L->top.p = ra + b;
+        else  /* previous instruction set top */
+          b = cast_int(L->top.p - ra);
+        savepc(ci);  /* several calls here can raise errors */
+        if (TESTARG_k(i)) {
+          luaF_closeupval(L, base);  /* close upvalues from current call */
+          lua_assert(L->tbclist.p < base);  /* no pending tbc variables */
+          lua_assert(base == ci->func.p + 1);
+        }
+        if ((n = luaD_pretailcall(L, ci, ra, b, delta)) < 0)  /* Lua function? */
+          goto startfunc;  /* execute the callee */
+        else {  /* C function? */
+          ci->func.p -= delta;  /* restore 'func' (if vararg) */
+          luaD_poscall(L, ci, n);  /* finish caller */
+          updatetrap(ci);  /* 'luaD_poscall' can change hooks */
+          goto ret;  /* caller returns after the tail call */
+        }
+      }
+      vmcase(OP_RETURN) {
+        StkId ra = RA(i);
+        int n = GETARG_B(i) - 1;  /* number of results */
+        int nparams1 = GETARG_C(i);
+        if (n < 0)  /* not fixed? */
+          n = cast_int(L->top.p - ra);  /* get what is available */
+        savepc(ci);
+        if (TESTARG_k(i)) {  /* may there be open upvalues? */
+          ci->u2.nres = n;  /* save number of returns */
+          if (L->top.p < ci->top.p)
+            L->top.p = ci->top.p;
+          luaF_close(L, base, CLOSEKTOP, 1);
+          updatetrap(ci);
+          updatestack(ci);
+        }
+        if (nparams1)  /* vararg function? */
+          ci->func.p -= ci->u.l.nextraargs + nparams1;
+        L->top.p = ra + n;  /* set call for 'luaD_poscall' */
+        luaD_poscall(L, ci, n);
+        updatetrap(ci);  /* 'luaD_poscall' can change hooks */
+        goto ret;
+      }
+      vmcase(OP_RETURN0) {
+        if (l_unlikely(L->hookmask)) {
+          StkId ra = RA(i);
+          L->top.p = ra;
+          savepc(ci);
+          luaD_poscall(L, ci, 0);  /* no hurry... */
+          trap = 1;
+        }
+        else {  /* do the 'poscall' here */
+          int nres;
+          L->ci = ci->previous;  /* back to caller */
+          L->top.p = base - 1;
+          for (nres = ci->nresults; l_unlikely(nres > 0); nres--)
+            setnilvalue(s2v(L->top.p++));  /* all results are nil */
+        }
+        goto ret;
+      }
+      vmcase(OP_RETURN1) {
+        if (l_unlikely(L->hookmask)) {
+          StkId ra = RA(i);
+          L->top.p = ra + 1;
+          savepc(ci);
+          luaD_poscall(L, ci, 1);  /* no hurry... */
+          trap = 1;
+        }
+        else {  /* do the 'poscall' here */
+          int nres = ci->nresults;
+          L->ci = ci->previous;  /* back to caller */
+          if (nres == 0)
+            L->top.p = base - 1;  /* asked for no results */
+          else {
+            StkId ra = RA(i);
+            setobjs2s(L, base - 1, ra);  /* at least this result */
+            L->top.p = base;
+            for (; l_unlikely(nres > 1); nres--)
+              setnilvalue(s2v(L->top.p++));  /* complete missing results */
+          }
+        }
+       ret:  /* return from a Lua function */
+        if (ci->callstatus & CIST_FRESH)
+          return;  /* end this frame */
+        else {
+          ci = ci->previous;
+          goto returning;  /* continue running caller in this frame */
+        }
+      }
+      vmcase(OP_FORLOOP) {
+        StkId ra = RA(i);
+        if (ttisinteger(s2v(ra + 2))) {  /* integer loop? */
+          lua_Unsigned count = l_castS2U(ivalue(s2v(ra + 1)));
+          if (count > 0) {  /* still more iterations? */
+            lua_Integer step = ivalue(s2v(ra + 2));
+            lua_Integer idx = ivalue(s2v(ra));  /* internal index */
+            chgivalue(s2v(ra + 1), count - 1);  /* update counter */
+            idx = intop(+, idx, step);  /* add step to index */
+            chgivalue(s2v(ra), idx);  /* update internal index */
+            setivalue(s2v(ra + 3), idx);  /* and control variable */
+            pc -= GETARG_Bx(i);  /* jump back */
+          }
+        }
+        else if (floatforloop(ra))  /* float loop */
+          pc -= GETARG_Bx(i);  /* jump back */
+        updatetrap(ci);  /* allows a signal to break the loop */
+        vmbreak;
+      }
+      vmcase(OP_FORPREP) {
+        StkId ra = RA(i);
+        savestate(L, ci);  /* in case of errors */
+        if (forprep(L, ra))
+          pc += GETARG_Bx(i) + 1;  /* skip the loop */
+        vmbreak;
+      }
+      vmcase(OP_TFORPREP) {
+       StkId ra = RA(i);
+        /* create to-be-closed upvalue (if needed) */
+        halfProtect(luaF_newtbcupval(L, ra + 3));
+        pc += GETARG_Bx(i);
+        i = *(pc++);  /* go to next instruction */
+        lua_assert(GET_OPCODE(i) == OP_TFORCALL && ra == RA(i));
+        goto l_tforcall;
+      }
+      vmcase(OP_TFORCALL) {
+       l_tforcall: {
+        StkId ra = RA(i);
+        /* 'ra' has the iterator function, 'ra + 1' has the state,
+           'ra + 2' has the control variable, and 'ra + 3' has the
+           to-be-closed variable. The call will use the stack after
+           these values (starting at 'ra + 4')
+        */
+        /* push function, state, and control variable */
+        memcpy(ra + 4, ra, 3 * sizeof(*ra));
+        L->top.p = ra + 4 + 3;
+        ProtectNT(luaD_call(L, ra + 4, GETARG_C(i)));  /* do the call */
+        updatestack(ci);  /* stack may have changed */
+        i = *(pc++);  /* go to next instruction */
+        lua_assert(GET_OPCODE(i) == OP_TFORLOOP && ra == RA(i));
+        goto l_tforloop;
+      }}
+      vmcase(OP_TFORLOOP) {
+       l_tforloop: {
+        StkId ra = RA(i);
+        if (!ttisnil(s2v(ra + 4))) {  /* continue loop? */
+          setobjs2s(L, ra + 2, ra + 4);  /* save control variable */
+          pc -= GETARG_Bx(i);  /* jump back */
+        }
+        vmbreak;
+      }}
+      vmcase(OP_SETLIST) {
+        StkId ra = RA(i);
+        int n = GETARG_B(i);
+        unsigned int last = GETARG_C(i);
+        Table *h = hvalue(s2v(ra));
+        if (n == 0)
+          n = cast_int(L->top.p - ra) - 1;  /* get up to the top */
+        else
+          L->top.p = ci->top.p;  /* correct top in case of emergency GC */
+        last += n;
+        if (TESTARG_k(i)) {
+          last += GETARG_Ax(*pc) * (MAXARG_C + 1);
+          pc++;
+        }
+        if (last > luaH_realasize(h))  /* needs more space? */
+          luaH_resizearray(L, h, last);  /* preallocate it at once */
+        for (; n > 0; n--) {
+          TValue *val = s2v(ra + n);
+          setobj2t(L, &h->array[last - 1], val);
+          last--;
+          luaC_barrierback(L, obj2gco(h), val);
+        }
+        vmbreak;
+      }
+      vmcase(OP_CLOSURE) {
+        StkId ra = RA(i);
+        Proto *p = cl->p->p[GETARG_Bx(i)];
+        halfProtect(pushclosure(L, p, cl->upvals, base, ra));
+        checkGC(L, ra + 1);
+        vmbreak;
+      }
+      vmcase(OP_VARARG) {
+        StkId ra = RA(i);
+        int n = GETARG_C(i) - 1;  /* required results */
+        Protect(luaT_getvarargs(L, ci, ra, n));
+        vmbreak;
+      }
+      vmcase(OP_VARARGPREP) {
+        ProtectNT(luaT_adjustvarargs(L, GETARG_A(i), ci, cl->p));
+        if (l_unlikely(trap)) {  /* previous "Protect" updated trap */
+          luaD_hookcall(L, ci);
+          L->oldpc = 1;  /* next opcode will be seen as a "new" line */
+        }
+        updatebase(ci);  /* function has new base after adjustment */
+        vmbreak;
+      }
+      vmcase(OP_EXTRAARG) {
+        lua_assert(0);
+        vmbreak;
+      }
+    }
+  }
+}
+
+/* }================================================================== */
diff --git a/src/libs/3rdparty/lua/src/lvm.h b/src/libs/3rdparty/lua/src/lvm.h
new file mode 100644
index 0000000000..dba1ad2770
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lvm.h
@@ -0,0 +1,141 @@
+/*
+** $Id: lvm.h $
+** Lua virtual machine
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lvm_h
+#define lvm_h
+
+
+#include "ldo.h"
+#include "lobject.h"
+#include "ltm.h"
+
+
+#if !defined(LUA_NOCVTN2S)
+#define cvt2str(o)	ttisnumber(o)
+#else
+#define cvt2str(o)	0	/* no conversion from numbers to strings */
+#endif
+
+
+#if !defined(LUA_NOCVTS2N)
+#define cvt2num(o)	ttisstring(o)
+#else
+#define cvt2num(o)	0	/* no conversion from strings to numbers */
+#endif
+
+
+/*
+** You can define LUA_FLOORN2I if you want to convert floats to integers
+** by flooring them (instead of raising an error if they are not
+** integral values)
+*/
+#if !defined(LUA_FLOORN2I)
+#define LUA_FLOORN2I		F2Ieq
+#endif
+
+
+/*
+** Rounding modes for float->integer coercion
+ */
+typedef enum {
+  F2Ieq,     /* no rounding; accepts only integral values */
+  F2Ifloor,  /* takes the floor of the number */
+  F2Iceil    /* takes the ceil of the number */
+} F2Imod;
+
+
+/* convert an object to a float (including string coercion) */
+#define tonumber(o,n) \
+	(ttisfloat(o) ? (*(n) = fltvalue(o), 1) : luaV_tonumber_(o,n))
+
+
+/* convert an object to a float (without string coercion) */
+#define tonumberns(o,n) \
+	(ttisfloat(o) ? ((n) = fltvalue(o), 1) : \
+	(ttisinteger(o) ? ((n) = cast_num(ivalue(o)), 1) : 0))
+
+
+/* convert an object to an integer (including string coercion) */
+#define tointeger(o,i) \
+  (l_likely(ttisinteger(o)) ? (*(i) = ivalue(o), 1) \
+                          : luaV_tointeger(o,i,LUA_FLOORN2I))
+
+
+/* convert an object to an integer (without string coercion) */
+#define tointegerns(o,i) \
+  (l_likely(ttisinteger(o)) ? (*(i) = ivalue(o), 1) \
+                          : luaV_tointegerns(o,i,LUA_FLOORN2I))
+
+
+#define intop(op,v1,v2) l_castU2S(l_castS2U(v1) op l_castS2U(v2))
+
+#define luaV_rawequalobj(t1,t2)		luaV_equalobj(NULL,t1,t2)
+
+
+/*
+** fast track for 'gettable': if 't' is a table and 't[k]' is present,
+** return 1 with 'slot' pointing to 't[k]' (position of final result).
+** Otherwise, return 0 (meaning it will have to check metamethod)
+** with 'slot' pointing to an empty 't[k]' (if 't' is a table) or NULL
+** (otherwise). 'f' is the raw get function to use.
+*/
+#define luaV_fastget(L,t,k,slot,f) \
+  (!ttistable(t)  \
+   ? (slot = NULL, 0)  /* not a table; 'slot' is NULL and result is 0 */  \
+   : (slot = f(hvalue(t), k),  /* else, do raw access */  \
+      !isempty(slot)))  /* result not empty? */
+
+
+/*
+** Special case of 'luaV_fastget' for integers, inlining the fast case
+** of 'luaH_getint'.
+*/
+#define luaV_fastgeti(L,t,k,slot) \
+  (!ttistable(t)  \
+   ? (slot = NULL, 0)  /* not a table; 'slot' is NULL and result is 0 */  \
+   : (slot = (l_castS2U(k) - 1u < hvalue(t)->alimit) \
+              ? &hvalue(t)->array[k - 1] : luaH_getint(hvalue(t), k), \
+      !isempty(slot)))  /* result not empty? */
+
+
+/*
+** Finish a fast set operation (when fast get succeeds). In that case,
+** 'slot' points to the place to put the value.
+*/
+#define luaV_finishfastset(L,t,slot,v) \
+    { setobj2t(L, cast(TValue *,slot), v); \
+      luaC_barrierback(L, gcvalue(t), v); }
+
+
+/*
+** Shift right is the same as shift left with a negative 'y'
+*/
+#define luaV_shiftr(x,y)	luaV_shiftl(x,intop(-, 0, y))
+
+
+
+LUAI_FUNC int luaV_equalobj (lua_State *L, const TValue *t1, const TValue *t2);
+LUAI_FUNC int luaV_lessthan (lua_State *L, const TValue *l, const TValue *r);
+LUAI_FUNC int luaV_lessequal (lua_State *L, const TValue *l, const TValue *r);
+LUAI_FUNC int luaV_tonumber_ (const TValue *obj, lua_Number *n);
+LUAI_FUNC int luaV_tointeger (const TValue *obj, lua_Integer *p, F2Imod mode);
+LUAI_FUNC int luaV_tointegerns (const TValue *obj, lua_Integer *p,
+                                F2Imod mode);
+LUAI_FUNC int luaV_flttointeger (lua_Number n, lua_Integer *p, F2Imod mode);
+LUAI_FUNC void luaV_finishget (lua_State *L, const TValue *t, TValue *key,
+                               StkId val, const TValue *slot);
+LUAI_FUNC void luaV_finishset (lua_State *L, const TValue *t, TValue *key,
+                               TValue *val, const TValue *slot);
+LUAI_FUNC void luaV_finishOp (lua_State *L);
+LUAI_FUNC void luaV_execute (lua_State *L, CallInfo *ci);
+LUAI_FUNC void luaV_concat (lua_State *L, int total);
+LUAI_FUNC lua_Integer luaV_idiv (lua_State *L, lua_Integer x, lua_Integer y);
+LUAI_FUNC lua_Integer luaV_mod (lua_State *L, lua_Integer x, lua_Integer y);
+LUAI_FUNC lua_Number luaV_modf (lua_State *L, lua_Number x, lua_Number y);
+LUAI_FUNC lua_Integer luaV_shiftl (lua_Integer x, lua_Integer y);
+LUAI_FUNC void luaV_objlen (lua_State *L, StkId ra, const TValue *rb);
+
+#endif
diff --git a/src/libs/3rdparty/lua/src/lzio.c b/src/libs/3rdparty/lua/src/lzio.c
new file mode 100644
index 0000000000..cd0a02d5f9
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lzio.c
@@ -0,0 +1,68 @@
+/*
+** $Id: lzio.c $
+** Buffered streams
+** See Copyright Notice in lua.h
+*/
+
+#define lzio_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include <string.h>
+
+#include "lua.h"
+
+#include "llimits.h"
+#include "lmem.h"
+#include "lstate.h"
+#include "lzio.h"
+
+
+int luaZ_fill (ZIO *z) {
+  size_t size;
+  lua_State *L = z->L;
+  const char *buff;
+  lua_unlock(L);
+  buff = z->reader(L, z->data, &size);
+  lua_lock(L);
+  if (buff == NULL || size == 0)
+    return EOZ;
+  z->n = size - 1;  /* discount char being returned */
+  z->p = buff;
+  return cast_uchar(*(z->p++));
+}
+
+
+void luaZ_init (lua_State *L, ZIO *z, lua_Reader reader, void *data) {
+  z->L = L;
+  z->reader = reader;
+  z->data = data;
+  z->n = 0;
+  z->p = NULL;
+}
+
+
+/* --------------------------------------------------------------- read --- */
+size_t luaZ_read (ZIO *z, void *b, size_t n) {
+  while (n) {
+    size_t m;
+    if (z->n == 0) {  /* no bytes in buffer? */
+      if (luaZ_fill(z) == EOZ)  /* try to read more */
+        return n;  /* no more input; return number of missing bytes */
+      else {
+        z->n++;  /* luaZ_fill consumed first byte; put it back */
+        z->p--;
+      }
+    }
+    m = (n <= z->n) ? n : z->n;  /* min. between n and z->n */
+    memcpy(b, z->p, m);
+    z->n -= m;
+    z->p += m;
+    b = (char *)b + m;
+    n -= m;
+  }
+  return 0;
+}
+
diff --git a/src/libs/3rdparty/lua/src/lzio.h b/src/libs/3rdparty/lua/src/lzio.h
new file mode 100644
index 0000000000..38f397fd28
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lzio.h
@@ -0,0 +1,66 @@
+/*
+** $Id: lzio.h $
+** Buffered streams
+** See Copyright Notice in lua.h
+*/
+
+
+#ifndef lzio_h
+#define lzio_h
+
+#include "lua.h"
+
+#include "lmem.h"
+
+
+#define EOZ	(-1)			/* end of stream */
+
+typedef struct Zio ZIO;
+
+#define zgetc(z)  (((z)->n--)>0 ?  cast_uchar(*(z)->p++) : luaZ_fill(z))
+
+
+typedef struct Mbuffer {
+  char *buffer;
+  size_t n;
+  size_t buffsize;
+} Mbuffer;
+
+#define luaZ_initbuffer(L, buff) ((buff)->buffer = NULL, (buff)->buffsize = 0)
+
+#define luaZ_buffer(buff)	((buff)->buffer)
+#define luaZ_sizebuffer(buff)	((buff)->buffsize)
+#define luaZ_bufflen(buff)	((buff)->n)
+
+#define luaZ_buffremove(buff,i)	((buff)->n -= (i))
+#define luaZ_resetbuffer(buff) ((buff)->n = 0)
+
+
+#define luaZ_resizebuffer(L, buff, size) \
+	((buff)->buffer = luaM_reallocvchar(L, (buff)->buffer, \
+				(buff)->buffsize, size), \
+	(buff)->buffsize = size)
+
+#define luaZ_freebuffer(L, buff)	luaZ_resizebuffer(L, buff, 0)
+
+
+LUAI_FUNC void luaZ_init (lua_State *L, ZIO *z, lua_Reader reader,
+                                        void *data);
+LUAI_FUNC size_t luaZ_read (ZIO* z, void *b, size_t n);	/* read next n bytes */
+
+
+
+/* --------- Private Part ------------------ */
+
+struct Zio {
+  size_t n;			/* bytes still unread */
+  const char *p;		/* current position in buffer */
+  lua_Reader reader;		/* reader function */
+  void *data;			/* additional data */
+  lua_State *L;			/* Lua state (for reader) */
+};
+
+
+LUAI_FUNC int luaZ_fill (ZIO *z);
+
+#endif
diff --git a/src/libs/3rdparty/sol2/CMakeLists.txt b/src/libs/3rdparty/sol2/CMakeLists.txt
new file mode 100644
index 0000000000..1afdb1bdbb
--- /dev/null
+++ b/src/libs/3rdparty/sol2/CMakeLists.txt
@@ -0,0 +1,12 @@
+add_library(sol2 INTERFACE)
+
+target_include_directories(sol2 INTERFACE  
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>  
+    $<INSTALL_INTERFACE:include>
+)
+
+install(TARGETS sol2 EXPORT QtCreator)
+
+qtc_add_public_header(include/sol/sol.hpp)
+qtc_add_public_header(include/sol/config.hpp)
+qtc_add_public_header(include/sol/forward.hpp)
diff --git a/src/libs/3rdparty/sol2/LICENSE.txt b/src/libs/3rdparty/sol2/LICENSE.txt
new file mode 100644
index 0000000000..5813440548
--- /dev/null
+++ b/src/libs/3rdparty/sol2/LICENSE.txt
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2013-2022 Rapptz, ThePhD, and contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/src/libs/3rdparty/sol2/include/sol/config.hpp b/src/libs/3rdparty/sol2/include/sol/config.hpp
new file mode 100644
index 0000000000..36ef3fe47e
--- /dev/null
+++ b/src/libs/3rdparty/sol2/include/sol/config.hpp
@@ -0,0 +1,57 @@
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+// This file was generated with a script.
+// Generated 2024-01-13 14:25:56.570832 UTC
+// This header was generated with sol v3.3.1 (revision 9c882a28)
+// https://github.com/ThePhD/sol2
+
+#ifndef SOL_SINGLE_SOL_CONFIG_HPP
+#define SOL_SINGLE_SOL_CONFIG_HPP
+
+// beginning of sol/config.hpp
+
+/* Base, empty configuration file!
+
+     To override, place a file in your include paths of the form:
+
+. (your include path here)
+| sol (directory, or equivalent)
+  | config.hpp (your config.hpp file)
+
+     So that when sol2 includes the file
+
+#include <sol/config.hpp>
+
+     it gives you the configuration values you desire. Configuration values can be
+seen in the safety.rst of the doc/src, or at
+https://sol2.readthedocs.io/en/latest/safety.html ! You can also pass them through
+the build system, or the command line options of your compiler.
+
+*/
+
+#define SOL_SAFE_FUNCTIONS 1
+#define SOL_SAFE_USERTYPE 1
+#define SOL_NO_NIL 1
+
+// end of sol/config.hpp
+
+#endif // SOL_SINGLE_SOL_CONFIG_HPP
diff --git a/src/libs/3rdparty/sol2/include/sol/forward.hpp b/src/libs/3rdparty/sol2/include/sol/forward.hpp
new file mode 100644
index 0000000000..83fba4d254
--- /dev/null
+++ b/src/libs/3rdparty/sol2/include/sol/forward.hpp
@@ -0,0 +1,1340 @@
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+// This file was generated with a script.
+// Generated 2024-01-13 14:25:56.569197 UTC
+// This header was generated with sol v3.3.1 (revision 9c882a28)
+// https://github.com/ThePhD/sol2
+
+#ifndef SOL_SINGLE_INCLUDE_SOL_FORWARD_HPP
+#define SOL_SINGLE_INCLUDE_SOL_FORWARD_HPP
+
+// beginning of sol/forward.hpp
+
+#ifndef SOL_FORWARD_HPP
+#define SOL_FORWARD_HPP
+
+// beginning of sol/version.hpp
+
+#include "config.hpp"
+
+#define SOL_VERSION_MAJOR 3
+#define SOL_VERSION_MINOR 2
+#define SOL_VERSION_PATCH 3
+#define SOL_VERSION_STRING "3.2.3"
+#define SOL_VERSION ((SOL_VERSION_MAJOR * 100000) + (SOL_VERSION_MINOR * 100) + (SOL_VERSION_PATCH))
+
+#define SOL_TOKEN_TO_STRING_POST_EXPANSION_I_(_TOKEN) #_TOKEN
+#define SOL_TOKEN_TO_STRING_I_(_TOKEN) SOL_TOKEN_TO_STRING_POST_EXPANSION_I_(_TOKEN)
+
+#define SOL_CONCAT_TOKENS_POST_EXPANSION_I_(_LEFT, _RIGHT) _LEFT##_RIGHT
+#define SOL_CONCAT_TOKENS_I_(_LEFT, _RIGHT) SOL_CONCAT_TOKENS_POST_EXPANSION_I_(_LEFT, _RIGHT)
+
+#define SOL_RAW_IS_ON(OP_SYMBOL) ((3 OP_SYMBOL 3) != 0)
+#define SOL_RAW_IS_OFF(OP_SYMBOL) ((3 OP_SYMBOL 3) == 0)
+#define SOL_RAW_IS_DEFAULT_ON(OP_SYMBOL) ((3 OP_SYMBOL 3) > 3)
+#define SOL_RAW_IS_DEFAULT_OFF(OP_SYMBOL) ((3 OP_SYMBOL 3 OP_SYMBOL 3) < 0)
+
+#define SOL_IS_ON(OP_SYMBOL) SOL_RAW_IS_ON(OP_SYMBOL ## _I_)
+#define SOL_IS_OFF(OP_SYMBOL) SOL_RAW_IS_OFF(OP_SYMBOL ## _I_)
+#define SOL_IS_DEFAULT_ON(OP_SYMBOL) SOL_RAW_IS_DEFAULT_ON(OP_SYMBOL ## _I_)
+#define SOL_IS_DEFAULT_OFF(OP_SYMBOL) SOL_RAW_IS_DEFAULT_OFF(OP_SYMBOL ## _I_)
+
+#define SOL_ON          |
+#define SOL_OFF         ^
+#define SOL_DEFAULT_ON  +
+#define SOL_DEFAULT_OFF -
+
+#if defined(SOL_BUILD_CXX_MODE)
+	#if (SOL_BUILD_CXX_MODE != 0)
+		#define SOL_BUILD_CXX_MODE_I_ SOL_ON
+	#else
+		#define SOL_BUILD_CXX_MODE_I_ SOL_OFF
+	#endif
+#elif defined(__cplusplus)
+	#define SOL_BUILD_CXX_MODE_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_BUILD_CXX_MODE_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_BUILD_C_MODE)
+	#if (SOL_BUILD_C_MODE != 0)
+		#define SOL_BUILD_C_MODE_I_ SOL_ON
+	#else
+		#define SOL_BUILD_C_MODE_I_ SOL_OFF
+	#endif
+#elif defined(__STDC__)
+	#define SOL_BUILD_C_MODE_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_BUILD_C_MODE_I_ SOL_DEFAULT_OFF
+#endif
+
+#if SOL_IS_ON(SOL_BUILD_C_MODE)
+	#include <stddef.h>
+	#include <stdint.h>
+	#include <limits.h>
+#else
+	#include <cstddef>
+	#include <cstdint>
+	#include <climits>
+#endif
+
+#if defined(SOL_HAS_BUILTIN)
+	#define SOL_HAS_BUILTIN_I_(...) SOL_HAS_BUILTIN(__VA_ARGS__)
+#elif defined(__has_builtin)
+	#define SOL_HAS_BUILTIN_I_(...) __has_builtin(__VA_ARGS__)
+#else
+	#define SOL_HAS_BUILTIN_I_(...) 0
+#endif
+
+#if defined(SOL_COMPILER_VCXX)
+	#if defined(SOL_COMPILER_VCXX != 0)
+		#define SOL_COMPILER_VCXX_I_ SOL_ON
+	#else
+		#define SOL_COMPILER_VCXX_I_ SOL_OFF
+	#endif
+#elif defined(_MSC_VER)
+	#define SOL_COMPILER_VCXX_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_COMPILER_VCXX_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_COMPILER_GCC)
+	#if defined(SOL_COMPILER_GCC != 0)
+		#define SOL_COMPILER_GCC_I_ SOL_ON
+	#else
+		#define SOL_COMPILER_GCC_I_ SOL_OFF
+	#endif
+#elif defined(__GNUC__)
+	#define SOL_COMPILER_GCC_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_COMPILER_GCC_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_COMPILER_CLANG)
+	#if defined(SOL_COMPILER_CLANG != 0)
+		#define SOL_COMPILER_CLANG_I_ SOL_ON
+	#else
+		#define SOL_COMPILER_CLANG_I_ SOL_OFF
+	#endif
+#elif defined(__clang__)
+	#define SOL_COMPILER_CLANG_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_COMPILER_CLANG_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_COMPILER_EDG)
+	#if defined(SOL_COMPILER_EDG != 0)
+		#define SOL_COMPILER_EDG_I_ SOL_ON
+	#else
+		#define SOL_COMPILER_EDG_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_COMPILER_EDG_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_COMPILER_MINGW)
+	#if (SOL_COMPILER_MINGW != 0)
+		#define SOL_COMPILER_MINGW_I_ SOL_ON
+	#else
+		#define SOL_COMPILER_MINGW_I_ SOL_OFF
+	#endif
+#elif defined(__MINGW32__)
+	#define SOL_COMPILER_MINGW_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_COMPILER_MINGW_I_ SOL_DEFAULT_OFF
+#endif
+
+#if SIZE_MAX <= 0xFFFFULL
+	#define SOL_PLATFORM_X16_I_ SOL_ON
+	#define SOL_PLATFORM_X86_I_ SOL_OFF
+	#define SOL_PLATFORM_X64_I_ SOL_OFF
+#elif SIZE_MAX <= 0xFFFFFFFFULL
+	#define SOL_PLATFORM_X16_I_ SOL_OFF
+	#define SOL_PLATFORM_X86_I_ SOL_ON
+	#define SOL_PLATFORM_X64_I_ SOL_OFF
+#else
+	#define SOL_PLATFORM_X16_I_ SOL_OFF
+	#define SOL_PLATFORM_X86_I_ SOL_OFF
+	#define SOL_PLATFORM_X64_I_ SOL_ON
+#endif
+
+#define SOL_PLATFORM_ARM32_I_ SOL_OFF
+#define SOL_PLATFORM_ARM64_I_ SOL_OFF
+
+#if defined(SOL_PLATFORM_WINDOWS)
+	#if (SOL_PLATFORM_WINDOWS != 0)
+		#define SOL_PLATFORM_WINDOWS_I_ SOL_ON
+	#else
+		#define SOL_PLATFORM_WINDOWS_I_ SOL_OFF
+	#endif
+#elif defined(_WIN32)
+	#define SOL_PLATFORM_WINDOWS_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_PLATFORM_WINDOWS_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_PLATFORM_CYGWIN)
+	#if (SOL_PLATFORM_CYGWIN != 0)
+		#define SOL_PLATFORM_CYGWIN_I_ SOL_ON
+	#else
+		#define SOL_PLATFORM_CYGWIN_I_ SOL_ON
+	#endif
+#elif defined(__CYGWIN__)
+	#define SOL_PLATFORM_CYGWIN_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_PLATFORM_CYGWIN_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_PLATFORM_APPLE)
+	#if (SOL_PLATFORM_APPLE != 0)
+		#define SOL_PLATFORM_APPLE_I_ SOL_ON
+	#else
+		#define SOL_PLATFORM_APPLE_I_ SOL_OFF
+	#endif
+#elif defined(__APPLE__)
+	#define SOL_PLATFORM_APPLE_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_PLATFORM_APPLE_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_PLATFORM_UNIX)
+	#if (SOL_PLATFORM_UNIX != 0)
+		#define SOL_PLATFORM_UNIXLIKE_I_ SOL_ON
+	#else
+		#define SOL_PLATFORM_UNIXLIKE_I_ SOL_OFF
+	#endif
+#elif defined(__unix__)
+	#define SOL_PLATFORM_UNIXLIKE_I_ SOL_DEFAUKT_ON
+#else
+	#define SOL_PLATFORM_UNIXLIKE_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_PLATFORM_LINUX)
+	#if (SOL_PLATFORM_LINUX != 0)
+		#define SOL_PLATFORM_LINUXLIKE_I_ SOL_ON
+	#else
+		#define SOL_PLATFORM_LINUXLIKE_I_ SOL_OFF
+	#endif
+#elif defined(__LINUX__)
+	#define SOL_PLATFORM_LINUXLIKE_I_ SOL_DEFAUKT_ON
+#else
+	#define SOL_PLATFORM_LINUXLIKE_I_ SOL_DEFAULT_OFF
+#endif
+
+#define SOL_PLATFORM_APPLE_IPHONE_I_ SOL_OFF
+#define SOL_PLATFORM_BSDLIKE_I_      SOL_OFF
+
+#if defined(SOL_IN_DEBUG_DETECTED)
+	#if SOL_IN_DEBUG_DETECTED != 0
+		#define SOL_DEBUG_BUILD_I_ SOL_ON
+	#else
+		#define SOL_DEBUG_BUILD_I_ SOL_OFF
+	#endif
+#elif !defined(NDEBUG)
+	#if SOL_IS_ON(SOL_COMPILER_VCXX) && defined(_DEBUG)
+		#define SOL_DEBUG_BUILD_I_ SOL_ON
+	#elif (SOL_IS_ON(SOL_COMPILER_CLANG) || SOL_IS_ON(SOL_COMPILER_GCC)) && !defined(__OPTIMIZE__)
+		#define SOL_DEBUG_BUILD_I_ SOL_ON
+	#else
+		#define SOL_DEBUG_BUILD_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_DEBUG_BUILD_I_ SOL_DEFAULT_OFF
+#endif // We are in a debug mode of some sort
+
+#if defined(SOL_NO_EXCEPTIONS)
+	#if (SOL_NO_EXCEPTIONS != 0)
+		#define SOL_EXCEPTIONS_I_ SOL_OFF
+	#else
+		#define SOL_EXCEPTIONS_I_ SOL_ON
+	#endif
+#elif SOL_IS_ON(SOL_COMPILER_VCXX)
+	#if !defined(_CPPUNWIND)
+		#define SOL_EXCEPTIONS_I_ SOL_OFF
+	#else
+		#define SOL_EXCEPTIONS_I_ SOL_ON
+	#endif
+#elif SOL_IS_ON(SOL_COMPILER_CLANG) || SOL_IS_ON(SOL_COMPILER_GCC)
+	#if !defined(__EXCEPTIONS)
+		#define SOL_EXCEPTIONS_I_ SOL_OFF
+	#else
+		#define SOL_EXCEPTIONS_I_ SOL_ON
+	#endif
+#else
+	#define SOL_EXCEPTIONS_I_ SOL_DEFAULT_ON
+#endif
+
+#if defined(SOL_NO_RTTI)
+	#if (SOL_NO_RTTI != 0)
+		#define SOL_RTTI_I_ SOL_OFF
+	#else
+		#define SOL_RTTI_I_ SOL_ON
+	#endif
+#elif SOL_IS_ON(SOL_COMPILER_VCXX)
+	#if !defined(_CPPRTTI)
+		#define SOL_RTTI_I_ SOL_OFF
+	#else
+		#define SOL_RTTI_I_ SOL_ON
+	#endif
+#elif SOL_IS_ON(SOL_COMPILER_CLANG) || SOL_IS_ON(SOL_COMPILER_GCC)
+	#if !defined(__GXX_RTTI)
+		#define SOL_RTTI_I_ SOL_OFF
+	#else
+		#define SOL_RTTI_I_ SOL_ON
+	#endif
+#else
+	#define SOL_RTTI_I_ SOL_DEFAULT_ON
+#endif
+
+#if defined(SOL_NO_THREAD_LOCAL)
+	#if SOL_NO_THREAD_LOCAL != 0
+		#define SOL_USE_THREAD_LOCAL_I_ SOL_OFF
+	#else
+		#define SOL_USE_THREAD_LOCAL_I_ SOL_ON
+	#endif
+#else
+	#define SOL_USE_THREAD_LOCAL_I_ SOL_DEFAULT_ON
+#endif // thread_local keyword is bjorked on some platforms
+
+#if defined(SOL_ALL_SAFETIES_ON)
+	#if SOL_ALL_SAFETIES_ON != 0
+		#define SOL_ALL_SAFETIES_ON_I_ SOL_ON
+	#else
+		#define SOL_ALL_SAFETIES_ON_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_ALL_SAFETIES_ON_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_SAFE_GETTER)
+	#if SOL_SAFE_GETTER != 0
+		#define SOL_SAFE_GETTER_I_ SOL_ON
+	#else
+		#define SOL_SAFE_GETTER_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON)
+		#define SOL_SAFE_GETTER_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD)
+		#define SOL_SAFE_GETTER_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_SAFE_GETTER_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_SAFE_USERTYPE)
+	#if SOL_SAFE_USERTYPE != 0
+		#define SOL_SAFE_USERTYPE_I_ SOL_ON
+	#else
+		#define SOL_SAFE_USERTYPE_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON)
+		#define SOL_SAFE_USERTYPE_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD)
+		#define SOL_SAFE_USERTYPE_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_SAFE_USERTYPE_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_SAFE_REFERENCES)
+	#if SOL_SAFE_REFERENCES != 0
+		#define SOL_SAFE_REFERENCES_I_ SOL_ON
+	#else
+		#define SOL_SAFE_REFERENCES_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON)
+		#define SOL_SAFE_REFERENCES_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD)
+		#define SOL_SAFE_REFERENCES_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_SAFE_REFERENCES_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_SAFE_FUNCTIONS)
+	#if SOL_SAFE_FUNCTIONS != 0
+		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_ON
+	#else
+		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_OFF
+	#endif
+#elif defined (SOL_SAFE_FUNCTION_OBJECTS)
+	#if SOL_SAFE_FUNCTION_OBJECTS != 0
+		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_ON
+	#else
+		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON)
+		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD)
+		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_SAFE_FUNCTION_CALLS)
+	#if SOL_SAFE_FUNCTION_CALLS != 0
+		#define SOL_SAFE_FUNCTION_CALLS_I_ SOL_ON
+	#else
+		#define SOL_SAFE_FUNCTION_CALLS_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON)
+		#define SOL_SAFE_FUNCTION_CALLS_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD)
+		#define SOL_SAFE_FUNCTION_CALLS_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_SAFE_FUNCTION_CALLS_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_SAFE_PROXIES)
+	#if SOL_SAFE_PROXIES != 0
+		#define SOL_SAFE_PROXIES_I_ SOL_ON
+	#else
+		#define SOL_SAFE_PROXIES_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON)
+		#define SOL_SAFE_PROXIES_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD)
+		#define SOL_SAFE_PROXIES_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_SAFE_PROXIES_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_SAFE_NUMERICS)
+	#if SOL_SAFE_NUMERICS != 0
+		#define SOL_SAFE_NUMERICS_I_ SOL_ON
+	#else
+		#define SOL_SAFE_NUMERICS_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON)
+		#define SOL_SAFE_NUMERICS_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD)
+		#define SOL_SAFE_NUMERICS_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_SAFE_NUMERICS_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_ALL_INTEGER_VALUES_FIT)
+	#if (SOL_ALL_INTEGER_VALUES_FIT != 0)
+		#define SOL_ALL_INTEGER_VALUES_FIT_I_ SOL_ON
+	#else
+		#define SOL_ALL_INTEGER_VALUES_FIT_I_ SOL_OFF
+	#endif
+#elif !SOL_IS_DEFAULT_OFF(SOL_SAFE_NUMERICS) && SOL_IS_OFF(SOL_SAFE_NUMERICS)
+	// if numerics is intentionally turned off, flip this on
+	#define SOL_ALL_INTEGER_VALUES_FIT_I_ SOL_DEFAULT_ON
+#else
+	// default to off
+	#define SOL_ALL_INTEGER_VALUES_FIT_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_SAFE_STACK_CHECK)
+	#if SOL_SAFE_STACK_CHECK != 0
+		#define SOL_SAFE_STACK_CHECK_I_ SOL_ON
+	#else
+		#define SOL_SAFE_STACK_CHECK_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON)
+		#define SOL_SAFE_STACK_CHECK_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD)
+		#define SOL_SAFE_STACK_CHECK_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_SAFE_STACK_CHECK_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_NO_CHECK_NUMBER_PRECISION)
+	#if SOL_NO_CHECK_NUMBER_PRECISION != 0
+		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_OFF
+	#else
+		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_ON
+	#endif
+#elif defined(SOL_NO_CHECKING_NUMBER_PRECISION)
+	#if SOL_NO_CHECKING_NUMBER_PRECISION != 0
+		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_OFF
+	#else
+		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_ON
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON)
+		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_SAFE_NUMERICS)
+		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD)
+		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_STRINGS_ARE_NUMBERS)
+	#if (SOL_STRINGS_ARE_NUMBERS != 0)
+		#define SOL_STRINGS_ARE_NUMBERS_I_ SOL_ON
+	#else
+		#define SOL_STRINGS_ARE_NUMBERS_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_STRINGS_ARE_NUMBERS_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_ENABLE_INTEROP)
+	#if SOL_ENABLE_INTEROP != 0
+		#define SOL_USE_INTEROP_I_ SOL_ON
+	#else
+		#define SOL_USE_INTEROP_I_ SOL_OFF
+	#endif
+#elif defined(SOL_USE_INTEROP)
+	#if SOL_USE_INTEROP != 0
+		#define SOL_USE_INTEROP_I_ SOL_ON
+	#else
+		#define SOL_USE_INTEROP_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_USE_INTEROP_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_NO_NIL)
+	#if (SOL_NO_NIL != 0)
+		#define SOL_NIL_I_ SOL_OFF
+	#else
+		#define SOL_NIL_I_ SOL_ON
+	#endif
+#elif defined(__MAC_OS_X_VERSION_MAX_ALLOWED) || defined(__OBJC__) || defined(nil)
+	#define SOL_NIL_I_ SOL_DEFAULT_OFF
+#else
+	#define SOL_NIL_I_ SOL_DEFAULT_ON
+#endif
+
+#if defined(SOL_USERTYPE_TYPE_BINDING_INFO)
+	#if (SOL_USERTYPE_TYPE_BINDING_INFO != 0)
+		#define SOL_USERTYPE_TYPE_BINDING_INFO_I_ SOL_ON
+	#else
+		#define SOL_USERTYPE_TYPE_BINDING_INFO_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_USERTYPE_TYPE_BINDING_INFO_I_ SOL_DEFAULT_ON
+#endif // We should generate a my_type.__type table with lots of class information for usertypes
+
+#if defined(SOL_AUTOMAGICAL_TYPES_BY_DEFAULT)
+	#if (SOL_AUTOMAGICAL_TYPES_BY_DEFAULT != 0)
+		#define SOL_DEFAULT_AUTOMAGICAL_USERTYPES_I_ SOL_ON
+	#else
+		#define SOL_DEFAULT_AUTOMAGICAL_USERTYPES_I_ SOL_OFF
+	#endif
+#elif defined(SOL_DEFAULT_AUTOMAGICAL_USERTYPES)
+	#if (SOL_DEFAULT_AUTOMAGICAL_USERTYPES != 0)
+		#define SOL_DEFAULT_AUTOMAGICAL_USERTYPES_I_ SOL_ON
+	#else
+		#define SOL_DEFAULT_AUTOMAGICAL_USERTYPES_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_DEFAULT_AUTOMAGICAL_USERTYPES_I_ SOL_DEFAULT_ON
+#endif // make is_automagical on/off by default
+
+#if defined(SOL_STD_VARIANT)
+	#if (SOL_STD_VARIANT != 0)
+		#define SOL_STD_VARIANT_I_ SOL_ON
+	#else
+		#define SOL_STD_VARIANT_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_COMPILER_CLANG) && SOL_IS_ON(SOL_PLATFORM_APPLE)
+		#if defined(__has_include)
+			#if __has_include(<variant>)
+				#define SOL_STD_VARIANT_I_ SOL_DEFAULT_ON
+			#else
+				#define SOL_STD_VARIANT_I_ SOL_DEFAULT_OFF
+			#endif
+		#else
+			#define SOL_STD_VARIANT_I_ SOL_DEFAULT_OFF
+		#endif
+	#else
+		#define SOL_STD_VARIANT_I_ SOL_DEFAULT_ON
+	#endif
+#endif // make is_automagical on/off by default
+
+#if defined(SOL_NOEXCEPT_FUNCTION_TYPE)
+	#if (SOL_NOEXCEPT_FUNCTION_TYPE != 0)
+		#define SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_ SOL_ON
+	#else
+		#define SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_ SOL_OFF
+	#endif
+#else
+	#if defined(__cpp_noexcept_function_type)
+		#define SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_COMPILER_VCXX) && (defined(_MSVC_LANG) && (_MSVC_LANG < 201403L))
+		// There is a bug in the VC++ compiler??
+		// on /std:c++latest under x86 conditions (VS 15.5.2),
+		// compiler errors are tossed for noexcept markings being on function types
+		// that are identical in every other way to their non-noexcept marked types function types...
+		// VS 2019: There is absolutely a bug.
+		#define SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_ SOL_OFF
+	#else
+		#define SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_ SOL_DEFAULT_ON
+	#endif
+#endif // noexcept is part of a function's type
+
+#if defined(SOL_STACK_STRING_OPTIMIZATION_SIZE) && SOL_STACK_STRING_OPTIMIZATION_SIZE > 0
+	#define SOL_OPTIMIZATION_STRING_CONVERSION_STACK_SIZE_I_ SOL_STACK_STRING_OPTIMIZATION_SIZE
+#else
+	#define SOL_OPTIMIZATION_STRING_CONVERSION_STACK_SIZE_I_ 1024
+#endif
+
+#if defined(SOL_ID_SIZE) && SOL_ID_SIZE > 0
+	#define SOL_ID_SIZE_I_ SOL_ID_SIZE
+#else
+	#define SOL_ID_SIZE_I_ 512
+#endif
+
+#if defined(LUA_IDSIZE) && LUA_IDSIZE > 0
+	#define SOL_FILE_ID_SIZE_I_ LUA_IDSIZE
+#elif defined(SOL_ID_SIZE) && SOL_ID_SIZE > 0
+	#define SOL_FILE_ID_SIZE_I_ SOL_FILE_ID_SIZE
+#else
+	#define SOL_FILE_ID_SIZE_I_ 2048
+#endif
+
+#if defined(SOL_PRINT_ERRORS)
+	#if (SOL_PRINT_ERRORS != 0)
+		#define SOL_PRINT_ERRORS_I_ SOL_ON
+	#else
+		#define SOL_PRINT_ERRORS_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON)
+		#define SOL_PRINT_ERRORS_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD)
+		#define SOL_PRINT_ERRORS_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_PRINT_ERRORS_I_ SOL_OFF
+	#endif
+#endif
+
+#if defined(SOL_DEFAULT_PASS_ON_ERROR)
+	#if (SOL_DEFAULT_PASS_ON_ERROR != 0)
+		#define SOL_DEFAULT_PASS_ON_ERROR_I_ SOL_ON
+	#else
+		#define SOL_DEFAULT_PASS_ON_ERROR_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_DEFAULT_PASS_ON_ERROR_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_USING_CXX_LUA)
+	#if (SOL_USING_CXX_LUA != 0)
+		#define SOL_USING_CXX_LUA_I_ SOL_ON
+	#else
+		#define SOL_USING_CXX_LUA_I_ SOL_OFF
+	#endif
+#elif defined(SOL_USE_CXX_LUA)
+	// alternative spelling
+	#if (SOL_USE_CXX_LUA != 0)
+		#define SOL_USING_CXX_LUA_I_ SOL_ON
+	#else
+		#define SOL_USING_CXX_LUA_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_USING_CXX_LUA_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_USING_CXX_LUAJIT)
+	#if (SOL_USING_CXX_LUAJIT != 0)
+		#define SOL_USING_CXX_LUAJIT_I_ SOL_ON
+	#else
+		#define SOL_USING_CXX_LUAJIT_I_ SOL_OFF
+	#endif
+#elif defined(SOL_USE_CXX_LUAJIT)
+	#if (SOL_USE_CXX_LUAJIT != 0)
+		#define SOL_USING_CXX_LUAJIT_I_ SOL_ON
+	#else
+		#define SOL_USING_CXX_LUAJIT_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_USING_CXX_LUAJIT_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_NO_LUA_HPP)
+	#if (SOL_NO_LUA_HPP != 0)
+		#define SOL_USE_LUA_HPP_I_ SOL_OFF
+	#else
+		#define SOL_USE_LUA_HPP_I_ SOL_ON
+	#endif
+#elif SOL_IS_ON(SOL_USING_CXX_LUA)
+	#define SOL_USE_LUA_HPP_I_ SOL_OFF
+#elif defined(__has_include)
+	#if __has_include(<lua.hpp>)
+		#define SOL_USE_LUA_HPP_I_ SOL_ON
+	#else
+		#define SOL_USE_LUA_HPP_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_USE_LUA_HPP_I_ SOL_DEFAULT_ON
+#endif
+
+#if defined(SOL_CONTAINERS_START)
+	#define SOL_CONTAINER_START_INDEX_I_ SOL_CONTAINERS_START
+#elif defined(SOL_CONTAINERS_START_INDEX)
+	#define SOL_CONTAINER_START_INDEX_I_ SOL_CONTAINERS_START_INDEX
+#elif defined(SOL_CONTAINER_START_INDEX)
+	#define SOL_CONTAINER_START_INDEX_I_ SOL_CONTAINER_START_INDEX
+#else
+	#define SOL_CONTAINER_START_INDEX_I_ 1
+#endif
+
+#if defined (SOL_NO_MEMORY_ALIGNMENT)
+	#if (SOL_NO_MEMORY_ALIGNMENT != 0)
+		#define SOL_ALIGN_MEMORY_I_ SOL_OFF
+	#else
+		#define SOL_ALIGN_MEMORY_I_ SOL_ON
+	#endif
+#else
+	#define SOL_ALIGN_MEMORY_I_ SOL_DEFAULT_ON
+#endif
+
+#if defined(SOL_USE_BOOST)
+	#if (SOL_USE_BOOST != 0)
+		#define SOL_USE_BOOST_I_ SOL_ON
+	#else
+		#define SOL_USE_BOOST_I_ SOL_OFF
+	#endif
+#else
+		#define SOL_USE_BOOST_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_USE_UNSAFE_BASE_LOOKUP)
+	#if (SOL_USE_UNSAFE_BASE_LOOKUP != 0)
+		#define SOL_USE_UNSAFE_BASE_LOOKUP_I_ SOL_ON
+	#else
+		#define SOL_USE_UNSAFE_BASE_LOOKUP_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_USE_UNSAFE_BASE_LOOKUP_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_INSIDE_UNREAL)
+	#if (SOL_INSIDE_UNREAL != 0)
+		#define SOL_INSIDE_UNREAL_ENGINE_I_ SOL_ON
+	#else
+		#define SOL_INSIDE_UNREAL_ENGINE_I_ SOL_OFF
+	#endif
+#else
+	#if defined(UE_BUILD_DEBUG) || defined(UE_BUILD_DEVELOPMENT) || defined(UE_BUILD_TEST) || defined(UE_BUILD_SHIPPING) || defined(UE_SERVER)
+		#define SOL_INSIDE_UNREAL_ENGINE_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_INSIDE_UNREAL_ENGINE_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_NO_COMPAT)
+	#if (SOL_NO_COMPAT != 0)
+		#define SOL_USE_COMPATIBILITY_LAYER_I_ SOL_OFF
+	#else
+		#define SOL_USE_COMPATIBILITY_LAYER_I_ SOL_ON
+	#endif
+#else
+	#define SOL_USE_COMPATIBILITY_LAYER_I_ SOL_DEFAULT_ON
+#endif
+
+#if defined(SOL_GET_FUNCTION_POINTER_UNSAFE)
+	#if (SOL_GET_FUNCTION_POINTER_UNSAFE != 0)
+		#define SOL_GET_FUNCTION_POINTER_UNSAFE_I_ SOL_ON
+	#else
+		#define SOL_GET_FUNCTION_POINTER_UNSAFE_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_GET_FUNCTION_POINTER_UNSAFE_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_CONTAINER_CHECK_IS_EXHAUSTIVE)
+	#if (SOL_CONTAINER_CHECK_IS_EXHAUSTIVE != 0)
+		#define SOL_CONTAINER_CHECK_IS_EXHAUSTIVE_I_ SOL_ON
+	#else
+		#define SOL_CONTAINER_CHECK_IS_EXHAUSTIVE_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_CONTAINER_CHECK_IS_EXHAUSTIVE_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_FUNCTION_CALL_VALUE_SEMANTICS)
+	#if (SOL_FUNCTION_CALL_VALUE_SEMANTICS != 0)
+		#define SOL_FUNCTION_CALL_VALUE_SEMANTICS_I_ SOL_ON
+	#else
+		#define SOL_FUNCTION_CALL_VALUE_SEMANTICS_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_FUNCTION_CALL_VALUE_SEMANTICS_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_MINGW_CCTYPE_IS_POISONED)
+	#if (SOL_MINGW_CCTYPE_IS_POISONED != 0)
+		#define SOL_MINGW_CCTYPE_IS_POISONED_I_ SOL_ON
+	#else
+		#define SOL_MINGW_CCTYPE_IS_POISONED_I_ SOL_OFF
+	#endif
+#elif SOL_IS_ON(SOL_COMPILER_MINGW) && defined(__GNUC__) && (__GNUC__ < 6)
+	// MinGW is off its rocker in some places...
+	#define SOL_MINGW_CCTYPE_IS_POISONED_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_MINGW_CCTYPE_IS_POISONED_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_CHAR8_T)
+	#if (SOL_CHAR8_T != 0)
+		#define SOL_CHAR8_T_I_ SOL_ON
+	#else
+		#define SOL_CHAR8_T_I_ SOL_OFF
+	#endif
+#else
+	#if defined(__cpp_char8_t)
+		#define SOL_CHAR8_T_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_CHAR8_T_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if SOL_IS_ON(SOL_USE_BOOST)
+	#include <boost/version.hpp>
+
+	#if BOOST_VERSION >= 107500 // Since Boost 1.75.0 boost::none is constexpr
+		#define SOL_BOOST_NONE_CONSTEXPR_I_ constexpr
+	#else
+		#define SOL_BOOST_NONE_CONSTEXPR_I_ const
+	#endif // BOOST_VERSION
+#else
+	// assume boost isn't using a garbage version
+	#define SOL_BOOST_NONE_CONSTEXPR_I_ constexpr
+#endif
+
+#if defined(SOL2_CI)
+	#if (SOL2_CI != 0)
+		#define SOL2_CI_I_ SOL_ON
+	#else
+		#define SOL2_CI_I_ SOL_OFF
+	#endif
+#else
+	#define SOL2_CI_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_ASSERT)
+	#define SOL_USER_ASSERT_I_ SOL_ON
+#else
+	#define SOL_USER_ASSERT_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_ASSERT_MSG)
+	#define SOL_USER_ASSERT_MSG_I_ SOL_ON
+#else
+	#define SOL_USER_ASSERT_MSG_I_ SOL_DEFAULT_OFF
+#endif
+
+// beginning of sol/prologue.hpp
+
+#if defined(SOL_PROLOGUE_I_)
+	#error "[sol2] Library Prologue was already included in translation unit and not properly ended with an epilogue."
+#endif
+
+#define SOL_PROLOGUE_I_ 1
+
+#if SOL_IS_ON(SOL_BUILD_CXX_MODE)
+	#define _FWD(...) static_cast<decltype( __VA_ARGS__ )&&>( __VA_ARGS__ )
+
+	#if SOL_IS_ON(SOL_COMPILER_GCC) || SOL_IS_ON(SOL_COMPILER_CLANG)
+		#define _MOVE(...) static_cast<__typeof( __VA_ARGS__ )&&>( __VA_ARGS__ )
+	#else
+		#include <type_traits>
+		
+		#define _MOVE(...) static_cast<::std::remove_reference_t<( __VA_ARGS__ )>&&>( __VA_OPT__(,) )
+	#endif
+#endif
+
+// end of sol/prologue.hpp
+
+// beginning of sol/epilogue.hpp
+
+#if !defined(SOL_PROLOGUE_I_)
+	#error "[sol2] Library Prologue is missing from this translation unit."
+#else
+	#undef SOL_PROLOGUE_I_
+#endif
+
+#if SOL_IS_ON(SOL_BUILD_CXX_MODE)
+	#undef _FWD
+	#undef _MOVE
+#endif
+
+// end of sol/epilogue.hpp
+
+// beginning of sol/detail/build_version.hpp
+
+#if defined(SOL_DLL)
+	#if (SOL_DLL != 0)
+		#define SOL_DLL_I_ SOL_ON
+	#else
+		#define SOL_DLL_I_ SOL_OFF
+	#endif
+#elif SOL_IS_ON(SOL_COMPILER_VCXX) && (defined(DLL_) || defined(_DLL))
+	#define SOL_DLL_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_DLL_I_ SOL_DEFAULT_OFF
+#endif // DLL definition
+
+#if defined(SOL_HEADER_ONLY)
+	#if (SOL_HEADER_ONLY != 0)
+		#define SOL_HEADER_ONLY_I_ SOL_ON
+	#else
+		#define SOL_HEADER_ONLY_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_HEADER_ONLY_I_ SOL_DEFAULT_OFF
+#endif // Header only library
+
+#if defined(SOL_BUILD)
+	#if (SOL_BUILD != 0)
+		#define SOL_BUILD_I_ SOL_ON
+	#else
+		#define SOL_BUILD_I_ SOL_OFF
+	#endif
+#elif SOL_IS_ON(SOL_HEADER_ONLY)
+	#define SOL_BUILD_I_ SOL_DEFAULT_OFF
+#else
+	#define SOL_BUILD_I_ SOL_DEFAULT_ON
+#endif
+
+#if defined(SOL_UNITY_BUILD)
+	#if (SOL_UNITY_BUILD != 0)
+		#define SOL_UNITY_BUILD_I_ SOL_ON
+	#else
+		#define SOL_UNITY_BUILD_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_UNITY_BUILD_I_ SOL_DEFAULT_OFF
+#endif // Header only library
+
+#if defined(SOL_C_FUNCTION_LINKAGE)
+	#define SOL_C_FUNCTION_LINKAGE_I_ SOL_C_FUNCTION_LINKAGE
+#else
+	#if SOL_IS_ON(SOL_BUILD_CXX_MODE)
+		// C++
+		#define SOL_C_FUNCTION_LINKAGE_I_ extern "C"
+	#else
+		// normal
+		#define SOL_C_FUNCTION_LINKAGE_I_
+	#endif // C++ or not
+#endif // Linkage specification for C functions
+
+#if defined(SOL_API_LINKAGE)
+	#define SOL_API_LINKAGE_I_ SOL_API_LINKAGE
+#else
+	#if SOL_IS_ON(SOL_DLL)
+		#if SOL_IS_ON(SOL_COMPILER_VCXX) || SOL_IS_ON(SOL_PLATFORM_WINDOWS) || SOL_IS_ON(SOL_PLATFORM_CYGWIN)
+			// MSVC Compiler; or, Windows, or Cygwin platforms
+			#if SOL_IS_ON(SOL_BUILD)
+				// Building the library
+				#if SOL_IS_ON(SOL_COMPILER_GCC)
+					// Using GCC
+					#define SOL_API_LINKAGE_I_ __attribute__((dllexport))
+				#else
+					// Using Clang, MSVC, etc...
+					#define SOL_API_LINKAGE_I_ __declspec(dllexport)
+				#endif
+			#else
+				#if SOL_IS_ON(SOL_COMPILER_GCC)
+					#define SOL_API_LINKAGE_I_ __attribute__((dllimport))
+				#else
+					#define SOL_API_LINKAGE_I_ __declspec(dllimport)
+				#endif
+			#endif
+		#else
+			// extern if building normally on non-MSVC
+			#define SOL_API_LINKAGE_I_ extern
+		#endif
+	#elif SOL_IS_ON(SOL_UNITY_BUILD)
+		// Built-in library, like how stb typical works
+		#if SOL_IS_ON(SOL_HEADER_ONLY)
+			// Header only, so functions are defined "inline"
+			#define SOL_API_LINKAGE_I_ inline
+		#else
+			// Not header only, so seperately compiled files
+			#define SOL_API_LINKAGE_I_ extern
+		#endif
+	#else
+		// Normal static library
+		#if SOL_IS_ON(SOL_BUILD_CXX_MODE)
+			#define SOL_API_LINKAGE_I_
+		#else
+			#define SOL_API_LINKAGE_I_ extern
+		#endif
+	#endif // DLL or not
+#endif // Build definitions
+
+#if defined(SOL_PUBLIC_FUNC_DECL)
+	#define SOL_PUBLIC_FUNC_DECL_I_ SOL_PUBLIC_FUNC_DECL
+#else
+	#define SOL_PUBLIC_FUNC_DECL_I_ SOL_API_LINKAGE_I_
+#endif
+
+#if defined(SOL_INTERNAL_FUNC_DECL_)
+	#define SOL_INTERNAL_FUNC_DECL_I_ SOL_INTERNAL_FUNC_DECL_
+#else
+	#define SOL_INTERNAL_FUNC_DECL_I_ SOL_API_LINKAGE_I_
+#endif
+
+#if defined(SOL_PUBLIC_FUNC_DEF)
+	#define SOL_PUBLIC_FUNC_DEF_I_ SOL_PUBLIC_FUNC_DEF
+#else
+	#define SOL_PUBLIC_FUNC_DEF_I_ SOL_API_LINKAGE_I_
+#endif
+
+#if defined(SOL_INTERNAL_FUNC_DEF)
+	#define SOL_INTERNAL_FUNC_DEF_I_ SOL_INTERNAL_FUNC_DEF
+#else
+	#define SOL_INTERNAL_FUNC_DEF_I_ SOL_API_LINKAGE_I_
+#endif
+
+#if defined(SOL_FUNC_DECL)
+	#define SOL_FUNC_DECL_I_ SOL_FUNC_DECL
+#elif SOL_IS_ON(SOL_HEADER_ONLY)
+	#define SOL_FUNC_DECL_I_ 
+#elif SOL_IS_ON(SOL_DLL)
+	#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		#if SOL_IS_ON(SOL_BUILD)
+			#define SOL_FUNC_DECL_I_ extern __declspec(dllexport)
+		#else
+			#define SOL_FUNC_DECL_I_ extern __declspec(dllimport)
+		#endif
+	#elif SOL_IS_ON(SOL_COMPILER_GCC) || SOL_IS_ON(SOL_COMPILER_CLANG)
+		#define SOL_FUNC_DECL_I_ extern __attribute__((visibility("default")))
+	#else
+		#define SOL_FUNC_DECL_I_ extern
+	#endif
+#endif
+
+#if defined(SOL_FUNC_DEFN)
+	#define SOL_FUNC_DEFN_I_ SOL_FUNC_DEFN
+#elif SOL_IS_ON(SOL_HEADER_ONLY)
+	#define SOL_FUNC_DEFN_I_ inline
+#elif SOL_IS_ON(SOL_DLL)
+	#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		#if SOL_IS_ON(SOL_BUILD)
+			#define SOL_FUNC_DEFN_I_ __declspec(dllexport)
+		#else
+			#define SOL_FUNC_DEFN_I_ __declspec(dllimport)
+		#endif
+	#elif SOL_IS_ON(SOL_COMPILER_GCC) || SOL_IS_ON(SOL_COMPILER_CLANG)
+		#define SOL_FUNC_DEFN_I_ __attribute__((visibility("default")))
+	#else
+		#define SOL_FUNC_DEFN_I_
+	#endif
+#endif
+
+#if defined(SOL_HIDDEN_FUNC_DECL)
+	#define SOL_HIDDEN_FUNC_DECL_I_ SOL_HIDDEN_FUNC_DECL
+#elif SOL_IS_ON(SOL_HEADER_ONLY)
+	#define SOL_HIDDEN_FUNC_DECL_I_ 
+#elif SOL_IS_ON(SOL_DLL)
+	#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		#if SOL_IS_ON(SOL_BUILD)
+			#define SOL_HIDDEN_FUNC_DECL_I_ extern __declspec(dllexport)
+		#else
+			#define SOL_HIDDEN_FUNC_DECL_I_ extern __declspec(dllimport)
+		#endif
+	#elif SOL_IS_ON(SOL_COMPILER_GCC) || SOL_IS_ON(SOL_COMPILER_CLANG)
+		#define SOL_HIDDEN_FUNC_DECL_I_ extern __attribute__((visibility("default")))
+	#else
+		#define SOL_HIDDEN_FUNC_DECL_I_ extern
+	#endif
+#endif
+
+#if defined(SOL_HIDDEN_FUNC_DEFN)
+	#define SOL_HIDDEN_FUNC_DEFN_I_ SOL_HIDDEN_FUNC_DEFN
+#elif SOL_IS_ON(SOL_HEADER_ONLY)
+	#define SOL_HIDDEN_FUNC_DEFN_I_ inline
+#elif SOL_IS_ON(SOL_DLL)
+	#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		#if SOL_IS_ON(SOL_BUILD)
+			#define SOL_HIDDEN_FUNC_DEFN_I_ 
+		#else
+			#define SOL_HIDDEN_FUNC_DEFN_I_ 
+		#endif
+	#elif SOL_IS_ON(SOL_COMPILER_GCC) || SOL_IS_ON(SOL_COMPILER_CLANG)
+		#define SOL_HIDDEN_FUNC_DEFN_I_ __attribute__((visibility("hidden")))
+	#else
+		#define SOL_HIDDEN_FUNC_DEFN_I_
+	#endif
+#endif
+
+// end of sol/detail/build_version.hpp
+
+// end of sol/version.hpp
+
+#include <utility>
+#include <type_traits>
+#include <string_view>
+
+#if SOL_IS_ON(SOL_USING_CXX_LUA) || SOL_IS_ON(SOL_USING_CXX_LUAJIT)
+struct lua_State;
+#else
+extern "C" {
+struct lua_State;
+}
+#endif // C++ Mangling for Lua vs. Not
+
+namespace sol {
+
+	enum class type;
+
+	class stateless_reference;
+	template <bool b>
+	class basic_reference;
+	using reference = basic_reference<false>;
+	using main_reference = basic_reference<true>;
+	class stateless_stack_reference;
+	class stack_reference;
+
+	template <typename A>
+	class basic_bytecode;
+
+	struct lua_value;
+
+	struct proxy_base_tag;
+	template <typename>
+	struct proxy_base;
+	template <typename, typename>
+	struct table_proxy;
+
+	template <bool, typename>
+	class basic_table_core;
+	template <bool b>
+	using table_core = basic_table_core<b, reference>;
+	template <bool b>
+	using main_table_core = basic_table_core<b, main_reference>;
+	template <bool b>
+	using stack_table_core = basic_table_core<b, stack_reference>;
+	template <typename base_type>
+	using basic_table = basic_table_core<false, base_type>;
+	using table = table_core<false>;
+	using global_table = table_core<true>;
+	using main_table = main_table_core<false>;
+	using main_global_table = main_table_core<true>;
+	using stack_table = stack_table_core<false>;
+	using stack_global_table = stack_table_core<true>;
+
+	template <typename>
+	struct basic_lua_table;
+	using lua_table = basic_lua_table<reference>;
+	using stack_lua_table = basic_lua_table<stack_reference>;
+
+	template <typename T, typename base_type>
+	class basic_usertype;
+	template <typename T>
+	using usertype = basic_usertype<T, reference>;
+	template <typename T>
+	using stack_usertype = basic_usertype<T, stack_reference>;
+
+	template <typename base_type>
+	class basic_metatable;
+	using metatable = basic_metatable<reference>;
+	using stack_metatable = basic_metatable<stack_reference>;
+
+	template <typename base_t>
+	struct basic_environment;
+	using environment = basic_environment<reference>;
+	using main_environment = basic_environment<main_reference>;
+	using stack_environment = basic_environment<stack_reference>;
+
+	template <typename T, bool>
+	class basic_function;
+	template <typename T, bool, typename H>
+	class basic_protected_function;
+	using unsafe_function = basic_function<reference, false>;
+	using safe_function = basic_protected_function<reference, false, reference>;
+	using main_unsafe_function = basic_function<main_reference, false>;
+	using main_safe_function = basic_protected_function<main_reference, false, reference>;
+	using stack_unsafe_function = basic_function<stack_reference, false>;
+	using stack_safe_function = basic_protected_function<stack_reference, false, reference>;
+	using stack_aligned_unsafe_function = basic_function<stack_reference, true>;
+	using stack_aligned_safe_function = basic_protected_function<stack_reference, true, reference>;
+	using protected_function = safe_function;
+	using main_protected_function = main_safe_function;
+	using stack_protected_function = stack_safe_function;
+	using stack_aligned_protected_function = stack_aligned_safe_function;
+#if SOL_IS_ON(SOL_SAFE_FUNCTION_OBJECTS)
+	using function = protected_function;
+	using main_function = main_protected_function;
+	using stack_function = stack_protected_function;
+	using stack_aligned_function = stack_aligned_safe_function;
+#else
+	using function = unsafe_function;
+	using main_function = main_unsafe_function;
+	using stack_function = stack_unsafe_function;
+	using stack_aligned_function = stack_aligned_unsafe_function;
+#endif
+	using stack_aligned_stack_handler_function = basic_protected_function<stack_reference, true, stack_reference>;
+
+	struct unsafe_function_result;
+	struct protected_function_result;
+	using safe_function_result = protected_function_result;
+#if SOL_IS_ON(SOL_SAFE_FUNCTION_OBJECTS)
+	using function_result = safe_function_result;
+#else
+	using function_result = unsafe_function_result;
+#endif
+
+	template <typename base_t>
+	class basic_object_base;
+	template <typename base_t>
+	class basic_object;
+	template <typename base_t>
+	class basic_userdata;
+	template <typename base_t>
+	class basic_lightuserdata;
+	template <typename base_t>
+	class basic_coroutine;
+	template <typename base_t>
+	class basic_packaged_coroutine;
+	template <typename base_t>
+	class basic_thread;
+
+	using object = basic_object<reference>;
+	using userdata = basic_userdata<reference>;
+	using lightuserdata = basic_lightuserdata<reference>;
+	using thread = basic_thread<reference>;
+	using coroutine = basic_coroutine<reference>;
+	using packaged_coroutine = basic_packaged_coroutine<reference>;
+	using main_object = basic_object<main_reference>;
+	using main_userdata = basic_userdata<main_reference>;
+	using main_lightuserdata = basic_lightuserdata<main_reference>;
+	using main_coroutine = basic_coroutine<main_reference>;
+	using stack_object = basic_object<stack_reference>;
+	using stack_userdata = basic_userdata<stack_reference>;
+	using stack_lightuserdata = basic_lightuserdata<stack_reference>;
+	using stack_thread = basic_thread<stack_reference>;
+	using stack_coroutine = basic_coroutine<stack_reference>;
+
+	struct stack_proxy_base;
+	struct stack_proxy;
+	struct variadic_args;
+	struct variadic_results;
+	struct stack_count;
+	struct this_state;
+	struct this_main_state;
+	struct this_environment;
+
+	class state_view;
+	class state;
+
+	template <typename T>
+	struct as_table_t;
+	template <typename T>
+	struct as_container_t;
+	template <typename T>
+	struct nested;
+	template <typename T>
+	struct light;
+	template <typename T>
+	struct user;
+	template <typename T>
+	struct as_args_t;
+	template <typename T>
+	struct protect_t;
+	template <typename F, typename... Policies>
+	struct policy_wrapper;
+
+	template <typename T>
+	struct usertype_traits;
+	template <typename T>
+	struct unique_usertype_traits;
+
+	template <typename... Args>
+	struct types {
+		typedef std::make_index_sequence<sizeof...(Args)> indices;
+		static constexpr std::size_t size() {
+			return sizeof...(Args);
+		}
+	};
+
+	template <typename T>
+	struct derive : std::false_type {
+		typedef types<> type;
+	};
+
+	template <typename T>
+	struct base : std::false_type {
+		typedef types<> type;
+	};
+
+	template <typename T>
+	struct weak_derive {
+		static bool value;
+	};
+
+	template <typename T>
+	bool weak_derive<T>::value = false;
+
+	namespace stack {
+		struct record;
+	}
+
+#if SOL_IS_OFF(SOL_USE_BOOST)
+	template <class T>
+	class optional;
+
+	template <class T>
+	class optional<T&>;
+#endif
+
+	using check_handler_type = int(lua_State*, int, type, type, const char*);
+
+} // namespace sol
+
+#define SOL_BASE_CLASSES(T, ...)                       \
+	namespace sol {                                   \
+		template <>                                  \
+		struct base<T> : std::true_type {            \
+			typedef ::sol::types<__VA_ARGS__> type; \
+		};                                           \
+	}                                                 \
+	static_assert(true, "")
+#define SOL_DERIVED_CLASSES(T, ...)                    \
+	namespace sol {                                   \
+		template <>                                  \
+		struct derive<T> : std::true_type {          \
+			typedef ::sol::types<__VA_ARGS__> type; \
+		};                                           \
+	}                                                 \
+	static_assert(true, "")
+
+#endif // SOL_FORWARD_HPP
+// end of sol/forward.hpp
+
+#endif // SOL_SINGLE_INCLUDE_SOL_FORWARD_HPP
diff --git a/src/libs/3rdparty/sol2/include/sol/sol.hpp b/src/libs/3rdparty/sol2/include/sol/sol.hpp
new file mode 100644
index 0000000000..063ea72165
--- /dev/null
+++ b/src/libs/3rdparty/sol2/include/sol/sol.hpp
@@ -0,0 +1,29202 @@
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+// This file was generated with a script.
+// Generated 2024-01-13 14:25:56.532275 UTC
+// This header was generated with sol v3.3.1 (revision 9c882a28)
+// https://github.com/ThePhD/sol2
+
+#ifndef SOL_SINGLE_INCLUDE_SOL_HPP
+#define SOL_SINGLE_INCLUDE_SOL_HPP
+
+// beginning of sol/sol.hpp
+
+#ifndef SOL_HPP
+#define SOL_HPP
+
+// beginning of sol/version.hpp
+
+#include "config.hpp"
+
+#define SOL_VERSION_MAJOR 3
+#define SOL_VERSION_MINOR 2
+#define SOL_VERSION_PATCH 3
+#define SOL_VERSION_STRING "3.2.3"
+#define SOL_VERSION ((SOL_VERSION_MAJOR * 100000) + (SOL_VERSION_MINOR * 100) + (SOL_VERSION_PATCH))
+
+#define SOL_TOKEN_TO_STRING_POST_EXPANSION_I_(_TOKEN) #_TOKEN
+#define SOL_TOKEN_TO_STRING_I_(_TOKEN) SOL_TOKEN_TO_STRING_POST_EXPANSION_I_(_TOKEN)
+
+#define SOL_CONCAT_TOKENS_POST_EXPANSION_I_(_LEFT, _RIGHT) _LEFT##_RIGHT
+#define SOL_CONCAT_TOKENS_I_(_LEFT, _RIGHT) SOL_CONCAT_TOKENS_POST_EXPANSION_I_(_LEFT, _RIGHT)
+
+#define SOL_RAW_IS_ON(OP_SYMBOL) ((3 OP_SYMBOL 3) != 0)
+#define SOL_RAW_IS_OFF(OP_SYMBOL) ((3 OP_SYMBOL 3) == 0)
+#define SOL_RAW_IS_DEFAULT_ON(OP_SYMBOL) ((3 OP_SYMBOL 3) > 3)
+#define SOL_RAW_IS_DEFAULT_OFF(OP_SYMBOL) ((3 OP_SYMBOL 3 OP_SYMBOL 3) < 0)
+
+#define SOL_IS_ON(OP_SYMBOL) SOL_RAW_IS_ON(OP_SYMBOL ## _I_)
+#define SOL_IS_OFF(OP_SYMBOL) SOL_RAW_IS_OFF(OP_SYMBOL ## _I_)
+#define SOL_IS_DEFAULT_ON(OP_SYMBOL) SOL_RAW_IS_DEFAULT_ON(OP_SYMBOL ## _I_)
+#define SOL_IS_DEFAULT_OFF(OP_SYMBOL) SOL_RAW_IS_DEFAULT_OFF(OP_SYMBOL ## _I_)
+
+#define SOL_ON          |
+#define SOL_OFF         ^
+#define SOL_DEFAULT_ON  +
+#define SOL_DEFAULT_OFF -
+
+#if defined(SOL_BUILD_CXX_MODE)
+	#if (SOL_BUILD_CXX_MODE != 0)
+		#define SOL_BUILD_CXX_MODE_I_ SOL_ON
+	#else
+		#define SOL_BUILD_CXX_MODE_I_ SOL_OFF
+	#endif
+#elif defined(__cplusplus)
+	#define SOL_BUILD_CXX_MODE_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_BUILD_CXX_MODE_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_BUILD_C_MODE)
+	#if (SOL_BUILD_C_MODE != 0)
+		#define SOL_BUILD_C_MODE_I_ SOL_ON
+	#else
+		#define SOL_BUILD_C_MODE_I_ SOL_OFF
+	#endif
+#elif defined(__STDC__)
+	#define SOL_BUILD_C_MODE_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_BUILD_C_MODE_I_ SOL_DEFAULT_OFF
+#endif
+
+#if SOL_IS_ON(SOL_BUILD_C_MODE)
+	#include <stddef.h>
+	#include <stdint.h>
+	#include <limits.h>
+#else
+	#include <cstddef>
+	#include <cstdint>
+	#include <climits>
+#endif
+
+#if defined(SOL_HAS_BUILTIN)
+	#define SOL_HAS_BUILTIN_I_(...) SOL_HAS_BUILTIN(__VA_ARGS__)
+#elif defined(__has_builtin)
+	#define SOL_HAS_BUILTIN_I_(...) __has_builtin(__VA_ARGS__)
+#else
+	#define SOL_HAS_BUILTIN_I_(...) 0
+#endif
+
+#if defined(SOL_COMPILER_VCXX)
+	#if defined(SOL_COMPILER_VCXX != 0)
+		#define SOL_COMPILER_VCXX_I_ SOL_ON
+	#else
+		#define SOL_COMPILER_VCXX_I_ SOL_OFF
+	#endif
+#elif defined(_MSC_VER)
+	#define SOL_COMPILER_VCXX_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_COMPILER_VCXX_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_COMPILER_GCC)
+	#if defined(SOL_COMPILER_GCC != 0)
+		#define SOL_COMPILER_GCC_I_ SOL_ON
+	#else
+		#define SOL_COMPILER_GCC_I_ SOL_OFF
+	#endif
+#elif defined(__GNUC__)
+	#define SOL_COMPILER_GCC_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_COMPILER_GCC_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_COMPILER_CLANG)
+	#if defined(SOL_COMPILER_CLANG != 0)
+		#define SOL_COMPILER_CLANG_I_ SOL_ON
+	#else
+		#define SOL_COMPILER_CLANG_I_ SOL_OFF
+	#endif
+#elif defined(__clang__)
+	#define SOL_COMPILER_CLANG_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_COMPILER_CLANG_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_COMPILER_EDG)
+	#if defined(SOL_COMPILER_EDG != 0)
+		#define SOL_COMPILER_EDG_I_ SOL_ON
+	#else
+		#define SOL_COMPILER_EDG_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_COMPILER_EDG_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_COMPILER_MINGW)
+	#if (SOL_COMPILER_MINGW != 0)
+		#define SOL_COMPILER_MINGW_I_ SOL_ON
+	#else
+		#define SOL_COMPILER_MINGW_I_ SOL_OFF
+	#endif
+#elif defined(__MINGW32__)
+	#define SOL_COMPILER_MINGW_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_COMPILER_MINGW_I_ SOL_DEFAULT_OFF
+#endif
+
+#if SIZE_MAX <= 0xFFFFULL
+	#define SOL_PLATFORM_X16_I_ SOL_ON
+	#define SOL_PLATFORM_X86_I_ SOL_OFF
+	#define SOL_PLATFORM_X64_I_ SOL_OFF
+#elif SIZE_MAX <= 0xFFFFFFFFULL
+	#define SOL_PLATFORM_X16_I_ SOL_OFF
+	#define SOL_PLATFORM_X86_I_ SOL_ON
+	#define SOL_PLATFORM_X64_I_ SOL_OFF
+#else
+	#define SOL_PLATFORM_X16_I_ SOL_OFF
+	#define SOL_PLATFORM_X86_I_ SOL_OFF
+	#define SOL_PLATFORM_X64_I_ SOL_ON
+#endif
+
+#define SOL_PLATFORM_ARM32_I_ SOL_OFF
+#define SOL_PLATFORM_ARM64_I_ SOL_OFF
+
+#if defined(SOL_PLATFORM_WINDOWS)
+	#if (SOL_PLATFORM_WINDOWS != 0)
+		#define SOL_PLATFORM_WINDOWS_I_ SOL_ON
+	#else
+		#define SOL_PLATFORM_WINDOWS_I_ SOL_OFF
+	#endif
+#elif defined(_WIN32)
+	#define SOL_PLATFORM_WINDOWS_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_PLATFORM_WINDOWS_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_PLATFORM_CYGWIN)
+	#if (SOL_PLATFORM_CYGWIN != 0)
+		#define SOL_PLATFORM_CYGWIN_I_ SOL_ON
+	#else
+		#define SOL_PLATFORM_CYGWIN_I_ SOL_ON
+	#endif
+#elif defined(__CYGWIN__)
+	#define SOL_PLATFORM_CYGWIN_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_PLATFORM_CYGWIN_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_PLATFORM_APPLE)
+	#if (SOL_PLATFORM_APPLE != 0)
+		#define SOL_PLATFORM_APPLE_I_ SOL_ON
+	#else
+		#define SOL_PLATFORM_APPLE_I_ SOL_OFF
+	#endif
+#elif defined(__APPLE__)
+	#define SOL_PLATFORM_APPLE_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_PLATFORM_APPLE_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_PLATFORM_UNIX)
+	#if (SOL_PLATFORM_UNIX != 0)
+		#define SOL_PLATFORM_UNIXLIKE_I_ SOL_ON
+	#else
+		#define SOL_PLATFORM_UNIXLIKE_I_ SOL_OFF
+	#endif
+#elif defined(__unix__)
+	#define SOL_PLATFORM_UNIXLIKE_I_ SOL_DEFAUKT_ON
+#else
+	#define SOL_PLATFORM_UNIXLIKE_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_PLATFORM_LINUX)
+	#if (SOL_PLATFORM_LINUX != 0)
+		#define SOL_PLATFORM_LINUXLIKE_I_ SOL_ON
+	#else
+		#define SOL_PLATFORM_LINUXLIKE_I_ SOL_OFF
+	#endif
+#elif defined(__LINUX__)
+	#define SOL_PLATFORM_LINUXLIKE_I_ SOL_DEFAUKT_ON
+#else
+	#define SOL_PLATFORM_LINUXLIKE_I_ SOL_DEFAULT_OFF
+#endif
+
+#define SOL_PLATFORM_APPLE_IPHONE_I_ SOL_OFF
+#define SOL_PLATFORM_BSDLIKE_I_      SOL_OFF
+
+#if defined(SOL_IN_DEBUG_DETECTED)
+	#if SOL_IN_DEBUG_DETECTED != 0
+		#define SOL_DEBUG_BUILD_I_ SOL_ON
+	#else
+		#define SOL_DEBUG_BUILD_I_ SOL_OFF
+	#endif
+#elif !defined(NDEBUG)
+	#if SOL_IS_ON(SOL_COMPILER_VCXX) && defined(_DEBUG)
+		#define SOL_DEBUG_BUILD_I_ SOL_ON
+	#elif (SOL_IS_ON(SOL_COMPILER_CLANG) || SOL_IS_ON(SOL_COMPILER_GCC)) && !defined(__OPTIMIZE__)
+		#define SOL_DEBUG_BUILD_I_ SOL_ON
+	#else
+		#define SOL_DEBUG_BUILD_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_DEBUG_BUILD_I_ SOL_DEFAULT_OFF
+#endif // We are in a debug mode of some sort
+
+#if defined(SOL_NO_EXCEPTIONS)
+	#if (SOL_NO_EXCEPTIONS != 0)
+		#define SOL_EXCEPTIONS_I_ SOL_OFF
+	#else
+		#define SOL_EXCEPTIONS_I_ SOL_ON
+	#endif
+#elif SOL_IS_ON(SOL_COMPILER_VCXX)
+	#if !defined(_CPPUNWIND)
+		#define SOL_EXCEPTIONS_I_ SOL_OFF
+	#else
+		#define SOL_EXCEPTIONS_I_ SOL_ON
+	#endif
+#elif SOL_IS_ON(SOL_COMPILER_CLANG) || SOL_IS_ON(SOL_COMPILER_GCC)
+	#if !defined(__EXCEPTIONS)
+		#define SOL_EXCEPTIONS_I_ SOL_OFF
+	#else
+		#define SOL_EXCEPTIONS_I_ SOL_ON
+	#endif
+#else
+	#define SOL_EXCEPTIONS_I_ SOL_DEFAULT_ON
+#endif
+
+#if defined(SOL_NO_RTTI)
+	#if (SOL_NO_RTTI != 0)
+		#define SOL_RTTI_I_ SOL_OFF
+	#else
+		#define SOL_RTTI_I_ SOL_ON
+	#endif
+#elif SOL_IS_ON(SOL_COMPILER_VCXX)
+	#if !defined(_CPPRTTI)
+		#define SOL_RTTI_I_ SOL_OFF
+	#else
+		#define SOL_RTTI_I_ SOL_ON
+	#endif
+#elif SOL_IS_ON(SOL_COMPILER_CLANG) || SOL_IS_ON(SOL_COMPILER_GCC)
+	#if !defined(__GXX_RTTI)
+		#define SOL_RTTI_I_ SOL_OFF
+	#else
+		#define SOL_RTTI_I_ SOL_ON
+	#endif
+#else
+	#define SOL_RTTI_I_ SOL_DEFAULT_ON
+#endif
+
+#if defined(SOL_NO_THREAD_LOCAL)
+	#if SOL_NO_THREAD_LOCAL != 0
+		#define SOL_USE_THREAD_LOCAL_I_ SOL_OFF
+	#else
+		#define SOL_USE_THREAD_LOCAL_I_ SOL_ON
+	#endif
+#else
+	#define SOL_USE_THREAD_LOCAL_I_ SOL_DEFAULT_ON
+#endif // thread_local keyword is bjorked on some platforms
+
+#if defined(SOL_ALL_SAFETIES_ON)
+	#if SOL_ALL_SAFETIES_ON != 0
+		#define SOL_ALL_SAFETIES_ON_I_ SOL_ON
+	#else
+		#define SOL_ALL_SAFETIES_ON_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_ALL_SAFETIES_ON_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_SAFE_GETTER)
+	#if SOL_SAFE_GETTER != 0
+		#define SOL_SAFE_GETTER_I_ SOL_ON
+	#else
+		#define SOL_SAFE_GETTER_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON)
+		#define SOL_SAFE_GETTER_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD)
+		#define SOL_SAFE_GETTER_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_SAFE_GETTER_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_SAFE_USERTYPE)
+	#if SOL_SAFE_USERTYPE != 0
+		#define SOL_SAFE_USERTYPE_I_ SOL_ON
+	#else
+		#define SOL_SAFE_USERTYPE_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON)
+		#define SOL_SAFE_USERTYPE_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD)
+		#define SOL_SAFE_USERTYPE_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_SAFE_USERTYPE_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_SAFE_REFERENCES)
+	#if SOL_SAFE_REFERENCES != 0
+		#define SOL_SAFE_REFERENCES_I_ SOL_ON
+	#else
+		#define SOL_SAFE_REFERENCES_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON)
+		#define SOL_SAFE_REFERENCES_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD)
+		#define SOL_SAFE_REFERENCES_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_SAFE_REFERENCES_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_SAFE_FUNCTIONS)
+	#if SOL_SAFE_FUNCTIONS != 0
+		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_ON
+	#else
+		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_OFF
+	#endif
+#elif defined (SOL_SAFE_FUNCTION_OBJECTS)
+	#if SOL_SAFE_FUNCTION_OBJECTS != 0
+		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_ON
+	#else
+		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON)
+		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD)
+		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_SAFE_FUNCTION_CALLS)
+	#if SOL_SAFE_FUNCTION_CALLS != 0
+		#define SOL_SAFE_FUNCTION_CALLS_I_ SOL_ON
+	#else
+		#define SOL_SAFE_FUNCTION_CALLS_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON)
+		#define SOL_SAFE_FUNCTION_CALLS_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD)
+		#define SOL_SAFE_FUNCTION_CALLS_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_SAFE_FUNCTION_CALLS_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_SAFE_PROXIES)
+	#if SOL_SAFE_PROXIES != 0
+		#define SOL_SAFE_PROXIES_I_ SOL_ON
+	#else
+		#define SOL_SAFE_PROXIES_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON)
+		#define SOL_SAFE_PROXIES_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD)
+		#define SOL_SAFE_PROXIES_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_SAFE_PROXIES_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_SAFE_NUMERICS)
+	#if SOL_SAFE_NUMERICS != 0
+		#define SOL_SAFE_NUMERICS_I_ SOL_ON
+	#else
+		#define SOL_SAFE_NUMERICS_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON)
+		#define SOL_SAFE_NUMERICS_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD)
+		#define SOL_SAFE_NUMERICS_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_SAFE_NUMERICS_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_ALL_INTEGER_VALUES_FIT)
+	#if (SOL_ALL_INTEGER_VALUES_FIT != 0)
+		#define SOL_ALL_INTEGER_VALUES_FIT_I_ SOL_ON
+	#else
+		#define SOL_ALL_INTEGER_VALUES_FIT_I_ SOL_OFF
+	#endif
+#elif !SOL_IS_DEFAULT_OFF(SOL_SAFE_NUMERICS) && SOL_IS_OFF(SOL_SAFE_NUMERICS)
+	// if numerics is intentionally turned off, flip this on
+	#define SOL_ALL_INTEGER_VALUES_FIT_I_ SOL_DEFAULT_ON
+#else
+	// default to off
+	#define SOL_ALL_INTEGER_VALUES_FIT_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_SAFE_STACK_CHECK)
+	#if SOL_SAFE_STACK_CHECK != 0
+		#define SOL_SAFE_STACK_CHECK_I_ SOL_ON
+	#else
+		#define SOL_SAFE_STACK_CHECK_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON)
+		#define SOL_SAFE_STACK_CHECK_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD)
+		#define SOL_SAFE_STACK_CHECK_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_SAFE_STACK_CHECK_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_NO_CHECK_NUMBER_PRECISION)
+	#if SOL_NO_CHECK_NUMBER_PRECISION != 0
+		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_OFF
+	#else
+		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_ON
+	#endif
+#elif defined(SOL_NO_CHECKING_NUMBER_PRECISION)
+	#if SOL_NO_CHECKING_NUMBER_PRECISION != 0
+		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_OFF
+	#else
+		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_ON
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON)
+		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_SAFE_NUMERICS)
+		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD)
+		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_STRINGS_ARE_NUMBERS)
+	#if (SOL_STRINGS_ARE_NUMBERS != 0)
+		#define SOL_STRINGS_ARE_NUMBERS_I_ SOL_ON
+	#else
+		#define SOL_STRINGS_ARE_NUMBERS_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_STRINGS_ARE_NUMBERS_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_ENABLE_INTEROP)
+	#if SOL_ENABLE_INTEROP != 0
+		#define SOL_USE_INTEROP_I_ SOL_ON
+	#else
+		#define SOL_USE_INTEROP_I_ SOL_OFF
+	#endif
+#elif defined(SOL_USE_INTEROP)
+	#if SOL_USE_INTEROP != 0
+		#define SOL_USE_INTEROP_I_ SOL_ON
+	#else
+		#define SOL_USE_INTEROP_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_USE_INTEROP_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_NO_NIL)
+	#if (SOL_NO_NIL != 0)
+		#define SOL_NIL_I_ SOL_OFF
+	#else
+		#define SOL_NIL_I_ SOL_ON
+	#endif
+#elif defined(__MAC_OS_X_VERSION_MAX_ALLOWED) || defined(__OBJC__) || defined(nil)
+	#define SOL_NIL_I_ SOL_DEFAULT_OFF
+#else
+	#define SOL_NIL_I_ SOL_DEFAULT_ON
+#endif
+
+#if defined(SOL_USERTYPE_TYPE_BINDING_INFO)
+	#if (SOL_USERTYPE_TYPE_BINDING_INFO != 0)
+		#define SOL_USERTYPE_TYPE_BINDING_INFO_I_ SOL_ON
+	#else
+		#define SOL_USERTYPE_TYPE_BINDING_INFO_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_USERTYPE_TYPE_BINDING_INFO_I_ SOL_DEFAULT_ON
+#endif // We should generate a my_type.__type table with lots of class information for usertypes
+
+#if defined(SOL_AUTOMAGICAL_TYPES_BY_DEFAULT)
+	#if (SOL_AUTOMAGICAL_TYPES_BY_DEFAULT != 0)
+		#define SOL_DEFAULT_AUTOMAGICAL_USERTYPES_I_ SOL_ON
+	#else
+		#define SOL_DEFAULT_AUTOMAGICAL_USERTYPES_I_ SOL_OFF
+	#endif
+#elif defined(SOL_DEFAULT_AUTOMAGICAL_USERTYPES)
+	#if (SOL_DEFAULT_AUTOMAGICAL_USERTYPES != 0)
+		#define SOL_DEFAULT_AUTOMAGICAL_USERTYPES_I_ SOL_ON
+	#else
+		#define SOL_DEFAULT_AUTOMAGICAL_USERTYPES_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_DEFAULT_AUTOMAGICAL_USERTYPES_I_ SOL_DEFAULT_ON
+#endif // make is_automagical on/off by default
+
+#if defined(SOL_STD_VARIANT)
+	#if (SOL_STD_VARIANT != 0)
+		#define SOL_STD_VARIANT_I_ SOL_ON
+	#else
+		#define SOL_STD_VARIANT_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_COMPILER_CLANG) && SOL_IS_ON(SOL_PLATFORM_APPLE)
+		#if defined(__has_include)
+			#if __has_include(<variant>)
+				#define SOL_STD_VARIANT_I_ SOL_DEFAULT_ON
+			#else
+				#define SOL_STD_VARIANT_I_ SOL_DEFAULT_OFF
+			#endif
+		#else
+			#define SOL_STD_VARIANT_I_ SOL_DEFAULT_OFF
+		#endif
+	#else
+		#define SOL_STD_VARIANT_I_ SOL_DEFAULT_ON
+	#endif
+#endif // make is_automagical on/off by default
+
+#if defined(SOL_NOEXCEPT_FUNCTION_TYPE)
+	#if (SOL_NOEXCEPT_FUNCTION_TYPE != 0)
+		#define SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_ SOL_ON
+	#else
+		#define SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_ SOL_OFF
+	#endif
+#else
+	#if defined(__cpp_noexcept_function_type)
+		#define SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_COMPILER_VCXX) && (defined(_MSVC_LANG) && (_MSVC_LANG < 201403L))
+		// There is a bug in the VC++ compiler??
+		// on /std:c++latest under x86 conditions (VS 15.5.2),
+		// compiler errors are tossed for noexcept markings being on function types
+		// that are identical in every other way to their non-noexcept marked types function types...
+		// VS 2019: There is absolutely a bug.
+		#define SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_ SOL_OFF
+	#else
+		#define SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_ SOL_DEFAULT_ON
+	#endif
+#endif // noexcept is part of a function's type
+
+#if defined(SOL_STACK_STRING_OPTIMIZATION_SIZE) && SOL_STACK_STRING_OPTIMIZATION_SIZE > 0
+	#define SOL_OPTIMIZATION_STRING_CONVERSION_STACK_SIZE_I_ SOL_STACK_STRING_OPTIMIZATION_SIZE
+#else
+	#define SOL_OPTIMIZATION_STRING_CONVERSION_STACK_SIZE_I_ 1024
+#endif
+
+#if defined(SOL_ID_SIZE) && SOL_ID_SIZE > 0
+	#define SOL_ID_SIZE_I_ SOL_ID_SIZE
+#else
+	#define SOL_ID_SIZE_I_ 512
+#endif
+
+#if defined(LUA_IDSIZE) && LUA_IDSIZE > 0
+	#define SOL_FILE_ID_SIZE_I_ LUA_IDSIZE
+#elif defined(SOL_ID_SIZE) && SOL_ID_SIZE > 0
+	#define SOL_FILE_ID_SIZE_I_ SOL_FILE_ID_SIZE
+#else
+	#define SOL_FILE_ID_SIZE_I_ 2048
+#endif
+
+#if defined(SOL_PRINT_ERRORS)
+	#if (SOL_PRINT_ERRORS != 0)
+		#define SOL_PRINT_ERRORS_I_ SOL_ON
+	#else
+		#define SOL_PRINT_ERRORS_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON)
+		#define SOL_PRINT_ERRORS_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD)
+		#define SOL_PRINT_ERRORS_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_PRINT_ERRORS_I_ SOL_OFF
+	#endif
+#endif
+
+#if defined(SOL_DEFAULT_PASS_ON_ERROR)
+	#if (SOL_DEFAULT_PASS_ON_ERROR != 0)
+		#define SOL_DEFAULT_PASS_ON_ERROR_I_ SOL_ON
+	#else
+		#define SOL_DEFAULT_PASS_ON_ERROR_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_DEFAULT_PASS_ON_ERROR_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_USING_CXX_LUA)
+	#if (SOL_USING_CXX_LUA != 0)
+		#define SOL_USING_CXX_LUA_I_ SOL_ON
+	#else
+		#define SOL_USING_CXX_LUA_I_ SOL_OFF
+	#endif
+#elif defined(SOL_USE_CXX_LUA)
+	// alternative spelling
+	#if (SOL_USE_CXX_LUA != 0)
+		#define SOL_USING_CXX_LUA_I_ SOL_ON
+	#else
+		#define SOL_USING_CXX_LUA_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_USING_CXX_LUA_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_USING_CXX_LUAJIT)
+	#if (SOL_USING_CXX_LUAJIT != 0)
+		#define SOL_USING_CXX_LUAJIT_I_ SOL_ON
+	#else
+		#define SOL_USING_CXX_LUAJIT_I_ SOL_OFF
+	#endif
+#elif defined(SOL_USE_CXX_LUAJIT)
+	#if (SOL_USE_CXX_LUAJIT != 0)
+		#define SOL_USING_CXX_LUAJIT_I_ SOL_ON
+	#else
+		#define SOL_USING_CXX_LUAJIT_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_USING_CXX_LUAJIT_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_NO_LUA_HPP)
+	#if (SOL_NO_LUA_HPP != 0)
+		#define SOL_USE_LUA_HPP_I_ SOL_OFF
+	#else
+		#define SOL_USE_LUA_HPP_I_ SOL_ON
+	#endif
+#elif SOL_IS_ON(SOL_USING_CXX_LUA)
+	#define SOL_USE_LUA_HPP_I_ SOL_OFF
+#elif defined(__has_include)
+	#if __has_include(<lua.hpp>)
+		#define SOL_USE_LUA_HPP_I_ SOL_ON
+	#else
+		#define SOL_USE_LUA_HPP_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_USE_LUA_HPP_I_ SOL_DEFAULT_ON
+#endif
+
+#if defined(SOL_CONTAINERS_START)
+	#define SOL_CONTAINER_START_INDEX_I_ SOL_CONTAINERS_START
+#elif defined(SOL_CONTAINERS_START_INDEX)
+	#define SOL_CONTAINER_START_INDEX_I_ SOL_CONTAINERS_START_INDEX
+#elif defined(SOL_CONTAINER_START_INDEX)
+	#define SOL_CONTAINER_START_INDEX_I_ SOL_CONTAINER_START_INDEX
+#else
+	#define SOL_CONTAINER_START_INDEX_I_ 1
+#endif
+
+#if defined (SOL_NO_MEMORY_ALIGNMENT)
+	#if (SOL_NO_MEMORY_ALIGNMENT != 0)
+		#define SOL_ALIGN_MEMORY_I_ SOL_OFF
+	#else
+		#define SOL_ALIGN_MEMORY_I_ SOL_ON
+	#endif
+#else
+	#define SOL_ALIGN_MEMORY_I_ SOL_DEFAULT_ON
+#endif
+
+#if defined(SOL_USE_BOOST)
+	#if (SOL_USE_BOOST != 0)
+		#define SOL_USE_BOOST_I_ SOL_ON
+	#else
+		#define SOL_USE_BOOST_I_ SOL_OFF
+	#endif
+#else
+		#define SOL_USE_BOOST_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_USE_UNSAFE_BASE_LOOKUP)
+	#if (SOL_USE_UNSAFE_BASE_LOOKUP != 0)
+		#define SOL_USE_UNSAFE_BASE_LOOKUP_I_ SOL_ON
+	#else
+		#define SOL_USE_UNSAFE_BASE_LOOKUP_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_USE_UNSAFE_BASE_LOOKUP_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_INSIDE_UNREAL)
+	#if (SOL_INSIDE_UNREAL != 0)
+		#define SOL_INSIDE_UNREAL_ENGINE_I_ SOL_ON
+	#else
+		#define SOL_INSIDE_UNREAL_ENGINE_I_ SOL_OFF
+	#endif
+#else
+	#if defined(UE_BUILD_DEBUG) || defined(UE_BUILD_DEVELOPMENT) || defined(UE_BUILD_TEST) || defined(UE_BUILD_SHIPPING) || defined(UE_SERVER)
+		#define SOL_INSIDE_UNREAL_ENGINE_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_INSIDE_UNREAL_ENGINE_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_NO_COMPAT)
+	#if (SOL_NO_COMPAT != 0)
+		#define SOL_USE_COMPATIBILITY_LAYER_I_ SOL_OFF
+	#else
+		#define SOL_USE_COMPATIBILITY_LAYER_I_ SOL_ON
+	#endif
+#else
+	#define SOL_USE_COMPATIBILITY_LAYER_I_ SOL_DEFAULT_ON
+#endif
+
+#if defined(SOL_GET_FUNCTION_POINTER_UNSAFE)
+	#if (SOL_GET_FUNCTION_POINTER_UNSAFE != 0)
+		#define SOL_GET_FUNCTION_POINTER_UNSAFE_I_ SOL_ON
+	#else
+		#define SOL_GET_FUNCTION_POINTER_UNSAFE_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_GET_FUNCTION_POINTER_UNSAFE_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_CONTAINER_CHECK_IS_EXHAUSTIVE)
+	#if (SOL_CONTAINER_CHECK_IS_EXHAUSTIVE != 0)
+		#define SOL_CONTAINER_CHECK_IS_EXHAUSTIVE_I_ SOL_ON
+	#else
+		#define SOL_CONTAINER_CHECK_IS_EXHAUSTIVE_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_CONTAINER_CHECK_IS_EXHAUSTIVE_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_FUNCTION_CALL_VALUE_SEMANTICS)
+	#if (SOL_FUNCTION_CALL_VALUE_SEMANTICS != 0)
+		#define SOL_FUNCTION_CALL_VALUE_SEMANTICS_I_ SOL_ON
+	#else
+		#define SOL_FUNCTION_CALL_VALUE_SEMANTICS_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_FUNCTION_CALL_VALUE_SEMANTICS_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_MINGW_CCTYPE_IS_POISONED)
+	#if (SOL_MINGW_CCTYPE_IS_POISONED != 0)
+		#define SOL_MINGW_CCTYPE_IS_POISONED_I_ SOL_ON
+	#else
+		#define SOL_MINGW_CCTYPE_IS_POISONED_I_ SOL_OFF
+	#endif
+#elif SOL_IS_ON(SOL_COMPILER_MINGW) && defined(__GNUC__) && (__GNUC__ < 6)
+	// MinGW is off its rocker in some places...
+	#define SOL_MINGW_CCTYPE_IS_POISONED_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_MINGW_CCTYPE_IS_POISONED_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_CHAR8_T)
+	#if (SOL_CHAR8_T != 0)
+		#define SOL_CHAR8_T_I_ SOL_ON
+	#else
+		#define SOL_CHAR8_T_I_ SOL_OFF
+	#endif
+#else
+	#if defined(__cpp_char8_t)
+		#define SOL_CHAR8_T_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_CHAR8_T_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if SOL_IS_ON(SOL_USE_BOOST)
+	#include <boost/version.hpp>
+
+	#if BOOST_VERSION >= 107500 // Since Boost 1.75.0 boost::none is constexpr
+		#define SOL_BOOST_NONE_CONSTEXPR_I_ constexpr
+	#else
+		#define SOL_BOOST_NONE_CONSTEXPR_I_ const
+	#endif // BOOST_VERSION
+#else
+	// assume boost isn't using a garbage version
+	#define SOL_BOOST_NONE_CONSTEXPR_I_ constexpr
+#endif
+
+#if defined(SOL2_CI)
+	#if (SOL2_CI != 0)
+		#define SOL2_CI_I_ SOL_ON
+	#else
+		#define SOL2_CI_I_ SOL_OFF
+	#endif
+#else
+	#define SOL2_CI_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_ASSERT)
+	#define SOL_USER_ASSERT_I_ SOL_ON
+#else
+	#define SOL_USER_ASSERT_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_ASSERT_MSG)
+	#define SOL_USER_ASSERT_MSG_I_ SOL_ON
+#else
+	#define SOL_USER_ASSERT_MSG_I_ SOL_DEFAULT_OFF
+#endif
+
+// beginning of sol/prologue.hpp
+
+#if defined(SOL_PROLOGUE_I_)
+	#error "[sol2] Library Prologue was already included in translation unit and not properly ended with an epilogue."
+#endif
+
+#define SOL_PROLOGUE_I_ 1
+
+#if SOL_IS_ON(SOL_BUILD_CXX_MODE)
+	#define _FWD(...) static_cast<decltype( __VA_ARGS__ )&&>( __VA_ARGS__ )
+
+	#if SOL_IS_ON(SOL_COMPILER_GCC) || SOL_IS_ON(SOL_COMPILER_CLANG)
+		#define _MOVE(...) static_cast<__typeof( __VA_ARGS__ )&&>( __VA_ARGS__ )
+	#else
+		#include <type_traits>
+		
+		#define _MOVE(...) static_cast<::std::remove_reference_t<( __VA_ARGS__ )>&&>( __VA_OPT__(,) )
+	#endif
+#endif
+
+// end of sol/prologue.hpp
+
+// beginning of sol/epilogue.hpp
+
+#if !defined(SOL_PROLOGUE_I_)
+	#error "[sol2] Library Prologue is missing from this translation unit."
+#else
+	#undef SOL_PROLOGUE_I_
+#endif
+
+#if SOL_IS_ON(SOL_BUILD_CXX_MODE)
+	#undef _FWD
+	#undef _MOVE
+#endif
+
+// end of sol/epilogue.hpp
+
+// beginning of sol/detail/build_version.hpp
+
+#if defined(SOL_DLL)
+	#if (SOL_DLL != 0)
+		#define SOL_DLL_I_ SOL_ON
+	#else
+		#define SOL_DLL_I_ SOL_OFF
+	#endif
+#elif SOL_IS_ON(SOL_COMPILER_VCXX) && (defined(DLL_) || defined(_DLL))
+	#define SOL_DLL_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_DLL_I_ SOL_DEFAULT_OFF
+#endif // DLL definition
+
+#if defined(SOL_HEADER_ONLY)
+	#if (SOL_HEADER_ONLY != 0)
+		#define SOL_HEADER_ONLY_I_ SOL_ON
+	#else
+		#define SOL_HEADER_ONLY_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_HEADER_ONLY_I_ SOL_DEFAULT_OFF
+#endif // Header only library
+
+#if defined(SOL_BUILD)
+	#if (SOL_BUILD != 0)
+		#define SOL_BUILD_I_ SOL_ON
+	#else
+		#define SOL_BUILD_I_ SOL_OFF
+	#endif
+#elif SOL_IS_ON(SOL_HEADER_ONLY)
+	#define SOL_BUILD_I_ SOL_DEFAULT_OFF
+#else
+	#define SOL_BUILD_I_ SOL_DEFAULT_ON
+#endif
+
+#if defined(SOL_UNITY_BUILD)
+	#if (SOL_UNITY_BUILD != 0)
+		#define SOL_UNITY_BUILD_I_ SOL_ON
+	#else
+		#define SOL_UNITY_BUILD_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_UNITY_BUILD_I_ SOL_DEFAULT_OFF
+#endif // Header only library
+
+#if defined(SOL_C_FUNCTION_LINKAGE)
+	#define SOL_C_FUNCTION_LINKAGE_I_ SOL_C_FUNCTION_LINKAGE
+#else
+	#if SOL_IS_ON(SOL_BUILD_CXX_MODE)
+		// C++
+		#define SOL_C_FUNCTION_LINKAGE_I_ extern "C"
+	#else
+		// normal
+		#define SOL_C_FUNCTION_LINKAGE_I_
+	#endif // C++ or not
+#endif // Linkage specification for C functions
+
+#if defined(SOL_API_LINKAGE)
+	#define SOL_API_LINKAGE_I_ SOL_API_LINKAGE
+#else
+	#if SOL_IS_ON(SOL_DLL)
+		#if SOL_IS_ON(SOL_COMPILER_VCXX) || SOL_IS_ON(SOL_PLATFORM_WINDOWS) || SOL_IS_ON(SOL_PLATFORM_CYGWIN)
+			// MSVC Compiler; or, Windows, or Cygwin platforms
+			#if SOL_IS_ON(SOL_BUILD)
+				// Building the library
+				#if SOL_IS_ON(SOL_COMPILER_GCC)
+					// Using GCC
+					#define SOL_API_LINKAGE_I_ __attribute__((dllexport))
+				#else
+					// Using Clang, MSVC, etc...
+					#define SOL_API_LINKAGE_I_ __declspec(dllexport)
+				#endif
+			#else
+				#if SOL_IS_ON(SOL_COMPILER_GCC)
+					#define SOL_API_LINKAGE_I_ __attribute__((dllimport))
+				#else
+					#define SOL_API_LINKAGE_I_ __declspec(dllimport)
+				#endif
+			#endif
+		#else
+			// extern if building normally on non-MSVC
+			#define SOL_API_LINKAGE_I_ extern
+		#endif
+	#elif SOL_IS_ON(SOL_UNITY_BUILD)
+		// Built-in library, like how stb typical works
+		#if SOL_IS_ON(SOL_HEADER_ONLY)
+			// Header only, so functions are defined "inline"
+			#define SOL_API_LINKAGE_I_ inline
+		#else
+			// Not header only, so seperately compiled files
+			#define SOL_API_LINKAGE_I_ extern
+		#endif
+	#else
+		// Normal static library
+		#if SOL_IS_ON(SOL_BUILD_CXX_MODE)
+			#define SOL_API_LINKAGE_I_
+		#else
+			#define SOL_API_LINKAGE_I_ extern
+		#endif
+	#endif // DLL or not
+#endif // Build definitions
+
+#if defined(SOL_PUBLIC_FUNC_DECL)
+	#define SOL_PUBLIC_FUNC_DECL_I_ SOL_PUBLIC_FUNC_DECL
+#else
+	#define SOL_PUBLIC_FUNC_DECL_I_ SOL_API_LINKAGE_I_
+#endif
+
+#if defined(SOL_INTERNAL_FUNC_DECL_)
+	#define SOL_INTERNAL_FUNC_DECL_I_ SOL_INTERNAL_FUNC_DECL_
+#else
+	#define SOL_INTERNAL_FUNC_DECL_I_ SOL_API_LINKAGE_I_
+#endif
+
+#if defined(SOL_PUBLIC_FUNC_DEF)
+	#define SOL_PUBLIC_FUNC_DEF_I_ SOL_PUBLIC_FUNC_DEF
+#else
+	#define SOL_PUBLIC_FUNC_DEF_I_ SOL_API_LINKAGE_I_
+#endif
+
+#if defined(SOL_INTERNAL_FUNC_DEF)
+	#define SOL_INTERNAL_FUNC_DEF_I_ SOL_INTERNAL_FUNC_DEF
+#else
+	#define SOL_INTERNAL_FUNC_DEF_I_ SOL_API_LINKAGE_I_
+#endif
+
+#if defined(SOL_FUNC_DECL)
+	#define SOL_FUNC_DECL_I_ SOL_FUNC_DECL
+#elif SOL_IS_ON(SOL_HEADER_ONLY)
+	#define SOL_FUNC_DECL_I_ 
+#elif SOL_IS_ON(SOL_DLL)
+	#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		#if SOL_IS_ON(SOL_BUILD)
+			#define SOL_FUNC_DECL_I_ extern __declspec(dllexport)
+		#else
+			#define SOL_FUNC_DECL_I_ extern __declspec(dllimport)
+		#endif
+	#elif SOL_IS_ON(SOL_COMPILER_GCC) || SOL_IS_ON(SOL_COMPILER_CLANG)
+		#define SOL_FUNC_DECL_I_ extern __attribute__((visibility("default")))
+	#else
+		#define SOL_FUNC_DECL_I_ extern
+	#endif
+#endif
+
+#if defined(SOL_FUNC_DEFN)
+	#define SOL_FUNC_DEFN_I_ SOL_FUNC_DEFN
+#elif SOL_IS_ON(SOL_HEADER_ONLY)
+	#define SOL_FUNC_DEFN_I_ inline
+#elif SOL_IS_ON(SOL_DLL)
+	#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		#if SOL_IS_ON(SOL_BUILD)
+			#define SOL_FUNC_DEFN_I_ __declspec(dllexport)
+		#else
+			#define SOL_FUNC_DEFN_I_ __declspec(dllimport)
+		#endif
+	#elif SOL_IS_ON(SOL_COMPILER_GCC) || SOL_IS_ON(SOL_COMPILER_CLANG)
+		#define SOL_FUNC_DEFN_I_ __attribute__((visibility("default")))
+	#else
+		#define SOL_FUNC_DEFN_I_
+	#endif
+#endif
+
+#if defined(SOL_HIDDEN_FUNC_DECL)
+	#define SOL_HIDDEN_FUNC_DECL_I_ SOL_HIDDEN_FUNC_DECL
+#elif SOL_IS_ON(SOL_HEADER_ONLY)
+	#define SOL_HIDDEN_FUNC_DECL_I_ 
+#elif SOL_IS_ON(SOL_DLL)
+	#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		#if SOL_IS_ON(SOL_BUILD)
+			#define SOL_HIDDEN_FUNC_DECL_I_ extern __declspec(dllexport)
+		#else
+			#define SOL_HIDDEN_FUNC_DECL_I_ extern __declspec(dllimport)
+		#endif
+	#elif SOL_IS_ON(SOL_COMPILER_GCC) || SOL_IS_ON(SOL_COMPILER_CLANG)
+		#define SOL_HIDDEN_FUNC_DECL_I_ extern __attribute__((visibility("default")))
+	#else
+		#define SOL_HIDDEN_FUNC_DECL_I_ extern
+	#endif
+#endif
+
+#if defined(SOL_HIDDEN_FUNC_DEFN)
+	#define SOL_HIDDEN_FUNC_DEFN_I_ SOL_HIDDEN_FUNC_DEFN
+#elif SOL_IS_ON(SOL_HEADER_ONLY)
+	#define SOL_HIDDEN_FUNC_DEFN_I_ inline
+#elif SOL_IS_ON(SOL_DLL)
+	#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		#if SOL_IS_ON(SOL_BUILD)
+			#define SOL_HIDDEN_FUNC_DEFN_I_ 
+		#else
+			#define SOL_HIDDEN_FUNC_DEFN_I_ 
+		#endif
+	#elif SOL_IS_ON(SOL_COMPILER_GCC) || SOL_IS_ON(SOL_COMPILER_CLANG)
+		#define SOL_HIDDEN_FUNC_DEFN_I_ __attribute__((visibility("hidden")))
+	#else
+		#define SOL_HIDDEN_FUNC_DEFN_I_
+	#endif
+#endif
+
+// end of sol/detail/build_version.hpp
+
+// end of sol/version.hpp
+
+#if SOL_IS_ON(SOL_INSIDE_UNREAL_ENGINE)
+#ifdef check
+#pragma push_macro("check")
+#undef check
+#endif
+#endif // Unreal Engine 4 Bullshit
+
+#if SOL_IS_ON(SOL_COMPILER_GCC)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow"
+#pragma GCC diagnostic ignored "-Wconversion"
+#if __GNUC__ > 6
+#pragma GCC diagnostic ignored "-Wnoexcept-type"
+#endif
+#elif SOL_IS_ON(SOL_COMPILER_CLANG)
+#elif SOL_IS_ON(SOL_COMPILER_VCXX)
+#pragma warning(push)
+#pragma warning(disable : 4505) // unreferenced local function has been removed GEE THANKS
+#endif                          // clang++ vs. g++ vs. VC++
+
+// beginning of sol/forward.hpp
+
+#ifndef SOL_FORWARD_HPP
+#define SOL_FORWARD_HPP
+
+#include <utility>
+#include <type_traits>
+#include <string_view>
+
+#if SOL_IS_ON(SOL_USING_CXX_LUA) || SOL_IS_ON(SOL_USING_CXX_LUAJIT)
+struct lua_State;
+#else
+extern "C" {
+struct lua_State;
+}
+#endif // C++ Mangling for Lua vs. Not
+
+namespace sol {
+
+	enum class type;
+
+	class stateless_reference;
+	template <bool b>
+	class basic_reference;
+	using reference = basic_reference<false>;
+	using main_reference = basic_reference<true>;
+	class stateless_stack_reference;
+	class stack_reference;
+
+	template <typename A>
+	class basic_bytecode;
+
+	struct lua_value;
+
+	struct proxy_base_tag;
+	template <typename>
+	struct proxy_base;
+	template <typename, typename>
+	struct table_proxy;
+
+	template <bool, typename>
+	class basic_table_core;
+	template <bool b>
+	using table_core = basic_table_core<b, reference>;
+	template <bool b>
+	using main_table_core = basic_table_core<b, main_reference>;
+	template <bool b>
+	using stack_table_core = basic_table_core<b, stack_reference>;
+	template <typename base_type>
+	using basic_table = basic_table_core<false, base_type>;
+	using table = table_core<false>;
+	using global_table = table_core<true>;
+	using main_table = main_table_core<false>;
+	using main_global_table = main_table_core<true>;
+	using stack_table = stack_table_core<false>;
+	using stack_global_table = stack_table_core<true>;
+
+	template <typename>
+	struct basic_lua_table;
+	using lua_table = basic_lua_table<reference>;
+	using stack_lua_table = basic_lua_table<stack_reference>;
+
+	template <typename T, typename base_type>
+	class basic_usertype;
+	template <typename T>
+	using usertype = basic_usertype<T, reference>;
+	template <typename T>
+	using stack_usertype = basic_usertype<T, stack_reference>;
+
+	template <typename base_type>
+	class basic_metatable;
+	using metatable = basic_metatable<reference>;
+	using stack_metatable = basic_metatable<stack_reference>;
+
+	template <typename base_t>
+	struct basic_environment;
+	using environment = basic_environment<reference>;
+	using main_environment = basic_environment<main_reference>;
+	using stack_environment = basic_environment<stack_reference>;
+
+	template <typename T, bool>
+	class basic_function;
+	template <typename T, bool, typename H>
+	class basic_protected_function;
+	using unsafe_function = basic_function<reference, false>;
+	using safe_function = basic_protected_function<reference, false, reference>;
+	using main_unsafe_function = basic_function<main_reference, false>;
+	using main_safe_function = basic_protected_function<main_reference, false, reference>;
+	using stack_unsafe_function = basic_function<stack_reference, false>;
+	using stack_safe_function = basic_protected_function<stack_reference, false, reference>;
+	using stack_aligned_unsafe_function = basic_function<stack_reference, true>;
+	using stack_aligned_safe_function = basic_protected_function<stack_reference, true, reference>;
+	using protected_function = safe_function;
+	using main_protected_function = main_safe_function;
+	using stack_protected_function = stack_safe_function;
+	using stack_aligned_protected_function = stack_aligned_safe_function;
+#if SOL_IS_ON(SOL_SAFE_FUNCTION_OBJECTS)
+	using function = protected_function;
+	using main_function = main_protected_function;
+	using stack_function = stack_protected_function;
+	using stack_aligned_function = stack_aligned_safe_function;
+#else
+	using function = unsafe_function;
+	using main_function = main_unsafe_function;
+	using stack_function = stack_unsafe_function;
+	using stack_aligned_function = stack_aligned_unsafe_function;
+#endif
+	using stack_aligned_stack_handler_function = basic_protected_function<stack_reference, true, stack_reference>;
+
+	struct unsafe_function_result;
+	struct protected_function_result;
+	using safe_function_result = protected_function_result;
+#if SOL_IS_ON(SOL_SAFE_FUNCTION_OBJECTS)
+	using function_result = safe_function_result;
+#else
+	using function_result = unsafe_function_result;
+#endif
+
+	template <typename base_t>
+	class basic_object_base;
+	template <typename base_t>
+	class basic_object;
+	template <typename base_t>
+	class basic_userdata;
+	template <typename base_t>
+	class basic_lightuserdata;
+	template <typename base_t>
+	class basic_coroutine;
+	template <typename base_t>
+	class basic_packaged_coroutine;
+	template <typename base_t>
+	class basic_thread;
+
+	using object = basic_object<reference>;
+	using userdata = basic_userdata<reference>;
+	using lightuserdata = basic_lightuserdata<reference>;
+	using thread = basic_thread<reference>;
+	using coroutine = basic_coroutine<reference>;
+	using packaged_coroutine = basic_packaged_coroutine<reference>;
+	using main_object = basic_object<main_reference>;
+	using main_userdata = basic_userdata<main_reference>;
+	using main_lightuserdata = basic_lightuserdata<main_reference>;
+	using main_coroutine = basic_coroutine<main_reference>;
+	using stack_object = basic_object<stack_reference>;
+	using stack_userdata = basic_userdata<stack_reference>;
+	using stack_lightuserdata = basic_lightuserdata<stack_reference>;
+	using stack_thread = basic_thread<stack_reference>;
+	using stack_coroutine = basic_coroutine<stack_reference>;
+
+	struct stack_proxy_base;
+	struct stack_proxy;
+	struct variadic_args;
+	struct variadic_results;
+	struct stack_count;
+	struct this_state;
+	struct this_main_state;
+	struct this_environment;
+
+	class state_view;
+	class state;
+
+	template <typename T>
+	struct as_table_t;
+	template <typename T>
+	struct as_container_t;
+	template <typename T>
+	struct nested;
+	template <typename T>
+	struct light;
+	template <typename T>
+	struct user;
+	template <typename T>
+	struct as_args_t;
+	template <typename T>
+	struct protect_t;
+	template <typename F, typename... Policies>
+	struct policy_wrapper;
+
+	template <typename T>
+	struct usertype_traits;
+	template <typename T>
+	struct unique_usertype_traits;
+
+	template <typename... Args>
+	struct types {
+		typedef std::make_index_sequence<sizeof...(Args)> indices;
+		static constexpr std::size_t size() {
+			return sizeof...(Args);
+		}
+	};
+
+	template <typename T>
+	struct derive : std::false_type {
+		typedef types<> type;
+	};
+
+	template <typename T>
+	struct base : std::false_type {
+		typedef types<> type;
+	};
+
+	template <typename T>
+	struct weak_derive {
+		static bool value;
+	};
+
+	template <typename T>
+	bool weak_derive<T>::value = false;
+
+	namespace stack {
+		struct record;
+	}
+
+#if SOL_IS_OFF(SOL_USE_BOOST)
+	template <class T>
+	class optional;
+
+	template <class T>
+	class optional<T&>;
+#endif
+
+	using check_handler_type = int(lua_State*, int, type, type, const char*);
+
+} // namespace sol
+
+#define SOL_BASE_CLASSES(T, ...)                       \
+	namespace sol {                                   \
+		template <>                                  \
+		struct base<T> : std::true_type {            \
+			typedef ::sol::types<__VA_ARGS__> type; \
+		};                                           \
+	}                                                 \
+	static_assert(true, "")
+#define SOL_DERIVED_CLASSES(T, ...)                    \
+	namespace sol {                                   \
+		template <>                                  \
+		struct derive<T> : std::true_type {          \
+			typedef ::sol::types<__VA_ARGS__> type; \
+		};                                           \
+	}                                                 \
+	static_assert(true, "")
+
+#endif // SOL_FORWARD_HPP
+// end of sol/forward.hpp
+
+// beginning of sol/forward_detail.hpp
+
+#ifndef SOL_FORWARD_DETAIL_HPP
+#define SOL_FORWARD_DETAIL_HPP
+
+// beginning of sol/traits.hpp
+
+// beginning of sol/tuple.hpp
+
+// beginning of sol/base_traits.hpp
+
+#include <type_traits>
+
+namespace sol {
+	namespace detail {
+		struct unchecked_t { };
+		const unchecked_t unchecked = unchecked_t {};
+	} // namespace detail
+
+	namespace meta {
+		using sfinae_yes_t = std::true_type;
+		using sfinae_no_t = std::false_type;
+
+		template <typename...>
+		using void_t = void;
+
+		template <typename T>
+		using unqualified = std::remove_cv<std::remove_reference_t<T>>;
+
+		template <typename T>
+		using unqualified_t = typename unqualified<T>::type;
+
+		namespace meta_detail {
+			template <typename T>
+			struct unqualified_non_alias : unqualified<T> { };
+
+			template <template <class...> class Test, class, class... Args>
+			struct is_detected : std::false_type { };
+
+			template <template <class...> class Test, class... Args>
+			struct is_detected<Test, void_t<Test<Args...>>, Args...> : std::true_type { };
+		} // namespace meta_detail
+
+		template <template <class...> class Trait, class... Args>
+		using is_detected = typename meta_detail::is_detected<Trait, void, Args...>::type;
+
+		template <template <class...> class Trait, class... Args>
+		constexpr inline bool is_detected_v = is_detected<Trait, Args...>::value;
+
+		template <typename _Default, typename _Void, template <typename...> typename _Op, typename... _Args>
+		class detector {
+		public:
+			using value_t = ::std::false_type;
+			using type = _Default;
+		};
+
+		template <typename _Default, template <typename...> typename _Op, typename... _Args>
+		class detector<_Default, void_t<_Op<_Args...>>, _Op, _Args...> {
+		public:
+			using value_t = ::std::true_type;
+			using type = _Op<_Args...>;
+		};
+
+		class nonesuch {
+		public:
+			~nonesuch() = delete;
+			nonesuch(nonesuch const&) = delete;
+			nonesuch& operator=(nonesuch const&) = delete;
+		};
+
+		template <template <typename...> typename _Op, typename... _Args>
+		using detected_t = typename detector<nonesuch, void, _Op, _Args...>::type;
+
+		template <typename _Default, template <typename...> typename _Op, typename... _Args>
+		using detected_or = detector<_Default, void, _Op, _Args...>;
+
+		template <typename _Default, template <typename...> typename _Op, typename... _Args>
+		using detected_or_t = typename detector<_Default, void, _Op, _Args...>::type;
+
+		template <typename _Default, template <typename...> typename _Op, typename... _Args>
+		constexpr inline bool detected_or_v = detector<_Default, void, _Op, _Args...>::value;
+
+		template <std::size_t I>
+		using index_value = std::integral_constant<std::size_t, I>;
+
+		template <bool>
+		struct conditional {
+			template <typename T, typename U>
+			using type = T;
+		};
+
+		template <>
+		struct conditional<false> {
+			template <typename T, typename U>
+			using type = U;
+		};
+
+		template <bool B, typename T, typename U>
+		using conditional_t = typename conditional<B>::template type<T, U>;
+
+		namespace meta_detail {
+			template <typename T, template <typename...> class Templ>
+			struct is_specialization_of : std::false_type { };
+			template <typename... T, template <typename...> class Templ>
+			struct is_specialization_of<Templ<T...>, Templ> : std::true_type { };
+		} // namespace meta_detail
+
+		template <typename T, template <typename...> class Templ>
+		using is_specialization_of = meta_detail::is_specialization_of<std::remove_cv_t<T>, Templ>;
+
+		template <typename T, template <typename...> class Templ>
+		inline constexpr bool is_specialization_of_v = is_specialization_of<std::remove_cv_t<T>, Templ>::value;
+
+		template <typename T>
+		struct identity {
+			typedef T type;
+		};
+
+		template <typename T>
+		using identity_t = typename identity<T>::type;
+
+		template <typename T>
+		using is_builtin_type = std::integral_constant<bool, std::is_arithmetic<T>::value || std::is_pointer<T>::value || std::is_array<T>::value>;
+
+		namespace meta_detail {
+			template <typename T, typename = void>
+			struct has_internal_marker_impl : std::false_type { };
+			template <typename T>
+			struct has_internal_marker_impl<T, void_t<typename T::SOL_INTERNAL_UNSPECIALIZED_MARKER_>> : std::true_type { };
+
+			template <typename T>
+			using has_internal_marker = has_internal_marker_impl<T>;
+
+			template <typename T>
+			constexpr inline bool has_internal_marker_v = has_internal_marker<T>::value;
+		} // namespace meta_detail
+
+	} // namespace meta
+} // namespace sol
+
+// end of sol/base_traits.hpp
+
+#include <tuple>
+#include <cstddef>
+
+namespace sol {
+	namespace detail {
+		using swallow = std::initializer_list<int>;
+	} // namespace detail
+
+	namespace meta {
+		template <typename T>
+		using is_tuple = is_specialization_of<T, std::tuple>;
+
+		template <typename T>
+		constexpr inline bool is_tuple_v = is_tuple<T>::value;
+
+		namespace detail {
+			template <typename... Args>
+			struct tuple_types_ {
+				typedef types<Args...> type;
+			};
+
+			template <typename... Args>
+			struct tuple_types_<std::tuple<Args...>> {
+				typedef types<Args...> type;
+			};
+		} // namespace detail
+
+		template <typename... Args>
+		using tuple_types = typename detail::tuple_types_<Args...>::type;
+
+		template <typename Arg>
+		struct pop_front_type;
+
+		template <typename Arg>
+		using pop_front_type_t = typename pop_front_type<Arg>::type;
+
+		template <typename... Args>
+		struct pop_front_type<types<Args...>> {
+			typedef void front_type;
+			typedef types<Args...> type;
+		};
+
+		template <typename Arg, typename... Args>
+		struct pop_front_type<types<Arg, Args...>> {
+			typedef Arg front_type;
+			typedef types<Args...> type;
+		};
+
+		template <std::size_t N, typename Tuple>
+		using tuple_element = std::tuple_element<N, std::remove_reference_t<Tuple>>;
+
+		template <std::size_t N, typename Tuple>
+		using tuple_element_t = std::tuple_element_t<N, std::remove_reference_t<Tuple>>;
+
+		template <std::size_t N, typename Tuple>
+		using unqualified_tuple_element = unqualified<tuple_element_t<N, Tuple>>;
+
+		template <std::size_t N, typename Tuple>
+		using unqualified_tuple_element_t = unqualified_t<tuple_element_t<N, Tuple>>;
+
+	} // namespace meta
+} // namespace sol
+
+// end of sol/tuple.hpp
+
+// beginning of sol/bind_traits.hpp
+
+namespace sol { namespace meta {
+	namespace meta_detail {
+		template <typename F>
+		using detect_deducible_signature = decltype(&F::operator());
+	} // namespace meta_detail
+
+	template <typename F>
+	using call_operator_deducible = typename is_detected<meta_detail::detect_deducible_signature, F>::type;
+
+	template <typename F>
+	constexpr inline bool call_operator_deducible_v = call_operator_deducible<F>::value;
+
+	namespace meta_detail {
+
+		template <std::size_t I, typename T>
+		struct void_tuple_element : meta::tuple_element<I, T> { };
+
+		template <std::size_t I>
+		struct void_tuple_element<I, std::tuple<>> {
+			typedef void type;
+		};
+
+		template <std::size_t I, typename T>
+		using void_tuple_element_t = typename void_tuple_element<I, T>::type;
+
+		template <bool it_is_noexcept, bool has_c_variadic, typename T, typename R, typename... Args>
+		struct basic_traits {
+		private:
+			using first_type = meta::conditional_t<std::is_void<T>::value, int, T>&;
+
+		public:
+			inline static constexpr const bool is_noexcept = it_is_noexcept;
+			inline static constexpr bool is_member_function = std::is_void<T>::value;
+			inline static constexpr bool has_c_var_arg = has_c_variadic;
+			inline static constexpr std::size_t arity = sizeof...(Args);
+			inline static constexpr std::size_t free_arity = sizeof...(Args) + static_cast<std::size_t>(!std::is_void<T>::value);
+			typedef types<Args...> args_list;
+			typedef std::tuple<Args...> args_tuple;
+			typedef T object_type;
+			typedef R return_type;
+			typedef tuple_types<R> returns_list;
+			typedef R(function_type)(Args...);
+			typedef meta::conditional_t<std::is_void<T>::value, args_list, types<first_type, Args...>> free_args_list;
+			typedef meta::conditional_t<std::is_void<T>::value, R(Args...), R(first_type, Args...)> free_function_type;
+			typedef meta::conditional_t<std::is_void<T>::value, R (*)(Args...), R (*)(first_type, Args...)> free_function_pointer_type;
+			typedef std::remove_pointer_t<free_function_pointer_type> signature_type;
+			template <std::size_t i>
+			using arg_at = void_tuple_element_t<i, args_tuple>;
+		};
+
+		template <typename Signature, bool b = call_operator_deducible<Signature>::value>
+		struct fx_traits : public basic_traits<false, false, void, void> { };
+
+		// Free Functions
+		template <typename R, typename... Args>
+		struct fx_traits<R(Args...), false> : public basic_traits<false, false, void, R, Args...> {
+			typedef R (*function_pointer_type)(Args...);
+		};
+
+		template <typename R, typename... Args>
+		struct fx_traits<R (*)(Args...), false> : public basic_traits<false, false, void, R, Args...> {
+			typedef R (*function_pointer_type)(Args...);
+		};
+
+		template <typename R, typename... Args>
+		struct fx_traits<R(Args..., ...), false> : public basic_traits<false, true, void, R, Args...> {
+			typedef R (*function_pointer_type)(Args..., ...);
+		};
+
+		template <typename R, typename... Args>
+		struct fx_traits<R (*)(Args..., ...), false> : public basic_traits<false, true, void, R, Args...> {
+			typedef R (*function_pointer_type)(Args..., ...);
+		};
+
+		// Member Functions
+		/* C-Style Variadics */
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...), false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...);
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...), false> : public basic_traits<false, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...);
+		};
+
+		/* Const Volatile */
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) const, false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) const;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) const, false> : public basic_traits<false, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) const;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) const volatile, false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) const volatile;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) const volatile, false> : public basic_traits<false, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) const volatile;
+		};
+
+		/* Member Function Qualifiers */
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...)&, false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) &;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...)&, false> : public basic_traits<false, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) &;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) const&, false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) const&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) const&, false> : public basic_traits<false, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) const&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) const volatile&, false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) const volatile&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) const volatile&, false> : public basic_traits<false, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) const volatile&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...)&&, false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) &&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...)&&, false> : public basic_traits<false, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) &&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) const&&, false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) const&&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) const&&, false> : public basic_traits<false, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) const&&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) const volatile&&, false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) const volatile&&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) const volatile&&, false> : public basic_traits<false, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) const volatile&&;
+		};
+
+#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE)
+
+		template <typename R, typename... Args>
+		struct fx_traits<R(Args...) noexcept, false> : public basic_traits<true, false, void, R, Args...> {
+			typedef R (*function_pointer_type)(Args...) noexcept;
+		};
+
+		template <typename R, typename... Args>
+		struct fx_traits<R (*)(Args...) noexcept, false> : public basic_traits<true, false, void, R, Args...> {
+			typedef R (*function_pointer_type)(Args...) noexcept;
+		};
+
+		template <typename R, typename... Args>
+		struct fx_traits<R(Args..., ...) noexcept, false> : public basic_traits<true, true, void, R, Args...> {
+			typedef R (*function_pointer_type)(Args..., ...) noexcept;
+		};
+
+		template <typename R, typename... Args>
+		struct fx_traits<R (*)(Args..., ...) noexcept, false> : public basic_traits<true, true, void, R, Args...> {
+			typedef R (*function_pointer_type)(Args..., ...) noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) noexcept;
+		};
+
+		/* Const Volatile */
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) const noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) const noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) const noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) const noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) const volatile noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) const volatile noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) const volatile noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) const volatile noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...)& noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) & noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...)& noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) & noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) const& noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) const& noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) const& noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) const& noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) const volatile& noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) const volatile& noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) const volatile& noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) const volatile& noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...)&& noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) && noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...)&& noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) && noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) const&& noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) const&& noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) const&& noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) const&& noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) const volatile&& noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) const volatile&& noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) const volatile&& noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) const volatile&& noexcept;
+		};
+
+#endif // noexcept is part of a function's type
+
+#if SOL_IS_ON(SOL_COMPILER_VCXX) && SOL_IS_ON(SOL_PLATFORM_X86)
+		template <typename R, typename... Args>
+		struct fx_traits<R __stdcall(Args...), false> : public basic_traits<false, false, void, R, Args...> {
+			typedef R(__stdcall* function_pointer_type)(Args...);
+		};
+
+		template <typename R, typename... Args>
+		struct fx_traits<R(__stdcall*)(Args...), false> : public basic_traits<false, false, void, R, Args...> {
+			typedef R(__stdcall* function_pointer_type)(Args...);
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...), false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...);
+		};
+
+		/* Const Volatile */
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) const, false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) const;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) const volatile, false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) const volatile;
+		};
+
+		/* Member Function Qualifiers */
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...)&, false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) &;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) const&, false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) const&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) const volatile&, false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) const volatile&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...)&&, false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) &&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) const&&, false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) const&&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) const volatile&&, false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) const volatile&&;
+		};
+
+#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE)
+
+		template <typename R, typename... Args>
+		struct fx_traits<R __stdcall(Args...) noexcept, false> : public basic_traits<true, false, void, R, Args...> {
+			typedef R(__stdcall* function_pointer_type)(Args...) noexcept;
+		};
+
+		template <typename R, typename... Args>
+		struct fx_traits<R(__stdcall*)(Args...) noexcept, false> : public basic_traits<true, false, void, R, Args...> {
+			typedef R(__stdcall* function_pointer_type)(Args...) noexcept;
+		};
+
+		/* __stdcall cannot be applied to functions with varargs*/
+		/*template <typename R, typename... Args>
+		struct fx_traits<__stdcall R(Args..., ...) noexcept, false> : public basic_traits<true, true, void, R, Args...> {
+			typedef R(__stdcall* function_pointer_type)(Args..., ...) noexcept;
+		};
+
+		template <typename R, typename... Args>
+		struct fx_traits<R (__stdcall *)(Args..., ...) noexcept, false> : public basic_traits<true, true, void, R, Args...> {
+			typedef R(__stdcall* function_pointer_type)(Args..., ...) noexcept;
+		};*/
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) noexcept;
+		};
+
+		/* __stdcall does not work with varargs */
+		/*template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args..., ...) noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args..., ...) noexcept;
+		};*/
+
+		/* Const Volatile */
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) const noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) const noexcept;
+		};
+
+		/* __stdcall does not work with varargs */
+		/*template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args..., ...) const noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args..., ...) const noexcept;
+		};*/
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) const volatile noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) const volatile noexcept;
+		};
+
+		/* __stdcall does not work with varargs */
+		/*template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args..., ...) const volatile noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args..., ...) const volatile noexcept;
+		};*/
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...)& noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) & noexcept;
+		};
+
+		/* __stdcall does not work with varargs */
+		/*template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args..., ...) & noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args..., ...) & noexcept;
+		};*/
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) const& noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) const& noexcept;
+		};
+
+		/* __stdcall does not work with varargs */
+		/*template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args..., ...) const& noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args..., ...) const& noexcept;
+		};*/
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) const volatile& noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) const volatile& noexcept;
+		};
+
+		/* __stdcall does not work with varargs */
+		/*template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args..., ...) const volatile& noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args..., ...) const volatile& noexcept;
+		};*/
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...)&& noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) && noexcept;
+		};
+
+		/* __stdcall does not work with varargs */
+		/*template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args..., ...) && noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args..., ...) && noexcept;
+		};*/
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) const&& noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) const&& noexcept;
+		};
+
+		/* __stdcall does not work with varargs */
+		/*template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args..., ...) const&& noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args..., ...) const&& noexcept;
+		};*/
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) const volatile&& noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) const volatile&& noexcept;
+		};
+
+		/* __stdcall does not work with varargs */
+		/*template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args..., ...) const volatile&& noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args..., ...) const volatile&& noexcept;
+		};*/
+#endif // noexcept is part of a function's type
+#endif // __stdcall x86 VC++ bug
+
+		template <typename Signature>
+		struct fx_traits<Signature, true> : public fx_traits<typename fx_traits<decltype(&Signature::operator())>::function_type, false> { };
+
+		template <typename Signature, bool b = std::is_member_object_pointer<Signature>::value>
+		struct callable_traits : public fx_traits<std::decay_t<Signature>> { };
+
+		template <typename R, typename T>
+		struct callable_traits<R(T::*), true> {
+			typedef meta::conditional_t<std::is_array_v<R>, std::add_lvalue_reference_t<R>, R> return_type;
+			typedef return_type Arg;
+			typedef T object_type;
+			using signature_type = R(T::*);
+			inline static constexpr bool is_noexcept = false;
+			inline static constexpr bool is_member_function = false;
+			inline static constexpr std::size_t arity = 1;
+			inline static constexpr std::size_t free_arity = 2;
+			typedef std::tuple<Arg> args_tuple;
+			typedef types<Arg> args_list;
+			typedef types<T, Arg> free_args_list;
+			typedef meta::tuple_types<return_type> returns_list;
+			typedef return_type(function_type)(T&, return_type);
+			typedef return_type (*function_pointer_type)(T&, Arg);
+			typedef return_type (*free_function_pointer_type)(T&, Arg);
+			template <std::size_t i>
+			using arg_at = void_tuple_element_t<i, args_tuple>;
+		};
+
+	} // namespace meta_detail
+
+	template <typename Signature>
+	using bind_traits = meta_detail::callable_traits<Signature>;
+
+	namespace meta_detail {
+		template <typename, bool>
+		struct is_probably_stateless_lambda : std::false_type { };
+
+		template <typename T>
+		struct is_probably_stateless_lambda<T, true> : std::is_convertible<T, typename bind_traits<T>::function_type*>::type { };
+	} // namespace meta_detail
+
+	template <typename T>
+	using is_probably_stateless_lambda = typename meta_detail::is_probably_stateless_lambda<T, std::is_empty_v<T> && call_operator_deducible_v<T>>::type;
+
+	template <typename T>
+	inline constexpr bool is_probably_stateless_lambda_v = is_probably_stateless_lambda<T>::value;
+
+	template <typename Signature>
+	using function_args_t = typename bind_traits<Signature>::args_list;
+
+	template <typename Signature>
+	using function_signature_t = typename bind_traits<Signature>::signature_type;
+
+	template <typename Signature>
+	using function_return_t = typename bind_traits<Signature>::return_type;
+}} // namespace sol::meta
+
+// end of sol/bind_traits.hpp
+
+// beginning of sol/pointer_like.hpp
+
+#include <utility>
+#include <type_traits>
+#include <memory>
+
+namespace sol {
+
+	namespace meta {
+		namespace meta_detail {
+			template <typename T>
+			using is_dereferenceable_test = decltype(*std::declval<T>());
+
+			template <typename T>
+			using is_explicitly_dereferenceable_test = decltype(std::declval<T>().operator*());
+		} // namespace meta_detail
+
+		template <typename T>
+		using is_pointer_like = std::integral_constant<bool,
+		     !std::is_array_v<T> && (std::is_pointer_v<T> || is_detected_v<meta_detail::is_explicitly_dereferenceable_test, T>)>;
+
+		template <typename T>
+		constexpr inline bool is_pointer_like_v = is_pointer_like<T>::value;
+	} // namespace meta
+
+	namespace detail {
+
+		template <typename T>
+		auto unwrap(T&& item) -> decltype(std::forward<T>(item)) {
+			return std::forward<T>(item);
+		}
+
+		template <typename T>
+		T& unwrap(std::reference_wrapper<T> arg) {
+			return arg.get();
+		}
+
+		template <typename T>
+		inline decltype(auto) deref(T&& item) {
+			using Tu = meta::unqualified_t<T>;
+			if constexpr (meta::is_pointer_like_v<Tu>) {
+				return *std::forward<T>(item);
+			}
+			else {
+				return std::forward<T>(item);
+			}
+		}
+
+		template <typename T>
+		inline decltype(auto) deref_move_only(T&& item) {
+			using Tu = meta::unqualified_t<T>;
+			if constexpr (meta::is_pointer_like_v<Tu> && !std::is_pointer_v<Tu> && !std::is_copy_constructible_v<Tu>) {
+				return *std::forward<T>(item);
+			}
+			else {
+				return std::forward<T>(item);
+			}
+		}
+
+		template <typename T>
+		inline T* ptr(T& val) {
+			return std::addressof(val);
+		}
+
+		template <typename T>
+		inline T* ptr(std::reference_wrapper<T> val) {
+			return std::addressof(val.get());
+		}
+
+		template <typename T>
+		inline T* ptr(T* val) {
+			return val;
+		}
+	} // namespace detail
+} // namespace sol
+
+// end of sol/pointer_like.hpp
+
+// beginning of sol/string_view.hpp
+
+#include <cstddef>
+#include <string>
+#include <string_view>
+#include <functional>
+
+namespace sol {
+	template <typename C, typename T = std::char_traits<C>>
+	using basic_string_view = std::basic_string_view<C, T>;
+
+	typedef std::string_view string_view;
+	typedef std::wstring_view wstring_view;
+	typedef std::u16string_view u16string_view;
+	typedef std::u32string_view u32string_view;
+	typedef std::hash<std::string_view> string_view_hash;
+} // namespace sol
+
+// end of sol/string_view.hpp
+
+#include <type_traits>
+#include <cstdint>
+#include <memory>
+#include <functional>
+#include <array>
+#include <iterator>
+#include <iosfwd>
+#if SOL_IS_ON(SOL_STD_VARIANT)
+#include <variant>
+#endif // variant is weird on XCode, thanks XCode
+
+namespace sol { namespace meta {
+	template <typename T>
+	struct unwrapped {
+		typedef T type;
+	};
+
+	template <typename T>
+	struct unwrapped<std::reference_wrapper<T>> {
+		typedef T type;
+	};
+
+	template <typename T>
+	using unwrapped_t = typename unwrapped<T>::type;
+
+	template <typename T>
+	struct unwrap_unqualified : unwrapped<unqualified_t<T>> { };
+
+	template <typename T>
+	using unwrap_unqualified_t = typename unwrap_unqualified<T>::type;
+
+	template <typename T>
+	struct remove_member_pointer;
+
+	template <typename R, typename T>
+	struct remove_member_pointer<R T::*> {
+		typedef R type;
+	};
+
+	template <typename R, typename T>
+	struct remove_member_pointer<R T::*const> {
+		typedef R type;
+	};
+
+	template <typename T>
+	using remove_member_pointer_t = remove_member_pointer<T>;
+
+	template <typename T, typename...>
+	struct all_same : std::true_type { };
+
+	template <typename T, typename U, typename... Args>
+	struct all_same<T, U, Args...> : std::integral_constant<bool, std::is_same<T, U>::value && all_same<T, Args...>::value> { };
+
+	template <typename T, typename...>
+	struct any_same : std::false_type { };
+
+	template <typename T, typename U, typename... Args>
+	struct any_same<T, U, Args...> : std::integral_constant<bool, std::is_same<T, U>::value || any_same<T, Args...>::value> { };
+
+	template <typename T, typename... Args>
+	constexpr inline bool any_same_v = any_same<T, Args...>::value;
+
+	template <bool B>
+	using boolean = std::integral_constant<bool, B>;
+
+	template <bool B>
+	constexpr inline bool boolean_v = boolean<B>::value;
+
+	template <typename T>
+	using neg = boolean<!T::value>;
+
+	template <typename T>
+	constexpr inline bool neg_v = neg<T>::value;
+
+	template <typename... Args>
+	struct all : boolean<true> { };
+
+	template <typename T, typename... Args>
+	struct all<T, Args...> : std::conditional_t<T::value, all<Args...>, boolean<false>> { };
+
+	template <typename... Args>
+	struct any : boolean<false> { };
+
+	template <typename T, typename... Args>
+	struct any<T, Args...> : std::conditional_t<T::value, boolean<true>, any<Args...>> { };
+
+	template <typename... Args>
+	constexpr inline bool all_v = all<Args...>::value;
+
+	template <typename... Args>
+	constexpr inline bool any_v = any<Args...>::value;
+
+	enum class enable_t { _ };
+
+	constexpr const auto enabler = enable_t::_;
+
+	template <bool value, typename T = void>
+	using disable_if_t = std::enable_if_t<!value, T>;
+
+	template <typename... Args>
+	using enable = std::enable_if_t<all<Args...>::value, enable_t>;
+
+	template <typename... Args>
+	using disable = std::enable_if_t<neg<all<Args...>>::value, enable_t>;
+
+	template <typename... Args>
+	using enable_any = std::enable_if_t<any<Args...>::value, enable_t>;
+
+	template <typename... Args>
+	using disable_any = std::enable_if_t<neg<any<Args...>>::value, enable_t>;
+
+	template <typename V, typename... Vs>
+	struct find_in_pack_v : boolean<false> { };
+
+	template <typename V, typename Vs1, typename... Vs>
+	struct find_in_pack_v<V, Vs1, Vs...> : any<boolean<(V::value == Vs1::value)>, find_in_pack_v<V, Vs...>> { };
+
+	namespace meta_detail {
+		template <std::size_t I, typename T, typename... Args>
+		struct index_in_pack : std::integral_constant<std::size_t, SIZE_MAX> { };
+
+		template <std::size_t I, typename T, typename T1, typename... Args>
+		struct index_in_pack<I, T, T1, Args...>
+		: conditional_t<std::is_same<T, T1>::value, std::integral_constant<std::ptrdiff_t, I>, index_in_pack<I + 1, T, Args...>> { };
+	} // namespace meta_detail
+
+	template <typename T, typename... Args>
+	struct index_in_pack : meta_detail::index_in_pack<0, T, Args...> { };
+
+	template <typename T, typename List>
+	struct index_in : meta_detail::index_in_pack<0, T, List> { };
+
+	template <typename T, typename... Args>
+	struct index_in<T, types<Args...>> : meta_detail::index_in_pack<0, T, Args...> { };
+
+	template <std::size_t I, typename... Args>
+	struct at_in_pack { };
+
+	template <std::size_t I, typename... Args>
+	using at_in_pack_t = typename at_in_pack<I, Args...>::type;
+
+	template <std::size_t I, typename Arg, typename... Args>
+	struct at_in_pack<I, Arg, Args...> : std::conditional<I == 0, Arg, at_in_pack_t<I - 1, Args...>> { };
+
+	template <typename Arg, typename... Args>
+	struct at_in_pack<0, Arg, Args...> {
+		typedef Arg type;
+	};
+
+	namespace meta_detail {
+		template <typename, typename TI>
+		using on_even = meta::boolean<(TI::value % 2) == 0>;
+
+		template <typename, typename TI>
+		using on_odd = meta::boolean<(TI::value % 2) == 1>;
+
+		template <typename, typename>
+		using on_always = std::true_type;
+
+		template <template <typename...> class When, std::size_t Limit, std::size_t I, template <typename...> class Pred, typename... Ts>
+		struct count_when_for_pack : std::integral_constant<std::size_t, 0> { };
+		template <template <typename...> class When, std::size_t Limit, std::size_t I, template <typename...> class Pred, typename T, typename... Ts>
+			          struct count_when_for_pack<When, Limit, I, Pred, T, Ts...> : conditional_t < sizeof...(Ts)
+			     == 0
+			|| Limit<2, std::integral_constant<std::size_t, I + static_cast<std::size_t>(Limit != 0 && Pred<T>::value)>,
+			     count_when_for_pack<When, Limit - static_cast<std::size_t>(When<T, std::integral_constant<std::size_t, I>>::value),
+			          I + static_cast<std::size_t>(When<T, std::integral_constant<std::size_t, I>>::value&& Pred<T>::value), Pred, Ts...>> { };
+	} // namespace meta_detail
+
+	template <template <typename...> class Pred, typename... Ts>
+	struct count_for_pack : meta_detail::count_when_for_pack<meta_detail::on_always, sizeof...(Ts), 0, Pred, Ts...> { };
+
+	template <template <typename...> class Pred, typename... Ts>
+	inline constexpr std::size_t count_for_pack_v = count_for_pack<Pred, Ts...>::value;
+
+	template <template <typename...> class Pred, typename List>
+	struct count_for;
+
+	template <template <typename...> class Pred, typename... Args>
+	struct count_for<Pred, types<Args...>> : count_for_pack<Pred, Args...> { };
+
+	template <std::size_t Limit, template <typename...> class Pred, typename... Ts>
+	struct count_for_to_pack : meta_detail::count_when_for_pack<meta_detail::on_always, Limit, 0, Pred, Ts...> { };
+
+	template <std::size_t Limit, template <typename...> class Pred, typename... Ts>
+	inline constexpr std::size_t count_for_to_pack_v = count_for_to_pack<Limit, Pred, Ts...>::value;
+
+	template <template <typename...> class When, std::size_t Limit, template <typename...> class Pred, typename... Ts>
+	struct count_when_for_to_pack : meta_detail::count_when_for_pack<When, Limit, 0, Pred, Ts...> { };
+
+	template <template <typename...> class When, std::size_t Limit, template <typename...> class Pred, typename... Ts>
+	inline constexpr std::size_t count_when_for_to_pack_v = count_when_for_to_pack<When, Limit, Pred, Ts...>::value;
+
+	template <template <typename...> class Pred, typename... Ts>
+	using count_even_for_pack = count_when_for_to_pack<meta_detail::on_even, sizeof...(Ts), Pred, Ts...>;
+
+	template <template <typename...> class Pred, typename... Ts>
+	inline constexpr std::size_t count_even_for_pack_v = count_even_for_pack<Pred, Ts...>::value;
+
+	template <template <typename...> class Pred, typename... Ts>
+	using count_odd_for_pack = count_when_for_to_pack<meta_detail::on_odd, sizeof...(Ts), Pred, Ts...>;
+
+	template <template <typename...> class Pred, typename... Ts>
+	inline constexpr std::size_t count_odd_for_pack_v = count_odd_for_pack<Pred, Ts...>::value;
+
+	template <typename... Args>
+	struct return_type {
+		typedef std::tuple<Args...> type;
+	};
+
+	template <typename T>
+	struct return_type<T> {
+		typedef T type;
+	};
+
+	template <>
+	struct return_type<> {
+		typedef void type;
+	};
+
+	template <typename... Args>
+	using return_type_t = typename return_type<Args...>::type;
+
+	namespace meta_detail {
+		template <typename>
+		struct always_true : std::true_type { };
+		struct is_invokable_tester {
+			template <typename Fun, typename... Args>
+			static always_true<decltype(std::declval<Fun>()(std::declval<Args>()...))> test(int);
+			template <typename...>
+			static std::false_type test(...);
+		};
+	} // namespace meta_detail
+
+	template <typename T>
+	struct is_invokable;
+	template <typename Fun, typename... Args>
+	struct is_invokable<Fun(Args...)> : decltype(meta_detail::is_invokable_tester::test<Fun, Args...>(0)) { };
+
+	namespace meta_detail {
+
+		template <typename T, typename = void>
+		struct is_invocable : std::is_function<std::remove_pointer_t<T>> { };
+
+		template <typename T>
+		struct is_invocable<T,
+			std::enable_if_t<std::is_final<unqualified_t<T>>::value && std::is_class<unqualified_t<T>>::value
+			     && std::is_same<decltype(void(&T::operator())), void>::value>> { };
+
+		template <typename T>
+		struct is_invocable<T,
+			std::enable_if_t<!std::is_final<unqualified_t<T>>::value && std::is_class<unqualified_t<T>>::value
+			     && std::is_destructible<unqualified_t<T>>::value>> {
+			struct F {
+				void operator()() {};
+			};
+			struct Derived : T, F { };
+			template <typename U, U>
+			struct Check;
+
+			template <typename V>
+			static sfinae_no_t test(Check<void (F::*)(), &V::operator()>*);
+
+			template <typename>
+			static sfinae_yes_t test(...);
+
+			static constexpr bool value = std::is_same_v<decltype(test<Derived>(0)), sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct is_invocable<T,
+			std::enable_if_t<!std::is_final<unqualified_t<T>>::value && std::is_class<unqualified_t<T>>::value
+			     && !std::is_destructible<unqualified_t<T>>::value>> {
+			struct F {
+				void operator()() {};
+			};
+			struct Derived : T, F {
+				~Derived() = delete;
+			};
+			template <typename U, U>
+			struct Check;
+
+			template <typename V>
+			static sfinae_no_t test(Check<void (F::*)(), &V::operator()>*);
+
+			template <typename>
+			static sfinae_yes_t test(...);
+
+			static constexpr bool value = std::is_same_v<decltype(test<Derived>(0)), sfinae_yes_t>;
+		};
+
+		struct has_begin_end_impl {
+			template <typename T, typename U = unqualified_t<T>, typename B = decltype(std::declval<U&>().begin()),
+				typename E = decltype(std::declval<U&>().end())>
+			static std::true_type test(int);
+
+			template <typename...>
+			static std::false_type test(...);
+		};
+
+		struct has_key_type_impl {
+			template <typename T, typename U = unqualified_t<T>, typename V = typename U::key_type>
+			static std::true_type test(int);
+
+			template <typename...>
+			static std::false_type test(...);
+		};
+
+		struct has_key_comp_impl {
+			template <typename T, typename V = decltype(std::declval<unqualified_t<T>>().key_comp())>
+			static std::true_type test(int);
+
+			template <typename...>
+			static std::false_type test(...);
+		};
+
+		struct has_load_factor_impl {
+			template <typename T, typename V = decltype(std::declval<unqualified_t<T>>().load_factor())>
+			static std::true_type test(int);
+
+			template <typename...>
+			static std::false_type test(...);
+		};
+
+		struct has_mapped_type_impl {
+			template <typename T, typename V = typename unqualified_t<T>::mapped_type>
+			static std::true_type test(int);
+
+			template <typename...>
+			static std::false_type test(...);
+		};
+
+		struct has_value_type_impl {
+			template <typename T, typename V = typename unqualified_t<T>::value_type>
+			static std::true_type test(int);
+
+			template <typename...>
+			static std::false_type test(...);
+		};
+
+		struct has_iterator_impl {
+			template <typename T, typename V = typename unqualified_t<T>::iterator>
+			static std::true_type test(int);
+
+			template <typename...>
+			static std::false_type test(...);
+		};
+
+		struct has_key_value_pair_impl {
+			template <typename T, typename U = unqualified_t<T>, typename V = typename U::value_type, typename F = decltype(std::declval<V&>().first),
+				typename S = decltype(std::declval<V&>().second)>
+			static std::true_type test(int);
+
+			template <typename...>
+			static std::false_type test(...);
+		};
+
+		template <typename T>
+		struct has_push_back_test {
+		private:
+			template <typename C>
+			static sfinae_yes_t test(decltype(std::declval<C>().push_back(std::declval<std::add_rvalue_reference_t<typename C::value_type>>()))*);
+			template <typename C>
+			static sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_insert_with_iterator_test {
+		private:
+			template <typename C>
+			static sfinae_yes_t test(decltype(std::declval<C>().insert(
+				std::declval<std::add_rvalue_reference_t<typename C::iterator>>(), std::declval<std::add_rvalue_reference_t<typename C::value_type>>()))*);
+			template <typename C>
+			static sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = !std::is_same_v<decltype(test<T>(0)), sfinae_no_t>;
+		};
+
+		template <typename T>
+		struct has_insert_test {
+		private:
+			template <typename C>
+			static sfinae_yes_t test(decltype(std::declval<C>().insert(std::declval<std::add_rvalue_reference_t<typename C::value_type>>()))*);
+			template <typename C>
+			static sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = !std::is_same_v<decltype(test<T>(0)), sfinae_no_t>;
+		};
+
+		template <typename T>
+		struct has_insert_after_test {
+		private:
+			template <typename C>
+			static sfinae_yes_t test(decltype(std::declval<C>().insert_after(std::declval<std::add_rvalue_reference_t<typename C::const_iterator>>(),
+				std::declval<std::add_rvalue_reference_t<typename C::value_type>>()))*);
+			template <typename C>
+			static sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_size_test {
+		private:
+			template <typename C>
+			static sfinae_yes_t test(decltype(std::declval<C>().size())*);
+			template <typename C>
+			static sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_max_size_test {
+		private:
+			template <typename C>
+			static sfinae_yes_t test(decltype(std::declval<C>().max_size())*);
+			template <typename C>
+			static sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_to_string_test {
+		private:
+			template <typename C>
+			static sfinae_yes_t test(decltype(std::declval<C>().to_string())*);
+			template <typename C>
+			static sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), sfinae_yes_t>;
+		};
+
+		template <typename T, typename U, typename = void>
+		class supports_op_less_test : public std::false_type { };
+		template <typename T, typename U>
+		class supports_op_less_test<T, U, void_t<decltype(std::declval<T&>() < std::declval<U&>())>>
+		: public std::integral_constant<bool,
+#if SOL_IS_ON(SOL_STD_VARIANT)
+			  !is_specialization_of_v<unqualified_t<T>, std::variant> && !is_specialization_of_v<unqualified_t<U>, std::variant>
+#else
+			  true
+#endif
+			  > {
+		};
+
+		template <typename T, typename U, typename = void>
+		class supports_op_equal_test : public std::false_type { };
+		template <typename T, typename U>
+		class supports_op_equal_test<T, U, void_t<decltype(std::declval<T&>() == std::declval<U&>())>>
+		: public std::integral_constant<bool,
+#if SOL_IS_ON(SOL_STD_VARIANT)
+			  !is_specialization_of_v<unqualified_t<T>, std::variant> && !is_specialization_of_v<unqualified_t<U>, std::variant>
+#else
+			  true
+#endif
+			  > {
+		};
+
+		template <typename T, typename U, typename = void>
+		class supports_op_less_equal_test : public std::false_type { };
+		template <typename T, typename U>
+		class supports_op_less_equal_test<T, U, void_t<decltype(std::declval<T&>() <= std::declval<U&>())>>
+		: public std::integral_constant<bool,
+#if SOL_IS_ON(SOL_STD_VARIANT)
+			  !is_specialization_of_v<unqualified_t<T>, std::variant> && !is_specialization_of_v<unqualified_t<U>, std::variant>
+#else
+			  true
+#endif
+			  > {
+		};
+
+		template <typename T, typename U, typename = void>
+		class supports_op_left_shift_test : public std::false_type { };
+		template <typename T, typename U>
+		class supports_op_left_shift_test<T, U, void_t<decltype(std::declval<T&>() << std::declval<U&>())>> : public std::true_type { };
+
+		template <typename T, typename = void>
+		class supports_adl_to_string_test : public std::false_type { };
+		template <typename T>
+		class supports_adl_to_string_test<T, void_t<decltype(to_string(std::declval<const T&>()))>> : public std::true_type { };
+
+		template <typename T, bool b>
+		struct is_matched_lookup_impl : std::false_type { };
+		template <typename T>
+		struct is_matched_lookup_impl<T, true> : std::is_same<typename T::key_type, typename T::value_type> { };
+
+		template <typename T>
+		using non_void_t = meta::conditional_t<std::is_void_v<T>, ::sol::detail::unchecked_t, T>;
+
+		template <typename T>
+		using detect_sentinel = typename T::sentinel;
+	} // namespace meta_detail
+
+	template <typename T, typename Fallback>
+	class sentinel_or {
+	public:
+		using type = detected_or_t<Fallback, meta_detail::detect_sentinel, T>;
+	};
+
+	template <typename T, typename Fallback>
+	using sentinel_or_t = typename sentinel_or<T, Fallback>::type;
+
+	template <typename T, typename U = T>
+	class supports_op_less : public meta_detail::supports_op_less_test<T, U> { };
+
+	template <typename T, typename U = T>
+	class supports_op_equal : public meta_detail::supports_op_equal_test<T, U> { };
+
+	template <typename T, typename U = T>
+	class supports_op_less_equal : public meta_detail::supports_op_less_equal_test<T, U> { };
+
+	template <typename T, typename U = T>
+	class supports_op_left_shift : public meta_detail::supports_op_left_shift_test<T, U> { };
+
+	template <typename T>
+	class supports_adl_to_string : public meta_detail::supports_adl_to_string_test<T> { };
+
+	template <typename T>
+	class supports_to_string_member : public meta::boolean<meta_detail::has_to_string_test<meta_detail::non_void_t<T>>::value> { };
+
+	template <typename T>
+	using is_invocable = boolean<meta_detail::is_invocable<T>::value>;
+
+	template <typename T>
+	constexpr inline bool is_invocable_v = is_invocable<T>::value;
+
+	template <typename T>
+	struct has_begin_end : decltype(meta_detail::has_begin_end_impl::test<T>(0)) { };
+
+	template <typename T>
+	constexpr inline bool has_begin_end_v = has_begin_end<T>::value;
+
+	template <typename T>
+	struct has_key_value_pair : decltype(meta_detail::has_key_value_pair_impl::test<T>(0)) { };
+
+	template <typename T>
+	struct has_key_type : decltype(meta_detail::has_key_type_impl::test<T>(0)) { };
+
+	template <typename T>
+	struct has_key_comp : decltype(meta_detail::has_key_comp_impl::test<T>(0)) { };
+
+	template <typename T>
+	struct has_load_factor : decltype(meta_detail::has_load_factor_impl::test<T>(0)) { };
+
+	template <typename T>
+	struct has_mapped_type : decltype(meta_detail::has_mapped_type_impl::test<T>(0)) { };
+
+	template <typename T>
+	struct has_iterator : decltype(meta_detail::has_iterator_impl::test<T>(0)) { };
+
+	template <typename T>
+	struct has_value_type : decltype(meta_detail::has_value_type_impl::test<T>(0)) { };
+
+	template <typename T>
+	using has_push_back = meta::boolean<meta_detail::has_push_back_test<T>::value>;
+
+	template <typename T>
+	using has_max_size = meta::boolean<meta_detail::has_max_size_test<T>::value>;
+
+	template <typename T>
+	using has_insert = meta::boolean<meta_detail::has_insert_test<T>::value>;
+
+	template <typename T>
+	using has_insert_with_iterator = meta::boolean<meta_detail::has_insert_with_iterator_test<T>::value>;
+
+	template <typename T>
+	using has_insert_after = meta::boolean<meta_detail::has_insert_after_test<T>::value>;
+
+	template <typename T>
+	using has_size = meta::boolean<meta_detail::has_size_test<T>::value>;
+
+	template <typename T>
+	using is_associative = meta::all<has_key_type<T>, has_key_value_pair<T>, has_mapped_type<T>>;
+
+	template <typename T>
+	using is_lookup = meta::all<has_key_type<T>, has_value_type<T>>;
+
+	template <typename T>
+	using is_ordered = meta::all<has_key_comp<T>, meta::neg<has_load_factor<T>>>;
+
+	template <typename T>
+	using is_matched_lookup = meta_detail::is_matched_lookup_impl<T, is_lookup<T>::value>;
+
+	template <typename T>
+	using is_initializer_list = meta::is_specialization_of<T, std::initializer_list>;
+
+	template <typename T>
+	constexpr inline bool is_initializer_list_v = is_initializer_list<T>::value;
+
+	template <typename T, typename CharT = char>
+	using is_string_literal_array_of = boolean<std::is_array_v<T> && std::is_same_v<std::remove_all_extents_t<T>, CharT>>;
+
+	template <typename T, typename CharT = char>
+	constexpr inline bool is_string_literal_array_of_v = is_string_literal_array_of<T, CharT>::value;
+
+	template <typename T>
+	using is_string_literal_array = boolean<std::is_array_v<T>
+		&& any_same_v<std::remove_all_extents_t<T>, char,
+#if SOL_IS_ON(SOL_CHAR8_T)
+		     char8_t,
+#endif
+		     char16_t, char32_t, wchar_t>>;
+
+	template <typename T>
+	constexpr inline bool is_string_literal_array_v = is_string_literal_array<T>::value;
+
+	template <typename T, typename CharT>
+	struct is_string_of : std::false_type { };
+
+	template <typename CharT, typename CharTargetT, typename TraitsT, typename AllocT>
+	struct is_string_of<std::basic_string<CharT, TraitsT, AllocT>, CharTargetT> : std::is_same<CharT, CharTargetT> { };
+
+	template <typename T, typename CharT>
+	constexpr inline bool is_string_of_v = is_string_of<T, CharT>::value;
+
+	template <typename T, typename CharT>
+	struct is_string_view_of : std::false_type { };
+
+	template <typename CharT, typename CharTargetT, typename TraitsT>
+	struct is_string_view_of<std::basic_string_view<CharT, TraitsT>, CharTargetT> : std::is_same<CharT, CharTargetT> { };
+
+	template <typename T, typename CharT>
+	constexpr inline bool is_string_view_of_v = is_string_view_of<T, CharT>::value;
+
+	template <typename T>
+	using is_string_like
+		= meta::boolean<is_specialization_of_v<T, std::basic_string> || is_specialization_of_v<T, std::basic_string_view> || is_string_literal_array_v<T>>;
+
+	template <typename T>
+	constexpr inline bool is_string_like_v = is_string_like<T>::value;
+
+	template <typename T, typename CharT = char>
+	using is_string_constructible = meta::boolean<is_string_literal_array_of_v<T, CharT> || std::is_same_v<T, const CharT*> || std::is_same_v<T, CharT>
+		|| is_string_of_v<T, CharT> || std::is_same_v<T, std::initializer_list<CharT>> || is_string_view_of_v<T, CharT> || std::is_null_pointer_v<T>>;
+
+	template <typename T, typename CharT = char>
+	constexpr inline bool is_string_constructible_v = is_string_constructible<T, CharT>::value;
+
+	template <typename T>
+	using is_string_like_or_constructible = meta::boolean<is_string_like_v<T> || is_string_constructible_v<T>>;
+
+	template <typename T>
+	struct is_pair : std::false_type { };
+
+	template <typename T1, typename T2>
+	struct is_pair<std::pair<T1, T2>> : std::true_type { };
+
+	template <typename T, typename Char>
+	using is_c_str_of = any<std::is_same<T, const Char*>, std::is_same<T, Char const* const>, std::is_same<T, Char*>, is_string_literal_array_of<T, Char>>;
+
+	template <typename T, typename Char>
+	constexpr inline bool is_c_str_of_v = is_c_str_of<T, Char>::value;
+
+	template <typename T>
+	using is_c_str = is_c_str_of<T, char>;
+
+	template <typename T>
+	constexpr inline bool is_c_str_v = is_c_str<T>::value;
+
+	template <typename T, typename Char>
+	using is_c_str_or_string_of = any<is_c_str_of<T, Char>, is_string_of<T, Char>>;
+
+	template <typename T, typename Char>
+	constexpr inline bool is_c_str_or_string_of_v = is_c_str_or_string_of<T, Char>::value;
+
+	template <typename T>
+	using is_c_str_or_string = is_c_str_or_string_of<T, char>;
+
+	template <typename T>
+	constexpr inline bool is_c_str_or_string_v = is_c_str_or_string<T>::value;
+
+	template <typename T>
+	struct is_move_only : all<neg<std::is_reference<T>>, neg<std::is_copy_constructible<unqualified_t<T>>>, std::is_move_constructible<unqualified_t<T>>> { };
+
+	template <typename T>
+	using is_not_move_only = neg<is_move_only<T>>;
+
+	namespace meta_detail {
+		template <typename T>
+		decltype(auto) force_tuple(T&& x) {
+			if constexpr (meta::is_specialization_of_v<meta::unqualified_t<T>, std::tuple>) {
+				return std::forward<T>(x);
+			}
+			else {
+				return std::tuple<T>(std::forward<T>(x));
+			}
+		}
+	} // namespace meta_detail
+
+	template <typename... X>
+	decltype(auto) tuplefy(X&&... x) {
+		return std::tuple_cat(meta_detail::force_tuple(std::forward<X>(x))...);
+	}
+
+	template <typename T, typename = void>
+	struct iterator_tag {
+		using type = std::input_iterator_tag;
+	};
+
+	template <typename T>
+	struct iterator_tag<T, conditional_t<false, typename std::iterator_traits<T>::iterator_category, void>> {
+		using type = typename std::iterator_traits<T>::iterator_category;
+	};
+}}     // namespace sol::meta
+
+// end of sol/traits.hpp
+
+namespace sol {
+	namespace detail {
+		const bool default_safe_function_calls =
+#if SOL_IS_ON(SOL_SAFE_FUNCTION_CALLS)
+		     true;
+#else
+		     false;
+#endif
+	} // namespace detail
+
+	namespace meta { namespace meta_detail {
+	}} // namespace meta::meta_detail
+
+	namespace stack { namespace stack_detail {
+		using undefined_method_func = void (*)(stack_reference);
+
+		template <typename T>
+		void set_undefined_methods_on(stack_reference);
+
+		struct undefined_metatable;
+	}} // namespace stack::stack_detail
+} // namespace sol
+
+#endif // SOL_FORWARD_DETAIL_HPP
+// end of sol/forward_detail.hpp
+
+// beginning of sol/assert.hpp
+
+#if SOL_IS_ON(SOL2_CI)
+
+struct pre_main {
+	pre_main() {
+#ifdef _MSC_VER
+		_set_abort_behavior(0, _WRITE_ABORT_MSG);
+#endif
+	}
+} inline sol2_ci_dont_lock_ci_please = {};
+
+#endif // Prevent lockup when doing Continuous Integration
+
+#if SOL_IS_ON(SOL_USER_ASSERT)
+	#define SOL_ASSERT(...) SOL_C_ASSERT(__VA_ARGS__)
+#else
+	#if SOL_IS_ON(SOL_DEBUG_BUILD)
+		#include <exception>
+		#include <iostream>
+		#include <cstdlib>
+
+			#define SOL_ASSERT(...)                                                                                               \
+				do {                                                                                                               \
+					if (!(__VA_ARGS__)) {                                                                                           \
+						std::cerr << "Assertion `" #__VA_ARGS__ "` failed in " << __FILE__ << " line " << __LINE__ << std::endl; \
+						std::terminate();                                                                                        \
+					}                                                                                                             \
+				} while (false)
+	#else
+		#define SOL_ASSERT(...)           \
+			do {                           \
+				if (false) {              \
+					(void)(__VA_ARGS__); \
+				}                         \
+			} while (false)
+	#endif
+#endif
+
+#if SOL_IS_ON(SOL_USER_ASSERT_MSG)
+	#define SOL_ASSERT_MSG(message, ...) SOL_ASSERT_MSG(message, __VA_ARGS__)
+#else
+	#if SOL_IS_ON(SOL_DEBUG_BUILD)
+		#include <exception>
+		#include <iostream>
+		#include <cstdlib>
+
+		#define SOL_ASSERT_MSG(message, ...)                                                                                                         \
+			do {                                                                                                                                  \
+				if (!(__VA_ARGS__)) {                                                                                                              \
+					std::cerr << "Assertion `" #__VA_ARGS__ "` failed in " << __FILE__ << " line " << __LINE__ << ": " << message << std::endl; \
+					std::terminate();                                                                                                           \
+				}                                                                                                                                \
+			} while (false)
+	#else
+		#define SOL_ASSERT_MSG(message, ...)    \
+			do {                             \
+				if (false) {                \
+					(void)(__VA_ARGS__);   \
+					(void)sizeof(message); \
+				}                           \
+			} while (false)
+	#endif
+#endif
+
+// end of sol/assert.hpp
+
+// beginning of sol/bytecode.hpp
+
+// beginning of sol/compatibility.hpp
+
+// beginning of sol/compatibility/lua_version.hpp
+
+#if SOL_IS_ON(SOL_USING_CXX_LUA)
+	#include <lua.h>
+	#include <lualib.h>
+	#include <lauxlib.h>
+#elif SOL_IS_ON(SOL_USE_LUA_HPP)
+	#include <lua.hpp>
+#else
+	extern "C" {
+		#include <lua.h>
+		#include <lauxlib.h>
+		#include <lualib.h>
+	}
+#endif // C++ Mangling for Lua vs. Not
+
+#if defined(SOL_LUAJIT)
+	#if (SOL_LUAJIT != 0)
+		#define SOL_USE_LUAJIT_I_ SOL_ON
+	#else
+		#define SOL_USE_LUAJIT_I_ SOL_OFF
+	#endif
+#elif defined(LUAJIT_VERSION)
+	#define SOL_USE_LUAJIT_I_ SOL_ON
+#else
+	#define SOL_USE_LUAJIT_I_ SOL_DEFAULT_OFF
+#endif // luajit
+
+#if SOL_IS_ON(SOL_USING_CXX_LUAJIT)
+	#include <luajit.h>
+#elif SOL_IS_ON(SOL_USE_LUAJIT)
+	extern "C" {
+		#include <luajit.h>
+	}
+#endif // C++ LuaJIT ... whatever that means
+
+#if defined(SOL_LUAJIT_VERSION)
+	#define SOL_LUAJIT_VERSION_I_ SOL_LUAJIT_VERSION
+#elif SOL_IS_ON(SOL_USE_LUAJIT)
+	#define SOL_LUAJIT_VERSION_I_ LUAJIT_VERSION_NUM
+#else
+	#define SOL_LUAJIT_VERSION_I_ 0
+#endif
+
+#if defined(SOL_LUAJIT_FFI_DISABLED)
+	#define SOL_LUAJIT_FFI_DISABLED_I_ SOL_ON
+#elif defined(LUAJIT_DISABLE_FFI)
+	#define SOL_LUAJIT_FFI_DISABLED_I_ SOL_ON
+#else
+	#define SOL_LUAJIT_FFI_DISABLED_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(MOONJIT_VERSION)
+	#define SOL_USE_MOONJIT_I_ SOL_ON
+#else
+	#define SOL_USE_MOONJIT_I_ SOL_OFF
+#endif
+
+#if !defined(SOL_LUA_VERSION)
+	#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM >= 502
+		#define SOL_LUA_VERSION LUA_VERSION_NUM
+	#elif defined(LUA_VERSION_NUM) && LUA_VERSION_NUM == 501
+		#define SOL_LUA_VERSION LUA_VERSION_NUM
+	#elif !defined(LUA_VERSION_NUM) || !(LUA_VERSION_NUM)
+		// Definitely 5.0
+		#define SOL_LUA_VERSION 500
+	#else
+		// ??? Not sure, assume latest?
+		#define SOL_LUA_VERSION 504
+	#endif // Lua Version 503, 502, 501 || luajit, 500
+#endif // SOL_LUA_VERSION
+
+#if defined(SOL_LUA_VERSION)
+	#define SOL_LUA_VERSION_I_ SOL_LUA_VERSION
+#else
+	#define SOL_LUA_VERSION_I_ 504
+#endif
+
+#if defined(SOL_EXCEPTIONS_ALWAYS_UNSAFE)
+	#if (SOL_EXCEPTIONS_ALWAYS_UNSAFE != 0)
+		#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_OFF
+	#else
+		#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_ON
+	#endif
+#elif defined(SOL_EXCEPTIONS_SAFE_PROPAGATION)
+	#if (SOL_EXCEPTIONS_SAFE_PROPAGATION != 0)
+		#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_ON
+	#else
+		#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_OFF
+	#endif
+#elif SOL_LUAJIT_VERSION_I_ >= 20100
+	// LuaJIT 2.1.0-beta3 and better have exception support locked in for all platforms (mostly)
+	#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_DEFAULT_ON
+#elif SOL_LUAJIT_VERSION_I_ >= 20000
+	// LuaJIT 2.0.x have exception support only on x64 builds
+	#if SOL_IS_ON(SOL_PLATFORM_X64)
+		#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_OFF
+	#endif
+#else
+	// otherwise, there is no exception safety for
+	// shoving exceptions through Lua and errors should
+	// always be serialized
+	#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_EXCEPTIONS_CATCH_ALL)
+	#if (SOL_EXCEPTIONS_CATCH_ALL != 0)
+		#define SOL_EXCEPTIONS_CATCH_ALL_I_ SOL_ON
+	#else
+		#define SOL_EXCEPTIONS_CATCH_ALL_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_USE_LUAJIT)
+		#define SOL_EXCEPTIONS_CATCH_ALL_I_ SOL_DEFAULT_OFF
+	#elif SOL_IS_ON(SOL_USING_CXX_LUAJIT)
+		#define SOL_EXCEPTIONS_CATCH_ALL_I_ SOL_DEFAULT_OFF
+	#elif SOL_IS_ON(SOL_USING_CXX_LUA)
+		#define SOL_EXCEPTIONS_CATCH_ALL_I_ SOL_DEFAULT_OFF
+	#else
+		#define SOL_EXCEPTIONS_CATCH_ALL_I_ SOL_DEFAULT_ON
+	#endif
+#endif
+
+#if defined(SOL_LUAJIT_USE_EXCEPTION_TRAMPOLINE)
+	#if (SOL_LUAJIT_USE_EXCEPTION_TRAMPOLINE != 0)
+		#define SOL_USE_LUAJIT_EXCEPTION_TRAMPOLINE_I_ SOL_ON
+	#else
+		#define SOL_USE_LUAJIT_EXCEPTION_TRAMPOLINE_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_OFF(SOL_PROPAGATE_EXCEPTIONS) && SOL_IS_ON(SOL_USE_LUAJIT)
+		#define SOL_USE_LUAJIT_EXCEPTION_TRAMPOLINE_I_ SOL_ON
+	#else
+		#define SOL_USE_LUAJIT_EXCEPTION_TRAMPOLINE_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_LUAL_STREAM_HAS_CLOSE_FUNCTION)
+	#if (SOL_LUAL_STREAM_HAS_CLOSE_FUNCTION != 0)
+		#define SOL_LUAL_STREAM_USE_CLOSE_FUNCTION_I_ SOL_ON
+	#else
+		#define SOL_LUAL_STREAM_USE_CLOSE_FUNCTION_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_OFF(SOL_USE_LUAJIT) && (SOL_LUA_VERSION > 501)
+		#define SOL_LUAL_STREAM_USE_CLOSE_FUNCTION_I_ SOL_ON
+	#else
+		#define SOL_LUAL_STREAM_USE_CLOSE_FUNCTION_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined (SOL_LUA_BIT32_LIB)
+	#if SOL_LUA_BIT32_LIB != 0
+		#define SOL_LUA_BIT32_LIB_I_ SOL_ON
+	#else
+		#define SOL_LUA_BIT32_LIB_I_ SOL_OFF
+	#endif
+#else
+	// Lua 5.2 only (deprecated in 5.3 (503)) (Can be turned on with Compat flags)
+	// Lua 5.2, or other versions of Lua with the compat flag, or Lua that is not 5.2 with the specific define (5.4.1 either removed it entirely or broke it)
+	#if (SOL_LUA_VERSION_I_ == 502)
+		#define SOL_LUA_BIT32_LIB_I_ SOL_ON
+	#elif defined(LUA_COMPAT_BITLIB)
+		#define SOL_LUA_BIT32_LIB_I_ SOL_ON
+	#elif (SOL_LUA_VERSION_I_ < 504 && defined(LUA_COMPAT_5_2))
+		#define SOL_LUA_BIT32_LIB_I_ SOL_ON
+	#else
+		#define SOL_LUA_BIT32_LIB_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined (SOL_LUA_NIL_IN_TABLES)
+	#if SOL_LUA_NIL_IN_TABLES != 0
+		#define SOL_LUA_NIL_IN_TABLES_I_ SOL_ON
+	#else
+		#define SOL_LUA_NIL_IN_TABLES_I_ SOL_OFF
+	#endif
+#else
+	#if defined(LUA_NILINTABLE) && (LUA_NILINTABLE != 0)
+		#define SOL_LUA_NIL_IN_TABLES_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_LUA_NIL_IN_TABLES_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+// end of sol/compatibility/lua_version.hpp
+
+#if SOL_IS_ON(SOL_USE_COMPATIBILITY_LAYER)
+
+#if SOL_IS_ON(SOL_USING_CXX_LUA) || SOL_IS_ON(SOL_USING_CXX_LUAJIT)
+	#ifndef COMPAT53_LUA_CPP
+		#define COMPAT53_LUA_CPP 1
+	#endif // Build Lua Compat layer as C++
+#endif
+	#ifndef COMPAT53_INCLUDE_SOURCE
+		#define COMPAT53_INCLUDE_SOURCE 1
+	#endif // Build Compat Layer Inline
+// beginning of sol/compatibility/compat-5.3.h
+
+#ifndef KEPLER_PROJECT_COMPAT53_H_
+#define KEPLER_PROJECT_COMPAT53_H_
+
+#include <stddef.h>
+#include <limits.h>
+#include <string.h>
+#if defined(__cplusplus) && !defined(COMPAT53_LUA_CPP)
+extern "C" {
+#endif
+#include <lua.h>
+#include <lauxlib.h>
+#include <lualib.h>
+#if defined(__cplusplus) && !defined(COMPAT53_LUA_CPP)
+}
+#endif
+
+#ifndef COMPAT53_PREFIX
+/* we chose this name because many other lua bindings / libs have
+* their own compatibility layer, and that use the compat53 declaration
+* frequently, causing all kinds of linker / compiler issues
+*/
+#  define COMPAT53_PREFIX kp_compat53
+#endif // COMPAT53_PREFIX
+
+#ifndef COMPAT53_API
+#  if defined(COMPAT53_INCLUDE_SOURCE) && COMPAT53_INCLUDE_SOURCE
+#    if defined(__GNUC__) || defined(__clang__)
+#      define COMPAT53_API __attribute__((__unused__)) static inline 
+#    else
+#      define COMPAT53_API static inline 
+#    endif /* Clang/GCC */
+#  else /* COMPAT53_INCLUDE_SOURCE */
+/* we are not including source, so everything is extern */
+#      define COMPAT53_API extern
+#  endif /* COMPAT53_INCLUDE_SOURCE */
+#endif /* COMPAT53_PREFIX */
+
+#define COMPAT53_CONCAT_HELPER(a, b) a##b
+#define COMPAT53_CONCAT(a, b) COMPAT53_CONCAT_HELPER(a, b)
+
+/* declarations for Lua 5.1 */
+#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM == 501
+
+/* XXX not implemented:
+* lua_arith (new operators)
+* lua_upvalueid
+* lua_upvaluejoin
+* lua_version
+* lua_yieldk
+*/
+
+#ifndef LUA_OK
+#  define LUA_OK 0
+#endif
+#ifndef LUA_OPADD
+#  define LUA_OPADD 0
+#endif
+#ifndef LUA_OPSUB
+#  define LUA_OPSUB 1
+#endif
+#ifndef LUA_OPMUL
+#  define LUA_OPMUL 2
+#endif
+#ifndef LUA_OPDIV
+#  define LUA_OPDIV 3
+#endif
+#ifndef LUA_OPMOD
+#  define LUA_OPMOD 4
+#endif
+#ifndef LUA_OPPOW
+#  define LUA_OPPOW 5
+#endif
+#ifndef LUA_OPUNM
+#  define LUA_OPUNM 6
+#endif
+#ifndef LUA_OPEQ
+#  define LUA_OPEQ 0
+#endif
+#ifndef LUA_OPLT
+#  define LUA_OPLT 1
+#endif
+#ifndef LUA_OPLE
+#  define LUA_OPLE 2
+#endif
+
+/* LuaJIT/Lua 5.1 does not have the updated
+* error codes for thread status/function returns (but some patched versions do)
+* define it only if it's not found
+*/
+#if !defined(LUA_ERRGCMM)
+/* Use + 2 because in some versions of Lua (Lua 5.1)
+* LUA_ERRFILE is defined as (LUA_ERRERR+1)
+* so we need to avoid it (LuaJIT might have something at this
+* integer value too)
+*/
+#  define LUA_ERRGCMM (LUA_ERRERR + 2)
+#endif /* LUA_ERRGCMM define */
+
+#if !defined(MOONJIT_VERSION)
+typedef size_t lua_Unsigned;
+#endif
+
+typedef struct luaL_Buffer_53 {
+	luaL_Buffer b; /* make incorrect code crash! */
+	char *ptr;
+	size_t nelems;
+	size_t capacity;
+	lua_State *L2;
+} luaL_Buffer_53;
+#define luaL_Buffer luaL_Buffer_53
+
+/* In PUC-Rio 5.1, userdata is a simple FILE*
+* In LuaJIT, it's a struct where the first member is a FILE*
+* We can't support the `closef` member
+*/
+typedef struct luaL_Stream {
+	FILE *f;
+} luaL_Stream;
+
+#define lua_absindex COMPAT53_CONCAT(COMPAT53_PREFIX, _absindex)
+COMPAT53_API int lua_absindex(lua_State *L, int i);
+
+#define lua_arith COMPAT53_CONCAT(COMPAT53_PREFIX, _arith)
+COMPAT53_API void lua_arith(lua_State *L, int op);
+
+#define lua_compare COMPAT53_CONCAT(COMPAT53_PREFIX, _compare)
+COMPAT53_API int lua_compare(lua_State *L, int idx1, int idx2, int op);
+
+#define lua_copy COMPAT53_CONCAT(COMPAT53_PREFIX, _copy)
+COMPAT53_API void lua_copy(lua_State *L, int from, int to);
+
+#define lua_getuservalue(L, i) \
+  (lua_getfenv((L), (i)), lua_type((L), -1))
+#define lua_setuservalue(L, i) \
+  (luaL_checktype((L), -1, LUA_TTABLE), lua_setfenv((L), (i)))
+
+#define lua_len COMPAT53_CONCAT(COMPAT53_PREFIX, _len)
+COMPAT53_API void lua_len(lua_State *L, int i);
+
+#define lua_pushstring(L, s) \
+  (lua_pushstring((L), (s)), lua_tostring((L), -1))
+
+#define lua_pushlstring(L, s, len) \
+  ((((len) == 0) ? lua_pushlstring((L), "", 0) : lua_pushlstring((L), (s), (len))), lua_tostring((L), -1))
+
+#ifndef luaL_newlibtable
+#  define luaL_newlibtable(L, l) \
+  (lua_createtable((L), 0, sizeof((l))/sizeof(*(l))-1))
+#endif
+#ifndef luaL_newlib
+#  define luaL_newlib(L, l) \
+  (luaL_newlibtable((L), (l)), luaL_register((L), NULL, (l)))
+#endif
+
+#ifndef lua_pushglobaltable
+#  define lua_pushglobaltable(L) \
+  lua_pushvalue((L), LUA_GLOBALSINDEX)
+#endif
+#define lua_rawgetp COMPAT53_CONCAT(COMPAT53_PREFIX, _rawgetp)
+COMPAT53_API int lua_rawgetp(lua_State *L, int i, const void *p);
+
+#define lua_rawsetp COMPAT53_CONCAT(COMPAT53_PREFIX, _rawsetp)
+COMPAT53_API void lua_rawsetp(lua_State *L, int i, const void *p);
+
+#define lua_rawlen(L, i) lua_objlen((L), (i))
+
+#define lua_tointeger(L, i) lua_tointegerx((L), (i), NULL)
+
+#define lua_tonumberx COMPAT53_CONCAT(COMPAT53_PREFIX, _tonumberx)
+COMPAT53_API lua_Number lua_tonumberx(lua_State *L, int i, int *isnum);
+
+#define luaL_checkversion COMPAT53_CONCAT(COMPAT53_PREFIX, L_checkversion)
+COMPAT53_API void luaL_checkversion(lua_State *L);
+
+#define lua_load COMPAT53_CONCAT(COMPAT53_PREFIX, _load_53)
+COMPAT53_API int lua_load(lua_State *L, lua_Reader reader, void *data, const char* source, const char* mode);
+
+#define luaL_loadfilex COMPAT53_CONCAT(COMPAT53_PREFIX, L_loadfilex)
+COMPAT53_API int luaL_loadfilex(lua_State *L, const char *filename, const char *mode);
+
+#define luaL_loadbufferx COMPAT53_CONCAT(COMPAT53_PREFIX, L_loadbufferx)
+COMPAT53_API int luaL_loadbufferx(lua_State *L, const char *buff, size_t sz, const char *name, const char *mode);
+
+#define luaL_checkstack COMPAT53_CONCAT(COMPAT53_PREFIX, L_checkstack_53)
+COMPAT53_API void luaL_checkstack(lua_State *L, int sp, const char *msg);
+
+#define luaL_getsubtable COMPAT53_CONCAT(COMPAT53_PREFIX, L_getsubtable)
+COMPAT53_API int luaL_getsubtable(lua_State* L, int i, const char *name);
+
+#define luaL_len COMPAT53_CONCAT(COMPAT53_PREFIX, L_len)
+COMPAT53_API lua_Integer luaL_len(lua_State *L, int i);
+
+#define luaL_setfuncs COMPAT53_CONCAT(COMPAT53_PREFIX, L_setfuncs)
+COMPAT53_API void luaL_setfuncs(lua_State *L, const luaL_Reg *l, int nup);
+
+#define luaL_setmetatable COMPAT53_CONCAT(COMPAT53_PREFIX, L_setmetatable)
+COMPAT53_API void luaL_setmetatable(lua_State *L, const char *tname);
+
+#define luaL_testudata COMPAT53_CONCAT(COMPAT53_PREFIX, L_testudata)
+COMPAT53_API void *luaL_testudata(lua_State *L, int i, const char *tname);
+
+#define luaL_traceback COMPAT53_CONCAT(COMPAT53_PREFIX, L_traceback)
+COMPAT53_API void luaL_traceback(lua_State *L, lua_State *L1, const char *msg, int level);
+
+#define luaL_fileresult COMPAT53_CONCAT(COMPAT53_PREFIX, L_fileresult)
+COMPAT53_API int luaL_fileresult(lua_State *L, int stat, const char *fname);
+
+#define luaL_execresult COMPAT53_CONCAT(COMPAT53_PREFIX, L_execresult)
+COMPAT53_API int luaL_execresult(lua_State *L, int stat);
+
+#define lua_callk(L, na, nr, ctx, cont) \
+  ((void)(ctx), (void)(cont), lua_call((L), (na), (nr)))
+#define lua_pcallk(L, na, nr, err, ctx, cont) \
+  ((void)(ctx), (void)(cont), lua_pcall((L), (na), (nr), (err)))
+
+#define lua_resume(L, from, nargs) \
+  ((void)(from), lua_resume((L), (nargs)))
+
+#define luaL_buffinit COMPAT53_CONCAT(COMPAT53_PREFIX, _buffinit_53)
+COMPAT53_API void luaL_buffinit(lua_State *L, luaL_Buffer_53 *B);
+
+#define luaL_prepbuffsize COMPAT53_CONCAT(COMPAT53_PREFIX, _prepbufsize_53)
+COMPAT53_API char *luaL_prepbuffsize(luaL_Buffer_53 *B, size_t s);
+
+#define luaL_addlstring COMPAT53_CONCAT(COMPAT53_PREFIX, _addlstring_53)
+COMPAT53_API void luaL_addlstring(luaL_Buffer_53 *B, const char *s, size_t l);
+
+#define luaL_addvalue COMPAT53_CONCAT(COMPAT53_PREFIX, _addvalue_53)
+COMPAT53_API void luaL_addvalue(luaL_Buffer_53 *B);
+
+#define luaL_pushresult COMPAT53_CONCAT(COMPAT53_PREFIX, _pushresult_53)
+COMPAT53_API void luaL_pushresult(luaL_Buffer_53 *B);
+
+#undef luaL_buffinitsize
+#define luaL_buffinitsize(L, B, s) \
+  (luaL_buffinit((L), (B)), luaL_prepbuffsize((B), (s)))
+
+#undef luaL_prepbuffer
+#define luaL_prepbuffer(B) \
+  luaL_prepbuffsize((B), LUAL_BUFFERSIZE)
+
+#undef luaL_addchar
+#define luaL_addchar(B, c) \
+  ((void)((B)->nelems < (B)->capacity || luaL_prepbuffsize((B), 1)), \
+   ((B)->ptr[(B)->nelems++] = (c)))
+
+#undef luaL_addsize
+#define luaL_addsize(B, s) \
+  ((B)->nelems += (s))
+
+#undef luaL_addstring
+#define luaL_addstring(B, s) \
+  luaL_addlstring((B), (s), strlen((s)))
+
+#undef luaL_pushresultsize
+#define luaL_pushresultsize(B, s) \
+  (luaL_addsize((B), (s)), luaL_pushresult((B)))
+
+#if defined(LUA_COMPAT_APIINTCASTS)
+#define lua_pushunsigned(L, n) \
+  lua_pushinteger((L), (lua_Integer)(n))
+#define lua_tounsignedx(L, i, is) \
+  ((lua_Unsigned)lua_tointegerx((L), (i), (is)))
+#define lua_tounsigned(L, i) \
+  lua_tounsignedx((L), (i), NULL)
+#define luaL_checkunsigned(L, a) \
+  ((lua_Unsigned)luaL_checkinteger((L), (a)))
+#define luaL_optunsigned(L, a, d) \
+  ((lua_Unsigned)luaL_optinteger((L), (a), (lua_Integer)(d)))
+#endif
+
+#endif /* Lua 5.1 only */
+
+/* declarations for Lua 5.1 and 5.2 */
+#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM <= 502
+
+typedef int lua_KContext;
+
+typedef int(*lua_KFunction)(lua_State *L, int status, lua_KContext ctx);
+
+#define lua_dump(L, w, d, s) \
+  ((void)(s), lua_dump((L), (w), (d)))
+
+#define lua_getfield(L, i, k) \
+  (lua_getfield((L), (i), (k)), lua_type((L), -1))
+
+#define lua_gettable(L, i) \
+  (lua_gettable((L), (i)), lua_type((L), -1))
+
+#define lua_geti COMPAT53_CONCAT(COMPAT53_PREFIX, _geti)
+COMPAT53_API int lua_geti(lua_State *L, int index, lua_Integer i);
+
+#define lua_isinteger COMPAT53_CONCAT(COMPAT53_PREFIX, _isinteger)
+COMPAT53_API int lua_isinteger(lua_State *L, int index);
+
+#define lua_tointegerx COMPAT53_CONCAT(COMPAT53_PREFIX, _tointegerx_53)
+COMPAT53_API lua_Integer lua_tointegerx(lua_State *L, int i, int *isnum);
+
+#define lua_numbertointeger(n, p) \
+  ((*(p) = (lua_Integer)(n)), 1)
+
+#define lua_rawget(L, i) \
+  (lua_rawget((L), (i)), lua_type((L), -1))
+
+#define lua_rawgeti(L, i, n) \
+  (lua_rawgeti((L), (i), (n)), lua_type((L), -1))
+
+#define lua_rotate COMPAT53_CONCAT(COMPAT53_PREFIX, _rotate)
+COMPAT53_API void lua_rotate(lua_State *L, int idx, int n);
+
+#define lua_seti COMPAT53_CONCAT(COMPAT53_PREFIX, _seti)
+COMPAT53_API void lua_seti(lua_State *L, int index, lua_Integer i);
+
+#define lua_stringtonumber COMPAT53_CONCAT(COMPAT53_PREFIX, _stringtonumber)
+COMPAT53_API size_t lua_stringtonumber(lua_State *L, const char *s);
+
+#define luaL_tolstring COMPAT53_CONCAT(COMPAT53_PREFIX, L_tolstring)
+COMPAT53_API const char *luaL_tolstring(lua_State *L, int idx, size_t *len);
+
+#define luaL_getmetafield(L, o, e) \
+  (luaL_getmetafield((L), (o), (e)) ? lua_type((L), -1) : LUA_TNIL)
+
+#define luaL_newmetatable(L, tn) \
+  (luaL_newmetatable((L), (tn)) ? (lua_pushstring((L), (tn)), lua_setfield((L), -2, "__name"), 1) : 0)
+
+#define luaL_requiref COMPAT53_CONCAT(COMPAT53_PREFIX, L_requiref_53)
+COMPAT53_API void luaL_requiref(lua_State *L, const char *modname,
+	lua_CFunction openf, int glb);
+
+#endif /* Lua 5.1 and Lua 5.2 */
+
+/* declarations for Lua 5.2 */
+#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM == 502
+
+/* XXX not implemented:
+* lua_isyieldable
+* lua_getextraspace
+* lua_arith (new operators)
+* lua_pushfstring (new formats)
+*/
+
+#define lua_getglobal(L, n) \
+  (lua_getglobal((L), (n)), lua_type((L), -1))
+
+#define lua_getuservalue(L, i) \
+  (lua_getuservalue((L), (i)), lua_type((L), -1))
+
+#define lua_pushlstring(L, s, len) \
+  (((len) == 0) ? lua_pushlstring((L), "", 0) : lua_pushlstring((L), (s), (len)))
+
+#define lua_rawgetp(L, i, p) \
+  (lua_rawgetp((L), (i), (p)), lua_type((L), -1))
+
+#define LUA_KFUNCTION(_name) \
+  static int (_name)(lua_State *L, int status, lua_KContext ctx); \
+  static int (_name ## _52)(lua_State *L) { \
+    lua_KContext ctx; \
+    int status = lua_getctx(L, &ctx); \
+    return (_name)(L, status, ctx); \
+  } \
+  static int (_name)(lua_State *L, int status, lua_KContext ctx)
+
+#define lua_pcallk(L, na, nr, err, ctx, cont) \
+  lua_pcallk((L), (na), (nr), (err), (ctx), cont ## _52)
+
+#define lua_callk(L, na, nr, ctx, cont) \
+  lua_callk((L), (na), (nr), (ctx), cont ## _52)
+
+#define lua_yieldk(L, nr, ctx, cont) \
+  lua_yieldk((L), (nr), (ctx), cont ## _52)
+
+#ifdef lua_call
+#  undef lua_call
+#  define lua_call(L, na, nr) \
+  (lua_callk)((L), (na), (nr), 0, NULL)
+#endif
+
+#ifdef lua_pcall
+#  undef lua_pcall
+#  define lua_pcall(L, na, nr, err) \
+  (lua_pcallk)((L), (na), (nr), (err), 0, NULL)
+#endif
+
+#ifdef lua_yield
+#  undef lua_yield
+#  define lua_yield(L, nr) \
+  (lua_yieldk)((L), (nr), 0, NULL)
+#endif
+
+#endif /* Lua 5.2 only */
+
+/* other Lua versions */
+#if !defined(LUA_VERSION_NUM) || LUA_VERSION_NUM < 501 || LUA_VERSION_NUM > 504
+
+#  error "unsupported Lua version (i.e. not Lua 5.1, 5.2, 5.3, or 5.4)"
+
+#endif /* other Lua versions except 5.1, 5.2, 5.3, and 5.4 */
+
+/* helper macro for defining continuation functions (for every version
+* *except* Lua 5.2) */
+#ifndef LUA_KFUNCTION
+#define LUA_KFUNCTION(_name) \
+  static int (_name)(lua_State *L, int status, lua_KContext ctx)
+#endif
+
+#if defined(COMPAT53_INCLUDE_SOURCE) && COMPAT53_INCLUDE_SOURCE == 1
+// beginning of sol/compatibility/compat-5.3.c.h
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <errno.h>
+#include <stdio.h>
+
+/* don't compile it again if it already is included via compat53.h */
+#ifndef KEPLER_PROJECT_COMPAT53_C_
+#define KEPLER_PROJECT_COMPAT53_C_
+
+/* definitions for Lua 5.1 only */
+#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM == 501
+
+#ifndef COMPAT53_FOPEN_NO_LOCK
+#if defined(_MSC_VER)
+#define COMPAT53_FOPEN_NO_LOCK 1
+#else /* otherwise */
+#define COMPAT53_FOPEN_NO_LOCK 0
+#endif /* VC++ only so far */
+#endif /* No-lock fopen_s usage if possible */
+
+#if defined(_MSC_VER) && COMPAT53_FOPEN_NO_LOCK
+#include <share.h>
+#endif /* VC++ _fsopen for share-allowed file read */
+
+#ifndef COMPAT53_HAVE_STRERROR_R
+#if defined(__GLIBC__) || defined(_POSIX_VERSION) || defined(__APPLE__) || (!defined(__MINGW32__) && defined(__GNUC__) && (__GNUC__ < 6))
+#define COMPAT53_HAVE_STRERROR_R 1
+#else /* none of the defines matched: define to 0 */
+#define COMPAT53_HAVE_STRERROR_R 0
+#endif /* have strerror_r of some form */
+#endif /* strerror_r */
+
+#ifndef COMPAT53_HAVE_STRERROR_S
+#if defined(_MSC_VER) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L) || (defined(__STDC_LIB_EXT1__) && __STDC_LIB_EXT1__)
+#define COMPAT53_HAVE_STRERROR_S 1
+#else /* not VC++ or C11 */
+#define COMPAT53_HAVE_STRERROR_S 0
+#endif /* strerror_s from VC++ or C11 */
+#endif /* strerror_s */
+
+#ifndef COMPAT53_LUA_FILE_BUFFER_SIZE
+#define COMPAT53_LUA_FILE_BUFFER_SIZE 4096
+#endif /* Lua File Buffer Size */
+
+static char* compat53_strerror(int en, char* buff, size_t sz) {
+#if COMPAT53_HAVE_STRERROR_R
+	/* use strerror_r here, because it's available on these specific platforms */
+	if (sz > 0) {
+		buff[0] = '\0';
+		/* we don't care whether the GNU version or the XSI version is used: */
+		if (strerror_r(en, buff, sz)) {
+			/* Yes, we really DO want to ignore the return value!
+			 * GCC makes that extra hard, not even a (void) cast will do. */
+		}
+		if (buff[0] == '\0') {
+			/* Buffer is unchanged, so we probably have called GNU strerror_r which
+			 * returned a static constant string. Chances are that strerror will
+			 * return the same static constant string and therefore be thread-safe. */
+			return strerror(en);
+		}
+	}
+	return buff; /* sz is 0 *or* strerror_r wrote into the buffer */
+#elif COMPAT53_HAVE_STRERROR_S
+	/* for MSVC and other C11 implementations, use strerror_s since it's
+	 * provided by default by the libraries */
+	strerror_s(buff, sz, en);
+	return buff;
+#else
+	/* fallback, but strerror is not guaranteed to be threadsafe due to modifying
+	 * errno itself and some impls not locking a static buffer for it ... but most
+	 * known systems have threadsafe errno: this might only change if the locale
+	 * is changed out from under someone while this function is being called */
+	(void)buff;
+	(void)sz;
+	return strerror(en);
+#endif
+}
+
+COMPAT53_API int lua_absindex(lua_State* L, int i) {
+	if (i < 0 && i > LUA_REGISTRYINDEX)
+		i += lua_gettop(L) + 1;
+	return i;
+}
+
+static void compat53_call_lua(lua_State* L, char const code[], size_t len, int nargs, int nret) {
+	lua_rawgetp(L, LUA_REGISTRYINDEX, (void*)code);
+	if (lua_type(L, -1) != LUA_TFUNCTION) {
+		lua_pop(L, 1);
+		if (luaL_loadbuffer(L, code, len, "=none"))
+			lua_error(L);
+		lua_pushvalue(L, -1);
+		lua_rawsetp(L, LUA_REGISTRYINDEX, (void*)code);
+	}
+	lua_insert(L, -nargs - 1);
+	lua_call(L, nargs, nret);
+}
+
+COMPAT53_API void lua_arith(lua_State* L, int op) {
+	static const char compat53_arith_code[]
+	     = "local op,a,b=...\n"
+	       "if op==0 then return a+b\n"
+	       "elseif op==1 then return a-b\n"
+	       "elseif op==2 then return a*b\n"
+	       "elseif op==3 then return a/b\n"
+	       "elseif op==4 then return a%b\n"
+	       "elseif op==5 then return a^b\n"
+	       "elseif op==6 then return -a\n"
+	       "end\n";
+
+	if (op < LUA_OPADD || op > LUA_OPUNM)
+		luaL_error(L, "invalid 'op' argument for lua_arith");
+	luaL_checkstack(L, 5, "not enough stack slots");
+	if (op == LUA_OPUNM)
+		lua_pushvalue(L, -1);
+	lua_pushnumber(L, op);
+	lua_insert(L, -3);
+	compat53_call_lua(L, compat53_arith_code, sizeof(compat53_arith_code) - 1, 3, 1);
+}
+
+COMPAT53_API int lua_compare(lua_State* L, int idx1, int idx2, int op) {
+	static const char compat53_compare_code[]
+	     = "local a,b=...\n"
+	       "return a<=b\n";
+
+	int result = 0;
+	switch (op) {
+	case LUA_OPEQ:
+		return lua_equal(L, idx1, idx2);
+	case LUA_OPLT:
+		return lua_lessthan(L, idx1, idx2);
+	case LUA_OPLE:
+		luaL_checkstack(L, 5, "not enough stack slots");
+		idx1 = lua_absindex(L, idx1);
+		idx2 = lua_absindex(L, idx2);
+		lua_pushvalue(L, idx1);
+		lua_pushvalue(L, idx2);
+		compat53_call_lua(L, compat53_compare_code, sizeof(compat53_compare_code) - 1, 2, 1);
+		result = lua_toboolean(L, -1);
+		lua_pop(L, 1);
+		return result;
+	default:
+		luaL_error(L, "invalid 'op' argument for lua_compare");
+	}
+	return 0;
+}
+
+COMPAT53_API void lua_copy(lua_State* L, int from, int to) {
+	int abs_to = lua_absindex(L, to);
+	luaL_checkstack(L, 1, "not enough stack slots");
+	lua_pushvalue(L, from);
+	lua_replace(L, abs_to);
+}
+
+COMPAT53_API void lua_len(lua_State* L, int i) {
+	switch (lua_type(L, i)) {
+	case LUA_TSTRING:
+		lua_pushnumber(L, (lua_Number)lua_objlen(L, i));
+		break;
+	case LUA_TTABLE:
+		if (!luaL_callmeta(L, i, "__len"))
+			lua_pushnumber(L, (lua_Number)lua_objlen(L, i));
+		break;
+	case LUA_TUSERDATA:
+		if (luaL_callmeta(L, i, "__len"))
+			break;
+		/* FALLTHROUGH */
+	default:
+		luaL_error(L, "attempt to get length of a %s value", lua_typename(L, lua_type(L, i)));
+	}
+}
+
+COMPAT53_API int lua_rawgetp(lua_State* L, int i, const void* p) {
+	int abs_i = lua_absindex(L, i);
+	lua_pushlightuserdata(L, (void*)p);
+	lua_rawget(L, abs_i);
+	return lua_type(L, -1);
+}
+
+COMPAT53_API void lua_rawsetp(lua_State* L, int i, const void* p) {
+	int abs_i = lua_absindex(L, i);
+	luaL_checkstack(L, 1, "not enough stack slots");
+	lua_pushlightuserdata(L, (void*)p);
+	lua_insert(L, -2);
+	lua_rawset(L, abs_i);
+}
+
+COMPAT53_API lua_Number lua_tonumberx(lua_State* L, int i, int* isnum) {
+	lua_Number n = lua_tonumber(L, i);
+	if (isnum != NULL) {
+		*isnum = (n != 0 || lua_isnumber(L, i));
+	}
+	return n;
+}
+
+COMPAT53_API void luaL_checkversion(lua_State* L) {
+	(void)L;
+}
+
+COMPAT53_API void luaL_checkstack(lua_State* L, int sp, const char* msg) {
+	if (!lua_checkstack(L, sp + LUA_MINSTACK)) {
+		if (msg != NULL)
+			luaL_error(L, "stack overflow (%s)", msg);
+		else {
+			lua_pushliteral(L, "stack overflow");
+			lua_error(L);
+		}
+	}
+}
+
+COMPAT53_API int luaL_getsubtable(lua_State* L, int i, const char* name) {
+	int abs_i = lua_absindex(L, i);
+	luaL_checkstack(L, 3, "not enough stack slots");
+	lua_pushstring(L, name);
+	lua_gettable(L, abs_i);
+	if (lua_istable(L, -1))
+		return 1;
+	lua_pop(L, 1);
+	lua_newtable(L);
+	lua_pushstring(L, name);
+	lua_pushvalue(L, -2);
+	lua_settable(L, abs_i);
+	return 0;
+}
+
+COMPAT53_API lua_Integer luaL_len(lua_State* L, int i) {
+	lua_Integer res = 0;
+	int isnum = 0;
+	luaL_checkstack(L, 1, "not enough stack slots");
+	lua_len(L, i);
+	res = lua_tointegerx(L, -1, &isnum);
+	lua_pop(L, 1);
+	if (!isnum)
+		luaL_error(L, "object length is not an integer");
+	return res;
+}
+
+COMPAT53_API void luaL_setfuncs(lua_State* L, const luaL_Reg* l, int nup) {
+	luaL_checkstack(L, nup + 1, "too many upvalues");
+	for (; l->name != NULL; l++) { /* fill the table with given functions */
+		int i;
+		lua_pushstring(L, l->name);
+		for (i = 0; i < nup; i++) /* copy upvalues to the top */
+			lua_pushvalue(L, -(nup + 1));
+		lua_pushcclosure(L, l->func, nup); /* closure with those upvalues */
+		lua_settable(L, -(nup + 3));       /* table must be below the upvalues, the name and the closure */
+	}
+	lua_pop(L, nup); /* remove upvalues */
+}
+
+COMPAT53_API void luaL_setmetatable(lua_State* L, const char* tname) {
+	luaL_checkstack(L, 1, "not enough stack slots");
+	luaL_getmetatable(L, tname);
+	lua_setmetatable(L, -2);
+}
+
+COMPAT53_API void* luaL_testudata(lua_State* L, int i, const char* tname) {
+	void* p = lua_touserdata(L, i);
+	luaL_checkstack(L, 2, "not enough stack slots");
+	if (p == NULL || !lua_getmetatable(L, i))
+		return NULL;
+	else {
+		int res = 0;
+		luaL_getmetatable(L, tname);
+		res = lua_rawequal(L, -1, -2);
+		lua_pop(L, 2);
+		if (!res)
+			p = NULL;
+	}
+	return p;
+}
+
+static int compat53_countlevels(lua_State* L) {
+	lua_Debug ar;
+	int li = 1, le = 1;
+	/* find an upper bound */
+	while (lua_getstack(L, le, &ar)) {
+		li = le;
+		le *= 2;
+	}
+	/* do a binary search */
+	while (li < le) {
+		int m = (li + le) / 2;
+		if (lua_getstack(L, m, &ar))
+			li = m + 1;
+		else
+			le = m;
+	}
+	return le - 1;
+}
+
+static int compat53_findfield(lua_State* L, int objidx, int level) {
+	if (level == 0 || !lua_istable(L, -1))
+		return 0;                               /* not found */
+	lua_pushnil(L);                              /* start 'next' loop */
+	while (lua_next(L, -2)) {                    /* for each pair in table */
+		if (lua_type(L, -2) == LUA_TSTRING) {   /* ignore non-string keys */
+			if (lua_rawequal(L, objidx, -1)) { /* found object? */
+				lua_pop(L, 1);                /* remove value (but keep name) */
+				return 1;
+			}
+			else if (compat53_findfield(L, objidx, level - 1)) { /* try recursively */
+				lua_remove(L, -2);                              /* remove table (but keep name) */
+				lua_pushliteral(L, ".");
+				lua_insert(L, -2); /* place '.' between the two names */
+				lua_concat(L, 3);
+				return 1;
+			}
+		}
+		lua_pop(L, 1); /* remove value */
+	}
+	return 0; /* not found */
+}
+
+static int compat53_pushglobalfuncname(lua_State* L, lua_Debug* ar) {
+	int top = lua_gettop(L);
+	lua_getinfo(L, "f", ar); /* push function */
+	lua_pushvalue(L, LUA_GLOBALSINDEX);
+	if (compat53_findfield(L, top + 1, 2)) {
+		lua_copy(L, -1, top + 1); /* move name to proper place */
+		lua_pop(L, 2);            /* remove pushed values */
+		return 1;
+	}
+	else {
+		lua_settop(L, top); /* remove function and global table */
+		return 0;
+	}
+}
+
+static void compat53_pushfuncname(lua_State* L, lua_Debug* ar) {
+	if (*ar->namewhat != '\0') /* is there a name? */
+		lua_pushfstring(L, "function " LUA_QS, ar->name);
+	else if (*ar->what == 'm') /* main? */
+		lua_pushliteral(L, "main chunk");
+	else if (*ar->what == 'C') {
+		if (compat53_pushglobalfuncname(L, ar)) {
+			lua_pushfstring(L, "function " LUA_QS, lua_tostring(L, -1));
+			lua_remove(L, -2); /* remove name */
+		}
+		else
+			lua_pushliteral(L, "?");
+	}
+	else
+		lua_pushfstring(L, "function <%s:%d>", ar->short_src, ar->linedefined);
+}
+
+#define COMPAT53_LEVELS1 12 /* size of the first part of the stack */
+#define COMPAT53_LEVELS2 10 /* size of the second part of the stack */
+
+COMPAT53_API void luaL_traceback(lua_State* L, lua_State* L1, const char* msg, int level) {
+	lua_Debug ar;
+	int top = lua_gettop(L);
+	int numlevels = compat53_countlevels(L1);
+	int mark = (numlevels > COMPAT53_LEVELS1 + COMPAT53_LEVELS2) ? COMPAT53_LEVELS1 : 0;
+	if (msg)
+		lua_pushfstring(L, "%s\n", msg);
+	lua_pushliteral(L, "stack traceback:");
+	while (lua_getstack(L1, level++, &ar)) {
+		if (level == mark) {                       /* too many levels? */
+			lua_pushliteral(L, "\n\t...");        /* add a '...' */
+			level = numlevels - COMPAT53_LEVELS2; /* and skip to last ones */
+		}
+		else {
+			lua_getinfo(L1, "Slnt", &ar);
+			lua_pushfstring(L, "\n\t%s:", ar.short_src);
+			if (ar.currentline > 0)
+				lua_pushfstring(L, "%d:", ar.currentline);
+			lua_pushliteral(L, " in ");
+			compat53_pushfuncname(L, &ar);
+			lua_concat(L, lua_gettop(L) - top);
+		}
+	}
+	lua_concat(L, lua_gettop(L) - top);
+}
+
+COMPAT53_API int luaL_fileresult(lua_State* L, int stat, const char* fname) {
+	const char* serr = NULL;
+	int en = errno; /* calls to Lua API may change this value */
+	char buf[512] = { 0 };
+	if (stat) {
+		lua_pushboolean(L, 1);
+		return 1;
+	}
+	else {
+		lua_pushnil(L);
+		serr = compat53_strerror(en, buf, sizeof(buf));
+		if (fname)
+			lua_pushfstring(L, "%s: %s", fname, serr);
+		else
+			lua_pushstring(L, serr);
+		lua_pushnumber(L, (lua_Number)en);
+		return 3;
+	}
+}
+
+static int compat53_checkmode(lua_State* L, const char* mode, const char* modename, int err) {
+	if (mode && strchr(mode, modename[0]) == NULL) {
+		lua_pushfstring(L, "attempt to load a %s chunk (mode is '%s')", modename, mode);
+		return err;
+	}
+	return LUA_OK;
+}
+
+typedef struct {
+	lua_Reader reader;
+	void* ud;
+	int has_peeked_data;
+	const char* peeked_data;
+	size_t peeked_data_size;
+} compat53_reader_data;
+
+static const char* compat53_reader(lua_State* L, void* ud, size_t* size) {
+	compat53_reader_data* data = (compat53_reader_data*)ud;
+	if (data->has_peeked_data) {
+		data->has_peeked_data = 0;
+		*size = data->peeked_data_size;
+		return data->peeked_data;
+	}
+	else
+		return data->reader(L, data->ud, size);
+}
+
+COMPAT53_API int lua_load(lua_State* L, lua_Reader reader, void* data, const char* source, const char* mode) {
+	int status = LUA_OK;
+	compat53_reader_data compat53_data = { reader, data, 1, 0, 0 };
+	compat53_data.peeked_data = reader(L, data, &(compat53_data.peeked_data_size));
+	if (compat53_data.peeked_data && compat53_data.peeked_data_size && compat53_data.peeked_data[0] == LUA_SIGNATURE[0]) /* binary file? */
+		status = compat53_checkmode(L, mode, "binary", LUA_ERRSYNTAX);
+	else
+		status = compat53_checkmode(L, mode, "text", LUA_ERRSYNTAX);
+	if (status != LUA_OK)
+		return status;
+		/* we need to call the original 5.1 version of lua_load! */
+#undef lua_load
+	return lua_load(L, compat53_reader, &compat53_data, source);
+#define lua_load COMPAT53_CONCAT(COMPAT53_PREFIX, _load_53)
+}
+
+typedef struct {
+	int n;                                    /* number of pre-read characters */
+	FILE* f;                                  /* file being read */
+	char buff[COMPAT53_LUA_FILE_BUFFER_SIZE]; /* area for reading file */
+} compat53_LoadF;
+
+static const char* compat53_getF(lua_State* L, void* ud, size_t* size) {
+	compat53_LoadF* lf = (compat53_LoadF*)ud;
+	(void)L;            /* not used */
+	if (lf->n > 0) {    /* are there pre-read characters to be read? */
+		*size = lf->n; /* return them (chars already in buffer) */
+		lf->n = 0;     /* no more pre-read characters */
+	}
+	else { /* read a block from file */
+		  /* 'fread' can return > 0 *and* set the EOF flag. If next call to
+		  'compat53_getF' called 'fread', it might still wait for user input.
+		  The next check avoids this problem. */
+		if (feof(lf->f))
+			return NULL;
+		*size = fread(lf->buff, 1, sizeof(lf->buff), lf->f); /* read block */
+	}
+	return lf->buff;
+}
+
+static int compat53_errfile(lua_State* L, const char* what, int fnameindex) {
+	char buf[512] = { 0 };
+	const char* serr = compat53_strerror(errno, buf, sizeof(buf));
+	const char* filename = lua_tostring(L, fnameindex) + 1;
+	lua_pushfstring(L, "cannot %s %s: %s", what, filename, serr);
+	lua_remove(L, fnameindex);
+	return LUA_ERRFILE;
+}
+
+static int compat53_skipBOM(compat53_LoadF* lf) {
+	const char* p = "\xEF\xBB\xBF"; /* UTF-8 BOM mark */
+	int c;
+	lf->n = 0;
+	do {
+		c = getc(lf->f);
+		if (c == EOF || c != *(const unsigned char*)p++)
+			return c;
+		lf->buff[lf->n++] = (char)c; /* to be read by the parser */
+	} while (*p != '\0');
+	lf->n = 0;          /* prefix matched; discard it */
+	return getc(lf->f); /* return next character */
+}
+
+/*
+** reads the first character of file 'f' and skips an optional BOM mark
+** in its beginning plus its first line if it starts with '#'. Returns
+** true if it skipped the first line.  In any case, '*cp' has the
+** first "valid" character of the file (after the optional BOM and
+** a first-line comment).
+*/
+static int compat53_skipcomment(compat53_LoadF* lf, int* cp) {
+	int c = *cp = compat53_skipBOM(lf);
+	if (c == '#') { /* first line is a comment (Unix exec. file)? */
+		do {       /* skip first line */
+			c = getc(lf->f);
+		} while (c != EOF && c != '\n');
+		*cp = getc(lf->f); /* skip end-of-line, if present */
+		return 1;          /* there was a comment */
+	}
+	else
+		return 0; /* no comment */
+}
+
+COMPAT53_API int luaL_loadfilex(lua_State* L, const char* filename, const char* mode) {
+	compat53_LoadF lf;
+	int status, readstatus;
+	int c;
+	int fnameindex = lua_gettop(L) + 1; /* index of filename on the stack */
+	if (filename == NULL) {
+		lua_pushliteral(L, "=stdin");
+		lf.f = stdin;
+	}
+	else {
+		lua_pushfstring(L, "@%s", filename);
+#if defined(_MSC_VER)
+		/* This code is here to stop a deprecation error that stops builds
+		 * if a certain macro is defined. While normally not caring would
+		 * be best, some header-only libraries and builds can't afford to
+		 * dictate this to the user. A quick check shows that fopen_s this
+		 * goes back to VS 2005, and _fsopen goes back to VS 2003 .NET,
+		 * possibly even before that so we don't need to do any version
+		 * number checks, since this has been there since forever.  */
+
+		/* TO USER: if you want the behavior of typical fopen_s/fopen,
+		 * which does lock the file on VC++, define the macro used below to 0 */
+#if COMPAT53_FOPEN_NO_LOCK
+		lf.f = _fsopen(filename, "r", _SH_DENYNO); /* do not lock the file in any way */
+		if (lf.f == NULL)
+			return compat53_errfile(L, "open", fnameindex);
+#else  /* use default locking version */
+		if (fopen_s(&lf.f, filename, "r") != 0)
+			return compat53_errfile(L, "open", fnameindex);
+#endif /* Locking vs. No-locking fopen variants */
+#else
+		lf.f = fopen(filename, "r"); /* default stdlib doesn't forcefully lock files here */
+		if (lf.f == NULL)
+			return compat53_errfile(L, "open", fnameindex);
+#endif
+	}
+	if (compat53_skipcomment(&lf, &c))       /* read initial portion */
+		lf.buff[lf.n++] = '\n';             /* add line to correct line numbers */
+	if (c == LUA_SIGNATURE[0] && filename) { /* binary file? */
+#if defined(_MSC_VER)
+		if (freopen_s(&lf.f, filename, "rb", lf.f) != 0)
+			return compat53_errfile(L, "reopen", fnameindex);
+#else
+		lf.f = freopen(filename, "rb", lf.f); /* reopen in binary mode */
+		if (lf.f == NULL)
+			return compat53_errfile(L, "reopen", fnameindex);
+#endif
+		compat53_skipcomment(&lf, &c); /* re-read initial portion */
+	}
+	if (c != EOF)
+		lf.buff[lf.n++] = (char)c; /* 'c' is the first character of the stream */
+	status = lua_load(L, &compat53_getF, &lf, lua_tostring(L, -1), mode);
+	readstatus = ferror(lf.f);
+	if (filename)
+		fclose(lf.f); /* close file (even in case of errors) */
+	if (readstatus) {
+		lua_settop(L, fnameindex); /* ignore results from 'lua_load' */
+		return compat53_errfile(L, "read", fnameindex);
+	}
+	lua_remove(L, fnameindex);
+	return status;
+}
+
+COMPAT53_API int luaL_loadbufferx(lua_State* L, const char* buff, size_t sz, const char* name, const char* mode) {
+	int status = LUA_OK;
+	if (sz > 0 && buff[0] == LUA_SIGNATURE[0]) {
+		status = compat53_checkmode(L, mode, "binary", LUA_ERRSYNTAX);
+	}
+	else {
+		status = compat53_checkmode(L, mode, "text", LUA_ERRSYNTAX);
+	}
+	if (status != LUA_OK)
+		return status;
+	return luaL_loadbuffer(L, buff, sz, name);
+}
+
+#if !defined(l_inspectstat) \
+     && (defined(unix) || defined(__unix) || defined(__unix__) || defined(__TOS_AIX__) || defined(_SYSTYPE_BSD) || (defined(__APPLE__) && defined(__MACH__)))
+/* some form of unix; check feature macros in unistd.h for details */
+#include <unistd.h>
+/* check posix version; the relevant include files and macros probably
+ * were available before 2001, but I'm not sure */
+#if defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L
+#include <sys/wait.h>
+#define l_inspectstat(stat, what)   \
+	if (WIFEXITED(stat)) {         \
+		stat = WEXITSTATUS(stat); \
+	}                              \
+	else if (WIFSIGNALED(stat)) {  \
+		stat = WTERMSIG(stat);    \
+		what = "signal";          \
+	}
+#endif
+#endif
+
+/* provide default (no-op) version */
+#if !defined(l_inspectstat)
+#define l_inspectstat(stat, what) ((void)0)
+#endif
+
+COMPAT53_API int luaL_execresult(lua_State* L, int stat) {
+	const char* what = "exit";
+	if (stat == -1)
+		return luaL_fileresult(L, 0, NULL);
+	else {
+		l_inspectstat(stat, what);
+		if (*what == 'e' && stat == 0)
+			lua_pushboolean(L, 1);
+		else
+			lua_pushnil(L);
+		lua_pushstring(L, what);
+		lua_pushinteger(L, stat);
+		return 3;
+	}
+}
+
+COMPAT53_API void luaL_buffinit(lua_State* L, luaL_Buffer_53* B) {
+	/* make it crash if used via pointer to a 5.1-style luaL_Buffer */
+	B->b.p = NULL;
+	B->b.L = NULL;
+	B->b.lvl = 0;
+	/* reuse the buffer from the 5.1-style luaL_Buffer though! */
+	B->ptr = B->b.buffer;
+	B->capacity = LUAL_BUFFERSIZE;
+	B->nelems = 0;
+	B->L2 = L;
+}
+
+COMPAT53_API char* luaL_prepbuffsize(luaL_Buffer_53* B, size_t s) {
+	if (B->capacity - B->nelems < s) { /* needs to grow */
+		char* newptr = NULL;
+		size_t newcap = B->capacity * 2;
+		if (newcap - B->nelems < s)
+			newcap = B->nelems + s;
+		if (newcap < B->capacity) /* overflow */
+			luaL_error(B->L2, "buffer too large");
+#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM >= 504
+		newptr = (char*)lua_newuserdatauv(B->L2, newcap, 0);
+#else
+		newptr = (char*)lua_newuserdata(B->L2, newcap);
+#endif
+		memcpy(newptr, B->ptr, B->nelems);
+		if (B->ptr != B->b.buffer)
+			lua_replace(B->L2, -2); /* remove old buffer */
+		B->ptr = newptr;
+		B->capacity = newcap;
+	}
+	return B->ptr + B->nelems;
+}
+
+COMPAT53_API void luaL_addlstring(luaL_Buffer_53* B, const char* s, size_t l) {
+	memcpy(luaL_prepbuffsize(B, l), s, l);
+	luaL_addsize(B, l);
+}
+
+COMPAT53_API void luaL_addvalue(luaL_Buffer_53* B) {
+	size_t len = 0;
+	const char* s = lua_tolstring(B->L2, -1, &len);
+	if (!s)
+		luaL_error(B->L2, "cannot convert value to string");
+	if (B->ptr != B->b.buffer)
+		lua_insert(B->L2, -2); /* userdata buffer must be at stack top */
+	luaL_addlstring(B, s, len);
+	lua_remove(B->L2, B->ptr != B->b.buffer ? -2 : -1);
+}
+
+void luaL_pushresult(luaL_Buffer_53* B) {
+	lua_pushlstring(B->L2, B->ptr, B->nelems);
+	if (B->ptr != B->b.buffer)
+		lua_replace(B->L2, -2); /* remove userdata buffer */
+}
+
+#endif /* Lua 5.1 */
+
+/* definitions for Lua 5.1 and Lua 5.2 */
+#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM <= 502
+
+COMPAT53_API int lua_geti(lua_State* L, int index, lua_Integer i) {
+	index = lua_absindex(L, index);
+	lua_pushinteger(L, i);
+	lua_gettable(L, index);
+	return lua_type(L, -1);
+}
+
+COMPAT53_API int lua_isinteger(lua_State* L, int index) {
+	if (lua_type(L, index) == LUA_TNUMBER) {
+		lua_Number n = lua_tonumber(L, index);
+		lua_Integer i = lua_tointeger(L, index);
+		if (i == n)
+			return 1;
+	}
+	return 0;
+}
+
+COMPAT53_API lua_Integer lua_tointegerx(lua_State* L, int i, int* isnum) {
+	int ok = 0;
+	lua_Number n = lua_tonumberx(L, i, &ok);
+	if (ok) {
+		if (n == (lua_Integer)n) {
+			if (isnum)
+				*isnum = 1;
+			return (lua_Integer)n;
+		}
+	}
+	if (isnum)
+		*isnum = 0;
+	return 0;
+}
+
+static void compat53_reverse(lua_State* L, int a, int b) {
+	for (; a < b; ++a, --b) {
+		lua_pushvalue(L, a);
+		lua_pushvalue(L, b);
+		lua_replace(L, a);
+		lua_replace(L, b);
+	}
+}
+
+COMPAT53_API void lua_rotate(lua_State* L, int idx, int n) {
+	int n_elems = 0;
+	idx = lua_absindex(L, idx);
+	n_elems = lua_gettop(L) - idx + 1;
+	if (n < 0)
+		n += n_elems;
+	if (n > 0 && n < n_elems) {
+		luaL_checkstack(L, 2, "not enough stack slots available");
+		n = n_elems - n;
+		compat53_reverse(L, idx, idx + n - 1);
+		compat53_reverse(L, idx + n, idx + n_elems - 1);
+		compat53_reverse(L, idx, idx + n_elems - 1);
+	}
+}
+
+COMPAT53_API void lua_seti(lua_State* L, int index, lua_Integer i) {
+	luaL_checkstack(L, 1, "not enough stack slots available");
+	index = lua_absindex(L, index);
+	lua_pushinteger(L, i);
+	lua_insert(L, -2);
+	lua_settable(L, index);
+}
+
+#if !defined(lua_str2number)
+#define lua_str2number(s, p) strtod((s), (p))
+#endif
+
+COMPAT53_API size_t lua_stringtonumber(lua_State* L, const char* s) {
+	char* endptr;
+	lua_Number n = lua_str2number(s, &endptr);
+	if (endptr != s) {
+		while (*endptr != '\0' && isspace((unsigned char)*endptr))
+			++endptr;
+		if (*endptr == '\0') {
+			lua_pushnumber(L, n);
+			return endptr - s + 1;
+		}
+	}
+	return 0;
+}
+
+COMPAT53_API const char* luaL_tolstring(lua_State* L, int idx, size_t* len) {
+	if (!luaL_callmeta(L, idx, "__tostring")) {
+		int t = lua_type(L, idx), tt = 0;
+		char const* name = NULL;
+		switch (t) {
+		case LUA_TNIL:
+			lua_pushliteral(L, "nil");
+			break;
+		case LUA_TSTRING:
+		case LUA_TNUMBER:
+			lua_pushvalue(L, idx);
+			break;
+		case LUA_TBOOLEAN:
+			if (lua_toboolean(L, idx))
+				lua_pushliteral(L, "true");
+			else
+				lua_pushliteral(L, "false");
+			break;
+		default:
+			tt = luaL_getmetafield(L, idx, "__name");
+			name = (tt == LUA_TSTRING) ? lua_tostring(L, -1) : lua_typename(L, t);
+			lua_pushfstring(L, "%s: %p", name, lua_topointer(L, idx));
+			if (tt != LUA_TNIL)
+				lua_replace(L, -2);
+			break;
+		}
+	}
+	else {
+		if (!lua_isstring(L, -1))
+			luaL_error(L, "'__tostring' must return a string");
+	}
+	return lua_tolstring(L, -1, len);
+}
+
+COMPAT53_API void luaL_requiref(lua_State* L, const char* modname, lua_CFunction openf, int glb) {
+	luaL_checkstack(L, 3, "not enough stack slots available");
+	luaL_getsubtable(L, LUA_REGISTRYINDEX, "_LOADED");
+	if (lua_getfield(L, -1, modname) == LUA_TNIL) {
+		lua_pop(L, 1);
+		lua_pushcfunction(L, openf);
+		lua_pushstring(L, modname);
+		lua_call(L, 1, 1);
+		lua_pushvalue(L, -1);
+		lua_setfield(L, -3, modname);
+	}
+	if (glb) {
+		lua_pushvalue(L, -1);
+		lua_setglobal(L, modname);
+	}
+	lua_replace(L, -2);
+}
+
+#endif /* Lua 5.1 and 5.2 */
+
+#endif /* KEPLER_PROJECT_COMPAT53_C_ */
+
+/*********************************************************************
+ * This file contains parts of Lua 5.2's and Lua 5.3's source code:
+ *
+ * Copyright (C) 1994-2014 Lua.org, PUC-Rio.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *********************************************************************/
+// end of sol/compatibility/compat-5.3.c.h
+
+#endif
+
+#endif /* KEPLER_PROJECT_COMPAT53_H_ */
+
+// end of sol/compatibility/compat-5.3.h
+
+// beginning of sol/compatibility/compat-5.4.h
+
+#ifndef NOT_KEPLER_PROJECT_COMPAT54_H_
+#define NOT_KEPLER_PROJECT_COMPAT54_H_
+
+#if defined(__cplusplus) && !defined(COMPAT53_LUA_CPP)
+extern "C" {
+#endif
+#include <lua.h>
+#include <lauxlib.h>
+#include <lualib.h>
+#if defined(__cplusplus) && !defined(COMPAT53_LUA_CPP)
+}
+#endif
+
+#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM == 504
+
+#if !defined(LUA_ERRGCMM)
+/* So Lua 5.4 actually removes this, which breaks sol2...
+ man, this API is quite unstable...!
+*/
+#  define LUA_ERRGCMM (LUA_ERRERR + 2)
+#endif /* LUA_ERRGCMM define */
+
+#endif // Lua 5.4 only
+
+#endif // NOT_KEPLER_PROJECT_COMPAT54_H_// end of sol/compatibility/compat-5.4.h
+
+#endif
+
+// end of sol/compatibility.hpp
+
+#include <vector>
+#include <cstdint>
+#include <cstddef>
+
+namespace sol {
+
+	template <typename Allocator = std::allocator<std::byte>>
+	class basic_bytecode : private std::vector<std::byte, Allocator> {
+	private:
+		using base_t = std::vector<std::byte, Allocator>;
+
+	public:
+		using typename base_t::allocator_type;
+		using typename base_t::const_iterator;
+		using typename base_t::const_pointer;
+		using typename base_t::const_reference;
+		using typename base_t::const_reverse_iterator;
+		using typename base_t::difference_type;
+		using typename base_t::iterator;
+		using typename base_t::pointer;
+		using typename base_t::reference;
+		using typename base_t::reverse_iterator;
+		using typename base_t::size_type;
+		using typename base_t::value_type;
+
+		using base_t::base_t;
+		using base_t::operator=;
+
+		using base_t::data;
+		using base_t::empty;
+		using base_t::max_size;
+		using base_t::size;
+
+		using base_t::at;
+		using base_t::operator[];
+		using base_t::back;
+		using base_t::front;
+
+		using base_t::begin;
+		using base_t::cbegin;
+		using base_t::cend;
+		using base_t::end;
+
+		using base_t::crbegin;
+		using base_t::crend;
+		using base_t::rbegin;
+		using base_t::rend;
+
+		using base_t::get_allocator;
+		using base_t::swap;
+
+		using base_t::clear;
+		using base_t::emplace;
+		using base_t::emplace_back;
+		using base_t::erase;
+		using base_t::insert;
+		using base_t::pop_back;
+		using base_t::push_back;
+		using base_t::reserve;
+		using base_t::resize;
+		using base_t::shrink_to_fit;
+
+		string_view as_string_view() const {
+			return string_view(reinterpret_cast<const char*>(this->data()), this->size());
+		}
+	};
+
+	template <typename Container>
+	inline int basic_insert_dump_writer(lua_State*, const void* memory, size_t memory_size, void* userdata_pointer) {
+		using storage_t = Container;
+		const std::byte* p_code = static_cast<const std::byte*>(memory);
+		storage_t& bc = *static_cast<storage_t*>(userdata_pointer);
+#if SOL_IS_OFF(SOL_EXCEPTIONS)
+		bc.insert(bc.cend(), p_code, p_code + memory_size);
+#else
+		try {
+			bc.insert(bc.cend(), p_code, p_code + memory_size);
+		}
+		catch (...) {
+			return -1;
+		}
+#endif
+		return 0;
+	}
+
+	using bytecode = basic_bytecode<>;
+
+	constexpr inline auto bytecode_dump_writer = &basic_insert_dump_writer<bytecode>;
+
+} // namespace sol
+
+// end of sol/bytecode.hpp
+
+// beginning of sol/stack.hpp
+
+// beginning of sol/trampoline.hpp
+
+// beginning of sol/types.hpp
+
+// beginning of sol/error.hpp
+
+#include <stdexcept>
+#include <string>
+#include <array>
+
+namespace sol {
+	namespace detail {
+		struct direct_error_tag { };
+		const auto direct_error = direct_error_tag {};
+
+		struct error_result {
+			int results;
+			const char* format_string;
+			std::array<const char*, 4> argument_strings;
+
+			error_result() : results(0), format_string(nullptr) {
+			}
+
+			error_result(int results_) : results(results_), format_string(nullptr) {
+			}
+
+			error_result(const char* format_string_, const char* first_message_) : results(0), format_string(format_string_), argument_strings() {
+				argument_strings[0] = first_message_;
+			}
+		};
+
+		inline int handle_errors(lua_State* L, const error_result& er) {
+			if (er.format_string == nullptr) {
+				return er.results;
+			}
+			return luaL_error(L, er.format_string, er.argument_strings[0], er.argument_strings[1], er.argument_strings[2], er.argument_strings[3]);
+		}
+	} // namespace detail
+
+	class error : public std::runtime_error {
+	private:
+		// Because VC++ is upsetting, most of the time!
+		std::string what_reason;
+
+	public:
+		error(const std::string& str) : error(detail::direct_error, "lua: error: " + str) {
+		}
+		error(std::string&& str) : error(detail::direct_error, "lua: error: " + std::move(str)) {
+		}
+		error(detail::direct_error_tag, const std::string& str) : std::runtime_error(""), what_reason(str) {
+		}
+		error(detail::direct_error_tag, std::string&& str) : std::runtime_error(""), what_reason(std::move(str)) {
+		}
+
+		error(const error& e) = default;
+		error(error&& e) = default;
+		error& operator=(const error& e) = default;
+		error& operator=(error&& e) = default;
+
+		virtual const char* what() const noexcept override {
+			return what_reason.c_str();
+		}
+	};
+
+} // namespace sol
+
+// end of sol/error.hpp
+
+// beginning of sol/optional.hpp
+
+// beginning of sol/in_place.hpp
+
+#include <cstddef>
+#include <utility>
+
+namespace sol {
+
+	using in_place_t = std::in_place_t;
+	constexpr std::in_place_t in_place {};
+	constexpr std::in_place_t in_place_of {};
+
+	template <typename T>
+	using in_place_type_t = std::in_place_type_t<T>;
+	template <typename T>
+	constexpr std::in_place_type_t<T> in_place_type {};
+
+	template <size_t I>
+	using in_place_index_t = std::in_place_index_t<I>;
+	template <size_t I>
+	constexpr in_place_index_t<I> in_place_index {};
+
+} // namespace sol
+
+// end of sol/in_place.hpp
+
+#if SOL_IS_ON(SOL_USE_BOOST)
+#include <boost/optional.hpp>
+#else
+// beginning of sol/optional_implementation.hpp
+
+#define SOL_TL_OPTIONAL_VERSION_MAJOR 0
+#define SOL_TL_OPTIONAL_VERSION_MINOR 5
+
+#include <exception>
+#include <functional>
+#include <new>
+#include <type_traits>
+#include <utility>
+#include <cstdlib>
+#include <optional>
+
+#if (defined(_MSC_VER) && _MSC_VER == 1900)
+#define SOL_TL_OPTIONAL_MSVC2015
+#endif
+
+#if (defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ <= 9 && !defined(__clang__))
+#define SOL_TL_OPTIONAL_GCC49
+#endif
+
+#if (defined(__GNUC__) && __GNUC__ == 5 && __GNUC_MINOR__ <= 4 && !defined(__clang__))
+#define SOL_TL_OPTIONAL_GCC54
+#endif
+
+#if (defined(__GNUC__) && __GNUC__ == 5 && __GNUC_MINOR__ <= 5 && !defined(__clang__))
+#define SOL_TL_OPTIONAL_GCC55
+#endif
+
+#if (defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ <= 9 && !defined(__clang__))
+#define SOL_TL_OPTIONAL_NO_CONSTRR
+
+#define SOL_TL_OPTIONAL_IS_TRIVIALLY_COPY_CONSTRUCTIBLE(T) std::has_trivial_copy_constructor<T>::value
+#define SOL_TL_OPTIONAL_IS_TRIVIALLY_COPY_ASSIGNABLE(T) std::has_trivial_copy_assign<T>::value
+
+#define SOL_TL_OPTIONAL_IS_TRIVIALLY_DESTRUCTIBLE(T) std::is_trivially_destructible<T>::value
+
+#elif (defined(__GNUC__) && __GNUC__ < 8 && !defined(__clang__))
+#ifndef SOL_TL_GCC_LESS_8_TRIVIALLY_COPY_CONSTRUCTIBLE_MUTEX
+#define SOL_TL_GCC_LESS_8_TRIVIALLY_COPY_CONSTRUCTIBLE_MUTEX
+namespace sol { namespace detail {
+	template <class T>
+	struct is_trivially_copy_constructible : std::is_trivially_copy_constructible<T> { };
+#ifdef _GLIBCXX_VECTOR
+	template <class T, class A>
+	struct is_trivially_copy_constructible<std::vector<T, A>> : std::is_trivially_copy_constructible<T> { };
+#endif
+}} // namespace sol::detail
+#endif
+
+#define SOL_TL_OPTIONAL_IS_TRIVIALLY_COPY_CONSTRUCTIBLE(T) sol::detail::is_trivially_copy_constructible<T>::value
+#define SOL_TL_OPTIONAL_IS_TRIVIALLY_COPY_ASSIGNABLE(T) std::is_trivially_copy_assignable<T>::value
+#define SOL_TL_OPTIONAL_IS_TRIVIALLY_DESTRUCTIBLE(T) std::is_trivially_destructible<T>::value
+#else
+#define SOL_TL_OPTIONAL_IS_TRIVIALLY_COPY_CONSTRUCTIBLE(T) std::is_trivially_copy_constructible<T>::value
+#define SOL_TL_OPTIONAL_IS_TRIVIALLY_COPY_ASSIGNABLE(T) std::is_trivially_copy_assignable<T>::value
+#define SOL_TL_OPTIONAL_IS_TRIVIALLY_DESTRUCTIBLE(T) std::is_trivially_destructible<T>::value
+#endif
+
+#if __cplusplus > 201103L
+#define SOL_TL_OPTIONAL_CXX14
+#endif
+
+#if (__cplusplus == 201103L || defined(SOL_TL_OPTIONAL_MSVC2015) || defined(SOL_TL_OPTIONAL_GCC49))
+#define SOL_TL_OPTIONAL_11_CONSTEXPR
+#else
+   /// \exclude
+#define SOL_TL_OPTIONAL_11_CONSTEXPR constexpr
+#endif
+
+namespace sol {
+#ifndef SOL_TL_MONOSTATE_INPLACE_MUTEX
+#define SOL_TL_MONOSTATE_INPLACE_MUTEX
+	/// \brief Used to represent an optional with no data; essentially a bool
+	class monostate { };
+#endif
+
+	template <class T>
+	class optional;
+
+	/// \exclude
+	namespace detail {
+#ifndef SOL_TL_TRAITS_MUTEX
+#define SOL_TL_TRAITS_MUTEX
+		// C++14-style aliases for brevity
+		template <class T>
+		using remove_const_t = typename std::remove_const<T>::type;
+		template <class T>
+		using remove_reference_t = typename std::remove_reference<T>::type;
+		template <class T>
+		using decay_t = typename std::decay<T>::type;
+		template <bool E, class T = void>
+		using enable_if_t = typename std::enable_if<E, T>::type;
+		template <bool B, class T, class F>
+		using conditional_t = typename std::conditional<B, T, F>::type;
+
+		// std::conjunction from C++17
+		template <class...>
+		struct conjunction : std::true_type { };
+		template <class B>
+		struct conjunction<B> : B { };
+		template <class B, class... Bs>
+		struct conjunction<B, Bs...> : std::conditional<bool(B::value), conjunction<Bs...>, B>::type { };
+
+#if defined(_LIBCPP_VERSION) && __cplusplus == 201103L
+#define SOL_TL_OPTIONAL_LIBCXX_MEM_FN_WORKAROUND
+#endif
+
+#ifdef SOL_TL_OPTIONAL_LIBCXX_MEM_FN_WORKAROUND
+		template <class T>
+		struct is_pointer_to_non_const_member_func : std::false_type { };
+		template <class T, class Ret, class... Args>
+		struct is_pointer_to_non_const_member_func<Ret (T::*)(Args...)> : std::true_type { };
+		template <class T, class Ret, class... Args>
+		struct is_pointer_to_non_const_member_func<Ret (T::*)(Args...)&> : std::true_type { };
+		template <class T, class Ret, class... Args>
+		struct is_pointer_to_non_const_member_func<Ret (T::*)(Args...) &&> : std::true_type { };
+		template <class T, class Ret, class... Args>
+		struct is_pointer_to_non_const_member_func<Ret (T::*)(Args...) volatile> : std::true_type { };
+		template <class T, class Ret, class... Args>
+		struct is_pointer_to_non_const_member_func<Ret (T::*)(Args...) volatile&> : std::true_type { };
+		template <class T, class Ret, class... Args>
+		struct is_pointer_to_non_const_member_func<Ret (T::*)(Args...) volatile&&> : std::true_type { };
+
+		template <class T>
+		struct is_const_or_const_ref : std::false_type { };
+		template <class T>
+		struct is_const_or_const_ref<T const&> : std::true_type { };
+		template <class T>
+		struct is_const_or_const_ref<T const> : std::true_type { };
+#endif
+
+		// std::invoke from C++17
+		// https://stackoverflow.com/questions/38288042/c11-14-invoke-workaround
+		template <typename Fn, typename... Args,
+#ifdef SOL_TL_OPTIONAL_LIBCXX_MEM_FN_WORKAROUND
+		     typename = enable_if_t<!(is_pointer_to_non_const_member_func<Fn>::value && is_const_or_const_ref<Args...>::value)>,
+#endif
+		     typename = enable_if_t<std::is_member_pointer<decay_t<Fn>>::value>, int = 0>
+		constexpr auto invoke(Fn&& f, Args&&... args) noexcept(noexcept(std::mem_fn(f)(std::forward<Args>(args)...)))
+		     -> decltype(std::mem_fn(f)(std::forward<Args>(args)...)) {
+			return std::mem_fn(f)(std::forward<Args>(args)...);
+		}
+
+		template <typename Fn, typename... Args, typename = enable_if_t<!std::is_member_pointer<decay_t<Fn>>::value>>
+		constexpr auto invoke(Fn&& f, Args&&... args) noexcept(noexcept(std::forward<Fn>(f)(std::forward<Args>(args)...)))
+		     -> decltype(std::forward<Fn>(f)(std::forward<Args>(args)...)) {
+			return std::forward<Fn>(f)(std::forward<Args>(args)...);
+		}
+
+		// std::invoke_result from C++17
+		template <class F, class, class... Us>
+		struct invoke_result_impl;
+
+		template <class F, class... Us>
+		struct invoke_result_impl<F, decltype(detail::invoke(std::declval<F>(), std::declval<Us>()...), void()), Us...> {
+			using type = decltype(detail::invoke(std::declval<F>(), std::declval<Us>()...));
+		};
+
+		template <class F, class... Us>
+		using invoke_result = invoke_result_impl<F, void, Us...>;
+
+		template <class F, class... Us>
+		using invoke_result_t = typename invoke_result<F, Us...>::type;
+#endif
+
+		// std::void_t from C++17
+		template <class...>
+		struct voider {
+			using type = void;
+		};
+		template <class... Ts>
+		using void_t = typename voider<Ts...>::type;
+
+		// Trait for checking if a type is a sol::optional
+		template <class T>
+		struct is_optional_impl : std::false_type { };
+		template <class T>
+		struct is_optional_impl<optional<T>> : std::true_type { };
+		template <class T>
+		using is_optional = is_optional_impl<decay_t<T>>;
+
+		// Change void to sol::monostate
+		template <class U>
+		using fixup_void = conditional_t<std::is_void<U>::value, monostate, U>;
+
+		template <class F, class U, class = invoke_result_t<F, U>>
+		using get_map_return = optional<fixup_void<invoke_result_t<F, U>>>;
+
+		// Check if invoking F for some Us returns void
+		template <class F, class = void, class... U>
+		struct returns_void_impl;
+		template <class F, class... U>
+		struct returns_void_impl<F, void_t<invoke_result_t<F, U...>>, U...> : std::is_void<invoke_result_t<F, U...>> { };
+		template <class F, class... U>
+		using returns_void = returns_void_impl<F, void, U...>;
+
+		template <class T, class... U>
+		using enable_if_ret_void = enable_if_t<returns_void<T&&, U...>::value>;
+
+		template <class T, class... U>
+		using disable_if_ret_void = enable_if_t<!returns_void<T&&, U...>::value>;
+
+		template <class T, class U>
+		using enable_forward_value = detail::enable_if_t<std::is_constructible<T, U&&>::value && !std::is_same<detail::decay_t<U>, in_place_t>::value
+		     && !std::is_same<optional<T>, detail::decay_t<U>>::value>;
+
+		template <class T, class U, class Other>
+		using enable_from_other = detail::enable_if_t<std::is_constructible<T, Other>::value && !std::is_constructible<T, optional<U>&>::value
+		     && !std::is_constructible<T, optional<U>&&>::value && !std::is_constructible<T, const optional<U>&>::value
+		     && !std::is_constructible<T, const optional<U>&&>::value && !std::is_convertible<optional<U>&, T>::value
+		     && !std::is_convertible<optional<U>&&, T>::value && !std::is_convertible<const optional<U>&, T>::value
+		     && !std::is_convertible<const optional<U>&&, T>::value>;
+
+		template <class T, class U>
+		using enable_assign_forward = detail::enable_if_t<!std::is_same<optional<T>, detail::decay_t<U>>::value
+		     && !detail::conjunction<std::is_scalar<T>, std::is_same<T, detail::decay_t<U>>>::value && std::is_constructible<T, U>::value
+		     && std::is_assignable<T&, U>::value>;
+
+		template <class T, class U, class Other>
+		using enable_assign_from_other = detail::enable_if_t<std::is_constructible<T, Other>::value && std::is_assignable<T&, Other>::value
+		     && !std::is_constructible<T, optional<U>&>::value && !std::is_constructible<T, optional<U>&&>::value
+		     && !std::is_constructible<T, const optional<U>&>::value && !std::is_constructible<T, const optional<U>&&>::value
+		     && !std::is_convertible<optional<U>&, T>::value && !std::is_convertible<optional<U>&&, T>::value
+		     && !std::is_convertible<const optional<U>&, T>::value && !std::is_convertible<const optional<U>&&, T>::value
+		     && !std::is_assignable<T&, optional<U>&>::value && !std::is_assignable<T&, optional<U>&&>::value
+		     && !std::is_assignable<T&, const optional<U>&>::value && !std::is_assignable<T&, const optional<U>&&>::value>;
+
+#ifdef _MSC_VER
+		// TODO make a version which works with MSVC
+		template <class T, class U = T>
+		struct is_swappable : std::true_type { };
+
+		template <class T, class U = T>
+		struct is_nothrow_swappable : std::true_type { };
+#else
+		// https://stackoverflow.com/questions/26744589/what-is-a-proper-way-to-implement-is-swappable-to-test-for-the-swappable-concept
+		namespace swap_adl_tests {
+			// if swap ADL finds this then it would call std::swap otherwise (same
+			// signature)
+			struct tag { };
+
+			template <class T>
+			tag swap(T&, T&);
+			template <class T, std::size_t N>
+			tag swap(T (&a)[N], T (&b)[N]);
+
+			// helper functions to test if an unqualified swap is possible, and if it
+			// becomes std::swap
+			template <class, class>
+			std::false_type can_swap(...) noexcept(false);
+			template <class T, class U, class = decltype(swap(std::declval<T&>(), std::declval<U&>()))>
+			std::true_type can_swap(int) noexcept(noexcept(swap(std::declval<T&>(), std::declval<U&>())));
+
+			template <class, class>
+			std::false_type uses_std(...);
+			template <class T, class U>
+			std::is_same<decltype(swap(std::declval<T&>(), std::declval<U&>())), tag> uses_std(int);
+
+			template <class T>
+			struct is_std_swap_noexcept
+			: std::integral_constant<bool, std::is_nothrow_move_constructible<T>::value && std::is_nothrow_move_assignable<T>::value> { };
+
+			template <class T, std::size_t N>
+			struct is_std_swap_noexcept<T[N]> : is_std_swap_noexcept<T> { };
+
+			template <class T, class U>
+			struct is_adl_swap_noexcept : std::integral_constant<bool, noexcept(can_swap<T, U>(0))> { };
+		} // namespace swap_adl_tests
+
+		template <class T, class U = T>
+		struct is_swappable : std::integral_constant<bool,
+		                           decltype(detail::swap_adl_tests::can_swap<T, U>(0))::value
+		                                && (!decltype(detail::swap_adl_tests::uses_std<T, U>(0))::value
+		                                     || (std::is_move_assignable<T>::value && std::is_move_constructible<T>::value))> { };
+
+		template <class T, std::size_t N>
+		struct is_swappable<T[N], T[N]> : std::integral_constant<bool,
+		                                       decltype(detail::swap_adl_tests::can_swap<T[N], T[N]>(0))::value
+		                                            && (!decltype(detail::swap_adl_tests::uses_std<T[N], T[N]>(0))::value || is_swappable<T, T>::value)> { };
+
+		template <class T, class U = T>
+		struct is_nothrow_swappable
+		: std::integral_constant<bool,
+		       is_swappable<T, U>::value
+		            && ((decltype(detail::swap_adl_tests::uses_std<T, U>(0))::value&& detail::swap_adl_tests::is_std_swap_noexcept<T>::value)
+		                 || (!decltype(detail::swap_adl_tests::uses_std<T, U>(0))::value&& detail::swap_adl_tests::is_adl_swap_noexcept<T, U>::value))> { };
+#endif
+
+		// The storage base manages the actual storage, and correctly propagates
+		// trivial destroyion from T. This case is for when T is not trivially
+		// destructible.
+		template <class T, bool = ::std::is_trivially_destructible<T>::value>
+		struct optional_storage_base {
+			SOL_TL_OPTIONAL_11_CONSTEXPR optional_storage_base() noexcept : m_dummy(), m_has_value(false) {
+			}
+
+			template <class... U>
+			SOL_TL_OPTIONAL_11_CONSTEXPR optional_storage_base(in_place_t, U&&... u) : m_value(std::forward<U>(u)...), m_has_value(true) {
+			}
+
+			~optional_storage_base() {
+				if (m_has_value) {
+					m_value.~T();
+					m_has_value = false;
+				}
+			}
+
+			struct dummy { };
+			union {
+				dummy m_dummy;
+				T m_value;
+			};
+
+			bool m_has_value;
+		};
+
+		// This case is for when T is trivially destructible.
+		template <class T>
+		struct optional_storage_base<T, true> {
+			SOL_TL_OPTIONAL_11_CONSTEXPR optional_storage_base() noexcept : m_dummy(), m_has_value(false) {
+			}
+
+			template <class... U>
+			SOL_TL_OPTIONAL_11_CONSTEXPR optional_storage_base(in_place_t, U&&... u) : m_value(std::forward<U>(u)...), m_has_value(true) {
+			}
+
+			// No destructor, so this class is trivially destructible
+
+			struct dummy { };
+			union {
+				dummy m_dummy;
+				T m_value;
+			};
+
+			bool m_has_value = false;
+		};
+
+		// This base class provides some handy member functions which can be used in
+		// further derived classes
+		template <class T>
+		struct optional_operations_base : optional_storage_base<T> {
+			using optional_storage_base<T>::optional_storage_base;
+
+			void hard_reset() noexcept {
+				get().~T();
+				this->m_has_value = false;
+			}
+
+			template <class... Args>
+			void construct(Args&&... args) noexcept {
+				new (std::addressof(this->m_value)) T(std::forward<Args>(args)...);
+				this->m_has_value = true;
+			}
+
+			template <class Opt>
+			void assign(Opt&& rhs) {
+				if (this->has_value()) {
+					if (rhs.has_value()) {
+						this->m_value = std::forward<Opt>(rhs).get();
+					}
+					else {
+						this->m_value.~T();
+						this->m_has_value = false;
+					}
+				}
+
+				else if (rhs.has_value()) {
+					construct(std::forward<Opt>(rhs).get());
+				}
+			}
+
+			bool has_value() const {
+				return this->m_has_value;
+			}
+
+			SOL_TL_OPTIONAL_11_CONSTEXPR T& get() & {
+				return this->m_value;
+			}
+			SOL_TL_OPTIONAL_11_CONSTEXPR const T& get() const& {
+				return this->m_value;
+			}
+			SOL_TL_OPTIONAL_11_CONSTEXPR T&& get() && {
+				return std::move(this->m_value);
+			}
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+			constexpr const T&& get() const&& {
+				return std::move(this->m_value);
+			}
+#endif
+		};
+
+		// This class manages conditionally having a trivial copy constructor
+		// This specialization is for when T is trivially copy constructible
+		template <class T, bool = SOL_TL_OPTIONAL_IS_TRIVIALLY_COPY_CONSTRUCTIBLE(T)>
+		struct optional_copy_base : optional_operations_base<T> {
+			using optional_operations_base<T>::optional_operations_base;
+		};
+
+		// This specialization is for when T is not trivially copy constructible
+		template <class T>
+		struct optional_copy_base<T, false> : optional_operations_base<T> {
+			using base_t = optional_operations_base<T>;
+
+			using base_t::base_t;
+
+			optional_copy_base() = default;
+			optional_copy_base(const optional_copy_base& rhs) : base_t() {
+				if (rhs.has_value()) {
+					this->construct(rhs.get());
+				}
+				else {
+					this->m_has_value = false;
+				}
+			}
+
+			optional_copy_base(optional_copy_base&& rhs) = default;
+			optional_copy_base& operator=(const optional_copy_base& rhs) = default;
+			optional_copy_base& operator=(optional_copy_base&& rhs) = default;
+		};
+
+#ifndef SOL_TL_OPTIONAL_GCC49
+		template <class T, bool = std::is_trivially_move_constructible<T>::value>
+		struct optional_move_base : optional_copy_base<T> {
+			using optional_copy_base<T>::optional_copy_base;
+		};
+#else
+		template <class T, bool = false>
+		struct optional_move_base;
+#endif
+		template <class T>
+		struct optional_move_base<T, false> : optional_copy_base<T> {
+			using optional_copy_base<T>::optional_copy_base;
+
+			optional_move_base() = default;
+			optional_move_base(const optional_move_base& rhs) = default;
+
+			optional_move_base(optional_move_base&& rhs) noexcept(std::is_nothrow_move_constructible<T>::value) {
+				if (rhs.has_value()) {
+					this->construct(std::move(rhs.get()));
+				}
+				else {
+					this->m_has_value = false;
+				}
+			}
+			optional_move_base& operator=(const optional_move_base& rhs) = default;
+			optional_move_base& operator=(optional_move_base&& rhs) = default;
+		};
+
+		// This class manages conditionally having a trivial copy assignment operator
+		template <class T,
+		     bool = SOL_TL_OPTIONAL_IS_TRIVIALLY_COPY_ASSIGNABLE(T) && SOL_TL_OPTIONAL_IS_TRIVIALLY_COPY_CONSTRUCTIBLE(T)
+		          && SOL_TL_OPTIONAL_IS_TRIVIALLY_DESTRUCTIBLE(T)>
+		struct optional_copy_assign_base : optional_move_base<T> {
+			using optional_move_base<T>::optional_move_base;
+		};
+
+		template <class T>
+		struct optional_copy_assign_base<T, false> : optional_move_base<T> {
+			using optional_move_base<T>::optional_move_base;
+
+			optional_copy_assign_base() = default;
+			optional_copy_assign_base(const optional_copy_assign_base& rhs) = default;
+
+			optional_copy_assign_base(optional_copy_assign_base&& rhs) = default;
+			optional_copy_assign_base& operator=(const optional_copy_assign_base& rhs) {
+				this->assign(rhs);
+				return *this;
+			}
+			optional_copy_assign_base& operator=(optional_copy_assign_base&& rhs) = default;
+		};
+
+#ifndef SOL_TL_OPTIONAL_GCC49
+		template <class T,
+		     bool = std::is_trivially_destructible<T>::value&& std::is_trivially_move_constructible<T>::value&& std::is_trivially_move_assignable<T>::value>
+		struct optional_move_assign_base : optional_copy_assign_base<T> {
+			using optional_copy_assign_base<T>::optional_copy_assign_base;
+		};
+#else
+		template <class T, bool = false>
+		struct optional_move_assign_base;
+#endif
+
+		template <class T>
+		struct optional_move_assign_base<T, false> : optional_copy_assign_base<T> {
+			using optional_copy_assign_base<T>::optional_copy_assign_base;
+
+			optional_move_assign_base() = default;
+			optional_move_assign_base(const optional_move_assign_base& rhs) = default;
+
+			optional_move_assign_base(optional_move_assign_base&& rhs) = default;
+
+			optional_move_assign_base& operator=(const optional_move_assign_base& rhs) = default;
+
+			optional_move_assign_base& operator=(optional_move_assign_base&& rhs) noexcept(
+			     std::is_nothrow_move_constructible<T>::value&& std::is_nothrow_move_assignable<T>::value) {
+				this->assign(std::move(rhs));
+				return *this;
+			}
+		};
+
+		// optional_delete_ctor_base will conditionally delete copy and move
+		// constructors depending on whether T is copy/move constructible
+		template <class T, bool EnableCopy = std::is_copy_constructible<T>::value, bool EnableMove = std::is_move_constructible<T>::value>
+		struct optional_delete_ctor_base {
+			optional_delete_ctor_base() = default;
+			optional_delete_ctor_base(const optional_delete_ctor_base&) = default;
+			optional_delete_ctor_base(optional_delete_ctor_base&&) noexcept = default;
+			optional_delete_ctor_base& operator=(const optional_delete_ctor_base&) = default;
+			optional_delete_ctor_base& operator=(optional_delete_ctor_base&&) noexcept = default;
+		};
+
+		template <class T>
+		struct optional_delete_ctor_base<T, true, false> {
+			optional_delete_ctor_base() = default;
+			optional_delete_ctor_base(const optional_delete_ctor_base&) = default;
+			optional_delete_ctor_base(optional_delete_ctor_base&&) noexcept = delete;
+			optional_delete_ctor_base& operator=(const optional_delete_ctor_base&) = default;
+			optional_delete_ctor_base& operator=(optional_delete_ctor_base&&) noexcept = default;
+		};
+
+		template <class T>
+		struct optional_delete_ctor_base<T, false, true> {
+			optional_delete_ctor_base() = default;
+			optional_delete_ctor_base(const optional_delete_ctor_base&) = delete;
+			optional_delete_ctor_base(optional_delete_ctor_base&&) noexcept = default;
+			optional_delete_ctor_base& operator=(const optional_delete_ctor_base&) = default;
+			optional_delete_ctor_base& operator=(optional_delete_ctor_base&&) noexcept = default;
+		};
+
+		template <class T>
+		struct optional_delete_ctor_base<T, false, false> {
+			optional_delete_ctor_base() = default;
+			optional_delete_ctor_base(const optional_delete_ctor_base&) = delete;
+			optional_delete_ctor_base(optional_delete_ctor_base&&) noexcept = delete;
+			optional_delete_ctor_base& operator=(const optional_delete_ctor_base&) = default;
+			optional_delete_ctor_base& operator=(optional_delete_ctor_base&&) noexcept = default;
+		};
+
+		// optional_delete_assign_base will conditionally delete copy and move
+		// constructors depending on whether T is copy/move constructible + assignable
+		template <class T, bool EnableCopy = (std::is_copy_constructible<T>::value && std::is_copy_assignable<T>::value),
+		     bool EnableMove = (std::is_move_constructible<T>::value && std::is_move_assignable<T>::value)>
+		struct optional_delete_assign_base {
+			optional_delete_assign_base() = default;
+			optional_delete_assign_base(const optional_delete_assign_base&) = default;
+			optional_delete_assign_base(optional_delete_assign_base&&) noexcept = default;
+			optional_delete_assign_base& operator=(const optional_delete_assign_base&) = default;
+			optional_delete_assign_base& operator=(optional_delete_assign_base&&) noexcept = default;
+		};
+
+		template <class T>
+		struct optional_delete_assign_base<T, true, false> {
+			optional_delete_assign_base() = default;
+			optional_delete_assign_base(const optional_delete_assign_base&) = default;
+			optional_delete_assign_base(optional_delete_assign_base&&) noexcept = default;
+			optional_delete_assign_base& operator=(const optional_delete_assign_base&) = default;
+			optional_delete_assign_base& operator=(optional_delete_assign_base&&) noexcept = delete;
+		};
+
+		template <class T>
+		struct optional_delete_assign_base<T, false, true> {
+			optional_delete_assign_base() = default;
+			optional_delete_assign_base(const optional_delete_assign_base&) = default;
+			optional_delete_assign_base(optional_delete_assign_base&&) noexcept = default;
+			optional_delete_assign_base& operator=(const optional_delete_assign_base&) = delete;
+			optional_delete_assign_base& operator=(optional_delete_assign_base&&) noexcept = default;
+		};
+
+		template <class T>
+		struct optional_delete_assign_base<T, false, false> {
+			optional_delete_assign_base() = default;
+			optional_delete_assign_base(const optional_delete_assign_base&) = default;
+			optional_delete_assign_base(optional_delete_assign_base&&) noexcept = default;
+			optional_delete_assign_base& operator=(const optional_delete_assign_base&) = delete;
+			optional_delete_assign_base& operator=(optional_delete_assign_base&&) noexcept = delete;
+		};
+
+	} // namespace detail
+
+	/// \brief A tag type to represent an empty optional
+	using nullopt_t = std::nullopt_t;
+
+	/// \brief Represents an empty optional
+	/// \synopsis static constexpr nullopt_t nullopt;
+	///
+	/// *Examples*:
+	/// ```
+	/// sol::optional<int> a = sol::nullopt;
+	/// void foo (sol::optional<int>);
+	/// foo(sol::nullopt); //pass an empty optional
+	/// ```
+	using std::nullopt;
+
+	/// @brief An exception for when an optional is accessed through specific methods while it is not engaged.
+	class bad_optional_access : public std::exception {
+	public:
+		/// @brief Default-constructs an optional exception.
+		bad_optional_access() = default;
+		/// @brief Returns a pointer to a null-terminated string containing the reason for the exception.
+		const char* what() const noexcept override {
+			return "Optional has no value";
+		}
+	};
+
+	/// An optional object is an object that contains the storage for another
+	/// object and manages the lifetime of this contained object, if any. The
+	/// contained object may be initialized after the optional object has been
+	/// initialized, and may be destroyed before the optional object has been
+	/// destroyed. The initialization state of the contained object is tracked by
+	/// the optional object.
+	template <class T>
+	class optional : private detail::optional_move_assign_base<T>,
+	                 private detail::optional_delete_ctor_base<T>,
+	                 private detail::optional_delete_assign_base<T> {
+		using base = detail::optional_move_assign_base<T>;
+
+		static_assert(!std::is_same<T, in_place_t>::value, "instantiation of optional with in_place_t is ill-formed");
+		static_assert(!std::is_same<detail::decay_t<T>, nullopt_t>::value, "instantiation of optional with nullopt_t is ill-formed");
+
+	public:
+#if defined(SOL_TL_OPTIONAL_CXX14) && !defined(SOL_TL_OPTIONAL_GCC49) && !defined(SOL_TL_OPTIONAL_GCC54) && !defined(SOL_TL_OPTIONAL_GCC55)
+		/// \group and_then
+		/// Carries out some operation which returns an optional on the stored
+		/// object if there is one. \requires `std::invoke(std::forward<F>(f),
+		/// value())` returns a `std::optional<U>` for some `U`. \returns Let `U` be
+		/// the result of `std::invoke(std::forward<F>(f), value())`. Returns a
+		/// `std::optional<U>`. The return value is empty if `*this` is empty,
+		/// otherwise the return value of `std::invoke(std::forward<F>(f), value())`
+		/// is returned.
+		/// \group and_then
+		/// \synopsis template <class F> \n constexpr auto and_then(F &&f) &;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR auto and_then(F&& f) & {
+			using result = detail::invoke_result_t<F, T&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+		}
+
+		/// \group and_then
+		/// \synopsis template <class F> \n constexpr auto and_then(F &&f) &&;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR auto and_then(F&& f) && {
+			using result = detail::invoke_result_t<F, T&&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : result(nullopt);
+		}
+
+		/// \group and_then
+		/// \synopsis template <class F> \n constexpr auto and_then(F &&f) const &;
+		template <class F>
+		constexpr auto and_then(F&& f) const& {
+			using result = detail::invoke_result_t<F, const T&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group and_then
+		/// \synopsis template <class F> \n constexpr auto and_then(F &&f) const &&;
+		template <class F>
+		constexpr auto and_then(F&& f) const&& {
+			using result = detail::invoke_result_t<F, const T&&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : result(nullopt);
+		}
+#endif
+#else
+		/// \group and_then
+		/// Carries out some operation which returns an optional on the stored
+		/// object if there is one. \requires `std::invoke(std::forward<F>(f),
+		/// value())` returns a `std::optional<U>` for some `U`.
+		/// \returns Let `U` be the result of `std::invoke(std::forward<F>(f),
+		/// value())`. Returns a `std::optional<U>`. The return value is empty if
+		/// `*this` is empty, otherwise the return value of
+		/// `std::invoke(std::forward<F>(f), value())` is returned.
+		/// \group and_then
+		/// \synopsis template <class F> \n constexpr auto and_then(F &&f) &;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR detail::invoke_result_t<F, T&> and_then(F&& f) & {
+			using result = detail::invoke_result_t<F, T&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+		}
+
+		/// \group and_then
+		/// \synopsis template <class F> \n constexpr auto and_then(F &&f) &&;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR detail::invoke_result_t<F, T&&> and_then(F&& f) && {
+			using result = detail::invoke_result_t<F, T&&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : result(nullopt);
+		}
+
+		/// \group and_then
+		/// \synopsis template <class F> \n constexpr auto and_then(F &&f) const &;
+		template <class F>
+		constexpr detail::invoke_result_t<F, const T&> and_then(F&& f) const& {
+			using result = detail::invoke_result_t<F, const T&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group and_then
+		/// \synopsis template <class F> \n constexpr auto and_then(F &&f) const &&;
+		template <class F>
+		constexpr detail::invoke_result_t<F, const T&&> and_then(F&& f) const&& {
+			using result = detail::invoke_result_t<F, const T&&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : result(nullopt);
+		}
+#endif
+#endif
+
+#if defined(SOL_TL_OPTIONAL_CXX14) && !defined(SOL_TL_OPTIONAL_GCC49) && !defined(SOL_TL_OPTIONAL_GCC54) && !defined(SOL_TL_OPTIONAL_GCC55)
+		/// \brief Carries out some operation on the stored object if there is one.
+		/// \returns Let `U` be the result of `std::invoke(std::forward<F>(f),
+		/// value())`. Returns a `std::optional<U>`. The return value is empty if
+		/// `*this` is empty, otherwise an `optional<U>` is constructed from the
+		/// return value of `std::invoke(std::forward<F>(f), value())` and is
+		/// returned.
+		///
+		/// \group map
+		/// \synopsis template <class F> constexpr auto map(F &&f) &;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR auto map(F&& f) & {
+			return optional_map_impl(*this, std::forward<F>(f));
+		}
+
+		/// \group map
+		/// \synopsis template <class F> constexpr auto map(F &&f) &&;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR auto map(F&& f) && {
+			return optional_map_impl(std::move(*this), std::forward<F>(f));
+		}
+
+		/// \group map
+		/// \synopsis template <class F> constexpr auto map(F &&f) const&;
+		template <class F>
+		constexpr auto map(F&& f) const& {
+			return optional_map_impl(*this, std::forward<F>(f));
+		}
+
+		/// \group map
+		/// \synopsis template <class F> constexpr auto map(F &&f) const&&;
+		template <class F>
+		constexpr auto map(F&& f) const&& {
+			return optional_map_impl(std::move(*this), std::forward<F>(f));
+		}
+#else
+		/// \brief Carries out some operation on the stored object if there is one.
+		/// \returns Let `U` be the result of `std::invoke(std::forward<F>(f),
+		/// value())`. Returns a `std::optional<U>`. The return value is empty if
+		/// `*this` is empty, otherwise an `optional<U>` is constructed from the
+		/// return value of `std::invoke(std::forward<F>(f), value())` and is
+		/// returned.
+		///
+		/// \group map
+		/// \synopsis template <class F> auto map(F &&f) &;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR decltype(optional_map_impl(std::declval<optional&>(), std::declval<F&&>())) map(F&& f) & {
+			return optional_map_impl(*this, std::forward<F>(f));
+		}
+
+		/// \group map
+		/// \synopsis template <class F> auto map(F &&f) &&;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR decltype(optional_map_impl(std::declval<optional&&>(), std::declval<F&&>())) map(F&& f) && {
+			return optional_map_impl(std::move(*this), std::forward<F>(f));
+		}
+
+		/// \group map
+		/// \synopsis template <class F> auto map(F &&f) const&;
+		template <class F>
+		constexpr decltype(optional_map_impl(std::declval<const optional&>(), std::declval<F&&>())) map(F&& f) const& {
+			return optional_map_impl(*this, std::forward<F>(f));
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group map
+		/// \synopsis template <class F> auto map(F &&f) const&&;
+		template <class F>
+		constexpr decltype(optional_map_impl(std::declval<const optional&&>(), std::declval<F&&>())) map(F&& f) const&& {
+			return optional_map_impl(std::move(*this), std::forward<F>(f));
+		}
+#endif
+#endif
+
+		/// \brief Calls `f` if the optional is empty
+		/// \requires `std::invoke_result_t<F>` must be void or convertible to
+		/// `optional<T>`.
+		/// \effects If `*this` has a value, returns `*this`.
+		/// Otherwise, if `f` returns `void`, calls `std::forward<F>(f)` and returns
+		/// `std::nullopt`. Otherwise, returns `std::forward<F>(f)()`.
+		///
+		/// \group or_else
+		/// \synopsis template <class F> optional<T> or_else (F &&f) &;
+		template <class F, detail::enable_if_ret_void<F>* = nullptr>
+		optional<T> SOL_TL_OPTIONAL_11_CONSTEXPR or_else(F&& f) & {
+			if (has_value())
+				return *this;
+
+			std::forward<F>(f)();
+			return nullopt;
+		}
+
+		/// \exclude
+		template <class F, detail::disable_if_ret_void<F>* = nullptr>
+		optional<T> SOL_TL_OPTIONAL_11_CONSTEXPR or_else(F&& f) & {
+			return has_value() ? *this : std::forward<F>(f)();
+		}
+
+		/// \group or_else
+		/// \synopsis template <class F> optional<T> or_else (F &&f) &&;
+		template <class F, detail::enable_if_ret_void<F>* = nullptr>
+		optional<T> or_else(F&& f) && {
+			if (has_value())
+				return std::move(*this);
+
+			std::forward<F>(f)();
+			return nullopt;
+		}
+
+		/// \exclude
+		template <class F, detail::disable_if_ret_void<F>* = nullptr>
+		optional<T> SOL_TL_OPTIONAL_11_CONSTEXPR or_else(F&& f) && {
+			return has_value() ? std::move(*this) : std::forward<F>(f)();
+		}
+
+		/// \group or_else
+		/// \synopsis template <class F> optional<T> or_else (F &&f) const &;
+		template <class F, detail::enable_if_ret_void<F>* = nullptr>
+		optional<T> or_else(F&& f) const& {
+			if (has_value())
+				return *this;
+
+			std::forward<F>(f)();
+			return nullopt;
+		}
+
+		/// \exclude
+		template <class F, detail::disable_if_ret_void<F>* = nullptr>
+		optional<T> SOL_TL_OPTIONAL_11_CONSTEXPR or_else(F&& f) const& {
+			return has_value() ? *this : std::forward<F>(f)();
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \exclude
+		template <class F, detail::enable_if_ret_void<F>* = nullptr>
+		optional<T> or_else(F&& f) const&& {
+			if (has_value())
+				return std::move(*this);
+
+			std::forward<F>(f)();
+			return nullopt;
+		}
+
+		/// \exclude
+		template <class F, detail::disable_if_ret_void<F>* = nullptr>
+		optional<T> or_else(F&& f) const&& {
+			return has_value() ? std::move(*this) : std::forward<F>(f)();
+		}
+#endif
+
+		/// \brief Maps the stored value with `f` if there is one, otherwise returns
+		/// `u`.
+		///
+		/// \details If there is a value stored, then `f` is called with `**this`
+		/// and the value is returned. Otherwise `u` is returned.
+		///
+		/// \group map_or
+		template <class F, class U>
+		U map_or(F&& f, U&& u) & {
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : std::forward<U>(u);
+		}
+
+		/// \group map_or
+		template <class F, class U>
+		U map_or(F&& f, U&& u) && {
+			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : std::forward<U>(u);
+		}
+
+		/// \group map_or
+		template <class F, class U>
+		U map_or(F&& f, U&& u) const& {
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : std::forward<U>(u);
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group map_or
+		template <class F, class U>
+		U map_or(F&& f, U&& u) const&& {
+			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : std::forward<U>(u);
+		}
+#endif
+
+		/// \brief Maps the stored value with `f` if there is one, otherwise calls
+		/// `u` and returns the result.
+		///
+		/// \details If there is a value stored, then `f` is
+		/// called with `**this` and the value is returned. Otherwise
+		/// `std::forward<U>(u)()` is returned.
+		///
+		/// \group map_or_else
+		/// \synopsis template <class F, class U> \n auto map_or_else(F &&f, U &&u) &;
+		template <class F, class U>
+		detail::invoke_result_t<U> map_or_else(F&& f, U&& u) & {
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : std::forward<U>(u)();
+		}
+
+		/// \group map_or_else
+		/// \synopsis template <class F, class U> \n auto map_or_else(F &&f, U &&u)
+		/// &&;
+		template <class F, class U>
+		detail::invoke_result_t<U> map_or_else(F&& f, U&& u) && {
+			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : std::forward<U>(u)();
+		}
+
+		/// \group map_or_else
+		/// \synopsis template <class F, class U> \n auto map_or_else(F &&f, U &&u)
+		/// const &;
+		template <class F, class U>
+		detail::invoke_result_t<U> map_or_else(F&& f, U&& u) const& {
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : std::forward<U>(u)();
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group map_or_else
+		/// \synopsis template <class F, class U> \n auto map_or_else(F &&f, U &&u)
+		/// const &&;
+		template <class F, class U>
+		detail::invoke_result_t<U> map_or_else(F&& f, U&& u) const&& {
+			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : std::forward<U>(u)();
+		}
+#endif
+
+		/// \returns `u` if `*this` has a value, otherwise an empty optional.
+		template <class U>
+		constexpr optional<typename std::decay<U>::type> conjunction(U&& u) const {
+			using result = optional<detail::decay_t<U>>;
+			return has_value() ? result { u } : result { nullopt };
+		}
+
+		/// \returns `rhs` if `*this` is empty, otherwise the current value.
+		/// \group disjunction
+		SOL_TL_OPTIONAL_11_CONSTEXPR optional disjunction(const optional& rhs) & {
+			return has_value() ? *this : rhs;
+		}
+
+		/// \group disjunction
+		constexpr optional disjunction(const optional& rhs) const& {
+			return has_value() ? *this : rhs;
+		}
+
+		/// \group disjunction
+		SOL_TL_OPTIONAL_11_CONSTEXPR optional disjunction(const optional& rhs) && {
+			return has_value() ? std::move(*this) : rhs;
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group disjunction
+		constexpr optional disjunction(const optional& rhs) const&& {
+			return has_value() ? std::move(*this) : rhs;
+		}
+#endif
+
+		/// \group disjunction
+		SOL_TL_OPTIONAL_11_CONSTEXPR optional disjunction(optional&& rhs) & {
+			return has_value() ? *this : std::move(rhs);
+		}
+
+		/// \group disjunction
+		constexpr optional disjunction(optional&& rhs) const& {
+			return has_value() ? *this : std::move(rhs);
+		}
+
+		/// \group disjunction
+		SOL_TL_OPTIONAL_11_CONSTEXPR optional disjunction(optional&& rhs) && {
+			return has_value() ? std::move(*this) : std::move(rhs);
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group disjunction
+		constexpr optional disjunction(optional&& rhs) const&& {
+			return has_value() ? std::move(*this) : std::move(rhs);
+		}
+#endif
+
+		/// Takes the value out of the optional, leaving it empty
+		/// \group take
+		optional take() & {
+			optional ret = *this;
+			reset();
+			return ret;
+		}
+
+		/// \group take
+		optional take() const& {
+			optional ret = *this;
+			reset();
+			return ret;
+		}
+
+		/// \group take
+		optional take() && {
+			optional ret = std::move(*this);
+			reset();
+			return ret;
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group take
+		optional take() const&& {
+			optional ret = std::move(*this);
+			reset();
+			return ret;
+		}
+#endif
+
+		using value_type = T;
+
+		/// Constructs an optional that does not contain a value.
+		/// \group ctor_empty
+		constexpr optional() noexcept = default;
+
+		/// \group ctor_empty
+		constexpr optional(nullopt_t) noexcept {
+		}
+
+		/// Copy constructor
+		///
+		/// If `rhs` contains a value, the stored value is direct-initialized with
+		/// it. Otherwise, the constructed optional is empty.
+		SOL_TL_OPTIONAL_11_CONSTEXPR optional(const optional& rhs) = default;
+
+		/// Move constructor
+		///
+		/// If `rhs` contains a value, the stored value is direct-initialized with
+		/// it. Otherwise, the constructed optional is empty.
+		SOL_TL_OPTIONAL_11_CONSTEXPR optional(optional&& rhs) = default;
+
+		/// Constructs the stored value in-place using the given arguments.
+		/// \group in_place
+		/// \synopsis template <class... Args> constexpr explicit optional(in_place_t, Args&&... args);
+		template <class... Args>
+		constexpr explicit optional(detail::enable_if_t<std::is_constructible<T, Args...>::value, in_place_t>, Args&&... args)
+		: base(in_place, std::forward<Args>(args)...) {
+		}
+
+		/// \group in_place
+		/// \synopsis template <class U, class... Args> \n constexpr explicit optional(in_place_t, std::initializer_list<U>&, Args&&... args);
+		template <class U, class... Args>
+		SOL_TL_OPTIONAL_11_CONSTEXPR explicit optional(detail::enable_if_t<std::is_constructible<T, std::initializer_list<U>&, Args&&...>::value, in_place_t>,
+		     std::initializer_list<U> il, Args&&... args) {
+			this->construct(il, std::forward<Args>(args)...);
+		}
+
+#if 0 // SOL_MODIFICATION
+      /// Constructs the stored value with `u`.
+      /// \synopsis template <class U=T> constexpr optional(U &&u);
+		template <class U = T, detail::enable_if_t<std::is_convertible<U&&, T>::value>* = nullptr, detail::enable_forward_value<T, U>* = nullptr>
+		constexpr optional(U&& u) : base(in_place, std::forward<U>(u)) {
+		}
+
+		/// \exclude
+		template <class U = T, detail::enable_if_t<!std::is_convertible<U&&, T>::value>* = nullptr, detail::enable_forward_value<T, U>* = nullptr>
+		constexpr explicit optional(U&& u) : base(in_place, std::forward<U>(u)) {
+		}
+#else
+		/// Constructs the stored value with `u`.
+		/// \synopsis template <class U=T> constexpr optional(U &&u);
+		constexpr optional(T&& u) : base(in_place, std::move(u)) {
+		}
+
+		/// \exclude
+		constexpr optional(const T& u) : base(in_place, u) {
+		}
+#endif // sol2 modification
+
+		/// Converting copy constructor.
+		/// \synopsis template <class U> optional(const optional<U> &rhs);
+		template <class U, detail::enable_from_other<T, U, const U&>* = nullptr, detail::enable_if_t<std::is_convertible<const U&, T>::value>* = nullptr>
+		optional(const optional<U>& rhs) {
+			if (rhs.has_value()) {
+				this->construct(*rhs);
+			}
+		}
+
+		/// \exclude
+		template <class U, detail::enable_from_other<T, U, const U&>* = nullptr, detail::enable_if_t<!std::is_convertible<const U&, T>::value>* = nullptr>
+		explicit optional(const optional<U>& rhs) {
+			if (rhs.has_value()) {
+				this->construct(*rhs);
+			}
+		}
+
+		/// Converting move constructor.
+		/// \synopsis template <class U> optional(optional<U> &&rhs);
+		template <class U, detail::enable_from_other<T, U, U&&>* = nullptr, detail::enable_if_t<std::is_convertible<U&&, T>::value>* = nullptr>
+		optional(optional<U>&& rhs) {
+			if (rhs.has_value()) {
+				this->construct(std::move(*rhs));
+			}
+		}
+
+		/// \exclude
+		template <class U, detail::enable_from_other<T, U, U&&>* = nullptr, detail::enable_if_t<!std::is_convertible<U&&, T>::value>* = nullptr>
+		explicit optional(optional<U>&& rhs) {
+			this->construct(std::move(*rhs));
+		}
+
+		/// Destroys the stored value if there is one.
+		~optional() = default;
+
+		/// Assignment to empty.
+		///
+		/// Destroys the current value if there is one.
+		optional& operator=(nullopt_t) noexcept {
+			if (has_value()) {
+				this->m_value.~T();
+				this->m_has_value = false;
+			}
+
+			return *this;
+		}
+
+		/// Copy assignment.
+		///
+		/// Copies the value from `rhs` if there is one. Otherwise resets the stored
+		/// value in `*this`.
+		optional& operator=(const optional& rhs) = default;
+
+		/// Move assignment.
+		///
+		/// Moves the value from `rhs` if there is one. Otherwise resets the stored
+		/// value in `*this`.
+		optional& operator=(optional&& rhs) = default;
+
+		/// Assigns the stored value from `u`, destroying the old value if there was
+		/// one.
+		/// \synopsis optional &operator=(U &&u);
+		template <class U = T, detail::enable_assign_forward<T, U>* = nullptr>
+		optional& operator=(U&& u) {
+			if (has_value()) {
+				this->m_value = std::forward<U>(u);
+			}
+			else {
+				this->construct(std::forward<U>(u));
+			}
+
+			return *this;
+		}
+
+		/// Converting copy assignment operator.
+		///
+		/// Copies the value from `rhs` if there is one. Otherwise resets the stored
+		/// value in `*this`.
+		/// \synopsis optional &operator=(const optional<U> & rhs);
+		template <class U, detail::enable_assign_from_other<T, U, const U&>* = nullptr>
+		optional& operator=(const optional<U>& rhs) {
+			if (has_value()) {
+				if (rhs.has_value()) {
+					this->m_value = *rhs;
+				}
+				else {
+					this->hard_reset();
+				}
+			}
+
+			if (rhs.has_value()) {
+				this->construct(*rhs);
+			}
+
+			return *this;
+		}
+
+		// TODO check exception guarantee
+		/// Converting move assignment operator.
+		///
+		/// Moves the value from `rhs` if there is one. Otherwise resets the stored
+		/// value in `*this`.
+		/// \synopsis optional &operator=(optional<U> && rhs);
+		template <class U, detail::enable_assign_from_other<T, U, U>* = nullptr>
+		optional& operator=(optional<U>&& rhs) {
+			if (has_value()) {
+				if (rhs.has_value()) {
+					this->m_value = std::move(*rhs);
+				}
+				else {
+					this->hard_reset();
+				}
+			}
+
+			if (rhs.has_value()) {
+				this->construct(std::move(*rhs));
+			}
+
+			return *this;
+		}
+
+		/// Constructs the value in-place, destroying the current one if there is
+		/// one.
+		/// \group emplace
+		template <class... Args>
+		T& emplace(Args&&... args) {
+			static_assert(std::is_constructible<T, Args&&...>::value, "T must be constructible with Args");
+
+			*this = nullopt;
+			this->construct(std::forward<Args>(args)...);
+			return value();
+		}
+
+		/// \group emplace
+		/// \synopsis template <class U, class... Args> \n T& emplace(std::initializer_list<U> il, Args &&... args);
+		template <class U, class... Args>
+		detail::enable_if_t<std::is_constructible<T, std::initializer_list<U>&, Args&&...>::value, T&> emplace(std::initializer_list<U> il, Args&&... args) {
+			*this = nullopt;
+			this->construct(il, std::forward<Args>(args)...);
+			return value();
+		}
+
+		/// Swaps this optional with the other.
+		///
+		/// If neither optionals have a value, nothing happens.
+		/// If both have a value, the values are swapped.
+		/// If one has a value, it is moved to the other and the movee is left
+		/// valueless.
+		void swap(optional& rhs) noexcept(std::is_nothrow_move_constructible<T>::value&& detail::is_nothrow_swappable<T>::value) {
+			if (has_value()) {
+				if (rhs.has_value()) {
+					using std::swap;
+					swap(**this, *rhs);
+				}
+				else {
+					new (std::addressof(rhs.m_value)) T(std::move(this->m_value));
+					this->m_value.T::~T();
+				}
+			}
+			else if (rhs.has_value()) {
+				new (std::addressof(this->m_value)) T(std::move(rhs.m_value));
+				rhs.m_value.T::~T();
+			}
+		}
+
+		/// \returns a pointer to the stored value
+		/// \requires a value is stored
+		/// \group pointer
+		/// \synopsis constexpr const T *operator->() const;
+		constexpr const T* operator->() const {
+			return std::addressof(this->m_value);
+		}
+
+		/// \group pointer
+		/// \synopsis constexpr T *operator->();
+		SOL_TL_OPTIONAL_11_CONSTEXPR T* operator->() {
+			return std::addressof(this->m_value);
+		}
+
+		/// \returns the stored value
+		/// \requires a value is stored
+		/// \group deref
+		/// \synopsis constexpr T &operator*();
+		SOL_TL_OPTIONAL_11_CONSTEXPR T& operator*() & {
+			return this->m_value;
+		}
+
+		/// \group deref
+		/// \synopsis constexpr const T &operator*() const;
+		constexpr const T& operator*() const& {
+			return this->m_value;
+		}
+
+		/// \exclude
+		SOL_TL_OPTIONAL_11_CONSTEXPR T&& operator*() && {
+			return std::move(this->m_value);
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \exclude
+		constexpr const T&& operator*() const&& {
+			return std::move(this->m_value);
+		}
+#endif
+
+		/// \returns whether or not the optional has a value
+		/// \group has_value
+		constexpr bool has_value() const noexcept {
+			return this->m_has_value;
+		}
+
+		/// \group has_value
+		constexpr explicit operator bool() const noexcept {
+			return this->m_has_value;
+		}
+
+		/// \returns the contained value if there is one, otherwise throws
+		/// [bad_optional_access]
+		/// \group value
+		/// \synopsis constexpr T &value();
+		SOL_TL_OPTIONAL_11_CONSTEXPR T& value() & {
+			if (has_value())
+				return this->m_value;
+#if SOL_IS_OFF(SOL_EXCEPTIONS)
+			std::abort();
+#else
+			throw bad_optional_access();
+#endif // No exceptions allowed
+		}
+		/// \group value
+		/// \synopsis constexpr const T &value() const;
+		SOL_TL_OPTIONAL_11_CONSTEXPR const T& value() const& {
+			if (has_value())
+				return this->m_value;
+#if SOL_IS_OFF(SOL_EXCEPTIONS)
+			std::abort();
+#else
+			throw bad_optional_access();
+#endif // No exceptions allowed
+		}
+		/// \exclude
+		SOL_TL_OPTIONAL_11_CONSTEXPR T&& value() && {
+			if (has_value())
+				return std::move(this->m_value);
+#if SOL_IS_OFF(SOL_EXCEPTIONS)
+			std::abort();
+#else
+			throw bad_optional_access();
+#endif // No exceptions allowed
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \exclude
+		SOL_TL_OPTIONAL_11_CONSTEXPR const T&& value() const&& {
+			if (has_value())
+				return std::move(this->m_value);
+#if SOL_IS_OFF(SOL_EXCEPTIONS)
+			std::abort();
+#else
+			throw bad_optional_access();
+#endif // No exceptions allowed
+		}
+#endif
+
+		/// \returns the stored value if there is one, otherwise returns `u`
+		/// \group value_or
+		template <class U>
+		constexpr T value_or(U&& u) const& {
+			static_assert(std::is_copy_constructible<T>::value && std::is_convertible<U&&, T>::value, "T must be copy constructible and convertible from U");
+			return has_value() ? **this : static_cast<T>(std::forward<U>(u));
+		}
+
+		/// \group value_or
+		template <class U>
+		SOL_TL_OPTIONAL_11_CONSTEXPR T value_or(U&& u) && {
+			static_assert(std::is_move_constructible<T>::value && std::is_convertible<U&&, T>::value, "T must be move constructible and convertible from U");
+			return has_value() ? **this : static_cast<T>(std::forward<U>(u));
+		}
+
+		/// Destroys the stored value if one exists, making the optional empty
+		void reset() noexcept {
+			if (has_value()) {
+				this->m_value.~T();
+				this->m_has_value = false;
+			}
+		}
+	}; // namespace sol
+
+	/// \group relop
+	/// \brief Compares two optional objects
+	/// \details If both optionals contain a value, they are compared with `T`s
+	/// relational operators. Otherwise `lhs` and `rhs` are equal only if they are
+	/// both empty, and `lhs` is less than `rhs` only if `rhs` is empty and `lhs`
+	/// is not.
+	template <class T, class U>
+	inline constexpr bool operator==(const optional<T>& lhs, const optional<U>& rhs) {
+		return lhs.has_value() == rhs.has_value() && (!lhs.has_value() || *lhs == *rhs);
+	}
+	/// \group relop
+	template <class T, class U>
+	inline constexpr bool operator!=(const optional<T>& lhs, const optional<U>& rhs) {
+		return lhs.has_value() != rhs.has_value() || (lhs.has_value() && *lhs != *rhs);
+	}
+	/// \group relop
+	template <class T, class U>
+	inline constexpr bool operator<(const optional<T>& lhs, const optional<U>& rhs) {
+		return rhs.has_value() && (!lhs.has_value() || *lhs < *rhs);
+	}
+	/// \group relop
+	template <class T, class U>
+	inline constexpr bool operator>(const optional<T>& lhs, const optional<U>& rhs) {
+		return lhs.has_value() && (!rhs.has_value() || *lhs > *rhs);
+	}
+	/// \group relop
+	template <class T, class U>
+	inline constexpr bool operator<=(const optional<T>& lhs, const optional<U>& rhs) {
+		return !lhs.has_value() || (rhs.has_value() && *lhs <= *rhs);
+	}
+	/// \group relop
+	template <class T, class U>
+	inline constexpr bool operator>=(const optional<T>& lhs, const optional<U>& rhs) {
+		return !rhs.has_value() || (lhs.has_value() && *lhs >= *rhs);
+	}
+
+	/// \group relop_nullopt
+	/// \brief Compares an optional to a `nullopt`
+	/// \details Equivalent to comparing the optional to an empty optional
+	template <class T>
+	inline constexpr bool operator==(const optional<T>& lhs, nullopt_t) noexcept {
+		return !lhs.has_value();
+	}
+	/// \group relop_nullopt
+	template <class T>
+	inline constexpr bool operator==(nullopt_t, const optional<T>& rhs) noexcept {
+		return !rhs.has_value();
+	}
+	/// \group relop_nullopt
+	template <class T>
+	inline constexpr bool operator!=(const optional<T>& lhs, nullopt_t) noexcept {
+		return lhs.has_value();
+	}
+	/// \group relop_nullopt
+	template <class T>
+	inline constexpr bool operator!=(nullopt_t, const optional<T>& rhs) noexcept {
+		return rhs.has_value();
+	}
+	/// \group relop_nullopt
+	template <class T>
+	inline constexpr bool operator<(const optional<T>&, nullopt_t) noexcept {
+		return false;
+	}
+	/// \group relop_nullopt
+	template <class T>
+	inline constexpr bool operator<(nullopt_t, const optional<T>& rhs) noexcept {
+		return rhs.has_value();
+	}
+	/// \group relop_nullopt
+	template <class T>
+	inline constexpr bool operator<=(const optional<T>& lhs, nullopt_t) noexcept {
+		return !lhs.has_value();
+	}
+	/// \group relop_nullopt
+	template <class T>
+	inline constexpr bool operator<=(nullopt_t, const optional<T>&) noexcept {
+		return true;
+	}
+	/// \group relop_nullopt
+	template <class T>
+	inline constexpr bool operator>(const optional<T>& lhs, nullopt_t) noexcept {
+		return lhs.has_value();
+	}
+	/// \group relop_nullopt
+	template <class T>
+	inline constexpr bool operator>(nullopt_t, const optional<T>&) noexcept {
+		return false;
+	}
+	/// \group relop_nullopt
+	template <class T>
+	inline constexpr bool operator>=(const optional<T>&, nullopt_t) noexcept {
+		return true;
+	}
+	/// \group relop_nullopt
+	template <class T>
+	inline constexpr bool operator>=(nullopt_t, const optional<T>& rhs) noexcept {
+		return !rhs.has_value();
+	}
+
+	/// \group relop_t
+	/// \brief Compares the optional with a value.
+	/// \details If the optional has a value, it is compared with the other value
+	/// using `T`s relational operators. Otherwise, the optional is considered
+	/// less than the value.
+	template <class T, class U>
+	inline constexpr bool operator==(const optional<T>& lhs, const U& rhs) {
+		return lhs.has_value() ? *lhs == rhs : false;
+	}
+	/// \group relop_t
+	template <class T, class U>
+	inline constexpr bool operator==(const U& lhs, const optional<T>& rhs) {
+		return rhs.has_value() ? lhs == *rhs : false;
+	}
+	/// \group relop_t
+	template <class T, class U>
+	inline constexpr bool operator!=(const optional<T>& lhs, const U& rhs) {
+		return lhs.has_value() ? *lhs != rhs : true;
+	}
+	/// \group relop_t
+	template <class T, class U>
+	inline constexpr bool operator!=(const U& lhs, const optional<T>& rhs) {
+		return rhs.has_value() ? lhs != *rhs : true;
+	}
+	/// \group relop_t
+	template <class T, class U>
+	inline constexpr bool operator<(const optional<T>& lhs, const U& rhs) {
+		return lhs.has_value() ? *lhs < rhs : true;
+	}
+	/// \group relop_t
+	template <class T, class U>
+	inline constexpr bool operator<(const U& lhs, const optional<T>& rhs) {
+		return rhs.has_value() ? lhs < *rhs : false;
+	}
+	/// \group relop_t
+	template <class T, class U>
+	inline constexpr bool operator<=(const optional<T>& lhs, const U& rhs) {
+		return lhs.has_value() ? *lhs <= rhs : true;
+	}
+	/// \group relop_t
+	template <class T, class U>
+	inline constexpr bool operator<=(const U& lhs, const optional<T>& rhs) {
+		return rhs.has_value() ? lhs <= *rhs : false;
+	}
+	/// \group relop_t
+	template <class T, class U>
+	inline constexpr bool operator>(const optional<T>& lhs, const U& rhs) {
+		return lhs.has_value() ? *lhs > rhs : false;
+	}
+	/// \group relop_t
+	template <class T, class U>
+	inline constexpr bool operator>(const U& lhs, const optional<T>& rhs) {
+		return rhs.has_value() ? lhs > *rhs : true;
+	}
+	/// \group relop_t
+	template <class T, class U>
+	inline constexpr bool operator>=(const optional<T>& lhs, const U& rhs) {
+		return lhs.has_value() ? *lhs >= rhs : false;
+	}
+	/// \group relop_t
+	template <class T, class U>
+	inline constexpr bool operator>=(const U& lhs, const optional<T>& rhs) {
+		return rhs.has_value() ? lhs >= *rhs : true;
+	}
+
+	/// \synopsis template <class T>  \n  void swap(optional<T> &lhs, optional<T> &rhs);
+	template <class T, detail::enable_if_t<std::is_move_constructible<T>::value>* = nullptr, detail::enable_if_t<detail::is_swappable<T>::value>* = nullptr>
+	void swap(optional<T>& lhs, optional<T>& rhs) noexcept(noexcept(lhs.swap(rhs))) {
+		return lhs.swap(rhs);
+	}
+
+	namespace detail {
+		struct i_am_secret { };
+	} // namespace detail
+
+	template <class T = detail::i_am_secret, class U, class Ret = detail::conditional_t<std::is_same<T, detail::i_am_secret>::value, detail::decay_t<U>, T>>
+	inline constexpr optional<Ret> make_optional(U&& v) {
+		return optional<Ret>(std::forward<U>(v));
+	}
+
+	template <class T, class... Args>
+	inline constexpr optional<T> make_optional(Args&&... args) {
+		return optional<T>(in_place, std::forward<Args>(args)...);
+	}
+	template <class T, class U, class... Args>
+	inline constexpr optional<T> make_optional(std::initializer_list<U> il, Args&&... args) {
+		return optional<T>(in_place, il, std::forward<Args>(args)...);
+	}
+
+#if __cplusplus >= 201703L
+	template <class T>
+	optional(T) -> optional<T>;
+#endif
+
+	/// \exclude
+	namespace detail {
+#ifdef SOL_TL_OPTIONAL_CXX14
+		template <class Opt, class F, class Ret = decltype(detail::invoke(std::declval<F>(), *std::declval<Opt>())),
+		     detail::enable_if_t<!std::is_void<Ret>::value>* = nullptr>
+		constexpr auto optional_map_impl(Opt&& opt, F&& f) {
+			return opt.has_value() ? detail::invoke(std::forward<F>(f), *std::forward<Opt>(opt)) : optional<Ret>(nullopt);
+		}
+
+		template <class Opt, class F, class Ret = decltype(detail::invoke(std::declval<F>(), *std::declval<Opt>())),
+		     detail::enable_if_t<std::is_void<Ret>::value>* = nullptr>
+		auto optional_map_impl(Opt&& opt, F&& f) {
+			if (opt.has_value()) {
+				detail::invoke(std::forward<F>(f), *std::forward<Opt>(opt));
+				return make_optional(monostate {});
+			}
+
+			return optional<monostate>(nullopt);
+		}
+#else
+		template <class Opt, class F, class Ret = decltype(detail::invoke(std::declval<F>(), *std::declval<Opt>())),
+		     detail::enable_if_t<!std::is_void<Ret>::value>* = nullptr>
+
+		constexpr auto optional_map_impl(Opt&& opt, F&& f) -> optional<Ret> {
+			return opt.has_value() ? detail::invoke(std::forward<F>(f), *std::forward<Opt>(opt)) : optional<Ret>(nullopt);
+		}
+
+		template <class Opt, class F, class Ret = decltype(detail::invoke(std::declval<F>(), *std::declval<Opt>())),
+		     detail::enable_if_t<std::is_void<Ret>::value>* = nullptr>
+
+		auto optional_map_impl(Opt&& opt, F&& f) -> optional<monostate> {
+			if (opt.has_value()) {
+				detail::invoke(std::forward<F>(f), *std::forward<Opt>(opt));
+				return monostate {};
+			}
+
+			return nullopt;
+		}
+#endif
+	} // namespace detail
+
+	/// Specialization for when `T` is a reference. `optional<T&>` acts similarly
+	/// to a `T*`, but provides more operations and shows intent more clearly.
+	///
+	/// *Examples*:
+	///
+	/// ```
+	/// int i = 42;
+	/// sol::optional<int&> o = i;
+	/// *o == 42; //true
+	/// i = 12;
+	/// *o = 12; //true
+	/// &*o == &i; //true
+	/// ```
+	///
+	/// Assignment has rebind semantics rather than assign-through semantics:
+	///
+	/// ```
+	/// int j = 8;
+	/// o = j;
+	///
+	/// &*o == &j; //true
+	/// ```
+	template <class T>
+	class optional<T&> {
+	public:
+#if defined(SOL_TL_OPTIONAL_CXX14) && !defined(SOL_TL_OPTIONAL_GCC49) && !defined(SOL_TL_OPTIONAL_GCC54) && !defined(SOL_TL_OPTIONAL_GCC55)
+		/// \group and_then
+		/// Carries out some operation which returns an optional on the stored
+		/// object if there is one. \requires `std::invoke(std::forward<F>(f),
+		/// value())` returns a `std::optional<U>` for some `U`. \returns Let `U` be
+		/// the result of `std::invoke(std::forward<F>(f), value())`. Returns a
+		/// `std::optional<U>`. The return value is empty if `*this` is empty,
+		/// otherwise the return value of `std::invoke(std::forward<F>(f), value())`
+		/// is returned.
+		/// \group and_then
+		/// \synopsis template <class F> \n constexpr auto and_then(F &&f) &;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR auto and_then(F&& f) & {
+			using result = detail::invoke_result_t<F, T&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+		}
+
+		/// \group and_then
+		/// \synopsis template <class F> \n constexpr auto and_then(F &&f) &&;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR auto and_then(F&& f) && {
+			using result = detail::invoke_result_t<F, T&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+		}
+
+		/// \group and_then
+		/// \synopsis template <class F> \n constexpr auto and_then(F &&f) const &;
+		template <class F>
+		constexpr auto and_then(F&& f) const& {
+			using result = detail::invoke_result_t<F, const T&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group and_then
+		/// \synopsis template <class F> \n constexpr auto and_then(F &&f) const &&;
+		template <class F>
+		constexpr auto and_then(F&& f) const&& {
+			using result = detail::invoke_result_t<F, const T&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+		}
+#endif
+#else
+		/// \group and_then
+		/// Carries out some operation which returns an optional on the stored
+		/// object if there is one. \requires `std::invoke(std::forward<F>(f),
+		/// value())` returns a `std::optional<U>` for some `U`. \returns Let `U` be
+		/// the result of `std::invoke(std::forward<F>(f), value())`. Returns a
+		/// `std::optional<U>`. The return value is empty if `*this` is empty,
+		/// otherwise the return value of `std::invoke(std::forward<F>(f), value())`
+		/// is returned.
+		/// \group and_then
+		/// \synopsis template <class F> \n constexpr auto and_then(F &&f) &;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR detail::invoke_result_t<F, T&> and_then(F&& f) & {
+			using result = detail::invoke_result_t<F, T&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+		}
+
+		/// \group and_then
+		/// \synopsis template <class F> \n constexpr auto and_then(F &&f) &&;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR detail::invoke_result_t<F, T&> and_then(F&& f) && {
+			using result = detail::invoke_result_t<F, T&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+		}
+
+		/// \group and_then
+		/// \synopsis template <class F> \n constexpr auto and_then(F &&f) const &;
+		template <class F>
+		constexpr detail::invoke_result_t<F, const T&> and_then(F&& f) const& {
+			using result = detail::invoke_result_t<F, const T&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group and_then
+		/// \synopsis template <class F> \n constexpr auto and_then(F &&f) const &&;
+		template <class F>
+		constexpr detail::invoke_result_t<F, const T&> and_then(F&& f) const&& {
+			using result = detail::invoke_result_t<F, const T&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+		}
+#endif
+#endif
+
+#if defined(SOL_TL_OPTIONAL_CXX14) && !defined(SOL_TL_OPTIONAL_GCC49) && !defined(SOL_TL_OPTIONAL_GCC54) && !defined(SOL_TL_OPTIONAL_GCC55)
+		/// \brief Carries out some operation on the stored object if there is one.
+		/// \returns Let `U` be the result of `std::invoke(std::forward<F>(f),
+		/// value())`. Returns a `std::optional<U>`. The return value is empty if
+		/// `*this` is empty, otherwise an `optional<U>` is constructed from the
+		/// return value of `std::invoke(std::forward<F>(f), value())` and is
+		/// returned.
+		///
+		/// \group map
+		/// \synopsis template <class F> constexpr auto map(F &&f) &;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR auto map(F&& f) & {
+			return detail::optional_map_impl(*this, std::forward<F>(f));
+		}
+
+		/// \group map
+		/// \synopsis template <class F> constexpr auto map(F &&f) &&;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR auto map(F&& f) && {
+			return detail::optional_map_impl(std::move(*this), std::forward<F>(f));
+		}
+
+		/// \group map
+		/// \synopsis template <class F> constexpr auto map(F &&f) const&;
+		template <class F>
+		constexpr auto map(F&& f) const& {
+			return detail::optional_map_impl(*this, std::forward<F>(f));
+		}
+
+		/// \group map
+		/// \synopsis template <class F> constexpr auto map(F &&f) const&&;
+		template <class F>
+		constexpr auto map(F&& f) const&& {
+			return detail::optional_map_impl(std::move(*this), std::forward<F>(f));
+		}
+#else
+		/// \brief Carries out some operation on the stored object if there is one.
+		/// \returns Let `U` be the result of `std::invoke(std::forward<F>(f),
+		/// value())`. Returns a `std::optional<U>`. The return value is empty if
+		/// `*this` is empty, otherwise an `optional<U>` is constructed from the
+		/// return value of `std::invoke(std::forward<F>(f), value())` and is
+		/// returned.
+		///
+		/// \group map
+		/// \synopsis template <class F> auto map(F &&f) &;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR decltype(detail::optional_map_impl(std::declval<optional&>(), std::declval<F&&>())) map(F&& f) & {
+			return detail::optional_map_impl(*this, std::forward<F>(f));
+		}
+
+		/// \group map
+		/// \synopsis template <class F> auto map(F &&f) &&;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR decltype(detail::optional_map_impl(std::declval<optional&&>(), std::declval<F&&>())) map(F&& f) && {
+			return detail::optional_map_impl(std::move(*this), std::forward<F>(f));
+		}
+
+		/// \group map
+		/// \synopsis template <class F> auto map(F &&f) const&;
+		template <class F>
+		constexpr decltype(detail::optional_map_impl(std::declval<const optional&>(), std::declval<F&&>())) map(F&& f) const& {
+			return detail::optional_map_impl(*this, std::forward<F>(f));
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group map
+		/// \synopsis template <class F> auto map(F &&f) const&&;
+		template <class F>
+		constexpr decltype(detail::optional_map_impl(std::declval<const optional&&>(), std::declval<F&&>())) map(F&& f) const&& {
+			return detail::optional_map_impl(std::move(*this), std::forward<F>(f));
+		}
+#endif
+#endif
+
+		/// \brief Calls `f` if the optional is empty
+		/// \requires `std::invoke_result_t<F>` must be void or convertible to
+		/// `optional<T>`. \effects If `*this` has a value, returns `*this`.
+		/// Otherwise, if `f` returns `void`, calls `std::forward<F>(f)` and returns
+		/// `std::nullopt`. Otherwise, returns `std::forward<F>(f)()`.
+		///
+		/// \group or_else
+		/// \synopsis template <class F> optional<T> or_else (F &&f) &;
+		template <class F, detail::enable_if_ret_void<F>* = nullptr>
+		optional<T> SOL_TL_OPTIONAL_11_CONSTEXPR or_else(F&& f) & {
+			if (has_value())
+				return *this;
+
+			std::forward<F>(f)();
+			return nullopt;
+		}
+
+		/// \exclude
+		template <class F, detail::disable_if_ret_void<F>* = nullptr>
+		optional<T> SOL_TL_OPTIONAL_11_CONSTEXPR or_else(F&& f) & {
+			return has_value() ? *this : std::forward<F>(f)();
+		}
+
+		/// \group or_else
+		/// \synopsis template <class F> optional<T> or_else (F &&f) &&;
+		template <class F, detail::enable_if_ret_void<F>* = nullptr>
+		optional<T> or_else(F&& f) && {
+			if (has_value())
+				return std::move(*this);
+
+			std::forward<F>(f)();
+			return nullopt;
+		}
+
+		/// \exclude
+		template <class F, detail::disable_if_ret_void<F>* = nullptr>
+		optional<T> SOL_TL_OPTIONAL_11_CONSTEXPR or_else(F&& f) && {
+			return has_value() ? std::move(*this) : std::forward<F>(f)();
+		}
+
+		/// \group or_else
+		/// \synopsis template <class F> optional<T> or_else (F &&f) const &;
+		template <class F, detail::enable_if_ret_void<F>* = nullptr>
+		optional<T> or_else(F&& f) const& {
+			if (has_value())
+				return *this;
+
+			std::forward<F>(f)();
+			return nullopt;
+		}
+
+		/// \exclude
+		template <class F, detail::disable_if_ret_void<F>* = nullptr>
+		optional<T> SOL_TL_OPTIONAL_11_CONSTEXPR or_else(F&& f) const& {
+			return has_value() ? *this : std::forward<F>(f)();
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \exclude
+		template <class F, detail::enable_if_ret_void<F>* = nullptr>
+		optional<T> or_else(F&& f) const&& {
+			if (has_value())
+				return std::move(*this);
+
+			std::forward<F>(f)();
+			return nullopt;
+		}
+
+		/// \exclude
+		template <class F, detail::disable_if_ret_void<F>* = nullptr>
+		optional<T> or_else(F&& f) const&& {
+			return has_value() ? std::move(*this) : std::forward<F>(f)();
+		}
+#endif
+
+		/// \brief Maps the stored value with `f` if there is one, otherwise returns
+		/// `u`.
+		///
+		/// \details If there is a value stored, then `f` is called with `**this`
+		/// and the value is returned. Otherwise `u` is returned.
+		///
+		/// \group map_or
+		template <class F, class U>
+		U map_or(F&& f, U&& u) & {
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : std::forward<U>(u);
+		}
+
+		/// \group map_or
+		template <class F, class U>
+		U map_or(F&& f, U&& u) && {
+			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : std::forward<U>(u);
+		}
+
+		/// \group map_or
+		template <class F, class U>
+		U map_or(F&& f, U&& u) const& {
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : std::forward<U>(u);
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group map_or
+		template <class F, class U>
+		U map_or(F&& f, U&& u) const&& {
+			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : std::forward<U>(u);
+		}
+#endif
+
+		/// \brief Maps the stored value with `f` if there is one, otherwise calls
+		/// `u` and returns the result.
+		///
+		/// \details If there is a value stored, then `f` is
+		/// called with `**this` and the value is returned. Otherwise
+		/// `std::forward<U>(u)()` is returned.
+		///
+		/// \group map_or_else
+		/// \synopsis template <class F, class U> \n auto map_or_else(F &&f, U &&u) &;
+		template <class F, class U>
+		detail::invoke_result_t<U> map_or_else(F&& f, U&& u) & {
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : std::forward<U>(u)();
+		}
+
+		/// \group map_or_else
+		/// \synopsis template <class F, class U> \n auto map_or_else(F &&f, U &&u)
+		/// &&;
+		template <class F, class U>
+		detail::invoke_result_t<U> map_or_else(F&& f, U&& u) && {
+			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : std::forward<U>(u)();
+		}
+
+		/// \group map_or_else
+		/// \synopsis template <class F, class U> \n auto map_or_else(F &&f, U &&u)
+		/// const &;
+		template <class F, class U>
+		detail::invoke_result_t<U> map_or_else(F&& f, U&& u) const& {
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : std::forward<U>(u)();
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group map_or_else
+		/// \synopsis template <class F, class U> \n auto map_or_else(F &&f, U &&u)
+		/// const &&;
+		template <class F, class U>
+		detail::invoke_result_t<U> map_or_else(F&& f, U&& u) const&& {
+			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : std::forward<U>(u)();
+		}
+#endif
+
+		/// \returns `u` if `*this` has a value, otherwise an empty optional.
+		template <class U>
+		constexpr optional<typename std::decay<U>::type> conjunction(U&& u) const {
+			using result = optional<detail::decay_t<U>>;
+			return has_value() ? result { u } : result { nullopt };
+		}
+
+		/// \returns `rhs` if `*this` is empty, otherwise the current value.
+		/// \group disjunction
+		SOL_TL_OPTIONAL_11_CONSTEXPR optional disjunction(const optional& rhs) & {
+			return has_value() ? *this : rhs;
+		}
+
+		/// \group disjunction
+		constexpr optional disjunction(const optional& rhs) const& {
+			return has_value() ? *this : rhs;
+		}
+
+		/// \group disjunction
+		SOL_TL_OPTIONAL_11_CONSTEXPR optional disjunction(const optional& rhs) && {
+			return has_value() ? std::move(*this) : rhs;
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group disjunction
+		constexpr optional disjunction(const optional& rhs) const&& {
+			return has_value() ? std::move(*this) : rhs;
+		}
+#endif
+
+		/// \group disjunction
+		SOL_TL_OPTIONAL_11_CONSTEXPR optional disjunction(optional&& rhs) & {
+			return has_value() ? *this : std::move(rhs);
+		}
+
+		/// \group disjunction
+		constexpr optional disjunction(optional&& rhs) const& {
+			return has_value() ? *this : std::move(rhs);
+		}
+
+		/// \group disjunction
+		SOL_TL_OPTIONAL_11_CONSTEXPR optional disjunction(optional&& rhs) && {
+			return has_value() ? std::move(*this) : std::move(rhs);
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group disjunction
+		constexpr optional disjunction(optional&& rhs) const&& {
+			return has_value() ? std::move(*this) : std::move(rhs);
+		}
+#endif
+
+		/// Takes the value out of the optional, leaving it empty
+		/// \group take
+		optional take() & {
+			optional ret = *this;
+			reset();
+			return ret;
+		}
+
+		/// \group take
+		optional take() const& {
+			optional ret = *this;
+			reset();
+			return ret;
+		}
+
+		/// \group take
+		optional take() && {
+			optional ret = std::move(*this);
+			reset();
+			return ret;
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group take
+		optional take() const&& {
+			optional ret = std::move(*this);
+			reset();
+			return ret;
+		}
+#endif
+
+		using value_type = T&;
+
+		/// Constructs an optional that does not contain a value.
+		/// \group ctor_empty
+		constexpr optional() noexcept : m_value(nullptr) {
+		}
+
+		/// \group ctor_empty
+		constexpr optional(nullopt_t) noexcept : m_value(nullptr) {
+		}
+
+		/// Copy constructor
+		///
+		/// If `rhs` contains a value, the stored value is direct-initialized with
+		/// it. Otherwise, the constructed optional is empty.
+		SOL_TL_OPTIONAL_11_CONSTEXPR optional(const optional& rhs) noexcept = default;
+
+		/// Move constructor
+		///
+		/// If `rhs` contains a value, the stored value is direct-initialized with
+		/// it. Otherwise, the constructed optional is empty.
+		SOL_TL_OPTIONAL_11_CONSTEXPR optional(optional&& rhs) = default;
+
+		/// Constructs the stored value with `u`.
+		/// \synopsis template <class U=T> constexpr optional(U &&u);
+		template <class U = T, detail::enable_if_t<!detail::is_optional<detail::decay_t<U>>::value>* = nullptr>
+		constexpr optional(U&& u) : m_value(std::addressof(u)) {
+			static_assert(std::is_lvalue_reference<U>::value, "U must be an lvalue");
+		}
+
+		/// \exclude
+		template <class U>
+		constexpr explicit optional(const optional<U>& rhs) : optional(*rhs) {
+		}
+
+		/// No-op
+		~optional() = default;
+
+		/// Assignment to empty.
+		///
+		/// Destroys the current value if there is one.
+		optional& operator=(nullopt_t) noexcept {
+			m_value = nullptr;
+			return *this;
+		}
+
+		/// Copy assignment.
+		///
+		/// Rebinds this optional to the referee of `rhs` if there is one. Otherwise
+		/// resets the stored value in `*this`.
+		optional& operator=(const optional& rhs) = default;
+
+		/// Rebinds this optional to `u`.
+		///
+		/// \requires `U` must be an lvalue reference.
+		/// \synopsis optional &operator=(U &&u);
+		template <class U = T, detail::enable_if_t<!detail::is_optional<detail::decay_t<U>>::value>* = nullptr>
+		optional& operator=(U&& u) {
+			static_assert(std::is_lvalue_reference<U>::value, "U must be an lvalue");
+			m_value = std::addressof(u);
+			return *this;
+		}
+
+		/// Converting copy assignment operator.
+		///
+		/// Rebinds this optional to the referee of `rhs` if there is one. Otherwise
+		/// resets the stored value in `*this`.
+		template <class U>
+		optional& operator=(const optional<U>& rhs) {
+			m_value = std::addressof(rhs.value());
+			return *this;
+		}
+
+		/// Constructs the value in-place, destroying the current one if there is
+		/// one.
+		///
+		/// \group emplace
+		template <class... Args>
+		T& emplace(Args&&... args) noexcept {
+			static_assert(std::is_constructible<T, Args&&...>::value, "T must be constructible with Args");
+
+			*this = nullopt;
+			this->construct(std::forward<Args>(args)...);
+		}
+
+		/// Swaps this optional with the other.
+		///
+		/// If neither optionals have a value, nothing happens.
+		/// If both have a value, the values are swapped.
+		/// If one has a value, it is moved to the other and the movee is left
+		/// valueless.
+		void swap(optional& rhs) noexcept {
+			std::swap(m_value, rhs.m_value);
+		}
+
+		/// \returns a pointer to the stored value
+		/// \requires a value is stored
+		/// \group pointer
+		/// \synopsis constexpr const T *operator->() const;
+		constexpr const T* operator->() const {
+			return m_value;
+		}
+
+		/// \group pointer
+		/// \synopsis constexpr T *operator->();
+		SOL_TL_OPTIONAL_11_CONSTEXPR T* operator->() {
+			return m_value;
+		}
+
+		/// \returns the stored value
+		/// \requires a value is stored
+		/// \group deref
+		/// \synopsis constexpr T &operator*();
+		SOL_TL_OPTIONAL_11_CONSTEXPR T& operator*() {
+			return *m_value;
+		}
+
+		/// \group deref
+		/// \synopsis constexpr const T &operator*() const;
+		constexpr const T& operator*() const {
+			return *m_value;
+		}
+
+		/// \returns whether or not the optional has a value
+		/// \group has_value
+		constexpr bool has_value() const noexcept {
+			return m_value != nullptr;
+		}
+
+		/// \group has_value
+		constexpr explicit operator bool() const noexcept {
+			return m_value != nullptr;
+		}
+
+		/// \returns the contained value if there is one, otherwise throws
+		/// [bad_optional_access]
+		/// \group value
+		/// synopsis constexpr T &value();
+		SOL_TL_OPTIONAL_11_CONSTEXPR T& value() {
+			if (has_value())
+				return *m_value;
+#if SOL_IS_OFF(SOL_EXCEPTIONS)
+			std::abort();
+#else
+			throw bad_optional_access();
+#endif // No exceptions allowed
+		}
+		/// \group value
+		/// \synopsis constexpr const T &value() const;
+		SOL_TL_OPTIONAL_11_CONSTEXPR const T& value() const {
+			if (has_value())
+				return *m_value;
+#if SOL_IS_OFF(SOL_EXCEPTIONS)
+			std::abort();
+#else
+			throw bad_optional_access();
+#endif // No exceptions allowed
+		}
+
+		/// \returns the stored value if there is one, otherwise returns `u`
+		/// \group value_or
+		template <class U>
+		constexpr T& value_or(U&& u) const {
+			static_assert(std::is_convertible<U&&, T&>::value, "T must be convertible from U");
+			return has_value() ? const_cast<T&>(**this) : static_cast<T&>(std::forward<U>(u));
+		}
+
+		/// Destroys the stored value if one exists, making the optional empty
+		void reset() noexcept {
+			m_value = nullptr;
+		}
+
+	private:
+		T* m_value;
+	};
+
+} // namespace sol
+
+namespace std {
+	// TODO SFINAE
+	template <class T>
+	struct hash<::sol::optional<T>> {
+		::std::size_t operator()(const ::sol::optional<T>& o) const {
+			if (!o.has_value())
+				return 0;
+
+			return ::std::hash<::sol::detail::remove_const_t<T>>()(*o);
+		}
+	};
+} // namespace std
+
+// end of sol/optional_implementation.hpp
+
+#endif // Boost vs. Better optional
+
+#include <optional>
+
+namespace sol {
+
+#if SOL_IS_ON(SOL_USE_BOOST)
+	template <typename T>
+	using optional = boost::optional<T>;
+	using nullopt_t = boost::none_t;
+	SOL_BOOST_NONE_CONSTEXPR_I_ nullopt_t nullopt = boost::none;
+#endif // Boost vs. Better optional
+
+	namespace meta {
+		template <typename T>
+		using is_optional = any<is_specialization_of<T, optional>, is_specialization_of<T, std::optional>>;
+
+		template <typename T>
+		constexpr inline bool is_optional_v = is_optional<T>::value;
+	} // namespace meta
+
+	namespace detail {
+		template <typename T>
+		struct associated_nullopt {
+			inline static constexpr std::nullopt_t value = std::nullopt;
+		};
+
+#if SOL_IS_ON(SOL_USE_BOOST)
+		template <typename T>
+		struct associated_nullopt<boost::optional<T>> {
+			inline static SOL_BOOST_NONE_CONSTEXPR_I_ boost::none_t value = boost::none;
+		};
+#endif // Boost nullopt
+
+#if SOL_IS_ON(SOL_USE_BOOST)
+		template <typename T>
+		inline SOL_BOOST_NONE_CONSTEXPR_I_ auto associated_nullopt_v = associated_nullopt<T>::value;
+#else
+		template <typename T>
+		inline constexpr auto associated_nullopt_v = associated_nullopt<T>::value;
+#endif // Boost continues to lag behind, to not many people's surprise...
+	} // namespace detail
+} // namespace sol
+
+#if SOL_IS_ON(SOL_USE_BOOST)
+#undef SOL_BOOST_NONE_CONSTEXPR_I_
+#endif
+
+// end of sol/optional.hpp
+
+// beginning of sol/raii.hpp
+
+#include <memory>
+
+namespace sol {
+	namespace detail {
+		struct default_construct {
+			template <typename T, typename... Args>
+			static void construct(T&& obj, Args&&... args) {
+				typedef meta::unqualified_t<T> Tu;
+				std::allocator<Tu> alloc {};
+				std::allocator_traits<std::allocator<Tu>>::construct(alloc, std::forward<T>(obj), std::forward<Args>(args)...);
+			}
+
+			template <typename T, typename... Args>
+			void operator()(T&& obj, Args&&... args) const {
+				construct(std::forward<T>(obj), std::forward<Args>(args)...);
+			}
+		};
+
+		struct default_destroy {
+			template <typename T>
+			static void destroy(T&& obj) {
+				std::allocator<meta::unqualified_t<T>> alloc {};
+				alloc.destroy(obj);
+			}
+
+			template <typename T>
+			void operator()(T&& obj) const {
+				destroy(std::forward<T>(obj));
+			}
+		};
+
+		struct deleter {
+			template <typename T>
+			void operator()(T* p) const {
+				delete p;
+			}
+		};
+
+		struct state_deleter {
+			void operator()(lua_State* L) const {
+				lua_close(L);
+			}
+		};
+
+		template <typename T, typename Dx, typename... Args>
+		inline std::unique_ptr<T, Dx> make_unique_deleter(Args&&... args) {
+			return std::unique_ptr<T, Dx>(new T(std::forward<Args>(args)...));
+		}
+
+		template <typename Tag, typename T>
+		struct tagged {
+		private:
+			T value_;
+
+		public:
+			template <typename Arg, typename... Args, meta::disable<std::is_same<meta::unqualified_t<Arg>, tagged>> = meta::enabler>
+			tagged(Arg&& arg, Args&&... args) : value_(std::forward<Arg>(arg), std::forward<Args>(args)...) {
+			}
+
+			T& value() & {
+				return value_;
+			}
+
+			T const& value() const& {
+				return value_;
+			}
+
+			T&& value() && {
+				return std::move(value_);
+			}
+		};
+	} // namespace detail
+
+	template <typename... Args>
+	struct constructor_list { };
+
+	template <typename... Args>
+	using constructors = constructor_list<Args...>;
+
+	const auto default_constructor = constructors<types<>> {};
+
+	struct no_construction { };
+	const auto no_constructor = no_construction {};
+
+	struct call_construction { };
+	const auto call_constructor = call_construction {};
+
+	template <typename... Functions>
+	struct constructor_wrapper {
+		std::tuple<Functions...> functions;
+		template <typename Arg, typename... Args, meta::disable<std::is_same<meta::unqualified_t<Arg>, constructor_wrapper>> = meta::enabler>
+		constructor_wrapper(Arg&& arg, Args&&... args) : functions(std::forward<Arg>(arg), std::forward<Args>(args)...) {
+		}
+	};
+
+	template <typename... Functions>
+	inline auto initializers(Functions&&... functions) {
+		return constructor_wrapper<std::decay_t<Functions>...>(std::forward<Functions>(functions)...);
+	}
+
+	template <typename... Functions>
+	struct factory_wrapper {
+		std::tuple<Functions...> functions;
+		template <typename Arg, typename... Args, meta::disable<std::is_same<meta::unqualified_t<Arg>, factory_wrapper>> = meta::enabler>
+		factory_wrapper(Arg&& arg, Args&&... args) : functions(std::forward<Arg>(arg), std::forward<Args>(args)...) {
+		}
+	};
+
+	template <typename... Functions>
+	inline auto factories(Functions&&... functions) {
+		return factory_wrapper<std::decay_t<Functions>...>(std::forward<Functions>(functions)...);
+	}
+
+	template <typename Function>
+	struct destructor_wrapper {
+		Function fx;
+		destructor_wrapper(Function f) : fx(std::move(f)) {
+		}
+	};
+
+	template <>
+	struct destructor_wrapper<void> { };
+
+	const destructor_wrapper<void> default_destructor {};
+
+	template <typename Fx>
+	inline auto destructor(Fx&& fx) {
+		return destructor_wrapper<std::decay_t<Fx>>(std::forward<Fx>(fx));
+	}
+
+} // namespace sol
+
+// end of sol/raii.hpp
+
+// beginning of sol/policies.hpp
+
+#include <array>
+
+namespace sol {
+	namespace detail {
+		struct policy_base_tag { };
+	} // namespace detail
+
+	template <int Target, int... In>
+	struct static_stack_dependencies : detail::policy_base_tag { };
+	typedef static_stack_dependencies<-1, 1> self_dependency;
+	template <int... In>
+	struct returns_self_with : detail::policy_base_tag { };
+	typedef returns_self_with<> returns_self;
+
+	struct stack_dependencies : detail::policy_base_tag {
+		int target;
+		std::array<int, 64> stack_indices;
+		std::size_t len;
+
+		template <typename... Args>
+		stack_dependencies(int stack_target, Args&&... args) : target(stack_target), stack_indices(), len(sizeof...(Args)) {
+			std::size_t i = 0;
+			(void)detail::swallow { int(), (stack_indices[i++] = static_cast<int>(std::forward<Args>(args)), int())... };
+		}
+
+		int& operator[](std::size_t i) {
+			return stack_indices[i];
+		}
+
+		const int& operator[](std::size_t i) const {
+			return stack_indices[i];
+		}
+
+		std::size_t size() const {
+			return len;
+		}
+	};
+
+	template <typename F, typename... Policies>
+	struct policy_wrapper {
+		typedef std::index_sequence_for<Policies...> indices;
+
+		F value;
+		std::tuple<Policies...> policies;
+
+		template <typename Fx, typename... Args, meta::enable<meta::neg<std::is_same<meta::unqualified_t<Fx>, policy_wrapper>>> = meta::enabler>
+		policy_wrapper(Fx&& fx, Args&&... args) : value(std::forward<Fx>(fx)), policies(std::forward<Args>(args)...) {
+		}
+
+		policy_wrapper(const policy_wrapper&) = default;
+		policy_wrapper& operator=(const policy_wrapper&) = default;
+		policy_wrapper(policy_wrapper&&) = default;
+		policy_wrapper& operator=(policy_wrapper&&) = default;
+	};
+
+	template <typename F, typename... Args>
+	auto policies(F&& f, Args&&... args) {
+		return policy_wrapper<std::decay_t<F>, std::decay_t<Args>...>(std::forward<F>(f), std::forward<Args>(args)...);
+	}
+
+	namespace detail {
+		template <typename T>
+		using is_policy = meta::is_specialization_of<T, policy_wrapper>;
+
+		template <typename T>
+		inline constexpr bool is_policy_v = is_policy<T>::value;
+	} // namespace detail
+} // namespace sol
+
+// end of sol/policies.hpp
+
+// beginning of sol/ebco.hpp
+
+#include <type_traits>
+#include <utility>
+#include <memory>
+
+namespace sol { namespace detail {
+
+	template <typename T, std::size_t tag = 0, typename = void>
+	struct ebco {
+		T m_value;
+
+		ebco() = default;
+		ebco(const ebco&) = default;
+		ebco(ebco&&) = default;
+		ebco& operator=(const ebco&) = default;
+		ebco& operator=(ebco&&) = default;
+		ebco(const T& v) noexcept(std::is_nothrow_copy_constructible_v<T>) : m_value(v) {};
+		ebco(T&& v) noexcept(std::is_nothrow_move_constructible_v<T>) : m_value(std::move(v)) {};
+		ebco& operator=(const T& v) noexcept(std::is_nothrow_copy_assignable_v<T>) {
+			m_value = v;
+			return *this;
+		}
+		ebco& operator=(T&& v) noexcept(std::is_nothrow_move_assignable_v<T>) {
+			m_value = std::move(v);
+			return *this;
+		};
+		template <typename Arg, typename... Args,
+			typename = std::enable_if_t<
+			     !std::is_same_v<std::remove_reference_t<std::remove_cv_t<Arg>>,
+			          ebco> && !std::is_same_v<std::remove_reference_t<std::remove_cv_t<Arg>>, T> && (sizeof...(Args) > 0 || !std::is_convertible_v<Arg, T>)>>
+		ebco(Arg&& arg, Args&&... args) noexcept(std::is_nothrow_constructible_v<T, Arg, Args...>)
+		: m_value(std::forward<Arg>(arg), std::forward<Args>(args)...) {
+		}
+
+		T& value() & noexcept {
+			return m_value;
+		}
+
+		T const& value() const& noexcept {
+			return m_value;
+		}
+
+		T&& value() && noexcept {
+			return std::move(m_value);
+		}
+	};
+
+	template <typename T, std::size_t tag>
+	struct ebco<T, tag, std::enable_if_t<!std::is_reference_v<T> && std::is_class_v<T> && !std::is_final_v<T>>> : T {
+		ebco() = default;
+		ebco(const ebco&) = default;
+		ebco(ebco&&) = default;
+		ebco(const T& v) noexcept(std::is_nothrow_copy_constructible_v<T>) : T(v) {};
+		ebco(T&& v) noexcept(std::is_nothrow_move_constructible_v<T>) : T(std::move(v)) {};
+		template <typename Arg, typename... Args,
+			typename = std::enable_if_t<
+			     !std::is_same_v<std::remove_reference_t<std::remove_cv_t<Arg>>,
+			          ebco> && !std::is_same_v<std::remove_reference_t<std::remove_cv_t<Arg>>, T> && (sizeof...(Args) > 0 || !std::is_convertible_v<Arg, T>)>>
+		ebco(Arg&& arg, Args&&... args) noexcept(std::is_nothrow_constructible_v<T, Arg, Args...>) : T(std::forward<Arg>(arg), std::forward<Args>(args)...) {
+		}
+
+		ebco& operator=(const ebco&) = default;
+		ebco& operator=(ebco&&) = default;
+		ebco& operator=(const T& v) noexcept(std::is_nothrow_copy_assignable_v<T>) {
+			static_cast<T&>(*this) = v;
+			return *this;
+		}
+		ebco& operator=(T&& v) noexcept(std::is_nothrow_move_assignable_v<T>) {
+			static_cast<T&>(*this) = std::move(v);
+			return *this;
+		};
+
+		T& value() & noexcept {
+			return static_cast<T&>(*this);
+		}
+
+		T const& value() const& noexcept {
+			return static_cast<T const&>(*this);
+		}
+
+		T&& value() && noexcept {
+			return std::move(static_cast<T&>(*this));
+		}
+	};
+
+	template <typename T, std::size_t tag>
+	struct ebco<T&, tag> {
+	private:
+		T* m_ref;
+
+	public:
+		ebco() = default;
+		ebco(const ebco&) = default;
+		ebco(ebco&&) = default;
+		ebco(T& v) noexcept : m_ref(std::addressof(v)) {};
+
+		ebco& operator=(const ebco&) = default;
+		ebco& operator=(ebco&&) = default;
+		ebco& operator=(T& v) noexcept {
+			m_ref = std::addressof(v);
+			return *this;
+		}
+
+		T& value() const noexcept {
+			return *(const_cast<ebco<T&, tag>&>(*this).m_ref);
+		}
+	};
+
+	template <typename T, std::size_t tag>
+	struct ebco<T&&, tag> {
+		T&& ref;
+
+		ebco() = default;
+		ebco(const ebco&) = delete;
+		ebco(ebco&&) = default;
+		ebco(T&& v) noexcept : ref(v) {};
+
+		ebco& operator=(const ebco&) = delete;
+		ebco& operator=(ebco&&) = delete;
+
+		T& value() & noexcept {
+			return ref;
+		}
+
+		const T& value() const& noexcept {
+			return ref;
+		}
+
+		T&& value() && noexcept {
+			return std::move(ref);
+		}
+	};
+
+}} // namespace sol::detail
+
+// end of sol/ebco.hpp
+
+#include <array>
+#include <initializer_list>
+#include <string>
+#include <string_view>
+#include <limits>
+#include <optional>
+#include <memory>
+#if SOL_IS_ON(SOL_STD_VARIANT)
+#include <variant>
+#endif // variant shenanigans (thanks, Mac OSX)
+
+namespace sol {
+	namespace d {
+		// shortest possible hidden detail namespace
+		// when types are transcribed, this saves
+		// quite a bit of space, actually.
+		// it's a little unfortunate, but here we are?
+		template <typename T>
+		struct u { };
+	} // namespace d
+
+	namespace detail {
+#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE)
+		typedef int (*lua_CFunction_noexcept)(lua_State* L) noexcept;
+#else
+		typedef int (*lua_CFunction_noexcept)(lua_State* L);
+#endif // noexcept function type for lua_CFunction
+
+		template <typename T>
+		struct implicit_wrapper {
+			T& value;
+
+			implicit_wrapper(T* value_) : value(*value_) {
+			}
+
+			implicit_wrapper(T& value_) : value(value_) {
+			}
+
+			operator T&() {
+				return value;
+			}
+
+			operator T*() {
+				return std::addressof(value);
+			}
+		};
+
+		struct yield_tag_t { };
+		inline constexpr yield_tag_t yield_tag {};
+	} // namespace detail
+
+	struct lua_nil_t { };
+	inline constexpr lua_nil_t lua_nil {};
+	inline bool operator==(lua_nil_t, lua_nil_t) {
+		return true;
+	}
+	inline bool operator!=(lua_nil_t, lua_nil_t) {
+		return false;
+	}
+#if SOL_IS_ON(SOL_NIL)
+	using nil_t = lua_nil_t;
+	inline constexpr const nil_t& nil = lua_nil;
+#endif
+
+	namespace detail {
+		struct non_lua_nil_t { };
+	} // namespace detail
+
+	struct metatable_key_t { };
+	inline constexpr metatable_key_t metatable_key {};
+
+	struct global_tag_t {
+	} inline constexpr global_tag {};
+
+	struct env_key_t { };
+	inline constexpr env_key_t env_key {};
+
+	struct no_metatable_t { };
+	inline constexpr no_metatable_t no_metatable {};
+
+	template <typename T>
+	struct yielding_t {
+		T func;
+
+		yielding_t() = default;
+		yielding_t(const yielding_t&) = default;
+		yielding_t(yielding_t&&) = default;
+		yielding_t& operator=(const yielding_t&) = default;
+		yielding_t& operator=(yielding_t&&) = default;
+		template <typename Arg,
+		     meta::enable<meta::neg<std::is_same<meta::unqualified_t<Arg>, yielding_t>>,
+		          meta::neg<std::is_base_of<proxy_base_tag, meta::unqualified_t<Arg>>>> = meta::enabler>
+		yielding_t(Arg&& arg) : func(std::forward<Arg>(arg)) {
+		}
+		template <typename Arg0, typename Arg1, typename... Args>
+		yielding_t(Arg0&& arg0, Arg1&& arg1, Args&&... args) : func(std::forward<Arg0>(arg0), std::forward<Arg1>(arg1), std::forward<Args>(args)...) {
+		}
+	};
+
+	template <typename F>
+	inline yielding_t<std::decay_t<F>> yielding(F&& f) {
+		return yielding_t<std::decay_t<F>>(std::forward<F>(f));
+	}
+
+	typedef std::remove_pointer_t<lua_CFunction> lua_CFunction_ref;
+
+	template <typename T>
+	struct non_null { };
+
+	template <typename... Args>
+	struct function_sig { };
+
+	struct upvalue_index {
+		int index;
+		upvalue_index(int idx) : index(lua_upvalueindex(idx)) {
+		}
+
+		operator int() const {
+			return index;
+		}
+	};
+
+	struct raw_index {
+		int index;
+		raw_index(int i) : index(i) {
+		}
+
+		operator int() const {
+			return index;
+		}
+	};
+
+	struct absolute_index {
+		int index;
+		absolute_index(lua_State* L, int idx) : index(lua_absindex(L, idx)) {
+		}
+
+		operator int() const {
+			return index;
+		}
+	};
+
+	struct ref_index {
+		int index;
+		ref_index(int idx) : index(idx) {
+		}
+
+		operator int() const {
+			return index;
+		}
+	};
+
+	struct stack_count {
+		int count;
+
+		stack_count(int cnt) : count(cnt) {
+		}
+	};
+
+	struct lightuserdata_value {
+		void* value;
+		lightuserdata_value(void* data) : value(data) {
+		}
+		operator void*() const {
+			return value;
+		}
+	};
+
+	struct userdata_value {
+	private:
+		void* m_value;
+
+	public:
+		userdata_value(void* data) : m_value(data) {
+		}
+
+		void* value() const {
+			return m_value;
+		}
+
+		operator void*() const {
+			return value();
+		}
+	};
+
+	template <typename T>
+	struct light {
+	private:
+		static_assert(!std::is_void_v<T>, "the type for light will never be void");
+		T* m_value;
+
+	public:
+		light(T& x) : m_value(std::addressof(x)) {
+		}
+		light(T* x) : m_value(x) {
+		}
+		explicit light(void* x) : m_value(static_cast<T*>(x)) {
+		}
+
+		T* value() const {
+			return m_value;
+		}
+
+		operator T*() const {
+			return m_value;
+		}
+		operator T&() const {
+			return *m_value;
+		}
+
+		void* void_value() const {
+			return m_value;
+		}
+	};
+
+	template <typename T>
+	auto make_light(T& l) {
+		typedef meta::unwrapped_t<std::remove_pointer_t<std::remove_pointer_t<T>>> L;
+		return light<L>(l);
+	}
+
+	template <typename T>
+	struct user : private detail::ebco<T> {
+	private:
+		using base_t = detail::ebco<T>;
+
+	public:
+		using base_t::base_t;
+
+		using base_t::value;
+
+		operator std::add_pointer_t<std::remove_reference_t<T>>() {
+			return std::addressof(this->base_t::value());
+		}
+
+		operator std::add_pointer_t<std::add_const_t<std::remove_reference_t<T>>>() const {
+			return std::addressof(this->base_t::value());
+		}
+
+		operator std::add_lvalue_reference_t<T>() {
+			return this->base_t::value();
+		}
+
+		operator std::add_const_t<std::add_lvalue_reference_t<T>>&() const {
+			return this->base_t::value();
+		}
+	};
+
+	template <typename T>
+	auto make_user(T&& u) {
+		typedef meta::unwrapped_t<meta::unqualified_t<T>> U;
+		return user<U>(std::forward<T>(u));
+	}
+
+	template <typename T>
+	struct metatable_registry_key : private detail::ebco<T> {
+	private:
+		using base_t = detail::ebco<T>;
+
+	public:
+		using base_t::base_t;
+
+		using base_t::value;
+	};
+
+	template <typename T>
+	auto meta_registry_key(T&& key) {
+		typedef meta::unqualified_t<T> K;
+		return metatable_registry_key<K>(std::forward<T>(key));
+	}
+
+	template <typename... Upvalues>
+	struct closure {
+		lua_CFunction c_function;
+		std::tuple<Upvalues...> upvalues;
+		closure(lua_CFunction f, Upvalues... targetupvalues) : c_function(f), upvalues(std::forward<Upvalues>(targetupvalues)...) {
+		}
+	};
+
+	template <>
+	struct closure<> {
+		lua_CFunction c_function;
+		int upvalues;
+		closure(lua_CFunction f, int upvalue_count = 0) : c_function(f), upvalues(upvalue_count) {
+		}
+	};
+
+	typedef closure<> c_closure;
+
+	template <typename... Args>
+	closure<Args...> make_closure(lua_CFunction f, Args&&... args) {
+		return closure<Args...>(f, std::forward<Args>(args)...);
+	}
+
+	template <typename Sig, typename... Ps>
+	struct function_arguments {
+		std::tuple<Ps...> arguments;
+		template <typename Arg, typename... Args, meta::disable<std::is_same<meta::unqualified_t<Arg>, function_arguments>> = meta::enabler>
+		function_arguments(Arg&& arg, Args&&... args) : arguments(std::forward<Arg>(arg), std::forward<Args>(args)...) {
+		}
+	};
+
+	template <typename Sig = function_sig<>, typename... Args>
+	auto as_function(Args&&... args) {
+		return function_arguments<Sig, std::decay_t<Args>...>(std::forward<Args>(args)...);
+	}
+
+	template <typename Sig = function_sig<>, typename... Args>
+	auto as_function_reference(Args&&... args) {
+		return function_arguments<Sig, Args...>(std::forward<Args>(args)...);
+	}
+
+	template <typename T>
+	struct as_table_t : private detail::ebco<T> {
+	private:
+		using base_t = detail::ebco<T>;
+
+	public:
+		as_table_t() = default;
+		as_table_t(const as_table_t&) = default;
+		as_table_t(as_table_t&&) = default;
+		as_table_t& operator=(const as_table_t&) = default;
+		as_table_t& operator=(as_table_t&&) = default;
+		as_table_t(const meta::unqualified_t<T>& obj) noexcept(std::is_nothrow_constructible_v<base_t, const meta::unqualified_t<T>&>) : base_t(obj) {
+		}
+		as_table_t(meta::unqualified_t<T>&& obj) noexcept(std::is_nothrow_constructible_v<base_t, meta::unqualified_t<T>&&>) : base_t(std::move(obj)) {
+		}
+		template <typename Arg, typename... Args,
+		     std::enable_if_t<
+		          !std::is_same_v<as_table_t, meta::unqualified_t<Arg>> && !std::is_same_v<meta::unqualified_t<T>, meta::unqualified_t<Arg>>>* = nullptr>
+		as_table_t(Arg&& arg, Args&&... args) noexcept(std::is_nothrow_constructible_v<base_t, Arg, Args...>)
+		: base_t(std::forward<Arg>(arg), std::forward<Args>(args)...) {
+		}
+
+		using base_t::value;
+
+		operator std::add_lvalue_reference_t<T>() {
+			return this->base_t::value();
+		}
+
+		operator std::add_const_t<std::add_lvalue_reference_t<T>>() const {
+			return this->base_t::value();
+		}
+	};
+
+	template <typename T>
+	struct nested : private detail::ebco<T> {
+	private:
+		using base_t = detail::ebco<T>;
+
+	public:
+		using nested_type = T;
+
+		nested() = default;
+		nested(const nested&) = default;
+		nested(nested&&) = default;
+		nested& operator=(const nested&) = default;
+		nested& operator=(nested&&) = default;
+		nested(const meta::unqualified_t<T>& obj) noexcept(std::is_nothrow_constructible_v<base_t, const meta::unqualified_t<T>&>) : base_t(obj) {
+		}
+		nested(meta::unqualified_t<T>&& obj) noexcept(std::is_nothrow_constructible_v<base_t, meta::unqualified_t<T>&&>) : base_t(std::move(obj)) {
+		}
+		template <typename Arg, typename... Args,
+		     std::enable_if_t<
+		          !std::is_same_v<nested, meta::unqualified_t<Arg>> && !std::is_same_v<meta::unqualified_t<T>, meta::unqualified_t<Arg>>>* = nullptr>
+		nested(Arg&& arg, Args&&... args) noexcept(std::is_nothrow_constructible_v<base_t, Arg, Args...>)
+		: base_t(std::forward<Arg>(arg), std::forward<Args>(args)...) {
+		}
+
+		using base_t::value;
+
+		operator std::add_lvalue_reference_t<T>() {
+			return this->base_t::value();
+		}
+
+		operator std::add_const_t<std::add_lvalue_reference_t<T>>() const {
+			return this->base_t::value();
+		}
+	};
+
+	struct nested_tag_t { };
+	constexpr inline nested_tag_t nested_tag {};
+
+	template <typename T>
+	as_table_t<T> as_table_ref(T&& container) {
+		return as_table_t<T>(std::forward<T>(container));
+	}
+
+	template <typename T>
+	as_table_t<meta::unqualified_t<T>> as_table(T&& container) {
+		return as_table_t<meta::unqualified_t<T>>(std::forward<T>(container));
+	}
+
+	template <typename T>
+	nested<T> as_nested_ref(T&& container) {
+		return nested<T>(std::forward<T>(container));
+	}
+
+	template <typename T>
+	nested<meta::unqualified_t<T>> as_nested(T&& container) {
+		return nested<meta::unqualified_t<T>>(std::forward<T>(container));
+	}
+
+	template <typename T>
+	struct as_container_t : private detail::ebco<T> {
+	private:
+		using base_t = detail::ebco<T>;
+
+	public:
+		using type = T;
+
+		as_container_t() = default;
+		as_container_t(const as_container_t&) = default;
+		as_container_t(as_container_t&&) = default;
+		as_container_t& operator=(const as_container_t&) = default;
+		as_container_t& operator=(as_container_t&&) = default;
+
+		using base_t::base_t;
+
+		using base_t::value;
+
+		operator std::add_lvalue_reference_t<T>() {
+			return value();
+		}
+	};
+
+	template <typename T>
+	auto as_container(T&& value) {
+		return as_container_t<T>(std::forward<T>(value));
+	}
+
+	template <typename T, std::size_t Limit = 15>
+	struct exhaustive_until : private detail::ebco<T> {
+	private:
+		using base_t = detail::ebco<T>;
+
+	public:
+		using base_t::base_t;
+
+		using base_t::value;
+
+		operator std::add_pointer_t<std::remove_reference_t<T>>() {
+			return std::addressof(this->base_t::value());
+		}
+
+		operator std::add_pointer_t<std::add_const_t<std::remove_reference_t<T>>>() const {
+			return std::addressof(this->base_t::value());
+		}
+
+		operator std::add_lvalue_reference_t<T>() {
+			return this->base_t::value();
+		}
+
+		operator std::add_const_t<std::add_lvalue_reference_t<T>>&() const {
+			return this->base_t::value();
+		}
+	};
+
+	template <typename T>
+	using exhaustive = exhaustive_until<T, (std::numeric_limits<size_t>::max)()>;
+
+	template <typename T>
+	struct non_exhaustive : private detail::ebco<T> {
+	private:
+		using base_t = detail::ebco<T>;
+
+	public:
+		using base_t::base_t;
+
+		using base_t::value;
+
+		operator std::add_pointer_t<std::remove_reference_t<T>>() {
+			return std::addressof(this->base_t::value());
+		}
+
+		operator std::add_pointer_t<std::add_const_t<std::remove_reference_t<T>>>() const {
+			return std::addressof(this->base_t::value());
+		}
+
+		operator std::add_lvalue_reference_t<T>() {
+			return this->base_t::value();
+		}
+
+		operator std::add_const_t<std::add_lvalue_reference_t<T>>&() const {
+			return this->base_t::value();
+		}
+	};
+
+	template <typename T>
+	struct push_invoke_t : private detail::ebco<T> {
+	private:
+		using base_t = detail::ebco<T>;
+
+	public:
+		push_invoke_t() = default;
+		push_invoke_t(const push_invoke_t&) = default;
+		push_invoke_t(push_invoke_t&&) = default;
+		push_invoke_t& operator=(const push_invoke_t&) = default;
+		push_invoke_t& operator=(push_invoke_t&&) = default;
+
+		using base_t::base_t;
+
+		using base_t::value;
+	};
+
+	template <typename Fx>
+	auto push_invoke(Fx&& fx) {
+		return push_invoke_t<Fx>(std::forward<Fx>(fx));
+	}
+
+	template <typename T>
+	struct forward_as_value_t : private detail::ebco<T> {
+	private:
+		using base_t = detail::ebco<T>;
+
+	public:
+		forward_as_value_t() = default;
+		forward_as_value_t(const forward_as_value_t&) = default;
+		forward_as_value_t(forward_as_value_t&&) = default;
+		forward_as_value_t& operator=(const forward_as_value_t&) = default;
+		forward_as_value_t& operator=(forward_as_value_t&&) = default;
+
+		using base_t::base_t;
+
+		using base_t::value;
+	};
+
+	template <typename T>
+	auto pass_as_value(T& value_ref_) {
+		return forward_as_value_t<T>(value_ref_);
+	}
+
+	struct override_value_t { };
+	constexpr inline override_value_t override_value = override_value_t();
+	struct update_if_empty_t { };
+	constexpr inline update_if_empty_t update_if_empty = update_if_empty_t();
+	struct create_if_nil_t { };
+	constexpr inline create_if_nil_t create_if_nil = create_if_nil_t();
+
+	namespace detail {
+		enum insert_mode { none = 0x0, update_if_empty = 0x01, override_value = 0x02, create_if_nil = 0x04 };
+
+		template <typename T, typename...>
+		using is_insert_mode = std::integral_constant<bool,
+		     std::is_same_v<T, override_value_t> || std::is_same_v<T, update_if_empty_t> || std::is_same_v<T, create_if_nil_t>>;
+
+		template <typename T, typename...>
+		using is_not_insert_mode = meta::neg<is_insert_mode<T>>;
+	} // namespace detail
+
+	struct this_state {
+		lua_State* L;
+
+		this_state(lua_State* Ls) : L(Ls) {
+		}
+
+		operator lua_State*() const noexcept {
+			return lua_state();
+		}
+
+		lua_State* operator->() const noexcept {
+			return lua_state();
+		}
+
+		lua_State* lua_state() const noexcept {
+			return L;
+		}
+	};
+
+	struct this_main_state {
+		lua_State* L;
+
+		this_main_state(lua_State* Ls) : L(Ls) {
+		}
+
+		operator lua_State*() const noexcept {
+			return lua_state();
+		}
+
+		lua_State* operator->() const noexcept {
+			return lua_state();
+		}
+
+		lua_State* lua_state() const noexcept {
+			return L;
+		}
+	};
+
+	struct new_table {
+		int sequence_hint = 0;
+		int map_hint = 0;
+
+		new_table() = default;
+		new_table(const new_table&) = default;
+		new_table(new_table&&) = default;
+		new_table& operator=(const new_table&) = default;
+		new_table& operator=(new_table&&) = default;
+
+		new_table(int sequence_hint_, int map_hint_ = 0) noexcept : sequence_hint(sequence_hint_), map_hint(map_hint_) {
+		}
+	};
+
+	const new_table create = {};
+
+	enum class lib : unsigned char {
+		// print, assert, and other base functions
+		base,
+		// require and other package functions
+		package,
+		// coroutine functions and utilities
+		coroutine,
+		// string library
+		string,
+		// functionality from the OS
+		os,
+		// all things math
+		math,
+		// the table manipulator and observer functions
+		table,
+		// the debug library
+		debug,
+		// the bit library: different based on which you're using
+		bit32,
+		// input/output library
+		io,
+		// LuaJIT only
+		ffi,
+		// LuaJIT only
+		jit,
+		// library for handling utf8: new to Lua
+		utf8,
+		// do not use
+		count
+	};
+
+	enum class call_syntax { dot = 0, colon = 1 };
+
+	enum class load_mode {
+		any = 0,
+		text = 1,
+		binary = 2,
+	};
+
+	enum class call_status : int {
+		ok = LUA_OK,
+		yielded = LUA_YIELD,
+		runtime = LUA_ERRRUN,
+		memory = LUA_ERRMEM,
+		handler = LUA_ERRERR,
+		gc = LUA_ERRGCMM,
+		syntax = LUA_ERRSYNTAX,
+		file = LUA_ERRFILE,
+	};
+
+	enum class thread_status : int {
+		ok = LUA_OK,
+		yielded = LUA_YIELD,
+		runtime = LUA_ERRRUN,
+		memory = LUA_ERRMEM,
+		gc = LUA_ERRGCMM,
+		handler = LUA_ERRERR,
+		dead = -1,
+	};
+
+	enum class load_status : int {
+		ok = LUA_OK,
+		syntax = LUA_ERRSYNTAX,
+		memory = LUA_ERRMEM,
+		gc = LUA_ERRGCMM,
+		file = LUA_ERRFILE,
+	};
+
+	enum class gc_mode : int {
+		incremental = 0,
+		generational = 1,
+		default_value = incremental,
+	};
+
+	enum class type : int {
+		none = LUA_TNONE,
+		lua_nil = LUA_TNIL,
+#if SOL_IS_ON(SOL_NIL)
+		nil = lua_nil,
+#endif // Objective C/C++ Keyword that's found in OSX SDK and OBJC -- check for all forms to protect
+		string = LUA_TSTRING,
+		number = LUA_TNUMBER,
+		thread = LUA_TTHREAD,
+		boolean = LUA_TBOOLEAN,
+		function = LUA_TFUNCTION,
+		userdata = LUA_TUSERDATA,
+		lightuserdata = LUA_TLIGHTUSERDATA,
+		table = LUA_TTABLE,
+		poly = -0xFFFF
+	};
+
+	inline const std::string& to_string(call_status c) {
+		static const std::array<std::string, 10> names { { "ok",
+			"yielded",
+			"runtime",
+			"memory",
+			"handler",
+			"gc",
+			"syntax",
+			"file",
+			"CRITICAL_EXCEPTION_FAILURE",
+			"CRITICAL_INDETERMINATE_STATE_FAILURE" } };
+		switch (c) {
+		case call_status::ok:
+			return names[0];
+		case call_status::yielded:
+			return names[1];
+		case call_status::runtime:
+			return names[2];
+		case call_status::memory:
+			return names[3];
+		case call_status::handler:
+			return names[4];
+		case call_status::gc:
+			return names[5];
+		case call_status::syntax:
+			return names[6];
+		case call_status::file:
+			return names[7];
+		}
+		if (static_cast<std::ptrdiff_t>(c) == -1) {
+			// One of the many cases where a critical exception error has occurred
+			return names[8];
+		}
+		return names[9];
+	}
+
+	inline bool is_indeterminate_call_failure(call_status c) {
+		switch (c) {
+		case call_status::ok:
+		case call_status::yielded:
+		case call_status::runtime:
+		case call_status::memory:
+		case call_status::handler:
+		case call_status::gc:
+		case call_status::syntax:
+		case call_status::file:
+			return false;
+		}
+		return true;
+	}
+
+	inline const std::string& to_string(load_status c) {
+		static const std::array<std::string, 7> names {
+			{ "ok", "memory", "gc", "syntax", "file", "CRITICAL_EXCEPTION_FAILURE", "CRITICAL_INDETERMINATE_STATE_FAILURE" }
+		};
+		switch (c) {
+		case load_status::ok:
+			return names[0];
+		case load_status::memory:
+			return names[1];
+		case load_status::gc:
+			return names[2];
+		case load_status::syntax:
+			return names[3];
+		case load_status::file:
+			return names[4];
+		}
+		if (static_cast<int>(c) == -1) {
+			// One of the many cases where a critical exception error has occurred
+			return names[5];
+		}
+		return names[6];
+	}
+
+	inline const std::string& to_string(load_mode c) {
+		static const std::array<std::string, 3> names { {
+			"bt",
+			"t",
+			"b",
+		} };
+		return names[static_cast<std::size_t>(c)];
+	}
+
+	enum class meta_function : unsigned {
+		construct,
+		index,
+		new_index,
+		mode,
+		call,
+		call_function = call,
+		metatable,
+		to_string,
+		length,
+		unary_minus,
+		addition,
+		subtraction,
+		multiplication,
+		division,
+		modulus,
+		power_of,
+		involution = power_of,
+		concatenation,
+		equal_to,
+		less_than,
+		less_than_or_equal_to,
+		garbage_collect,
+		floor_division,
+		bitwise_left_shift,
+		bitwise_right_shift,
+		bitwise_not,
+		bitwise_and,
+		bitwise_or,
+		bitwise_xor,
+		pairs,
+		ipairs,
+		next,
+		type,
+		type_info,
+		call_construct,
+		storage,
+		gc_names,
+		static_index,
+		static_new_index,
+	};
+
+	typedef meta_function meta_method;
+
+	inline const std::array<std::string, 37>& meta_function_names() {
+		static const std::array<std::string, 37> names = { { "new",
+			"__index",
+			"__newindex",
+			"__mode",
+			"__call",
+			"__metatable",
+			"__tostring",
+			"__len",
+			"__unm",
+			"__add",
+			"__sub",
+			"__mul",
+			"__div",
+			"__mod",
+			"__pow",
+			"__concat",
+			"__eq",
+			"__lt",
+			"__le",
+			"__gc",
+
+			"__idiv",
+			"__shl",
+			"__shr",
+			"__bnot",
+			"__band",
+			"__bor",
+			"__bxor",
+
+			"__pairs",
+			"__ipairs",
+			"next",
+
+			"__type",
+			"__typeinfo",
+			"__sol.call_new",
+			"__sol.storage",
+			"__sol.gc_names",
+			"__sol.static_index",
+			"__sol.static_new_index" } };
+		return names;
+	}
+
+	inline const std::string& to_string(meta_function mf) {
+		return meta_function_names()[static_cast<std::size_t>(mf)];
+	}
+
+	inline type type_of(lua_State* L, int index) {
+		return static_cast<type>(lua_type(L, index));
+	}
+
+	inline std::string type_name(lua_State* L, type t) {
+		return lua_typename(L, static_cast<int>(t));
+	}
+
+	template <typename T>
+	struct is_stateless_lua_reference
+	: std::integral_constant<bool,
+	       (std::is_base_of_v<stateless_stack_reference, T> || std::is_base_of_v<stateless_reference, T>)&&(
+	            !std::is_base_of_v<stack_reference, T> && !std::is_base_of_v<reference, T> && !std::is_base_of_v<main_reference, T>)> { };
+
+	template <typename T>
+	inline constexpr bool is_stateless_lua_reference_v = is_stateless_lua_reference<T>::value;
+
+	template <typename T>
+	struct is_lua_reference
+	: std::integral_constant<bool,
+	       std::is_base_of_v<reference,
+	            T> || std::is_base_of_v<main_reference, T> || std::is_base_of_v<stack_reference, T> || std::is_base_of_v<stateless_stack_reference, T> || std::is_base_of_v<stateless_reference, T>> {
+	};
+
+	template <typename T>
+	inline constexpr bool is_lua_reference_v = is_lua_reference<T>::value;
+
+	template <typename T>
+	struct is_lua_reference_or_proxy : std::integral_constant<bool, is_lua_reference_v<T> || meta::is_specialization_of_v<T, table_proxy>> { };
+
+	template <typename T>
+	inline constexpr bool is_lua_reference_or_proxy_v = is_lua_reference_or_proxy<T>::value;
+
+	template <typename T>
+	struct is_transparent_argument
+	: std::integral_constant<bool,
+	       std::is_same_v<meta::unqualified_t<T>,
+	            this_state> || std::is_same_v<meta::unqualified_t<T>, this_main_state> || std::is_same_v<meta::unqualified_t<T>, this_environment> || std::is_same_v<meta::unqualified_t<T>, variadic_args>> {
+	};
+
+	template <typename T>
+	constexpr inline bool is_transparent_argument_v = is_transparent_argument<T>::value;
+
+	template <typename T>
+	struct is_variadic_arguments : meta::any<std::is_same<T, variadic_args>, meta::is_optional<T>> { };
+
+	template <typename T>
+	struct is_container
+	: std::integral_constant<bool,
+	       !std::is_same_v<state_view,
+	            T> && !std::is_same_v<state, T> && !meta::is_initializer_list_v<T> && !meta::is_string_like_v<T> && !meta::is_string_literal_array_v<T> && !is_transparent_argument_v<T> && !is_lua_reference_v<T> && (meta::has_begin_end_v<T> || std::is_array_v<T>)> {
+	};
+
+	template <typename T>
+	constexpr inline bool is_container_v = is_container<T>::value;
+
+	template <typename T>
+	struct is_to_stringable : meta::any<meta::supports_to_string_member<meta::unqualified_t<T>>, meta::supports_adl_to_string<meta::unqualified_t<T>>,
+	                               meta::supports_op_left_shift<std::ostream, meta::unqualified_t<T>>> { };
+
+	template <typename T>
+	inline constexpr bool is_to_stringable_v = is_to_stringable<T>::value;
+
+	template <typename T>
+	struct is_callable : std::true_type { };
+
+	template <typename T>
+	inline constexpr bool is_callable_v = is_callable<T>::value;
+
+	namespace detail {
+		template <typename T, typename = void>
+		struct lua_type_of : std::integral_constant<type, type::userdata> { };
+
+		template <typename C, typename T, typename A>
+		struct lua_type_of<std::basic_string<C, T, A>> : std::integral_constant<type, type::string> { };
+
+		template <typename C, typename T>
+		struct lua_type_of<basic_string_view<C, T>> : std::integral_constant<type, type::string> { };
+
+		template <std::size_t N>
+		struct lua_type_of<char[N]> : std::integral_constant<type, type::string> { };
+
+		template <std::size_t N>
+		struct lua_type_of<wchar_t[N]> : std::integral_constant<type, type::string> { };
+
+#if SOL_IS_ON(SOL_CHAR8_T)
+		template <std::size_t N>
+		struct lua_type_of<char8_t[N]> : std::integral_constant<type, type::string> { };
+#endif
+
+		template <std::size_t N>
+		struct lua_type_of<char16_t[N]> : std::integral_constant<type, type::string> { };
+
+		template <std::size_t N>
+		struct lua_type_of<char32_t[N]> : std::integral_constant<type, type::string> { };
+
+		template <>
+		struct lua_type_of<char> : std::integral_constant<type, type::string> { };
+
+		template <>
+		struct lua_type_of<wchar_t> : std::integral_constant<type, type::string> { };
+
+#if SOL_IS_ON(SOL_CHAR8_T)
+		template <>
+		struct lua_type_of<char8_t> : std::integral_constant<type, type::string> { };
+#endif
+
+		template <>
+		struct lua_type_of<char16_t> : std::integral_constant<type, type::string> { };
+
+		template <>
+		struct lua_type_of<char32_t> : std::integral_constant<type, type::string> { };
+
+		template <>
+		struct lua_type_of<const char*> : std::integral_constant<type, type::string> { };
+
+		template <>
+		struct lua_type_of<const wchar_t*> : std::integral_constant<type, type::string> { };
+
+#if SOL_IS_ON(SOL_CHAR8_T)
+		template <>
+		struct lua_type_of<const char8_t*> : std::integral_constant<type, type::string> { };
+#endif
+
+		template <>
+		struct lua_type_of<const char16_t*> : std::integral_constant<type, type::string> { };
+
+		template <>
+		struct lua_type_of<const char32_t*> : std::integral_constant<type, type::string> { };
+
+		template <>
+		struct lua_type_of<bool> : std::integral_constant<type, type::boolean> { };
+
+		template <>
+		struct lua_type_of<lua_nil_t> : std::integral_constant<type, type::lua_nil> { };
+
+		template <>
+		struct lua_type_of<nullopt_t> : std::integral_constant<type, type::lua_nil> { };
+
+		template <>
+		struct lua_type_of<lua_value> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<detail::non_lua_nil_t> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<std::nullptr_t> : std::integral_constant<type, type::lua_nil> { };
+
+		template <>
+		struct lua_type_of<error> : std::integral_constant<type, type::string> { };
+
+		template <bool b, typename Base>
+		struct lua_type_of<basic_table_core<b, Base>> : std::integral_constant<type, type::table> { };
+
+		template <typename Base>
+		struct lua_type_of<basic_lua_table<Base>> : std::integral_constant<type, type::table> { };
+
+		template <typename Base>
+		struct lua_type_of<basic_metatable<Base>> : std::integral_constant<type, type::table> { };
+
+		template <typename T, typename Base>
+		struct lua_type_of<basic_usertype<T, Base>> : std::integral_constant<type, type::table> { };
+
+		template <>
+		struct lua_type_of<metatable_key_t> : std::integral_constant<type, type::table> { };
+
+		template <typename B>
+		struct lua_type_of<basic_environment<B>> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<env_key_t> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<new_table> : std::integral_constant<type, type::table> { };
+
+		template <typename T>
+		struct lua_type_of<as_table_t<T>> : std::integral_constant<type, type::table> { };
+
+		template <typename T>
+		struct lua_type_of<std::initializer_list<T>> : std::integral_constant<type, type::table> { };
+
+		template <bool b>
+		struct lua_type_of<basic_reference<b>> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<stack_reference> : std::integral_constant<type, type::poly> { };
+
+		template <typename Base>
+		struct lua_type_of<basic_object<Base>> : std::integral_constant<type, type::poly> { };
+
+		template <typename... Args>
+		struct lua_type_of<std::tuple<Args...>> : std::integral_constant<type, type::poly> { };
+
+		template <typename A, typename B>
+		struct lua_type_of<std::pair<A, B>> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<void*> : std::integral_constant<type, type::lightuserdata> { };
+
+		template <>
+		struct lua_type_of<const void*> : std::integral_constant<type, type::lightuserdata> { };
+
+		template <>
+		struct lua_type_of<lightuserdata_value> : std::integral_constant<type, type::lightuserdata> { };
+
+		template <>
+		struct lua_type_of<userdata_value> : std::integral_constant<type, type::userdata> { };
+
+		template <typename T>
+		struct lua_type_of<light<T>> : std::integral_constant<type, type::lightuserdata> { };
+
+		template <typename T>
+		struct lua_type_of<user<T>> : std::integral_constant<type, type::userdata> { };
+
+		template <typename Base>
+		struct lua_type_of<basic_lightuserdata<Base>> : std::integral_constant<type, type::lightuserdata> { };
+
+		template <typename Base>
+		struct lua_type_of<basic_userdata<Base>> : std::integral_constant<type, type::userdata> { };
+
+		template <>
+		struct lua_type_of<lua_CFunction> : std::integral_constant<type, type::function> { };
+
+		template <>
+		struct lua_type_of<std::remove_pointer_t<lua_CFunction>> : std::integral_constant<type, type::function> { };
+
+		template <typename Base, bool aligned>
+		struct lua_type_of<basic_function<Base, aligned>> : std::integral_constant<type, type::function> { };
+
+		template <typename Base, bool aligned, typename Handler>
+		struct lua_type_of<basic_protected_function<Base, aligned, Handler>> : std::integral_constant<type, type::function> { };
+
+		template <typename Base>
+		struct lua_type_of<basic_coroutine<Base>> : std::integral_constant<type, type::function> { };
+
+		template <typename Base>
+		struct lua_type_of<basic_thread<Base>> : std::integral_constant<type, type::thread> { };
+
+		template <typename Signature>
+		struct lua_type_of<std::function<Signature>> : std::integral_constant<type, type::function> { };
+
+		template <typename T>
+		struct lua_type_of<optional<T>> : std::integral_constant<type, type::poly> { };
+
+		template <typename T>
+		struct lua_type_of<std::optional<T>> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<variadic_args> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<variadic_results> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<stack_count> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<this_state> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<this_main_state> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<this_environment> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<type> : std::integral_constant<type, type::poly> { };
+
+#if SOL_IS_ON(SOL_GET_FUNCTION_POINTER_UNSAFE)
+		template <typename T>
+		struct lua_type_of<T*> : std::integral_constant<type, std::is_function_v<T> ? type::function : type::userdata> { };
+#else
+		template <typename T>
+		struct lua_type_of<T*> : std::integral_constant<type, type::userdata> { };
+#endif
+
+		template <typename T>
+		struct lua_type_of<T, std::enable_if_t<std::is_arithmetic_v<T> || std::is_same_v<T, lua_Number> || std::is_same_v<T, lua_Integer>>>
+		: std::integral_constant<type, type::number> { };
+
+		template <typename T>
+		struct lua_type_of<T, std::enable_if_t<std::is_function_v<T>>> : std::integral_constant<type, type::function> { };
+
+		template <typename T>
+		struct lua_type_of<T, std::enable_if_t<std::is_enum_v<T>>> : std::integral_constant<type, type::number> { };
+
+		template <>
+		struct lua_type_of<meta_function> : std::integral_constant<type, type::string> { };
+
+#if SOL_IS_ON(SOL_STD_VARIANT)
+		template <typename... Tn>
+		struct lua_type_of<std::variant<Tn...>> : std::integral_constant<type, type::poly> { };
+#endif // std::variant deployment sucks on Clang
+
+		template <typename T>
+		struct lua_type_of<nested<T>> : meta::conditional_t<::sol::is_container_v<T>, std::integral_constant<type, type::table>, lua_type_of<T>> { };
+
+		template <typename C, C v, template <typename...> class V, typename... Args>
+		struct accumulate : std::integral_constant<C, v> { };
+
+		template <typename C, C v, template <typename...> class V, typename T, typename... Args>
+		struct accumulate<C, v, V, T, Args...> : accumulate<C, v + V<T>::value, V, Args...> { };
+
+		template <typename C, C v, template <typename...> class V, typename List>
+		struct accumulate_list;
+
+		template <typename C, C v, template <typename...> class V, typename... Args>
+		struct accumulate_list<C, v, V, types<Args...>> : accumulate<C, v, V, Args...> { };
+	} // namespace detail
+
+	template <typename T>
+	struct lua_type_of : detail::lua_type_of<T> {
+		typedef int SOL_INTERNAL_UNSPECIALIZED_MARKER_;
+	};
+
+	template <typename T>
+	inline constexpr type lua_type_of_v = lua_type_of<T>::value;
+
+	template <typename T>
+	struct lua_size : std::integral_constant<int, 1> {
+		typedef int SOL_INTERNAL_UNSPECIALIZED_MARKER_;
+	};
+
+	template <typename A, typename B>
+	struct lua_size<std::pair<A, B>> : std::integral_constant<int, lua_size<A>::value + lua_size<B>::value> { };
+
+	template <typename... Args>
+	struct lua_size<std::tuple<Args...>> : std::integral_constant<int, detail::accumulate<int, 0, lua_size, Args...>::value> { };
+
+	template <typename T>
+	inline constexpr int lua_size_v = lua_size<T>::value;
+
+	namespace detail {
+		// MSVC's decltype detection is broken, which breaks other
+		// parts of the code. So we add more workarounds. The moment it's fixed,
+		// we take it away and break everyone that doesn't upgrade.
+		template <typename T>
+		using is_msvc_callable_rigged = meta::any<meta::is_specialization_of<T, push_invoke_t>, meta::is_specialization_of<T, as_table_t>,
+		     meta::is_specialization_of<T, forward_as_value_t>, meta::is_specialization_of<T, as_container_t>, meta::is_specialization_of<T, nested>,
+		     meta::is_specialization_of<T, yielding_t>>;
+
+		template <typename T>
+		inline constexpr bool is_msvc_callable_rigged_v = is_msvc_callable_rigged<T>::value;
+	} // namespace detail
+
+	template <typename T>
+	struct is_lua_primitive : std::integral_constant<bool,
+	                               type::userdata != lua_type_of_v<T>                                   // cf
+	                                    || ((type::userdata == lua_type_of_v<T>)                        // cf
+	                                         &&meta::meta_detail::has_internal_marker_v<lua_type_of<T>> // cf
+	                                         && !meta::meta_detail::has_internal_marker_v<lua_size<T>>) // cf
+	                                    || is_lua_reference_or_proxy_v<T>                               // cf
+	                                    || meta::is_specialization_of_v<T, std::tuple>                  // cf
+	                                    || meta::is_specialization_of_v<T, std::pair>> { };
+
+	template <typename T>
+	constexpr inline bool is_lua_primitive_v = is_lua_primitive<T>::value;
+
+	template <typename T>
+	struct is_value_semantic_for_function
+#if SOL_IS_ON(SOL_FUNCTION_CALL_VALUE_SEMANTICS)
+	: std::true_type {
+	};
+#else
+	: std::false_type {
+	};
+#endif
+
+	template <typename T>
+	constexpr inline bool is_value_semantic_for_function_v = is_value_semantic_for_function<T>::value;
+
+	template <typename T>
+	struct is_main_threaded : std::is_base_of<main_reference, T> { };
+
+	template <typename T>
+	inline constexpr bool is_main_threaded_v = is_main_threaded<T>::value;
+
+	template <typename T>
+	struct is_stack_based : std::is_base_of<stack_reference, T> { };
+	template <>
+	struct is_stack_based<variadic_args> : std::true_type { };
+	template <>
+	struct is_stack_based<unsafe_function_result> : std::true_type { };
+	template <>
+	struct is_stack_based<protected_function_result> : std::true_type { };
+	template <>
+	struct is_stack_based<stack_proxy> : std::true_type { };
+	template <>
+	struct is_stack_based<stack_proxy_base> : std::true_type { };
+	template <>
+	struct is_stack_based<stack_count> : std::true_type { };
+
+	template <typename T>
+	constexpr inline bool is_stack_based_v = is_stack_based<T>::value;
+
+	template <typename T>
+	struct is_lua_primitive<T*> : std::true_type { };
+	template <>
+	struct is_lua_primitive<unsafe_function_result> : std::true_type { };
+	template <>
+	struct is_lua_primitive<protected_function_result> : std::true_type { };
+	template <typename T>
+	struct is_lua_primitive<std::reference_wrapper<T>> : std::true_type { };
+	template <typename T>
+	struct is_lua_primitive<user<T>> : std::true_type { };
+	template <typename T>
+	struct is_lua_primitive<light<T>> : is_lua_primitive<T*> { };
+	template <typename T>
+	struct is_lua_primitive<optional<T>> : std::true_type { };
+	template <typename T>
+	struct is_lua_primitive<std::optional<T>> : std::true_type { };
+	template <typename T>
+	struct is_lua_primitive<as_table_t<T>> : std::true_type { };
+	template <typename T>
+	struct is_lua_primitive<nested<T>> : std::true_type { };
+	template <>
+	struct is_lua_primitive<userdata_value> : std::true_type { };
+	template <>
+	struct is_lua_primitive<lightuserdata_value> : std::true_type { };
+	template <>
+	struct is_lua_primitive<stack_proxy> : std::true_type { };
+	template <>
+	struct is_lua_primitive<stack_proxy_base> : std::true_type { };
+	template <typename T>
+	struct is_lua_primitive<non_null<T>> : is_lua_primitive<T*> { };
+
+	template <typename T>
+	struct is_lua_index : std::is_integral<T> { };
+	template <>
+	struct is_lua_index<raw_index> : std::true_type { };
+	template <>
+	struct is_lua_index<absolute_index> : std::true_type { };
+	template <>
+	struct is_lua_index<ref_index> : std::true_type { };
+	template <>
+	struct is_lua_index<upvalue_index> : std::true_type { };
+
+	template <typename Signature>
+	struct lua_bind_traits : meta::bind_traits<Signature> {
+	private:
+		typedef meta::bind_traits<Signature> base_t;
+
+	public:
+		typedef std::integral_constant<bool, meta::count_for<is_variadic_arguments, typename base_t::args_list>::value != 0> runtime_variadics_t;
+		static const std::size_t true_arity = base_t::arity;
+		static const std::size_t arity = detail::accumulate_list<std::size_t, 0, lua_size, typename base_t::args_list>::value
+		     - meta::count_for<is_transparent_argument, typename base_t::args_list>::value;
+		static const std::size_t true_free_arity = base_t::free_arity;
+		static const std::size_t free_arity = detail::accumulate_list<std::size_t, 0, lua_size, typename base_t::free_args_list>::value
+		     - meta::count_for<is_transparent_argument, typename base_t::args_list>::value;
+	};
+
+	template <typename T>
+	struct is_table : std::false_type { };
+	template <bool x, typename T>
+	struct is_table<basic_table_core<x, T>> : std::true_type { };
+	template <typename T>
+	struct is_table<basic_lua_table<T>> : std::true_type { };
+
+	template <typename T>
+	inline constexpr bool is_table_v = is_table<T>::value;
+
+	template <typename T>
+	struct is_global_table : std::false_type { };
+	template <typename T>
+	struct is_global_table<basic_table_core<true, T>> : std::true_type { };
+
+	template <typename T>
+	inline constexpr bool is_global_table_v = is_global_table<T>::value;
+
+	template <typename T>
+	struct is_stack_table : std::false_type { };
+	template <bool x, typename T>
+	struct is_stack_table<basic_table_core<x, T>> : std::integral_constant<bool, std::is_base_of_v<stack_reference, T>> { };
+	template <typename T>
+	struct is_stack_table<basic_lua_table<T>> : std::integral_constant<bool, std::is_base_of_v<stack_reference, T>> { };
+
+	template <typename T>
+	inline constexpr bool is_stack_table_v = is_stack_table<T>::value;
+
+	template <typename T>
+	struct is_function : std::false_type { };
+	template <typename T, bool aligned>
+	struct is_function<basic_function<T, aligned>> : std::true_type { };
+	template <typename T, bool aligned, typename Handler>
+	struct is_function<basic_protected_function<T, aligned, Handler>> : std::true_type { };
+
+	template <typename T>
+	using is_lightuserdata = meta::is_specialization_of<T, basic_lightuserdata>;
+
+	template <typename T>
+	inline constexpr bool is_lightuserdata_v = is_lightuserdata<T>::value;
+
+	template <typename T>
+	using is_userdata = meta::is_specialization_of<T, basic_userdata>;
+
+	template <typename T>
+	inline constexpr bool is_userdata_v = is_userdata<T>::value;
+
+	template <typename T>
+	using is_environment = std::integral_constant<bool, is_userdata_v<T> || is_table_v<T> || meta::is_specialization_of_v<T, basic_environment>>;
+
+	template <typename T>
+	inline constexpr bool is_environment_v = is_environment<T>::value;
+
+	template <typename T>
+	using is_table_like = std::integral_constant<bool, is_table_v<T> || is_environment_v<T> || is_userdata_v<T>>;
+
+	template <typename T>
+	inline constexpr bool is_table_like_v = is_table_like<T>::value;
+
+	template <typename T>
+	struct is_automagical
+	: std::integral_constant<bool,
+	       (SOL_IS_ON(SOL_DEFAULT_AUTOMAGICAL_USERTYPES))
+	            || (std::is_array_v<
+	                     meta::unqualified_t<T>> || (!std::is_same_v<meta::unqualified_t<T>, state> && !std::is_same_v<meta::unqualified_t<T>, state_view>))> {
+	};
+
+	template <typename T>
+	inline type type_of() {
+		return lua_type_of<meta::unqualified_t<T>>::value;
+	}
+
+	namespace detail {
+		template <typename T>
+		struct is_non_factory_constructor : std::false_type { };
+
+		template <typename... Args>
+		struct is_non_factory_constructor<constructors<Args...>> : std::true_type { };
+
+		template <typename... Args>
+		struct is_non_factory_constructor<constructor_wrapper<Args...>> : std::true_type { };
+
+		template <>
+		struct is_non_factory_constructor<no_construction> : std::true_type { };
+
+		template <typename T>
+		inline constexpr bool is_non_factory_constructor_v = is_non_factory_constructor<T>::value;
+
+		template <typename T>
+		struct is_constructor : is_non_factory_constructor<T> { };
+
+		template <typename... Args>
+		struct is_constructor<factory_wrapper<Args...>> : std::true_type { };
+
+		template <typename T>
+		struct is_constructor<protect_t<T>> : is_constructor<meta::unqualified_t<T>> { };
+
+		template <typename F, typename... Policies>
+		struct is_constructor<policy_wrapper<F, Policies...>> : is_constructor<meta::unqualified_t<F>> { };
+
+		template <typename T>
+		inline constexpr bool is_constructor_v = is_constructor<T>::value;
+
+		template <typename... Args>
+		using any_is_constructor = meta::any<is_constructor<meta::unqualified_t<Args>>...>;
+
+		template <typename... Args>
+		inline constexpr bool any_is_constructor_v = any_is_constructor<Args...>::value;
+
+		template <typename T>
+		struct is_destructor : std::false_type { };
+
+		template <typename Fx>
+		struct is_destructor<destructor_wrapper<Fx>> : std::true_type { };
+
+		template <typename... Args>
+		using any_is_destructor = meta::any<is_destructor<meta::unqualified_t<Args>>...>;
+
+		template <typename... Args>
+		inline constexpr bool any_is_destructor_v = any_is_destructor<Args...>::value;
+	} // namespace detail
+
+	template <typename T>
+	using is_lua_c_function = meta::any<std::is_same<lua_CFunction, T>, std::is_same<detail::lua_CFunction_noexcept, T>, std::is_same<lua_CFunction_ref, T>>;
+
+	template <typename T>
+	inline constexpr bool is_lua_c_function_v = is_lua_c_function<T>::value;
+
+	enum class automagic_flags : unsigned {
+		none = 0x000u,
+		default_constructor = 0x001,
+		destructor = 0x002u,
+		pairs_operator = 0x004u,
+		to_string_operator = 0x008u,
+		call_operator = 0x010u,
+		less_than_operator = 0x020u,
+		less_than_or_equal_to_operator = 0x040u,
+		length_operator = 0x080u,
+		equal_to_operator = 0x100u,
+		all = default_constructor | destructor | pairs_operator | to_string_operator | call_operator | less_than_operator | less_than_or_equal_to_operator
+		     | length_operator | equal_to_operator
+	};
+
+	inline constexpr automagic_flags operator|(automagic_flags left, automagic_flags right) noexcept {
+		return static_cast<automagic_flags>(
+		     static_cast<std::underlying_type_t<automagic_flags>>(left) | static_cast<std::underlying_type_t<automagic_flags>>(right));
+	}
+
+	inline constexpr automagic_flags operator&(automagic_flags left, automagic_flags right) noexcept {
+		return static_cast<automagic_flags>(
+		     static_cast<std::underlying_type_t<automagic_flags>>(left) & static_cast<std::underlying_type_t<automagic_flags>>(right));
+	}
+
+	inline constexpr automagic_flags& operator|=(automagic_flags& left, automagic_flags right) noexcept {
+		left = left | right;
+		return left;
+	}
+
+	inline constexpr automagic_flags& operator&=(automagic_flags& left, automagic_flags right) noexcept {
+		left = left & right;
+		return left;
+	}
+
+	template <typename Left, typename Right>
+	constexpr bool has_flag(Left left, Right right) noexcept {
+		return (left & right) == right;
+	}
+
+	template <typename Left, typename Right>
+	constexpr bool has_any_flag(Left left, Right right) noexcept {
+		return (left & right) != static_cast<Left>(static_cast<std::underlying_type_t<Left>>(0));
+	}
+
+	template <typename Left, typename Right>
+	constexpr auto clear_flags(Left left, Right right) noexcept {
+		return static_cast<Left>(static_cast<std::underlying_type_t<Left>>(left) & ~static_cast<std::underlying_type_t<Right>>(right));
+	}
+
+	struct automagic_enrollments {
+		bool default_constructor = true;
+		bool destructor = true;
+		bool pairs_operator = true;
+		bool to_string_operator = true;
+		bool call_operator = true;
+		bool less_than_operator = true;
+		bool less_than_or_equal_to_operator = true;
+		bool length_operator = true;
+		bool equal_to_operator = true;
+	};
+
+	template <automagic_flags compile_time_defaults = automagic_flags::all>
+	struct constant_automagic_enrollments : public automagic_enrollments { };
+
+} // namespace sol
+
+// end of sol/types.hpp
+
+#include <exception>
+#include <cstring>
+
+#if SOL_IS_ON(SOL_PRINT_ERRORS)
+#include <iostream>
+#endif
+
+namespace sol {
+	// must push a single object to be the error object
+	// NOTE: the VAST MAJORITY of all Lua libraries -- C or otherwise -- expect a string for the type of error
+	// break this convention at your own risk
+	using exception_handler_function = int (*)(lua_State*, optional<const std::exception&>, string_view);
+
+	namespace detail {
+		inline const char (&default_exception_handler_name())[11] {
+			static const char name[11] = "sol.\xE2\x98\xA2\xE2\x98\xA2";
+			return name;
+		}
+
+		// must push at least 1 object on the stack
+		inline int default_exception_handler(lua_State* L, optional<const std::exception&>, string_view what) {
+#if SOL_IS_ON(SOL_PRINT_ERRORS)
+			std::cerr << "[sol2] An exception occurred: ";
+			std::cerr.write(what.data(), static_cast<std::streamsize>(what.size()));
+			std::cerr << std::endl;
+#endif
+			lua_pushlstring(L, what.data(), what.size());
+			return 1;
+		}
+
+		inline int call_exception_handler(lua_State* L, optional<const std::exception&> maybe_ex, string_view what) {
+			lua_getglobal(L, default_exception_handler_name());
+			type t = static_cast<type>(lua_type(L, -1));
+			if (t != type::lightuserdata) {
+				lua_pop(L, 1);
+				return default_exception_handler(L, std::move(maybe_ex), std::move(what));
+			}
+			void* vfunc = lua_touserdata(L, -1);
+			lua_pop(L, 1);
+			if (vfunc == nullptr) {
+				return default_exception_handler(L, std::move(maybe_ex), std::move(what));
+			}
+			exception_handler_function exfunc = reinterpret_cast<exception_handler_function>(vfunc);
+			return exfunc(L, std::move(maybe_ex), std::move(what));
+		}
+
+#if SOL_IS_OFF(SOL_EXCEPTIONS)
+		template <lua_CFunction f>
+		int static_trampoline(lua_State* L) noexcept {
+			return f(L);
+		}
+
+#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE)
+		template <lua_CFunction_noexcept f>
+		int static_trampoline_noexcept(lua_State* L) noexcept {
+			return f(L);
+		}
+#else
+		template <lua_CFunction f>
+		int static_trampoline_noexcept(lua_State* L) noexcept {
+			return f(L);
+		}
+#endif
+
+		template <typename Fx, typename... Args>
+		int trampoline(lua_State* L, Fx&& f, Args&&... args) noexcept {
+			return f(L, std::forward<Args>(args)...);
+		}
+
+		inline int c_trampoline(lua_State* L, lua_CFunction f) noexcept {
+			return trampoline(L, f);
+		}
+#else
+
+		inline int lua_cfunction_trampoline(lua_State* L, lua_CFunction f) {
+#if SOL_IS_ON(SOL_PROPAGATE_EXCEPTIONS)
+			return f(L);
+#else
+			try {
+				return f(L);
+			}
+			catch (const char* cs) {
+				call_exception_handler(L, optional<const std::exception&>(nullopt), string_view(cs));
+			}
+			catch (const std::string& s) {
+				call_exception_handler(L, optional<const std::exception&>(nullopt), string_view(s.c_str(), s.size()));
+			}
+			catch (const std::exception& e) {
+				call_exception_handler(L, optional<const std::exception&>(e), e.what());
+			}
+#if SOL_IS_ON(SOL_EXCEPTIONS_CATCH_ALL)
+			// LuaJIT cannot have the catchall when the safe propagation is on
+			// but LuaJIT will swallow all C++ errors
+			// if we don't at least catch std::exception ones
+			catch (...) {
+				call_exception_handler(L, optional<const std::exception&>(nullopt), "caught (...) exception");
+			}
+#endif // LuaJIT cannot have the catchall, but we must catch std::exceps for it
+			return lua_error(L);
+#endif // Safe exceptions
+		}
+
+		template <lua_CFunction f>
+		int static_trampoline(lua_State* L) {
+			return lua_cfunction_trampoline(L, f);
+		}
+
+#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE)
+		template <lua_CFunction_noexcept f>
+		int static_trampoline_noexcept(lua_State* L) noexcept {
+			return f(L);
+		}
+#else
+		template <lua_CFunction f>
+		int static_trampoline_noexcept(lua_State* L) noexcept {
+			return f(L);
+		}
+#endif
+
+		template <typename Fx, typename... Args>
+		int trampoline(lua_State* L, Fx&& f, Args&&... args) {
+			if constexpr (meta::bind_traits<meta::unqualified_t<Fx>>::is_noexcept) {
+				return f(L, std::forward<Args>(args)...);
+			}
+			else {
+#if SOL_IS_ON(SOL_PROPAGATE_EXCEPTIONS)
+				return f(L, std::forward<Args>(args)...);
+#else
+				try {
+					return f(L, std::forward<Args>(args)...);
+				}
+				catch (const char* cs) {
+					call_exception_handler(L, optional<const std::exception&>(nullopt), string_view(cs));
+				}
+				catch (const std::string& s) {
+					call_exception_handler(L, optional<const std::exception&>(nullopt), string_view(s.c_str(), s.size()));
+				}
+				catch (const std::exception& e) {
+					call_exception_handler(L, optional<const std::exception&>(e), e.what());
+				}
+#if SOL_IS_ON(SOL_EXCEPTIONS_CATCH_ALL)
+				// LuaJIT cannot have the catchall when the safe propagation is on
+				// but LuaJIT will swallow all C++ errors
+				// if we don't at least catch std::exception ones
+				catch (...) {
+					call_exception_handler(L, optional<const std::exception&>(nullopt), "caught (...) exception");
+				}
+#endif
+				return lua_error(L);
+#endif
+			}
+		}
+
+		inline int c_trampoline(lua_State* L, lua_CFunction f) {
+			return trampoline(L, f);
+		}
+#endif // Exceptions vs. No Exceptions
+
+		template <typename F, F fx>
+		inline int typed_static_trampoline(lua_State* L) {
+#if 0
+			// TODO: you must evaluate the get/check_get of every
+			// argument, to ensure it doesn't throw
+			// (e.g., for the sol_lua_check_access extension point!)
+			// This incluudes properly noexcept-ing all the above
+			// trampolines / safety nets
+			if constexpr (meta::bind_traits<F>::is_noexcept) {
+				return static_trampoline_noexcept<fx>(L);
+			}
+			else
+#endif
+			{ return static_trampoline<fx>(L); }
+		}
+	} // namespace detail
+
+	inline void set_default_exception_handler(lua_State* L, exception_handler_function exf = &detail::default_exception_handler) {
+		static_assert(sizeof(void*) >= sizeof(exception_handler_function),
+		     "void* storage is too small to transport the exception handler: please file a bug on the sol2 issue tracker to get this looked at!");
+		void* storage;
+		std::memcpy(&storage, &exf, sizeof(exception_handler_function));
+		lua_pushlightuserdata(L, storage);
+		lua_setglobal(L, detail::default_exception_handler_name());
+	}
+} // namespace sol
+
+// end of sol/trampoline.hpp
+
+// beginning of sol/stack_core.hpp
+
+// beginning of sol/inheritance.hpp
+
+// beginning of sol/usertype_traits.hpp
+
+// beginning of sol/demangle.hpp
+
+#include <string>
+#include <array>
+#include <cctype>
+#if SOL_IS_ON(SOL_MINGW_CCTYPE_IS_POISONED)
+extern "C" {
+#include <ctype.h>
+}
+#endif // MinGW is on some stuff
+#include <locale>
+
+namespace sol { namespace detail {
+	inline constexpr std::array<string_view, 9> removals { { "{anonymous}",
+		"(anonymous namespace)",
+		"public:",
+		"private:",
+		"protected:",
+		"struct ",
+		"class ",
+		"`anonymous-namespace'",
+		"`anonymous namespace'" } };
+
+#if SOL_IS_ON(SOL_COMPILER_GCC) || SOL_IS_ON(SOL_COMPILER_CLANG)
+	inline std::string ctti_get_type_name_from_sig(std::string name) {
+		// cardinal sins from MINGW
+		using namespace std;
+		std::size_t start = name.find_first_of('[');
+		start = name.find_first_of('=', start);
+		std::size_t end = name.find_last_of(']');
+		if (end == std::string::npos)
+			end = name.size();
+		if (start == std::string::npos)
+			start = 0;
+		if (start < name.size() - 1)
+			start += 1;
+		name = name.substr(start, end - start);
+		start = name.rfind("seperator_mark");
+		if (start != std::string::npos) {
+			name.erase(start - 2, name.length());
+		}
+		while (!name.empty() && isblank(name.front()))
+			name.erase(name.begin());
+		while (!name.empty() && isblank(name.back()))
+			name.pop_back();
+
+		for (std::size_t r = 0; r < removals.size(); ++r) {
+			auto found = name.find(removals[r]);
+			while (found != std::string::npos) {
+				name.erase(found, removals[r].size());
+				found = name.find(removals[r]);
+			}
+		}
+
+		return name;
+	}
+
+	template <typename T, class seperator_mark = int>
+	inline std::string ctti_get_type_name() {
+		return ctti_get_type_name_from_sig(__PRETTY_FUNCTION__);
+	}
+#elif SOL_IS_ON(SOL_COMPILER_VCXX)
+	inline std::string ctti_get_type_name_from_sig(std::string name) {
+		std::size_t start = name.find("get_type_name");
+		if (start == std::string::npos)
+			start = 0;
+		else
+			start += 13;
+		if (start < name.size() - 1)
+			start += 1;
+		std::size_t end = name.find_last_of('>');
+		if (end == std::string::npos)
+			end = name.size();
+		name = name.substr(start, end - start);
+		if (name.find("struct", 0) == 0)
+			name.replace(0, 6, "", 0);
+		if (name.find("class", 0) == 0)
+			name.replace(0, 5, "", 0);
+		while (!name.empty() && isblank(name.front()))
+			name.erase(name.begin());
+		while (!name.empty() && isblank(name.back()))
+			name.pop_back();
+
+		for (std::size_t r = 0; r < removals.size(); ++r) {
+			auto found = name.find(removals[r]);
+			while (found != std::string::npos) {
+				name.erase(found, removals[r].size());
+				found = name.find(removals[r]);
+			}
+		}
+
+		return name;
+	}
+
+	template <typename T>
+	std::string ctti_get_type_name() {
+		return ctti_get_type_name_from_sig(__FUNCSIG__);
+	}
+#else
+#error Compiler not supported for demangling
+#endif // compilers
+
+	template <typename T>
+	std::string demangle_once() {
+		std::string realname = ctti_get_type_name<T>();
+		return realname;
+	}
+
+	inline std::string short_demangle_from_type_name(std::string realname) {
+		// This isn't the most complete but it'll do for now...?
+		static const std::array<std::string, 10> ops = {
+			{ "operator<", "operator<<", "operator<<=", "operator<=", "operator>", "operator>>", "operator>>=", "operator>=", "operator->", "operator->*" }
+		};
+		int level = 0;
+		std::size_t idx = 0;
+		for (idx = static_cast<std::size_t>(realname.empty() ? 0 : realname.size() - 1); idx > 0; --idx) {
+			if (level == 0 && realname[idx] == ':') {
+				break;
+			}
+			bool isleft = realname[idx] == '<';
+			bool isright = realname[idx] == '>';
+			if (!isleft && !isright)
+				continue;
+			bool earlybreak = false;
+			for (const auto& op : ops) {
+				std::size_t nisop = realname.rfind(op, idx);
+				if (nisop == std::string::npos)
+					continue;
+				std::size_t nisopidx = idx - op.size() + 1;
+				if (nisop == nisopidx) {
+					idx = static_cast<std::size_t>(nisopidx);
+					earlybreak = true;
+				}
+				break;
+			}
+			if (earlybreak) {
+				continue;
+			}
+			level += isleft ? -1 : 1;
+		}
+		if (idx > 0) {
+			realname.erase(0, realname.length() < static_cast<std::size_t>(idx) ? realname.length() : idx + 1);
+		}
+		return realname;
+	}
+
+	template <typename T>
+	std::string short_demangle_once() {
+		std::string realname = ctti_get_type_name<T>();
+		return short_demangle_from_type_name(realname);
+	}
+
+	template <typename T>
+	const std::string& demangle() {
+		static const std::string d = demangle_once<T>();
+		return d;
+	}
+
+	template <typename T>
+	const std::string& short_demangle() {
+		static const std::string d = short_demangle_once<T>();
+		return d;
+	}
+}} // namespace sol::detail
+
+// end of sol/demangle.hpp
+
+namespace sol {
+
+	template <typename T>
+	struct usertype_traits {
+		static const std::string& name() {
+			static const std::string& n = detail::short_demangle<T>();
+			return n;
+		}
+		static const std::string& qualified_name() {
+			static const std::string& q_n = detail::demangle<T>();
+			return q_n;
+		}
+		static const std::string& metatable() {
+			static const std::string m = std::string("sol.").append(detail::demangle<T>());
+			return m;
+		}
+		static const std::string& user_metatable() {
+			static const std::string u_m = std::string("sol.").append(detail::demangle<T>()).append(".user");
+			return u_m;
+		}
+		static const std::string& user_gc_metatable() {
+			static const std::string u_g_m = std::string("sol.").append(detail::demangle<T>()).append(".user\xE2\x99\xBB");
+			return u_g_m;
+		}
+		static const std::string& gc_table() {
+			static const std::string g_t = std::string("sol.").append(detail::demangle<T>()).append(".\xE2\x99\xBB");
+			return g_t;
+		}
+	};
+
+} // namespace sol
+
+// end of sol/usertype_traits.hpp
+
+// beginning of sol/unique_usertype_traits.hpp
+
+#include <memory>
+
+namespace sol {
+
+	namespace detail {
+		template <typename T>
+		struct unique_fallback {
+			using SOL_INTERNAL_UNSPECIALIZED_MARKER_ = int;
+		};
+
+		template <typename T>
+		struct unique_fallback<std::shared_ptr<T>> {
+		private:
+			using pointer = typename std::pointer_traits<std::shared_ptr<T>>::element_type*;
+
+		public:
+			// rebind is non-void
+			// if and only if unique usertype
+			// is cast-capable
+			template <typename X>
+			using rebind_actual_type = std::shared_ptr<X>;
+
+			static bool is_null(lua_State*, const std::shared_ptr<T>& p) noexcept {
+				return p == nullptr;
+			}
+
+			static pointer get(lua_State*, const std::shared_ptr<T>& p) noexcept {
+				return p.get();
+			}
+		};
+
+		template <typename T, typename D>
+		struct unique_fallback<std::unique_ptr<T, D>> {
+		private:
+			using pointer = typename std::unique_ptr<T, D>::pointer;
+
+		public:
+			static bool is_null(lua_State*, const std::unique_ptr<T, D>& p) noexcept {
+				return p == nullptr;
+			}
+
+			static pointer get(lua_State*, const std::unique_ptr<T, D>& p) noexcept {
+				return p.get();
+			}
+		};
+	} // namespace detail
+
+	namespace meta { namespace meta_detail {
+		template <typename T, typename = void>
+		struct unique_actual_type;
+
+		template <typename T>
+		struct unique_actual_type<T, meta::void_t<typename T::actual_type>> {
+			using type = typename T::actual_type;
+		};
+
+		template <typename T, typename... Rest, template <typename...> class Templ>
+		struct unique_actual_type<Templ<T, Rest...>> {
+			using type = T;
+		};
+
+	}} // namespace meta::meta_detail
+
+	template <typename T>
+	using unique_usertype_actual_t = typename meta::meta_detail::unique_actual_type<unique_usertype_traits<T>>::type;
+
+	namespace meta { namespace meta_detail {
+		template <typename T>
+		using value_test_t = decltype(T::value);
+
+		template <typename T>
+		using type_test_t = typename T::type;
+
+		template <typename T>
+		using type_element_type_t = typename T::element_type;
+
+		template <typename T, typename = void>
+		struct unique_element_type {
+			using type = typename std::pointer_traits<typename unique_actual_type<T>::type>::element_type;
+		};
+
+		template <typename T>
+		struct unique_element_type<T, std::enable_if_t<meta::is_detected_v<type_element_type_t, T>>> {
+			using type = typename T::element_type;
+		};
+
+		template <typename T>
+		struct unique_element_type<T, std::enable_if_t<meta::is_detected_v<type_test_t, T>>> {
+			using type = typename T::type;
+		};
+
+		template <typename T, typename = void>
+		struct unique_valid : std::integral_constant<bool, !has_internal_marker_v<T>> { };
+
+		template <typename T>
+		struct unique_valid<T, meta::void_t<decltype(T::value)>> : std::integral_constant<bool, T::value> { };
+	}} // namespace meta::meta_detail
+
+	template <typename T>
+	using unique_usertype_element_t = typename meta::meta_detail::unique_element_type<unique_usertype_traits<T>>::type;
+
+	template <typename T, typename Element = void>
+	using unique_usertype_rebind_actual_t = typename unique_usertype_traits<T>::template rebind_actual_type<Element>;
+
+	template <typename T>
+	struct unique_usertype_traits : public detail::unique_fallback<T> { };
+
+	template <typename T>
+	struct is_unique_usertype : std::integral_constant<bool, meta::meta_detail::unique_valid<unique_usertype_traits<T>>::value> { };
+
+	template <typename T>
+	inline constexpr bool is_unique_usertype_v = is_unique_usertype<T>::value;
+
+	namespace meta { namespace meta_detail {
+		template <typename T>
+		using adl_sol_lua_check_access_test_t
+			= decltype(sol_lua_check_access(types<T>(), static_cast<lua_State*>(nullptr), -1, std::declval<stack::record&>()));
+
+		template <typename T>
+		inline constexpr bool is_adl_sol_lua_check_access_v = meta::is_detected_v<adl_sol_lua_check_access_test_t, T>;
+
+		template <typename T>
+		using unique_usertype_get_with_state_test_t
+			= decltype(unique_usertype_traits<T>::get(static_cast<lua_State*>(nullptr), std::declval<unique_usertype_actual_t<T>>()));
+
+		template <typename T>
+		inline constexpr bool unique_usertype_get_with_state_v = meta::is_detected_v<unique_usertype_get_with_state_test_t, T>;
+
+		template <typename T>
+		using unique_usertype_is_null_with_state_test_t
+			= decltype(unique_usertype_traits<T>::is_null(static_cast<lua_State*>(nullptr), std::declval<unique_usertype_actual_t<T>>()));
+
+		template <typename T>
+		inline constexpr bool unique_usertype_is_null_with_state_v = meta::is_detected_v<unique_usertype_is_null_with_state_test_t, T>;
+	}} // namespace meta::meta_detail
+
+	namespace detail {
+		template <typename T>
+		constexpr bool unique_is_null_noexcept() noexcept {
+			if constexpr (meta::meta_detail::unique_usertype_is_null_with_state_v<std::remove_cv_t<T>>) {
+				return noexcept(
+				     unique_usertype_traits<T>::is_null(static_cast<lua_State*>(nullptr), std::declval<unique_usertype_actual_t<std::remove_cv_t<T>>>()));
+			}
+			else {
+				return noexcept(unique_usertype_traits<T>::is_null(std::declval<unique_usertype_actual_t<std::remove_cv_t<T>>>()));
+			}
+		}
+
+		template <typename T>
+		bool unique_is_null(lua_State* L_, T& value_) noexcept(unique_is_null_noexcept<std::remove_cv_t<T>>()) {
+			using Tu = std::remove_cv_t<T>;
+			if constexpr (meta::meta_detail::unique_usertype_is_null_with_state_v<Tu>) {
+				return unique_usertype_traits<Tu>::is_null(L_, value_);
+			}
+			else {
+				return unique_usertype_traits<Tu>::is_null(value_);
+			}
+		}
+
+		template <typename T>
+		constexpr bool unique_get_noexcept() noexcept {
+			if constexpr (meta::meta_detail::unique_usertype_get_with_state_v<std::remove_cv_t<T>>) {
+				return noexcept(
+				     unique_usertype_traits<T>::get(static_cast<lua_State*>(nullptr), std::declval<unique_usertype_actual_t<std::remove_cv_t<T>>>()));
+			}
+			else {
+				return noexcept(unique_usertype_traits<T>::get(std::declval<unique_usertype_actual_t<std::remove_cv_t<T>>>()));
+			}
+		}
+
+		template <typename T>
+		auto unique_get(lua_State* L_, T& value_) noexcept(unique_get_noexcept<std::remove_cv_t<T>>()) {
+			using Tu = std::remove_cv_t<T>;
+			if constexpr (meta::meta_detail::unique_usertype_get_with_state_v<Tu>) {
+				return unique_usertype_traits<Tu>::get(L_, value_);
+			}
+			else {
+				return unique_usertype_traits<Tu>::get(value_);
+			}
+		}
+	} // namespace detail
+
+	namespace meta { namespace meta_detail {
+		template <typename T, typename Element = void>
+		using is_rebind_actual_type_test_t = typename T::template rebind_actual_type<Element>;
+
+		template <typename T, typename Element = void>
+		using is_rebind_actual_type = meta::is_detected<is_rebind_actual_type_test_t, T, Element>;
+
+		template <typename T, typename Element = void>
+		inline constexpr bool is_rebind_actual_type_v = is_rebind_actual_type<T, Element>::value;
+
+		template <typename T, typename Element, bool = is_rebind_actual_type_v<T, Element>>
+		struct is_actual_type_rebindable_for_test : std::false_type { };
+
+		template <typename T, typename Element>
+		struct is_actual_type_rebindable_for_test<T, Element, true>
+		: std::integral_constant<bool, !std::is_void_v<typename T::template rebind_actual_type<Element>>> { };
+	}} // namespace meta::meta_detail
+
+	template <typename T, typename Element = void>
+	using is_actual_type_rebindable_for = typename meta::meta_detail::is_actual_type_rebindable_for_test<unique_usertype_traits<T>, Element>::type;
+
+	template <typename T, typename Element = void>
+	inline constexpr bool is_actual_type_rebindable_for_v = is_actual_type_rebindable_for<T, Element>::value;
+
+} // namespace sol
+
+// end of sol/unique_usertype_traits.hpp
+
+namespace sol {
+	template <typename... Args>
+	struct base_list { };
+	template <typename... Args>
+	using bases = base_list<Args...>;
+
+	typedef bases<> base_classes_tag;
+	const auto base_classes = base_classes_tag();
+
+	template <typename... Args>
+	struct is_to_stringable<base_list<Args...>> : std::false_type { };
+
+	namespace detail {
+
+		inline decltype(auto) base_class_check_key() {
+			static const auto& key = "class_check";
+			return key;
+		}
+
+		inline decltype(auto) base_class_cast_key() {
+			static const auto& key = "class_cast";
+			return key;
+		}
+
+		inline decltype(auto) base_class_index_propogation_key() {
+			static const auto& key = u8"\xF0\x9F\x8C\xB2.index";
+			return key;
+		}
+
+		inline decltype(auto) base_class_new_index_propogation_key() {
+			static const auto& key = u8"\xF0\x9F\x8C\xB2.new_index";
+			return key;
+		}
+
+		template <typename T>
+		struct inheritance {
+			typedef typename base<T>::type bases_t;
+
+			static bool type_check_bases(types<>, const string_view&) {
+				return false;
+			}
+
+			template <typename Base, typename... Args>
+			static bool type_check_bases(types<Base, Args...>, const string_view& ti) {
+				return ti == usertype_traits<Base>::qualified_name() || type_check_bases(types<Args...>(), ti);
+			}
+
+			static bool type_check(const string_view& ti) {
+				return ti == usertype_traits<T>::qualified_name() || type_check_bases(bases_t(), ti);
+			}
+
+			template <typename... Bases>
+			static bool type_check_with(const string_view& ti) {
+				return ti == usertype_traits<T>::qualified_name() || type_check_bases(types<Bases...>(), ti);
+			}
+
+			static void* type_cast_bases(types<>, T*, const string_view&) {
+				return nullptr;
+			}
+
+			template <typename Base, typename... Args>
+			static void* type_cast_bases(types<Base, Args...>, T* data, const string_view& ti) {
+				// Make sure to convert to T first, and then dynamic cast to the proper type
+				return ti != usertype_traits<Base>::qualified_name() ? type_cast_bases(types<Args...>(), data, ti)
+				                                                     : static_cast<void*>(static_cast<Base*>(data));
+			}
+
+			static void* type_cast(void* voiddata, const string_view& ti) {
+				T* data = static_cast<T*>(voiddata);
+				return static_cast<void*>(ti != usertype_traits<T>::qualified_name() ? type_cast_bases(bases_t(), data, ti) : data);
+			}
+
+			template <typename... Bases>
+			static void* type_cast_with(void* voiddata, const string_view& ti) {
+				T* data = static_cast<T*>(voiddata);
+				return static_cast<void*>(ti != usertype_traits<T>::qualified_name() ? type_cast_bases(types<Bases...>(), data, ti) : data);
+			}
+
+			template <typename U>
+			static bool type_unique_cast_bases(types<>, void*, void*, const string_view&) {
+				return 0;
+			}
+
+			template <typename U, typename Base, typename... Args>
+			static int type_unique_cast_bases(types<Base, Args...>, void* source_data, void* target_data, const string_view& ti) {
+				using uu_traits = unique_usertype_traits<U>;
+				using base_ptr = typename uu_traits::template rebind_actual_type<Base>;
+				string_view base_ti = usertype_traits<Base>::qualified_name();
+				if (base_ti == ti) {
+					if (target_data != nullptr) {
+						U* source = static_cast<U*>(source_data);
+						base_ptr* target = static_cast<base_ptr*>(target_data);
+						// perform proper derived -> base conversion
+						*target = *source;
+					}
+					return 2;
+				}
+				return type_unique_cast_bases<U>(types<Args...>(), source_data, target_data, ti);
+			}
+
+			template <typename U>
+			static int type_unique_cast(void* source_data, void* target_data, const string_view& ti, const string_view& rebind_ti) {
+				if constexpr (is_actual_type_rebindable_for_v<U>) {
+					using rebound_actual_type = unique_usertype_rebind_actual_t<U>;
+					using maybe_bases_or_empty = meta::conditional_t<std::is_void_v<rebound_actual_type>, types<>, bases_t>;
+					string_view this_rebind_ti = usertype_traits<rebound_actual_type>::qualified_name();
+					if (rebind_ti != this_rebind_ti) {
+						// this is not even of the same unique type
+						return 0;
+					}
+					string_view this_ti = usertype_traits<T>::qualified_name();
+					if (ti == this_ti) {
+						// direct match, return 1
+						return 1;
+					}
+					return type_unique_cast_bases<U>(maybe_bases_or_empty(), source_data, target_data, ti);
+				}
+				else {
+					(void)rebind_ti;
+					string_view this_ti = usertype_traits<T>::qualified_name();
+					if (ti == this_ti) {
+						// direct match, return 1
+						return 1;
+					}
+					return type_unique_cast_bases<U>(types<>(), source_data, target_data, ti);
+				}
+			}
+
+			template <typename U, typename... Bases>
+			static int type_unique_cast_with(void* source_data, void* target_data, const string_view& ti, const string_view& rebind_ti) {
+				using uc_bases_t = types<Bases...>;
+				if constexpr (is_actual_type_rebindable_for_v<U>) {
+					using rebound_actual_type = unique_usertype_rebind_actual_t<U>;
+					using cond_bases_t = meta::conditional_t<std::is_void_v<rebound_actual_type>, types<>, uc_bases_t>;
+					string_view this_rebind_ti = usertype_traits<rebound_actual_type>::qualified_name();
+					if (rebind_ti != this_rebind_ti) {
+						// this is not even of the same unique type
+						return 0;
+					}
+					string_view this_ti = usertype_traits<T>::qualified_name();
+					if (ti == this_ti) {
+						// direct match, return 1
+						return 1;
+					}
+					return type_unique_cast_bases<U>(cond_bases_t(), source_data, target_data, ti);
+				}
+				else {
+					(void)rebind_ti;
+					string_view this_ti = usertype_traits<T>::qualified_name();
+					if (ti == this_ti) {
+						// direct match, return 1
+						return 1;
+					}
+					return type_unique_cast_bases<U>(types<>(), source_data, target_data, ti);
+				}
+			}
+		};
+
+		using inheritance_check_function = decltype(&inheritance<void>::type_check);
+		using inheritance_cast_function = decltype(&inheritance<void>::type_cast);
+		using inheritance_unique_cast_function = decltype(&inheritance<void>::type_unique_cast<void>);
+	} // namespace detail
+} // namespace sol
+
+// end of sol/inheritance.hpp
+
+// beginning of sol/error_handler.hpp
+
+#include <cstdio>
+
+namespace sol {
+
+	namespace detail {
+		constexpr const char* not_a_number = "not a numeric type";
+		constexpr const char* not_a_number_or_number_string = "not a numeric type or numeric string";
+		constexpr const char* not_a_number_integral = "not a numeric type that fits exactly an integer (number maybe has significant decimals)";
+		constexpr const char* not_a_number_or_number_string_integral
+		     = "not a numeric type or a numeric string that fits exactly an integer (e.g. number maybe has significant decimals)";
+
+		constexpr const char* not_enough_stack_space = "not enough space left on Lua stack";
+		constexpr const char* not_enough_stack_space_floating = "not enough space left on Lua stack for a floating point number";
+		constexpr const char* not_enough_stack_space_integral = "not enough space left on Lua stack for an integral number";
+		constexpr const char* not_enough_stack_space_string = "not enough space left on Lua stack for a string";
+		constexpr const char* not_enough_stack_space_meta_function_name = "not enough space left on Lua stack for the name of a meta_function";
+		constexpr const char* not_enough_stack_space_userdata = "not enough space left on Lua stack to create a sol2 userdata";
+		constexpr const char* not_enough_stack_space_generic = "not enough space left on Lua stack to push valuees";
+		constexpr const char* not_enough_stack_space_environment = "not enough space left on Lua stack to retrieve environment";
+		constexpr const char* protected_function_error = "caught (...) unknown error during protected_function call";
+
+		inline void accumulate_and_mark(const std::string& n, std::string& aux_message, int& marker) {
+			if (marker > 0) {
+				aux_message += ", ";
+			}
+			aux_message += n;
+			++marker;
+		}
+	} // namespace detail
+
+	inline std::string associated_type_name(lua_State* L, int index, type t) {
+		switch (t) {
+		case type::poly:
+			return "anything";
+		case type::userdata: {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 2, "not enough space to push get the type name");
+#endif // make sure stack doesn't overflow
+			if (lua_getmetatable(L, index) == 0) {
+				break;
+			}
+			lua_pushlstring(L, "__name", 6);
+			lua_rawget(L, -2);
+			size_t sz;
+			const char* name = lua_tolstring(L, -1, &sz);
+			std::string tn(name, static_cast<std::string::size_type>(sz));
+			lua_pop(L, 2);
+			return tn;
+		}
+		default:
+			break;
+		}
+		return lua_typename(L, static_cast<int>(t));
+	}
+
+	inline int push_type_panic_string(lua_State* L, int index, type expected, type actual, string_view message, string_view aux_message) noexcept {
+		const char* err = message.size() == 0
+		     ? (aux_message.size() == 0 ? "stack index %d, expected %s, received %s" : "stack index %d, expected %s, received %s: %s")
+		     : "stack index %d, expected %s, received %s: %s %s";
+		const char* type_name = expected == type::poly ? "anything" : lua_typename(L, static_cast<int>(expected));
+		{
+			std::string actual_name = associated_type_name(L, index, actual);
+			lua_pushfstring(L, err, index, type_name, actual_name.c_str(), message.data(), aux_message.data());
+		}
+		return 1;
+	}
+
+	inline int type_panic_string(lua_State* L, int index, type expected, type actual, string_view message = "") noexcept(false) {
+		push_type_panic_string(L, index, expected, actual, message, "");
+		return lua_error(L);
+	}
+
+	inline int type_panic_c_str(lua_State* L, int index, type expected, type actual, const char* message = nullptr) noexcept(false) {
+		push_type_panic_string(L, index, expected, actual, message == nullptr ? "" : message, "");
+		return lua_error(L);
+	}
+
+	struct type_panic_t {
+		int operator()(lua_State* L, int index, type expected, type actual) const noexcept(false) {
+			return type_panic_c_str(L, index, expected, actual, nullptr);
+		}
+		int operator()(lua_State* L, int index, type expected, type actual, string_view message) const noexcept(false) {
+			return type_panic_c_str(L, index, expected, actual, message.data());
+		}
+	};
+
+	const type_panic_t type_panic = {};
+
+	struct constructor_handler {
+		int operator()(lua_State* L, int index, type expected, type actual, string_view message) const noexcept(false) {
+			push_type_panic_string(L, index, expected, actual, message, "(type check failed in constructor)");
+			return lua_error(L);
+		}
+	};
+
+	template <typename F = void>
+	struct argument_handler {
+		int operator()(lua_State* L, int index, type expected, type actual, string_view message) const noexcept(false) {
+			push_type_panic_string(L, index, expected, actual, message, "(bad argument to variable or function call)");
+			return lua_error(L);
+		}
+	};
+
+	template <typename R, typename... Args>
+	struct argument_handler<types<R, Args...>> {
+		int operator()(lua_State* L, int index, type expected, type actual, string_view message) const noexcept(false) {
+			{
+				std::string aux_message = "(bad argument into '";
+				aux_message += detail::demangle<R>();
+				aux_message += "(";
+				int marker = 0;
+				(void)detail::swallow { int(), (detail::accumulate_and_mark(detail::demangle<Args>(), aux_message, marker), int())... };
+				aux_message += ")')";
+				push_type_panic_string(L, index, expected, actual, message, aux_message);
+			}
+			return lua_error(L);
+		}
+	};
+
+	// Specify this function as the handler for lua::check if you know there's nothing wrong
+	inline int no_panic(lua_State*, int, type, type, const char* = nullptr) noexcept {
+		return 0;
+	}
+
+	inline void type_error(lua_State* L, int expected, int actual) noexcept(false) {
+		luaL_error(L, "expected %s, received %s", lua_typename(L, expected), lua_typename(L, actual));
+	}
+
+	inline void type_error(lua_State* L, type expected, type actual) noexcept(false) {
+		type_error(L, static_cast<int>(expected), static_cast<int>(actual));
+	}
+
+	inline void type_assert(lua_State* L, int index, type expected, type actual) noexcept(false) {
+		if (expected != type::poly && expected != actual) {
+			type_panic_c_str(L, index, expected, actual, nullptr);
+		}
+	}
+
+	inline void type_assert(lua_State* L, int index, type expected) {
+		type actual = type_of(L, index);
+		type_assert(L, index, expected, actual);
+	}
+
+} // namespace sol
+
+// end of sol/error_handler.hpp
+
+// beginning of sol/reference.hpp
+
+// beginning of sol/stack_reference.hpp
+
+namespace sol {
+	namespace detail {
+		inline bool xmovable(lua_State* leftL, lua_State* rightL) {
+			if (rightL == nullptr || leftL == nullptr || leftL == rightL) {
+				return false;
+			}
+			const void* leftregistry = lua_topointer(leftL, LUA_REGISTRYINDEX);
+			const void* rightregistry = lua_topointer(rightL, LUA_REGISTRYINDEX);
+			return leftregistry == rightregistry;
+		}
+	} // namespace detail
+
+	class stateless_stack_reference {
+	private:
+		friend class stack_reference;
+
+		int m_index = 0;
+
+		int registry_index() const noexcept {
+			return LUA_NOREF;
+		}
+
+	public:
+		stateless_stack_reference() noexcept = default;
+		stateless_stack_reference(lua_nil_t) noexcept : stateless_stack_reference() {};
+		stateless_stack_reference(lua_State* L_, int index_) noexcept : stateless_stack_reference(absolute_index(L_, index_)) {
+		}
+		stateless_stack_reference(lua_State*, absolute_index index_) noexcept : stateless_stack_reference(index_) {
+		}
+		stateless_stack_reference(lua_State*, raw_index index_) noexcept : stateless_stack_reference(index_) {
+		}
+		stateless_stack_reference(absolute_index index_) noexcept : m_index(index_) {
+		}
+		stateless_stack_reference(raw_index index_) noexcept : m_index(index_) {
+		}
+		stateless_stack_reference(lua_State*, ref_index) noexcept = delete;
+		stateless_stack_reference(ref_index) noexcept = delete;
+		stateless_stack_reference(const reference&) noexcept = delete;
+		stateless_stack_reference(const stateless_stack_reference&) noexcept = default;
+		stateless_stack_reference(stateless_stack_reference&& o) noexcept = default;
+		stateless_stack_reference& operator=(stateless_stack_reference&&) noexcept = default;
+		stateless_stack_reference& operator=(const stateless_stack_reference&) noexcept = default;
+
+		int push(lua_State* L_) const noexcept {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L_, 1, "not enough Lua stack space to push a single reference value");
+#endif // make sure stack doesn't overflow
+			lua_pushvalue(L_, m_index);
+			return 1;
+		}
+
+		void pop(lua_State* L_, int pop_count = 1) const noexcept {
+			lua_pop(L_, pop_count);
+		}
+
+		int stack_index() const noexcept {
+			return m_index;
+		}
+
+		const void* pointer(lua_State* L_) const noexcept {
+			const void* pointer_id = lua_topointer(L_, stack_index());
+			return pointer_id;
+		}
+
+		type get_type(lua_State* L_) const noexcept {
+			int untyped_value = lua_type(L_, stack_index());
+			return static_cast<type>(untyped_value);
+		}
+
+		bool valid(lua_State* L) const noexcept {
+			type t = get_type(L);
+			return t != type::lua_nil && t != type::none;
+		}
+
+		void reset(lua_State*) noexcept {
+			m_index = 0;
+		}
+
+		void reset(lua_State* L_, int index_) noexcept {
+			m_index = absolute_index(L_, index_);
+		}
+
+		void abandon(lua_State* = nullptr) noexcept {
+			m_index = 0;
+		}
+
+		stateless_stack_reference copy(lua_State* L_) const noexcept {
+			return stateless_stack_reference(L_, raw_index(m_index));
+		}
+
+		void copy_assign(lua_State*, const stateless_stack_reference& right) noexcept {
+			m_index = right.m_index;
+		}
+
+		bool equals(lua_State* L_, const stateless_stack_reference& r) const noexcept {
+			return lua_compare(L_, this->stack_index(), r.stack_index(), LUA_OPEQ) == 1;
+		}
+
+		bool equals(lua_State* L_, lua_nil_t) const noexcept {
+			return valid(L_);
+		}
+	};
+
+	class stack_reference : public stateless_stack_reference {
+	private:
+		lua_State* luastate = nullptr;
+
+	public:
+		stack_reference() noexcept = default;
+		stack_reference(lua_nil_t) noexcept : stack_reference() {};
+		stack_reference(lua_State* L, lua_nil_t) noexcept : stateless_stack_reference(L, 0), luastate(L) {
+		}
+		stack_reference(lua_State* L, int i) noexcept : stateless_stack_reference(L, i), luastate(L) {
+		}
+		stack_reference(lua_State* L, absolute_index i) noexcept : stateless_stack_reference(L, i), luastate(L) {
+		}
+		stack_reference(lua_State* L, raw_index i) noexcept : stateless_stack_reference(L, i), luastate(L) {
+		}
+		stack_reference(lua_State* L, ref_index i) noexcept = delete;
+		stack_reference(lua_State* L, const reference& r) noexcept = delete;
+		stack_reference(lua_State* L, const stack_reference& r) noexcept : luastate(L) {
+			if (!r.valid()) {
+				m_index = 0;
+				return;
+			}
+			int i = r.stack_index();
+			if (detail::xmovable(lua_state(), r.lua_state())) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+				luaL_checkstack(L, 1, "not enough Lua stack space to push a single reference value");
+#endif // make sure stack doesn't overflow
+				lua_pushvalue(r.lua_state(), r.stack_index());
+				lua_xmove(r.lua_state(), luastate, 1);
+				i = absolute_index(luastate, -1);
+			}
+			m_index = i;
+		}
+		stack_reference(stack_reference&& o) noexcept = default;
+		stack_reference& operator=(stack_reference&&) noexcept = default;
+		stack_reference(const stack_reference&) noexcept = default;
+		stack_reference& operator=(const stack_reference&) noexcept = default;
+
+		int push() const noexcept {
+			return push(lua_state());
+		}
+
+		int push(lua_State* L_) const noexcept {
+			return stateless_stack_reference::push(L_);
+		}
+
+		void pop() const noexcept {
+			pop(lua_state());
+		}
+
+		void pop(lua_State* L_, int pop_count_ = 1) const noexcept {
+			stateless_stack_reference::pop(L_, pop_count_);
+		}
+
+		const void* pointer() const noexcept {
+			return stateless_stack_reference::pointer(lua_state());
+		}
+
+		type get_type() const noexcept {
+			return stateless_stack_reference::get_type(lua_state());
+		}
+
+		lua_State* lua_state() const noexcept {
+			return luastate;
+		}
+
+		bool valid() const noexcept {
+			return stateless_stack_reference::valid(lua_state());
+		}
+
+		void abandon() {
+			stateless_stack_reference::abandon(lua_state());
+		}
+	};
+
+	inline bool operator==(const stack_reference& l, const stack_reference& r) {
+		return lua_compare(l.lua_state(), l.stack_index(), r.stack_index(), LUA_OPEQ) == 1;
+	}
+
+	inline bool operator!=(const stack_reference& l, const stack_reference& r) {
+		return !operator==(l, r);
+	}
+
+	inline bool operator==(const stack_reference& lhs, const lua_nil_t&) {
+		return !lhs.valid();
+	}
+
+	inline bool operator==(const lua_nil_t&, const stack_reference& rhs) {
+		return !rhs.valid();
+	}
+
+	inline bool operator!=(const stack_reference& lhs, const lua_nil_t&) {
+		return lhs.valid();
+	}
+
+	inline bool operator!=(const lua_nil_t&, const stack_reference& rhs) {
+		return rhs.valid();
+	}
+
+	inline bool operator==(const stateless_stack_reference& l, const stateless_stack_reference& r) {
+		return l.stack_index() == r.stack_index();
+	}
+
+	inline bool operator!=(const stateless_stack_reference& l, const stateless_stack_reference& r) {
+		return l.stack_index() != r.stack_index();
+	}
+
+	struct stateless_stack_reference_equals {
+		using is_transparent = std::true_type;
+
+		stateless_stack_reference_equals(lua_State* L_) noexcept : m_L(L_) {
+		}
+
+		lua_State* lua_state() const noexcept {
+			return m_L;
+		}
+
+		bool operator()(const stateless_stack_reference& lhs, const stateless_stack_reference& rhs) const {
+			return lhs.equals(lua_state(), rhs);
+		}
+
+		bool operator()(lua_nil_t lhs, const stateless_stack_reference& rhs) const {
+			return rhs.equals(lua_state(), lhs);
+		}
+
+		bool operator()(const stateless_stack_reference& lhs, lua_nil_t rhs) const {
+			return lhs.equals(lua_state(), rhs);
+		}
+
+	private:
+		lua_State* m_L;
+	};
+
+	struct stack_reference_equals {
+		using is_transparent = std::true_type;
+
+		bool operator()(const lua_nil_t& lhs, const stack_reference& rhs) const {
+			return lhs == rhs;
+		}
+
+		bool operator()(const stack_reference& lhs, const lua_nil_t& rhs) const {
+			return lhs == rhs;
+		}
+
+		bool operator()(const stack_reference& lhs, const stack_reference& rhs) const {
+			return lhs == rhs;
+		}
+	};
+
+	struct stateless_stack_reference_hash {
+		using argument_type = stateless_stack_reference;
+		using result_type = std::size_t;
+		using is_transparent = std::true_type;
+
+		stateless_stack_reference_hash(lua_State* L_) noexcept : m_L(L_) {
+		}
+
+		lua_State* lua_state() const noexcept {
+			return m_L;
+		}
+
+		result_type operator()(const argument_type& lhs) const noexcept {
+			std::hash<const void*> h;
+			return h(lhs.pointer(lua_state()));
+		}
+
+	private:
+		lua_State* m_L;
+	};
+
+	struct stack_reference_hash {
+		using argument_type = stack_reference;
+		using result_type = std::size_t;
+		using is_transparent = std::true_type;
+
+		result_type operator()(const argument_type& lhs) const noexcept {
+			std::hash<const void*> h;
+			return h(lhs.pointer());
+		}
+	};
+} // namespace sol
+
+// end of sol/stack_reference.hpp
+
+#include <functional>
+
+namespace sol {
+	namespace detail {
+		inline const char (&default_main_thread_name())[9] {
+			static const char name[9] = "sol.\xF0\x9F\x93\x8C";
+			return name;
+		}
+	} // namespace detail
+
+	namespace stack {
+		inline void remove(lua_State* L_, int rawindex, int count) {
+			if (count < 1)
+				return;
+			int top = lua_gettop(L_);
+			if (top < 1) {
+				return;
+			}
+			if (rawindex == -count || top == rawindex) {
+				// Slice them right off the top
+				lua_pop(L_, static_cast<int>(count));
+				return;
+			}
+
+			// Remove each item one at a time using stack operations
+			// Probably slower, maybe, haven't benchmarked,
+			// but necessary
+			int index = lua_absindex(L_, rawindex);
+			if (index < 0) {
+				index = lua_gettop(L_) + (index + 1);
+			}
+			int last = index + count;
+			for (int i = index; i < last; ++i) {
+				lua_remove(L_, index);
+			}
+		}
+
+		struct push_popper_at {
+			lua_State* L;
+			int index;
+			int count;
+			push_popper_at(lua_State* L_, int index_ = -1, int count_ = 1) : L(L_), index(index_), count(count_) {
+			}
+			~push_popper_at() {
+				remove(L, index, count);
+			}
+		};
+
+		template <bool top_level>
+		struct push_popper_n {
+			lua_State* L;
+			int pop_count;
+			push_popper_n(lua_State* L_, int pop_count_) : L(L_), pop_count(pop_count_) {
+			}
+			push_popper_n(const push_popper_n&) = delete;
+			push_popper_n(push_popper_n&&) = default;
+			push_popper_n& operator=(const push_popper_n&) = delete;
+			push_popper_n& operator=(push_popper_n&&) = default;
+			~push_popper_n() {
+				lua_pop(L, pop_count);
+			}
+		};
+
+		template <>
+		struct push_popper_n<true> {
+			push_popper_n(lua_State*, int) {
+			}
+		};
+
+		template <bool, typename T, typename = void>
+		struct push_popper {
+			using Tu = meta::unqualified_t<T>;
+			T m_object;
+			int m_index;
+
+			push_popper(T object_) noexcept : m_object(object_), m_index(lua_absindex(m_object.lua_state(), -m_object.push())) {
+			}
+
+			int index_of(const Tu&) const noexcept {
+				return m_index;
+			}
+
+			~push_popper() {
+				m_object.pop();
+			}
+		};
+
+		template <typename T, typename C>
+		struct push_popper<true, T, C> {
+			using Tu = meta::unqualified_t<T>;
+
+			push_popper(T) noexcept {
+			}
+
+			int index_of(const Tu&) const noexcept {
+				return -1;
+			}
+
+			~push_popper() {
+			}
+		};
+
+		template <typename T>
+		struct push_popper<false, T, std::enable_if_t<is_stack_based_v<meta::unqualified_t<T>>>> {
+			using Tu = meta::unqualified_t<T>;
+
+			push_popper(T) noexcept {
+			}
+
+			int index_of(const Tu& object_) const noexcept {
+				return object_.stack_index();
+			}
+
+			~push_popper() {
+			}
+		};
+
+		template <bool, typename T, typename = void>
+		struct stateless_push_popper {
+			using Tu = meta::unqualified_t<T>;
+			lua_State* m_L;
+			T m_object;
+			int m_index;
+
+			stateless_push_popper(lua_State* L_, T object_) noexcept : m_L(L_), m_object(object_), m_index(lua_absindex(m_L, -m_object.push(m_L))) {
+			}
+
+			int index_of(const Tu&) const noexcept {
+				return m_index;
+			}
+
+			~stateless_push_popper() {
+				m_object.pop(m_L);
+			}
+		};
+
+		template <typename T, typename C>
+		struct stateless_push_popper<true, T, C> {
+			using Tu = meta::unqualified_t<T>;
+
+			stateless_push_popper(lua_State*, T) noexcept {
+			}
+
+			int index_of(lua_State*, const Tu&) const noexcept {
+				return -1;
+			}
+
+			~stateless_push_popper() {
+			}
+		};
+
+		template <typename T>
+		struct stateless_push_popper<false, T, std::enable_if_t<is_stack_based_v<meta::unqualified_t<T>>>> {
+			using Tu = meta::unqualified_t<T>;
+			lua_State* m_L;
+
+			stateless_push_popper(lua_State* L_, T) noexcept : m_L(L_) {
+			}
+
+			int index_of(const Tu& object_) const noexcept {
+				return object_.stack_index();
+			}
+
+			~stateless_push_popper() {
+			}
+		};
+
+		template <bool top_level = false, typename T>
+		push_popper<top_level, T> push_pop(T&& x) {
+			return push_popper<top_level, T>(std::forward<T>(x));
+		}
+
+		template <bool top_level = false, typename T>
+		stateless_push_popper<top_level, T> push_pop(lua_State* L_, T&& object_) {
+			return stateless_push_popper<top_level, T>(L_, std::forward<T>(object_));
+		}
+
+		template <typename T>
+		push_popper_at push_pop_at(T&& object_) {
+			int push_count = object_.push();
+			lua_State* L = object_.lua_state();
+			return push_popper_at(L, lua_absindex(L, -push_count), push_count);
+		}
+
+		template <bool top_level = false>
+		push_popper_n<top_level> pop_n(lua_State* L_, int pop_count_) {
+			return push_popper_n<top_level>(L_, pop_count_);
+		}
+	} // namespace stack
+
+	inline lua_State* main_thread(lua_State* L_, lua_State* backup_if_unsupported_ = nullptr) {
+#if SOL_LUA_VERSION_I_ < 502
+		if (L_ == nullptr)
+			return backup_if_unsupported_;
+		lua_getglobal(L_, detail::default_main_thread_name());
+		auto pp = stack::pop_n(L_, 1);
+		if (type_of(L_, -1) == type::thread) {
+			return lua_tothread(L_, -1);
+		}
+		return backup_if_unsupported_;
+#else
+		if (L_ == nullptr)
+			return backup_if_unsupported_;
+		lua_rawgeti(L_, LUA_REGISTRYINDEX, LUA_RIDX_MAINTHREAD);
+		lua_State* Lmain = lua_tothread(L_, -1);
+		lua_pop(L_, 1);
+		return Lmain;
+#endif // Lua 5.2+ has the main thread unqualified_getter
+	}
+
+	namespace detail {
+		struct no_safety_tag {
+		} inline constexpr no_safety {};
+
+		template <bool b>
+		inline lua_State* pick_main_thread(lua_State* L_, lua_State* backup_if_unsupported = nullptr) {
+			(void)L_;
+			(void)backup_if_unsupported;
+			if (b) {
+				return main_thread(L_, backup_if_unsupported);
+			}
+			return L_;
+		}
+	} // namespace detail
+
+	class stateless_reference {
+	private:
+		template <bool o_main_only>
+		friend class basic_reference;
+
+		int ref = LUA_NOREF;
+
+		int copy_ref(lua_State* L_) const noexcept {
+			if (ref == LUA_NOREF)
+				return LUA_NOREF;
+			push(L_);
+			return luaL_ref(L_, LUA_REGISTRYINDEX);
+		}
+
+		lua_State* copy_assign_ref(lua_State* L_, lua_State* rL, const stateless_reference& r) {
+			if (valid(L_)) {
+				deref(L_);
+			}
+			ref = r.copy_ref(L_);
+			return rL;
+		}
+
+		lua_State* move_assign(lua_State* L_, lua_State* rL, stateless_reference&& r) {
+			if (valid(L_)) {
+				deref(L_);
+			}
+			ref = r.ref;
+			r.ref = LUA_NOREF;
+			return rL;
+		}
+
+	protected:
+		int stack_index() const noexcept {
+			return -1;
+		}
+
+		stateless_reference(lua_State* L_, global_tag_t) noexcept {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L_, 1, "not enough Lua stack space to push this reference value");
+#endif // make sure stack doesn't overflow
+			lua_pushglobaltable(L_);
+			ref = luaL_ref(L_, LUA_REGISTRYINDEX);
+		}
+
+		stateless_reference(int raw_ref_index) noexcept : ref(raw_ref_index) {
+		}
+
+	public:
+		stateless_reference() noexcept = default;
+		stateless_reference(lua_nil_t) noexcept : stateless_reference() {
+		}
+		stateless_reference(const stack_reference& r) noexcept : stateless_reference(r.lua_state(), r.stack_index()) {
+		}
+		stateless_reference(stack_reference&& r) noexcept : stateless_reference(r.lua_state(), r.stack_index()) {
+		}
+		stateless_reference(lua_State* L_, const stateless_reference& r) noexcept {
+			if (r.ref == LUA_REFNIL) {
+				ref = LUA_REFNIL;
+				return;
+			}
+			if (r.ref == LUA_NOREF || L_ == nullptr) {
+				ref = LUA_NOREF;
+				return;
+			}
+			ref = r.copy_ref(L_);
+		}
+
+		stateless_reference(lua_State* L_, stateless_reference&& r) noexcept {
+			if (r.ref == LUA_REFNIL) {
+				ref = LUA_REFNIL;
+				return;
+			}
+			if (r.ref == LUA_NOREF || L_ == nullptr) {
+				ref = LUA_NOREF;
+				return;
+			}
+			ref = r.ref;
+			r.ref = LUA_NOREF;
+		}
+
+		stateless_reference(lua_State* L_, const stack_reference& r) noexcept {
+			if (L_ == nullptr || r.lua_state() == nullptr || r.get_type() == type::none) {
+				ref = LUA_NOREF;
+				return;
+			}
+			if (r.get_type() == type::lua_nil) {
+				ref = LUA_REFNIL;
+				return;
+			}
+			if (L_ != r.lua_state() && !detail::xmovable(L_, r.lua_state())) {
+				return;
+			}
+			r.push(L_);
+			ref = luaL_ref(L_, LUA_REGISTRYINDEX);
+		}
+
+		stateless_reference(lua_State* L_, const stateless_stack_reference& r) noexcept : stateless_reference(L_, r.stack_index()) {
+		}
+
+		stateless_reference(lua_State* L_, int index = -1) noexcept {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L_, 1, "not enough Lua stack space to push this reference value");
+#endif // make sure stack doesn't overflow
+			lua_pushvalue(L_, index);
+			ref = luaL_ref(L_, LUA_REGISTRYINDEX);
+		}
+		stateless_reference(lua_State* L_, absolute_index index_) noexcept : stateless_reference(L_, index_.index) {
+		}
+		stateless_reference(lua_State* L_, ref_index index_) noexcept {
+			lua_rawgeti(L_, LUA_REGISTRYINDEX, index_.index);
+			ref = luaL_ref(L_, LUA_REGISTRYINDEX);
+		}
+		stateless_reference(lua_State*, lua_nil_t) noexcept {
+		}
+
+		~stateless_reference() noexcept = default;
+
+		stateless_reference(const stateless_reference& o) noexcept = delete;
+		stateless_reference& operator=(const stateless_reference& r) noexcept = delete;
+
+		stateless_reference(stateless_reference&& o) noexcept : ref(o.ref) {
+			o.ref = LUA_NOREF;
+		}
+
+		stateless_reference& operator=(stateless_reference&& o) noexcept {
+			ref = o.ref;
+			o.ref = LUA_NOREF;
+			return *this;
+		}
+
+		int push(lua_State* L_) const noexcept {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L_, 1, "not enough Lua stack space to push this reference value");
+#endif // make sure stack doesn't overflow
+			lua_rawgeti(L_, LUA_REGISTRYINDEX, ref);
+			return 1;
+		}
+
+		void pop(lua_State* L_, int n = 1) const noexcept {
+			lua_pop(L_, n);
+		}
+
+		int registry_index() const noexcept {
+			return ref;
+		}
+
+		void reset(lua_State* L_) noexcept {
+			if (valid(L_)) {
+				deref(L_);
+			}
+			ref = LUA_NOREF;
+		}
+
+		void reset(lua_State* L_, int index_) noexcept {
+			reset(L_);
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L_, 1, "not enough Lua stack space to push this reference value");
+#endif // make sure stack doesn't overflow
+			lua_pushvalue(L_, index_);
+			ref = luaL_ref(L_, LUA_REGISTRYINDEX);
+		}
+
+		bool valid(lua_State*) const noexcept {
+			return !(ref == LUA_NOREF || ref == LUA_REFNIL);
+		}
+
+		const void* pointer(lua_State* L_) const noexcept {
+			int si = push(L_);
+			const void* vp = lua_topointer(L_, -si);
+			lua_pop(L_, si);
+			return vp;
+		}
+
+		type get_type(lua_State* L_) const noexcept {
+			int p = push(L_);
+			int result = lua_type(L_, -1);
+			pop(L_, p);
+			return static_cast<type>(result);
+		}
+
+		void abandon(lua_State* = nullptr) {
+			ref = LUA_NOREF;
+		}
+
+		void deref(lua_State* L_) const noexcept {
+			luaL_unref(L_, LUA_REGISTRYINDEX, ref);
+		}
+
+		stateless_reference copy(lua_State* L_) const noexcept {
+			if (!valid(L_)) {
+				return {};
+			}
+			return stateless_reference(copy_ref(L_));
+		}
+
+		void copy_assign(lua_State* L_, const stateless_reference& right) noexcept {
+			if (valid(L_)) {
+				deref(L_);
+			}
+			if (!right.valid(L_)) {
+				return;
+			}
+			ref = right.copy_ref(L_);
+		}
+
+		bool equals(lua_State* L_, const stateless_reference& r) const noexcept {
+			auto ppl = stack::push_pop(L_, *this);
+			auto ppr = stack::push_pop(L_, r);
+			return lua_compare(L_, -1, -2, LUA_OPEQ) == 1;
+		}
+
+		bool equals(lua_State* L_, const stateless_stack_reference& r) const noexcept {
+			auto ppl = stack::push_pop(L_, *this);
+			return lua_compare(L_, -1, r.stack_index(), LUA_OPEQ) == 1;
+		}
+
+		bool equals(lua_State* L_, lua_nil_t) const noexcept {
+			return valid(L_);
+		}
+	};
+
+	template <bool main_only = false>
+	class basic_reference : public stateless_reference {
+	private:
+		template <bool o_main_only>
+		friend class basic_reference;
+		lua_State* luastate = nullptr; // non-owning
+
+		template <bool r_main_only>
+		void copy_assign_complex(const basic_reference<r_main_only>& r) {
+			if (valid()) {
+				deref();
+			}
+			if (r.ref == LUA_REFNIL) {
+				luastate = detail::pick_main_thread < main_only && !r_main_only > (r.lua_state(), r.lua_state());
+				ref = LUA_REFNIL;
+				return;
+			}
+			if (r.ref == LUA_NOREF) {
+				luastate = r.luastate;
+				ref = LUA_NOREF;
+				return;
+			}
+			if (detail::xmovable(lua_state(), r.lua_state())) {
+				r.push(lua_state());
+				ref = luaL_ref(lua_state(), LUA_REGISTRYINDEX);
+				return;
+			}
+			luastate = detail::pick_main_thread < main_only && !r_main_only > (r.lua_state(), r.lua_state());
+			ref = r.copy_ref();
+		}
+
+		template <bool r_main_only>
+		void move_assign(basic_reference<r_main_only>&& r) {
+			if (valid()) {
+				deref();
+			}
+			if (r.ref == LUA_REFNIL) {
+				luastate = detail::pick_main_thread < main_only && !r_main_only > (r.lua_state(), r.lua_state());
+				ref = LUA_REFNIL;
+				return;
+			}
+			if (r.ref == LUA_NOREF) {
+				luastate = r.luastate;
+				ref = LUA_NOREF;
+				return;
+			}
+			if (detail::xmovable(lua_state(), r.lua_state())) {
+				r.push(lua_state());
+				ref = luaL_ref(lua_state(), LUA_REGISTRYINDEX);
+				return;
+			}
+
+			luastate = detail::pick_main_thread < main_only && !r_main_only > (r.lua_state(), r.lua_state());
+			ref = r.ref;
+			r.ref = LUA_NOREF;
+			r.luastate = nullptr;
+		}
+
+	protected:
+		basic_reference(lua_State* L_, global_tag_t) noexcept : basic_reference(detail::pick_main_thread<main_only>(L_, L_), global_tag, global_tag) {
+		}
+
+		basic_reference(lua_State* L_, global_tag_t, global_tag_t) noexcept : stateless_reference(L_, global_tag), luastate(L_) {
+		}
+
+		basic_reference(lua_State* oL, const basic_reference<!main_only>& o) noexcept : stateless_reference(oL, o), luastate(oL) {
+		}
+
+		void deref() const noexcept {
+			return stateless_reference::deref(lua_state());
+		}
+
+		int copy_ref() const noexcept {
+			return copy_ref(lua_state());
+		}
+
+		int copy_ref(lua_State* L_) const noexcept {
+			return stateless_reference::copy_ref(L_);
+		}
+
+	public:
+		basic_reference() noexcept = default;
+		basic_reference(lua_nil_t) noexcept : basic_reference() {
+		}
+		basic_reference(const stack_reference& r) noexcept : basic_reference(r.lua_state(), r.stack_index()) {
+		}
+		basic_reference(stack_reference&& r) noexcept : basic_reference(r.lua_state(), r.stack_index()) {
+		}
+		template <bool r_main_only>
+		basic_reference(lua_State* L_, const basic_reference<r_main_only>& r) noexcept : luastate(detail::pick_main_thread<main_only>(L_, L_)) {
+			if (r.ref == LUA_REFNIL) {
+				ref = LUA_REFNIL;
+				return;
+			}
+			if (r.ref == LUA_NOREF || lua_state() == nullptr) {
+				ref = LUA_NOREF;
+				return;
+			}
+			if (detail::xmovable(lua_state(), r.lua_state())) {
+				r.push(lua_state());
+				ref = luaL_ref(lua_state(), LUA_REGISTRYINDEX);
+				return;
+			}
+			ref = r.copy_ref();
+		}
+
+		template <bool r_main_only>
+		basic_reference(lua_State* L_, basic_reference<r_main_only>&& r) noexcept : luastate(detail::pick_main_thread<main_only>(L_, L_)) {
+			if (r.ref == LUA_REFNIL) {
+				ref = LUA_REFNIL;
+				return;
+			}
+			if (r.ref == LUA_NOREF || lua_state() == nullptr) {
+				ref = LUA_NOREF;
+				return;
+			}
+			if (detail::xmovable(lua_state(), r.lua_state())) {
+				r.push(lua_state());
+				ref = luaL_ref(lua_state(), LUA_REGISTRYINDEX);
+				return;
+			}
+			ref = r.ref;
+			r.ref = LUA_NOREF;
+			r.luastate = nullptr;
+		}
+
+		basic_reference(lua_State* L_, const stack_reference& r) noexcept : luastate(detail::pick_main_thread<main_only>(L_, L_)) {
+			if (lua_state() == nullptr || r.lua_state() == nullptr || r.get_type() == type::none) {
+				ref = LUA_NOREF;
+				return;
+			}
+			if (r.get_type() == type::lua_nil) {
+				ref = LUA_REFNIL;
+				return;
+			}
+			if (lua_state() != r.lua_state() && !detail::xmovable(lua_state(), r.lua_state())) {
+				return;
+			}
+			r.push(lua_state());
+			ref = luaL_ref(lua_state(), LUA_REGISTRYINDEX);
+		}
+		basic_reference(lua_State* L_, int index = -1) noexcept : luastate(detail::pick_main_thread<main_only>(L_, L_)) {
+			// use L_ to stick with that state's execution stack
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L_, 1, "not enough Lua stack space to push this reference value");
+#endif // make sure stack doesn't overflow
+			lua_pushvalue(L_, index);
+			ref = luaL_ref(L_, LUA_REGISTRYINDEX);
+		}
+		basic_reference(lua_State* L_, ref_index index) noexcept : luastate(detail::pick_main_thread<main_only>(L_, L_)) {
+			lua_rawgeti(lua_state(), LUA_REGISTRYINDEX, index.index);
+			ref = luaL_ref(lua_state(), LUA_REGISTRYINDEX);
+		}
+		basic_reference(lua_State* L_, lua_nil_t) noexcept : luastate(detail::pick_main_thread<main_only>(L_, L_)) {
+		}
+
+		~basic_reference() noexcept {
+			if (lua_state() == nullptr || ref == LUA_NOREF)
+				return;
+			deref();
+		}
+
+		basic_reference(const basic_reference& o) noexcept : stateless_reference(o.copy_ref()), luastate(o.lua_state()) {
+		}
+
+		basic_reference(basic_reference&& o) noexcept : stateless_reference(std::move(o)), luastate(o.lua_state()) {
+			o.luastate = nullptr;
+		}
+
+		basic_reference(const basic_reference<!main_only>& o) noexcept
+		: basic_reference(detail::pick_main_thread<main_only>(o.lua_state(), o.lua_state()), o) {
+		}
+
+		basic_reference(basic_reference<!main_only>&& o) noexcept
+		: stateless_reference(std::move(o)), luastate(detail::pick_main_thread<main_only>(o.lua_state(), o.lua_state())) {
+			o.luastate = nullptr;
+			o.ref = LUA_NOREF;
+		}
+
+		basic_reference& operator=(basic_reference&& r) noexcept {
+			move_assign(std::move(r));
+			return *this;
+		}
+
+		basic_reference& operator=(const basic_reference& r) noexcept {
+			copy_assign_complex(r);
+			return *this;
+		}
+
+		basic_reference& operator=(basic_reference<!main_only>&& r) noexcept {
+			move_assign(std::move(r));
+			return *this;
+		}
+
+		basic_reference& operator=(const basic_reference<!main_only>& r) noexcept {
+			copy_assign_complex(r);
+			return *this;
+		}
+
+		basic_reference& operator=(const lua_nil_t&) noexcept {
+			reset();
+			return *this;
+		}
+
+		template <typename Super>
+		basic_reference& operator=(proxy_base<Super>&& r);
+
+		template <typename Super>
+		basic_reference& operator=(const proxy_base<Super>& r);
+
+		int push() const noexcept {
+			return push(lua_state());
+		}
+
+		void reset() noexcept {
+			stateless_reference::reset(luastate);
+			luastate = nullptr;
+		}
+
+		int push(lua_State* L_) const noexcept {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L_, 1, "not enough Lua stack space to push this reference value");
+#endif // make sure stack doesn't overflow
+			if (lua_state() == nullptr) {
+				lua_pushnil(L_);
+				return 1;
+			}
+			lua_rawgeti(lua_state(), LUA_REGISTRYINDEX, ref);
+			if (L_ != lua_state()) {
+				lua_xmove(lua_state(), L_, 1);
+			}
+			return 1;
+		}
+
+		void pop() const noexcept {
+			pop(lua_state());
+		}
+
+		void pop(lua_State* L_, int n = 1) const noexcept {
+			stateless_reference::pop(L_, n);
+		}
+
+		int registry_index() const noexcept {
+			return stateless_reference::registry_index();
+		}
+
+		bool valid() const noexcept {
+			return stateless_reference::valid(lua_state());
+		}
+
+		bool valid(lua_State* L_) const noexcept {
+			return stateless_reference::valid(L_);
+		}
+
+		const void* pointer() const noexcept {
+			return stateless_reference::pointer(lua_state());
+		}
+
+		explicit operator bool() const noexcept {
+			return valid();
+		}
+
+		type get_type() const noexcept {
+			return stateless_reference::get_type(lua_state());
+		}
+
+		lua_State* lua_state() const noexcept {
+			return luastate;
+		}
+	};
+
+	template <bool lb, bool rb>
+	inline bool operator==(const basic_reference<lb>& l, const basic_reference<rb>& r) noexcept {
+		auto ppl = stack::push_pop(l);
+		auto ppr = stack::push_pop(r);
+		return lua_compare(l.lua_state(), -1, -2, LUA_OPEQ) == 1;
+	}
+
+	template <bool lb, bool rb>
+	inline bool operator!=(const basic_reference<lb>& l, const basic_reference<rb>& r) noexcept {
+		return !operator==(l, r);
+	}
+
+	template <bool lb>
+	inline bool operator==(const basic_reference<lb>& l, const stack_reference& r) noexcept {
+		auto ppl = stack::push_pop(l);
+		return lua_compare(l.lua_state(), -1, r.stack_index(), LUA_OPEQ) == 1;
+	}
+
+	template <bool lb>
+	inline bool operator!=(const basic_reference<lb>& l, const stack_reference& r) noexcept {
+		return !operator==(l, r);
+	}
+
+	template <bool rb>
+	inline bool operator==(const stack_reference& l, const basic_reference<rb>& r) noexcept {
+		auto ppr = stack::push_pop(r);
+		return lua_compare(l.lua_state(), -1, r.stack_index(), LUA_OPEQ) == 1;
+	}
+
+	template <bool rb>
+	inline bool operator!=(const stack_reference& l, const basic_reference<rb>& r) noexcept {
+		return !operator==(l, r);
+	}
+
+	template <bool lb>
+	inline bool operator==(const basic_reference<lb>& lhs, const lua_nil_t&) noexcept {
+		return !lhs.valid();
+	}
+
+	template <bool rb>
+	inline bool operator==(const lua_nil_t&, const basic_reference<rb>& rhs) noexcept {
+		return !rhs.valid();
+	}
+
+	template <bool lb>
+	inline bool operator!=(const basic_reference<lb>& lhs, const lua_nil_t&) noexcept {
+		return lhs.valid();
+	}
+
+	template <bool rb>
+	inline bool operator!=(const lua_nil_t&, const basic_reference<rb>& rhs) noexcept {
+		return rhs.valid();
+	}
+
+	inline bool operator==(const stateless_reference& l, const stateless_reference& r) noexcept {
+		return l.registry_index() == r.registry_index();
+	}
+
+	inline bool operator!=(const stateless_reference& l, const stateless_reference& r) noexcept {
+		return l.registry_index() != r.registry_index();
+	}
+
+	inline bool operator==(const stateless_reference& lhs, const lua_nil_t&) noexcept {
+		return lhs.registry_index() == LUA_REFNIL;
+	}
+
+	inline bool operator==(const lua_nil_t&, const stateless_reference& rhs) noexcept {
+		return rhs.registry_index() == LUA_REFNIL;
+	}
+
+	inline bool operator!=(const stateless_reference& lhs, const lua_nil_t&) noexcept {
+		return lhs.registry_index() != LUA_REFNIL;
+	}
+
+	inline bool operator!=(const lua_nil_t&, const stateless_reference& rhs) noexcept {
+		return rhs.registry_index() != LUA_REFNIL;
+	}
+
+	struct stateless_reference_equals : public stateless_stack_reference_equals {
+		using is_transparent = std::true_type;
+
+		stateless_reference_equals(lua_State* L_) noexcept : stateless_stack_reference_equals(L_) {
+		}
+
+		bool operator()(const lua_nil_t& lhs, const stateless_reference& rhs) const noexcept {
+			return rhs.equals(lua_state(), lhs);
+		}
+
+		bool operator()(const stateless_reference& lhs, const lua_nil_t& rhs) const noexcept {
+			return lhs.equals(lua_state(), rhs);
+		}
+
+		bool operator()(const stateless_reference& lhs, const stateless_reference& rhs) const noexcept {
+			return lhs.equals(lua_state(), rhs);
+		}
+	};
+
+	struct reference_equals : public stack_reference_equals {
+		using is_transparent = std::true_type;
+
+		template <bool rb>
+		bool operator()(const lua_nil_t& lhs, const basic_reference<rb>& rhs) const noexcept {
+			return lhs == rhs;
+		}
+
+		template <bool lb>
+		bool operator()(const basic_reference<lb>& lhs, const lua_nil_t& rhs) const noexcept {
+			return lhs == rhs;
+		}
+
+		template <bool lb, bool rb>
+		bool operator()(const basic_reference<lb>& lhs, const basic_reference<rb>& rhs) const noexcept {
+			return lhs == rhs;
+		}
+
+		template <bool lb>
+		bool operator()(const basic_reference<lb>& lhs, const stack_reference& rhs) const noexcept {
+			return lhs == rhs;
+		}
+
+		template <bool rb>
+		bool operator()(const stack_reference& lhs, const basic_reference<rb>& rhs) const noexcept {
+			return lhs == rhs;
+		}
+	};
+
+	struct stateless_reference_hash : public stateless_stack_reference_hash {
+		using argument_type = stateless_reference;
+		using result_type = std::size_t;
+		using is_transparent = std::true_type;
+
+		stateless_reference_hash(lua_State* L_) noexcept : stateless_stack_reference_hash(L_) {
+		}
+
+		result_type operator()(const stateless_reference& lhs) const noexcept {
+			std::hash<const void*> h;
+			return h(lhs.pointer(lua_state()));
+		}
+	};
+
+	struct reference_hash : public stack_reference_hash {
+		using argument_type = reference;
+		using result_type = std::size_t;
+		using is_transparent = std::true_type;
+
+		template <bool lb>
+		result_type operator()(const basic_reference<lb>& lhs) const noexcept {
+			std::hash<const void*> h;
+			return h(lhs.pointer());
+		}
+	};
+} // namespace sol
+
+// end of sol/reference.hpp
+
+// beginning of sol/tie.hpp
+
+namespace sol {
+
+	namespace detail {
+		template <typename T>
+		struct is_speshul : std::false_type { };
+	} // namespace detail
+
+	template <typename T>
+	struct tie_size : std::tuple_size<T> { };
+
+	template <typename T>
+	struct is_tieable : std::integral_constant<bool, (::sol::tie_size<T>::value > 0)> { };
+
+	template <typename... Tn>
+	struct tie_t : public std::tuple<std::add_lvalue_reference_t<Tn>...> {
+	private:
+		typedef std::tuple<std::add_lvalue_reference_t<Tn>...> base_t;
+
+		template <typename T>
+		void set(std::false_type, T&& target) {
+			std::get<0>(*this) = std::forward<T>(target);
+		}
+
+		template <typename T>
+		void set(std::true_type, T&& target) {
+			typedef tie_size<meta::unqualified_t<T>> value_size;
+			typedef tie_size<std::tuple<Tn...>> tie_size;
+			typedef meta::conditional_t<(value_size::value < tie_size::value), value_size, tie_size> indices_size;
+			typedef std::make_index_sequence<indices_size::value> indices;
+			set_extra(detail::is_speshul<meta::unqualified_t<T>>(), indices(), std::forward<T>(target));
+		}
+
+		template <std::size_t... I, typename T>
+		void set_extra(std::true_type, std::index_sequence<I...>, T&& target) {
+			using std::get;
+			(void)detail::swallow { 0, (get<I>(static_cast<base_t&>(*this)) = get<I>(types<Tn...>(), target), 0)..., 0 };
+		}
+
+		template <std::size_t... I, typename T>
+		void set_extra(std::false_type, std::index_sequence<I...>, T&& target) {
+			using std::get;
+			(void)detail::swallow { 0, (get<I>(static_cast<base_t&>(*this)) = get<I>(target), 0)..., 0 };
+		}
+
+	public:
+		using base_t::base_t;
+
+		template <typename T>
+		tie_t& operator=(T&& value) {
+			typedef is_tieable<meta::unqualified_t<T>> tieable;
+			set(tieable(), std::forward<T>(value));
+			return *this;
+		}
+	};
+
+	template <typename... Tn>
+	struct tie_size<tie_t<Tn...>> : std::tuple_size<std::tuple<Tn...>> { };
+
+	namespace adl_barrier_detail {
+		template <typename... Tn>
+		inline tie_t<std::remove_reference_t<Tn>...> tie(Tn&&... argn) {
+			return tie_t<std::remove_reference_t<Tn>...>(std::forward<Tn>(argn)...);
+		}
+	} // namespace adl_barrier_detail
+
+	using namespace adl_barrier_detail;
+
+} // namespace sol
+
+// end of sol/tie.hpp
+
+// beginning of sol/stack_guard.hpp
+
+#include <functional>
+
+namespace sol {
+	namespace detail {
+		inline void stack_fail(int, int) {
+#if SOL_IS_ON(SOL_EXCEPTIONS)
+			throw error(detail::direct_error, "imbalanced stack after operation finish");
+#else
+			// Lol, what do you want, an error printout? :3c
+			// There's no sane default here. The right way would be C-style abort(), and that's not acceptable, so
+			// hopefully someone will register their own stack_fail thing for the `fx` parameter of stack_guard.
+#endif // No Exceptions
+		}
+	} // namespace detail
+
+	struct stack_guard {
+		lua_State* L;
+		int top;
+		std::function<void(int, int)> on_mismatch;
+
+		stack_guard(lua_State* L) : stack_guard(L, lua_gettop(L)) {
+		}
+		stack_guard(lua_State* L, int top, std::function<void(int, int)> fx = detail::stack_fail) : L(L), top(top), on_mismatch(std::move(fx)) {
+		}
+		bool check_stack(int modification = 0) const {
+			int bottom = lua_gettop(L) + modification;
+			if (top == bottom) {
+				return true;
+			}
+			on_mismatch(top, bottom);
+			return false;
+		}
+		~stack_guard() {
+			check_stack();
+		}
+	};
+} // namespace sol
+
+// end of sol/stack_guard.hpp
+
+#include <vector>
+#include <bitset>
+#include <forward_list>
+#include <string>
+#include <limits>
+#include <algorithm>
+#include <sstream>
+#include <optional>
+#include <type_traits>
+
+namespace sol {
+	namespace detail {
+		struct with_function_tag { };
+		struct as_reference_tag { };
+		template <typename T>
+		struct as_pointer_tag { };
+		template <typename T>
+		struct as_value_tag { };
+		template <typename T>
+		struct as_unique_tag { };
+		template <typename T>
+		struct as_table_tag { };
+
+		template <typename Tag>
+		inline constexpr bool is_tagged_v
+		     = meta::is_specialization_of_v<Tag,
+		            detail::
+		                 as_pointer_tag> || meta::is_specialization_of_v<Tag, as_value_tag> || meta::is_specialization_of_v<Tag, as_unique_tag> || meta::is_specialization_of_v<Tag, as_table_tag> || std::is_same_v<Tag, as_reference_tag> || std::is_same_v<Tag, with_function_tag>;
+
+		using lua_reg_table = luaL_Reg[64];
+
+		using unique_destructor = void (*)(void*);
+		using unique_tag = detail::inheritance_unique_cast_function;
+
+		inline void* alloc_newuserdata(lua_State* L, std::size_t bytesize) {
+#if SOL_LUA_VERSION_I_ >= 504
+			return lua_newuserdatauv(L, bytesize, 1);
+#else
+			return lua_newuserdata(L, bytesize);
+#endif
+		}
+
+		constexpr std::uintptr_t align(std::size_t alignment, std::uintptr_t ptr, std::size_t& space) {
+			// this handles arbitrary alignments...
+			// make this into a power-of-2-only?
+			// actually can't: this is a C++14-compatible framework,
+			// power of 2 alignment is C++17
+			std::uintptr_t offby = static_cast<std::uintptr_t>(ptr % alignment);
+			std::uintptr_t padding = (alignment - offby) % alignment;
+			ptr += padding;
+			space -= padding;
+			return ptr;
+		}
+
+		inline void* align(std::size_t alignment, void* ptr, std::size_t& space) {
+			return reinterpret_cast<void*>(align(alignment, reinterpret_cast<std::uintptr_t>(ptr), space));
+		}
+
+		constexpr std::uintptr_t align_one(std::size_t alignment, std::size_t size, std::uintptr_t ptr) {
+			std::size_t space = (std::numeric_limits<std::size_t>::max)();
+			return align(alignment, ptr, space) + size;
+		}
+
+		template <typename... Args>
+		constexpr std::size_t aligned_space_for(std::uintptr_t ptr) {
+			std::uintptr_t end = ptr;
+			((end = align_one(alignof(Args), sizeof(Args), end)), ...);
+			return static_cast<std::size_t>(end - ptr);
+		}
+
+		template <typename... Args>
+		constexpr std::size_t aligned_space_for() {
+			static_assert(sizeof...(Args) > 0);
+
+			constexpr std::size_t max_arg_alignment = (std::max)({ alignof(Args)... });
+			if constexpr (max_arg_alignment <= alignof(std::max_align_t)) {
+				// If all types are `good enough`, simply calculate alignment in case of the worst allocator
+				std::size_t worst_required_size = 0;
+				for (std::size_t ptr = 0; ptr < max_arg_alignment; ptr++) {
+					worst_required_size = (std::max)(worst_required_size, aligned_space_for<Args...>(ptr));
+				}
+				return worst_required_size;
+			}
+			else {
+				// For over-aligned types let's assume that every Arg in Args starts at the worst aligned address
+				return (aligned_space_for<Args>(0x1) + ...);
+			}
+		}
+
+		inline void* align_usertype_pointer(void* ptr) {
+			using use_align = std::integral_constant<bool,
+#if SOL_IS_OFF(SOL_ALIGN_MEMORY)
+			     false
+#else
+			     (std::alignment_of<void*>::value > 1)
+#endif
+			     >;
+			if (!use_align::value) {
+				return ptr;
+			}
+			std::size_t space = (std::numeric_limits<std::size_t>::max)();
+			return align(std::alignment_of<void*>::value, ptr, space);
+		}
+
+		template <bool pre_aligned = false, bool pre_shifted = false>
+		void* align_usertype_unique_destructor(void* ptr) {
+			using use_align = std::integral_constant<bool,
+#if SOL_IS_OFF(SOL_ALIGN_MEMORY)
+			     false
+#else
+			     (std::alignment_of<unique_destructor>::value > 1)
+#endif
+			     >;
+			if (!pre_aligned) {
+				ptr = align_usertype_pointer(ptr);
+			}
+			if (!pre_shifted) {
+				ptr = static_cast<void*>(static_cast<char*>(ptr) + sizeof(void*));
+			}
+			if (!use_align::value) {
+				return static_cast<void*>(static_cast<void**>(ptr) + 1);
+			}
+			std::size_t space = (std::numeric_limits<std::size_t>::max)();
+			return align(std::alignment_of<unique_destructor>::value, ptr, space);
+		}
+
+		template <bool pre_aligned = false, bool pre_shifted = false>
+		void* align_usertype_unique_tag(void* ptr) {
+			using use_align = std::integral_constant<bool,
+#if SOL_IS_OFF(SOL_ALIGN_MEMORY)
+			     false
+#else
+			     (std::alignment_of<unique_tag>::value > 1)
+#endif
+			     >;
+			if (!pre_aligned) {
+				ptr = align_usertype_unique_destructor(ptr);
+			}
+			if (!pre_shifted) {
+				ptr = static_cast<void*>(static_cast<char*>(ptr) + sizeof(unique_destructor));
+			}
+			if (!use_align::value) {
+				return ptr;
+			}
+			std::size_t space = (std::numeric_limits<std::size_t>::max)();
+			return align(std::alignment_of<unique_tag>::value, ptr, space);
+		}
+
+		template <typename T, bool pre_aligned = false, bool pre_shifted = false>
+		void* align_usertype_unique(void* ptr) {
+			typedef std::integral_constant<bool,
+#if SOL_IS_OFF(SOL_ALIGN_MEMORY)
+			     false
+#else
+			     (std::alignment_of_v<T> > 1)
+#endif
+			     >
+			     use_align;
+			if (!pre_aligned) {
+				ptr = align_usertype_unique_tag(ptr);
+			}
+			if (!pre_shifted) {
+				ptr = static_cast<void*>(static_cast<char*>(ptr) + sizeof(unique_tag));
+			}
+			if (!use_align::value) {
+				return ptr;
+			}
+			std::size_t space = (std::numeric_limits<std::size_t>::max)();
+			return align(std::alignment_of_v<T>, ptr, space);
+		}
+
+		template <typename T>
+		void* align_user(void* ptr) {
+			typedef std::integral_constant<bool,
+#if SOL_IS_OFF(SOL_ALIGN_MEMORY)
+			     false
+#else
+			     (std::alignment_of_v<T> > 1)
+#endif
+			     >
+			     use_align;
+			if (!use_align::value) {
+				return ptr;
+			}
+			std::size_t space = (std::numeric_limits<std::size_t>::max)();
+			return align(std::alignment_of_v<T>, ptr, space);
+		}
+
+		template <typename T>
+		T** usertype_allocate_pointer(lua_State* L) {
+			typedef std::integral_constant<bool,
+#if SOL_IS_OFF(SOL_ALIGN_MEMORY)
+			     false
+#else
+			     (std::alignment_of<T*>::value > 1)
+#endif
+			     >
+			     use_align;
+			if (!use_align::value) {
+				T** pointerpointer = static_cast<T**>(alloc_newuserdata(L, sizeof(T*)));
+				return pointerpointer;
+			}
+			constexpr std::size_t initial_size = aligned_space_for<T*>();
+
+			std::size_t allocated_size = initial_size;
+			void* unadjusted = alloc_newuserdata(L, initial_size);
+			void* adjusted = align(std::alignment_of<T*>::value, unadjusted, allocated_size);
+			if (adjusted == nullptr) {
+				// trash allocator can burn in hell
+				lua_pop(L, 1);
+				// luaL_error(L, "if you are the one that wrote this allocator you should feel bad for doing a
+				// worse job than malloc/realloc and should go read some books, yeah?");
+				luaL_error(L, "cannot properly align memory for '%s'", detail::demangle<T*>().data());
+			}
+			return static_cast<T**>(adjusted);
+		}
+
+		inline bool attempt_alloc(lua_State* L, std::size_t ptr_align, std::size_t ptr_size, std::size_t value_align,
+		     std::size_t allocated_size, void*& pointer_adjusted, void*& data_adjusted) {
+			void* adjusted = alloc_newuserdata(L, allocated_size);
+			pointer_adjusted = align(ptr_align, adjusted, allocated_size);
+			if (pointer_adjusted == nullptr) {
+				lua_pop(L, 1);
+				return false;
+			}
+			// subtract size of what we're going to allocate there
+			allocated_size -= ptr_size;
+			adjusted = static_cast<void*>(static_cast<char*>(pointer_adjusted) + ptr_size);
+			data_adjusted = align(value_align, adjusted, allocated_size);
+			if (data_adjusted == nullptr) {
+				lua_pop(L, 1);
+				return false;
+			}
+			return true;
+		}
+
+		inline bool attempt_alloc_unique(lua_State* L, std::size_t ptr_align, std::size_t ptr_size, std::size_t real_align,
+		     std::size_t allocated_size, void*& pointer_adjusted, void*& dx_adjusted, void*& id_adjusted, void*& data_adjusted) {
+			void* adjusted = alloc_newuserdata(L, allocated_size);
+			pointer_adjusted = align(ptr_align, adjusted, allocated_size);
+			if (pointer_adjusted == nullptr) {
+				lua_pop(L, 1);
+				return false;
+			}
+			allocated_size -= ptr_size;
+
+			adjusted = static_cast<void*>(static_cast<char*>(pointer_adjusted) + ptr_size);
+			dx_adjusted = align(std::alignment_of_v<unique_destructor>, adjusted, allocated_size);
+			if (dx_adjusted == nullptr) {
+				lua_pop(L, 1);
+				return false;
+			}
+			allocated_size -= sizeof(unique_destructor);
+
+			adjusted = static_cast<void*>(static_cast<char*>(dx_adjusted) + sizeof(unique_destructor));
+
+			id_adjusted = align(std::alignment_of_v<unique_tag>, adjusted, allocated_size);
+			if (id_adjusted == nullptr) {
+				lua_pop(L, 1);
+				return false;
+			}
+			allocated_size -= sizeof(unique_tag);
+
+			adjusted = static_cast<void*>(static_cast<char*>(id_adjusted) + sizeof(unique_tag));
+			data_adjusted = align(real_align, adjusted, allocated_size);
+			if (data_adjusted == nullptr) {
+				lua_pop(L, 1);
+				return false;
+			}
+			return true;
+		}
+
+		template <typename T>
+		T* usertype_allocate(lua_State* L) {
+			typedef std::integral_constant<bool,
+#if SOL_IS_OFF(SOL_ALIGN_MEMORY)
+			     false
+#else
+			     (std::alignment_of<T*>::value > 1 || std::alignment_of_v<T> > 1)
+#endif
+			     >
+			     use_align;
+			if (!use_align::value) {
+				T** pointerpointer = static_cast<T**>(alloc_newuserdata(L, sizeof(T*) + sizeof(T)));
+				T*& pointerreference = *pointerpointer;
+				T* allocationtarget = reinterpret_cast<T*>(pointerpointer + 1);
+				pointerreference = allocationtarget;
+				return allocationtarget;
+			}
+
+			constexpr std::size_t initial_size = aligned_space_for<T*, T>();
+
+			void* pointer_adjusted;
+			void* data_adjusted;
+			bool result
+			     = attempt_alloc(L, std::alignment_of_v<T*>, sizeof(T*), std::alignment_of_v<T>, initial_size, pointer_adjusted, data_adjusted);
+			if (!result) {
+				if (pointer_adjusted == nullptr) {
+					luaL_error(L, "aligned allocation of userdata block (pointer section) for '%s' failed", detail::demangle<T>().c_str());
+				}
+				else {
+					luaL_error(L, "aligned allocation of userdata block (data section) for '%s' failed", detail::demangle<T>().c_str());
+				}
+				return nullptr;
+			}
+
+			T** pointerpointer = reinterpret_cast<T**>(pointer_adjusted);
+			T*& pointerreference = *pointerpointer;
+			T* allocationtarget = reinterpret_cast<T*>(data_adjusted);
+			pointerreference = allocationtarget;
+			return allocationtarget;
+		}
+
+		template <typename T, typename Real>
+		Real* usertype_unique_allocate(lua_State* L, T**& pref, unique_destructor*& dx, unique_tag*& id) {
+			typedef std::integral_constant<bool,
+#if SOL_IS_OFF(SOL_ALIGN_MEMORY)
+			     false
+#else
+			     (std::alignment_of<T*>::value > 1 || std::alignment_of<unique_tag>::value > 1 || std::alignment_of<unique_destructor>::value > 1
+			          || std::alignment_of<Real>::value > 1)
+#endif
+			     >
+			     use_align;
+			if (!use_align::value) {
+				pref = static_cast<T**>(alloc_newuserdata(L, sizeof(T*) + sizeof(detail::unique_destructor) + sizeof(unique_tag) + sizeof(Real)));
+				dx = static_cast<detail::unique_destructor*>(static_cast<void*>(pref + 1));
+				id = static_cast<unique_tag*>(static_cast<void*>(dx + 1));
+				Real* mem = static_cast<Real*>(static_cast<void*>(id + 1));
+				return mem;
+			}
+
+			constexpr std::size_t initial_size = aligned_space_for<T*, unique_destructor, unique_tag, Real>();
+
+			void* pointer_adjusted = nullptr;
+			void* dx_adjusted = nullptr;
+			void* id_adjusted = nullptr;
+			void* data_adjusted = nullptr;
+			bool result = attempt_alloc_unique(L,
+			     std::alignment_of_v<T*>,
+			     sizeof(T*),
+			     std::alignment_of_v<Real>,
+			     initial_size,
+			     pointer_adjusted,
+			     dx_adjusted,
+			     id_adjusted,
+			     data_adjusted);
+			if (!result) {
+				if (pointer_adjusted == nullptr) {
+					luaL_error(L, "aligned allocation of userdata block (pointer section) for '%s' failed", detail::demangle<T>().c_str());
+				}
+				else if (dx_adjusted == nullptr) {
+					luaL_error(L, "aligned allocation of userdata block (deleter section) for '%s' failed", detail::demangle<T>().c_str());
+				}
+				else {
+					luaL_error(L, "aligned allocation of userdata block (data section) for '%s' failed", detail::demangle<T>().c_str());
+				}
+				return nullptr;
+			}
+
+			pref = static_cast<T**>(pointer_adjusted);
+			dx = static_cast<detail::unique_destructor*>(dx_adjusted);
+			id = static_cast<unique_tag*>(id_adjusted);
+			Real* mem = static_cast<Real*>(data_adjusted);
+			return mem;
+		}
+
+		template <typename T>
+		T* user_allocate(lua_State* L) {
+			typedef std::integral_constant<bool,
+#if SOL_IS_OFF(SOL_ALIGN_MEMORY)
+			     false
+#else
+			     (std::alignment_of_v<T> > 1)
+#endif
+			     >
+			     use_align;
+			if (!use_align::value) {
+				T* pointer = static_cast<T*>(alloc_newuserdata(L, sizeof(T)));
+				return pointer;
+			}
+
+			constexpr std::size_t initial_size = aligned_space_for<T>();
+
+			std::size_t allocated_size = initial_size;
+			void* unadjusted = alloc_newuserdata(L, allocated_size);
+			void* adjusted = align(std::alignment_of_v<T>, unadjusted, allocated_size);
+			if (adjusted == nullptr) {
+				lua_pop(L, 1);
+				luaL_error(L, "cannot properly align memory for '%s'", detail::demangle<T>().data());
+			}
+			return static_cast<T*>(adjusted);
+		}
+
+		template <typename T>
+		int usertype_alloc_destroy(lua_State* L) noexcept {
+			void* memory = lua_touserdata(L, 1);
+			memory = align_usertype_pointer(memory);
+			T** pdata = static_cast<T**>(memory);
+			T* data = *pdata;
+			std::allocator<T> alloc {};
+			std::allocator_traits<std::allocator<T>>::destroy(alloc, data);
+			return 0;
+		}
+
+		template <typename T>
+		int unique_destroy(lua_State* L) noexcept {
+			void* memory = lua_touserdata(L, 1);
+			memory = align_usertype_unique_destructor(memory);
+			unique_destructor& dx = *static_cast<unique_destructor*>(memory);
+			memory = align_usertype_unique_tag<true>(memory);
+			(dx)(memory);
+			return 0;
+		}
+
+		template <typename T>
+		int user_alloc_destroy(lua_State* L) noexcept {
+			void* memory = lua_touserdata(L, 1);
+			void* aligned_memory = align_user<T>(memory);
+			T* typed_memory = static_cast<T*>(aligned_memory);
+			std::allocator<T> alloc;
+			std::allocator_traits<std::allocator<T>>::destroy(alloc, typed_memory);
+			return 0;
+		}
+
+		template <typename T, typename Real>
+		void usertype_unique_alloc_destroy(void* memory) {
+			void* aligned_memory = align_usertype_unique<Real, true>(memory);
+			Real* typed_memory = static_cast<Real*>(aligned_memory);
+			std::allocator<Real> alloc;
+			std::allocator_traits<std::allocator<Real>>::destroy(alloc, typed_memory);
+		}
+
+		template <typename T>
+		int cannot_destroy(lua_State* L) {
+			return luaL_error(L,
+			     "cannot call the destructor for '%s': it is either hidden (protected/private) or removed with '= "
+			     "delete' and thusly this type is being destroyed without properly destroying, invoking undefined "
+			     "behavior: please bind a usertype and specify a custom destructor to define the behavior properly",
+			     detail::demangle<T>().data());
+		}
+
+		template <typename T>
+		void reserve(T&, std::size_t) {
+		}
+
+		template <typename T, typename Al>
+		void reserve(std::vector<T, Al>& vec, std::size_t hint) {
+			vec.reserve(hint);
+		}
+
+		template <typename T, typename Tr, typename Al>
+		void reserve(std::basic_string<T, Tr, Al>& str, std::size_t hint) {
+			str.reserve(hint);
+		}
+
+		inline bool property_always_true(meta_function) {
+			return true;
+		}
+
+		struct properties_enrollment_allowed {
+			int& times_through;
+			std::bitset<64>& properties;
+			automagic_enrollments& enrollments;
+
+			properties_enrollment_allowed(int& times_through_, std::bitset<64>& properties_, automagic_enrollments& enrollments_)
+			: times_through(times_through_), properties(properties_), enrollments(enrollments_) {
+			}
+
+			bool operator()(meta_function mf) const {
+				bool p = properties[static_cast<std::size_t>(mf)];
+				if (times_through > 0) {
+					return p;
+				}
+				switch (mf) {
+				case meta_function::length:
+					return enrollments.length_operator && !p;
+				case meta_function::pairs:
+					return enrollments.pairs_operator && !p;
+				case meta_function::call:
+					return enrollments.call_operator && !p;
+				case meta_function::less_than:
+					return enrollments.less_than_operator && !p;
+				case meta_function::less_than_or_equal_to:
+					return enrollments.less_than_or_equal_to_operator && !p;
+				case meta_function::equal_to:
+					return enrollments.equal_to_operator && !p;
+				default:
+					break;
+				}
+				return !p;
+			}
+		};
+
+		struct indexed_insert {
+			lua_reg_table& registration_table;
+			int& index;
+
+			indexed_insert(lua_reg_table& registration_table_, int& index_ref_) : registration_table(registration_table_), index(index_ref_) {
+			}
+			void operator()(meta_function meta_function_name_, lua_CFunction c_function_) {
+				registration_table[index] = luaL_Reg { to_string(meta_function_name_).c_str(), c_function_ };
+				++index;
+			}
+		};
+	} // namespace detail
+
+	namespace stack {
+
+		template <typename T, bool global = false, bool raw = false, typename = void>
+		struct field_getter;
+		template <typename T, typename P, bool global = false, bool raw = false, typename = void>
+		struct probe_field_getter;
+
+		template <typename T, bool global = false, bool raw = false, typename = void>
+		struct field_setter;
+
+		template <typename T, typename = void>
+		struct unqualified_getter;
+		template <typename T, typename = void>
+		struct qualified_getter;
+
+		template <typename T, typename = void>
+		struct qualified_interop_getter;
+		template <typename T, typename = void>
+		struct unqualified_interop_getter;
+
+		template <typename T, typename = void>
+		struct popper;
+
+		template <typename T, typename = void>
+		struct unqualified_pusher;
+
+		template <typename T, type t, typename = void>
+		struct unqualified_checker;
+		template <typename T, type t, typename = void>
+		struct qualified_checker;
+
+		template <typename T, typename = void>
+		struct unqualified_check_getter;
+		template <typename T, typename = void>
+		struct qualified_check_getter;
+
+		struct probe {
+			bool success;
+			int levels;
+
+			probe(bool s, int l) : success(s), levels(l) {
+			}
+
+			operator bool() const {
+				return success;
+			};
+		};
+
+		struct record {
+			int last;
+			int used;
+
+			record() noexcept : last(), used() {
+			}
+			void use(int count) noexcept {
+				last = count;
+				used += count;
+			}
+		};
+
+		namespace stack_detail {
+			template <typename Function>
+			Function* get_function_pointer(lua_State*, int, record&) noexcept;
+			template <typename Function, typename Handler>
+			bool check_function_pointer(lua_State* L, int index, Handler&& handler, record& tracking) noexcept;
+		} // namespace stack_detail
+
+	} // namespace stack
+
+	namespace meta { namespace meta_detail {
+		template <typename T>
+		using adl_sol_lua_get_test_t = decltype(sol_lua_get(types<T>(), static_cast<lua_State*>(nullptr), -1, std::declval<stack::record&>()));
+
+		template <typename T>
+		using adl_sol_lua_interop_get_test_t
+			= decltype(sol_lua_interop_get(types<T>(), static_cast<lua_State*>(nullptr), -1, static_cast<void*>(nullptr), std::declval<stack::record&>()));
+
+		template <typename T>
+		using adl_sol_lua_check_test_t = decltype(sol_lua_check(types<T>(), static_cast<lua_State*>(nullptr), -1, &no_panic, std::declval<stack::record&>()));
+
+		template <typename T>
+		using adl_sol_lua_interop_check_test_t
+			= decltype(sol_lua_interop_check(types<T>(), static_cast<lua_State*>(nullptr), -1, type::none, &no_panic, std::declval<stack::record&>()));
+
+		template <typename T>
+		using adl_sol_lua_check_get_test_t
+			= decltype(sol_lua_check_get(types<T>(), static_cast<lua_State*>(nullptr), -1, &no_panic, std::declval<stack::record&>()));
+
+		template <typename... Args>
+		using adl_sol_lua_push_test_t = decltype(sol_lua_push(static_cast<lua_State*>(nullptr), std::declval<Args>()...));
+
+		template <typename T, typename... Args>
+		using adl_sol_lua_push_exact_test_t = decltype(sol_lua_push(types<T>(), static_cast<lua_State*>(nullptr), std::declval<Args>()...));
+
+		template <typename T>
+		inline constexpr bool is_adl_sol_lua_get_v = meta::is_detected_v<adl_sol_lua_get_test_t, T>;
+
+		template <typename T>
+		inline constexpr bool is_adl_sol_lua_interop_get_v = meta::is_detected_v<adl_sol_lua_interop_get_test_t, T>;
+
+		template <typename T>
+		inline constexpr bool is_adl_sol_lua_check_v = meta::is_detected_v<adl_sol_lua_check_test_t, T>;
+
+		template <typename T>
+		inline constexpr bool is_adl_sol_lua_interop_check_v = meta::is_detected_v<adl_sol_lua_interop_check_test_t, T>;
+
+		template <typename T>
+		inline constexpr bool is_adl_sol_lua_check_get_v = meta::is_detected_v<adl_sol_lua_check_get_test_t, T>;
+
+		template <typename... Args>
+		inline constexpr bool is_adl_sol_lua_push_v = meta::is_detected_v<adl_sol_lua_push_test_t, Args...>;
+
+		template <typename T, typename... Args>
+		inline constexpr bool is_adl_sol_lua_push_exact_v = meta::is_detected_v<adl_sol_lua_push_exact_test_t, T, Args...>;
+	}} // namespace meta::meta_detail
+
+	namespace stack {
+		namespace stack_detail {
+			constexpr const char* not_enough_stack_space = "not enough space left on Lua stack";
+			constexpr const char* not_enough_stack_space_floating = "not enough space left on Lua stack for a floating point number";
+			constexpr const char* not_enough_stack_space_integral = "not enough space left on Lua stack for an integral number";
+			constexpr const char* not_enough_stack_space_string = "not enough space left on Lua stack for a string";
+			constexpr const char* not_enough_stack_space_meta_function_name = "not enough space left on Lua stack for the name of a meta_function";
+			constexpr const char* not_enough_stack_space_userdata = "not enough space left on Lua stack to create a sol2 userdata";
+			constexpr const char* not_enough_stack_space_generic = "not enough space left on Lua stack to push valuees";
+			constexpr const char* not_enough_stack_space_environment = "not enough space left on Lua stack to retrieve environment";
+
+			template <typename T>
+			struct strip {
+				typedef T type;
+			};
+			template <typename T>
+			struct strip<std::reference_wrapper<T>> {
+				typedef T& type;
+			};
+			template <typename T>
+			struct strip<user<T>> {
+				typedef T& type;
+			};
+			template <typename T>
+			struct strip<non_null<T>> {
+				typedef T type;
+			};
+			template <typename T>
+			using strip_t = typename strip<T>::type;
+
+			template <typename C>
+			static int get_size_hint(C& c) {
+				return static_cast<int>(c.size());
+			}
+
+			template <typename V, typename Al>
+			static int get_size_hint(const std::forward_list<V, Al>&) {
+				// forward_list makes me sad
+				return static_cast<int>(32);
+			}
+
+			template <typename T>
+			decltype(auto) unchecked_unqualified_get(lua_State* L, int index, record& tracking) {
+				using Tu = meta::unqualified_t<T>;
+				if constexpr (meta::meta_detail::is_adl_sol_lua_get_v<Tu>) {
+					return sol_lua_get(types<Tu>(), L, index, tracking);
+				}
+				else {
+					unqualified_getter<Tu> g {};
+					return g.get(L, index, tracking);
+				}
+			}
+
+			template <typename T>
+			decltype(auto) unchecked_get(lua_State* L, int index, record& tracking) {
+				if constexpr (meta::meta_detail::is_adl_sol_lua_get_v<T>) {
+					return sol_lua_get(types<T>(), L, index, tracking);
+				}
+				else {
+					qualified_getter<T> g {};
+					return g.get(L, index, tracking);
+				}
+			}
+
+			template <typename T>
+			decltype(auto) unqualified_interop_get(lua_State* L, int index, void* unadjusted_pointer, record& tracking) {
+				using Tu = meta::unqualified_t<T>;
+				if constexpr (meta::meta_detail::is_adl_sol_lua_interop_get_v<Tu>) {
+					return sol_lua_interop_get(types<Tu>(), L, index, unadjusted_pointer, tracking);
+				}
+				else {
+					(void)L;
+					(void)index;
+					(void)unadjusted_pointer;
+					(void)tracking;
+					using Ti = stack_detail::strip_t<Tu>;
+					return std::pair<bool, Ti*> { false, nullptr };
+				}
+			}
+
+			template <typename T>
+			decltype(auto) interop_get(lua_State* L, int index, void* unadjusted_pointer, record& tracking) {
+				if constexpr (meta::meta_detail::is_adl_sol_lua_interop_get_v<T>) {
+					return sol_lua_interop_get(types<T>(), L, index, unadjusted_pointer, tracking);
+				}
+				else {
+					return unqualified_interop_get<T>(L, index, unadjusted_pointer, tracking);
+				}
+			}
+
+			template <typename T, typename Handler>
+			bool unqualified_interop_check(lua_State* L, int index, type index_type, Handler&& handler, record& tracking) {
+				using Tu = meta::unqualified_t<T>;
+				if constexpr (meta::meta_detail::is_adl_sol_lua_interop_check_v<Tu>) {
+					return sol_lua_interop_check(types<Tu>(), L, index, index_type, std::forward<Handler>(handler), tracking);
+				}
+				else {
+					(void)L;
+					(void)index;
+					(void)index_type;
+					(void)handler;
+					(void)tracking;
+					return false;
+				}
+			}
+
+			template <typename T, typename Handler>
+			bool interop_check(lua_State* L, int index, type index_type, Handler&& handler, record& tracking) {
+				if constexpr (meta::meta_detail::is_adl_sol_lua_interop_check_v<T>) {
+					return sol_lua_interop_check(types<T>(), L, index, index_type, std::forward<Handler>(handler), tracking);
+				}
+				else {
+					return unqualified_interop_check<T>(L, index, index_type, std::forward<Handler>(handler), tracking);
+				}
+			}
+
+			using undefined_method_func = void (*)(stack_reference);
+
+			struct undefined_metatable {
+				lua_State* L;
+				const char* key;
+				undefined_method_func on_new_table;
+
+				undefined_metatable(lua_State* l, const char* k, undefined_method_func umf) : L(l), key(k), on_new_table(umf) {
+				}
+
+				void operator()() const {
+					if (luaL_newmetatable(L, key) == 1) {
+						on_new_table(stack_reference(L, -1));
+					}
+					lua_setmetatable(L, -2);
+				}
+			};
+		} // namespace stack_detail
+
+		inline bool maybe_indexable(lua_State* L, int index = -1) {
+			type t = type_of(L, index);
+			return t == type::userdata || t == type::table;
+		}
+
+		inline int top(lua_State* L) {
+			return lua_gettop(L);
+		}
+
+		inline bool is_main_thread(lua_State* L) {
+			int ismainthread = lua_pushthread(L);
+			lua_pop(L, 1);
+			return ismainthread == 1;
+		}
+
+		inline void coroutine_create_guard(lua_State* L) {
+			if (is_main_thread(L)) {
+				return;
+			}
+			int stacksize = lua_gettop(L);
+			if (stacksize < 1) {
+				return;
+			}
+			if (type_of(L, 1) != type::function) {
+				return;
+			}
+			// well now we're screwed...
+			// we can clean the stack and pray it doesn't destroy anything?
+			lua_pop(L, stacksize);
+		}
+
+		inline void clear(lua_State* L, int table_index) {
+			lua_pushnil(L);
+			while (lua_next(L, table_index) != 0) {
+				// remove value
+				lua_pop(L, 1);
+				// duplicate key to protect form rawset
+				lua_pushvalue(L, -1);
+				// push new value
+				lua_pushnil(L);
+				// table_index%[key] = nil
+				lua_rawset(L, table_index);
+			}
+		}
+
+		inline void clear(reference& r) {
+			auto pp = push_pop<false>(r);
+			int stack_index = pp.index_of(r);
+			clear(r.lua_state(), stack_index);
+		}
+
+		inline void clear(stack_reference& r) {
+			clear(r.lua_state(), r.stack_index());
+		}
+
+		inline void clear(lua_State* L_, stateless_reference& r) {
+			r.push(L_);
+			int stack_index = absolute_index(L_, -1);
+			clear(L_, stack_index);
+			r.pop(L_);
+		}
+
+		inline void clear(lua_State* L_, stateless_stack_reference& r) {
+			clear(L_, r.stack_index());
+		}
+
+		template <typename T, typename... Args>
+		int push(lua_State* L, T&& t, Args&&... args) {
+			using Tu = meta::unqualified_t<T>;
+			if constexpr (meta::meta_detail::is_adl_sol_lua_push_exact_v<T, T, Args...>) {
+				return sol_lua_push(types<T>(), L, std::forward<T>(t), std::forward<Args>(args)...);
+			}
+			else if constexpr (meta::meta_detail::is_adl_sol_lua_push_exact_v<Tu, T, Args...>) {
+				return sol_lua_push(types<Tu>(), L, std::forward<T>(t), std::forward<Args>(args)...);
+			}
+			else if constexpr (meta::meta_detail::is_adl_sol_lua_push_v<T, Args...>) {
+				return sol_lua_push(L, std::forward<T>(t), std::forward<Args>(args)...);
+			}
+			else {
+				unqualified_pusher<Tu> p {};
+				return p.push(L, std::forward<T>(t), std::forward<Args>(args)...);
+			}
+		}
+
+		// overload allows to use a pusher of a specific type, but pass in any kind of args
+		template <typename T, typename Arg, typename... Args, typename = std::enable_if_t<!std::is_same<T, Arg>::value>>
+		int push(lua_State* L, Arg&& arg, Args&&... args) {
+			using Tu = meta::unqualified_t<T>;
+			if constexpr (meta::meta_detail::is_adl_sol_lua_push_exact_v<T, Arg, Args...>) {
+				return sol_lua_push(types<T>(), L, std::forward<Arg>(arg), std::forward<Args>(args)...);
+			}
+			else if constexpr (meta::meta_detail::is_adl_sol_lua_push_exact_v<Tu, Arg, Args...>) {
+				return sol_lua_push(types<Tu>(), L, std::forward<Arg>(arg), std::forward<Args>(args)...);
+			}
+			else if constexpr (meta::meta_detail::is_adl_sol_lua_push_v<Arg, Args...> && !detail::is_tagged_v<Tu>) {
+				return sol_lua_push(L, std::forward<Arg>(arg), std::forward<Args>(args)...);
+			}
+			else {
+				unqualified_pusher<Tu> p {};
+				return p.push(L, std::forward<Arg>(arg), std::forward<Args>(args)...);
+			}
+		}
+
+		template <typename T, typename... Args>
+		int push_userdata(lua_State* L, T&& t, Args&&... args) {
+			using U = meta::unqualified_t<T>;
+			using Tr = meta::conditional_t<std::is_pointer_v<U>,
+			     detail::as_pointer_tag<std::remove_pointer_t<U>>,
+			     meta::conditional_t<is_unique_usertype_v<U>, detail::as_unique_tag<U>, detail::as_value_tag<U>>>;
+			return stack::push<Tr>(L, std::forward<T>(t), std::forward<Args>(args)...);
+		}
+
+		template <typename T, typename Arg, typename... Args>
+		int push_userdata(lua_State* L, Arg&& arg, Args&&... args) {
+			using U = meta::unqualified_t<T>;
+			using Tr = meta::conditional_t<std::is_pointer_v<U>,
+			     detail::as_pointer_tag<std::remove_pointer_t<U>>,
+			     meta::conditional_t<is_unique_usertype_v<U>, detail::as_unique_tag<U>, detail::as_value_tag<U>>>;
+			return stack::push<Tr>(L, std::forward<Arg>(arg), std::forward<Args>(args)...);
+		}
+
+		namespace stack_detail {
+
+			template <typename T, typename Arg, typename... Args>
+			int push_reference(lua_State* L, Arg&& arg, Args&&... args) {
+				// clang-format off
+				using use_reference_tag =
+				meta::all<
+					meta::neg<is_value_semantic_for_function<T>>
+#if SOL_IS_OFF(SOL_FUNCTION_CALL_VALUE_SEMANTICS)
+					, std::is_lvalue_reference<T>,
+					meta::neg<std::is_const<std::remove_reference_t<T>>>,
+					meta::neg<is_lua_primitive<meta::unqualified_t<T>>>,
+					meta::neg<is_unique_usertype<meta::unqualified_t<T>>>
+#endif
+				>;
+				// clang-format on
+				using Tr = meta::conditional_t<use_reference_tag::value, detail::as_reference_tag, meta::unqualified_t<T>>;
+				return stack::push<Tr>(L, std::forward<Arg>(arg), std::forward<Args>(args)...);
+			}
+
+		} // namespace stack_detail
+
+		template <typename T, typename... Args>
+		int push_reference(lua_State* L, T&& t, Args&&... args) {
+			return stack_detail::push_reference<T>(L, std::forward<T>(t), std::forward<Args>(args)...);
+		}
+
+		template <typename T, typename Arg, typename... Args>
+		int push_reference(lua_State* L, Arg&& arg, Args&&... args) {
+			return stack_detail::push_reference<T>(L, std::forward<Arg>(arg), std::forward<Args>(args)...);
+		}
+
+		inline int multi_push(lua_State*) {
+			// do nothing
+			return 0;
+		}
+
+		template <typename T, typename... Args>
+		int multi_push(lua_State* L, T&& t, Args&&... args) {
+			int pushcount = push(L, std::forward<T>(t));
+			void(detail::swallow { (pushcount += stack::push(L, std::forward<Args>(args)), 0)... });
+			return pushcount;
+		}
+
+		inline int multi_push_reference(lua_State*) {
+			// do nothing
+			return 0;
+		}
+
+		template <typename T, typename... Args>
+		int multi_push_reference(lua_State* L, T&& t, Args&&... args) {
+			int pushcount = stack::push_reference(L, std::forward<T>(t));
+			void(detail::swallow { (pushcount += stack::push_reference(L, std::forward<Args>(args)), 0)... });
+			return pushcount;
+		}
+
+		template <typename T, typename Handler>
+		bool unqualified_check(lua_State* L, int index, Handler&& handler, record& tracking) {
+			using Tu = meta::unqualified_t<T>;
+			if constexpr (meta::meta_detail::is_adl_sol_lua_check_v<Tu>) {
+				return sol_lua_check(types<Tu>(), L, index, std::forward<Handler>(handler), tracking);
+			}
+			else {
+				unqualified_checker<Tu, lua_type_of_v<Tu>> c{};
+				return c.check(L, index, std::forward<Handler>(handler), tracking);
+			}
+		}
+
+		template <typename T, typename Handler>
+		bool unqualified_check(lua_State* L, int index, Handler&& handler) {
+			record tracking {};
+			return unqualified_check<T>(L, index, std::forward<Handler>(handler), tracking);
+		}
+
+		template <typename T>
+		bool unqualified_check(lua_State* L, int index = -lua_size<meta::unqualified_t<T>>::value) {
+			auto handler = &no_panic;
+			return unqualified_check<T>(L, index, handler);
+		}
+
+		template <typename T, typename Handler>
+		bool check(lua_State* L, int index, Handler&& handler, record& tracking) {
+			if constexpr (meta::meta_detail::is_adl_sol_lua_check_v<T>) {
+				return sol_lua_check(types<T>(), L, index, std::forward<Handler>(handler), tracking);
+			}
+			else {
+				using Tu = meta::unqualified_t<T>;
+				qualified_checker<T, lua_type_of_v<Tu>> c{};
+				return c.check(L, index, std::forward<Handler>(handler), tracking);
+			}
+		}
+
+		template <typename T, typename Handler>
+		bool check(lua_State* L, int index, Handler&& handler) {
+			record tracking {};
+			return check<T>(L, index, std::forward<Handler>(handler), tracking);
+		}
+
+		template <typename T>
+		bool check(lua_State* L, int index = -lua_size<meta::unqualified_t<T>>::value) {
+			auto handler = &no_panic;
+			return check<T>(L, index, handler);
+		}
+
+		template <typename T, typename Handler>
+		bool check_usertype(lua_State* L, int index, type, Handler&& handler, record& tracking) {
+			using Tu = meta::unqualified_t<T>;
+			using detail_t = meta::conditional_t<std::is_pointer_v<T>, detail::as_pointer_tag<Tu>, detail::as_value_tag<Tu>>;
+			return check<detail_t>(L, index, std::forward<Handler>(handler), tracking);
+		}
+
+		template <typename T, typename Handler>
+		bool check_usertype(lua_State* L, int index, Handler&& handler, record& tracking) {
+			using Tu = meta::unqualified_t<T>;
+			using detail_t = meta::conditional_t<std::is_pointer_v<T>, detail::as_pointer_tag<Tu>, detail::as_value_tag<Tu>>;
+			return check<detail_t>(L, index, std::forward<Handler>(handler), tracking);
+		}
+
+		template <typename T, typename Handler>
+		bool check_usertype(lua_State* L, int index, Handler&& handler) {
+			record tracking {};
+			return check_usertype<T>(L, index, std::forward<Handler>(handler), tracking);
+		}
+
+		template <typename T>
+		bool check_usertype(lua_State* L, int index = -lua_size<meta::unqualified_t<T>>::value) {
+			auto handler = &no_panic;
+			return check_usertype<T>(L, index, handler);
+		}
+
+		template <typename T, typename Handler>
+		decltype(auto) unqualified_check_get(lua_State* L, int index, Handler&& handler, record& tracking) {
+			using Tu = meta::unqualified_t<T>;
+			if constexpr (meta::meta_detail::is_adl_sol_lua_check_get_v<T>) {
+				return sol_lua_check_get(types<T>(), L, index, std::forward<Handler>(handler), tracking);
+			}
+			else if constexpr (meta::meta_detail::is_adl_sol_lua_check_get_v<Tu>) {
+				return sol_lua_check_get(types<Tu>(), L, index, std::forward<Handler>(handler), tracking);
+			}
+			else {
+				unqualified_check_getter<Tu> cg {};
+				return cg.get(L, index, std::forward<Handler>(handler), tracking);
+			}
+		}
+
+		template <typename T, typename Handler>
+		decltype(auto) unqualified_check_get(lua_State* L, int index, Handler&& handler) {
+			record tracking {};
+			return unqualified_check_get<T>(L, index, handler, tracking);
+		}
+
+		template <typename T>
+		decltype(auto) unqualified_check_get(lua_State* L, int index = -lua_size<meta::unqualified_t<T>>::value) {
+			auto handler = &no_panic;
+			return unqualified_check_get<T>(L, index, handler);
+		}
+
+		template <typename T, typename Handler>
+		decltype(auto) check_get(lua_State* L, int index, Handler&& handler, record& tracking) {
+			if constexpr (meta::meta_detail::is_adl_sol_lua_check_get_v<T>) {
+				return sol_lua_check_get(types<T>(), L, index, std::forward<Handler>(handler), tracking);
+			}
+			else {
+				qualified_check_getter<T> cg {};
+				return cg.get(L, index, std::forward<Handler>(handler), tracking);
+			}
+		}
+
+		template <typename T, typename Handler>
+		decltype(auto) check_get(lua_State* L, int index, Handler&& handler) {
+			record tracking {};
+			return check_get<T>(L, index, handler, tracking);
+		}
+
+		template <typename T>
+		decltype(auto) check_get(lua_State* L, int index = -lua_size<meta::unqualified_t<T>>::value) {
+			auto handler = &no_panic;
+			return check_get<T>(L, index, handler);
+		}
+
+		namespace stack_detail {
+
+			template <typename Handler>
+			bool check_types(lua_State*, int, Handler&&, record&) {
+				return true;
+			}
+
+			template <typename T, typename... Args, typename Handler>
+			bool check_types(lua_State* L, int firstargument, Handler&& handler, record& tracking) {
+				if (!stack::check<T>(L, firstargument + tracking.used, handler, tracking))
+					return false;
+				return check_types<Args...>(L, firstargument, std::forward<Handler>(handler), tracking);
+			}
+
+			template <typename... Args, typename Handler>
+			bool check_types(types<Args...>, lua_State* L, int index, Handler&& handler, record& tracking) {
+				return check_types<Args...>(L, index, std::forward<Handler>(handler), tracking);
+			}
+
+		} // namespace stack_detail
+
+		template <typename... Args, typename Handler>
+		bool multi_check(lua_State* L, int index, Handler&& handler, record& tracking) {
+			return stack_detail::check_types<Args...>(L, index, std::forward<Handler>(handler), tracking);
+		}
+
+		template <typename... Args, typename Handler>
+		bool multi_check(lua_State* L, int index, Handler&& handler) {
+			record tracking {};
+			return multi_check<Args...>(L, index, std::forward<Handler>(handler), tracking);
+		}
+
+		template <typename... Args>
+		bool multi_check(lua_State* L, int index) {
+			return multi_check<Args...>(L, index);
+		}
+
+		template <typename T>
+		auto unqualified_get(lua_State* L, int index, record& tracking) -> decltype(stack_detail::unchecked_unqualified_get<T>(L, index, tracking)) {
+#if SOL_IS_ON(SOL_SAFE_GETTER)
+			static constexpr bool is_op = meta::is_optional_v<T>;
+			if constexpr (is_op) {
+				return stack_detail::unchecked_unqualified_get<T>(L, index, tracking);
+			}
+			else {
+				if (is_lua_reference<T>::value) {
+					return stack_detail::unchecked_unqualified_get<T>(L, index, tracking);
+				}
+				auto op = unqualified_check_get<T>(L, index, type_panic_c_str, tracking);
+				return *std::move(op);
+			}
+#else
+			return stack_detail::unchecked_unqualified_get<T>(L, index, tracking);
+#endif
+		}
+
+		template <typename T>
+		decltype(auto) unqualified_get(lua_State* L, int index = -lua_size<meta::unqualified_t<T>>::value) {
+			record tracking {};
+			return unqualified_get<T>(L, index, tracking);
+		}
+
+		template <typename T>
+		auto get(lua_State* L, int index, record& tracking) -> decltype(stack_detail::unchecked_get<T>(L, index, tracking)) {
+#if SOL_IS_ON(SOL_SAFE_GETTER)
+			static constexpr bool is_op = meta::is_optional_v<T>;
+			if constexpr (is_op) {
+				return stack_detail::unchecked_get<T>(L, index, tracking);
+			}
+			else {
+				if (is_lua_reference<T>::value) {
+					return stack_detail::unchecked_get<T>(L, index, tracking);
+				}
+				auto op = check_get<T>(L, index, type_panic_c_str, tracking);
+				return *std::move(op);
+			}
+#else
+			return stack_detail::unchecked_get<T>(L, index, tracking);
+#endif
+		}
+
+		template <typename T>
+		decltype(auto) get(lua_State* L, int index = -lua_size<meta::unqualified_t<T>>::value) {
+			record tracking {};
+			return get<T>(L, index, tracking);
+		}
+
+		template <typename T>
+		decltype(auto) get_usertype(lua_State* L, int index, record& tracking) {
+			using UT = meta::conditional_t<std::is_pointer<T>::value, detail::as_pointer_tag<std::remove_pointer_t<T>>, detail::as_value_tag<T>>;
+			return get<UT>(L, index, tracking);
+		}
+
+		template <typename T>
+		decltype(auto) get_usertype(lua_State* L, int index = -lua_size_v<meta::unqualified_t<T>>) {
+			record tracking {};
+			return get_usertype<T>(L, index, tracking);
+		}
+
+		template <typename T>
+		decltype(auto) pop(lua_State* L) {
+			return popper<T> {}.pop(L);
+		}
+
+		template <bool global = false, bool raw = false, typename Key>
+		void get_field(lua_State* L, Key&& key) {
+			field_getter<meta::unqualified_t<Key>, global, raw> {}.get(L, std::forward<Key>(key));
+		}
+
+		template <bool global = false, bool raw = false, typename Key>
+		void get_field(lua_State* L, Key&& key, int tableindex) {
+			field_getter<meta::unqualified_t<Key>, global, raw> {}.get(L, std::forward<Key>(key), tableindex);
+		}
+
+		template <bool global = false, typename Key>
+		void raw_get_field(lua_State* L, Key&& key) {
+			get_field<global, true>(L, std::forward<Key>(key));
+		}
+
+		template <bool global = false, typename Key>
+		void raw_get_field(lua_State* L, Key&& key, int tableindex) {
+			get_field<global, true>(L, std::forward<Key>(key), tableindex);
+		}
+
+		template <bool global = false, bool raw = false, typename C = detail::non_lua_nil_t, typename Key>
+		probe probe_get_field(lua_State* L, Key&& key) {
+			return probe_field_getter<meta::unqualified_t<Key>, C, global, raw> {}.get(L, std::forward<Key>(key));
+		}
+
+		template <bool global = false, bool raw = false, typename C = detail::non_lua_nil_t, typename Key>
+		probe probe_get_field(lua_State* L, Key&& key, int tableindex) {
+			return probe_field_getter<meta::unqualified_t<Key>, C, global, raw> {}.get(L, std::forward<Key>(key), tableindex);
+		}
+
+		template <bool global = false, typename C = detail::non_lua_nil_t, typename Key>
+		probe probe_raw_get_field(lua_State* L, Key&& key) {
+			return probe_get_field<global, true, C>(L, std::forward<Key>(key));
+		}
+
+		template <bool global = false, typename C = detail::non_lua_nil_t, typename Key>
+		probe probe_raw_get_field(lua_State* L, Key&& key, int tableindex) {
+			return probe_get_field<global, true, C>(L, std::forward<Key>(key), tableindex);
+		}
+
+		template <bool global = false, bool raw = false, typename Key, typename Value>
+		void set_field(lua_State* L, Key&& key, Value&& value) {
+			field_setter<meta::unqualified_t<Key>, global, raw> {}.set(L, std::forward<Key>(key), std::forward<Value>(value));
+		}
+
+		template <bool global = false, bool raw = false, typename Key, typename Value>
+		void set_field(lua_State* L, Key&& key, Value&& value, int tableindex) {
+			field_setter<meta::unqualified_t<Key>, global, raw> {}.set(L, std::forward<Key>(key), std::forward<Value>(value), tableindex);
+		}
+
+		template <bool global = false, typename Key, typename Value>
+		void raw_set_field(lua_State* L, Key&& key, Value&& value) {
+			set_field<global, true>(L, std::forward<Key>(key), std::forward<Value>(value));
+		}
+
+		template <bool global = false, typename Key, typename Value>
+		void raw_set_field(lua_State* L, Key&& key, Value&& value, int tableindex) {
+			set_field<global, true>(L, std::forward<Key>(key), std::forward<Value>(value), tableindex);
+		}
+
+		template <typename T, typename F>
+		void modify_unique_usertype_as(const stack_reference& obj, F&& f) {
+			void* raw = lua_touserdata(obj.lua_state(), obj.stack_index());
+			void* ptr_memory = detail::align_usertype_pointer(raw);
+			void* uu_memory = detail::align_usertype_unique<T>(raw);
+			T& uu = *static_cast<T*>(uu_memory);
+			f(uu);
+			*static_cast<void**>(ptr_memory) = static_cast<void*>(detail::unique_get(obj.lua_state(), uu));
+		}
+
+		template <typename F>
+		void modify_unique_usertype(const stack_reference& obj, F&& f) {
+			using bt = meta::bind_traits<meta::unqualified_t<F>>;
+			using T = typename bt::template arg_at<0>;
+			using Tu = meta::unqualified_t<T>;
+			modify_unique_usertype_as<Tu>(obj, std::forward<F>(f));
+		}
+
+		namespace stack_detail {
+			template <typename T, typename Handler>
+			decltype(auto) check_get_arg(lua_State* L_, int index_, Handler&& handler_, record& tracking_) {
+				if constexpr (meta::meta_detail::is_adl_sol_lua_check_access_v<T>) {
+					sol_lua_check_access(types<meta::unqualified_t<T>>(), L_, index_, tracking_);
+				}
+				return check_get<T>(L_, index_, std::forward<Handler>(handler_), tracking_);
+			}
+
+			template <typename T>
+			decltype(auto) unchecked_get_arg(lua_State* L_, int index_, record& tracking_) {
+				if constexpr (meta::meta_detail::is_adl_sol_lua_check_access_v<T>) {
+					sol_lua_check_access(types<meta::unqualified_t<T>>(), L_, index_, tracking_);
+				}
+				return unchecked_get<T>(L_, index_, tracking_);
+			}
+		} // namespace stack_detail
+
+	} // namespace stack
+
+	namespace detail {
+
+		template <typename T>
+		lua_CFunction make_destructor(std::true_type) {
+			if constexpr (is_unique_usertype_v<T>) {
+				return &unique_destroy<T>;
+			}
+			else if constexpr (!std::is_pointer_v<T>) {
+				return &usertype_alloc_destroy<T>;
+			}
+			else {
+				return &cannot_destroy<T>;
+			}
+		}
+
+		template <typename T>
+		lua_CFunction make_destructor(std::false_type) {
+			return &cannot_destroy<T>;
+		}
+
+		template <typename T>
+		lua_CFunction make_destructor() {
+			return make_destructor<T>(std::is_destructible<T>());
+		}
+
+		struct no_comp {
+			template <typename A, typename B>
+			bool operator()(A&&, B&&) const {
+				return false;
+			}
+		};
+
+		template <typename T>
+		int is_check(lua_State* L) {
+			return stack::push(L, stack::check<T>(L, 1, &no_panic));
+		}
+
+		template <typename T>
+		int member_default_to_string(std::true_type, lua_State* L) {
+			decltype(auto) ts = stack::get<T>(L, 1).to_string();
+			return stack::push(L, std::forward<decltype(ts)>(ts));
+		}
+
+		template <typename T>
+		int member_default_to_string(std::false_type, lua_State* L) {
+			return luaL_error(L,
+			     "cannot perform to_string on '%s': no 'to_string' overload in namespace, 'to_string' member "
+			     "function, or operator<<(ostream&, ...) present",
+			     detail::demangle<T>().data());
+		}
+
+		template <typename T>
+		int adl_default_to_string(std::true_type, lua_State* L) {
+			using namespace std;
+			decltype(auto) ts = to_string(stack::get<T>(L, 1));
+			return stack::push(L, std::forward<decltype(ts)>(ts));
+		}
+
+		template <typename T>
+		int adl_default_to_string(std::false_type, lua_State* L) {
+			return member_default_to_string<T>(meta::supports_to_string_member<T>(), L);
+		}
+
+		template <typename T>
+		int oss_default_to_string(std::true_type, lua_State* L) {
+			std::ostringstream oss;
+			oss << stack::unqualified_get<T>(L, 1);
+			return stack::push(L, oss.str());
+		}
+
+		template <typename T>
+		int oss_default_to_string(std::false_type, lua_State* L) {
+			return adl_default_to_string<T>(meta::supports_adl_to_string<T>(), L);
+		}
+
+		template <typename T>
+		int default_to_string(lua_State* L) {
+			return oss_default_to_string<T>(meta::supports_op_left_shift<std::ostream, T>(), L);
+		}
+
+		template <typename T>
+		int default_size(lua_State* L) {
+			decltype(auto) self = stack::unqualified_get<T>(L, 1);
+			return stack::push(L, self.size());
+		}
+
+		template <typename T, typename Op>
+		int comparsion_operator_wrap(lua_State* L) {
+			if constexpr (std::is_void_v<T>) {
+				return stack::push(L, false);
+			}
+			else {
+				auto maybel = stack::unqualified_check_get<T>(L, 1);
+				if (!maybel) {
+					return stack::push(L, false);
+				}
+				auto mayber = stack::unqualified_check_get<T>(L, 2);
+				if (!mayber) {
+					return stack::push(L, false);
+				}
+				decltype(auto) l = *maybel;
+				decltype(auto) r = *mayber;
+				if constexpr (std::is_same_v<no_comp, Op>) {
+					std::equal_to<> op;
+					return stack::push(L, op(detail::ptr(l), detail::ptr(r)));
+				}
+				else {
+					if constexpr (std::is_same_v<std::equal_to<>, Op> // clang-format hack
+					     || std::is_same_v<std::less_equal<>, Op>     //
+					     || std::is_same_v<std::less_equal<>, Op>) {  //
+						if (detail::ptr(l) == detail::ptr(r)) {
+							return stack::push(L, true);
+						}
+					}
+					Op op;
+					return stack::push(L, op(detail::deref(l), detail::deref(r)));
+				}
+			}
+		}
+
+		template <typename T, typename IFx, typename Fx>
+		void insert_default_registrations(IFx&& ifx, Fx&& fx);
+
+		template <typename T, bool, bool>
+		struct get_is_primitive : is_lua_primitive<T> { };
+
+		template <typename T>
+		struct get_is_primitive<T, true, false>
+		: meta::neg<std::is_reference<decltype(sol_lua_get(types<T>(), nullptr, -1, std::declval<stack::record&>()))>> { };
+
+		template <typename T>
+		struct get_is_primitive<T, false, true>
+		: meta::neg<std::is_reference<decltype(sol_lua_get(types<meta::unqualified_t<T>>(), nullptr, -1, std::declval<stack::record&>()))>> { };
+
+		template <typename T>
+		struct get_is_primitive<T, true, true> : get_is_primitive<T, true, false> { };
+
+	} // namespace detail
+
+	template <typename T>
+	struct is_proxy_primitive
+	: detail::get_is_primitive<T, meta::meta_detail::is_adl_sol_lua_get_v<T>, meta::meta_detail::is_adl_sol_lua_get_v<meta::unqualified_t<T>>> { };
+
+} // namespace sol
+
+// end of sol/stack_core.hpp
+
+// beginning of sol/stack_check.hpp
+
+// beginning of sol/stack_check_unqualified.hpp
+
+#include <memory>
+#include <functional>
+#include <utility>
+#include <cmath>
+#include <optional>
+#if SOL_IS_ON(SOL_STD_VARIANT)
+#include <variant>
+#endif // variant shenanigans
+
+namespace sol { namespace stack {
+	template <typename Handler>
+	bool loose_table_check(lua_State* L_, int index, Handler&& handler, record& tracking) {
+		tracking.use(1);
+		type t = type_of(L_, index);
+		if (t == type::table) {
+			return true;
+		}
+		if (t != type::userdata) {
+			handler(L_, index, type::table, t, "value is not a table or a userdata that can behave like one");
+			return false;
+		}
+		return true;
+	}
+
+	namespace stack_detail {
+		inline bool impl_check_metatable(lua_State* L_, int index, const std::string& metakey, bool poptable) {
+			luaL_getmetatable(L_, &metakey[0]);
+			const type expectedmetatabletype = static_cast<type>(lua_type(L_, -1));
+			if (expectedmetatabletype != type::lua_nil) {
+				if (lua_rawequal(L_, -1, index) == 1) {
+					lua_pop(L_, 1 + static_cast<int>(poptable));
+					return true;
+				}
+			}
+			lua_pop(L_, 1);
+			return false;
+		}
+
+		template <typename T, bool poptable = true>
+		inline bool check_metatable(lua_State* L_, int index = -2) {
+			return impl_check_metatable(L_, index, usertype_traits<T>::metatable(), poptable);
+		}
+
+		template <type expected, int (*check_func)(lua_State*, int)>
+		struct basic_check {
+			template <typename Handler>
+			static bool check(lua_State* L_, int index, Handler&& handler, record& tracking) {
+				tracking.use(1);
+				bool success = check_func(L_, index) == 1;
+				if (!success) {
+					// expected type, actual type
+					handler(L_, index, expected, type_of(L_, index), "");
+				}
+				return success;
+			}
+		};
+	} // namespace stack_detail
+
+	template <typename T, typename>
+	struct unqualified_interop_checker {
+		template <typename Handler>
+		static bool check(lua_State*, int, type, Handler&&, record&) {
+			return false;
+		}
+	};
+
+	template <typename T, typename>
+	struct qualified_interop_checker {
+		template <typename Handler>
+		static bool check(lua_State* L_, int index, type index_type, Handler&& handler, record& tracking) {
+			return stack_detail::unqualified_interop_check<T>(L_, index, index_type, std::forward<Handler>(handler), tracking);
+		}
+	};
+
+	template <typename T, type expected, typename>
+	struct unqualified_checker {
+		template <typename Handler>
+		static bool check(lua_State* L_, int index, Handler&& handler, record& tracking) {
+			if constexpr (std::is_same_v<T, bool>) {
+				tracking.use(1);
+				bool success = lua_isboolean(L_, index) == 1;
+				if (!success) {
+					// expected type, actual type
+					handler(L_, index, expected, type_of(L_, index), "");
+				}
+				return success;
+			}
+			else if constexpr (meta::any_same_v<T,
+				                   char
+#if SOL_IS_ON(SOL_CHAR8_T)
+				                   ,
+				                   char8_t
+#endif
+				                   ,
+				                   char16_t,
+				                   char32_t>) {
+				return stack::check<std::basic_string<T>>(L_, index, std::forward<Handler>(handler), tracking);
+			}
+			else if constexpr (std::is_integral_v<T> || std::is_same_v<T, lua_Integer>) {
+				tracking.use(1);
+#if SOL_LUA_VERSION_I_ >= 503
+				// Lua 5.3 and greater checks for numeric precision
+#if SOL_IS_ON(SOL_STRINGS_ARE_NUMBERS)
+				// imprecise, sloppy conversions
+				int isnum = 0;
+				lua_tointegerx(L_, index, &isnum);
+				const bool success = isnum != 0;
+				if (!success) {
+					// expected type, actual type
+					handler(L_, index, type::number, type_of(L_, index), detail::not_a_number_or_number_string_integral);
+				}
+#elif SOL_IS_ON(SOL_NUMBER_PRECISION_CHECKS)
+				// this check is precise, do not convert
+				if (lua_isinteger(L_, index) == 1) {
+					return true;
+				}
+				const bool success = false;
+				if (!success) {
+					// expected type, actual type
+					handler(L_, index, type::number, type_of(L_, index), detail::not_a_number_integral);
+				}
+#else
+				// Numerics are neither safe nor string-convertible
+				type t = type_of(L_, index);
+				const bool success = t == type::number;
+#endif
+				if (!success) {
+					// expected type, actual type
+					handler(L_, index, type::number, type_of(L_, index), detail::not_a_number);
+				}
+				return success;
+#else
+				// Lua 5.2 and below checks
+#if SOL_IS_OFF(SOL_STRINGS_ARE_NUMBERS)
+				// must pre-check, because it will convert
+				type t = type_of(L_, index);
+				if (t != type::number) {
+					// expected type, actual type
+					handler(L_, index, type::number, t, detail::not_a_number);
+					return false;
+				}
+#endif // Do not allow strings to be numbers
+
+#if SOL_IS_ON(SOL_NUMBER_PRECISION_CHECKS)
+				int isnum = 0;
+				const lua_Number v = lua_tonumberx(L_, index, &isnum);
+				const bool success = isnum != 0 && static_cast<lua_Number>(llround(v)) == v;
+#else
+				const bool success = true;
+#endif // Safe numerics and number precision checking
+				if (!success) {
+					// Use defines to provide a better error message!
+#if SOL_IS_ON(SOL_STRINGS_ARE_NUMBERS)
+					handler(L_, index, type::number, type_of(L_, index), detail::not_a_number_or_number_string);
+#elif SOL_IS_ON(SOL_NUMBER_PRECISION_CHECKS)
+					handler(L_, index, type::number, t, detail::not_a_number_or_number_string);
+#else
+					handler(L_, index, type::number, t, detail::not_a_number);
+#endif
+				}
+				return success;
+#endif
+			}
+			else if constexpr (std::is_floating_point_v<T> || std::is_same_v<T, lua_Number>) {
+				tracking.use(1);
+#if SOL_IS_ON(SOL_STRINGS_ARE_NUMBERS)
+				bool success = lua_isnumber(L_, index) == 1;
+				if (!success) {
+					// expected type, actual type
+					handler(L_, index, type::number, type_of(L_, index), detail::not_a_number_or_number_string);
+				}
+				return success;
+#else
+				type t = type_of(L_, index);
+				bool success = t == type::number;
+				if (!success) {
+					// expected type, actual type
+					handler(L_, index, type::number, t, detail::not_a_number);
+				}
+				return success;
+#endif // Strings are Numbers
+			}
+			else if constexpr (meta::any_same_v<T, type, this_state, this_main_state, this_environment, variadic_args>) {
+				(void)L_;
+				(void)index;
+				(void)handler;
+				tracking.use(0);
+				return true;
+			}
+			else if constexpr (is_unique_usertype_v<T>) {
+				using element = unique_usertype_element_t<T>;
+				using actual = unique_usertype_actual_t<T>;
+				const type indextype = type_of(L_, index);
+				tracking.use(1);
+				if (indextype != type::userdata) {
+					handler(L_, index, type::userdata, indextype, "value is not a userdata");
+					return false;
+				}
+				if (lua_getmetatable(L_, index) == 0) {
+					return true;
+				}
+				int metatableindex = lua_gettop(L_);
+				if (stack_detail::check_metatable<d::u<element>>(L_, metatableindex)) {
+					void* memory = lua_touserdata(L_, index);
+					memory = detail::align_usertype_unique_destructor(memory);
+					detail::unique_destructor& pdx = *static_cast<detail::unique_destructor*>(memory);
+					bool success = &detail::usertype_unique_alloc_destroy<element, actual> == pdx;
+					if (!success) {
+						memory = detail::align_usertype_unique_tag<true>(memory);
+#if 0
+						// New version, one day
+#else
+						const char*& name_tag = *static_cast<const char**>(memory);
+						success = usertype_traits<T>::qualified_name() == name_tag;
+#endif
+						if (!success) {
+							handler(L_, index, type::userdata, indextype, "value is a userdata but is not the correct unique usertype");
+						}
+					}
+					return success;
+				}
+				lua_pop(L_, 1);
+				handler(L_, index, type::userdata, indextype, "unrecognized userdata (not pushed by sol?)");
+				return false;
+			}
+			else if constexpr (meta::any_same_v<T, lua_nil_t, std::nullopt_t, nullopt_t>) {
+				bool success = lua_isnil(L_, index);
+				if (success) {
+					tracking.use(1);
+					return success;
+				}
+				tracking.use(0);
+				success = lua_isnone(L_, index);
+				if (!success) {
+					// expected type, actual type
+					handler(L_, index, expected, type_of(L_, index), "");
+				}
+				return success;
+			}
+			else if constexpr (std::is_same_v<T, env_key_t>) {
+				tracking.use(1);
+				type t = type_of(L_, index);
+				if (t == type::table || t == type::none || t == type::lua_nil || t == type::userdata) {
+					return true;
+				}
+				handler(L_, index, type::table, t, "value cannot not have a valid environment");
+				return true;
+			}
+			else if constexpr (std::is_same_v<T, detail::non_lua_nil_t>) {
+				return !stack::unqualified_check<lua_nil_t>(L_, index, std::forward<Handler>(handler), tracking);
+			}
+			else if constexpr (meta::is_specialization_of_v<T, basic_lua_table>) {
+				tracking.use(1);
+				type t = type_of(L_, index);
+				if (t != type::table) {
+					handler(L_, index, type::table, t, "value is not a table");
+					return false;
+				}
+				return true;
+			}
+			else if constexpr (meta::is_specialization_of_v<T, basic_bytecode>) {
+				tracking.use(1);
+				type t = type_of(L_, index);
+				if (t != type::function) {
+					handler(L_, index, type::function, t, "value is not a function that can be dumped");
+					return false;
+				}
+				return true;
+			}
+			else if constexpr (meta::is_specialization_of_v<T, basic_environment>) {
+				tracking.use(1);
+				if (lua_getmetatable(L_, index) == 0) {
+					return true;
+				}
+				type t = type_of(L_, -1);
+				if (t == type::table || t == type::none || t == type::lua_nil) {
+					lua_pop(L_, 1);
+					return true;
+				}
+				if (t != type::userdata) {
+					lua_pop(L_, 1);
+					handler(L_, index, type::table, t, "value does not have a valid metatable");
+					return false;
+				}
+				return true;
+			}
+			else if constexpr (std::is_same_v<T, metatable_key_t>) {
+				tracking.use(1);
+				if (lua_getmetatable(L_, index) == 0) {
+					return true;
+				}
+				type t = type_of(L_, -1);
+				if (t == type::table || t == type::none || t == type::lua_nil) {
+					lua_pop(L_, 1);
+					return true;
+				}
+				if (t != type::userdata) {
+					lua_pop(L_, 1);
+					handler(L_, index, expected, t, "value does not have a valid metatable");
+					return false;
+				}
+				return true;
+			}
+			else if constexpr (std::is_same_v<T, luaL_Stream*> || std::is_same_v<T, luaL_Stream>) {
+				if (lua_getmetatable(L_, index) == 0) {
+					type t = type_of(L_, index);
+					handler(L_, index, expected, t, "value is not a valid luaL_Stream (has no metatable/is not a valid value)");
+					return false;
+				}
+				luaL_getmetatable(L_, LUA_FILEHANDLE);
+				if (type_of(L_, index) != type::table) {
+					type t = type_of(L_, index);
+					lua_pop(L_, 1);
+					handler(L_,
+						index,
+						expected,
+						t,
+						"value is not a valid luaL_Stream (there is no metatable for luaL_Stream -- did you forget to "
+						"my_lua_state.open_libraries(sol::lib::state) or equivalent?)");
+					return false;
+				}
+				int is_stream_table = lua_compare(L_, -1, -2, LUA_OPEQ);
+				lua_pop(L_, 2);
+				if (is_stream_table == 0) {
+					type t = type_of(L_, index);
+					handler(L_, index, expected, t, "value is not a valid luaL_Stream (incorrect metatable)");
+					return false;
+				}
+				return true;
+			}
+			else if constexpr (meta::is_optional_v<T>) {
+				using ValueType = typename T::value_type;
+				(void)handler;
+				type t = type_of(L_, index);
+				if (t == type::none) {
+					tracking.use(0);
+					return true;
+				}
+				if (t == type::lua_nil) {
+					tracking.use(1);
+					return true;
+				}
+				return stack::unqualified_check<ValueType>(L_, index, &no_panic, tracking);
+			}
+#if SOL_IS_ON(SOL_GET_FUNCTION_POINTER_UNSAFE)
+			else if constexpr (std::is_function_v<T> || (std::is_pointer_v<T> && std::is_function_v<std::remove_pointer_t<T>>)) {
+				return stack_detail::check_function_pointer<std::remove_pointer_t<T>>(L_, index, std::forward<Handler>(handler), tracking);
+			}
+#endif
+			else if constexpr (expected == type::userdata) {
+				if constexpr (meta::any_same_v<T, userdata_value> || meta::is_specialization_of_v<T, basic_userdata>) {
+					tracking.use(1);
+					type t = type_of(L_, index);
+					bool success = t == type::userdata;
+					if (!success) {
+						// expected type, actual type
+						handler(L_, index, type::userdata, t, "");
+					}
+					return success;
+				}
+				else if constexpr (meta::is_specialization_of_v<T, user>) {
+					unqualified_checker<lightuserdata_value, type::userdata> c;
+					(void)c;
+					return c.check(L_, index, std::forward<Handler>(handler), tracking);
+				}
+				else {
+					if constexpr (std::is_pointer_v<T>) {
+						return check_usertype<T>(L_, index, std::forward<Handler>(handler), tracking);
+					}
+					else if constexpr (meta::is_specialization_of_v<T, std::reference_wrapper>) {
+						using T_internal = typename T::type;
+						return stack::check<T_internal>(L_, index, std::forward<Handler>(handler), tracking);
+					}
+					else {
+						return check_usertype<T>(L_, index, std::forward<Handler>(handler), tracking);
+					}
+				}
+			}
+			else if constexpr (expected == type::poly) {
+				tracking.use(1);
+				bool success = is_lua_reference_v<T> || !lua_isnone(L_, index);
+				if (!success) {
+					// expected type, actual type
+					handler(L_, index, type::poly, type_of(L_, index), "");
+				}
+				return success;
+			}
+			else if constexpr (expected == type::lightuserdata) {
+				tracking.use(1);
+				type t = type_of(L_, index);
+				bool success = t == type::userdata || t == type::lightuserdata;
+				if (!success) {
+					// expected type, actual type
+					handler(L_, index, type::lightuserdata, t, "");
+				}
+				return success;
+			}
+			else if constexpr (expected == type::function) {
+				if constexpr (meta::any_same_v<T, lua_CFunction, std::remove_pointer_t<lua_CFunction>, c_closure>) {
+					tracking.use(1);
+					bool success = lua_iscfunction(L_, index) == 1;
+					if (!success) {
+						// expected type, actual type
+						handler(L_, index, expected, type_of(L_, index), "");
+					}
+					return success;
+				}
+				else {
+					tracking.use(1);
+					type t = type_of(L_, index);
+					if (t == type::lua_nil || t == type::none || t == type::function) {
+						// allow for lua_nil to be returned
+						return true;
+					}
+					if (t != type::userdata && t != type::table) {
+						handler(L_, index, type::function, t, "must be a function or table or a userdata");
+						return false;
+					}
+					// Do advanced check for call-style userdata?
+					static const auto& callkey = to_string(meta_function::call);
+					if (lua_getmetatable(L_, index) == 0) {
+						// No metatable, no __call key possible
+						handler(L_, index, type::function, t, "value is not a function and does not have overriden metatable");
+						return false;
+					}
+					if (lua_isnoneornil(L_, -1)) {
+						lua_pop(L_, 1);
+						handler(L_, index, type::function, t, "value is not a function and does not have valid metatable");
+						return false;
+					}
+					lua_getfield(L_, -1, &callkey[0]);
+					if (lua_isnoneornil(L_, -1)) {
+						lua_pop(L_, 2);
+						handler(L_, index, type::function, t, "value's metatable does not have __call overridden in metatable, cannot call this type");
+						return false;
+					}
+					// has call, is definitely a function
+					lua_pop(L_, 2);
+					return true;
+				}
+			}
+			else if constexpr (expected == type::table) {
+				return stack::loose_table_check(L_, index, std::forward<Handler>(handler), tracking);
+			}
+			else {
+				tracking.use(1);
+				const type indextype = type_of(L_, index);
+				bool success = expected == indextype;
+				if (!success) {
+					// expected type, actual type, message
+					handler(L_, index, expected, indextype, "");
+				}
+				return success;
+			}
+		}
+	};
+
+	template <typename T>
+	struct unqualified_checker<non_null<T>, type::userdata> : unqualified_checker<T, lua_type_of_v<T>> { };
+
+	template <typename T>
+	struct unqualified_checker<detail::as_value_tag<T>, type::userdata> {
+		template <typename Handler>
+		static bool check(lua_State* L_, int index, Handler&& handler, record& tracking) {
+			const type indextype = type_of(L_, index);
+			return check(types<T>(), L_, index, indextype, std::forward<Handler>(handler), tracking);
+		}
+
+		template <typename U, typename Handler>
+		static bool check(types<U>, lua_State* L_, int index, type indextype, Handler&& handler, record& tracking) {
+			if constexpr (
+				std::is_same_v<T,
+				     lightuserdata_value> || std::is_same_v<T, userdata_value> || std::is_same_v<T, userdata> || std::is_same_v<T, lightuserdata>) {
+				tracking.use(1);
+				if (indextype != type::userdata) {
+					handler(L_, index, type::userdata, indextype, "value is not a valid userdata");
+					return false;
+				}
+				return true;
+			}
+			else {
+#if SOL_IS_ON(SOL_USE_INTEROP)
+				if (stack_detail::interop_check<U>(L_, index, indextype, handler, tracking)) {
+					return true;
+				}
+#endif // interop extensibility
+				tracking.use(1);
+#if SOL_IS_ON(SOL_GET_FUNCTION_POINTER_UNSAFE)
+				if (lua_iscfunction(L_, index) != 0) {
+					// a potential match...
+					return true;
+				}
+#endif
+				if (indextype != type::userdata) {
+					handler(L_, index, type::userdata, indextype, "value is not a valid userdata");
+					return false;
+				}
+				if (lua_getmetatable(L_, index) == 0) {
+					return true;
+				}
+				int metatableindex = lua_gettop(L_);
+				if (stack_detail::check_metatable<U>(L_, metatableindex))
+					return true;
+				if (stack_detail::check_metatable<U*>(L_, metatableindex))
+					return true;
+				if (stack_detail::check_metatable<d::u<U>>(L_, metatableindex))
+					return true;
+				if (stack_detail::check_metatable<as_container_t<U>>(L_, metatableindex))
+					return true;
+				bool success = false;
+				bool has_derived = derive<T>::value || weak_derive<T>::value;
+				if (has_derived) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+					luaL_checkstack(L_, 1, detail::not_enough_stack_space_string);
+#endif // make sure stack doesn't overflow
+					auto pn = stack::pop_n(L_, 1);
+					lua_pushstring(L_, &detail::base_class_check_key()[0]);
+					lua_rawget(L_, metatableindex);
+					if (type_of(L_, -1) != type::lua_nil) {
+						void* basecastdata = lua_touserdata(L_, -1);
+						detail::inheritance_check_function ic = reinterpret_cast<detail::inheritance_check_function>(basecastdata);
+						success = ic(usertype_traits<T>::qualified_name());
+					}
+				}
+				lua_pop(L_, 1);
+				if (!success) {
+					handler(L_, index, type::userdata, indextype, "value at this index does not properly reflect the desired type");
+					return false;
+				}
+				return true;
+			}
+		}
+	};
+
+	template <typename T>
+	struct unqualified_checker<detail::as_pointer_tag<T>, type::userdata> {
+		template <typename Handler>
+		static bool check(lua_State* L_, int index, type indextype, Handler&& handler, record& tracking) {
+			if (indextype == type::lua_nil) {
+				tracking.use(1);
+				return true;
+			}
+			return check_usertype<std::remove_pointer_t<T>>(L_, index, std::forward<Handler>(handler), tracking);
+		}
+
+		template <typename Handler>
+		static bool check(lua_State* L_, int index, Handler&& handler, record& tracking) {
+			const type indextype = type_of(L_, index);
+			return check(L_, index, indextype, std::forward<Handler>(handler), tracking);
+		}
+	};
+
+	template <typename T, std::size_t N, type expect>
+	struct unqualified_checker<exhaustive_until<T, N>, expect> {
+		template <typename K, typename V, typename Handler>
+		static bool check_two(types<K, V>, lua_State* arg_L, int relindex, type, Handler&& handler, record& tracking) {
+			tracking.use(1);
+
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(arg_L, 3, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+
+			int index = lua_absindex(arg_L, relindex);
+			lua_pushnil(arg_L);
+			while (lua_next(arg_L, index) != 0) {
+				const bool is_key_okay = stack::check<K>(arg_L, -2, std::forward<Handler>(handler), tracking);
+				if (!is_key_okay) {
+					lua_pop(arg_L, 2);
+					return false;
+				}
+				const bool is_value_okay = stack::check<V>(arg_L, -1, std::forward<Handler>(handler), tracking);
+				if (!is_value_okay) {
+					lua_pop(arg_L, 2);
+					return false;
+				}
+				lua_pop(arg_L, 1);
+			}
+			return true;
+		}
+
+		template <typename V, typename Handler>
+		static bool check_one(types<V>, lua_State* arg_L, int relindex, type, Handler&& handler, record& tracking) {
+			tracking.use(1);
+
+			size_t index = lua_absindex(arg_L, relindex);
+			// Zzzz slower but necessary thanks to the lower version API and missing functions qq
+			std::size_t idx = 0;
+			int vi = 0;
+			for (lua_Integer i = 0;; (void)(i += lua_size<V>::value), lua_pop(arg_L, static_cast<int>(vi))) {
+				vi = 0;
+				if (idx >= N) {
+					return true;
+				}
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+				luaL_checkstack(arg_L, 2, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+				bool isnil = false;
+				for (; vi < static_cast<int>(lua_size<V>::value); ++vi) {
+					lua_pushinteger(arg_L, i);
+					lua_gettable(arg_L, static_cast<int>(index));
+					type vt = type_of(arg_L, -1);
+					isnil = vt == type::lua_nil;
+					if (isnil) {
+						if (i == 0) {
+							vi += 1;
+							goto loop_continue;
+						}
+						lua_pop(arg_L, static_cast<int>(vi + 1));
+						return true;
+					}
+				}
+				if (!stack::check<V>(arg_L, -lua_size<V>::value, std::forward<Handler>(handler), tracking)) {
+					lua_pop(arg_L, lua_size<V>::value);
+					return false;
+				}
+				++idx;
+			loop_continue:;
+			}
+		}
+
+		template <typename Handler>
+		static bool check(lua_State* arg_L, int index, Handler&& handler, record& tracking) {
+			using Tu = meta::unqualified_t<T>;
+			if constexpr (is_container_v<Tu>) {
+				if constexpr (meta::is_associative<Tu>::value) {
+					typedef typename Tu::value_type P;
+					typedef typename P::first_type K;
+					typedef typename P::second_type V;
+					return check_two(types<K, V>(), arg_L, index, expect, std::forward<Handler>(handler), tracking);
+				}
+				else {
+					typedef typename Tu::value_type V;
+					return check_one(types<V>(), arg_L, index, expect, std::forward<Handler>(handler), tracking);
+				}
+			}
+			else {
+				unqualified_checker<Tu, expect> c {};
+				return c.check(arg_L, index, std::forward<Handler>(handler), tracking);
+			}
+		}
+	};
+
+	template <typename T, type expect>
+	struct unqualified_checker<non_exhaustive<T>, expect> {
+		template <typename Handler>
+		static bool check(lua_State* arg_L, int index, Handler&& handler, record& tracking) {
+			return stack::check<T>(arg_L, index, std::forward<Handler>(handler), tracking);
+		}
+	};
+
+	template <typename... Args>
+	struct unqualified_checker<std::tuple<Args...>, type::poly> {
+		template <typename Handler>
+		static bool check(lua_State* L_, int index, Handler&& handler, record& tracking) {
+			return stack::multi_check<Args...>(L_, index, std::forward<Handler>(handler), tracking);
+		}
+	};
+
+	template <typename A, typename B>
+	struct unqualified_checker<std::pair<A, B>, type::poly> {
+		template <typename Handler>
+		static bool check(lua_State* L_, int index, Handler&& handler, record& tracking) {
+			return stack::multi_check<A, B>(L_, index, std::forward<Handler>(handler), tracking);
+		}
+	};
+
+#if SOL_IS_ON(SOL_STD_VARIANT)
+
+	template <typename... Tn>
+	struct unqualified_checker<std::variant<Tn...>, type::poly> {
+		typedef std::variant<Tn...> V;
+		typedef std::variant_size<V> V_size;
+		typedef std::integral_constant<bool, V_size::value == 0> V_is_empty;
+
+		template <typename Handler>
+		static bool is_one(std::integral_constant<std::size_t, 0>, lua_State* L_, int index, Handler&& handler, record& tracking) {
+			if constexpr (V_is_empty::value) {
+				if (lua_isnone(L_, index)) {
+					return true;
+				}
+			}
+			tracking.use(1);
+			handler(L_, index, type::poly, type_of(L_, index), "value does not fit any type present in the variant");
+			return false;
+		}
+
+		template <std::size_t I, typename Handler>
+		static bool is_one(std::integral_constant<std::size_t, I>, lua_State* L_, int index, Handler&& handler, record& tracking) {
+			typedef std::variant_alternative_t<I - 1, V> T;
+			record temp_tracking = tracking;
+			if (stack::check<T>(L_, index, &no_panic, temp_tracking)) {
+				tracking = temp_tracking;
+				return true;
+			}
+			return is_one(std::integral_constant<std::size_t, I - 1>(), L_, index, std::forward<Handler>(handler), tracking);
+		}
+
+		template <typename Handler>
+		static bool check(lua_State* L_, int index, Handler&& handler, record& tracking) {
+			return is_one(std::integral_constant<std::size_t, V_size::value>(), L_, index, std::forward<Handler>(handler), tracking);
+		}
+	};
+
+#endif // variant shenanigans
+
+}} // namespace sol::stack
+
+// end of sol/stack_check_unqualified.hpp
+
+// beginning of sol/stack_check_qualified.hpp
+
+namespace sol { namespace stack {
+
+	template <typename X, type expected, typename>
+	struct qualified_checker {
+		template <typename Handler>
+		static bool check(lua_State* L, int index, Handler&& handler, record& tracking) {
+			using no_cv_X = meta::unqualified_t<X>;
+			if constexpr (!std::is_reference_v<X> && is_unique_usertype_v<no_cv_X>) {
+				using element = unique_usertype_element_t<no_cv_X>;
+				if constexpr (is_actual_type_rebindable_for_v<no_cv_X>) {
+					using rebound_actual_type = unique_usertype_rebind_actual_t<no_cv_X>;
+					// we have a unique pointer type that can be
+					// rebound to a base/derived type
+					const type indextype = type_of(L, index);
+					tracking.use(1);
+					if (indextype != type::userdata) {
+						handler(L, index, type::userdata, indextype, "value is not a userdata");
+						return false;
+					}
+					void* memory = lua_touserdata(L, index);
+					memory = detail::align_usertype_unique_destructor(memory);
+					detail::unique_destructor& pdx = *static_cast<detail::unique_destructor*>(memory);
+					if (&detail::usertype_unique_alloc_destroy<element, no_cv_X> == pdx) {
+						return true;
+					}
+					if constexpr (derive<element>::value) {
+						memory = detail::align_usertype_unique_tag<true, false>(memory);
+						detail::unique_tag& ic = *reinterpret_cast<detail::unique_tag*>(memory);
+						string_view ti = usertype_traits<element>::qualified_name();
+						string_view rebind_ti = usertype_traits<rebound_actual_type>::qualified_name();
+						if (ic(nullptr, nullptr, ti, rebind_ti) != 0) {
+							return true;
+						}
+					}
+					handler(L, index, type::userdata, indextype, "value is a userdata but is not the correct unique usertype");
+					return false;
+				}
+				else {
+					return stack::unqualified_check<X>(L, index, std::forward<Handler>(handler), tracking);
+				}
+			}
+			else if constexpr (!std::is_reference_v<X> && is_container_v<no_cv_X>) {
+				if (type_of(L, index) == type::userdata) {
+					return stack::unqualified_check<X>(L, index, std::forward<Handler>(handler), tracking);
+				}
+				else {
+					return stack::unqualified_check<nested<X>>(L, index, std::forward<Handler>(handler), tracking);
+				}
+			}
+			else if constexpr (!std::is_reference_v<X> && meta::is_specialization_of_v<X, nested>) {
+				using NestedX = typename meta::unqualified_t<X>::nested_type;
+				return stack::check<NestedX>(L, index, ::std::forward<Handler>(handler), tracking);
+			}
+			else {
+				return stack::unqualified_check<X>(L, index, std::forward<Handler>(handler), tracking);
+			}
+		}
+	};
+}} // namespace sol::stack
+
+// end of sol/stack_check_qualified.hpp
+
+// end of sol/stack_check.hpp
+
+// beginning of sol/stack_get.hpp
+
+// beginning of sol/stack_get_unqualified.hpp
+
+// beginning of sol/overload.hpp
+
+#include <utility>
+
+namespace sol {
+	template <typename... Functions>
+	struct overload_set {
+		std::tuple<Functions...> functions;
+		template <typename Arg, typename... Args, meta::disable<std::is_same<overload_set, meta::unqualified_t<Arg>>> = meta::enabler>
+		overload_set(Arg&& arg, Args&&... args) : functions(std::forward<Arg>(arg), std::forward<Args>(args)...) {
+		}
+		overload_set(const overload_set&) = default;
+		overload_set(overload_set&&) = default;
+		overload_set& operator=(const overload_set&) = default;
+		overload_set& operator=(overload_set&&) = default;
+	};
+
+	template <typename... Args>
+	decltype(auto) overload(Args&&... args) {
+		return overload_set<std::decay_t<Args>...>(std::forward<Args>(args)...);
+	}
+} // namespace sol
+
+// end of sol/overload.hpp
+
+// beginning of sol/unicode.hpp
+
+#include <array>
+#include <cstring>
+
+namespace sol {
+	// Everything here was lifted pretty much straight out of
+	// ogonek, because fuck figuring it out=
+	namespace unicode {
+		enum class error_code {
+			ok = 0,
+			invalid_code_point,
+			invalid_code_unit,
+			invalid_leading_surrogate,
+			invalid_trailing_surrogate,
+			sequence_too_short,
+			overlong_sequence,
+		};
+
+		inline const string_view& to_string(error_code ec) {
+			static const string_view storage[7] = { "ok",
+				"invalid code points",
+				"invalid code unit",
+				"invalid leading surrogate",
+				"invalid trailing surrogate",
+				"sequence too short",
+				"overlong sequence" };
+			return storage[static_cast<std::size_t>(ec)];
+		}
+
+		template <typename It>
+		struct decoded_result {
+			error_code error;
+			char32_t codepoint;
+			It next;
+		};
+
+		template <typename C>
+		struct encoded_result {
+			error_code error;
+			std::size_t code_units_size;
+			std::array<C, 4> code_units;
+		};
+
+		struct unicode_detail {
+			// codepoint related
+			static constexpr char32_t last_code_point = 0x10FFFF;
+
+			static constexpr char32_t first_lead_surrogate = 0xD800;
+			static constexpr char32_t last_lead_surrogate = 0xDBFF;
+
+			static constexpr char32_t first_trail_surrogate = 0xDC00;
+			static constexpr char32_t last_trail_surrogate = 0xDFFF;
+
+			static constexpr char32_t first_surrogate = first_lead_surrogate;
+			static constexpr char32_t last_surrogate = last_trail_surrogate;
+
+			static constexpr bool is_lead_surrogate(char32_t u) {
+				return u >= first_lead_surrogate && u <= last_lead_surrogate;
+			}
+			static constexpr bool is_trail_surrogate(char32_t u) {
+				return u >= first_trail_surrogate && u <= last_trail_surrogate;
+			}
+			static constexpr bool is_surrogate(char32_t u) {
+				return u >= first_surrogate && u <= last_surrogate;
+			}
+
+			// utf8 related
+			static constexpr auto last_1byte_value = 0x7Fu;
+			static constexpr auto last_2byte_value = 0x7FFu;
+			static constexpr auto last_3byte_value = 0xFFFFu;
+
+			static constexpr auto start_2byte_mask = 0x80u;
+			static constexpr auto start_3byte_mask = 0xE0u;
+			static constexpr auto start_4byte_mask = 0xF0u;
+
+			static constexpr auto continuation_mask = 0xC0u;
+			static constexpr auto continuation_signature = 0x80u;
+
+			static constexpr bool is_invalid(unsigned char b) {
+				return b == 0xC0 || b == 0xC1 || b > 0xF4;
+			}
+
+			static constexpr bool is_continuation(unsigned char b) {
+				return (b & unicode_detail::continuation_mask) == unicode_detail::continuation_signature;
+			}
+
+			static constexpr bool is_overlong(char32_t u, std::size_t bytes) {
+				return u <= unicode_detail::last_1byte_value || (u <= unicode_detail::last_2byte_value && bytes > 2)
+				     || (u <= unicode_detail::last_3byte_value && bytes > 3);
+			}
+
+			static constexpr int sequence_length(unsigned char b) {
+				return (b & start_2byte_mask) == 0                ? 1
+				     : (b & start_3byte_mask) != start_3byte_mask ? 2
+				     : (b & start_4byte_mask) != start_4byte_mask ? 3
+				                                                  : 4;
+			}
+
+			static constexpr char32_t decode(unsigned char b0, unsigned char b1) {
+				return (static_cast<char32_t>((b0 & 0x1Fu) << 6u) | static_cast<char32_t>(b1 & 0x3Fu));
+			}
+			static constexpr char32_t decode(unsigned char b0, unsigned char b1, unsigned char b2) {
+				return static_cast<char32_t>((b0 & 0x0Fu) << 12u) | static_cast<char32_t>((b1 & 0x3Fu) << 6u) | static_cast<char32_t>(b2 & 0x3Fu);
+			}
+			static constexpr char32_t decode(unsigned char b0, unsigned char b1, unsigned char b2, unsigned char b3) {
+				return static_cast<char32_t>(static_cast<char32_t>((b0 & 0x07u) << 18u) | static_cast<char32_t>((b1 & 0x3F) << 12)
+				     | static_cast<char32_t>((b2 & 0x3Fu) << 6u) | static_cast<char32_t>(b3 & 0x3Fu));
+			}
+
+			// utf16 related
+			static constexpr char32_t last_bmp_value = 0xFFFF;
+			static constexpr char32_t normalizing_value = 0x10000;
+			static constexpr int lead_surrogate_bitmask = 0xFFC00;
+			static constexpr int trail_surrogate_bitmask = 0x3FF;
+			static constexpr int lead_shifted_bits = 10;
+			static constexpr char32_t replacement = 0xFFFD;
+
+			static char32_t combine_surrogates(char16_t lead, char16_t trail) {
+				auto hi = lead - first_lead_surrogate;
+				auto lo = trail - first_trail_surrogate;
+				return normalizing_value + ((hi << lead_shifted_bits) | lo);
+			}
+		};
+
+		inline encoded_result<char> code_point_to_utf8(char32_t codepoint) {
+			encoded_result<char> er;
+			er.error = error_code::ok;
+			if (codepoint <= unicode_detail::last_1byte_value) {
+				er.code_units_size = 1;
+				er.code_units = std::array<char, 4> { { static_cast<char>(codepoint) } };
+			}
+			else if (codepoint <= unicode_detail::last_2byte_value) {
+				er.code_units_size = 2;
+				er.code_units = std::array<char, 4> { {
+					static_cast<char>(0xC0 | ((codepoint & 0x7C0) >> 6)),
+					static_cast<char>(0x80 | (codepoint & 0x3F)),
+				} };
+			}
+			else if (codepoint <= unicode_detail::last_3byte_value) {
+				er.code_units_size = 3;
+				er.code_units = std::array<char, 4> { {
+					static_cast<char>(0xE0 | ((codepoint & 0xF000) >> 12)),
+					static_cast<char>(0x80 | ((codepoint & 0xFC0) >> 6)),
+					static_cast<char>(0x80 | (codepoint & 0x3F)),
+				} };
+			}
+			else {
+				er.code_units_size = 4;
+				er.code_units = std::array<char, 4> { {
+					static_cast<char>(0xF0 | ((codepoint & 0x1C0000) >> 18)),
+					static_cast<char>(0x80 | ((codepoint & 0x3F000) >> 12)),
+					static_cast<char>(0x80 | ((codepoint & 0xFC0) >> 6)),
+					static_cast<char>(0x80 | (codepoint & 0x3F)),
+				} };
+			}
+			return er;
+		}
+
+		inline encoded_result<char16_t> code_point_to_utf16(char32_t codepoint) {
+			encoded_result<char16_t> er;
+
+			if (codepoint <= unicode_detail::last_bmp_value) {
+				er.code_units_size = 1;
+				er.code_units = std::array<char16_t, 4> { { static_cast<char16_t>(codepoint) } };
+				er.error = error_code::ok;
+			}
+			else {
+				auto normal = codepoint - unicode_detail::normalizing_value;
+				auto lead = unicode_detail::first_lead_surrogate + ((normal & unicode_detail::lead_surrogate_bitmask) >> unicode_detail::lead_shifted_bits);
+				auto trail = unicode_detail::first_trail_surrogate + (normal & unicode_detail::trail_surrogate_bitmask);
+				er.code_units = std::array<char16_t, 4> { { static_cast<char16_t>(lead), static_cast<char16_t>(trail) } };
+				er.code_units_size = 2;
+				er.error = error_code::ok;
+			}
+			return er;
+		}
+
+		inline encoded_result<char32_t> code_point_to_utf32(char32_t codepoint) {
+			encoded_result<char32_t> er;
+			er.code_units_size = 1;
+			er.code_units[0] = codepoint;
+			er.error = error_code::ok;
+			return er;
+		}
+
+		template <typename It>
+		inline decoded_result<It> utf8_to_code_point(It it, It last) {
+			decoded_result<It> dr;
+			if (it == last) {
+				dr.next = it;
+				dr.error = error_code::sequence_too_short;
+				return dr;
+			}
+
+			unsigned char b0 = static_cast<unsigned char>(*it);
+			std::size_t length = static_cast<std::size_t>(unicode_detail::sequence_length(b0));
+
+			if (length == 1) {
+				dr.codepoint = static_cast<char32_t>(b0);
+				dr.error = error_code::ok;
+				++it;
+				dr.next = it;
+				return dr;
+			}
+
+			if (unicode_detail::is_invalid(b0) || unicode_detail::is_continuation(b0)) {
+				dr.error = error_code::invalid_code_unit;
+				dr.next = it;
+				return dr;
+			}
+
+			++it;
+			std::array<unsigned char, 4> b;
+			b[0] = b0;
+			for (std::size_t i = 1; i < length; ++i) {
+				b[i] = static_cast<unsigned char>(*it);
+				if (!unicode_detail::is_continuation(b[i])) {
+					dr.error = error_code::invalid_code_unit;
+					dr.next = it;
+					return dr;
+				}
+				++it;
+			}
+
+			char32_t decoded;
+			switch (length) {
+			case 2:
+				decoded = unicode_detail::decode(b[0], b[1]);
+				break;
+			case 3:
+				decoded = unicode_detail::decode(b[0], b[1], b[2]);
+				break;
+			default:
+				decoded = unicode_detail::decode(b[0], b[1], b[2], b[3]);
+				break;
+			}
+
+			if (unicode_detail::is_overlong(decoded, length)) {
+				dr.error = error_code::overlong_sequence;
+				return dr;
+			}
+			if (unicode_detail::is_surrogate(decoded) || decoded > unicode_detail::last_code_point) {
+				dr.error = error_code::invalid_code_point;
+				return dr;
+			}
+
+			// then everything is fine
+			dr.codepoint = decoded;
+			dr.error = error_code::ok;
+			dr.next = it;
+			return dr;
+		}
+
+		template <typename It>
+		inline decoded_result<It> utf16_to_code_point(It it, It last) {
+			decoded_result<It> dr;
+			if (it == last) {
+				dr.next = it;
+				dr.error = error_code::sequence_too_short;
+				return dr;
+			}
+
+			char16_t lead = static_cast<char16_t>(*it);
+
+			if (!unicode_detail::is_surrogate(lead)) {
+				++it;
+				dr.codepoint = static_cast<char32_t>(lead);
+				dr.next = it;
+				dr.error = error_code::ok;
+				return dr;
+			}
+			if (!unicode_detail::is_lead_surrogate(lead)) {
+				dr.error = error_code::invalid_leading_surrogate;
+				dr.next = it;
+				return dr;
+			}
+
+			++it;
+			auto trail = *it;
+			if (!unicode_detail::is_trail_surrogate(trail)) {
+				dr.error = error_code::invalid_trailing_surrogate;
+				dr.next = it;
+				return dr;
+			}
+
+			dr.codepoint = unicode_detail::combine_surrogates(lead, trail);
+			dr.next = ++it;
+			dr.error = error_code::ok;
+			return dr;
+		}
+
+		template <typename It>
+		inline decoded_result<It> utf32_to_code_point(It it, It last) {
+			decoded_result<It> dr;
+			if (it == last) {
+				dr.next = it;
+				dr.error = error_code::sequence_too_short;
+				return dr;
+			}
+			dr.codepoint = static_cast<char32_t>(*it);
+			dr.next = ++it;
+			dr.error = error_code::ok;
+			return dr;
+		}
+	} // namespace unicode
+} // namespace sol
+// end of sol/unicode.hpp
+
+// beginning of sol/abort.hpp
+
+#include <cstdlib>
+
+#if SOL_IS_ON(SOL_DEBUG_BUILD)
+	#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		#define SOL_DEBUG_ABORT() \
+			if (true) { ::std::abort(); } \
+			static_assert(true, "")
+	#else
+		#define SOL_DEBUG_ABORT() ::std::abort()
+	#endif
+#else
+	#define SOL_DEBUG_ABORT() static_assert(true, "")
+#endif
+
+// end of sol/abort.hpp
+
+#include <memory>
+#include <functional>
+#include <utility>
+#include <cstdlib>
+#include <cmath>
+#include <string_view>
+#if SOL_IS_ON(SOL_STD_VARIANT)
+#include <variant>
+#endif // Apple clang screwed up
+
+namespace sol { namespace stack {
+
+	namespace stack_detail {
+		template <typename Ch>
+		struct count_code_units_utf {
+			std::size_t needed_size;
+
+			count_code_units_utf() : needed_size(0) {
+			}
+
+			void operator()(const unicode::encoded_result<Ch> er) {
+				needed_size += er.code_units_size;
+			}
+		};
+
+		template <typename Ch, typename ErCh>
+		struct copy_code_units_utf {
+			Ch* target_;
+
+			copy_code_units_utf(Ch* target) : target_(target) {
+			}
+
+			void operator()(const unicode::encoded_result<ErCh> er) {
+				std::memcpy(target_, er.code_units.data(), er.code_units_size * sizeof(ErCh));
+				target_ += er.code_units_size;
+			}
+		};
+
+		template <typename Ch, typename F>
+		inline void convert(const char* strb, const char* stre, F&& f) {
+			char32_t cp = 0;
+			for (const char* strtarget = strb; strtarget < stre;) {
+				auto dr = unicode::utf8_to_code_point(strtarget, stre);
+				if (dr.error != unicode::error_code::ok) {
+					cp = unicode::unicode_detail::replacement;
+					++strtarget;
+				}
+				else {
+					cp = dr.codepoint;
+					strtarget = dr.next;
+				}
+				if constexpr (std::is_same_v<Ch, char32_t>) {
+					auto er = unicode::code_point_to_utf32(cp);
+					f(er);
+				}
+				else {
+					auto er = unicode::code_point_to_utf16(cp);
+					f(er);
+				}
+			}
+		}
+
+		template <typename BaseCh, typename S>
+		inline S get_into(lua_State* L, int index, record& tracking) {
+			using Ch = typename S::value_type;
+			tracking.use(1);
+			size_t len;
+			auto utf8p = lua_tolstring(L, index, &len);
+			if (len < 1)
+				return S();
+			const char* strb = utf8p;
+			const char* stre = utf8p + len;
+			stack_detail::count_code_units_utf<BaseCh> count_units;
+			convert<BaseCh>(strb, stre, count_units);
+			S r(count_units.needed_size, static_cast<Ch>(0));
+			r.resize(count_units.needed_size);
+			Ch* target = &r[0];
+			stack_detail::copy_code_units_utf<Ch, BaseCh> copy_units(target);
+			convert<BaseCh>(strb, stre, copy_units);
+			return r;
+		}
+	} // namespace stack_detail
+
+	template <typename T, typename>
+	struct unqualified_getter {
+		static decltype(auto) get(lua_State* L, int index, record& tracking) {
+			if constexpr (std::is_same_v<T, bool>) {
+				tracking.use(1);
+				return lua_toboolean(L, index) != 0;
+			}
+			else if constexpr (std::is_enum_v<T>) {
+				tracking.use(1);
+				return static_cast<T>(lua_tointegerx(L, index, nullptr));
+			}
+			else if constexpr (std::is_integral_v<T> || std::is_same_v<T, lua_Integer>) {
+				tracking.use(1);
+#if SOL_LUA_VERSION_I_ >= 503
+				if (lua_isinteger(L, index) != 0) {
+					return static_cast<T>(lua_tointeger(L, index));
+				}
+#endif
+				return static_cast<T>(llround(lua_tonumber(L, index)));
+			}
+			else if constexpr (std::is_floating_point_v<T> || std::is_same_v<T, lua_Number>) {
+				tracking.use(1);
+				return static_cast<T>(lua_tonumber(L, index));
+			}
+			else if constexpr (is_lua_reference_v<T>) {
+				if constexpr (is_global_table_v<T>) {
+					tracking.use(1);
+					return T(L, global_tag);
+				}
+				else {
+					tracking.use(1);
+					return T(L, index);
+				}
+			}
+			else if constexpr (is_unique_usertype_v<T>) {
+				using actual = unique_usertype_actual_t<T>;
+
+				tracking.use(1);
+				void* memory = lua_touserdata(L, index);
+				void* aligned_memory = detail::align_usertype_unique<actual>(memory);
+				actual* typed_memory = static_cast<actual*>(aligned_memory);
+				return *typed_memory;
+			}
+			else if constexpr (meta::is_optional_v<T>) {
+				using ValueType = typename T::value_type;
+				return unqualified_check_getter<ValueType>::template get_using<T>(L, index, &no_panic, tracking);
+			}
+			else if constexpr (std::is_same_v<T, luaL_Stream*>) {
+				luaL_Stream* pstream = static_cast<luaL_Stream*>(lua_touserdata(L, index));
+				return pstream;
+			}
+			else if constexpr (std::is_same_v<T, luaL_Stream>) {
+				luaL_Stream* pstream = static_cast<luaL_Stream*>(lua_touserdata(L, index));
+				return *pstream;
+			}
+#if SOL_IS_ON(SOL_GET_FUNCTION_POINTER_UNSAFE)
+			else if constexpr (std::is_function_v<T> || (std::is_pointer_v<T> && std::is_function_v<std::remove_pointer_t<T>>)) {
+				return stack_detail::get_function_pointer<std::remove_pointer_t<T>>(L, index, tracking);
+			}
+#endif
+			else {
+				return stack_detail::unchecked_unqualified_get<detail::as_value_tag<T>>(L, index, tracking);
+			}
+		}
+	};
+
+	template <typename X, typename>
+	struct qualified_getter {
+		static decltype(auto) get(lua_State* L, int index, record& tracking) {
+			using Tu = meta::unqualified_t<X>;
+			static constexpr bool is_maybe_userdata_of_some_kind
+				= !std::is_reference_v<
+				       X> && is_container_v<Tu> && std::is_default_constructible_v<Tu> && !is_lua_primitive_v<Tu> && !is_transparent_argument_v<Tu>;
+			if constexpr (is_maybe_userdata_of_some_kind) {
+				if (type_of(L, index) == type::userdata) {
+					return static_cast<Tu>(stack_detail::unchecked_unqualified_get<Tu>(L, index, tracking));
+				}
+				else {
+					return stack_detail::unchecked_unqualified_get<sol::nested<Tu>>(L, index, tracking);
+				}
+			}
+			else if constexpr (!std::is_reference_v<X> && is_unique_usertype_v<Tu> && !is_actual_type_rebindable_for_v<Tu>) {
+				using element = unique_usertype_element_t<Tu>;
+				using actual = unique_usertype_actual_t<Tu>;
+				tracking.use(1);
+				void* memory = lua_touserdata(L, index);
+				memory = detail::align_usertype_unique_destructor(memory);
+				detail::unique_destructor& pdx = *static_cast<detail::unique_destructor*>(memory);
+				if (&detail::usertype_unique_alloc_destroy<element, Tu> == pdx) {
+					memory = detail::align_usertype_unique_tag<true, false>(memory);
+					memory = detail::align_usertype_unique<actual, true, false>(memory);
+					actual* mem = static_cast<actual*>(memory);
+					return static_cast<actual>(*mem);
+				}
+				actual r {};
+				if constexpr (!derive<element>::value) {
+					// In debug mode we would rather abort you for this grave failure rather
+					// than let you deref a null pointer and fuck everything over
+					SOL_DEBUG_ABORT();
+					return static_cast<actual>(std::move(r));
+				}
+				else {
+					memory = detail::align_usertype_unique_tag<true, false>(memory);
+					detail::unique_tag& ic = *reinterpret_cast<detail::unique_tag*>(memory);
+					memory = detail::align_usertype_unique<actual, true, false>(memory);
+					string_view ti = usertype_traits<element>::qualified_name();
+					int cast_operation;
+					if constexpr (is_actual_type_rebindable_for_v<Tu>) {
+						using rebound_actual_type = unique_usertype_rebind_actual_t<Tu, void>;
+						string_view rebind_ti = usertype_traits<rebound_actual_type>::qualified_name();
+						cast_operation = ic(memory, &r, ti, rebind_ti);
+					}
+					else {
+						string_view rebind_ti("");
+						cast_operation = ic(memory, &r, ti, rebind_ti);
+					}
+					switch (cast_operation) {
+					case 1: {
+						// it's a perfect match,
+						// alias memory directly
+						actual* mem = static_cast<actual*>(memory);
+						return static_cast<actual>(*mem);
+					}
+					case 2:
+						// it's a base match, return the
+						// aliased creation
+						return static_cast<actual>(std::move(r));
+					default:
+						// uh oh..
+						break;
+					}
+					SOL_DEBUG_ABORT();
+					return static_cast<actual>(r);
+				}
+			}
+			else {
+				return stack_detail::unchecked_unqualified_get<Tu>(L, index, tracking);
+			}
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<as_table_t<T>> {
+		using Tu = meta::unqualified_t<T>;
+
+		template <typename V>
+		static void push_back_at_end(std::true_type, types<V>, lua_State* L, T& cont, std::size_t) {
+			cont.push_back(stack::get<V>(L, -lua_size<V>::value));
+		}
+
+		template <typename V>
+		static void push_back_at_end(std::false_type, types<V> t, lua_State* L, T& cont, std::size_t idx) {
+			insert_at_end(meta::has_insert<Tu>(), t, L, cont, idx);
+		}
+
+		template <typename V>
+		static void insert_at_end(std::true_type, types<V>, lua_State* L, T& cont, std::size_t) {
+			using std::cend;
+			cont.insert(cend(cont), stack::get<V>(L, -lua_size<V>::value));
+		}
+
+		template <typename V>
+		static void insert_at_end(std::false_type, types<V>, lua_State* L, T& cont, std::size_t idx) {
+			cont[idx] = stack::get<V>(L, -lua_size<V>::value);
+		}
+
+		static bool max_size_check(std::false_type, T&, std::size_t) {
+			return false;
+		}
+
+		static bool max_size_check(std::true_type, T& cont, std::size_t idx) {
+			return idx >= cont.max_size();
+		}
+
+		static T get(lua_State* L, int relindex, record& tracking) {
+			return get(meta::is_associative<Tu>(), L, relindex, tracking);
+		}
+
+		static T get(std::false_type, lua_State* L, int relindex, record& tracking) {
+			typedef typename Tu::value_type V;
+			return get(types<V>(), L, relindex, tracking);
+		}
+
+		template <typename V>
+		static T get(types<V> t, lua_State* L, int relindex, record& tracking) {
+			tracking.use(1);
+
+			// the W4 flag is really great,
+			// so great that it can tell my for loops (twice nested)
+			// below never actually terminate
+			// without hitting where the gotos have infested
+
+			// so now I would get the error W4XXX unreachable
+			// me that the return cont at the end of this function
+			// which is fair until other compilers complain
+			// that there isn't a return and that based on
+			// SOME MAGICAL FORCE
+			// control flow falls off the end of a non-void function
+			// so it needs to be there for the compilers that are
+			// too flimsy to analyze the basic blocks...
+			// (I'm sure I should file a bug but those compilers are already
+			// in the wild; it doesn't matter if I fix them,
+			// someone else is still going to get some old-ass compiler
+			// and then bother me about the unclean build for the 30th
+			// time)
+
+			// "Why not an IIFE?"
+			// Because additional lambdas / functions which serve as
+			// capture-all-and-then-invoke bloat binary sizes
+			// by an actually detectable amount
+			// (one user uses sol2 pretty heavily and 22 MB of binary size
+			// was saved by reducing reliance on lambdas in templates)
+
+			// This would really be solved by having break N;
+			// be a real, proper thing...
+			// but instead, we have to use labels and gotos
+			// and earn the universal vitriol of the dogmatic
+			// programming community
+
+			// all in all: W4 is great!~
+
+			int index = lua_absindex(L, relindex);
+			T cont;
+			std::size_t idx = 0;
+#if SOL_LUA_VERSION_I_ >= 503
+			// This method is HIGHLY performant over regular table iteration
+			// thanks to the Lua API changes in 5.3
+			// Questionable in 5.4
+			for (lua_Integer i = 0;; i += lua_size<V>::value) {
+				if (max_size_check(meta::has_max_size<Tu>(), cont, idx)) {
+					// see above comment
+					goto done;
+				}
+				bool isnil = false;
+				for (int vi = 0; vi < lua_size<V>::value; ++vi) {
+#if SOL_IS_ON(SOL_LUA_NIL_IN_TABLES) && SOL_LUA_VERSION_I_ >= 600
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+					luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+					lua_pushinteger(L, static_cast<lua_Integer>(i + vi));
+					if (lua_keyin(L, index) == 0) {
+						// it's time to stop
+						isnil = true;
+					}
+					else {
+						// we have a key, have to get the value
+						lua_geti(L, index, i + vi);
+					}
+#else
+					type vt = static_cast<type>(lua_geti(L, index, i + vi));
+					isnil = vt == type::none || vt == type::lua_nil;
+#endif
+					if (isnil) {
+						if (i == 0) {
+							break;
+						}
+#if SOL_IS_ON(SOL_LUA_NIL_IN_TABLES) && SOL_LUA_VERSION_I_ >= 600
+						lua_pop(L, vi);
+#else
+						lua_pop(L, (vi + 1));
+#endif
+						// see above comment
+						goto done;
+					}
+				}
+				if (isnil) {
+#if SOL_IS_ON(SOL_LUA_NIL_IN_TABLES) && SOL_LUA_VERSION_I_ >= 600
+#else
+					lua_pop(L, lua_size<V>::value);
+#endif
+					continue;
+				}
+
+				push_back_at_end(meta::has_push_back<Tu>(), t, L, cont, idx);
+				++idx;
+				lua_pop(L, lua_size<V>::value);
+			}
+#else
+			// Zzzz slower but necessary thanks to the lower version API and missing functions qq
+			for (lua_Integer i = 0;; i += lua_size<V>::value, lua_pop(L, lua_size<V>::value)) {
+				if (idx >= cont.max_size()) {
+					// see above comment
+					goto done;
+				}
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+				luaL_checkstack(L, 2, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+				bool isnil = false;
+				for (int vi = 0; vi < lua_size<V>::value; ++vi) {
+					lua_pushinteger(L, i);
+					lua_gettable(L, index);
+					type vt = type_of(L, -1);
+					isnil = vt == type::lua_nil;
+					if (isnil) {
+						if (i == 0) {
+							break;
+						}
+						lua_pop(L, (vi + 1));
+						// see above comment
+						goto done;
+					}
+				}
+				if (isnil)
+					continue;
+				push_back_at_end(meta::has_push_back<Tu>(), t, L, cont, idx);
+				++idx;
+			}
+#endif
+		done:
+			return cont;
+		}
+
+		static T get(std::true_type, lua_State* L, int index, record& tracking) {
+			typedef typename Tu::value_type P;
+			typedef typename P::first_type K;
+			typedef typename P::second_type V;
+			return get(types<K, V>(), L, index, tracking);
+		}
+
+		template <typename K, typename V>
+		static T get(types<K, V>, lua_State* L, int relindex, record& tracking) {
+			tracking.use(1);
+
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 3, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+
+			T associative;
+			int index = lua_absindex(L, relindex);
+			lua_pushnil(L);
+			while (lua_next(L, index) != 0) {
+				decltype(auto) key = stack::check_get<K>(L, -2);
+				if (!key) {
+					lua_pop(L, 1);
+					continue;
+				}
+				associative.emplace(std::forward<decltype(*key)>(*key), stack::get<V>(L, -1));
+				lua_pop(L, 1);
+			}
+			return associative;
+		}
+	};
+
+	template <typename T, typename Al>
+	struct unqualified_getter<as_table_t<std::forward_list<T, Al>>> {
+		typedef std::forward_list<T, Al> C;
+
+		static C get(lua_State* L, int relindex, record& tracking) {
+			return get(meta::has_key_value_pair<C>(), L, relindex, tracking);
+		}
+
+		static C get(std::true_type, lua_State* L, int index, record& tracking) {
+			typedef typename T::value_type P;
+			typedef typename P::first_type K;
+			typedef typename P::second_type V;
+			return get(types<K, V>(), L, index, tracking);
+		}
+
+		static C get(std::false_type, lua_State* L, int relindex, record& tracking) {
+			typedef typename C::value_type V;
+			return get(types<V>(), L, relindex, tracking);
+		}
+
+		template <typename V>
+		static C get(types<V>, lua_State* L, int relindex, record& tracking) {
+			tracking.use(1);
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 3, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+
+			int index = lua_absindex(L, relindex);
+			C cont;
+			auto at = cont.cbefore_begin();
+			std::size_t idx = 0;
+#if SOL_LUA_VERSION_I_ >= 503
+			// This method is HIGHLY performant over regular table iteration thanks to the Lua API changes in 5.3
+			for (lua_Integer i = 0;; i += lua_size<V>::value, lua_pop(L, lua_size<V>::value)) {
+				if (idx >= cont.max_size()) {
+					goto done;
+				}
+				bool isnil = false;
+				for (int vi = 0; vi < lua_size<V>::value; ++vi) {
+					type t = static_cast<type>(lua_geti(L, index, i + vi));
+					isnil = t == type::lua_nil;
+					if (isnil) {
+						if (i == 0) {
+							break;
+						}
+						lua_pop(L, (vi + 1));
+						goto done;
+					}
+				}
+				if (isnil)
+					continue;
+				at = cont.insert_after(at, stack::get<V>(L, -lua_size<V>::value));
+				++idx;
+			}
+#else
+			// Zzzz slower but necessary thanks to the lower version API and missing functions qq
+			for (lua_Integer i = 0;; i += lua_size<V>::value, lua_pop(L, lua_size<V>::value)) {
+				if (idx >= cont.max_size()) {
+					goto done;
+				}
+				bool isnil = false;
+				for (int vi = 0; vi < lua_size<V>::value; ++vi) {
+					lua_pushinteger(L, i);
+					lua_gettable(L, index);
+					type t = type_of(L, -1);
+					isnil = t == type::lua_nil;
+					if (isnil) {
+						if (i == 0) {
+							break;
+						}
+						lua_pop(L, (vi + 1));
+						goto done;
+					}
+				}
+				if (isnil)
+					continue;
+				at = cont.insert_after(at, stack::get<V>(L, -lua_size<V>::value));
+				++idx;
+			}
+#endif
+		done:
+			return cont;
+		}
+
+		template <typename K, typename V>
+		static C get(types<K, V>, lua_State* L, int relindex, record& tracking) {
+			tracking.use(1);
+
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 3, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+
+			C associative;
+			auto at = associative.cbefore_begin();
+			int index = lua_absindex(L, relindex);
+			lua_pushnil(L);
+			while (lua_next(L, index) != 0) {
+				decltype(auto) key = stack::check_get<K>(L, -2);
+				if (!key) {
+					lua_pop(L, 1);
+					continue;
+				}
+				at = associative.emplace_after(at, std::forward<decltype(*key)>(*key), stack::get<V>(L, -1));
+				lua_pop(L, 1);
+			}
+			return associative;
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<nested<T>> {
+		static T get(lua_State* L, int index, record& tracking) {
+			using Tu = meta::unqualified_t<T>;
+			if constexpr (is_container_v<Tu>) {
+				if constexpr (meta::is_associative<Tu>::value) {
+					typedef typename Tu::value_type P;
+					typedef typename P::first_type K;
+					typedef typename P::second_type V;
+					unqualified_getter<as_table_t<T>> g {};
+					return g.get(types<K, nested<V>>(), L, index, tracking);
+				}
+				else {
+					typedef typename Tu::value_type V;
+					unqualified_getter<as_table_t<T>> g {};
+					return g.get(types<nested<V>>(), L, index, tracking);
+				}
+			}
+			else {
+				unqualified_getter<Tu> g {};
+				return g.get(L, index, tracking);
+			}
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<as_container_t<T>> {
+		static decltype(auto) get(lua_State* L, int index, record& tracking) {
+			return stack::unqualified_get<T>(L, index, tracking);
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<as_container_t<T>*> {
+		static decltype(auto) get(lua_State* L, int index, record& tracking) {
+			return stack::unqualified_get<T*>(L, index, tracking);
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<exhaustive<T>> {
+		static decltype(auto) get(lua_State* arg_L, int index, record& tracking) {
+			return stack::get<T>(arg_L, index, tracking);
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<non_exhaustive<T>> {
+		static decltype(auto) get(lua_State* arg_L, int index, record& tracking) {
+			return stack::get<T>(arg_L, index, tracking);
+		}
+	};
+
+	template <>
+	struct unqualified_getter<userdata_value> {
+		static userdata_value get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			return userdata_value(lua_touserdata(L, index));
+		}
+	};
+
+	template <>
+	struct unqualified_getter<lightuserdata_value> {
+		static lightuserdata_value get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			return lightuserdata_value(lua_touserdata(L, index));
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<light<T>> {
+		static light<T> get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			void* memory = lua_touserdata(L, index);
+			return light<T>(static_cast<T*>(memory));
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<user<T>> {
+		static std::add_lvalue_reference_t<T> get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			void* memory = lua_touserdata(L, index);
+			memory = detail::align_user<T>(memory);
+			return *static_cast<std::remove_reference_t<T>*>(memory);
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<user<T*>> {
+		static T* get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			void* memory = lua_touserdata(L, index);
+			memory = detail::align_user<T*>(memory);
+			return static_cast<T*>(memory);
+		}
+	};
+
+	template <>
+	struct unqualified_getter<type> {
+		static type get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			return static_cast<type>(lua_type(L, index));
+		}
+	};
+
+	template <>
+	struct unqualified_getter<std::string> {
+		static std::string get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			std::size_t len;
+			auto str = lua_tolstring(L, index, &len);
+			return std::string(str, len);
+		}
+	};
+
+	template <>
+	struct unqualified_getter<const char*> {
+		static const char* get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			size_t sz;
+			return lua_tolstring(L, index, &sz);
+		}
+	};
+
+	template <>
+	struct unqualified_getter<char> {
+		static char get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			size_t len;
+			auto str = lua_tolstring(L, index, &len);
+			return len > 0 ? str[0] : '\0';
+		}
+	};
+
+	template <typename Traits>
+	struct unqualified_getter<basic_string_view<char, Traits>> {
+		static string_view get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			size_t sz;
+			const char* str = lua_tolstring(L, index, &sz);
+			return basic_string_view<char, Traits>(str, sz);
+		}
+	};
+
+	template <typename Traits, typename Al>
+	struct unqualified_getter<std::basic_string<wchar_t, Traits, Al>> {
+		using S = std::basic_string<wchar_t, Traits, Al>;
+		static S get(lua_State* L, int index, record& tracking) {
+			using Ch = meta::conditional_t<sizeof(wchar_t) == 2, char16_t, char32_t>;
+			return stack_detail::get_into<Ch, S>(L, index, tracking);
+		}
+	};
+
+	template <typename Traits, typename Al>
+	struct unqualified_getter<std::basic_string<char16_t, Traits, Al>> {
+		static std::basic_string<char16_t, Traits, Al> get(lua_State* L, int index, record& tracking) {
+			return stack_detail::get_into<char16_t, std::basic_string<char16_t, Traits, Al>>(L, index, tracking);
+		}
+	};
+
+	template <typename Traits, typename Al>
+	struct unqualified_getter<std::basic_string<char32_t, Traits, Al>> {
+		static std::basic_string<char32_t, Traits, Al> get(lua_State* L, int index, record& tracking) {
+			return stack_detail::get_into<char32_t, std::basic_string<char32_t, Traits, Al>>(L, index, tracking);
+		}
+	};
+
+	template <>
+	struct unqualified_getter<char16_t> {
+		static char16_t get(lua_State* L, int index, record& tracking) {
+			string_view utf8 = stack::get<string_view>(L, index, tracking);
+			const char* strb = utf8.data();
+			const char* stre = utf8.data() + utf8.size();
+			char32_t cp = 0;
+			auto dr = unicode::utf8_to_code_point(strb, stre);
+			if (dr.error != unicode::error_code::ok) {
+				cp = unicode::unicode_detail::replacement;
+			}
+			else {
+				cp = dr.codepoint;
+			}
+			auto er = unicode::code_point_to_utf16(cp);
+			return er.code_units[0];
+		}
+	};
+
+	template <>
+	struct unqualified_getter<char32_t> {
+		static char32_t get(lua_State* L, int index, record& tracking) {
+			string_view utf8 = stack::get<string_view>(L, index, tracking);
+			const char* strb = utf8.data();
+			const char* stre = utf8.data() + utf8.size();
+			char32_t cp = 0;
+			auto dr = unicode::utf8_to_code_point(strb, stre);
+			if (dr.error != unicode::error_code::ok) {
+				cp = unicode::unicode_detail::replacement;
+			}
+			else {
+				cp = dr.codepoint;
+			}
+			auto er = unicode::code_point_to_utf32(cp);
+			return er.code_units[0];
+		}
+	};
+
+	template <>
+	struct unqualified_getter<wchar_t> {
+		static wchar_t get(lua_State* L, int index, record& tracking) {
+			typedef meta::conditional_t<sizeof(wchar_t) == 2, char16_t, char32_t> Ch;
+			unqualified_getter<Ch> g;
+			(void)g;
+			auto c = g.get(L, index, tracking);
+			return static_cast<wchar_t>(c);
+		}
+	};
+
+	template <>
+	struct unqualified_getter<meta_function> {
+		static meta_function get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			const char* name = unqualified_getter<const char*> {}.get(L, index, tracking);
+			const auto& mfnames = meta_function_names();
+			for (std::size_t i = 0; i < mfnames.size(); ++i)
+				if (mfnames[i] == name)
+					return static_cast<meta_function>(i);
+			return meta_function::construct;
+		}
+	};
+
+	template <>
+	struct unqualified_getter<lua_nil_t> {
+		static lua_nil_t get(lua_State*, int, record& tracking) {
+			tracking.use(1);
+			return lua_nil;
+		}
+	};
+
+	template <>
+	struct unqualified_getter<std::nullptr_t> {
+		static std::nullptr_t get(lua_State*, int, record& tracking) {
+			tracking.use(1);
+			return nullptr;
+		}
+	};
+
+	template <>
+	struct unqualified_getter<nullopt_t> {
+		static nullopt_t get(lua_State*, int, record& tracking) {
+			tracking.use(1);
+			return nullopt;
+		}
+	};
+
+	template <>
+	struct unqualified_getter<this_state> {
+		static this_state get(lua_State* L, int, record& tracking) {
+			tracking.use(0);
+			return this_state(L);
+		}
+	};
+
+	template <>
+	struct unqualified_getter<this_main_state> {
+		static this_main_state get(lua_State* L, int, record& tracking) {
+			tracking.use(0);
+			return this_main_state(main_thread(L, L));
+		}
+	};
+
+	template <>
+	struct unqualified_getter<lua_CFunction> {
+		static lua_CFunction get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			return lua_tocfunction(L, index);
+		}
+	};
+
+	template <>
+	struct unqualified_getter<c_closure> {
+		static c_closure get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			return c_closure(lua_tocfunction(L, index), -1);
+		}
+	};
+
+	template <>
+	struct unqualified_getter<error> {
+		static error get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			size_t sz = 0;
+			const char* err = lua_tolstring(L, index, &sz);
+			if (err == nullptr) {
+				return error(detail::direct_error, "");
+			}
+			return error(detail::direct_error, std::string(err, sz));
+		}
+	};
+
+	template <>
+	struct unqualified_getter<void*> {
+		static void* get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			return lua_touserdata(L, index);
+		}
+	};
+
+	template <>
+	struct unqualified_getter<const void*> {
+		static const void* get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			return lua_touserdata(L, index);
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<detail::as_value_tag<T>> {
+		static T* get_no_lua_nil(lua_State* L, int index, record& tracking) {
+			void* memory = lua_touserdata(L, index);
+#if SOL_IS_ON(SOL_USE_INTEROP)
+			auto ugr = stack_detail::interop_get<T>(L, index, memory, tracking);
+			if (ugr.first) {
+				return ugr.second;
+			}
+#endif // interop extensibility
+			tracking.use(1);
+			void* rawdata = detail::align_usertype_pointer(memory);
+			void** pudata = static_cast<void**>(rawdata);
+			void* udata = *pudata;
+			return get_no_lua_nil_from(L, udata, index, tracking);
+		}
+
+		static T* get_no_lua_nil_from(lua_State* L, void* udata, int index, record&) {
+			bool has_derived = derive<T>::value || weak_derive<T>::value;
+			if (has_derived) {
+				if (lua_getmetatable(L, index) == 1) {
+					lua_getfield(L, -1, &detail::base_class_cast_key()[0]);
+					if (type_of(L, -1) != type::lua_nil) {
+						void* basecastdata = lua_touserdata(L, -1);
+						detail::inheritance_cast_function ic = reinterpret_cast<detail::inheritance_cast_function>(basecastdata);
+						// use the casting function to properly adjust the pointer for the desired T
+						udata = ic(udata, usertype_traits<T>::qualified_name());
+					}
+					lua_pop(L, 2);
+				}
+			}
+			if constexpr (std::is_function_v<T>) {
+				T* func = reinterpret_cast<T*>(udata);
+				return func;
+			}
+			else {
+				T* obj = static_cast<T*>(udata);
+				return obj;
+			}
+		}
+
+		static T& get(lua_State* L, int index, record& tracking) {
+			return *get_no_lua_nil(L, index, tracking);
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<detail::as_pointer_tag<T>> {
+		static T* get(lua_State* L, int index, record& tracking) {
+			type t = type_of(L, index);
+			if (t == type::lua_nil) {
+				tracking.use(1);
+				return nullptr;
+			}
+			unqualified_getter<detail::as_value_tag<T>> g{};
+			return g.get_no_lua_nil(L, index, tracking);
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<non_null<T*>> {
+		static T* get(lua_State* L, int index, record& tracking) {
+			unqualified_getter<detail::as_value_tag<T>> g{};
+			return g.get_no_lua_nil(L, index, tracking);
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<T&> {
+		static T& get(lua_State* L, int index, record& tracking) {
+			unqualified_getter<detail::as_value_tag<T>> g{};
+			return g.get(L, index, tracking);
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<std::reference_wrapper<T>> {
+		static T& get(lua_State* L, int index, record& tracking) {
+			unqualified_getter<T&> g{};
+			return g.get(L, index, tracking);
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<T*> {
+		static T* get(lua_State* L, int index, record& tracking) {
+#if SOL_IS_ON(SOL_GET_FUNCTION_POINTER_UNSAFE)
+			if constexpr (std::is_function_v<T>) {
+				return stack_detail::get_function_pointer<T>(L, index, tracking);
+			}
+			else {
+				unqualified_getter<detail::as_pointer_tag<T>> g{};
+				return g.get(L, index, tracking);
+			}
+#else
+			unqualified_getter<detail::as_pointer_tag<T>> g{};
+			return g.get(L, index, tracking);
+#endif
+		}
+	};
+
+	template <typename... Tn>
+	struct unqualified_getter<std::tuple<Tn...>> {
+		typedef std::tuple<decltype(stack::get<Tn>(nullptr, 0))...> R;
+
+		template <typename... Args>
+		static R apply(std::index_sequence<>, lua_State*, int, record&, Args&&... args) {
+			// Fuck you too, VC++
+			return R { std::forward<Args>(args)... };
+		}
+
+		template <std::size_t I, std::size_t... Ix, typename... Args>
+		static R apply(std::index_sequence<I, Ix...>, lua_State* L, int index, record& tracking, Args&&... args) {
+			// Fuck you too, VC++
+			typedef std::tuple_element_t<I, std::tuple<Tn...>> T;
+			return apply(std::index_sequence<Ix...>(), L, index, tracking, std::forward<Args>(args)..., stack::get<T>(L, index + tracking.used, tracking));
+		}
+
+		static R get(lua_State* L, int index, record& tracking) {
+			return apply(std::make_index_sequence<sizeof...(Tn)>(), L, index, tracking);
+		}
+	};
+
+	template <typename A, typename B>
+	struct unqualified_getter<std::pair<A, B>> {
+		static decltype(auto) get(lua_State* L, int index, record& tracking) {
+			return std::pair<decltype(stack::get<A>(L, index)), decltype(stack::get<B>(L, index))> { stack::get<A>(L, index, tracking),
+				stack::get<B>(L, index + tracking.used, tracking) };
+		}
+	};
+
+#if SOL_IS_ON(SOL_STD_VARIANT)
+
+	template <typename... Tn>
+	struct unqualified_getter<std::variant<Tn...>> {
+		using V = std::variant<Tn...>;
+
+		static V get_one(std::integral_constant<std::size_t, std::variant_size_v<V>>, lua_State* L, int index, record& tracking) {
+			(void)L;
+			(void)index;
+			(void)tracking;
+			if constexpr (std::variant_size_v<V> == 0) {
+				return V();
+			}
+			else {
+				// using T = std::variant_alternative_t<0, V>;
+				std::abort();
+				// return V(std::in_place_index<0>, stack::get<T>(L, index, tracking));
+			}
+		}
+
+		template <std::size_t I>
+		static V get_one(std::integral_constant<std::size_t, I>, lua_State* L, int index, record& tracking) {
+			typedef std::variant_alternative_t<I, V> T;
+			record temp_tracking = tracking;
+			if (stack::check<T>(L, index, &no_panic, temp_tracking)) {
+				tracking = temp_tracking;
+				return V(std::in_place_index<I>, stack::get<T>(L, index));
+			}
+			return get_one(std::integral_constant<std::size_t, I + 1>(), L, index, tracking);
+		}
+
+		static V get(lua_State* L, int index, record& tracking) {
+			return get_one(std::integral_constant<std::size_t, 0>(), L, index, tracking);
+		}
+	};
+#endif // variant
+
+}} // namespace sol::stack
+
+// end of sol/stack_get_unqualified.hpp
+
+// beginning of sol/stack_get_qualified.hpp
+
+namespace sol { namespace stack {
+
+	// There are no more enable_ifs that can be used here,
+	// so this is just for posterity, I guess?
+	// maybe I'll fill this file in later.
+
+}} // namespace sol::stack
+
+// end of sol/stack_get_qualified.hpp
+
+// end of sol/stack_get.hpp
+
+// beginning of sol/stack_check_get.hpp
+
+// beginning of sol/stack_check_get_unqualified.hpp
+
+#include <cstdlib>
+#include <cmath>
+#include <optional>
+#if SOL_IS_ON(SOL_STD_VARIANT)
+#include <variant>
+#endif // variant shenanigans (thanks, Mac OSX)
+
+namespace sol { namespace stack {
+	template <typename T, typename>
+	struct unqualified_check_getter {
+		typedef decltype(stack_detail::unchecked_unqualified_get<T>(nullptr, -1, std::declval<record&>())) R;
+
+		template <typename Optional, typename Handler>
+		static Optional get_using(lua_State* L, int index, Handler&& handler, record& tracking) {
+			if constexpr (!meta::meta_detail::is_adl_sol_lua_check_v<T> && !meta::meta_detail::is_adl_sol_lua_get_v<T>) {
+				if constexpr (is_lua_reference_v<T>) {
+					if constexpr (is_global_table_v<T>) {
+						(void)L;
+						(void)index;
+						(void)handler;
+						tracking.use(1);
+						return true;
+					}
+					else {
+						// actually check if it's none here, otherwise
+						// we'll have a none object inside an optional!
+						bool success = lua_isnoneornil(L, index) == 0 && stack::check<T>(L, index, &no_panic);
+						if (!success) {
+							// expected type, actual type
+							tracking.use(static_cast<int>(success));
+							handler(L, index, type::poly, type_of(L, index), "");
+							return detail::associated_nullopt_v<Optional>;
+						}
+						return stack_detail::unchecked_get<T>(L, index, tracking);
+					}
+				}
+				else if constexpr ((std::is_integral_v<T> || std::is_same_v<T, lua_Integer>)&&!std::is_same_v<T, bool>) {
+#if SOL_LUA_VERSION_I_ >= 503
+					if (lua_isinteger(L, index) != 0) {
+						tracking.use(1);
+						return static_cast<T>(lua_tointeger(L, index));
+					}
+#endif
+					int isnum = 0;
+					const lua_Number value = lua_tonumberx(L, index, &isnum);
+					if (isnum != 0) {
+#if SOL_IS_ON(SOL_NUMBER_PRECISION_CHECKS)
+						const auto integer_value = llround(value);
+						if (static_cast<lua_Number>(integer_value) == value) {
+							tracking.use(1);
+							return static_cast<T>(integer_value);
+						}
+#else
+						tracking.use(1);
+						return static_cast<T>(value);
+#endif
+					}
+					const type t = type_of(L, index);
+					tracking.use(static_cast<int>(t != type::none));
+					handler(L, index, type::number, t, "not an integer");
+					return detail::associated_nullopt_v<Optional>;
+				}
+				else if constexpr (std::is_floating_point_v<T> || std::is_same_v<T, lua_Number>) {
+					int isnum = 0;
+					lua_Number value = lua_tonumberx(L, index, &isnum);
+					if (isnum == 0) {
+						type t = type_of(L, index);
+						tracking.use(static_cast<int>(t != type::none));
+						handler(L, index, type::number, t, "not a valid floating point number");
+						return detail::associated_nullopt_v<Optional>;
+					}
+					tracking.use(1);
+					return static_cast<T>(value);
+				}
+				else if constexpr (std::is_enum_v<T> && !meta::any_same_v<T, meta_function, type>) {
+					int isnum = 0;
+					lua_Integer value = lua_tointegerx(L, index, &isnum);
+					if (isnum == 0) {
+						type t = type_of(L, index);
+						tracking.use(static_cast<int>(t != type::none));
+						handler(L, index, type::number, t, "not a valid enumeration value");
+						return detail::associated_nullopt_v<Optional>;
+					}
+					tracking.use(1);
+					return static_cast<T>(value);
+				}
+				else {
+					if (!unqualified_check<T>(L, index, std::forward<Handler>(handler))) {
+						tracking.use(static_cast<int>(!lua_isnone(L, index)));
+						return detail::associated_nullopt_v<Optional>;
+					}
+					return stack_detail::unchecked_unqualified_get<T>(L, index, tracking);
+				}
+			}
+			else {
+				if (!unqualified_check<T>(L, index, std::forward<Handler>(handler))) {
+					tracking.use(static_cast<int>(!lua_isnone(L, index)));
+					return detail::associated_nullopt_v<Optional>;
+				}
+				return stack_detail::unchecked_unqualified_get<T>(L, index, tracking);
+			}
+		}
+
+		template <typename Handler>
+		static optional<R> get(lua_State* L, int index, Handler&& handler, record& tracking) {
+			return get_using<optional<R>>(L, index, std::forward<Handler>(handler), tracking);
+		}
+	};
+
+#if SOL_IS_ON(SOL_STD_VARIANT)
+	template <typename... Tn, typename C>
+	struct unqualified_check_getter<std::variant<Tn...>, C> {
+		typedef std::variant<Tn...> V;
+		typedef std::variant_size<V> V_size;
+		typedef std::integral_constant<bool, V_size::value == 0> V_is_empty;
+
+		template <typename Handler>
+		static optional<V> get_empty(std::true_type, lua_State*, int, Handler&&, record&) {
+			return nullopt;
+		}
+
+		template <typename Handler>
+		static optional<V> get_empty(std::false_type, lua_State* L, int index, Handler&& handler, record&) {
+			// This should never be reached...
+			// please check your code and understand what you did to bring yourself here
+			// maybe file a bug report, or 5
+			handler(
+				L, index, type::poly, type_of(L, index), "this variant code should never be reached: if it has, you have done something so terribly wrong");
+			return nullopt;
+		}
+
+		template <typename Handler>
+		static optional<V> get_one(std::integral_constant<std::size_t, 0>, lua_State* L, int index, Handler&& handler, record& tracking) {
+			return get_empty(V_is_empty(), L, index, std::forward<Handler>(handler), tracking);
+		}
+
+		template <std::size_t I, typename Handler>
+		static optional<V> get_one(std::integral_constant<std::size_t, I>, lua_State* L, int index, Handler&& handler, record& tracking) {
+			typedef std::variant_alternative_t<I - 1, V> T;
+			if (stack::check<T>(L, index, &no_panic, tracking)) {
+				return V(std::in_place_index<I - 1>, stack::get<T>(L, index));
+			}
+			return get_one(std::integral_constant<std::size_t, I - 1>(), L, index, std::forward<Handler>(handler), tracking);
+		}
+
+		template <typename Handler>
+		static optional<V> get(lua_State* L, int index, Handler&& handler, record& tracking) {
+			return get_one(std::integral_constant<std::size_t, V_size::value>(), L, index, std::forward<Handler>(handler), tracking);
+		}
+	};
+#endif // standard variant
+}}     // namespace sol::stack
+
+// end of sol/stack_check_get_unqualified.hpp
+
+// beginning of sol/stack_check_get_qualified.hpp
+
+namespace sol { namespace stack {
+
+#if SOL_IS_ON(SOL_COMPILER_GCC)
+#pragma GCC diagnostic push
+#if !SOL_IS_ON(SOL_COMPILER_CLANG)
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif
+#endif
+
+	namespace stack_detail {
+		template <typename OptionalType, typename T, typename Handler>
+		OptionalType get_optional(lua_State* L, int index, Handler&& handler, record& tracking) {
+			using Tu = meta::unqualified_t<T>;
+
+			if constexpr (is_lua_reference_v<T>) {
+				if constexpr (is_global_table_v<Tu>) {
+					(void)L;
+					(void)index;
+					(void)handler;
+					tracking.use(1);
+					return true;
+				}
+				else {
+					// actually check if it's none here, otherwise
+					// we'll have a none object inside an optional!
+					bool success = lua_isnoneornil(L, index) == 0 && stack::check<T>(L, index, &no_panic);
+					if (!success) {
+						// expected type, actual type
+						tracking.use(static_cast<int>(success));
+						handler(L, index, type::poly, type_of(L, index), "");
+						return {};
+					}
+					return OptionalType(stack_detail::unchecked_get<T>(L, index, tracking));
+				}
+			}
+			else if constexpr (!std::is_reference_v<T> && is_unique_usertype_v<Tu> && !is_actual_type_rebindable_for_v<Tu>) {
+				// we can take shortcuts here to save on separate checking, and just return nullopt!
+				using element = unique_usertype_element_t<Tu>;
+				using actual = unique_usertype_actual_t<Tu>;
+				tracking.use(1);
+				void* memory = lua_touserdata(L, index);
+				memory = detail::align_usertype_unique_destructor(memory);
+				detail::unique_destructor& pdx = *static_cast<detail::unique_destructor*>(memory);
+				if (&detail::usertype_unique_alloc_destroy<element, Tu> == pdx) {
+					memory = detail::align_usertype_unique_tag<true, false>(memory);
+					memory = detail::align_usertype_unique<actual, true, false>(memory);
+					actual* mem = static_cast<actual*>(memory);
+					return static_cast<actual>(*mem);
+				}
+				if constexpr (!derive<element>::value) {
+					return OptionalType();
+				}
+				else {
+					memory = detail::align_usertype_unique_tag<true, false>(memory);
+					detail::unique_tag& ic = *reinterpret_cast<detail::unique_tag*>(memory);
+					memory = detail::align_usertype_unique<actual, true, false>(memory);
+					string_view ti = usertype_traits<element>::qualified_name();
+					int cast_operation;
+					actual r {};
+					if constexpr (is_actual_type_rebindable_for_v<Tu>) {
+						using rebound_actual_type = unique_usertype_rebind_actual_t<Tu, void>;
+						string_view rebind_ti = usertype_traits<rebound_actual_type>::qualified_name();
+						cast_operation = ic(memory, &r, ti, rebind_ti);
+					}
+					else {
+						string_view rebind_ti("");
+						cast_operation = ic(memory, &r, ti, rebind_ti);
+					}
+					switch (cast_operation) {
+					case 1: {
+						// it's a perfect match,
+						// alias memory directly
+						actual* mem = static_cast<actual*>(memory);
+						return OptionalType(*mem);
+					}
+					case 2:
+						// it's a base match, return the
+						// aliased creation
+						return OptionalType(std::move(r));
+					default:
+						break;
+					}
+					return OptionalType();
+				}
+			}
+			else {
+				if (!check<T>(L, index, std::forward<Handler>(handler))) {
+					tracking.use(static_cast<int>(!lua_isnone(L, index)));
+					return OptionalType();
+				}
+				return OptionalType(stack_detail::unchecked_get<T>(L, index, tracking));
+			}
+		}
+	} // namespace stack_detail
+
+#if SOL_IS_ON(SOL_COMPILER_GCC)
+#pragma GCC diagnostic pop
+#endif
+
+	template <typename T, typename>
+	struct qualified_check_getter {
+		typedef decltype(stack_detail::unchecked_get<T>(nullptr, -1, std::declval<record&>())) R;
+
+		template <typename Handler>
+		optional<R> get(lua_State* L, int index, Handler&& handler, record& tracking) {
+			return stack_detail::get_optional<optional<R>, T>(L, index, std::forward<Handler>(handler), tracking);
+		}
+	};
+
+	template <typename Optional>
+	struct qualified_getter<Optional, std::enable_if_t<meta::is_optional_v<Optional>>> {
+		static Optional get(lua_State* L, int index, record& tracking) {
+			using T = typename meta::unqualified_t<Optional>::value_type;
+			return stack_detail::get_optional<Optional, T>(L, index, &no_panic, tracking);
+		}
+	};
+
+}} // namespace sol::stack
+
+// end of sol/stack_check_get_qualified.hpp
+
+// end of sol/stack_check_get.hpp
+
+// beginning of sol/stack_push.hpp
+
+#include <memory>
+#include <type_traits>
+#include <cassert>
+#include <limits>
+#include <cmath>
+#include <string_view>
+#if SOL_IS_ON(SOL_STD_VARIANT)
+#include <variant>
+#endif // Can use variant
+
+// beginning of sol/debug.hpp
+
+#include <iostream>
+
+namespace sol { namespace detail { namespace debug {
+	inline std::string dump_types(lua_State* L) {
+		std::string visual;
+		std::size_t size = lua_gettop(L) + 1;
+		for (std::size_t i = 1; i < size; ++i) {
+			if (i != 1) {
+				visual += " | ";
+			}
+			visual += type_name(L, stack::get<type>(L, static_cast<int>(i)));
+		}
+		return visual;
+	}
+
+	inline void print_stack(lua_State* L) {
+		std::cout << dump_types(L) << std::endl;
+	}
+
+	inline void print_section(const std::string& message, lua_State* L) {
+		std::cout << "-- " << message << " -- [ " << dump_types(L) << " ]" << std::endl;
+	}
+}}} // namespace sol::detail::debug
+
+// end of sol/debug.hpp
+
+namespace sol { namespace stack {
+	namespace stack_detail {
+		template <typename T>
+		inline bool integer_value_fits(const T& value) {
+			// We check if we can rely on casts or a lack of padding bits to satisfy
+			// the requirements here
+			// If it lacks padding bits, we can jump back and forth between lua_Integer and whatever type without
+			// loss of information
+			constexpr bool is_same_signedness
+				= (std::is_signed_v<T> && std::is_signed_v<lua_Integer>) || (std::is_unsigned_v<T> && std::is_unsigned_v<lua_Integer>);
+			constexpr bool probaby_fits_within_lua_Integer = sizeof(T) == sizeof(lua_Integer)
+#if SOL_IS_ON(SOL_ALL_INTEGER_VALUES_FIT)
+				&& ((std::has_unique_object_representations_v<T> && std::has_unique_object_representations_v<lua_Integer>) ? true : is_same_signedness)
+#else
+				&& is_same_signedness
+#endif
+				;
+			if constexpr (sizeof(T) < sizeof(lua_Integer) || probaby_fits_within_lua_Integer) {
+				(void)value;
+				return true;
+			}
+			else {
+				auto u_min = static_cast<std::intmax_t>((std::numeric_limits<lua_Integer>::min)());
+				auto u_max = static_cast<std::uintmax_t>((std::numeric_limits<lua_Integer>::max)());
+				auto t_min = static_cast<std::intmax_t>((std::numeric_limits<T>::min)());
+				auto t_max = static_cast<std::uintmax_t>((std::numeric_limits<T>::max)());
+				return (u_min <= t_min || value >= static_cast<T>(u_min)) && (u_max >= t_max || value <= static_cast<T>(u_max));
+			}
+		}
+
+		template <typename T>
+		int msvc_is_ass_with_if_constexpr_push_enum(std::true_type, lua_State* L, const T& value) {
+			if constexpr (meta::any_same_v<std::underlying_type_t<T>,
+				              char
+#if SOL_IS_ON(SOL_CHAR8_T)
+				              ,
+				              char8_t
+#endif
+				              ,
+				              char16_t,
+				              char32_t>) {
+				if constexpr (std::is_signed_v<T>) {
+					return stack::push(L, static_cast<std::int_least32_t>(value));
+				}
+				else {
+					return stack::push(L, static_cast<std::uint_least32_t>(value));
+				}
+			}
+			else {
+				return stack::push(L, static_cast<std::underlying_type_t<T>>(value));
+			}
+		}
+
+		template <typename T>
+		int msvc_is_ass_with_if_constexpr_push_enum(std::false_type, lua_State*, const T&) {
+			return 0;
+		}
+	} // namespace stack_detail
+
+	inline int push_environment_of(lua_State* L, int target_index = -1) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+		luaL_checkstack(L, 1, detail::not_enough_stack_space_environment);
+#endif // make sure stack doesn't overflow
+#if SOL_LUA_VERSION_I_ < 502
+		// Use lua_getfenv
+		lua_getfenv(L, target_index);
+#else
+
+		if (lua_iscfunction(L, target_index) != 0) {
+			const char* maybe_upvalue_name = lua_getupvalue(L, target_index, 1);
+			if (maybe_upvalue_name != nullptr) {
+				// it worked, take this one
+				return 1;
+			}
+		}
+		// Nominally, we search for the `"_ENV"` value.
+		// If we don't find it.... uh, well. We've got a problem?
+		for (int upvalue_index = 1;; ++upvalue_index) {
+			const char* maybe_upvalue_name = lua_getupvalue(L, target_index, upvalue_index);
+			if (maybe_upvalue_name == nullptr) {
+				push(L, lua_nil);
+				break;
+			}
+
+			string_view upvalue_name(maybe_upvalue_name);
+			if (upvalue_name == "_ENV") {
+				// Keep this one!
+				break;
+			}
+			// Discard what we received, loop back around
+			lua_pop(L, 1);
+		}
+#endif
+		return 1;
+	}
+
+	template <typename T>
+	int push_environment_of(const T& target) {
+		lua_State* target_L = target.lua_state();
+		int target_index = absolute_index(target_L, -target.push());
+		int env_count = push_environment_of(target_L, target_index);
+		SOL_ASSERT(env_count == 1);
+		lua_rotate(target_L, target_index, 1);
+		lua_pop(target_L, 1);
+		return env_count;
+	}
+
+	template <typename T>
+	struct unqualified_pusher<detail::as_value_tag<T>> {
+		template <typename F, typename... Args>
+		static int push_fx(lua_State* L, F&& f, Args&&... args) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_userdata);
+#endif // make sure stack doesn't overflow
+       // Basically, we store all user-data like this:
+       // If it's a movable/copyable value (no std::ref(x)), then we store the pointer to the new
+       // data in the first sizeof(T*) bytes, and then however many bytes it takes to
+       // do the actual object. Things that are std::ref or plain T* are stored as
+       // just the sizeof(T*), and nothing else.
+			T* obj = detail::usertype_allocate<T>(L);
+			f();
+			std::allocator<T> alloc {};
+			std::allocator_traits<std::allocator<T>>::construct(alloc, obj, std::forward<Args>(args)...);
+			return 1;
+		}
+
+		template <typename K, typename... Args>
+		static int push_keyed(lua_State* L, K&& k, Args&&... args) {
+			stack_detail::undefined_metatable fx(L, &k[0], &stack::stack_detail::set_undefined_methods_on<T>);
+			return push_fx(L, fx, std::forward<Args>(args)...);
+		}
+
+		template <typename Arg, typename... Args>
+		static int push(lua_State* L, Arg&& arg, Args&&... args) {
+			if constexpr (std::is_same_v<meta::unqualified_t<Arg>, detail::with_function_tag>) {
+				(void)arg;
+				return push_fx(L, std::forward<Args>(args)...);
+			}
+			else {
+				return push_keyed(L, usertype_traits<T>::metatable(), std::forward<Arg>(arg), std::forward<Args>(args)...);
+			}
+		}
+
+		static int push(lua_State* L) {
+			return push_keyed(L, usertype_traits<T>::metatable());
+		}
+	};
+
+	template <typename T>
+	struct unqualified_pusher<detail::as_pointer_tag<T>> {
+		typedef meta::unqualified_t<T> U;
+
+		template <typename F>
+		static int push_fx(lua_State* L, F&& f, T* obj) {
+			if (obj == nullptr)
+				return stack::push(L, lua_nil);
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_userdata);
+#endif // make sure stack doesn't overflow
+			T** pref = detail::usertype_allocate_pointer<T>(L);
+			f();
+			*pref = obj;
+			return 1;
+		}
+
+		template <typename K>
+		static int push_keyed(lua_State* L, K&& k, T* obj) {
+			stack_detail::undefined_metatable fx(L, &k[0], &stack::stack_detail::set_undefined_methods_on<U*>);
+			return push_fx(L, fx, obj);
+		}
+
+		template <typename Arg, typename... Args>
+		static int push(lua_State* L, Arg&& arg, Args&&... args) {
+			if constexpr (std::is_same_v<meta::unqualified_t<Arg>, detail::with_function_tag>) {
+				(void)arg;
+				return push_fx(L, std::forward<Args>(args)...);
+			}
+			else {
+				return push_keyed(L, usertype_traits<U*>::metatable(), std::forward<Arg>(arg), std::forward<Args>(args)...);
+			}
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<detail::as_reference_tag> {
+		template <typename T>
+		static int push(lua_State* L, T&& obj) {
+			return stack::push(L, detail::ptr(obj));
+		}
+	};
+
+	namespace stack_detail {
+		template <typename T>
+		struct uu_pusher {
+			using element = unique_usertype_element_t<T>;
+			using actual = unique_usertype_actual_t<T>;
+
+			template <typename Arg, typename... Args>
+			static int push(lua_State* L, Arg&& arg, Args&&... args) {
+				if constexpr (std::is_base_of_v<actual, meta::unqualified_t<Arg>>) {
+					if (detail::unique_is_null(L, arg)) {
+						return stack::push(L, lua_nil);
+					}
+					return push_deep(L, std::forward<Arg>(arg), std::forward<Args>(args)...);
+				}
+				else {
+					return push_deep(L, std::forward<Arg>(arg), std::forward<Args>(args)...);
+				}
+			}
+
+			template <typename... Args>
+			static int push_deep(lua_State* L, Args&&... args) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+				luaL_checkstack(L, 1, detail::not_enough_stack_space_userdata);
+#endif // make sure stack doesn't overflow
+				element** pointer_to_memory = nullptr;
+				detail::unique_destructor* fx = nullptr;
+				detail::unique_tag* id = nullptr;
+				actual* typed_memory = detail::usertype_unique_allocate<element, actual>(L, pointer_to_memory, fx, id);
+				if (luaL_newmetatable(L, &usertype_traits<d::u<std::remove_cv_t<element>>>::metatable()[0]) == 1) {
+					detail::lua_reg_table registration_table {};
+					int index = 0;
+					detail::indexed_insert insert_callable(registration_table, index);
+					detail::insert_default_registrations<element>(insert_callable, detail::property_always_true);
+					registration_table[index] = { to_string(meta_function::garbage_collect).c_str(), detail::make_destructor<T>() };
+					luaL_setfuncs(L, registration_table, 0);
+				}
+				lua_setmetatable(L, -2);
+				*fx = detail::usertype_unique_alloc_destroy<element, actual>;
+				*id = &detail::inheritance<element>::template type_unique_cast<actual>;
+				detail::default_construct::construct(typed_memory, std::forward<Args>(args)...);
+				*pointer_to_memory = detail::unique_get<T>(L, *typed_memory);
+				return 1;
+			}
+		};
+	} // namespace stack_detail
+
+	template <typename T>
+	struct unqualified_pusher<detail::as_unique_tag<T>> {
+		template <typename... Args>
+		static int push(lua_State* L, Args&&... args) {
+			stack_detail::uu_pusher<T> p;
+			(void)p;
+			return p.push(L, std::forward<Args>(args)...);
+		}
+	};
+
+	template <typename T, typename>
+	struct unqualified_pusher {
+		template <typename... Args>
+		static int push(lua_State* L, Args&&... args) {
+			using Tu = meta::unqualified_t<T>;
+			if constexpr (is_lua_reference_v<Tu>) {
+				using int_arr = int[];
+				int_arr p { (std::forward<Args>(args).push(L))... };
+				return p[0];
+			}
+			else if constexpr (std::is_same_v<Tu, bool>) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+				luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+				lua_pushboolean(L, std::forward<Args>(args)...);
+				return 1;
+			}
+			else if constexpr (std::is_integral_v<Tu> || std::is_same_v<Tu, lua_Integer>) {
+				const Tu& value(std::forward<Args>(args)...);
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+				luaL_checkstack(L, 1, detail::not_enough_stack_space_integral);
+#endif // make sure stack doesn't overflow
+#if SOL_LUA_VERSION_I_ >= 503
+				if (stack_detail::integer_value_fits<Tu>(value)) {
+					lua_pushinteger(L, static_cast<lua_Integer>(value));
+					return 1;
+				}
+#endif // Lua 5.3 and above
+#if SOL_IS_ON(SOL_NUMBER_PRECISION_CHECKS)
+				if (static_cast<T>(llround(static_cast<lua_Number>(value))) != value) {
+#if SOL_IS_OFF(SOL_EXCEPTIONS)
+					// Is this really worth it?
+					SOL_ASSERT_MSG(false, "integer value will be misrepresented in lua");
+					lua_pushinteger(L, static_cast<lua_Integer>(value));
+					return 1;
+#else
+					throw error(detail::direct_error, "integer value will be misrepresented in lua");
+#endif // No Exceptions
+				}
+#endif // Safe Numerics and Number Precision Check
+				lua_pushnumber(L, static_cast<lua_Number>(value));
+				return 1;
+			}
+			else if constexpr (std::is_floating_point_v<Tu> || std::is_same_v<Tu, lua_Number>) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+				luaL_checkstack(L, 1, detail::not_enough_stack_space_floating);
+#endif // make sure stack doesn't overflow
+				lua_pushnumber(L, std::forward<Args>(args)...);
+				return 1;
+			}
+			else if constexpr (std::is_same_v<Tu, luaL_Stream*>) {
+				luaL_Stream* source { std::forward<Args>(args)... };
+				luaL_Stream* stream = static_cast<luaL_Stream*>(detail::alloc_newuserdata(L, sizeof(luaL_Stream)));
+				stream->f = source->f;
+#if SOL_IS_ON(SOL_LUAL_STREAM_USE_CLOSE_FUNCTION)
+				stream->closef = source->closef;
+#endif // LuaJIT and Lua 5.1 and below do not have
+				return 1;
+			}
+			else if constexpr (std::is_same_v<Tu, luaL_Stream>) {
+				luaL_Stream& source(std::forward<Args>(args)...);
+				luaL_Stream* stream = static_cast<luaL_Stream*>(detail::alloc_newuserdata(L, sizeof(luaL_Stream)));
+				stream->f = source.f;
+#if SOL_IS_ON(SOL_LUAL_STREAM_USE_CLOSE_FUNCTION)
+				stream->closef = source.closef;
+#endif // LuaJIT and Lua 5.1 and below do not have
+				return 1;
+			}
+			else if constexpr (std::is_enum_v<Tu>) {
+				return stack_detail::msvc_is_ass_with_if_constexpr_push_enum(std::true_type(), L, std::forward<Args>(args)...);
+			}
+			else if constexpr (std::is_pointer_v<Tu>) {
+				return stack::push<detail::as_pointer_tag<std::remove_pointer_t<T>>>(L, std::forward<Args>(args)...);
+			}
+			else if constexpr (is_unique_usertype_v<Tu>) {
+				return stack::push<detail::as_unique_tag<T>>(L, std::forward<Args>(args)...);
+			}
+			else {
+				return stack::push<detail::as_value_tag<T>>(L, std::forward<Args>(args)...);
+			}
+		}
+	};
+
+	template <typename T>
+	struct unqualified_pusher<std::reference_wrapper<T>> {
+		static int push(lua_State* L, const std::reference_wrapper<T>& t) {
+			return stack::push(L, std::addressof(detail::deref(t.get())));
+		}
+	};
+
+	template <typename T>
+	struct unqualified_pusher<detail::as_table_tag<T>> {
+		using has_kvp = meta::has_key_value_pair<meta::unqualified_t<std::remove_pointer_t<T>>>;
+
+		static int push(lua_State* L, const T& tablecont) {
+			return push(has_kvp(), std::false_type(), L, tablecont);
+		}
+
+		static int push(lua_State* L, const T& tablecont, nested_tag_t) {
+			return push(has_kvp(), std::true_type(), L, tablecont);
+		}
+
+		static int push(std::true_type, lua_State* L, const T& tablecont) {
+			return push(has_kvp(), std::true_type(), L, tablecont);
+		}
+
+		static int push(std::false_type, lua_State* L, const T& tablecont) {
+			return push(has_kvp(), std::false_type(), L, tablecont);
+		}
+
+		template <bool is_nested>
+		static int push(std::true_type, std::integral_constant<bool, is_nested>, lua_State* L, const T& tablecont) {
+			auto& cont = detail::deref(detail::unwrap(tablecont));
+			lua_createtable(L, static_cast<int>(cont.size()), 0);
+			int tableindex = lua_gettop(L);
+			for (const auto& pair : cont) {
+				if (is_nested) {
+					set_field(L, pair.first, as_nested_ref(pair.second), tableindex);
+				}
+				else {
+					set_field(L, pair.first, pair.second, tableindex);
+				}
+			}
+			return 1;
+		}
+
+		template <bool is_nested>
+		static int push(std::false_type, std::integral_constant<bool, is_nested>, lua_State* L, const T& tablecont) {
+			auto& cont = detail::deref(detail::unwrap(tablecont));
+			lua_createtable(L, stack_detail::get_size_hint(cont), 0);
+			int tableindex = lua_gettop(L);
+			std::size_t index = 1;
+			for (const auto& i : cont) {
+#if SOL_LUA_VERSION_I_ >= 503
+				int p = is_nested ? stack::push(L, as_nested_ref(i)) : stack::push(L, i);
+				for (int pi = 0; pi < p; ++pi) {
+					lua_seti(L, tableindex, static_cast<lua_Integer>(index++));
+				}
+#else
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+				luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+				lua_pushinteger(L, static_cast<lua_Integer>(index));
+				int p = is_nested ? stack::push(L, as_nested_ref(i)) : stack::push(L, i);
+				if (p == 1) {
+					++index;
+					lua_settable(L, tableindex);
+				}
+				else {
+					int firstindex = tableindex + 1 + 1;
+					for (int pi = 0; pi < p; ++pi) {
+						stack::push(L, index);
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+						luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+						lua_pushvalue(L, firstindex);
+						lua_settable(L, tableindex);
+						++index;
+						++firstindex;
+					}
+					lua_pop(L, 1 + p);
+				}
+#endif // Lua Version 5.3 and others
+			}
+			// TODO: figure out a better way to do this...?
+			// set_field(L, -1, cont.size());
+			return 1;
+		}
+	};
+
+	template <typename T>
+	struct unqualified_pusher<as_table_t<T>> {
+		static int push(lua_State* L, const as_table_t<T>& value_) {
+			using inner_t = std::remove_pointer_t<meta::unwrap_unqualified_t<T>>;
+			if constexpr (is_container_v<inner_t>) {
+				return stack::push<detail::as_table_tag<T>>(L, value_.value());
+			}
+			else {
+				return stack::push(L, value_.value());
+			}
+		}
+
+		static int push(lua_State* L, const T& value_) {
+			using inner_t = std::remove_pointer_t<meta::unwrap_unqualified_t<T>>;
+			if constexpr (is_container_v<inner_t>) {
+				return stack::push<detail::as_table_tag<T>>(L, value_);
+			}
+			else {
+				return stack::push(L, value_);
+			}
+		}
+	};
+
+	template <typename T>
+	struct unqualified_pusher<nested<T>> {
+		static int push(lua_State* L, const T& nested_value) noexcept {
+			using Tu = meta::unwrap_unqualified_t<T>;
+			using inner_t = std::remove_pointer_t<Tu>;
+			if constexpr (is_container_v<inner_t>) {
+				return stack::push<detail::as_table_tag<T>>(L, nested_value, nested_tag);
+			}
+			else {
+				return stack::push<Tu>(L, nested_value);
+			}
+		}
+
+		static int push(lua_State* L, const nested<T>& nested_wrapper_) noexcept {
+			using Tu = meta::unwrap_unqualified_t<T>;
+			using inner_t = std::remove_pointer_t<Tu>;
+			if constexpr (is_container_v<inner_t>) {
+				return stack::push<detail::as_table_tag<T>>(L, nested_wrapper_.value(), nested_tag);
+			}
+			else {
+				return stack::push<Tu>(L, nested_wrapper_.value());
+			}
+		}
+	};
+
+	template <typename T>
+	struct unqualified_pusher<std::initializer_list<T>> {
+		static int push(lua_State* L, const std::initializer_list<T>& il) noexcept {
+			unqualified_pusher<detail::as_table_tag<std::initializer_list<T>>> p {};
+			return p.push(L, il);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<lua_nil_t> {
+		static int push(lua_State* L, lua_nil_t) noexcept {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushnil(L);
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<stack_count> {
+		static int push(lua_State*, stack_count st) noexcept {
+			return st.count;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<metatable_key_t> {
+		static int push(lua_State* L, metatable_key_t) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushlstring(L, to_string(meta_function::metatable).c_str(), 4);
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<std::remove_pointer_t<lua_CFunction>> {
+		static int push(lua_State* L, lua_CFunction func, int n = 0) noexcept {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushcclosure(L, func, n);
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<lua_CFunction> {
+		static int push(lua_State* L, lua_CFunction func, int n = 0) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushcclosure(L, func, n);
+			return 1;
+		}
+	};
+
+#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE)
+	template <>
+	struct unqualified_pusher<std::remove_pointer_t<detail::lua_CFunction_noexcept>> {
+		static int push(lua_State* L, detail::lua_CFunction_noexcept func, int n = 0) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushcclosure(L, func, n);
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<detail::lua_CFunction_noexcept> {
+		static int push(lua_State* L, detail::lua_CFunction_noexcept func, int n = 0) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushcclosure(L, func, n);
+			return 1;
+		}
+	};
+#endif // noexcept function type
+
+	template <>
+	struct unqualified_pusher<c_closure> {
+		static int push(lua_State* L, c_closure cc) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushcclosure(L, cc.c_function, cc.upvalues);
+			return 1;
+		}
+	};
+
+	template <typename Arg, typename... Args>
+	struct unqualified_pusher<closure<Arg, Args...>> {
+		template <std::size_t... I, typename T>
+		static int push(std::index_sequence<I...>, lua_State* L, T&& c) {
+			using f_tuple = decltype(std::forward<T>(c).upvalues);
+			int pushcount = multi_push(L, std::get<I>(std::forward<f_tuple>(std::forward<T>(c).upvalues))...);
+			return stack::push(L, c_closure(c.c_function, pushcount));
+		}
+
+		template <typename T>
+		static int push(lua_State* L, T&& c) {
+			return push(std::make_index_sequence<1 + sizeof...(Args)>(), L, std::forward<T>(c));
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<void*> {
+		static int push(lua_State* L, void* userdata) noexcept {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushlightuserdata(L, userdata);
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<const void*> {
+		static int push(lua_State* L, const void* userdata) noexcept {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushlightuserdata(L, const_cast<void*>(userdata));
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<lightuserdata_value> {
+		static int push(lua_State* L, lightuserdata_value userdata) noexcept {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushlightuserdata(L, userdata);
+			return 1;
+		}
+	};
+
+	template <typename T>
+	struct unqualified_pusher<light<T>> {
+		static int push(lua_State* L, light<T> l) noexcept {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushlightuserdata(L, static_cast<void*>(l.value()));
+			return 1;
+		}
+	};
+
+	template <typename T>
+	struct unqualified_pusher<user<T>> {
+		template <bool with_meta = true, typename Key, typename... Args>
+		static int push_with(lua_State* L, Key&& name, Args&&... args) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_userdata);
+#endif // make sure stack doesn't overflow
+       // A dumb pusher
+			T* data = detail::user_allocate<T>(L);
+			if (with_meta) {
+				// Make sure we have a plain GC set for this data
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+				luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+				if (luaL_newmetatable(L, name) != 0) {
+					lua_CFunction cdel = detail::user_alloc_destroy<T>;
+					lua_pushcclosure(L, cdel, 0);
+					lua_setfield(L, -2, "__gc");
+				}
+				lua_setmetatable(L, -2);
+			}
+			std::allocator<T> alloc {};
+			std::allocator_traits<std::allocator<T>>::construct(alloc, data, std::forward<Args>(args)...);
+			return 1;
+		}
+
+		template <typename Arg, typename... Args>
+		static int push(lua_State* L, Arg&& arg, Args&&... args) {
+			if constexpr (std::is_same_v<meta::unqualified_t<Arg>, metatable_key_t>) {
+				const auto name = &arg[0];
+				return push_with<true>(L, name, std::forward<Args>(args)...);
+			}
+			else if constexpr (std::is_same_v<meta::unqualified_t<Arg>, no_metatable_t>) {
+				(void)arg;
+				const auto name = &usertype_traits<meta::unqualified_t<T>>::user_gc_metatable()[0];
+				return push_with<false>(L, name, std::forward<Args>(args)...);
+			}
+			else {
+				const auto name = &usertype_traits<meta::unqualified_t<T>>::user_gc_metatable()[0];
+				return push_with(L, name, std::forward<Arg>(arg), std::forward<Args>(args)...);
+			}
+		}
+
+		static int push(lua_State* L, const user<T>& u) {
+			const auto name = &usertype_traits<meta::unqualified_t<T>>::user_gc_metatable()[0];
+			return push_with(L, name, u.value);
+		}
+
+		static int push(lua_State* L, user<T>&& u) {
+			const auto name = &usertype_traits<meta::unqualified_t<T>>::user_gc_metatable()[0];
+			return push_with(L, name, std::move(u.value()));
+		}
+
+		static int push(lua_State* L, no_metatable_t, const user<T>& u) {
+			const auto name = &usertype_traits<meta::unqualified_t<T>>::user_gc_metatable()[0];
+			return push_with<false>(L, name, u.value());
+		}
+
+		static int push(lua_State* L, no_metatable_t, user<T>&& u) {
+			const auto name = &usertype_traits<meta::unqualified_t<T>>::user_gc_metatable()[0];
+			return push_with<false>(L, name, std::move(u.value()));
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<userdata_value> {
+		static int push(lua_State* L, userdata_value data) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_userdata);
+#endif // make sure stack doesn't overflow
+			void** ud = detail::usertype_allocate_pointer<void>(L);
+			*ud = data.value();
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<const char*> {
+		static int push_sized(lua_State* L, const char* str, std::size_t len) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_string);
+#endif // make sure stack doesn't overflow
+			lua_pushlstring(L, str, len);
+			return 1;
+		}
+
+		static int push(lua_State* L, const char* str) {
+			if (str == nullptr)
+				return stack::push(L, lua_nil);
+			return push_sized(L, str, std::char_traits<char>::length(str));
+		}
+
+		static int push(lua_State* L, const char* strb, const char* stre) {
+			return push_sized(L, strb, static_cast<std::size_t>(stre - strb));
+		}
+
+		static int push(lua_State* L, const char* str, std::size_t len) {
+			return push_sized(L, str, len);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<char*> {
+		static int push_sized(lua_State* L, const char* str, std::size_t len) {
+			unqualified_pusher<const char*> p {};
+			(void)p;
+			return p.push_sized(L, str, len);
+		}
+
+		static int push(lua_State* L, const char* str) {
+			unqualified_pusher<const char*> p {};
+			(void)p;
+			return p.push(L, str);
+		}
+
+		static int push(lua_State* L, const char* strb, const char* stre) {
+			unqualified_pusher<const char*> p {};
+			(void)p;
+			return p.push(L, strb, stre);
+		}
+
+		static int push(lua_State* L, const char* str, std::size_t len) {
+			unqualified_pusher<const char*> p {};
+			(void)p;
+			return p.push(L, str, len);
+		}
+	};
+
+	template <size_t N>
+	struct unqualified_pusher<char[N]> {
+		static int push(lua_State* L, const char (&str)[N]) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_string);
+#endif // make sure stack doesn't overflow
+			lua_pushlstring(L, str, std::char_traits<char>::length(str));
+			return 1;
+		}
+
+		static int push(lua_State* L, const char (&str)[N], std::size_t sz) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_string);
+#endif // make sure stack doesn't overflow
+			lua_pushlstring(L, str, sz);
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<char> {
+		static int push(lua_State* L, char c) {
+			const char str[2] = { c, '\0' };
+			return stack::push(L, static_cast<const char*>(str), 1u);
+		}
+	};
+
+#if SOL_IS_ON(SOL_CHAR8_T)
+	template <>
+	struct unqualified_pusher<const char8_t*> {
+		static int push_sized(lua_State* L, const char8_t* str, std::size_t len) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_string);
+#endif // make sure stack doesn't overflow
+			lua_pushlstring(L, reinterpret_cast<const char*>(str), len);
+			return 1;
+		}
+
+		static int push(lua_State* L, const char8_t* str) {
+			if (str == nullptr)
+				return stack::push(L, lua_nil);
+			return push_sized(L, str, std::char_traits<char>::length(reinterpret_cast<const char*>(str)));
+		}
+
+		static int push(lua_State* L, const char8_t* strb, const char8_t* stre) {
+			return push_sized(L, strb, static_cast<std::size_t>(stre - strb));
+		}
+
+		static int push(lua_State* L, const char8_t* str, std::size_t len) {
+			return push_sized(L, str, len);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<char8_t*> {
+		static int push_sized(lua_State* L, const char8_t* str, std::size_t len) {
+			unqualified_pusher<const char8_t*> p {};
+			(void)p;
+			return p.push_sized(L, str, len);
+		}
+
+		static int push(lua_State* L, const char8_t* str) {
+			unqualified_pusher<const char8_t*> p {};
+			(void)p;
+			return p.push(L, str);
+		}
+
+		static int push(lua_State* L, const char8_t* strb, const char8_t* stre) {
+			unqualified_pusher<const char8_t*> p {};
+			(void)p;
+			return p.push(L, strb, stre);
+		}
+
+		static int push(lua_State* L, const char8_t* str, std::size_t len) {
+			unqualified_pusher<const char8_t*> p {};
+			(void)p;
+			return p.push(L, str, len);
+		}
+	};
+
+	template <size_t N>
+	struct unqualified_pusher<char8_t[N]> {
+		static int push(lua_State* L, const char8_t (&str)[N]) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_string);
+#endif // make sure stack doesn't overflow
+			const char* str_as_char = reinterpret_cast<const char*>(static_cast<const char8_t*>(str));
+			lua_pushlstring(L, str_as_char, std::char_traits<char>::length(str_as_char));
+			return 1;
+		}
+
+		static int push(lua_State* L, const char8_t (&str)[N], std::size_t sz) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_string);
+#endif // make sure stack doesn't overflow
+			lua_pushlstring(L, str, sz);
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<char8_t> {
+		static int push(lua_State* L, char8_t c) {
+			const char8_t str[2] = { c, '\0' };
+			return stack::push(L, static_cast<const char8_t*>(str), 1u);
+		}
+	};
+#endif // char8_t
+
+	template <typename Ch, typename Traits, typename Al>
+	struct unqualified_pusher<std::basic_string<Ch, Traits, Al>> {
+		static int push(lua_State* L, const std::basic_string<Ch, Traits, Al>& str) {
+			if constexpr (!std::is_same_v<Ch, char>) {
+				return stack::push(L, str.data(), str.size());
+			}
+			else {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+				luaL_checkstack(L, 1, detail::not_enough_stack_space_string);
+#endif // make sure stack doesn't overflow
+				lua_pushlstring(L, str.c_str(), str.size());
+				return 1;
+			}
+		}
+
+		static int push(lua_State* L, const std::basic_string<Ch, Traits, Al>& str, std::size_t sz) {
+			if constexpr (!std::is_same_v<Ch, char>) {
+				return stack::push(L, str.data(), sz);
+			}
+			else {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+				luaL_checkstack(L, 1, detail::not_enough_stack_space_string);
+#endif // make sure stack doesn't overflow
+				lua_pushlstring(L, str.c_str(), sz);
+				return 1;
+			}
+		}
+	};
+
+	template <typename Ch, typename Traits>
+	struct unqualified_pusher<basic_string_view<Ch, Traits>> {
+		static int push(lua_State* L, const basic_string_view<Ch, Traits>& sv) {
+			return stack::push(L, sv.data(), sv.length());
+		}
+
+		static int push(lua_State* L, const basic_string_view<Ch, Traits>& sv, std::size_t n) {
+			return stack::push(L, sv.data(), n);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<meta_function> {
+		static int push(lua_State* L, meta_function m) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_meta_function_name);
+#endif // make sure stack doesn't overflow
+			const std::string& str = to_string(m);
+			lua_pushlstring(L, str.c_str(), str.size());
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<absolute_index> {
+		static int push(lua_State* L, absolute_index ai) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushvalue(L, ai);
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<raw_index> {
+		static int push(lua_State* L, raw_index ri) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushvalue(L, ri);
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<ref_index> {
+		static int push(lua_State* L, ref_index ri) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_rawgeti(L, LUA_REGISTRYINDEX, ri);
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<const wchar_t*> {
+		static int push(lua_State* L, const wchar_t* wstr) {
+			return push(L, wstr, std::char_traits<wchar_t>::length(wstr));
+		}
+
+		static int push(lua_State* L, const wchar_t* wstr, std::size_t sz) {
+			return push(L, wstr, wstr + sz);
+		}
+
+		static int push(lua_State* L, const wchar_t* strb, const wchar_t* stre) {
+			if constexpr (sizeof(wchar_t) == 2) {
+				const char16_t* sb = reinterpret_cast<const char16_t*>(strb);
+				const char16_t* se = reinterpret_cast<const char16_t*>(stre);
+				return stack::push(L, sb, se);
+			}
+			else {
+				const char32_t* sb = reinterpret_cast<const char32_t*>(strb);
+				const char32_t* se = reinterpret_cast<const char32_t*>(stre);
+				return stack::push(L, sb, se);
+			}
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<wchar_t*> {
+		static int push(lua_State* L, const wchar_t* str) {
+			unqualified_pusher<const wchar_t*> p {};
+			(void)p;
+			return p.push(L, str);
+		}
+
+		static int push(lua_State* L, const wchar_t* strb, const wchar_t* stre) {
+			unqualified_pusher<const wchar_t*> p {};
+			(void)p;
+			return p.push(L, strb, stre);
+		}
+
+		static int push(lua_State* L, const wchar_t* str, std::size_t len) {
+			unqualified_pusher<const wchar_t*> p {};
+			(void)p;
+			return p.push(L, str, len);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<const char16_t*> {
+		static int convert_into(lua_State* L, char* start, std::size_t, const char16_t* strb, const char16_t* stre) {
+			char* target = start;
+			char32_t cp = 0;
+			for (const char16_t* strtarget = strb; strtarget < stre;) {
+				auto dr = unicode::utf16_to_code_point(strtarget, stre);
+				if (dr.error != unicode::error_code::ok) {
+					cp = unicode::unicode_detail::replacement;
+				}
+				else {
+					cp = dr.codepoint;
+				}
+				auto er = unicode::code_point_to_utf8(cp);
+				const char* utf8data = er.code_units.data();
+				std::memcpy(target, utf8data, er.code_units_size);
+				target += er.code_units_size;
+				strtarget = dr.next;
+			}
+
+			return stack::push(L, start, target);
+		}
+
+		static int push(lua_State* L, const char16_t* u16str) {
+			return push(L, u16str, std::char_traits<char16_t>::length(u16str));
+		}
+
+		static int push(lua_State* L, const char16_t* u16str, std::size_t sz) {
+			return push(L, u16str, u16str + sz);
+		}
+
+		static int push(lua_State* L, const char16_t* strb, const char16_t* stre) {
+			char sbo[SOL_OPTIMIZATION_STRING_CONVERSION_STACK_SIZE_I_];
+			// if our max string space is small enough, use SBO
+			// right off the bat
+			std::size_t max_possible_code_units = static_cast<std::size_t>(static_cast<std::size_t>(stre - strb) * static_cast<std::size_t>(4));
+			if (max_possible_code_units <= SOL_OPTIMIZATION_STRING_CONVERSION_STACK_SIZE_I_) {
+				return convert_into(L, sbo, max_possible_code_units, strb, stre);
+			}
+			// otherwise, we must manually count/check size
+			std::size_t needed_size = 0;
+			for (const char16_t* strtarget = strb; strtarget < stre;) {
+				auto dr = unicode::utf16_to_code_point(strtarget, stre);
+				auto er = unicode::code_point_to_utf8(dr.codepoint);
+				needed_size += er.code_units_size;
+				strtarget = dr.next;
+			}
+			if (needed_size < SOL_OPTIMIZATION_STRING_CONVERSION_STACK_SIZE_I_) {
+				return convert_into(L, sbo, needed_size, strb, stre);
+			}
+			std::string u8str("", 0);
+			u8str.resize(needed_size);
+			char* target = const_cast<char*>(u8str.data());
+			return convert_into(L, target, needed_size, strb, stre);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<char16_t*> {
+		static int push(lua_State* L, const char16_t* str) {
+			unqualified_pusher<const char16_t*> p {};
+			(void)p;
+			return p.push(L, str);
+		}
+
+		static int push(lua_State* L, const char16_t* strb, const char16_t* stre) {
+			unqualified_pusher<const char16_t*> p {};
+			(void)p;
+			return p.push(L, strb, stre);
+		}
+
+		static int push(lua_State* L, const char16_t* str, std::size_t len) {
+			unqualified_pusher<const char16_t*> p {};
+			(void)p;
+			return p.push(L, str, len);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<const char32_t*> {
+		static int convert_into(lua_State* L, char* start, std::size_t, const char32_t* strb, const char32_t* stre) {
+			char* target = start;
+			char32_t cp = 0;
+			for (const char32_t* strtarget = strb; strtarget < stre;) {
+				auto dr = unicode::utf32_to_code_point(strtarget, stre);
+				if (dr.error != unicode::error_code::ok) {
+					cp = unicode::unicode_detail::replacement;
+				}
+				else {
+					cp = dr.codepoint;
+				}
+				auto er = unicode::code_point_to_utf8(cp);
+				const char* data = er.code_units.data();
+				std::memcpy(target, data, er.code_units_size);
+				target += er.code_units_size;
+				strtarget = dr.next;
+			}
+			return stack::push(L, start, target);
+		}
+
+		static int push(lua_State* L, const char32_t* u32str) {
+			return push(L, u32str, u32str + std::char_traits<char32_t>::length(u32str));
+		}
+
+		static int push(lua_State* L, const char32_t* u32str, std::size_t sz) {
+			return push(L, u32str, u32str + sz);
+		}
+
+		static int push(lua_State* L, const char32_t* strb, const char32_t* stre) {
+			char sbo[SOL_OPTIMIZATION_STRING_CONVERSION_STACK_SIZE_I_];
+			// if our max string space is small enough, use SBO
+			// right off the bat
+			std::size_t max_possible_code_units = static_cast<std::size_t>(static_cast<std::size_t>(stre - strb) * static_cast<std::size_t>(4));
+			if (max_possible_code_units <= SOL_OPTIMIZATION_STRING_CONVERSION_STACK_SIZE_I_) {
+				return convert_into(L, sbo, max_possible_code_units, strb, stre);
+			}
+			// otherwise, we must manually count/check size
+			std::size_t needed_size = 0;
+			for (const char32_t* strtarget = strb; strtarget < stre;) {
+				auto dr = unicode::utf32_to_code_point(strtarget, stre);
+				auto er = unicode::code_point_to_utf8(dr.codepoint);
+				needed_size += er.code_units_size;
+				strtarget = dr.next;
+			}
+			if (needed_size < SOL_OPTIMIZATION_STRING_CONVERSION_STACK_SIZE_I_) {
+				return convert_into(L, sbo, needed_size, strb, stre);
+			}
+			std::string u8str("", 0);
+			u8str.resize(needed_size);
+			char* target = const_cast<char*>(u8str.data());
+			return convert_into(L, target, needed_size, strb, stre);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<char32_t*> {
+		static int push(lua_State* L, const char32_t* str) {
+			unqualified_pusher<const char32_t*> p {};
+			(void)p;
+			return p.push(L, str);
+		}
+
+		static int push(lua_State* L, const char32_t* strb, const char32_t* stre) {
+			unqualified_pusher<const char32_t*> p {};
+			(void)p;
+			return p.push(L, strb, stre);
+		}
+
+		static int push(lua_State* L, const char32_t* str, std::size_t len) {
+			unqualified_pusher<const char32_t*> p {};
+			(void)p;
+			return p.push(L, str, len);
+		}
+	};
+
+	template <size_t N>
+	struct unqualified_pusher<wchar_t[N]> {
+		static int push(lua_State* L, const wchar_t (&str)[N]) {
+			return push(L, str, std::char_traits<wchar_t>::length(str));
+		}
+
+		static int push(lua_State* L, const wchar_t (&str)[N], std::size_t sz) {
+			const wchar_t* str_ptr = static_cast<const wchar_t*>(str);
+			return stack::push<const wchar_t*>(L, str_ptr, str_ptr + sz);
+		}
+	};
+
+	template <size_t N>
+	struct unqualified_pusher<char16_t[N]> {
+		static int push(lua_State* L, const char16_t (&str)[N]) {
+			return push(L, str, std::char_traits<char16_t>::length(str));
+		}
+
+		static int push(lua_State* L, const char16_t (&str)[N], std::size_t sz) {
+			const char16_t* str_ptr = static_cast<const char16_t*>(str);
+			return stack::push<const char16_t*>(L, str_ptr, str_ptr + sz);
+		}
+	};
+
+	template <size_t N>
+	struct unqualified_pusher<char32_t[N]> {
+		static int push(lua_State* L, const char32_t (&str)[N]) {
+			return push(L, str, std::char_traits<char32_t>::length(str));
+		}
+
+		static int push(lua_State* L, const char32_t (&str)[N], std::size_t sz) {
+			const char32_t* str_ptr = static_cast<const char32_t*>(str);
+			return stack::push<const char32_t*>(L, str_ptr, str_ptr + sz);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<wchar_t> {
+		static int push(lua_State* L, wchar_t c) {
+			const wchar_t str[2] = { c, '\0' };
+			return stack::push(L, static_cast<const wchar_t*>(str), 1u);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<char16_t> {
+		static int push(lua_State* L, char16_t c) {
+			const char16_t str[2] = { c, '\0' };
+			return stack::push(L, static_cast<const char16_t*>(str), 1u);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<char32_t> {
+		static int push(lua_State* L, char32_t c) {
+			const char32_t str[2] = { c, '\0' };
+			return stack::push(L, static_cast<const char32_t*>(str), 1u);
+		}
+	};
+
+	template <typename... Args>
+	struct unqualified_pusher<std::tuple<Args...>> {
+		template <std::size_t... I, typename T>
+		static int push(std::index_sequence<I...>, lua_State* L, T&& t) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, static_cast<int>(sizeof...(I)), detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			int pushcount = 0;
+			(void)detail::swallow { 0, (pushcount += stack::push(L, std::get<I>(std::forward<T>(t))), 0)... };
+			return pushcount;
+		}
+
+		template <typename T>
+		static int push(lua_State* L, T&& t) {
+			return push(std::index_sequence_for<Args...>(), L, std::forward<T>(t));
+		}
+	};
+
+	template <typename A, typename B>
+	struct unqualified_pusher<std::pair<A, B>> {
+		template <typename T>
+		static int push(lua_State* L, T&& t) {
+			int pushcount = stack::push(L, std::get<0>(std::forward<T>(t)));
+			pushcount += stack::push(L, std::get<1>(std::forward<T>(t)));
+			return pushcount;
+		}
+	};
+
+	template <typename T>
+	struct unqualified_pusher<T, std::enable_if_t<meta::is_optional_v<T>>> {
+		using ValueType = typename meta::unqualified_t<T>::value_type;
+
+		template <typename Optional>
+		static int push(lua_State* L, Optional&& op) {
+			using QualifiedValueType = meta::conditional_t<std::is_lvalue_reference_v<Optional>, ValueType&, ValueType&&>;
+			if (!op) {
+				return stack::push(L, nullopt);
+			}
+			return stack::push(L, static_cast<QualifiedValueType>(op.value()));
+		}
+	};
+
+	template <typename T>
+	struct unqualified_pusher<forward_as_value_t<T>> {
+		static int push(lua_State* L, const forward_as_value_t<T>& value_) {
+			return stack::push<T>(L, value_.value());
+		}
+
+		static int push(lua_State* L, forward_as_value_t<T>&& value_) {
+			return stack::push<T>(L, std::move(value_).value());
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<nullopt_t> {
+		static int push(lua_State* L, nullopt_t) noexcept {
+			return stack::push(L, lua_nil);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<std::nullptr_t> {
+		static int push(lua_State* L, std::nullptr_t) noexcept {
+			return stack::push(L, lua_nil);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<this_state> {
+		static int push(lua_State*, const this_state&) noexcept {
+			return 0;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<this_main_state> {
+		static int push(lua_State*, const this_main_state&) noexcept {
+			return 0;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<new_table> {
+		static int push(lua_State* L, const new_table& nt) {
+			lua_createtable(L, nt.sequence_hint, nt.map_hint);
+			return 1;
+		}
+	};
+
+	template <typename Allocator>
+	struct unqualified_pusher<basic_bytecode<Allocator>> {
+		template <typename T>
+		static int push(lua_State* L, T&& bc, const char* bytecode_name) {
+			const auto first = bc.data();
+			const auto bcsize = bc.size();
+			// pushes either the function, or an error
+			// if it errors, shit goes south, and people can test that upstream
+			(void)luaL_loadbuffer(
+				L, reinterpret_cast<const char*>(first), static_cast<std::size_t>(bcsize * (sizeof(*first) / sizeof(const char))), bytecode_name);
+			return 1;
+		}
+
+		template <typename T>
+		static int push(lua_State* L, T&& bc) {
+			return push(L, std::forward<bc>(bc), "bytecode");
+		}
+	};
+
+#if SOL_IS_ON(SOL_STD_VARIANT)
+	namespace stack_detail {
+
+		struct push_function {
+			lua_State* L;
+
+			push_function(lua_State* L_) noexcept : L(L_) {
+			}
+
+			template <typename T>
+			int operator()(T&& value) const {
+				return stack::push<T>(L, std::forward<T>(value));
+			}
+		};
+
+	} // namespace stack_detail
+
+	template <typename... Tn>
+	struct unqualified_pusher<std::variant<Tn...>> {
+		static int push(lua_State* L, const std::variant<Tn...>& v) {
+			return std::visit(stack_detail::push_function(L), v);
+		}
+
+		static int push(lua_State* L, std::variant<Tn...>&& v) {
+			return std::visit(stack_detail::push_function(L), std::move(v));
+		}
+	};
+#endif // Variant because Clang is terrible
+
+}} // namespace sol::stack
+
+// end of sol/stack_push.hpp
+
+// beginning of sol/stack_pop.hpp
+
+#include <utility>
+#include <tuple>
+
+namespace sol { namespace stack {
+	template <typename T, typename>
+	struct popper {
+		inline static decltype(auto) pop(lua_State* L) {
+			if constexpr (is_stack_based_v<meta::unqualified_t<T>>) {
+				static_assert(!is_stack_based_v<meta::unqualified_t<T>>,
+					"You cannot pop something that lives solely on the stack: it will not remain on the stack when popped and thusly will go out of "
+					"scope!");
+			}
+			else {
+				record tracking {};
+				decltype(auto) r = get<T>(L, -lua_size<T>::value, tracking);
+				lua_pop(L, tracking.used);
+				return r;
+			}
+		}
+	};
+}} // namespace sol::stack
+
+// end of sol/stack_pop.hpp
+
+// beginning of sol/stack_field.hpp
+
+namespace sol { namespace stack {
+
+	namespace stack_detail {
+		template <typename T, bool global, bool raw>
+		inline constexpr bool is_get_direct_tableless_v = (global && !raw && meta::is_c_str_or_string_v<T>);
+
+		template <typename T, bool global, bool raw>
+		inline constexpr bool is_get_direct_v = (is_get_direct_tableless_v<T, global, raw>) // cf-hack
+			|| (!global && !raw && (meta::is_c_str_or_string_v<T> || meta::is_string_of_v<T, char>)) // cf-hack
+			|| (!global && raw && (std::is_integral_v<T> && !std::is_same_v<T, bool>))
+#if SOL_LUA_VERSION_I_ >= 503
+			|| (!global && !raw && (std::is_integral_v<T> && !std::is_same_v<T, bool>))
+#endif // integer keys 5.3 or better
+#if SOL_LUA_VERSION_I_ >= 502
+			|| (!global && raw && std::is_pointer_v<T> && std::is_void_v<std::remove_pointer_t<T>>)
+#endif // void pointer keys 5.2 or better
+			;
+
+		template <typename T, bool global, bool raw>
+		inline constexpr bool is_set_direct_tableless_v = (global && !raw && meta::is_c_str_or_string_v<T>);
+
+		template <typename T, bool global, bool raw>
+		inline constexpr bool is_set_direct_v = (is_set_direct_tableless_v<T, global, raw>) // cf-hack
+			|| (!global && !raw && (meta::is_c_str_or_string_v<T> || meta::is_string_of_v<T, char>)) // cf-hack
+			|| (!global && raw && (std::is_integral_v<T> && !std::is_same_v<T, bool>))     // cf-hack
+#if SOL_LUA_VERSION_I_ >= 503
+			|| (!global && !raw && (std::is_integral_v<T> && !std::is_same_v<T, bool>))
+#endif // integer keys 5.3 or better
+#if SOL_LUA_VERSION_I_ >= 502
+			|| (!global && raw && (std::is_pointer_v<T> && std::is_void_v<std::remove_pointer_t<T>>))
+#endif // void pointer keys 5.2 or better
+			;
+	} // namespace stack_detail
+
+	template <typename T, bool global, bool raw, typename>
+	struct field_getter {
+		static inline constexpr int default_table_index
+			= meta::conditional_t<stack_detail::is_get_direct_v<T, global, raw>, std::integral_constant<int, -1>, std::integral_constant<int, -2>>::value;
+
+		template <typename Key>
+		void get(lua_State* L, Key&& key, int tableindex = default_table_index) {
+			if constexpr (std::is_same_v<T, update_if_empty_t> || std::is_same_v<T, override_value_t> || std::is_same_v<T, create_if_nil_t>) {
+				(void)L;
+				(void)key;
+				(void)tableindex;
+			}
+			else if constexpr (std::is_same_v<T, env_key_t>) {
+				(void)key;
+#if SOL_LUA_VERSION_I_ < 502
+				// Use lua_setfenv
+				lua_getfenv(L, tableindex);
+#else
+				// Use upvalues as explained in Lua 5.2 and beyond's manual
+				if (lua_getupvalue(L, tableindex, 1) == nullptr) {
+					push(L, lua_nil);
+				}
+#endif
+			}
+			else if constexpr (std::is_same_v<T, metatable_key_t>) {
+				(void)key;
+				if (lua_getmetatable(L, tableindex) == 0)
+					push(L, lua_nil);
+			}
+			else if constexpr (raw) {
+				if constexpr (std::is_integral_v<T> && !std::is_same_v<bool, T>) {
+					lua_rawgeti(L, tableindex, static_cast<lua_Integer>(key));
+				}
+#if SOL_LUA_VERSION_I_ >= 502
+				else if constexpr (std::is_pointer_v<T> && std::is_void_v<std::remove_pointer_t<T>>) {
+					lua_rawgetp(L, tableindex, key);
+				}
+#endif // Lua 5.2.x+
+				else {
+					push(L, std::forward<Key>(key));
+					lua_rawget(L, tableindex);
+				}
+			}
+			else {
+				if constexpr (meta::is_c_str_or_string_v<T>) {
+					if constexpr (global) {
+						(void)tableindex;
+						lua_getglobal(L, &key[0]);
+					}
+					else {
+						lua_getfield(L, tableindex, &key[0]);
+					}
+				}
+				else if constexpr (std::is_same_v<T, meta_function>) {
+					const auto& real_key = to_string(key);
+					lua_getfield(L, tableindex, &real_key[0]);
+				}
+#if SOL_LUA_VERSION_I_ >= 503
+				else if constexpr (std::is_integral_v<T> && !std::is_same_v<bool, T>) {
+					lua_geti(L, tableindex, static_cast<lua_Integer>(key));
+				}
+#endif // Lua 5.3.x+
+				else {
+					push(L, std::forward<Key>(key));
+					lua_gettable(L, tableindex);
+				}
+			}
+		}
+	};
+
+	template <typename... Args, bool b, bool raw, typename C>
+	struct field_getter<std::tuple<Args...>, b, raw, C> {
+		template <std::size_t... I, typename Keys>
+		void apply(std::index_sequence<0, I...>, lua_State* L, Keys&& keys, int tableindex) {
+			get_field<b, raw>(L, std::get<0>(std::forward<Keys>(keys)), tableindex);
+			void(detail::swallow { (get_field<false, raw>(L, std::get<I>(std::forward<Keys>(keys))), 0)... });
+			reference saved(L, -1);
+			lua_pop(L, static_cast<int>(sizeof...(I)));
+			saved.push();
+		}
+
+		template <typename Keys>
+		void get(lua_State* L, Keys&& keys) {
+			apply(std::make_index_sequence<sizeof...(Args)>(), L, std::forward<Keys>(keys), lua_absindex(L, -1));
+		}
+
+		template <typename Keys>
+		void get(lua_State* L, Keys&& keys, int tableindex) {
+			apply(std::make_index_sequence<sizeof...(Args)>(), L, std::forward<Keys>(keys), tableindex);
+		}
+	};
+
+	template <typename A, typename B, bool b, bool raw, typename C>
+	struct field_getter<std::pair<A, B>, b, raw, C> {
+		template <typename Keys>
+		void get(lua_State* L, Keys&& keys, int tableindex) {
+			get_field<b, raw>(L, std::get<0>(std::forward<Keys>(keys)), tableindex);
+			get_field<false, raw>(L, std::get<1>(std::forward<Keys>(keys)));
+			reference saved(L, -1);
+			lua_pop(L, static_cast<int>(2));
+			saved.push();
+		}
+
+		template <typename Keys>
+		void get(lua_State* L, Keys&& keys) {
+			get_field<b, raw>(L, std::get<0>(std::forward<Keys>(keys)));
+			get_field<false, raw>(L, std::get<1>(std::forward<Keys>(keys)));
+			reference saved(L, -1);
+			lua_pop(L, static_cast<int>(2));
+			saved.push();
+		}
+	};
+
+	template <typename T, bool global, bool raw, typename>
+	struct field_setter {
+		static constexpr int default_table_index
+			= meta::conditional_t<stack_detail::is_set_direct_v<T, global, raw>, std::integral_constant<int, -2>, std::integral_constant<int, -3>>::value;
+
+		template <typename Key, typename Value>
+		void set(lua_State* L, Key&& key, Value&& value, int tableindex = default_table_index) {
+			if constexpr (std::is_same_v<T, update_if_empty_t> || std::is_same_v<T, override_value_t>) {
+				(void)L;
+				(void)key;
+				(void)value;
+				(void)tableindex;
+			}
+			else if constexpr (std::is_same_v<T, metatable_key_t>) {
+				(void)key;
+				push(L, std::forward<Value>(value));
+				lua_setmetatable(L, tableindex);
+			}
+			else if constexpr (raw) {
+				if constexpr (std::is_integral_v<T> && !std::is_same_v<bool, T>) {
+					push(L, std::forward<Value>(value));
+					lua_rawseti(L, tableindex, static_cast<lua_Integer>(key));
+				}
+#if SOL_LUA_VERSION_I_ >= 502
+				else if constexpr (std::is_pointer_v<T> && std::is_void_v<std::remove_pointer_t<T>>) {
+					push(L, std::forward<Value>(value));
+					lua_rawsetp(L, tableindex, std::forward<Key>(key));
+				}
+#endif // Lua 5.2.x
+				else {
+					push(L, std::forward<Key>(key));
+					push(L, std::forward<Value>(value));
+					lua_rawset(L, tableindex);
+				}
+			}
+			else {
+				if constexpr (meta::is_c_str_or_string_v<T>) {
+					if constexpr (global) {
+						push(L, std::forward<Value>(value));
+						lua_setglobal(L, &key[0]);
+						(void)tableindex;
+					}
+					else {
+						push(L, std::forward<Value>(value));
+						lua_setfield(L, tableindex, &key[0]);
+					}
+				}
+#if SOL_LUA_VERSION_I_ >= 503
+				else if constexpr (std::is_integral_v<T> && !std::is_same_v<bool, T>) {
+					push(L, std::forward<Value>(value));
+					lua_seti(L, tableindex, static_cast<lua_Integer>(key));
+				}
+#endif // Lua 5.3.x
+				else {
+					push(L, std::forward<Key>(key));
+					push(L, std::forward<Value>(value));
+					lua_settable(L, tableindex);
+				}
+			}
+		}
+	};
+
+	template <typename... Args, bool b, bool raw, typename C>
+	struct field_setter<std::tuple<Args...>, b, raw, C> {
+		template <bool g, std::size_t I, typename Keys, typename Value>
+		void apply(std::index_sequence<I>, lua_State* L, Keys&& keys, Value&& value, int tableindex) {
+			I < 1 ? set_field<g, raw>(L, std::get<I>(std::forward<Keys>(keys)), std::forward<Value>(value), tableindex)
+				 : set_field<g, raw>(L, std::get<I>(std::forward<Keys>(keys)), std::forward<Value>(value));
+		}
+
+		template <bool g, std::size_t I0, std::size_t I1, std::size_t... I, typename Keys, typename Value>
+		void apply(std::index_sequence<I0, I1, I...>, lua_State* L, Keys&& keys, Value&& value, int tableindex) {
+			I0 < 1 ? get_field<g, raw>(L, std::get<I0>(std::forward<Keys>(keys)), tableindex)
+				  : get_field<g, raw>(L, std::get<I0>(std::forward<Keys>(keys)), -1);
+			apply<false>(std::index_sequence<I1, I...>(), L, std::forward<Keys>(keys), std::forward<Value>(value), -1);
+		}
+
+		template <bool g, std::size_t I0, std::size_t... I, typename Keys, typename Value>
+		void top_apply(std::index_sequence<I0, I...>, lua_State* L, Keys&& keys, Value&& value, int tableindex) {
+			apply<g>(std::index_sequence<I0, I...>(), L, std::forward<Keys>(keys), std::forward<Value>(value), tableindex);
+			lua_pop(L, static_cast<int>(sizeof...(I)));
+		}
+
+		template <typename Keys, typename Value>
+		void set(lua_State* L, Keys&& keys, Value&& value, int tableindex = -3) {
+			top_apply<b>(std::make_index_sequence<sizeof...(Args)>(), L, std::forward<Keys>(keys), std::forward<Value>(value), tableindex);
+		}
+	};
+
+	template <typename A, typename B, bool b, bool raw, typename C>
+	struct field_setter<std::pair<A, B>, b, raw, C> {
+		template <typename Keys, typename Value>
+		void set(lua_State* L, Keys&& keys, Value&& value, int tableindex = -1) {
+			get_field<b, raw>(L, std::get<0>(std::forward<Keys>(keys)), tableindex);
+			set_field<false, raw>(L, std::get<1>(std::forward<Keys>(keys)), std::forward<Value>(value), lua_gettop(L));
+			lua_pop(L, 1);
+		}
+	};
+}} // namespace sol::stack
+
+// end of sol/stack_field.hpp
+
+// beginning of sol/stack_probe.hpp
+
+namespace sol { namespace stack {
+	template <typename T, typename P, bool b, bool raw, typename>
+	struct probe_field_getter {
+		template <typename Key>
+		probe get(lua_State* L, Key&& key, int tableindex = -2) {
+			if constexpr (!b) {
+				if (!maybe_indexable(L, tableindex)) {
+					return probe(false, 0);
+				}
+			}
+			get_field<b, raw>(L, std::forward<Key>(key), tableindex);
+			return probe(check<P>(L), 1);
+		}
+	};
+
+	template <typename A, typename B, typename P, bool b, bool raw, typename C>
+	struct probe_field_getter<std::pair<A, B>, P, b, raw, C> {
+		template <typename Keys>
+		probe get(lua_State* L, Keys&& keys, int tableindex = -2) {
+			if (!b && !maybe_indexable(L, tableindex)) {
+				return probe(false, 0);
+			}
+			get_field<b, raw>(L, std::get<0>(keys), tableindex);
+			if (!maybe_indexable(L)) {
+				return probe(false, 1);
+			}
+			get_field<false, raw>(L, std::get<1>(keys), tableindex);
+			return probe(check<P>(L), 2);
+		}
+	};
+
+	template <typename... Args, typename P, bool b, bool raw, typename C>
+	struct probe_field_getter<std::tuple<Args...>, P, b, raw, C> {
+		template <std::size_t I, typename Keys>
+		probe apply(std::index_sequence<I>, int sofar, lua_State* L, Keys&& keys, int tableindex) {
+			get_field<(I < 1) && b, raw>(L, std::get<I>(keys), tableindex);
+			return probe(check<P>(L), sofar);
+		}
+
+		template <std::size_t I, std::size_t I1, std::size_t... In, typename Keys>
+		probe apply(std::index_sequence<I, I1, In...>, int sofar, lua_State* L, Keys&& keys, int tableindex) {
+			get_field < I<1 && b, raw>(L, std::get<I>(keys), tableindex);
+			if (!maybe_indexable(L)) {
+				return probe(false, sofar);
+			}
+			return apply(std::index_sequence<I1, In...>(), sofar + 1, L, std::forward<Keys>(keys), -1);
+		}
+
+		template <typename Keys>
+		probe get(lua_State* L, Keys&& keys, int tableindex = -2) {
+			if constexpr (!b) {
+				if (!maybe_indexable(L, tableindex)) {
+					return probe(false, 0);
+				}
+				return apply(std::index_sequence_for<Args...>(), 1, L, std::forward<Keys>(keys), tableindex);
+			}
+			else {
+				return apply(std::index_sequence_for<Args...>(), 1, L, std::forward<Keys>(keys), tableindex);
+			}
+		}
+	};
+}} // namespace sol::stack
+
+// end of sol/stack_probe.hpp
+
+#include <cstring>
+#include <array>
+
+namespace sol {
+	namespace detail {
+		using typical_chunk_name_t = char[SOL_ID_SIZE_I_];
+		using typical_file_chunk_name_t = char[SOL_FILE_ID_SIZE_I_];
+
+		inline const std::string& default_chunk_name() {
+			static const std::string name = "";
+			return name;
+		}
+
+		template <std::size_t N>
+		const char* make_chunk_name(const string_view& code, const std::string& chunkname, char (&basechunkname)[N]) {
+			if (chunkname.empty()) {
+				auto it = code.cbegin();
+				auto e = code.cend();
+				std::size_t i = 0;
+				static const std::size_t n = N - 4;
+				for (i = 0; i < n && it != e; ++i, ++it) {
+					basechunkname[i] = *it;
+				}
+				if (it != e) {
+					for (std::size_t c = 0; c < 3; ++i, ++c) {
+						basechunkname[i] = '.';
+					}
+				}
+				basechunkname[i] = '\0';
+				return &basechunkname[0];
+			}
+			else {
+				return chunkname.c_str();
+			}
+		}
+
+		inline void clear_entries(stack_reference r) {
+			stack::push(r.lua_state(), lua_nil);
+			while (lua_next(r.lua_state(), -2)) {
+				absolute_index key(r.lua_state(), -2);
+				auto pn = stack::pop_n(r.lua_state(), 1);
+				stack::set_field<false, true>(r.lua_state(), key, lua_nil, r.stack_index());
+			}
+		}
+
+		inline void clear_entries(const reference& registry_reference) {
+			auto pp = stack::push_pop(registry_reference);
+			stack_reference ref(registry_reference.lua_state(), -1);
+			clear_entries(ref);
+		}
+	} // namespace detail
+
+	namespace stack {
+		namespace stack_detail {
+			template <typename T>
+			inline int push_as_upvalues(lua_State* L, T& item) {
+				typedef std::decay_t<T> TValue;
+				static const std::size_t itemsize = sizeof(TValue);
+				static const std::size_t voidsize = sizeof(void*);
+				static const std::size_t voidsizem1 = voidsize - 1;
+				static const std::size_t data_t_count = (sizeof(TValue) + voidsizem1) / voidsize;
+				typedef std::array<void*, data_t_count> data_t;
+
+				data_t data { {} };
+				std::memcpy(&data[0], std::addressof(item), itemsize);
+				int pushcount = 0;
+				for (const auto& v : data) {
+					lua_pushlightuserdata(L, v);
+					pushcount += 1;
+				}
+				return pushcount;
+			}
+
+			template <typename T>
+			inline std::pair<T, int> get_as_upvalues(lua_State* L, int index = 2) {
+				static const std::size_t data_t_count = (sizeof(T) + (sizeof(void*) - 1)) / sizeof(void*);
+				typedef std::array<void*, data_t_count> data_t;
+				data_t voiddata { {} };
+				for (std::size_t i = 0, d = 0; d < sizeof(T); ++i, d += sizeof(void*)) {
+					voiddata[i] = lua_touserdata(L, upvalue_index(index++));
+				}
+				return std::pair<T, int>(*reinterpret_cast<T*>(static_cast<void*>(voiddata.data())), index);
+			}
+
+			template <typename T>
+			inline std::pair<T, int> get_as_upvalues_using_function(lua_State* L, int function_index = -1) {
+				static const std::size_t data_t_count = (sizeof(T) + (sizeof(void*) - 1)) / sizeof(void*);
+				typedef std::array<void*, data_t_count> data_t;
+				function_index = lua_absindex(L, function_index);
+				int index = 0;
+				data_t voiddata { {} };
+				for (std::size_t d = 0; d < sizeof(T); d += sizeof(void*)) {
+					// first upvalue is nullptr to respect environment shenanigans
+					// So +2 instead of +1
+					const char* upvalue_name = lua_getupvalue(L, function_index, index + 2);
+					if (upvalue_name == nullptr) {
+						// We should freak out here...
+						break;
+					}
+					voiddata[index] = lua_touserdata(L, -1);
+					++index;
+				}
+				lua_pop(L, index);
+				return std::pair<T, int>(*reinterpret_cast<T*>(static_cast<void*>(voiddata.data())), index);
+			}
+
+			template <bool checked, typename Handler, typename Fx, typename... Args>
+			static decltype(auto) eval(types<>, std::index_sequence<>, lua_State*, int, Handler&&, record&, Fx&& fx, Args&&... args) {
+				return std::forward<Fx>(fx)(std::forward<Args>(args)...);
+			}
+
+			template <bool checked, typename Arg, typename... Args, std::size_t I, std::size_t... Is, typename Handler, typename Fx, typename... FxArgs>
+			static decltype(auto) eval(types<Arg, Args...>, std::index_sequence<I, Is...>, lua_State* L_, int start_index_, Handler&& handler_,
+			     record& tracking_, Fx&& fx_, FxArgs&&... fxargs_) {
+#if 0 && SOL_IS_ON(SOL_PROPAGATE_EXCEPTIONS)
+				// NOTE: THIS IS TERMPORARILY TURNED OFF BECAUSE IT IMPACTS ACTUAL SEMANTICS W.R.T. THINGS LIKE LUAJIT,
+				// SO IT MUST REMAIN OFF UNTIL WE CAN ESTABLISH SIMILAR BEHAVIOR IN MODES WHERE `checked == false`!
+
+				// We can save performance/time by letting errors unwind produced arguments
+				// rather than checking everything once, and then potentially re-doing work
+				if constexpr (checked) {
+					return eval<checked>(types<Args...>(),
+					     std::index_sequence<Is...>(),
+					     L_,
+					     start_index_,
+					     std::forward<Handler>(handler_),
+					     tracking_,
+					     std::forward<Fx>(fx_),
+					     std::forward<FxArgs>(fxargs_)...,
+					     *stack_detail::check_get_arg<Arg>(L_, start_index_ + tracking_.used, handler_, tracking_));
+				}
+				else
+#endif
+				{
+					return eval<checked>(types<Args...>(),
+					     std::index_sequence<Is...>(),
+					     L_,
+					     start_index_,
+					     std::forward<Handler>(handler_),
+					     tracking_,
+					     std::forward<Fx>(fx_),
+					     std::forward<FxArgs>(fxargs_)...,
+					     stack_detail::unchecked_get_arg<Arg>(L_, start_index_ + tracking_.used, tracking_));
+				}
+			}
+
+			template <bool checkargs = detail::default_safe_function_calls, std::size_t... I, typename R, typename... Args, typename Fx, typename... FxArgs>
+			inline decltype(auto) call(types<R>, types<Args...> argument_types_, std::index_sequence<I...> argument_indices_, lua_State* L_,
+			     int start_index_, Fx&& fx_, FxArgs&&... args_) {
+				static_assert(meta::all_v<meta::is_not_move_only<Args>...>,
+				     "One of the arguments being bound is a move-only type, and it is not being taken by reference: this will break your code. Please take "
+				     "a reference and std::move it manually if this was your intention.");
+				argument_handler<types<R, Args...>> handler {};
+				record tracking {};
+#if SOL_IS_OFF(SOL_PROPAGATE_EXCEPTIONS)
+				if constexpr (checkargs) {
+					multi_check<Args...>(L_, start_index_, handler);
+				}
+#endif
+				if constexpr (std::is_void_v<R>) {
+					eval<checkargs>(
+					     argument_types_, argument_indices_, L_, start_index_, handler, tracking, std::forward<Fx>(fx_), std::forward<FxArgs>(args_)...);
+				}
+				else {
+					return eval<checkargs>(
+					     argument_types_, argument_indices_, L_, start_index_, handler, tracking, std::forward<Fx>(fx_), std::forward<FxArgs>(args_)...);
+				}
+			}
+
+			template <typename T>
+			void raw_table_set(lua_State* L, T&& arg, int tableindex = -2) {
+				int push_count = push(L, std::forward<T>(arg));
+				SOL_ASSERT(push_count == 1);
+				std::size_t unique_index = static_cast<std::size_t>(luaL_len(L, tableindex) + 1u);
+				lua_rawseti(L, tableindex, static_cast<int>(unique_index));
+			}
+
+		} // namespace stack_detail
+
+		template <typename T>
+		int set_ref(lua_State* L, T&& arg, int tableindex = -2) {
+			int push_count = push(L, std::forward<T>(arg));
+			SOL_ASSERT(push_count == 1);
+			return luaL_ref(L, tableindex);
+		}
+
+		template <bool check_args = detail::default_safe_function_calls, typename R, typename... Args, typename Fx, typename... FxArgs>
+		inline decltype(auto) call(types<R> tr, types<Args...> ta, lua_State* L, int start, Fx&& fx, FxArgs&&... args) {
+			using args_indices = std::make_index_sequence<sizeof...(Args)>;
+			if constexpr (std::is_void_v<R>) {
+				stack_detail::call<check_args>(tr, ta, args_indices(), L, start, std::forward<Fx>(fx), std::forward<FxArgs>(args)...);
+			}
+			else {
+				return stack_detail::call<check_args>(tr, ta, args_indices(), L, start, std::forward<Fx>(fx), std::forward<FxArgs>(args)...);
+			}
+		}
+
+		template <bool check_args = detail::default_safe_function_calls, typename R, typename... Args, typename Fx, typename... FxArgs>
+		inline decltype(auto) call(types<R> tr, types<Args...> ta, lua_State* L, Fx&& fx, FxArgs&&... args) {
+			if constexpr (std::is_void_v<R>) {
+				call<check_args>(tr, ta, L, 1, std::forward<Fx>(fx), std::forward<FxArgs>(args)...);
+			}
+			else {
+				return call<check_args>(tr, ta, L, 1, std::forward<Fx>(fx), std::forward<FxArgs>(args)...);
+			}
+		}
+
+		template <bool check_args = detail::default_safe_function_calls, typename R, typename... Args, typename Fx, typename... FxArgs>
+		inline decltype(auto) call_from_top(types<R> tr, types<Args...> ta, lua_State* L, Fx&& fx, FxArgs&&... args) {
+			using expected_count_t = meta::count_for_pack<lua_size, Args...>;
+			if constexpr (std::is_void_v<R>) {
+				call<check_args>(tr,
+				     ta,
+				     L,
+				     (std::max)(static_cast<int>(lua_gettop(L) - expected_count_t::value), static_cast<int>(0)),
+				     std::forward<Fx>(fx),
+				     std::forward<FxArgs>(args)...);
+			}
+			else {
+				return call<check_args>(tr,
+				     ta,
+				     L,
+				     (std::max)(static_cast<int>(lua_gettop(L) - expected_count_t::value), static_cast<int>(0)),
+				     std::forward<Fx>(fx),
+				     std::forward<FxArgs>(args)...);
+			}
+		}
+
+		template <bool check_args = detail::default_safe_function_calls, bool clean_stack = true, typename Ret0, typename... Ret, typename... Args,
+		     typename Fx, typename... FxArgs>
+		inline int call_into_lua(types<Ret0, Ret...> tr, types<Args...> ta, lua_State* L, int start, Fx&& fx, FxArgs&&... fxargs) {
+			if constexpr (std::is_void_v<Ret0>) {
+				call<check_args>(tr, ta, L, start, std::forward<Fx>(fx), std::forward<FxArgs>(fxargs)...);
+				if constexpr (clean_stack) {
+					lua_settop(L, 0);
+				}
+				return 0;
+			}
+			else {
+				(void)tr;
+				decltype(auto) r
+				     = call<check_args>(types<meta::return_type_t<Ret0, Ret...>>(), ta, L, start, std::forward<Fx>(fx), std::forward<FxArgs>(fxargs)...);
+				using R = meta::unqualified_t<decltype(r)>;
+				using is_stack = meta::any<is_stack_based<R>, std::is_same<R, absolute_index>, std::is_same<R, ref_index>, std::is_same<R, raw_index>>;
+				if constexpr (clean_stack && !is_stack::value) {
+					lua_settop(L, 0);
+				}
+				return push_reference(L, std::forward<decltype(r)>(r));
+			}
+		}
+
+		template <bool check_args = detail::default_safe_function_calls, bool clean_stack = true, typename Fx, typename... FxArgs>
+		inline int call_lua(lua_State* L, int start, Fx&& fx, FxArgs&&... fxargs) {
+			using traits_type = lua_bind_traits<meta::unqualified_t<Fx>>;
+			using args_list = typename traits_type::args_list;
+			using returns_list = typename traits_type::returns_list;
+			return call_into_lua<check_args, clean_stack>(returns_list(), args_list(), L, start, std::forward<Fx>(fx), std::forward<FxArgs>(fxargs)...);
+		}
+
+		inline call_syntax get_call_syntax(lua_State* L, const string_view& key, int index) {
+			if (lua_gettop(L) < 1) {
+				return call_syntax::dot;
+			}
+			luaL_getmetatable(L, key.data());
+			auto pn = pop_n(L, 1);
+			if (lua_compare(L, -1, index, LUA_OPEQ) != 1) {
+				return call_syntax::dot;
+			}
+			return call_syntax::colon;
+		}
+
+		inline void script(
+		     lua_State* L, lua_Reader reader, void* data, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			detail::typical_chunk_name_t basechunkname = {};
+			const char* chunknametarget = detail::make_chunk_name("lua_Reader", chunkname, basechunkname);
+			if (lua_load(L, reader, data, chunknametarget, to_string(mode).c_str()) || lua_pcall(L, 0, LUA_MULTRET, 0)) {
+				lua_error(L);
+			}
+		}
+
+		inline void script(
+		     lua_State* L, const string_view& code, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+
+			detail::typical_chunk_name_t basechunkname = {};
+			const char* chunknametarget = detail::make_chunk_name(code, chunkname, basechunkname);
+			if (luaL_loadbufferx(L, code.data(), code.size(), chunknametarget, to_string(mode).c_str()) || lua_pcall(L, 0, LUA_MULTRET, 0)) {
+				lua_error(L);
+			}
+		}
+
+		inline void script_file(lua_State* L, const std::string& filename, load_mode mode = load_mode::any) {
+			if (luaL_loadfilex(L, filename.c_str(), to_string(mode).c_str()) || lua_pcall(L, 0, LUA_MULTRET, 0)) {
+				lua_error(L);
+			}
+		}
+
+		inline void luajit_exception_handler(lua_State* L, int (*handler)(lua_State*, lua_CFunction) = detail::c_trampoline) {
+#if SOL_IS_ON(SOL_USE_LUAJIT_EXCEPTION_TRAMPOLINE)
+			if (L == nullptr) {
+				return;
+			}
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushlightuserdata(L, (void*)handler);
+			auto pn = pop_n(L, 1);
+			luaJIT_setmode(L, -1, LUAJIT_MODE_WRAPCFUNC | LUAJIT_MODE_ON);
+#else
+			(void)L;
+			(void)handler;
+#endif
+		}
+
+		inline void luajit_exception_off(lua_State* L) {
+#if SOL_IS_ON(SOL_USE_LUAJIT_EXCEPTION_TRAMPOLINE)
+			if (L == nullptr) {
+				return;
+			}
+			luaJIT_setmode(L, -1, LUAJIT_MODE_WRAPCFUNC | LUAJIT_MODE_OFF);
+#else
+			(void)L;
+#endif
+		}
+	} // namespace stack
+} // namespace sol
+
+// end of sol/stack.hpp
+
+// beginning of sol/object.hpp
+
+// beginning of sol/make_reference.hpp
+
+namespace sol {
+
+	template <typename R = reference, bool should_pop = !is_stack_based_v<R>, typename T>
+	R make_reference(lua_State* L, T&& value) {
+		int backpedal = stack::push(L, std::forward<T>(value));
+		R r = stack::get<R>(L, -backpedal);
+		if (should_pop) {
+			lua_pop(L, backpedal);
+		}
+		return r;
+	}
+
+	template <typename T, typename R = reference, bool should_pop = !is_stack_based_v<R>, typename... Args>
+	R make_reference(lua_State* L, Args&&... args) {
+		int backpedal = stack::push<T>(L, std::forward<Args>(args)...);
+		R r = stack::get<R>(L, -backpedal);
+		if (should_pop) {
+			lua_pop(L, backpedal);
+		}
+		return r;
+	}
+
+	template <typename R = reference, bool should_pop = !is_stack_based_v<R>, typename T>
+	R make_reference_userdata(lua_State* L, T&& value) {
+		int backpedal = stack::push_userdata(L, std::forward<T>(value));
+		R r = stack::get<R>(L, -backpedal);
+		if (should_pop) {
+			lua_pop(L, backpedal);
+		}
+		return r;
+	}
+
+	template <typename T, typename R = reference, bool should_pop = !is_stack_based_v<R>, typename... Args>
+	R make_reference_userdata(lua_State* L, Args&&... args) {
+		int backpedal = stack::push_userdata<T>(L, std::forward<Args>(args)...);
+		R r = stack::get<R>(L, -backpedal);
+		if (should_pop) {
+			lua_pop(L, backpedal);
+		}
+		return r;
+	}
+
+} // namespace sol
+
+// end of sol/make_reference.hpp
+
+// beginning of sol/object_base.hpp
+
+namespace sol {
+
+	template <typename ref_t>
+	class basic_object_base : public ref_t {
+	private:
+		using base_t = ref_t;
+
+		template <typename T>
+		decltype(auto) as_stack(std::true_type) const {
+			return stack::get<T>(base_t::lua_state(), base_t::stack_index());
+		}
+
+		template <typename T>
+		decltype(auto) as_stack(std::false_type) const {
+			base_t::push();
+			return stack::pop<T>(base_t::lua_state());
+		}
+
+		template <typename T>
+		bool is_stack(std::true_type) const {
+			return stack::check<T>(base_t::lua_state(), base_t::stack_index(), &no_panic);
+		}
+
+		template <typename T>
+		bool is_stack(std::false_type) const {
+			int r = base_t::registry_index();
+			if (r == LUA_REFNIL)
+				return meta::any_same<meta::unqualified_t<T>, lua_nil_t, nullopt_t, std::nullptr_t>::value ? true : false;
+			if (r == LUA_NOREF)
+				return false;
+			auto pp = stack::push_pop(*this);
+			return stack::check<T>(base_t::lua_state(), -1, &no_panic);
+		}
+
+	public:
+		basic_object_base() noexcept = default;
+		basic_object_base(const basic_object_base&) = default;
+		basic_object_base(basic_object_base&&) = default;
+		basic_object_base& operator=(const basic_object_base&) = default;
+		basic_object_base& operator=(basic_object_base&&) = default;
+		template <typename T, typename... Args, meta::enable<meta::neg<std::is_same<meta::unqualified_t<T>, basic_object_base>>> = meta::enabler>
+		basic_object_base(T&& arg, Args&&... args) : base_t(std::forward<T>(arg), std::forward<Args>(args)...) {
+		}
+
+		template <typename T>
+		decltype(auto) as() const {
+			return as_stack<T>(is_stack_based<base_t>());
+		}
+
+		template <typename T>
+		bool is() const {
+			return is_stack<T>(is_stack_based<base_t>());
+		}
+	};
+} // namespace sol
+
+// end of sol/object_base.hpp
+
+namespace sol {
+
+	template <typename base_type>
+	class basic_object : public basic_object_base<base_type> {
+	private:
+		typedef basic_object_base<base_type> base_t;
+
+		template <bool invert_and_pop = false>
+		basic_object(std::integral_constant<bool, invert_and_pop>, lua_State* L_, int index_ = -1) noexcept : base_t(L_, index_) {
+			if (invert_and_pop) {
+				lua_pop(L_, -index_);
+			}
+		}
+
+	protected:
+		basic_object(detail::no_safety_tag, lua_nil_t n) : base_t(n) {
+		}
+		basic_object(detail::no_safety_tag, lua_State* L_, int index_) : base_t(L_, index_) {
+		}
+		basic_object(detail::no_safety_tag, lua_State* L_, ref_index index_) : base_t(L_, index_) {
+		}
+		template <typename T,
+		     meta::enable<meta::neg<meta::any_same<meta::unqualified_t<T>, basic_object>>, meta::neg<std::is_same<base_type, stack_reference>>,
+		          meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_object(detail::no_safety_tag, T&& r) noexcept : base_t(std::forward<T>(r)) {
+		}
+
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_object(detail::no_safety_tag, lua_State* L_, T&& r) noexcept : base_t(L_, std::forward<T>(r)) {
+		}
+
+	public:
+		basic_object() noexcept = default;
+		template <typename T,
+		     meta::enable<meta::neg<std::is_same<meta::unqualified_t<T>, basic_object>>, meta::neg<std::is_same<base_type, stack_reference>>,
+		          is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_object(T&& r) : base_t(std::forward<T>(r)) {
+		}
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_object(lua_State* L_, T&& r) : base_t(L_, std::forward<T>(r)) {
+		}
+		basic_object(lua_State* L_, global_tag_t t) : base_t(L_, t) {
+		}
+		basic_object(lua_nil_t r) : base_t(r) {
+		}
+		basic_object(const basic_object&) = default;
+		basic_object(basic_object&&) = default;
+		basic_object(const stack_reference& r) noexcept : basic_object(r.lua_state(), r.stack_index()) {
+		}
+		basic_object(stack_reference&& r) noexcept : basic_object(r.lua_state(), r.stack_index()) {
+		}
+		template <typename Super>
+		basic_object(const proxy_base<Super>& r) noexcept : basic_object(r.operator basic_object()) {
+		}
+		template <typename Super>
+		basic_object(proxy_base<Super>&& r) noexcept : basic_object(r.operator basic_object()) {
+		}
+		basic_object(lua_State* L_, lua_nil_t r) noexcept : base_t(L_, r) {
+		}
+		basic_object(lua_State* L_, int index_ = -1) noexcept : base_t(L_, index_) {
+		}
+		basic_object(lua_State* L_, absolute_index index_) noexcept : base_t(L_, index_) {
+		}
+		basic_object(lua_State* L_, raw_index index_) noexcept : base_t(L_, index_) {
+		}
+		basic_object(lua_State* L_, ref_index index_) noexcept : base_t(L_, index_) {
+		}
+		template <typename T, typename... Args>
+		basic_object(lua_State* L_, in_place_type_t<T>, Args&&... args) noexcept
+		: basic_object(std::integral_constant<bool, !is_stack_based<base_t>::value>(), L_, -stack::push<T>(L_, std::forward<Args>(args)...)) {
+		}
+		template <typename T, typename... Args>
+		basic_object(lua_State* L_, in_place_t, T&& arg, Args&&... args) noexcept
+		: basic_object(L_, in_place_type<T>, std::forward<T>(arg), std::forward<Args>(args)...) {
+		}
+		basic_object& operator=(const basic_object&) = default;
+		basic_object& operator=(basic_object&&) = default;
+		basic_object& operator=(const base_type& b) {
+			base_t::operator=(b);
+			return *this;
+		}
+		basic_object& operator=(base_type&& b) {
+			base_t::operator=(std::move(b));
+			return *this;
+		}
+		template <typename Super>
+		basic_object& operator=(const proxy_base<Super>& r) {
+			this->operator=(r.operator basic_object());
+			return *this;
+		}
+		template <typename Super>
+		basic_object& operator=(proxy_base<Super>&& r) {
+			this->operator=(r.operator basic_object());
+			return *this;
+		}
+	};
+
+	template <typename T>
+	object make_object(lua_State* L_, T&& value) {
+		return make_reference<object, true>(L_, std::forward<T>(value));
+	}
+
+	template <typename T, typename... Args>
+	object make_object(lua_State* L_, Args&&... args) {
+		return make_reference<T, object, true>(L_, std::forward<Args>(args)...);
+	}
+
+	template <typename T>
+	object make_object_userdata(lua_State* L_, T&& value) {
+		return make_reference_userdata<object, true>(L_, std::forward<T>(value));
+	}
+
+	template <typename T, typename... Args>
+	object make_object_userdata(lua_State* L_, Args&&... args) {
+		return make_reference_userdata<T, object, true>(L_, std::forward<Args>(args)...);
+	}
+} // namespace sol
+
+// end of sol/object.hpp
+
+// beginning of sol/function.hpp
+
+// beginning of sol/unsafe_function.hpp
+
+// beginning of sol/function_result.hpp
+
+// beginning of sol/protected_function_result.hpp
+
+// beginning of sol/proxy_base.hpp
+
+namespace sol {
+	struct proxy_base_tag { };
+
+	namespace detail {
+		template <typename T>
+		using proxy_key_t = meta::conditional_t<meta::is_specialization_of_v<meta::unqualified_t<T>, std::tuple>, T,
+		     std::tuple<meta::conditional_t<std::is_array_v<meta::unqualified_t<T>>, std::remove_reference_t<T>&, meta::unqualified_t<T>>>>;
+	}
+
+	template <typename Super>
+	struct proxy_base : public proxy_base_tag {
+		lua_State* lua_state() const {
+			const Super& super = *static_cast<const Super*>(static_cast<const void*>(this));
+			return super.lua_state();
+		}
+
+		operator std::string() const {
+			const Super& super = *static_cast<const Super*>(static_cast<const void*>(this));
+			return super.template get<std::string>();
+		}
+
+		template <typename T, meta::enable<meta::neg<meta::is_string_constructible<T>>, is_proxy_primitive<meta::unqualified_t<T>>> = meta::enabler>
+		operator T() const {
+			const Super& super = *static_cast<const Super*>(static_cast<const void*>(this));
+			return super.template get<T>();
+		}
+
+		template <typename T,
+		     meta::enable<meta::neg<meta::is_string_constructible<T>>, meta::neg<is_proxy_primitive<meta::unqualified_t<T>>>> = meta::enabler>
+		operator T&() const {
+			const Super& super = *static_cast<const Super*>(static_cast<const void*>(this));
+			return super.template get<T&>();
+		}
+	};
+
+} // namespace sol
+
+// end of sol/proxy_base.hpp
+
+// beginning of sol/stack_iterator.hpp
+
+#include <limits>
+#include <iterator>
+
+namespace sol {
+	template <typename proxy_t, bool is_const>
+	struct stack_iterator {
+		typedef meta::conditional_t<is_const, const proxy_t, proxy_t> reference;
+		typedef meta::conditional_t<is_const, const proxy_t*, proxy_t*> pointer;
+		typedef proxy_t value_type;
+		typedef std::ptrdiff_t difference_type;
+		typedef std::random_access_iterator_tag iterator_category;
+		lua_State* L;
+		int index;
+		int stacktop;
+		proxy_t sp;
+
+		stack_iterator() : L(nullptr), index((std::numeric_limits<int>::max)()), stacktop((std::numeric_limits<int>::max)()), sp() {
+		}
+		stack_iterator(const stack_iterator<proxy_t, true>& r) : L(r.L), index(r.index), stacktop(r.stacktop), sp(r.sp) {
+		}
+		stack_iterator(lua_State* luastate, int idx, int topidx) : L(luastate), index(idx), stacktop(topidx), sp(luastate, idx) {
+		}
+
+		reference operator*() {
+			return proxy_t(L, index);
+		}
+
+		reference operator*() const {
+			return proxy_t(L, index);
+		}
+
+		pointer operator->() {
+			sp = proxy_t(L, index);
+			return &sp;
+		}
+
+		pointer operator->() const {
+			const_cast<proxy_t&>(sp) = proxy_t(L, index);
+			return &sp;
+		}
+
+		stack_iterator& operator++() {
+			++index;
+			return *this;
+		}
+
+		stack_iterator operator++(int) {
+			auto r = *this;
+			this->operator++();
+			return r;
+		}
+
+		stack_iterator& operator--() {
+			--index;
+			return *this;
+		}
+
+		stack_iterator operator--(int) {
+			auto r = *this;
+			this->operator--();
+			return r;
+		}
+
+		stack_iterator& operator+=(difference_type idx) {
+			index += static_cast<int>(idx);
+			return *this;
+		}
+
+		stack_iterator& operator-=(difference_type idx) {
+			index -= static_cast<int>(idx);
+			return *this;
+		}
+
+		difference_type operator-(const stack_iterator& r) const {
+			return index - r.index;
+		}
+
+		stack_iterator operator+(difference_type idx) const {
+			stack_iterator r = *this;
+			r += idx;
+			return r;
+		}
+
+		reference operator[](difference_type idx) const {
+			return proxy_t(L, index + static_cast<int>(idx));
+		}
+
+		bool operator==(const stack_iterator& r) const {
+			if (stacktop == (std::numeric_limits<int>::max)()) {
+				return r.index == r.stacktop;
+			}
+			else if (r.stacktop == (std::numeric_limits<int>::max)()) {
+				return index == stacktop;
+			}
+			return index == r.index;
+		}
+
+		bool operator!=(const stack_iterator& r) const {
+			return !(this->operator==(r));
+		}
+
+		bool operator<(const stack_iterator& r) const {
+			return index < r.index;
+		}
+
+		bool operator>(const stack_iterator& r) const {
+			return index > r.index;
+		}
+
+		bool operator<=(const stack_iterator& r) const {
+			return index <= r.index;
+		}
+
+		bool operator>=(const stack_iterator& r) const {
+			return index >= r.index;
+		}
+	};
+
+	template <typename proxy_t, bool is_const>
+	inline stack_iterator<proxy_t, is_const> operator+(
+	     typename stack_iterator<proxy_t, is_const>::difference_type n, const stack_iterator<proxy_t, is_const>& r) {
+		return r + n;
+	}
+} // namespace sol
+
+// end of sol/stack_iterator.hpp
+
+// beginning of sol/stack_proxy.hpp
+
+// beginning of sol/stack_proxy_base.hpp
+
+namespace sol {
+	struct stack_proxy_base : public proxy_base<stack_proxy_base> {
+	private:
+		lua_State* m_L;
+		int m_index;
+
+	public:
+		stack_proxy_base() : m_L(nullptr), m_index(0) {
+		}
+		stack_proxy_base(lua_State* L_, int index_) : m_L(L_), m_index(index_) {
+		}
+
+		template <typename T>
+		decltype(auto) get() const {
+			return stack::get<T>(m_L, stack_index());
+		}
+
+		template <typename T>
+		bool is() const {
+			return stack::check<T>(m_L, stack_index());
+		}
+
+		template <typename T>
+		decltype(auto) as() const {
+			return get<T>();
+		}
+
+		type get_type() const noexcept {
+			return type_of(lua_state(), stack_index());
+		}
+
+		int push() const {
+			return push(m_L);
+		}
+
+		int push(lua_State* L_) const {
+			lua_pushvalue(L_, m_index);
+			return 1;
+		}
+
+		lua_State* lua_state() const {
+			return m_L;
+		}
+		int stack_index() const {
+			return m_index;
+		}
+	};
+
+	namespace stack {
+		template <>
+		struct unqualified_getter<stack_proxy_base> {
+			static stack_proxy_base get(lua_State* L_, int index_ = -1) {
+				return stack_proxy_base(L_, index_);
+			}
+		};
+
+		template <>
+		struct unqualified_pusher<stack_proxy_base> {
+			static int push(lua_State*, const stack_proxy_base& proxy_reference) {
+				return proxy_reference.push();
+			}
+		};
+	} // namespace stack
+
+} // namespace sol
+
+// end of sol/stack_proxy_base.hpp
+
+namespace sol {
+	struct stack_proxy : public stack_proxy_base {
+	public:
+		stack_proxy() : stack_proxy_base() {
+		}
+		stack_proxy(lua_State* L, int index) : stack_proxy_base(L, index) {
+		}
+
+		template <typename... Ret, typename... Args>
+		decltype(auto) call(Args&&... args);
+
+		template <typename... Args>
+		decltype(auto) operator()(Args&&... args) {
+			return call<>(std::forward<Args>(args)...);
+		}
+	};
+
+	namespace stack {
+		template <>
+		struct unqualified_getter<stack_proxy> {
+			static stack_proxy get(lua_State* L, int index, record& tracking) {
+				tracking.use(0);
+				return stack_proxy(L, index);
+			}
+		};
+
+		template <>
+		struct unqualified_pusher<stack_proxy> {
+			static int push(lua_State*, const stack_proxy& ref) {
+				return ref.push();
+			}
+		};
+	} // namespace stack
+} // namespace sol
+
+// end of sol/stack_proxy.hpp
+
+#include <cstdint>
+
+namespace sol {
+	struct protected_function_result : public proxy_base<protected_function_result> {
+	private:
+		lua_State* L;
+		int index;
+		int returncount;
+		int popcount;
+		call_status err;
+
+	public:
+		typedef stack_proxy reference_type;
+		typedef stack_proxy value_type;
+		typedef stack_proxy* pointer;
+		typedef std::ptrdiff_t difference_type;
+		typedef std::size_t size_type;
+		typedef stack_iterator<stack_proxy, false> iterator;
+		typedef stack_iterator<stack_proxy, true> const_iterator;
+		typedef std::reverse_iterator<iterator> reverse_iterator;
+		typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
+
+		protected_function_result() noexcept : protected_function_result(nullptr) {}
+		protected_function_result(lua_State* Ls, int idx = -1, int retnum = 0, int popped = 0, call_status pferr = call_status::ok) noexcept
+		: L(Ls), index(idx), returncount(retnum), popcount(popped), err(pferr) {
+		}
+
+		// We do not want anyone to copy these around willy-nilly
+		// Will likely break people, but also will probably get rid of quiet bugs that have
+		// been lurking. (E.g., Vanilla Lua will just quietly discard over-pops and under-pops:
+		// LuaJIT and other Lua engines will implode and segfault at random later times.)
+		protected_function_result(const protected_function_result&) = delete;
+		protected_function_result& operator=(const protected_function_result&) = delete;
+
+		protected_function_result(protected_function_result&& o) noexcept
+		: L(o.L), index(o.index), returncount(o.returncount), popcount(o.popcount), err(o.err) {
+			// Must be manual, otherwise destructor will screw us
+			// return count being 0 is enough to keep things clean
+			// but we will be thorough
+			o.abandon();
+		}
+		protected_function_result& operator=(protected_function_result&& o) noexcept {
+			L = o.L;
+			index = o.index;
+			returncount = o.returncount;
+			popcount = o.popcount;
+			err = o.err;
+			// Must be manual, otherwise destructor will screw us
+			// return count being 0 is enough to keep things clean
+			// but we will be thorough
+			o.abandon();
+			return *this;
+		}
+
+		protected_function_result(const unsafe_function_result& o) = delete;
+		protected_function_result& operator=(const unsafe_function_result& o) = delete;
+		protected_function_result(unsafe_function_result&& o) noexcept;
+		protected_function_result& operator=(unsafe_function_result&& o) noexcept;
+
+		call_status status() const noexcept {
+			return err;
+		}
+
+		bool valid() const noexcept {
+			return status() == call_status::ok || status() == call_status::yielded;
+		}
+
+#if SOL_IS_ON(SOL_COMPILER_GCC)
+#pragma GCC diagnostic push
+#if !SOL_IS_ON(SOL_COMPILER_CLANG)
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif
+#endif
+
+		template <typename T>
+		decltype(auto) get(int index_offset = 0) const {
+			using UT = meta::unqualified_t<T>;
+			int target = index + index_offset;
+			if constexpr (meta::is_optional_v<UT>) {
+				using ValueType = typename UT::value_type;
+				if constexpr (std::is_same_v<ValueType, error>) {
+					if (valid()) {
+						return UT();
+					}
+					return UT(error(detail::direct_error, stack::get<std::string>(L, target)));
+				}
+				else {
+					if (!valid()) {
+						return UT();
+					}
+					return stack::get<UT>(L, target);
+				}
+			}
+			else {
+				if constexpr (std::is_same_v<T, error>) {
+#if SOL_IS_ON(SOL_SAFE_PROXIES)
+					if (valid()) {
+						type t = type_of(L, target);
+						type_panic_c_str(L, target, t, type::none, "bad get from protected_function_result (is an error)");
+					}
+#endif // Check Argument Safety
+					return error(detail::direct_error, stack::get<std::string>(L, target));
+				}
+				else {
+#if SOL_IS_ON(SOL_SAFE_PROXIES)
+					if (!valid()) {
+						type t = type_of(L, target);
+						type_panic_c_str(L, target, t, type::none, "bad get from protected_function_result (is not an error)");
+					}
+#endif // Check Argument Safety
+					return stack::get<T>(L, target);
+				}
+			}
+		}
+
+#if SOL_IS_ON(SOL_COMPILER_GCC)
+#pragma GCC diagnostic pop
+#endif
+
+		type get_type(int index_offset = 0) const noexcept {
+			return type_of(L, index + static_cast<int>(index_offset));
+		}
+
+		stack_proxy operator[](difference_type index_offset) const {
+			return stack_proxy(L, index + static_cast<int>(index_offset));
+		}
+
+		iterator begin() {
+			return iterator(L, index, stack_index() + return_count());
+		}
+		iterator end() {
+			return iterator(L, stack_index() + return_count(), stack_index() + return_count());
+		}
+		const_iterator begin() const {
+			return const_iterator(L, index, stack_index() + return_count());
+		}
+		const_iterator end() const {
+			return const_iterator(L, stack_index() + return_count(), stack_index() + return_count());
+		}
+		const_iterator cbegin() const {
+			return begin();
+		}
+		const_iterator cend() const {
+			return end();
+		}
+
+		reverse_iterator rbegin() {
+			return std::reverse_iterator<iterator>(begin());
+		}
+		reverse_iterator rend() {
+			return std::reverse_iterator<iterator>(end());
+		}
+		const_reverse_iterator rbegin() const {
+			return std::reverse_iterator<const_iterator>(begin());
+		}
+		const_reverse_iterator rend() const {
+			return std::reverse_iterator<const_iterator>(end());
+		}
+		const_reverse_iterator crbegin() const {
+			return std::reverse_iterator<const_iterator>(cbegin());
+		}
+		const_reverse_iterator crend() const {
+			return std::reverse_iterator<const_iterator>(cend());
+		}
+
+		lua_State* lua_state() const noexcept {
+			return L;
+		};
+		int stack_index() const noexcept {
+			return index;
+		};
+		int return_count() const noexcept {
+			return returncount;
+		};
+		int pop_count() const noexcept {
+			return popcount;
+		};
+		void abandon() noexcept {
+			// L = nullptr;
+			index = 0;
+			returncount = 0;
+			popcount = 0;
+			err = call_status::runtime;
+		}
+		~protected_function_result() {
+			if (L == nullptr)
+				return;
+			stack::remove(L, index, popcount);
+		}
+	};
+
+	namespace stack {
+		template <>
+		struct unqualified_pusher<protected_function_result> {
+			static int push(lua_State* L, const protected_function_result& pfr) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+				luaL_checkstack(L, static_cast<int>(pfr.pop_count()), detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+				int p = 0;
+				for (int i = 0; i < pfr.pop_count(); ++i) {
+					lua_pushvalue(L, i + pfr.stack_index());
+					++p;
+				}
+				return p;
+			}
+		};
+	} // namespace stack
+} // namespace sol
+
+// end of sol/protected_function_result.hpp
+
+// beginning of sol/unsafe_function_result.hpp
+
+#include <cstdint>
+
+namespace sol {
+	struct unsafe_function_result : public proxy_base<unsafe_function_result> {
+	private:
+		lua_State* L;
+		int index;
+		int returncount;
+
+	public:
+		typedef stack_proxy reference_type;
+		typedef stack_proxy value_type;
+		typedef stack_proxy* pointer;
+		typedef std::ptrdiff_t difference_type;
+		typedef std::size_t size_type;
+		typedef stack_iterator<stack_proxy, false> iterator;
+		typedef stack_iterator<stack_proxy, true> const_iterator;
+		typedef std::reverse_iterator<iterator> reverse_iterator;
+		typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
+
+		unsafe_function_result() noexcept : unsafe_function_result(nullptr) {}
+		unsafe_function_result(lua_State* Ls, int idx = -1, int retnum = 0) noexcept : L(Ls), index(idx), returncount(retnum) {
+		}
+
+		// We do not want anyone to copy these around willy-nilly
+		// Will likely break people, but also will probably get rid of quiet bugs that have
+		// been lurking. (E.g., Vanilla Lua will just quietly discard over-pops and under-pops:
+		// LuaJIT and other Lua engines will implode and segfault at random later times.)
+		unsafe_function_result(const unsafe_function_result&) = delete;
+		unsafe_function_result& operator=(const unsafe_function_result&) = delete;
+
+		unsafe_function_result(unsafe_function_result&& o) noexcept : L(o.L), index(o.index), returncount(o.returncount) {
+			// Must be manual, otherwise destructor will screw us
+			// return count being 0 is enough to keep things clean
+			// but will be thorough
+			o.abandon();
+		}
+		unsafe_function_result& operator=(unsafe_function_result&& o) noexcept {
+			L = o.L;
+			index = o.index;
+			returncount = o.returncount;
+			// Must be manual, otherwise destructor will screw us
+			// return count being 0 is enough to keep things clean
+			// but will be thorough
+			o.abandon();
+			return *this;
+		}
+
+		unsafe_function_result(const protected_function_result& o) = delete;
+		unsafe_function_result& operator=(const protected_function_result& o) = delete;
+		unsafe_function_result(protected_function_result&& o) noexcept;
+		unsafe_function_result& operator=(protected_function_result&& o) noexcept;
+
+		template <typename T>
+		decltype(auto) get(difference_type index_offset = 0) const {
+			return stack::get<T>(L, index + static_cast<int>(index_offset));
+		}
+
+		type get_type(difference_type index_offset = 0) const noexcept {
+			return type_of(L, index + static_cast<int>(index_offset));
+		}
+
+		stack_proxy operator[](difference_type index_offset) const {
+			return stack_proxy(L, index + static_cast<int>(index_offset));
+		}
+
+		iterator begin() {
+			return iterator(L, index, stack_index() + return_count());
+		}
+		iterator end() {
+			return iterator(L, stack_index() + return_count(), stack_index() + return_count());
+		}
+		const_iterator begin() const {
+			return const_iterator(L, index, stack_index() + return_count());
+		}
+		const_iterator end() const {
+			return const_iterator(L, stack_index() + return_count(), stack_index() + return_count());
+		}
+		const_iterator cbegin() const {
+			return begin();
+		}
+		const_iterator cend() const {
+			return end();
+		}
+
+		reverse_iterator rbegin() {
+			return std::reverse_iterator<iterator>(begin());
+		}
+		reverse_iterator rend() {
+			return std::reverse_iterator<iterator>(end());
+		}
+		const_reverse_iterator rbegin() const {
+			return std::reverse_iterator<const_iterator>(begin());
+		}
+		const_reverse_iterator rend() const {
+			return std::reverse_iterator<const_iterator>(end());
+		}
+		const_reverse_iterator crbegin() const {
+			return std::reverse_iterator<const_iterator>(cbegin());
+		}
+		const_reverse_iterator crend() const {
+			return std::reverse_iterator<const_iterator>(cend());
+		}
+
+		call_status status() const noexcept {
+			return call_status::ok;
+		}
+
+		bool valid() const noexcept {
+			return status() == call_status::ok || status() == call_status::yielded;
+		}
+
+		lua_State* lua_state() const {
+			return L;
+		};
+		int stack_index() const {
+			return index;
+		};
+		int return_count() const {
+			return returncount;
+		};
+		void abandon() noexcept {
+			// L = nullptr;
+			index = 0;
+			returncount = 0;
+		}
+		~unsafe_function_result() {
+			if (L != nullptr) {
+				lua_pop(L, returncount);
+			}
+		}
+	};
+
+	namespace stack {
+		template <>
+		struct unqualified_pusher<unsafe_function_result> {
+			static int push(lua_State* L, const unsafe_function_result& fr) {
+				int p = 0;
+				for (int i = 0; i < fr.return_count(); ++i) {
+					lua_pushvalue(L, i + fr.stack_index());
+					++p;
+				}
+				return p;
+			}
+		};
+	} // namespace stack
+} // namespace sol
+
+// end of sol/unsafe_function_result.hpp
+
+#include <cstdint>
+
+namespace sol {
+
+	namespace detail {
+		template <>
+		struct is_speshul<unsafe_function_result> : std::true_type { };
+		template <>
+		struct is_speshul<protected_function_result> : std::true_type { };
+
+		template <std::size_t I, typename... Args, typename T>
+		stack_proxy get(types<Args...>, meta::index_value<0>, meta::index_value<I>, const T& fr) {
+			return stack_proxy(fr.lua_state(), fr.stack_index() + static_cast<int>(I));
+		}
+
+		template <std::size_t I, std::size_t N, typename Arg, typename... Args, typename T, meta::enable<meta::boolean<(N > 0)>> = meta::enabler>
+		stack_proxy get(types<Arg, Args...>, meta::index_value<N>, meta::index_value<I>, const T& fr) {
+			return get(types<Args...>(), meta::index_value<N - 1>(), meta::index_value<I + lua_size<Arg>::value>(), fr);
+		}
+	} // namespace detail
+
+	template <>
+	struct tie_size<unsafe_function_result> : std::integral_constant<std::size_t, SIZE_MAX> { };
+
+	template <>
+	struct tie_size<protected_function_result> : std::integral_constant<std::size_t, SIZE_MAX> { };
+
+	template <std::size_t I>
+	stack_proxy get(const unsafe_function_result& fr) {
+		return stack_proxy(fr.lua_state(), fr.stack_index() + static_cast<int>(I));
+	}
+
+	template <std::size_t I, typename... Args>
+	stack_proxy get(types<Args...> t, const unsafe_function_result& fr) {
+		return detail::get(t, meta::index_value<I>(), meta::index_value<0>(), fr);
+	}
+
+	template <std::size_t I>
+	stack_proxy get(const protected_function_result& fr) {
+		return stack_proxy(fr.lua_state(), fr.stack_index() + static_cast<int>(I));
+	}
+
+	template <std::size_t I, typename... Args>
+	stack_proxy get(types<Args...> t, const protected_function_result& fr) {
+		return detail::get(t, meta::index_value<I>(), meta::index_value<0>(), fr);
+	}
+} // namespace sol
+
+// end of sol/function_result.hpp
+
+// beginning of sol/function_types.hpp
+
+// beginning of sol/function_types_core.hpp
+
+// beginning of sol/wrapper.hpp
+
+namespace sol {
+
+	namespace detail {
+		template <typename T>
+		using array_return_type = meta::conditional_t<std::is_array<T>::value, std::add_lvalue_reference_t<T>, T>;
+	}
+
+	template <typename F, typename = void>
+	struct wrapper {
+		typedef lua_bind_traits<meta::unqualified_t<F>> traits_type;
+		typedef typename traits_type::args_list args_list;
+		typedef typename traits_type::args_list free_args_list;
+		typedef typename traits_type::returns_list returns_list;
+
+		template <typename... Args>
+		static decltype(auto) call(F& f, Args&&... args) {
+			return f(std::forward<Args>(args)...);
+		}
+
+		struct caller {
+			template <typename... Args>
+			decltype(auto) operator()(F& fx, Args&&... args) const {
+				return call(fx, std::forward<Args>(args)...);
+			}
+		};
+	};
+
+	template <typename F>
+	struct wrapper<F, std::enable_if_t<std::is_function<std::remove_pointer_t<meta::unqualified_t<F>>>::value>> {
+		typedef lua_bind_traits<std::remove_pointer_t<meta::unqualified_t<F>>> traits_type;
+		typedef typename traits_type::args_list args_list;
+		typedef typename traits_type::args_list free_args_list;
+		typedef typename traits_type::returns_list returns_list;
+
+		template <F fx, typename... Args>
+		static decltype(auto) invoke(Args&&... args) {
+			return fx(std::forward<Args>(args)...);
+		}
+
+		template <typename... Args>
+		static decltype(auto) call(F& fx, Args&&... args) {
+			return fx(std::forward<Args>(args)...);
+		}
+
+		struct caller {
+			template <typename... Args>
+			decltype(auto) operator()(F& fx, Args&&... args) const {
+				return call(fx, std::forward<Args>(args)...);
+			}
+		};
+
+		template <F fx>
+		struct invoker {
+			template <typename... Args>
+			decltype(auto) operator()(Args&&... args) const {
+				return invoke<fx>(std::forward<Args>(args)...);
+			}
+		};
+	};
+
+	template <typename F>
+	struct wrapper<F, std::enable_if_t<std::is_member_object_pointer<meta::unqualified_t<F>>::value>> {
+		typedef lua_bind_traits<meta::unqualified_t<F>> traits_type;
+		typedef typename traits_type::object_type object_type;
+		typedef typename traits_type::return_type return_type;
+		typedef typename traits_type::args_list args_list;
+		typedef types<object_type&, return_type> free_args_list;
+		typedef typename traits_type::returns_list returns_list;
+
+		template <F fx>
+		static auto call(object_type& mem) -> detail::array_return_type<decltype(mem.*fx)> {
+			return mem.*fx;
+		}
+
+		template <F fx, typename Arg, typename... Args>
+		static decltype(auto) invoke(object_type& mem, Arg&& arg, Args&&...) {
+			return mem.*fx = std::forward<Arg>(arg);
+		}
+
+		template <typename Fx>
+		static auto call(Fx&& fx, object_type& mem) -> detail::array_return_type<decltype(mem.*fx)> {
+			return mem.*fx;
+		}
+
+		template <typename Fx, typename Arg, typename... Args>
+		static void call(Fx&& fx, object_type& mem, Arg&& arg, Args&&...) {
+			using actual_type = meta::unqualified_t<detail::array_return_type<decltype(mem.*fx)>>;
+			if constexpr (std::is_array_v<actual_type>) {
+				using std::cbegin;
+				using std::cend;
+				auto first = cbegin(arg);
+				auto last = cend(arg);
+				for (std::size_t i = 0; first != last; ++i, ++first) {
+					(mem.*fx)[i] = *first;
+				}
+			}
+			else {
+				(mem.*fx) = std::forward<Arg>(arg);
+			}
+		}
+
+		struct caller {
+			template <typename Fx, typename... Args>
+			decltype(auto) operator()(Fx&& fx, object_type& mem, Args&&... args) const {
+				return call(std::forward<Fx>(fx), mem, std::forward<Args>(args)...);
+			}
+		};
+
+		template <F fx>
+		struct invoker {
+			template <typename... Args>
+			decltype(auto) operator()(Args&&... args) const {
+				return invoke<fx>(std::forward<Args>(args)...);
+			}
+		};
+	};
+
+	template <typename F, typename R, typename O, typename... FArgs>
+	struct member_function_wrapper {
+		typedef O object_type;
+		typedef lua_bind_traits<F> traits_type;
+		typedef typename traits_type::args_list args_list;
+		typedef types<object_type&, FArgs...> free_args_list;
+		typedef meta::tuple_types<R> returns_list;
+
+		template <F fx, typename... Args>
+		static R invoke(O& mem, Args&&... args) {
+			return (mem.*fx)(std::forward<Args>(args)...);
+		}
+
+		template <typename Fx, typename... Args>
+		static R call(Fx&& fx, O& mem, Args&&... args) {
+			return (mem.*fx)(std::forward<Args>(args)...);
+		}
+
+		struct caller {
+			template <typename Fx, typename... Args>
+			decltype(auto) operator()(Fx&& fx, O& mem, Args&&... args) const {
+				return call(std::forward<Fx>(fx), mem, std::forward<Args>(args)...);
+			}
+		};
+
+		template <F fx>
+		struct invoker {
+			template <typename... Args>
+			decltype(auto) operator()(O& mem, Args&&... args) const {
+				return invoke<fx>(mem, std::forward<Args>(args)...);
+			}
+		};
+	};
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...)> : public member_function_wrapper<R (O::*)(Args...), R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) const> : public member_function_wrapper<R (O::*)(Args...) const, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) const volatile> : public member_function_wrapper<R (O::*)(Args...) const volatile, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...)&> : public member_function_wrapper<R (O::*)(Args...)&, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) const&> : public member_function_wrapper<R (O::*)(Args...) const&, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) const volatile&> : public member_function_wrapper<R (O::*)(Args...) const volatile&, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args..., ...)&> : public member_function_wrapper<R (O::*)(Args..., ...)&, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args..., ...) const&> : public member_function_wrapper<R (O::*)(Args..., ...) const&, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args..., ...) const volatile&> : public member_function_wrapper<R (O::*)(Args..., ...) const volatile&, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) &&> : public member_function_wrapper<R (O::*)(Args...)&, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) const&&> : public member_function_wrapper<R (O::*)(Args...) const&, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) const volatile&&> : public member_function_wrapper<R (O::*)(Args...) const volatile&, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args..., ...) &&> : public member_function_wrapper<R (O::*)(Args..., ...)&, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args..., ...) const&&> : public member_function_wrapper<R (O::*)(Args..., ...) const&, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args..., ...) const volatile&&> : public member_function_wrapper<R (O::*)(Args..., ...) const volatile&, R, O, Args...> { };
+
+#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE)
+	// noexcept has become a part of a function's type
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) noexcept> : public member_function_wrapper<R (O::*)(Args...) noexcept, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) const noexcept> : public member_function_wrapper<R (O::*)(Args...) const noexcept, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) const volatile noexcept> : public member_function_wrapper<R (O::*)(Args...) const volatile noexcept, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...)& noexcept> : public member_function_wrapper<R (O::*)(Args...)& noexcept, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) const& noexcept> : public member_function_wrapper<R (O::*)(Args...) const& noexcept, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) const volatile& noexcept> : public member_function_wrapper<R (O::*)(Args...) const volatile& noexcept, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args..., ...)& noexcept> : public member_function_wrapper<R (O::*)(Args..., ...)& noexcept, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args..., ...) const& noexcept> : public member_function_wrapper<R (O::*)(Args..., ...) const& noexcept, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args..., ...) const volatile& noexcept>
+	: public member_function_wrapper<R (O::*)(Args..., ...) const volatile& noexcept, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...)&& noexcept> : public member_function_wrapper<R (O::*)(Args...)& noexcept, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) const&& noexcept> : public member_function_wrapper<R (O::*)(Args...) const& noexcept, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) const volatile&& noexcept> : public member_function_wrapper<R (O::*)(Args...) const volatile& noexcept, R, O, Args...> {
+	};
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args..., ...)&& noexcept> : public member_function_wrapper<R (O::*)(Args..., ...)& noexcept, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args..., ...) const&& noexcept> : public member_function_wrapper<R (O::*)(Args..., ...) const& noexcept, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args..., ...) const volatile&& noexcept>
+	: public member_function_wrapper<R (O::*)(Args..., ...) const volatile& noexcept, R, O, Args...> { };
+
+#endif // noexcept is part of a function's type
+
+} // namespace sol
+
+// end of sol/wrapper.hpp
+
+#include <memory>
+
+namespace sol { namespace function_detail {
+	template <typename Fx, int start = 1, bool is_yielding = false>
+	int call(lua_State* L) {
+		Fx& fx = stack::get<user<Fx>>(L, upvalue_index(start));
+		int nr = fx(L);
+		if (is_yielding) {
+			return lua_yield(L, nr);
+		}
+		else {
+			return nr;
+		}
+	}
+}} // namespace sol::function_detail
+
+// end of sol/function_types_core.hpp
+
+// beginning of sol/function_types_templated.hpp
+
+// beginning of sol/call.hpp
+
+// beginning of sol/property.hpp
+
+#include <type_traits>
+#include <utility>
+
+namespace sol {
+	namespace detail {
+		struct no_prop { };
+	} // namespace detail
+
+	template <typename R, typename W>
+	struct property_wrapper : detail::ebco<R, 0>, detail::ebco<W, 1> {
+	private:
+		using read_base_t = detail::ebco<R, 0>;
+		using write_base_t = detail::ebco<W, 1>;
+
+	public:
+		template <typename Rx, typename Wx>
+		property_wrapper(Rx&& r, Wx&& w) : read_base_t(std::forward<Rx>(r)), write_base_t(std::forward<Wx>(w)) {
+		}
+
+		W& write() {
+			return write_base_t::value();
+		}
+
+		const W& write() const {
+			return write_base_t::value();
+		}
+
+		R& read() {
+			return read_base_t::value();
+		}
+
+		const R& read() const {
+			return read_base_t::value();
+		}
+	};
+
+	template <typename F, typename G>
+	inline decltype(auto) property(F&& f, G&& g) {
+		typedef lua_bind_traits<meta::unqualified_t<F>> left_traits;
+		typedef lua_bind_traits<meta::unqualified_t<G>> right_traits;
+		if constexpr (left_traits::free_arity < right_traits::free_arity) {
+			return property_wrapper<std::decay_t<F>, std::decay_t<G>>(std::forward<F>(f), std::forward<G>(g));
+		}
+		else {
+			return property_wrapper<std::decay_t<G>, std::decay_t<F>>(std::forward<G>(g), std::forward<F>(f));
+		}
+	}
+
+	template <typename F>
+	inline decltype(auto) property(F&& f) {
+		typedef lua_bind_traits<meta::unqualified_t<F>> left_traits;
+		if constexpr (left_traits::free_arity < 2) {
+			return property_wrapper<std::decay_t<F>, detail::no_prop>(std::forward<F>(f), detail::no_prop());
+		}
+		else {
+			return property_wrapper<detail::no_prop, std::decay_t<F>>(detail::no_prop(), std::forward<F>(f));
+		}
+	}
+
+	template <typename F>
+	inline decltype(auto) readonly_property(F&& f) {
+		return property_wrapper<std::decay_t<F>, detail::no_prop>(std::forward<F>(f), detail::no_prop());
+	}
+
+	template <typename F>
+	inline decltype(auto) writeonly_property(F&& f) {
+		return property_wrapper<detail::no_prop, std::decay_t<F>>(detail::no_prop(), std::forward<F>(f));
+	}
+
+	template <typename T>
+	struct readonly_wrapper : detail::ebco<T> {
+	private:
+		using base_t = detail::ebco<T>;
+
+	public:
+		using base_t::base_t;
+
+		operator T&() {
+			return base_t::value();
+		}
+		operator const T&() const {
+			return base_t::value();
+		}
+	};
+
+	// Allow someone to make a member variable readonly (const)
+	template <typename R, typename T>
+	inline auto readonly(R T::*v) {
+		return readonly_wrapper<meta::unqualified_t<decltype(v)>>(v);
+	}
+
+	template <typename T>
+	struct var_wrapper : detail::ebco<T> {
+	private:
+		using base_t = detail::ebco<T>;
+
+	public:
+		using base_t::base_t;
+	};
+
+	template <typename V>
+	inline auto var(V&& v) {
+		typedef std::decay_t<V> T;
+		return var_wrapper<T>(std::forward<V>(v));
+	}
+
+	namespace meta {
+		template <typename T>
+		using is_member_object = std::integral_constant<bool, std::is_member_object_pointer_v<T> || is_specialization_of_v<T, readonly_wrapper>>;
+
+		template <typename T>
+		inline constexpr bool is_member_object_v = is_member_object<T>::value;
+
+		template <typename T>
+		using is_member_object_or_function = std::integral_constant<bool, is_member_object_v<T> || std::is_member_pointer_v<T>>;
+
+		template <typename T>
+		inline constexpr bool is_member_object_or_function_v = is_member_object_or_function<T>::value;
+	} // namespace meta
+
+} // namespace sol
+
+// end of sol/property.hpp
+
+// beginning of sol/protect.hpp
+
+#include <utility>
+
+namespace sol {
+
+	template <typename T>
+	struct protect_t {
+		T value;
+
+		template <typename Arg, typename... Args, meta::disable<std::is_same<protect_t, meta::unqualified_t<Arg>>> = meta::enabler>
+		protect_t(Arg&& arg, Args&&... args) : value(std::forward<Arg>(arg), std::forward<Args>(args)...) {
+		}
+
+		protect_t(const protect_t&) = default;
+		protect_t(protect_t&&) = default;
+		protect_t& operator=(const protect_t&) = default;
+		protect_t& operator=(protect_t&&) = default;
+	};
+
+	template <typename T>
+	auto protect(T&& value) {
+		return protect_t<std::decay_t<T>>(std::forward<T>(value));
+	}
+
+} // namespace sol
+
+// end of sol/protect.hpp
+
+namespace sol {
+	namespace u_detail {
+
+	} // namespace u_detail
+
+	namespace policy_detail {
+		template <int I, int... In>
+		inline void handle_policy(static_stack_dependencies<I, In...>, lua_State* L, int&) {
+			if constexpr (sizeof...(In) == 0) {
+				(void)L;
+				return;
+			}
+			else {
+				absolute_index ai(L, I);
+				if (type_of(L, ai) != type::userdata) {
+					return;
+				}
+				lua_createtable(L, static_cast<int>(sizeof...(In)), 0);
+				stack_reference deps(L, -1);
+				auto per_dep = [&L, &deps](int i) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+					luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+					lua_pushvalue(L, i);
+					luaL_ref(L, deps.stack_index());
+				};
+				(void)per_dep;
+				(void)detail::swallow { int(), (per_dep(In), int())... };
+				lua_setuservalue(L, ai);
+			}
+		}
+
+		template <int... In>
+		inline void handle_policy(returns_self_with<In...>, lua_State* L, int& pushed) {
+			pushed = stack::push(L, raw_index(1));
+			handle_policy(static_stack_dependencies<-1, In...>(), L, pushed);
+		}
+
+		inline void handle_policy(const stack_dependencies& sdeps, lua_State* L, int&) {
+			absolute_index ai(L, sdeps.target);
+			if (type_of(L, ai) != type::userdata) {
+				return;
+			}
+			lua_createtable(L, static_cast<int>(sdeps.size()), 0);
+			stack_reference deps(L, -1);
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, static_cast<int>(sdeps.size()), detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			for (std::size_t i = 0; i < sdeps.size(); ++i) {
+				lua_pushvalue(L, sdeps.stack_indices[i]);
+				luaL_ref(L, deps.stack_index());
+			}
+			lua_setuservalue(L, ai);
+		}
+
+		template <typename P, meta::disable<std::is_base_of<detail::policy_base_tag, meta::unqualified_t<P>>> = meta::enabler>
+		inline void handle_policy(P&& p, lua_State* L, int& pushed) {
+			pushed = std::forward<P>(p)(L, pushed);
+		}
+	} // namespace policy_detail
+
+	namespace function_detail {
+		inline int no_construction_error(lua_State* L) {
+			return luaL_error(L, "sol: cannot call this constructor (tagged as non-constructible)");
+		}
+	} // namespace function_detail
+
+	namespace call_detail {
+
+		template <typename R, typename W>
+		inline auto& pick(std::true_type, property_wrapper<R, W>& f) {
+			return f.read();
+		}
+
+		template <typename R, typename W>
+		inline auto& pick(std::false_type, property_wrapper<R, W>& f) {
+			return f.write();
+		}
+
+		template <typename T, typename List>
+		struct void_call : void_call<T, meta::function_args_t<List>> { };
+
+		template <typename T, typename... Args>
+		struct void_call<T, types<Args...>> {
+			static void call(Args...) {
+			}
+		};
+
+		template <typename T, bool checked, bool clean_stack>
+		struct constructor_match {
+			T* obj_;
+			reference* obj_lua_ref_;
+			stack::stack_detail::undefined_metatable* p_umf_;
+
+			constructor_match(T* obj_ptr, reference& obj_lua_ref, stack::stack_detail::undefined_metatable& umf)
+			: obj_(obj_ptr), obj_lua_ref_(&obj_lua_ref), p_umf_(&umf) {
+			}
+
+			template <typename Fx, std::size_t I, typename... R, typename... Args>
+			int operator()(types<Fx>, meta::index_value<I>, types<R...> r, types<Args...> a, lua_State* L, int, int start) const {
+				detail::default_construct func {};
+				int result = stack::call_into_lua<checked, clean_stack>(r, a, L, start, func, this->obj_);
+				// construct userdata table
+				// SPECIFICALLY, after we've created it successfully.
+				// If the constructor exits for any reason we have to break things down...
+				if constexpr (clean_stack) {
+					obj_lua_ref_->push();
+					(*this->p_umf_)();
+					obj_lua_ref_->pop();
+				}
+				else {
+					(*this->p_umf_)();
+				}
+				return result;
+			}
+		};
+
+		namespace overload_detail {
+			template <std::size_t... M, typename Match, typename... Args>
+			inline int overload_match_arity(types<>, std::index_sequence<>, std::index_sequence<M...>, Match&&, lua_State* L, int, int, Args&&...) {
+				return luaL_error(L, "sol: no matching function call takes this number of arguments and the specified types");
+			}
+
+			template <typename Fx, typename... Fxs, std::size_t I, std::size_t... In, std::size_t... M, typename Match, typename... Args>
+			inline int overload_match_arity(types<Fx, Fxs...>, std::index_sequence<I, In...>, std::index_sequence<M...>, Match&& matchfx, lua_State* L,
+			     int fxarity, int start, Args&&... args) {
+				typedef lua_bind_traits<meta::unwrap_unqualified_t<Fx>> traits;
+				typedef meta::tuple_types<typename traits::return_type> return_types;
+				typedef typename traits::free_args_list args_list;
+				// compile-time eliminate any functions that we know ahead of time are of improper arity
+				if constexpr (!traits::runtime_variadics_t::value
+				     && meta::find_in_pack_v<meta::index_value<traits::free_arity>, meta::index_value<M>...>::value) {
+					return overload_match_arity(types<Fxs...>(),
+					     std::index_sequence<In...>(),
+					     std::index_sequence<M...>(),
+					     std::forward<Match>(matchfx),
+					     L,
+					     fxarity,
+					     start,
+					     std::forward<Args>(args)...);
+				}
+				else {
+					if constexpr (!traits::runtime_variadics_t::value) {
+						if (traits::free_arity != fxarity) {
+							return overload_match_arity(types<Fxs...>(),
+							     std::index_sequence<In...>(),
+							     std::index_sequence<traits::free_arity, M...>(),
+							     std::forward<Match>(matchfx),
+							     L,
+							     fxarity,
+							     start,
+							     std::forward<Args>(args)...);
+						}
+					}
+					stack::record tracking {};
+					if (!stack::stack_detail::check_types(args_list(), L, start, &no_panic, tracking)) {
+						return overload_match_arity(types<Fxs...>(),
+						     std::index_sequence<In...>(),
+						     std::index_sequence<M...>(),
+						     std::forward<Match>(matchfx),
+						     L,
+						     fxarity,
+						     start,
+						     std::forward<Args>(args)...);
+					}
+					return matchfx(types<Fx>(), meta::index_value<I>(), return_types(), args_list(), L, fxarity, start, std::forward<Args>(args)...);
+				}
+			}
+
+			template <std::size_t... M, typename Match, typename... Args>
+			inline int overload_match_arity_single(
+			     types<>, std::index_sequence<>, std::index_sequence<M...>, Match&& matchfx, lua_State* L, int fxarity, int start, Args&&... args) {
+				return overload_match_arity(types<>(),
+				     std::index_sequence<>(),
+				     std::index_sequence<M...>(),
+				     std::forward<Match>(matchfx),
+				     L,
+				     fxarity,
+				     start,
+				     std::forward<Args>(args)...);
+			}
+
+			template <typename Fx, std::size_t I, std::size_t... M, typename Match, typename... Args>
+			inline int overload_match_arity_single(
+			     types<Fx>, std::index_sequence<I>, std::index_sequence<M...>, Match&& matchfx, lua_State* L, int fxarity, int start, Args&&... args) {
+				typedef lua_bind_traits<meta::unwrap_unqualified_t<Fx>> traits;
+				typedef meta::tuple_types<typename traits::return_type> return_types;
+				typedef typename traits::free_args_list args_list;
+				// compile-time eliminate any functions that we know ahead of time are of improper arity
+				if constexpr (!traits::runtime_variadics_t::value
+				     && meta::find_in_pack_v<meta::index_value<traits::free_arity>, meta::index_value<M>...>::value) {
+					return overload_match_arity(types<>(),
+					     std::index_sequence<>(),
+					     std::index_sequence<M...>(),
+					     std::forward<Match>(matchfx),
+					     L,
+					     fxarity,
+					     start,
+					     std::forward<Args>(args)...);
+				}
+				if constexpr (!traits::runtime_variadics_t::value) {
+					if (traits::free_arity != fxarity) {
+						return overload_match_arity(types<>(),
+						     std::index_sequence<>(),
+						     std::index_sequence<traits::free_arity, M...>(),
+						     std::forward<Match>(matchfx),
+						     L,
+						     fxarity,
+						     start,
+						     std::forward<Args>(args)...);
+					}
+				}
+				return matchfx(types<Fx>(), meta::index_value<I>(), return_types(), args_list(), L, fxarity, start, std::forward<Args>(args)...);
+			}
+
+			template <typename Fx, typename Fx1, typename... Fxs, std::size_t I, std::size_t I1, std::size_t... In, std::size_t... M, typename Match,
+			     typename... Args>
+			inline int overload_match_arity_single(types<Fx, Fx1, Fxs...>, std::index_sequence<I, I1, In...>, std::index_sequence<M...>, Match&& matchfx,
+			     lua_State* L, int fxarity, int start, Args&&... args) {
+				typedef lua_bind_traits<meta::unwrap_unqualified_t<Fx>> traits;
+				typedef meta::tuple_types<typename traits::return_type> return_types;
+				typedef typename traits::free_args_list args_list;
+				// compile-time eliminate any functions that we know ahead of time are of improper arity
+				if constexpr (!traits::runtime_variadics_t::value
+				     && meta::find_in_pack_v<meta::index_value<traits::free_arity>, meta::index_value<M>...>::value) {
+					return overload_match_arity(types<Fx1, Fxs...>(),
+					     std::index_sequence<I1, In...>(),
+					     std::index_sequence<M...>(),
+					     std::forward<Match>(matchfx),
+					     L,
+					     fxarity,
+					     start,
+					     std::forward<Args>(args)...);
+				}
+				else {
+					if constexpr (!traits::runtime_variadics_t::value) {
+						if (traits::free_arity != fxarity) {
+							return overload_match_arity(types<Fx1, Fxs...>(),
+							     std::index_sequence<I1, In...>(),
+							     std::index_sequence<traits::free_arity, M...>(),
+							     std::forward<Match>(matchfx),
+							     L,
+							     fxarity,
+							     start,
+							     std::forward<Args>(args)...);
+						}
+					}
+					stack::record tracking {};
+					if (!stack::stack_detail::check_types(args_list(), L, start, &no_panic, tracking)) {
+						return overload_match_arity(types<Fx1, Fxs...>(),
+						     std::index_sequence<I1, In...>(),
+						     std::index_sequence<M...>(),
+						     std::forward<Match>(matchfx),
+						     L,
+						     fxarity,
+						     start,
+						     std::forward<Args>(args)...);
+					}
+					return matchfx(types<Fx>(), meta::index_value<I>(), return_types(), args_list(), L, fxarity, start, std::forward<Args>(args)...);
+				}
+			}
+		} // namespace overload_detail
+
+		template <typename... Functions, typename Match, typename... Args>
+		inline int overload_match_arity(Match&& matchfx, lua_State* L, int fxarity, int start, Args&&... args) {
+			return overload_detail::overload_match_arity_single(types<Functions...>(),
+			     std::make_index_sequence<sizeof...(Functions)>(),
+			     std::index_sequence<>(),
+			     std::forward<Match>(matchfx),
+			     L,
+			     fxarity,
+			     start,
+			     std::forward<Args>(args)...);
+		}
+
+		template <typename... Functions, typename Match, typename... Args>
+		inline int overload_match(Match&& matchfx, lua_State* L, int start, Args&&... args) {
+			int fxarity = lua_gettop(L) - (start - 1);
+			return overload_match_arity<Functions...>(std::forward<Match>(matchfx), L, fxarity, start, std::forward<Args>(args)...);
+		}
+
+		template <typename T, typename... TypeLists, typename Match, typename... Args>
+		inline int construct_match(Match&& matchfx, lua_State* L, int fxarity, int start, Args&&... args) {
+			// use same overload resolution matching as all other parts of the framework
+			return overload_match_arity<decltype(void_call<T, TypeLists>::call)...>(
+			     std::forward<Match>(matchfx), L, fxarity, start, std::forward<Args>(args)...);
+		}
+
+		template <typename T, bool checked, bool clean_stack, typename... TypeLists>
+		inline int construct_trampolined(lua_State* L) {
+			static const auto& meta = usertype_traits<T>::metatable();
+			int argcount = lua_gettop(L);
+			call_syntax syntax = argcount > 0 ? stack::get_call_syntax(L, usertype_traits<T>::user_metatable(), 1) : call_syntax::dot;
+			argcount -= static_cast<int>(syntax);
+
+			T* obj = detail::usertype_allocate<T>(L);
+			reference userdataref(L, -1);
+			stack::stack_detail::undefined_metatable umf(L, &meta[0], &stack::stack_detail::set_undefined_methods_on<T>);
+
+			// put userdata at the first index
+			lua_insert(L, 1);
+			construct_match<T, TypeLists...>(constructor_match<T, checked, clean_stack>(obj, userdataref, umf), L, argcount, 1 + static_cast<int>(syntax));
+
+			userdataref.push();
+			return 1;
+		}
+
+		template <typename T, bool checked, bool clean_stack, typename... TypeLists>
+		inline int construct(lua_State* L) {
+			return detail::static_trampoline<&construct_trampolined<T, checked, clean_stack, TypeLists...>>(L);
+		}
+
+		template <typename F, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename = void>
+		struct agnostic_lua_call_wrapper {
+			template <typename Fx, typename... Args>
+			static int call(lua_State* L, Fx&& f, Args&&... args) {
+				using uFx = meta::unqualified_t<Fx>;
+				static constexpr bool is_ref = is_lua_reference_v<uFx>;
+				if constexpr (is_ref) {
+					if constexpr (is_index) {
+						return stack::push(L, std::forward<Fx>(f), std::forward<Args>(args)...);
+					}
+					else {
+						std::forward<Fx>(f) = stack::unqualified_get<F>(L, boost + (is_variable ? 3 : 1));
+						return 0;
+					}
+				}
+				else {
+					using wrap = wrapper<uFx>;
+					using traits_type = typename wrap::traits_type;
+					using fp_t = typename traits_type::function_pointer_type;
+					constexpr bool is_function_pointer_convertible = std::is_class_v<uFx> && std::is_convertible_v<std::decay_t<Fx>, fp_t>;
+					if constexpr (is_function_pointer_convertible) {
+						fp_t fx = f;
+						return agnostic_lua_call_wrapper<fp_t, is_index, is_variable, checked, boost, clean_stack> {}.call(
+						     L, fx, std::forward<Args>(args)...);
+					}
+					else {
+						using returns_list = typename wrap::returns_list;
+						using args_list = typename wrap::free_args_list;
+						using caller = typename wrap::caller;
+						return stack::call_into_lua<checked, clean_stack>(
+						     returns_list(), args_list(), L, boost + 1, caller(), std::forward<Fx>(f), std::forward<Args>(args)...);
+					}
+				}
+			}
+		};
+
+		template <typename T, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct agnostic_lua_call_wrapper<var_wrapper<T>, is_index, is_variable, checked, boost, clean_stack, C> {
+			template <typename F>
+			static int call(lua_State* L, F&& f) {
+				if constexpr (is_index) {
+					constexpr bool is_stack = is_stack_based_v<meta::unqualified_t<decltype(detail::unwrap(f.value()))>>;
+					if constexpr (clean_stack && !is_stack) {
+						lua_settop(L, 0);
+					}
+					return stack::push_reference(L, detail::unwrap(f.value()));
+				}
+				else {
+					if constexpr (std::is_const_v<meta::unwrapped_t<T>>) {
+						(void)f;
+						return luaL_error(L, "sol: cannot write to a readonly (const) variable");
+					}
+					else {
+						using R = meta::unwrapped_t<T>;
+						if constexpr (std::is_assignable_v<std::add_lvalue_reference_t<meta::unqualified_t<R>>, R>) {
+							detail::unwrap(f.value()) = stack::unqualified_get<meta::unwrapped_t<T>>(L, boost + (is_variable ? 3 : 1));
+							if (clean_stack) {
+								lua_settop(L, 0);
+							}
+							return 0;
+						}
+						else {
+							return luaL_error(L, "sol: cannot write to this variable: copy assignment/constructor not available");
+						}
+					}
+				}
+			}
+		};
+
+		template <bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct agnostic_lua_call_wrapper<lua_CFunction_ref, is_index, is_variable, checked, boost, clean_stack, C> {
+			static int call(lua_State* L, lua_CFunction_ref f) {
+				return f(L);
+			}
+		};
+
+		template <bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct agnostic_lua_call_wrapper<lua_CFunction, is_index, is_variable, checked, boost, clean_stack, C> {
+			static int call(lua_State* L, lua_CFunction f) {
+				return f(L);
+			}
+		};
+
+#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE)
+		template <bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct agnostic_lua_call_wrapper<detail::lua_CFunction_noexcept, is_index, is_variable, checked, boost, clean_stack, C> {
+			static int call(lua_State* L, detail::lua_CFunction_noexcept f) {
+				return f(L);
+			}
+		};
+#endif // noexcept function types
+
+		template <bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct agnostic_lua_call_wrapper<detail::no_prop, is_index, is_variable, checked, boost, clean_stack, C> {
+			static int call(lua_State* L, const detail::no_prop&) {
+				return luaL_error(L, is_index ? "sol: cannot read from a writeonly property" : "sol: cannot write to a readonly property");
+			}
+		};
+
+		template <bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct agnostic_lua_call_wrapper<no_construction, is_index, is_variable, checked, boost, clean_stack, C> {
+			static int call(lua_State* L, const no_construction&) {
+				return function_detail::no_construction_error(L);
+			}
+		};
+
+		template <typename... Args, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct agnostic_lua_call_wrapper<bases<Args...>, is_index, is_variable, checked, boost, clean_stack, C> {
+			static int call(lua_State*, const bases<Args...>&) {
+				// Uh. How did you even call this, lul
+				return 0;
+			}
+		};
+
+		template <typename T, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct agnostic_lua_call_wrapper<std::reference_wrapper<T>, is_index, is_variable, checked, boost, clean_stack, C> {
+			static int call(lua_State* L, std::reference_wrapper<T> f) {
+				agnostic_lua_call_wrapper<T, is_index, is_variable, checked, boost, clean_stack> alcw {};
+				return alcw.call(L, f.get());
+			}
+		};
+
+		template <typename T, typename F, bool is_index, bool is_variable, bool checked = detail::default_safe_function_calls, int boost = 0,
+		     bool clean_stack = true, typename = void>
+		struct lua_call_wrapper {
+			template <typename Fx, typename... Args>
+			static int call(lua_State* L, Fx&& fx, Args&&... args) {
+				if constexpr (std::is_member_function_pointer_v<F>) {
+					using wrap = wrapper<F>;
+					using object_type = typename wrap::object_type;
+					if constexpr (sizeof...(Args) < 1) {
+						using Ta = meta::conditional_t<std::is_void_v<T>, object_type, T>;
+						static_assert(std::is_base_of_v<object_type, Ta>,
+						     "It seems like you might have accidentally bound a class type with a member function method that does not correspond to the "
+						     "class. For example, there could be a small type in your new_usertype<T>(...) binding, where you specify one class \"T\" "
+						     "but then bind member methods from a complete unrelated class. Check things over!");
+#if SOL_IS_ON(SOL_SAFE_USERTYPE)
+						auto maybeo = stack::check_get<Ta*>(L, 1);
+						if (!maybeo || maybeo.value() == nullptr) {
+							return luaL_error(L,
+							     "sol: received nil for 'self' argument (use ':' for accessing member functions, make sure member variables are "
+							     "preceeded by the "
+							     "actual object with '.' syntax)");
+						}
+						object_type* o = static_cast<object_type*>(maybeo.value());
+						return call(L, std::forward<Fx>(fx), *o);
+#else
+						object_type& o = static_cast<object_type&>(*stack::unqualified_get<non_null<Ta*>>(L, 1));
+						return call(L, std::forward<Fx>(fx), o);
+#endif // Safety
+					}
+					else {
+						using returns_list = typename wrap::returns_list;
+						using args_list = typename wrap::args_list;
+						using caller = typename wrap::caller;
+						return stack::call_into_lua<checked, clean_stack>(
+						     returns_list(), args_list(), L, boost + (is_variable ? 3 : 2), caller(), std::forward<Fx>(fx), std::forward<Args>(args)...);
+					}
+				}
+				else if constexpr (std::is_member_object_pointer_v<F>) {
+					using wrap = wrapper<F>;
+					using object_type = typename wrap::object_type;
+					if constexpr (is_index) {
+						if constexpr (sizeof...(Args) < 1) {
+							using Ta = meta::conditional_t<std::is_void_v<T>, object_type, T>;
+							static_assert(std::is_base_of_v<object_type, Ta>,
+							     "It seems like you might have accidentally bound a class type with a member function method that does not correspond "
+							     "to the class. For example, there could be a small type in your new_usertype<T>(...) binding, where you specify one "
+							     "class \"T\" but then bind member methods from a complete unrelated class. Check things over!");
+#if SOL_IS_ON(SOL_SAFE_USERTYPE)
+							auto maybeo = stack::check_get<Ta*>(L, 1);
+							if (!maybeo || maybeo.value() == nullptr) {
+								if (is_variable) {
+									return luaL_error(L, "sol: 'self' argument is lua_nil (bad '.' access?)");
+								}
+								return luaL_error(L, "sol: 'self' argument is lua_nil (pass 'self' as first argument)");
+							}
+							object_type* o = static_cast<object_type*>(maybeo.value());
+							return call(L, std::forward<Fx>(fx), *o);
+#else
+							object_type& o = static_cast<object_type&>(*stack::get<non_null<Ta*>>(L, 1));
+							return call(L, std::forward<Fx>(fx), o);
+#endif // Safety
+						}
+						else {
+							using returns_list = typename wrap::returns_list;
+							using caller = typename wrap::caller;
+							return stack::call_into_lua<checked, clean_stack>(returns_list(),
+							     types<>(),
+							     L,
+							     boost + (is_variable ? 3 : 2),
+							     caller(),
+							     std::forward<Fx>(fx),
+							     std::forward<Args>(args)...);
+						}
+					}
+					else {
+						using traits_type = lua_bind_traits<F>;
+						using return_type = typename traits_type::return_type;
+						constexpr bool ret_is_const = std::is_const_v<std::remove_reference_t<return_type>>;
+						if constexpr (ret_is_const) {
+							(void)fx;
+							(void)detail::swallow { 0, (static_cast<void>(args), 0)... };
+							return luaL_error(L, "sol: cannot write to a readonly (const) variable");
+						}
+						else {
+							using u_return_type = meta::unqualified_t<return_type>;
+							constexpr bool is_assignable = std::is_copy_assignable_v<u_return_type> || std::is_array_v<u_return_type>;
+							if constexpr (!is_assignable) {
+								(void)fx;
+								(void)detail::swallow { 0, ((void)args, 0)... };
+								return luaL_error(L, "sol: cannot write to this variable: copy assignment/constructor not available");
+							}
+							else {
+								using args_list = typename wrap::args_list;
+								using caller = typename wrap::caller;
+								if constexpr (sizeof...(Args) > 0) {
+									return stack::call_into_lua<checked, clean_stack>(types<void>(),
+									     args_list(),
+									     L,
+									     boost + (is_variable ? 3 : 2),
+									     caller(),
+									     std::forward<Fx>(fx),
+									     std::forward<Args>(args)...);
+								}
+								else {
+									using Ta = meta::conditional_t<std::is_void_v<T>, object_type, T>;
+#if SOL_IS_ON(SOL_SAFE_USERTYPE)
+									auto maybeo = stack::check_get<Ta*>(L, 1);
+									if (!maybeo || maybeo.value() == nullptr) {
+										if (is_variable) {
+											return luaL_error(L, "sol: received nil for 'self' argument (bad '.' access?)");
+										}
+										return luaL_error(L, "sol: received nil for 'self' argument (pass 'self' as first argument)");
+									}
+									object_type* po = static_cast<object_type*>(maybeo.value());
+									object_type& o = *po;
+#else
+									object_type& o = static_cast<object_type&>(*stack::get<non_null<Ta*>>(L, 1));
+#endif // Safety
+
+									return stack::call_into_lua<checked, clean_stack>(
+									     types<void>(), args_list(), L, boost + (is_variable ? 3 : 2), caller(), std::forward<Fx>(fx), o);
+								}
+							}
+						}
+					}
+				}
+				else {
+					agnostic_lua_call_wrapper<F, is_index, is_variable, checked, boost, clean_stack> alcw {};
+					return alcw.call(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+				}
+			}
+		};
+
+		template <typename T, typename F, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct lua_call_wrapper<T, readonly_wrapper<F>, is_index, is_variable, checked, boost, clean_stack, C> {
+			using traits_type = lua_bind_traits<F>;
+			using wrap = wrapper<F>;
+			using object_type = typename wrap::object_type;
+
+			static int call(lua_State* L, readonly_wrapper<F>&& rw) {
+				if constexpr (!is_index) {
+					(void)rw;
+					return luaL_error(L, "sol: cannot write to a sol::readonly variable");
+				}
+				else {
+					lua_call_wrapper<T, F, true, is_variable, checked, boost, clean_stack, C> lcw;
+					return lcw.call(L, std::move(rw.value()));
+				}
+			}
+
+			static int call(lua_State* L, readonly_wrapper<F>&& rw, object_type& o) {
+				if constexpr (!is_index) {
+					(void)o;
+					return call(L, std::move(rw));
+				}
+				else {
+					lua_call_wrapper<T, F, true, is_variable, checked, boost, clean_stack, C> lcw;
+					return lcw.call(L, rw.value(), o);
+				}
+			}
+
+			static int call(lua_State* L, const readonly_wrapper<F>& rw) {
+				if constexpr (!is_index) {
+					(void)rw;
+					return luaL_error(L, "sol: cannot write to a sol::readonly variable");
+				}
+				else {
+					lua_call_wrapper<T, F, true, is_variable, checked, boost, clean_stack, C> lcw;
+					return lcw.call(L, rw.value());
+				}
+			}
+
+			static int call(lua_State* L, const readonly_wrapper<F>& rw, object_type& o) {
+				if constexpr (!is_index) {
+					(void)o;
+					return call(L, rw);
+				}
+				else {
+					lua_call_wrapper<T, F, true, is_variable, checked, boost, clean_stack, C> lcw;
+					return lcw.call(L, rw.value(), o);
+				}
+			}
+		};
+
+		template <typename T, typename... Args, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct lua_call_wrapper<T, constructor_list<Args...>, is_index, is_variable, checked, boost, clean_stack, C> {
+			typedef constructor_list<Args...> F;
+
+			static int call(lua_State* L, F&) {
+				const auto& meta = usertype_traits<T>::metatable();
+				int argcount = lua_gettop(L);
+				call_syntax syntax = argcount > 0 ? stack::get_call_syntax(L, usertype_traits<T>::user_metatable(), 1) : call_syntax::dot;
+				argcount -= static_cast<int>(syntax);
+
+				T* obj = detail::usertype_allocate<T>(L);
+				reference userdataref(L, -1);
+				stack::stack_detail::undefined_metatable umf(L, &meta[0], &stack::stack_detail::set_undefined_methods_on<T>);
+
+				// put userdata at the first index
+				lua_insert(L, 1);
+				// Because of the way constructors work,
+				// we have to kill the data, but only if the cosntructor is successfulyl invoked...
+				// if it's not successfully invoked and we panic,
+				// we cannot actually deallcoate/delete the data.
+				construct_match<T, Args...>(
+				     constructor_match<T, checked, clean_stack>(obj, userdataref, umf), L, argcount, boost + 1 + 1 + static_cast<int>(syntax));
+
+				userdataref.push();
+				return 1;
+			}
+		};
+
+		template <typename T, typename... Cxs, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct lua_call_wrapper<T, constructor_wrapper<Cxs...>, is_index, is_variable, checked, boost, clean_stack, C> {
+			typedef constructor_wrapper<Cxs...> F;
+
+			struct onmatch {
+				template <typename Fx, std::size_t I, typename... R, typename... Args>
+				int operator()(types<Fx>, meta::index_value<I>, types<R...> r, types<Args...> a, lua_State* L, int, int start, F& f) {
+					const auto& meta = usertype_traits<T>::metatable();
+					T* obj = detail::usertype_allocate<T>(L);
+					reference userdataref(L, -1);
+					stack::stack_detail::undefined_metatable umf(L, &meta[0], &stack::stack_detail::set_undefined_methods_on<T>);
+					umf();
+
+					auto& func = std::get<I>(f.functions);
+					// put userdata at the first index
+					lua_insert(L, 1);
+					stack::call_into_lua<checked, clean_stack>(r, a, L, boost + 1 + start, func, detail::implicit_wrapper<T>(obj));
+
+					userdataref.push();
+					return 1;
+				}
+			};
+
+			static int call(lua_State* L, F& f) {
+				call_syntax syntax = stack::get_call_syntax(L, usertype_traits<T>::user_metatable(), 1);
+				int syntaxval = static_cast<int>(syntax);
+				int argcount = lua_gettop(L) - syntaxval;
+				return construct_match<T, meta::pop_front_type_t<meta::function_args_t<Cxs>>...>(onmatch(), L, argcount, 1 + syntaxval, f);
+			}
+		};
+
+		template <typename T, typename Fx, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct lua_call_wrapper<T, destructor_wrapper<Fx>, is_index, is_variable, checked, boost, clean_stack, C> {
+
+			template <typename F>
+			static int call(lua_State* L, F&& f) {
+				if constexpr (std::is_void_v<Fx>) {
+					return detail::usertype_alloc_destroy<T>(L);
+				}
+				else {
+					using uFx = meta::unqualified_t<Fx>;
+					lua_call_wrapper<T, uFx, is_index, is_variable, checked, boost, clean_stack> lcw {};
+					return lcw.call(L, std::forward<F>(f).fx);
+				}
+			}
+		};
+
+		template <typename T, typename... Fs, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct lua_call_wrapper<T, overload_set<Fs...>, is_index, is_variable, checked, boost, clean_stack, C> {
+			typedef overload_set<Fs...> F;
+
+			struct on_match {
+				template <typename Fx, std::size_t I, typename... R, typename... Args>
+				int operator()(types<Fx>, meta::index_value<I>, types<R...>, types<Args...>, lua_State* L, int, int, F& fx) {
+					auto& f = std::get<I>(fx.functions);
+					return lua_call_wrapper<T, Fx, is_index, is_variable, checked, boost> {}.call(L, f);
+				}
+			};
+
+			static int call(lua_State* L, F& fx) {
+				return overload_match_arity<Fs...>(on_match(), L, lua_gettop(L), 1, fx);
+			}
+		};
+
+		template <typename T, typename... Fs, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct lua_call_wrapper<T, factory_wrapper<Fs...>, is_index, is_variable, checked, boost, clean_stack, C> {
+			typedef factory_wrapper<Fs...> F;
+
+			struct on_match {
+				template <typename Fx, std::size_t I, typename... R, typename... Args>
+				int operator()(types<Fx>, meta::index_value<I>, types<R...>, types<Args...>, lua_State* L, int, int, F& fx) {
+					auto& f = std::get<I>(fx.functions);
+					return lua_call_wrapper<T, Fx, is_index, is_variable, checked, boost, clean_stack> {}.call(L, f);
+				}
+			};
+
+			static int call(lua_State* L, F& fx) {
+				return overload_match_arity<Fs...>(on_match(), L, lua_gettop(L) - boost, 1 + boost, fx);
+			}
+		};
+
+		template <typename T, typename R, typename W, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct lua_call_wrapper<T, property_wrapper<R, W>, is_index, is_variable, checked, boost, clean_stack, C> {
+			typedef meta::conditional_t<is_index, R, W> P;
+			typedef meta::unqualified_t<P> U;
+			typedef wrapper<U> wrap;
+			typedef lua_bind_traits<U> traits_type;
+			typedef meta::unqualified_t<typename traits_type::template arg_at<0>> object_type;
+
+			template <typename F, typename... Args>
+			static int call(lua_State* L, F&& f, Args&&... args) {
+				constexpr bool is_specialized = meta::any<std::is_same<U, detail::no_prop>,
+				     meta::is_specialization_of<U, var_wrapper>,
+				     meta::is_specialization_of<U, constructor_wrapper>,
+				     meta::is_specialization_of<U, constructor_list>,
+				     std::is_member_pointer<U>>::value;
+				if constexpr (is_specialized) {
+					if constexpr (is_index) {
+						decltype(auto) p = f.read();
+						lua_call_wrapper<T, meta::unqualified_t<decltype(p)>, is_index, is_variable, checked, boost, clean_stack> lcw {};
+						return lcw.call(L, p, std::forward<Args>(args)...);
+					}
+					else {
+						decltype(auto) p = f.write();
+						lua_call_wrapper<T, meta::unqualified_t<decltype(p)>, is_index, is_variable, checked, boost, clean_stack> lcw {};
+						return lcw.call(L, p, std::forward<Args>(args)...);
+					}
+				}
+				else {
+					constexpr bool non_class_object_type = meta::any<std::is_void<object_type>,
+					     meta::boolean<lua_type_of<meta::unwrap_unqualified_t<object_type>>::value != type::userdata>>::value;
+					if constexpr (non_class_object_type) {
+						// The type being void means we don't have any arguments, so it might be a free functions?
+						using args_list = typename traits_type::free_args_list;
+						using returns_list = typename wrap::returns_list;
+						using caller = typename wrap::caller;
+						if constexpr (is_index) {
+							decltype(auto) pf = f.read();
+							return stack::call_into_lua<checked, clean_stack>(
+							     returns_list(), args_list(), L, boost + (is_variable ? 3 : 2), caller(), pf);
+						}
+						else {
+							decltype(auto) pf = f.write();
+							return stack::call_into_lua<checked, clean_stack>(
+							     returns_list(), args_list(), L, boost + (is_variable ? 3 : 2), caller(), pf);
+						}
+					}
+					else {
+						using args_list = meta::pop_front_type_t<typename traits_type::free_args_list>;
+						using Ta = T;
+						using Oa = std::remove_pointer_t<object_type>;
+#if SOL_IS_ON(SOL_SAFE_USERTYPE)
+						auto maybeo = stack::check_get<Ta*>(L, 1);
+						if (!maybeo || maybeo.value() == nullptr) {
+							if (is_variable) {
+								return luaL_error(L, "sol: 'self' argument is lua_nil (bad '.' access?)");
+							}
+							return luaL_error(L, "sol: 'self' argument is lua_nil (pass 'self' as first argument)");
+						}
+						Oa* o = static_cast<Oa*>(maybeo.value());
+#else
+						Oa* o = static_cast<Oa*>(stack::get<non_null<Ta*>>(L, 1));
+#endif // Safety
+						using returns_list = typename wrap::returns_list;
+						using caller = typename wrap::caller;
+						if constexpr (is_index) {
+							decltype(auto) pf = f.read();
+							return stack::call_into_lua<checked, clean_stack>(
+							     returns_list(), args_list(), L, boost + (is_variable ? 3 : 2), caller(), pf, detail::implicit_wrapper<Oa>(*o));
+						}
+						else {
+							decltype(auto) pf = f.write();
+							return stack::call_into_lua<checked, clean_stack>(
+							     returns_list(), args_list(), L, boost + (is_variable ? 3 : 2), caller(), pf, detail::implicit_wrapper<Oa>(*o));
+						}
+					}
+				}
+			}
+		};
+
+		template <typename T, typename V, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct lua_call_wrapper<T, protect_t<V>, is_index, is_variable, checked, boost, clean_stack, C> {
+			typedef protect_t<V> F;
+
+			template <typename... Args>
+			static int call(lua_State* L, F& fx, Args&&... args) {
+				return lua_call_wrapper<T, V, is_index, is_variable, true, boost, clean_stack> {}.call(L, fx.value, std::forward<Args>(args)...);
+			}
+		};
+
+		template <typename T, typename F, typename... Policies, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct lua_call_wrapper<T, policy_wrapper<F, Policies...>, is_index, is_variable, checked, boost, clean_stack, C> {
+			typedef policy_wrapper<F, Policies...> P;
+
+			template <std::size_t... In>
+			static int call(std::index_sequence<In...>, lua_State* L, P& fx) {
+				int pushed = lua_call_wrapper<T, F, is_index, is_variable, checked, boost, false, C> {}.call(L, fx.value);
+				(void)detail::swallow { int(), (policy_detail::handle_policy(std::get<In>(fx.policies), L, pushed), int())... };
+				return pushed;
+			}
+
+			static int call(lua_State* L, P& fx) {
+				typedef typename P::indices indices;
+				return call(indices(), L, fx);
+			}
+		};
+
+		template <typename T, typename Y, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct lua_call_wrapper<T, yielding_t<Y>, is_index, is_variable, checked, boost, clean_stack, C> {
+			template <typename F>
+			static int call(lua_State* L, F&& f) {
+				return lua_call_wrapper<T, meta::unqualified_t<Y>, is_index, is_variable, checked, boost, clean_stack> {}.call(L, f.func);
+			}
+		};
+
+		template <typename T, typename Sig, typename P, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct lua_call_wrapper<T, function_arguments<Sig, P>, is_index, is_variable, checked, boost, clean_stack, C> {
+			static int call(lua_State* L, const function_arguments<Sig, P>& f) {
+				lua_call_wrapper<T, meta::unqualified_t<P>, is_index, is_variable, checked, boost, clean_stack> lcw {};
+				return lcw.call(L, std::get<0>(f.arguments));
+			}
+
+			static int call(lua_State* L, function_arguments<Sig, P>& f) {
+				lua_call_wrapper<T, meta::unqualified_t<P>, is_index, is_variable, checked, boost, clean_stack> lcw {};
+				return lcw.call(L, std::get<0>(f.arguments));
+			}
+
+			static int call(lua_State* L, function_arguments<Sig, P>&& f) {
+				lua_call_wrapper<T, meta::unqualified_t<P>, is_index, is_variable, checked, boost, clean_stack> lcw {};
+				return lcw.call(L, std::get<0>(std::move(f.arguments)));
+			}
+		};
+
+		template <typename T, bool is_index, bool is_variable, int boost = 0, bool checked = detail::default_safe_function_calls, bool clean_stack = true,
+		     typename Fx, typename... Args>
+		inline int call_wrapped(lua_State* L, Fx&& fx, Args&&... args) {
+			using uFx = meta::unqualified_t<Fx>;
+			if constexpr (meta::is_specialization_of_v<uFx, yielding_t>) {
+				using real_fx = meta::unqualified_t<decltype(std::forward<Fx>(fx).func)>;
+				lua_call_wrapper<T, real_fx, is_index, is_variable, checked, boost, clean_stack> lcw {};
+				return lcw.call(L, std::forward<Fx>(fx).func, std::forward<Args>(args)...);
+			}
+			else {
+				lua_call_wrapper<T, uFx, is_index, is_variable, checked, boost, clean_stack> lcw {};
+				return lcw.call(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+			}
+		}
+
+		template <typename T, bool is_index, bool is_variable, typename F, int start = 1, bool checked = detail::default_safe_function_calls,
+		     bool clean_stack = true>
+		inline int call_user(lua_State* L) {
+			auto& fx = stack::unqualified_get<user<F>>(L, upvalue_index(start));
+			using uFx = meta::unqualified_t<F>;
+			int nr = call_wrapped<T, is_index, is_variable, 0, checked, clean_stack>(L, fx);
+			if constexpr (meta::is_specialization_of_v<uFx, yielding_t>) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		template <typename T, typename = void>
+		struct is_var_bind : std::false_type { };
+
+		template <typename T>
+		struct is_var_bind<T, std::enable_if_t<std::is_member_object_pointer<T>::value>> : std::true_type { };
+
+		template <typename T>
+		struct is_var_bind<T, std::enable_if_t<is_lua_reference_or_proxy<T>::value>> : std::true_type { };
+
+		template <>
+		struct is_var_bind<detail::no_prop> : std::true_type { };
+
+		template <typename R, typename W>
+		struct is_var_bind<property_wrapper<R, W>> : std::true_type { };
+
+		template <typename T>
+		struct is_var_bind<var_wrapper<T>> : std::true_type { };
+
+		template <typename T>
+		struct is_var_bind<readonly_wrapper<T>> : is_var_bind<meta::unqualified_t<T>> { };
+
+		template <typename F, typename... Policies>
+		struct is_var_bind<policy_wrapper<F, Policies...>> : is_var_bind<meta::unqualified_t<F>> { };
+	} // namespace call_detail
+
+	template <typename T>
+	struct is_variable_binding : call_detail::is_var_bind<meta::unqualified_t<T>> { };
+
+	template <typename T>
+	using is_var_wrapper = meta::is_specialization_of<T, var_wrapper>;
+
+	template <typename T>
+	struct is_function_binding : meta::neg<is_variable_binding<T>> { };
+
+} // namespace sol
+
+// end of sol/call.hpp
+
+namespace sol {
+	namespace function_detail {
+		template <typename F, F fx>
+		inline int call_wrapper_variable(std::false_type, lua_State* L) {
+			typedef meta::bind_traits<meta::unqualified_t<F>> traits_type;
+			typedef typename traits_type::args_list args_list;
+			typedef meta::tuple_types<typename traits_type::return_type> return_type;
+			return stack::call_into_lua(return_type(), args_list(), L, 1, fx);
+		}
+
+		template <typename R, typename V, V, typename T>
+		inline int call_set_assignable(std::false_type, T&&, lua_State* L) {
+			return luaL_error(L, "cannot write to this type: copy assignment/constructor not available");
+		}
+
+		template <typename R, typename V, V variable, typename T>
+		inline int call_set_assignable(std::true_type, lua_State* L, T&& mem) {
+			(mem.*variable) = stack::get<R>(L, 2);
+			return 0;
+		}
+
+		template <typename R, typename V, V, typename T>
+		inline int call_set_variable(std::false_type, lua_State* L, T&&) {
+			return luaL_error(L, "cannot write to a const variable");
+		}
+
+		template <typename R, typename V, V variable, typename T>
+		inline int call_set_variable(std::true_type, lua_State* L, T&& mem) {
+			return call_set_assignable<R, V, variable>(std::is_assignable<std::add_lvalue_reference_t<R>, R>(), L, std::forward<T>(mem));
+		}
+
+		template <typename V, V variable>
+		inline int call_wrapper_variable(std::true_type, lua_State* L) {
+			typedef meta::bind_traits<meta::unqualified_t<V>> traits_type;
+			typedef typename traits_type::object_type T;
+			typedef typename traits_type::return_type R;
+			auto& mem = stack::get<T>(L, 1);
+			switch (lua_gettop(L)) {
+			case 1: {
+				decltype(auto) r = (mem.*variable);
+				stack::push_reference(L, std::forward<decltype(r)>(r));
+				return 1;
+			}
+			case 2:
+				return call_set_variable<R, V, variable>(meta::neg<std::is_const<R>>(), L, mem);
+			default:
+				return luaL_error(L, "incorrect number of arguments to member variable function call");
+			}
+		}
+
+		template <typename F, F fx>
+		inline int call_wrapper_function(std::false_type, lua_State* L) {
+			return call_wrapper_variable<F, fx>(std::is_member_object_pointer<F>(), L);
+		}
+
+		template <typename F, F fx>
+		inline int call_wrapper_function(std::true_type, lua_State* L) {
+			return call_detail::call_wrapped<void, false, false>(L, fx);
+		}
+
+		template <typename F, F fx>
+		int call_wrapper_entry(lua_State* L) noexcept(meta::bind_traits<F>::is_noexcept) {
+			return call_wrapper_function<F, fx>(std::is_member_function_pointer<meta::unqualified_t<F>>(), L);
+		}
+
+		template <typename... Fxs>
+		struct c_call_matcher {
+			template <typename Fx, std::size_t I, typename R, typename... Args>
+			int operator()(types<Fx>, meta::index_value<I>, types<R>, types<Args...>, lua_State* L, int, int) const {
+				typedef meta::at_in_pack_t<I, Fxs...> target;
+				return target::call(L);
+			}
+		};
+
+		template <typename F, F fx>
+		inline int c_call_raw(std::true_type, lua_State* L) {
+			return fx(L);
+		}
+
+		template <typename F, F fx>
+		inline int c_call_raw(std::false_type, lua_State* L) {
+#ifdef __clang__
+			return detail::trampoline(L, function_detail::call_wrapper_entry<F, fx>);
+#else
+			return detail::typed_static_trampoline<decltype(&function_detail::call_wrapper_entry<F, fx>), (&function_detail::call_wrapper_entry<F, fx>)>(L);
+#endif // fuck you clang :c
+		}
+
+	} // namespace function_detail
+
+	template <typename F, F fx>
+	inline int c_call(lua_State* L) {
+		typedef meta::unqualified_t<F> Fu;
+		typedef std::integral_constant<bool,
+		     std::is_same<Fu, lua_CFunction>::value
+#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE)
+		          || std::is_same<Fu, detail::lua_CFunction_noexcept>::value
+#endif
+		     >
+		     is_raw;
+		return function_detail::c_call_raw<F, fx>(is_raw(), L);
+	}
+
+	template <typename F, F f>
+	struct wrap {
+		typedef F type;
+
+		static int call(lua_State* L) noexcept(noexcept(c_call<type, f>(L))) {
+			return c_call<type, f>(L);
+		}
+	};
+
+	template <typename... Fxs>
+	inline int c_call(lua_State* L) {
+		if constexpr (sizeof...(Fxs) < 2) {
+			using target = meta::at_in_pack_t<0, Fxs...>;
+			return target::call(L);
+		}
+		else {
+			return call_detail::overload_match_arity<typename Fxs::type...>(function_detail::c_call_matcher<Fxs...>(), L, lua_gettop(L), 1);
+		}
+	}
+
+} // namespace sol
+
+// end of sol/function_types_templated.hpp
+
+// beginning of sol/function_types_stateless.hpp
+
+namespace sol { namespace function_detail {
+	template <typename Function>
+	struct upvalue_free_function {
+		using function_type = std::remove_pointer_t<std::decay_t<Function>>;
+		using traits_type = meta::bind_traits<function_type>;
+
+		static int real_call(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			auto udata = stack::stack_detail::get_as_upvalues<function_type*>(L);
+			function_type* fx = udata.first;
+			return call_detail::call_wrapped<void, true, false>(L, fx);
+		}
+
+		template <bool is_yielding, bool no_trampoline>
+		static int call(lua_State* L) {
+			int nr;
+			if constexpr (no_trampoline) {
+				nr = real_call(L);
+			}
+			else {
+				nr = detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
+			}
+			if (is_yielding) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+	};
+
+	template <typename T, typename Function>
+	struct upvalue_member_function {
+		typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
+		typedef lua_bind_traits<function_type> traits_type;
+
+		static int real_call(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			// Layout:
+			// idx 1...n: verbatim data of member function pointer
+			// idx n + 1: is the object's void pointer
+			// We don't need to store the size, because the other side is templated
+			// with the same member function pointer type
+			function_type& memfx = stack::get<user<function_type>>(L, upvalue_index(2));
+			auto& item = *static_cast<T*>(stack::get<void*>(L, upvalue_index(3)));
+			return call_detail::call_wrapped<T, true, false, -1>(L, memfx, item);
+		}
+
+		template <bool is_yielding, bool no_trampoline>
+		static int call(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			int nr;
+			if constexpr (no_trampoline) {
+				nr = real_call(L);
+			}
+			else {
+				nr = detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
+			}
+			if (is_yielding) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		int operator()(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			return call(L);
+		}
+	};
+
+	template <typename T, typename Function>
+	struct upvalue_member_variable {
+		typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
+		typedef lua_bind_traits<function_type> traits_type;
+
+		static int real_call(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			// Layout:
+			// idx 1...n: verbatim data of member variable pointer
+			// idx n + 1: is the object's void pointer
+			// We don't need to store the size, because the other side is templated
+			// with the same member function pointer type
+			auto memberdata = stack::stack_detail::get_as_upvalues<function_type>(L);
+			auto objdata = stack::stack_detail::get_as_upvalues<T*>(L, memberdata.second);
+			auto& mem = *objdata.first;
+			function_type& var = memberdata.first;
+			switch (lua_gettop(L)) {
+			case 0:
+				return call_detail::call_wrapped<T, true, false, -1>(L, var, mem);
+			case 1:
+				return call_detail::call_wrapped<T, false, false, -1>(L, var, mem);
+			default:
+				return luaL_error(L, "sol: incorrect number of arguments to member variable function");
+			}
+		}
+
+		template <bool is_yielding, bool no_trampoline>
+		static int call(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			int nr;
+			if constexpr (no_trampoline) {
+				nr = real_call(L);
+			}
+			else {
+				nr = detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
+			}
+			if (is_yielding) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		int operator()(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			return call(L);
+		}
+	};
+
+	template <typename T, typename Function>
+	struct upvalue_member_variable<T, readonly_wrapper<Function>> {
+		typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
+		typedef lua_bind_traits<function_type> traits_type;
+
+		static int real_call(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			// Layout:
+			// idx 1...n: verbatim data of member variable pointer
+			// idx n + 1: is the object's void pointer
+			// We don't need to store the size, because the other side is templated
+			// with the same member function pointer type
+			auto memberdata = stack::stack_detail::get_as_upvalues<function_type>(L);
+			auto objdata = stack::stack_detail::get_as_upvalues<T*>(L, memberdata.second);
+			auto& mem = *objdata.first;
+			function_type& var = memberdata.first;
+			switch (lua_gettop(L)) {
+			case 0:
+				return call_detail::call_wrapped<T, true, false, -1>(L, var, mem);
+			default:
+				return luaL_error(L, "sol: incorrect number of arguments to member variable function");
+			}
+		}
+
+		template <bool is_yielding, bool no_trampoline>
+		static int call(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			int nr;
+			if constexpr (no_trampoline) {
+				nr = real_call(L);
+			}
+			else {
+				nr = detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
+			}
+			if (is_yielding) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		int operator()(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			return call(L);
+		}
+	};
+
+	template <typename T, typename Function>
+	struct upvalue_this_member_function {
+		typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
+		typedef lua_bind_traits<function_type> traits_type;
+
+		static int real_call(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			// Layout:
+			// idx 1...n: verbatim data of member variable pointer
+			function_type& memfx = stack::get<user<function_type>>(L, upvalue_index(2));
+			return call_detail::call_wrapped<T, false, false>(L, memfx);
+		}
+
+		template <bool is_yielding, bool no_trampoline>
+		static int call(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			int nr;
+			if constexpr (no_trampoline) {
+				nr = real_call(L);
+			}
+			else {
+				nr = detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
+			}
+			if (is_yielding) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		int operator()(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			return call(L);
+		}
+	};
+
+	template <typename T, typename Function>
+	struct upvalue_this_member_variable {
+		typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
+
+		static int real_call(lua_State* L) noexcept(std::is_nothrow_copy_assignable_v<T>) {
+			// Layout:
+			// idx 1...n: verbatim data of member variable pointer
+			auto memberdata = stack::stack_detail::get_as_upvalues<function_type>(L);
+			function_type& var = memberdata.first;
+			switch (lua_gettop(L)) {
+			case 1:
+				return call_detail::call_wrapped<T, true, false>(L, var);
+			case 2:
+				return call_detail::call_wrapped<T, false, false>(L, var);
+			default:
+				return luaL_error(L, "sol: incorrect number of arguments to member variable function");
+			}
+		}
+
+		template <bool is_yielding, bool no_trampoline>
+		static int call(lua_State* L) noexcept(std::is_nothrow_copy_assignable_v<T>) {
+			int nr;
+			if constexpr (no_trampoline) {
+				nr = real_call(L);
+			}
+			else {
+				nr = detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
+			}
+			if (is_yielding) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		int operator()(lua_State* L) noexcept(std::is_nothrow_copy_assignable_v<T>) {
+			return call(L);
+		}
+	};
+
+	template <typename T, typename Function>
+	struct upvalue_this_member_variable<T, readonly_wrapper<Function>> {
+		typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
+		typedef lua_bind_traits<function_type> traits_type;
+
+		static int real_call(lua_State* L) noexcept(std::is_nothrow_copy_assignable_v<T>) {
+			// Layout:
+			// idx 1...n: verbatim data of member variable pointer
+			auto memberdata = stack::stack_detail::get_as_upvalues<function_type>(L);
+			function_type& var = memberdata.first;
+			switch (lua_gettop(L)) {
+			case 1:
+				return call_detail::call_wrapped<T, true, false>(L, var);
+			default:
+				return luaL_error(L, "sol: incorrect number of arguments to member variable function");
+			}
+		}
+
+		template <bool is_yielding, bool no_trampoline>
+		static int call(lua_State* L) noexcept(std::is_nothrow_copy_assignable_v<T>) {
+			int nr;
+			if constexpr (no_trampoline) {
+				nr = real_call(L);
+			}
+			else {
+				nr = detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
+			}
+			if (is_yielding) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		int operator()(lua_State* L) noexcept(std::is_nothrow_copy_assignable_v<T>) {
+			return call(L);
+		}
+	};
+}} // namespace sol::function_detail
+
+// end of sol/function_types_stateless.hpp
+
+// beginning of sol/function_types_stateful.hpp
+
+namespace sol { namespace function_detail {
+	template <typename Func, bool is_yielding, bool no_trampoline>
+	struct functor_function {
+		typedef std::decay_t<meta::unwrap_unqualified_t<Func>> function_type;
+		function_type invocation;
+
+		template <typename... Args>
+		functor_function(function_type f, Args&&... args) noexcept(std::is_nothrow_constructible_v<function_type, function_type, Args...>)
+		: invocation(std::move(f), std::forward<Args>(args)...) {
+		}
+
+		static int call(lua_State* L, functor_function& self) noexcept(noexcept(call_detail::call_wrapped<void, true, false>(L, self.invocation))) {
+			int nr = call_detail::call_wrapped<void, true, false>(L, self.invocation);
+			if (is_yielding) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		int operator()(lua_State* L) noexcept(noexcept(call_detail::call_wrapped<void, true, false>(L, invocation))) {
+			if constexpr (no_trampoline) {
+				return call(L, *this);
+			}
+			else {
+				return detail::trampoline(L, &call, *this);
+			}
+		}
+	};
+
+	template <typename T, typename Function, bool is_yielding, bool no_trampoline>
+	struct member_function {
+		typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
+		typedef meta::function_return_t<function_type> return_type;
+		typedef meta::function_args_t<function_type> args_lists;
+		using traits_type = meta::bind_traits<function_type>;
+		function_type invocation;
+		T member;
+
+		template <typename... Args>
+		member_function(function_type f, Args&&... args) noexcept(
+			std::is_nothrow_constructible_v<function_type, function_type>&& std::is_nothrow_constructible_v<T, Args...>)
+		: invocation(std::move(f)), member(std::forward<Args>(args)...) {
+		}
+
+		static int call(lua_State* L, member_function& self)
+#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			int nr = call_detail::call_wrapped<T, true, false, -1>(L, self.invocation, detail::unwrap(detail::deref(self.member)));
+			if (is_yielding) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		int operator()(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			if constexpr (no_trampoline) {
+				return call(L, *this);
+			}
+			else {
+				return detail::trampoline(L, &call, *this);
+			}
+		}
+	};
+
+	template <typename T, typename Function, bool is_yielding, bool no_trampoline>
+	struct member_variable {
+		typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
+		typedef typename meta::bind_traits<function_type>::return_type return_type;
+		typedef typename meta::bind_traits<function_type>::args_list args_lists;
+		function_type var;
+		T member;
+		typedef std::add_lvalue_reference_t<meta::unwrapped_t<std::remove_reference_t<decltype(detail::deref(member))>>> M;
+
+		template <typename... Args>
+		member_variable(function_type v, Args&&... args) noexcept(
+			std::is_nothrow_constructible_v<function_type, function_type>&& std::is_nothrow_constructible_v<T, Args...>)
+		: var(std::move(v)), member(std::forward<Args>(args)...) {
+		}
+
+		static int call(lua_State* L, member_variable& self) noexcept(std::is_nothrow_copy_assignable_v<T>) {
+			int nr;
+			{
+				M mem = detail::unwrap(detail::deref(self.member));
+				switch (lua_gettop(L)) {
+				case 0:
+					nr = call_detail::call_wrapped<T, true, false, -1>(L, self.var, mem);
+					break;
+				case 1:
+					nr = call_detail::call_wrapped<T, false, false, -1>(L, self.var, mem);
+					break;
+				default:
+					nr = luaL_error(L, "sol: incorrect number of arguments to member variable function");
+					break;
+				}
+			}
+			if (is_yielding) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		int operator()(lua_State* L) noexcept(std::is_nothrow_copy_assignable_v<T>) {
+			if constexpr (no_trampoline) {
+				return call(L, *this);
+			}
+			else {
+				return detail::trampoline(L, &call, *this);
+			}
+		}
+	};
+}} // namespace sol::function_detail
+
+// end of sol/function_types_stateful.hpp
+
+// beginning of sol/function_types_overloaded.hpp
+
+namespace sol { namespace function_detail {
+	template <int start_skew, typename... Functions>
+	struct overloaded_function {
+		typedef std::tuple<Functions...> overload_list;
+		typedef std::make_index_sequence<sizeof...(Functions)> indices;
+		overload_list overloads;
+
+		overloaded_function(overload_list set) : overloads(std::move(set)) {
+		}
+
+		overloaded_function(Functions... fxs) : overloads(fxs...) {
+		}
+
+		template <typename Fx, std::size_t I, typename... R, typename... Args>
+		static int call(types<Fx>, meta::index_value<I>, types<R...>, types<Args...>, lua_State* L, int, int, overload_list& ol) {
+			auto& func = std::get<I>(ol);
+			int nr = call_detail::call_wrapped<void, true, false, start_skew>(L, func);
+			return nr;
+		}
+
+		struct on_success {
+			template <typename... Args>
+			int operator()(Args&&... args) const {
+				return call(std::forward<Args>(args)...);
+			}
+		};
+
+		int operator()(lua_State* L) {
+			on_success call_obj {};
+			return call_detail::overload_match<Functions...>(call_obj, L, 1 + start_skew, overloads);
+		}
+	};
+}} // namespace sol::function_detail
+
+// end of sol/function_types_overloaded.hpp
+
+// beginning of sol/resolve.hpp
+
+namespace sol {
+
+#ifndef __clang__
+	// constexpr is fine for not-clang
+
+	namespace detail {
+		template <typename R, typename... Args, typename F, typename = std::invoke_result_t<meta::unqualified_t<F>, Args...>>
+		inline constexpr auto resolve_i(types<R(Args...)>, F&&) -> R (meta::unqualified_t<F>::*)(Args...) {
+			using Sig = R(Args...);
+			typedef meta::unqualified_t<F> Fu;
+			return static_cast<Sig Fu::*>(&Fu::operator());
+		}
+
+		template <typename F, typename U = meta::unqualified_t<F>>
+		inline constexpr auto resolve_f(std::true_type, F&& f)
+		     -> decltype(resolve_i(types<meta::function_signature_t<decltype(&U::operator())>>(), std::forward<F>(f))) {
+			return resolve_i(types<meta::function_signature_t<decltype(&U::operator())>>(), std::forward<F>(f));
+		}
+
+		template <typename F>
+		inline constexpr void resolve_f(std::false_type, F&&) {
+			static_assert(meta::call_operator_deducible_v<F>, "Cannot use no-template-parameter call with an overloaded functor: specify the signature");
+		}
+
+		template <typename F, typename U = meta::unqualified_t<F>>
+		inline constexpr auto resolve_i(types<>, F&& f) -> decltype(resolve_f(meta::call_operator_deducible<U>(), std::forward<F>(f))) {
+			return resolve_f(meta::call_operator_deducible<U> {}, std::forward<F>(f));
+		}
+
+		template <typename... Args, typename F, typename R = std::invoke_result_t<F&, Args...>>
+		inline constexpr auto resolve_i(types<Args...>, F&& f) -> decltype(resolve_i(types<R(Args...)>(), std::forward<F>(f))) {
+			return resolve_i(types<R(Args...)>(), std::forward<F>(f));
+		}
+
+		template <typename Sig, typename C>
+		inline constexpr Sig C::*resolve_v(std::false_type, Sig C::*mem_func_ptr) {
+			return mem_func_ptr;
+		}
+
+		template <typename Sig, typename C>
+		inline constexpr Sig C::*resolve_v(std::true_type, Sig C::*mem_variable_ptr) {
+			return mem_variable_ptr;
+		}
+	} // namespace detail
+
+	template <typename... Args, typename R>
+	inline constexpr auto resolve(R fun_ptr(Args...)) -> R (*)(Args...) {
+		return fun_ptr;
+	}
+
+	template <typename Sig>
+	inline constexpr Sig* resolve(Sig* fun_ptr) {
+		return fun_ptr;
+	}
+
+	template <typename... Args, typename R, typename C>
+	inline constexpr auto resolve(R (C::*mem_ptr)(Args...)) -> R (C::*)(Args...) {
+		return mem_ptr;
+	}
+
+	template <typename Sig, typename C>
+	inline constexpr Sig C::*resolve(Sig C::*mem_ptr) {
+		return detail::resolve_v(std::is_member_object_pointer<Sig C::*>(), mem_ptr);
+	}
+
+	template <typename... Sig, typename F, meta::disable<std::is_function<meta::unqualified_t<F>>> = meta::enabler>
+	inline constexpr auto resolve(F&& f) -> decltype(detail::resolve_i(types<Sig...>(), std::forward<F>(f))) {
+		return detail::resolve_i(types<Sig...>(), std::forward<F>(f));
+	}
+#else
+
+	// Clang has distinct problems with constexpr arguments,
+	// so don't use the constexpr versions inside of clang.
+
+	namespace detail {
+		template <typename R, typename... Args, typename F, typename = std::invoke_result_t<meta::unqualified_t<F>, Args...>>
+		inline auto resolve_i(types<R(Args...)>, F&&) -> R (meta::unqualified_t<F>::*)(Args...) {
+			using Sig = R(Args...);
+			typedef meta::unqualified_t<F> Fu;
+			return static_cast<Sig Fu::*>(&Fu::operator());
+		}
+
+		template <typename F, typename U = meta::unqualified_t<F>>
+		inline auto resolve_f(std::true_type, F&& f)
+		     -> decltype(resolve_i(types<meta::function_signature_t<decltype(&U::operator())>>(), std::forward<F>(f))) {
+			return resolve_i(types<meta::function_signature_t<decltype(&U::operator())>>(), std::forward<F>(f));
+		}
+
+		template <typename F>
+		inline void resolve_f(std::false_type, F&&) {
+			static_assert(meta::call_operator_deducible_v<F>, "Cannot use no-template-parameter call with an overloaded functor: specify the signature");
+		}
+
+		template <typename F, typename U = meta::unqualified_t<F>>
+		inline auto resolve_i(types<>, F&& f) -> decltype(resolve_f(meta::call_operator_deducible<U>(), std::forward<F>(f))) {
+			return resolve_f(meta::call_operator_deducible<U> {}, std::forward<F>(f));
+		}
+
+		template <typename... Args, typename F, typename R = std::invoke_result_t<F&, Args...>>
+		inline auto resolve_i(types<Args...>, F&& f) -> decltype(resolve_i(types<R(Args...)>(), std::forward<F>(f))) {
+			return resolve_i(types<R(Args...)>(), std::forward<F>(f));
+		}
+
+		template <typename Sig, typename C>
+		inline Sig C::*resolve_v(std::false_type, Sig C::*mem_func_ptr) {
+			return mem_func_ptr;
+		}
+
+		template <typename Sig, typename C>
+		inline Sig C::*resolve_v(std::true_type, Sig C::*mem_variable_ptr) {
+			return mem_variable_ptr;
+		}
+	} // namespace detail
+
+	template <typename... Args, typename R>
+	inline auto resolve(R fun_ptr(Args...)) -> R (*)(Args...) {
+		return fun_ptr;
+	}
+
+	template <typename Sig>
+	inline Sig* resolve(Sig* fun_ptr) {
+		return fun_ptr;
+	}
+
+	template <typename... Args, typename R, typename C>
+	inline auto resolve(R (C::*mem_ptr)(Args...)) -> R (C::*)(Args...) {
+		return mem_ptr;
+	}
+
+	template <typename Sig, typename C>
+	inline Sig C::*resolve(Sig C::*mem_ptr) {
+		return detail::resolve_v(std::is_member_object_pointer<Sig C::*>(), mem_ptr);
+	}
+
+	template <typename... Sig, typename F>
+	inline auto resolve(F&& f) -> decltype(detail::resolve_i(types<Sig...>(), std::forward<F>(f))) {
+		return detail::resolve_i(types<Sig...>(), std::forward<F>(f));
+	}
+
+#endif
+
+} // namespace sol
+
+// end of sol/resolve.hpp
+
+namespace sol {
+	namespace function_detail {
+		template <typename T>
+		struct class_indicator {
+			using type = T;
+		};
+
+		struct call_indicator { };
+
+		template <bool yielding>
+		int lua_c_wrapper(lua_State* L) {
+			lua_CFunction cf = lua_tocfunction(L, lua_upvalueindex(2));
+			int nr = cf(L);
+			if constexpr (yielding) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		template <bool yielding>
+		int lua_c_noexcept_wrapper(lua_State* L) noexcept {
+			detail::lua_CFunction_noexcept cf = reinterpret_cast<detail::lua_CFunction_noexcept>(lua_tocfunction(L, lua_upvalueindex(2)));
+			int nr = cf(L);
+			if constexpr (yielding) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		struct c_function_invocation { };
+
+		template <bool is_yielding, bool no_trampoline, typename Fx, typename... Args>
+		void select(lua_State* L, Fx&& fx, Args&&... args);
+
+		template <bool is_yielding, bool no_trampoline, typename Fx, typename... Args>
+		void select_set_fx(lua_State* L, Args&&... args) {
+			lua_CFunction freefunc = no_trampoline ? function_detail::call<meta::unqualified_t<Fx>, 2, is_yielding>
+			                                       : detail::static_trampoline<function_detail::call<meta::unqualified_t<Fx>, 2, is_yielding>>;
+
+			int upvalues = 0;
+			upvalues += stack::push(L, nullptr);
+			upvalues += stack::push<user<Fx>>(L, std::forward<Args>(args)...);
+			stack::push(L, c_closure(freefunc, upvalues));
+		}
+
+		template <bool is_yielding, bool no_trampoline, typename R, typename... A, typename Fx, typename... Args>
+		void select_convertible(types<R(A...)>, lua_State* L, Fx&& fx, Args&&... args) {
+			using dFx = std::decay_t<meta::unwrap_unqualified_t<Fx>>;
+			using fx_ptr_t = R (*)(A...);
+			constexpr bool is_convertible = std::is_convertible_v<dFx, fx_ptr_t>;
+			if constexpr (is_convertible) {
+				fx_ptr_t fxptr = detail::unwrap(std::forward<Fx>(fx));
+				select<is_yielding, no_trampoline>(L, std::move(fxptr), std::forward<Args>(args)...);
+			}
+			else {
+				using F = function_detail::functor_function<dFx, false, true>;
+				select_set_fx<is_yielding, no_trampoline, F>(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+			}
+		}
+
+		template <bool is_yielding, bool no_trampoline, typename Fx, typename... Args>
+		void select_convertible(types<>, lua_State* L, Fx&& fx, Args&&... args) {
+			typedef meta::function_signature_t<meta::unwrap_unqualified_t<Fx>> Sig;
+			select_convertible<is_yielding, no_trampoline>(types<Sig>(), L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+		}
+
+		template <bool is_yielding, bool no_trampoline, typename Fx, typename... Args>
+		void select_member_variable(lua_State* L, Fx&& fx, Args&&... args) {
+			using uFx = meta::unqualified_t<Fx>;
+			if constexpr (sizeof...(Args) < 1) {
+				using C = typename meta::bind_traits<uFx>::object_type;
+				lua_CFunction freefunc = &function_detail::upvalue_this_member_variable<C, Fx>::template call<is_yielding, no_trampoline>;
+
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::stack_detail::push_as_upvalues(L, fx);
+				stack::push(L, c_closure(freefunc, upvalues));
+			}
+			else if constexpr (sizeof...(Args) < 2) {
+				using Tu = typename meta::meta_detail::unqualified_non_alias<Args...>::type;
+				constexpr bool is_reference = meta::is_specialization_of_v<Tu, std::reference_wrapper> || std::is_pointer_v<Tu>;
+				if constexpr (meta::is_specialization_of_v<Tu, function_detail::class_indicator>) {
+					lua_CFunction freefunc
+					     = &function_detail::upvalue_this_member_variable<typename Tu::type, Fx>::template call<is_yielding, no_trampoline>;
+
+					int upvalues = 0;
+					upvalues += stack::push(L, nullptr);
+					upvalues += stack::stack_detail::push_as_upvalues(L, fx);
+					stack::push(L, c_closure(freefunc, upvalues));
+				}
+				else if constexpr (is_reference) {
+					typedef std::decay_t<Fx> dFx;
+					dFx memfxptr(std::forward<Fx>(fx));
+					auto userptr = detail::ptr(std::forward<Args>(args)...);
+					lua_CFunction freefunc = &function_detail::upvalue_member_variable<std::decay_t<decltype(*userptr)>,
+					     meta::unqualified_t<Fx>>::template call<is_yielding, no_trampoline>;
+
+					int upvalues = 0;
+					upvalues += stack::push(L, nullptr);
+					upvalues += stack::stack_detail::push_as_upvalues(L, memfxptr);
+					upvalues += stack::push(L, static_cast<void const*>(userptr));
+					stack::push(L, c_closure(freefunc, upvalues));
+				}
+				else {
+					using clean_fx = std::remove_pointer_t<std::decay_t<Fx>>;
+					using F = function_detail::member_variable<Tu, clean_fx, is_yielding, no_trampoline>;
+					select_set_fx<is_yielding, no_trampoline, F>(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+				}
+			}
+			else {
+				using C = typename meta::bind_traits<uFx>::object_type;
+				using clean_fx = std::remove_pointer_t<std::decay_t<Fx>>;
+				using F = function_detail::member_variable<C, clean_fx, is_yielding, no_trampoline>;
+				select_set_fx<is_yielding, no_trampoline, F>(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+			}
+		}
+
+		template <bool is_yielding, bool no_trampoline, typename Fx, typename T, typename... Args>
+		void select_member_function_with(lua_State* L, Fx&& fx, T&& obj, Args&&... args) {
+			using dFx = std::decay_t<Fx>;
+			using Tu = meta::unqualified_t<T>;
+			if constexpr (meta::is_specialization_of_v<Tu, function_detail::class_indicator>) {
+				(void)obj;
+				using C = typename Tu::type;
+				lua_CFunction freefunc = &function_detail::upvalue_this_member_function<C, dFx>::template call<is_yielding, no_trampoline>;
+
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<dFx>>(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+				stack::push(L, c_closure(freefunc, upvalues));
+			}
+			else {
+				constexpr bool is_reference = meta::is_specialization_of_v<Tu, std::reference_wrapper> || std::is_pointer_v<Tu>;
+				if constexpr (is_reference) {
+					auto userptr = detail::ptr(std::forward<T>(obj));
+					lua_CFunction freefunc
+					     = &function_detail::upvalue_member_function<std::decay_t<decltype(*userptr)>, dFx>::template call<is_yielding, no_trampoline>;
+
+					int upvalues = 0;
+					upvalues += stack::push(L, nullptr);
+					upvalues += stack::push<user<dFx>>(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+					upvalues += stack::push(L, lightuserdata_value(static_cast<void*>(userptr)));
+					stack::push(L, c_closure(freefunc, upvalues));
+				}
+				else {
+					using F = function_detail::member_function<Tu, dFx, is_yielding, no_trampoline>;
+					select_set_fx<is_yielding, no_trampoline, F>(L, std::forward<Fx>(fx), std::forward<T>(obj), std::forward<Args>(args)...);
+				}
+			}
+		}
+
+		template <bool is_yielding, bool no_trampoline, typename Fx, typename... Args>
+		void select_member_function(lua_State* L, Fx&& fx, Args&&... args) {
+			using dFx = std::decay_t<Fx>;
+			if constexpr (sizeof...(Args) < 1) {
+				using C = typename meta::bind_traits<meta::unqualified_t<Fx>>::object_type;
+				lua_CFunction freefunc = &function_detail::upvalue_this_member_function<C, dFx>::template call<is_yielding, no_trampoline>;
+
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<dFx>>(L, std::forward<Fx>(fx));
+				stack::push(L, c_closure(freefunc, upvalues));
+			}
+			else {
+				select_member_function_with<is_yielding, no_trampoline>(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+			}
+		}
+
+		template <bool is_yielding, bool no_trampoline, typename Fx, typename... Args>
+		void select(lua_State* L, Fx&& fx, Args&&... args) {
+			using uFx = meta::unqualified_t<Fx>;
+			if constexpr (is_lua_reference_v<uFx>) {
+				// TODO: hoist into lambda in this case for yielding???
+				stack::push(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+			}
+			else if constexpr (is_lua_c_function_v<uFx>) {
+				if constexpr (no_trampoline) {
+					if (is_yielding) {
+						int upvalues = 0;
+						upvalues += stack::push(L, nullptr);
+						upvalues += stack::push(L, std::forward<Fx>(fx));
+#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE)
+						if constexpr (std::is_nothrow_invocable_r_v<int, uFx, lua_State*>) {
+							detail::lua_CFunction_noexcept cf = &lua_c_noexcept_wrapper<true>;
+							lua_pushcclosure(L, reinterpret_cast<lua_CFunction>(cf), upvalues);
+						}
+						else
+#endif
+						{
+							lua_CFunction cf = &function_detail::lua_c_wrapper<true>;
+							lua_pushcclosure(L, cf, upvalues);
+						}
+					}
+					else {
+						lua_pushcclosure(L, std::forward<Fx>(fx), 0);
+					}
+				}
+				else {
+					int upvalues = 0;
+					upvalues += stack::push(L, nullptr);
+					upvalues += stack::push(L, std::forward<Fx>(fx));
+#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE)
+					if constexpr (std::is_nothrow_invocable_r_v<int, uFx, lua_State*>) {
+						detail::lua_CFunction_noexcept cf = &lua_c_noexcept_wrapper<is_yielding>;
+						lua_pushcclosure(L, reinterpret_cast<lua_CFunction>(cf), upvalues);
+					}
+					else {
+						lua_CFunction cf = &function_detail::lua_c_wrapper<is_yielding>;
+						lua_pushcclosure(L, cf, upvalues);
+					}
+#else
+					lua_CFunction cf = &function_detail::lua_c_wrapper<is_yielding>;
+					lua_pushcclosure(L, cf, upvalues);
+#endif
+				}
+			}
+			else if constexpr (std::is_function_v<std::remove_pointer_t<uFx>>) {
+				std::decay_t<Fx> target(std::forward<Fx>(fx), std::forward<Args>(args)...);
+				lua_CFunction freefunc = &function_detail::upvalue_free_function<Fx>::template call<is_yielding, no_trampoline>;
+
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::stack_detail::push_as_upvalues(L, target);
+				stack::push(L, c_closure(freefunc, upvalues));
+			}
+			else if constexpr (std::is_member_function_pointer_v<uFx>) {
+				select_member_function<is_yielding, no_trampoline>(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+			}
+			else if constexpr (meta::is_member_object_v<uFx>) {
+				select_member_variable<is_yielding, no_trampoline>(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+			}
+			else {
+				select_convertible<is_yielding, no_trampoline>(types<>(), L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+			}
+		}
+	} // namespace function_detail
+
+	namespace stack {
+		template <typename... Sigs>
+		struct unqualified_pusher<function_sig<Sigs...>> {
+			template <bool is_yielding, typename Arg0, typename... Args>
+			static int push_yielding(lua_State* L, Arg0&& arg0, Args&&... args) {
+				if constexpr (meta::is_specialization_of_v<meta::unqualified_t<Arg0>, std::function>) {
+					if constexpr (is_yielding) {
+						return stack::push<meta::unqualified_t<Arg0>>(L, detail::yield_tag, std::forward<Arg0>(arg0), std::forward<Args>(args)...);
+					}
+					else {
+						return stack::push(L, std::forward<Arg0>(arg0), std::forward<Args>(args)...);
+					}
+				}
+				else {
+					function_detail::select<is_yielding, false>(L, std::forward<Arg0>(arg0), std::forward<Args>(args)...);
+					return 1;
+				}
+			}
+
+			template <typename Arg0, typename... Args>
+			static int push(lua_State* L, Arg0&& arg0, Args&&... args) {
+				if constexpr (std::is_same_v<meta::unqualified_t<Arg0>, detail::yield_tag_t>) {
+					push_yielding<true>(L, std::forward<Args>(args)...);
+				}
+				else if constexpr (meta::is_specialization_of_v<meta::unqualified_t<Arg0>, yielding_t>) {
+					push_yielding<true>(L, std::forward<Arg0>(arg0).func, std::forward<Args>(args)...);
+				}
+				else {
+					push_yielding<false>(L, std::forward<Arg0>(arg0), std::forward<Args>(args)...);
+				}
+				return 1;
+			}
+		};
+
+		template <typename T>
+		struct unqualified_pusher<yielding_t<T>> {
+			template <typename... Args>
+			static int push(lua_State* L, const yielding_t<T>& f, Args&&... args) {
+				if constexpr (meta::is_specialization_of_v<meta::unqualified_t<T>, std::function>) {
+					return stack::push<T>(L, detail::yield_tag, f.func, std::forward<Args>(args)...);
+				}
+				else {
+					function_detail::select<true, false>(L, f.func, std::forward<Args>(args)...);
+					return 1;
+				}
+			}
+
+			template <typename... Args>
+			static int push(lua_State* L, yielding_t<T>&& f, Args&&... args) {
+				if constexpr (meta::is_specialization_of_v<meta::unqualified_t<T>, std::function>) {
+					return stack::push<T>(L, detail::yield_tag, std::move(f.func), std::forward<Args>(args)...);
+				}
+				else {
+					function_detail::select<true, false>(L, std::move(f.func), std::forward<Args>(args)...);
+					return 1;
+				}
+			}
+		};
+
+		template <typename T, typename... Args>
+		struct unqualified_pusher<function_arguments<T, Args...>> {
+			template <std::size_t... I, typename FP>
+			static int push_func(std::index_sequence<I...>, lua_State* L, FP&& fp) {
+				return stack::push<T>(L, std::get<I>(std::forward<FP>(fp).arguments)...);
+			}
+
+			static int push(lua_State* L, const function_arguments<T, Args...>& fp) {
+				return push_func(std::make_index_sequence<sizeof...(Args)>(), L, fp);
+			}
+
+			static int push(lua_State* L, function_arguments<T, Args...>&& fp) {
+				return push_func(std::make_index_sequence<sizeof...(Args)>(), L, std::move(fp));
+			}
+		};
+
+		template <typename Signature>
+		struct unqualified_pusher<std::function<Signature>> {
+			using TargetFunctor = function_detail::functor_function<std::function<Signature>, false, true>;
+
+			static int push(lua_State* L, detail::yield_tag_t, const std::function<Signature>& fx) {
+				if (fx) {
+					function_detail::select_set_fx<true, false, TargetFunctor>(L, fx);
+					return 1;
+				}
+				return stack::push(L, lua_nil);
+			}
+
+			static int push(lua_State* L, detail::yield_tag_t, std::function<Signature>&& fx) {
+				if (fx) {
+					function_detail::select_set_fx<true, false, TargetFunctor>(L, std::move(fx));
+					return 1;
+				}
+				return stack::push(L, lua_nil);
+			}
+
+			static int push(lua_State* L, const std::function<Signature>& fx) {
+				if (fx) {
+					function_detail::select_set_fx<false, false, TargetFunctor>(L, fx);
+					return 1;
+				}
+				return stack::push(L, lua_nil);
+			}
+
+			static int push(lua_State* L, std::function<Signature>&& fx) {
+				if (fx) {
+					function_detail::select_set_fx<false, false, TargetFunctor>(L, std::move(fx));
+					return 1;
+				}
+				return stack::push(L, lua_nil);
+			}
+		};
+
+		template <typename Signature>
+		struct unqualified_pusher<Signature, std::enable_if_t<meta::is_member_object_or_function_v<Signature>>> {
+			template <typename... Args>
+			static int push(lua_State* L, Args&&... args) {
+				function_detail::select<false, false>(L, std::forward<Args>(args)...);
+				return 1;
+			}
+		};
+
+		template <typename Signature>
+		struct unqualified_pusher<Signature,
+		     std::enable_if_t<meta::all<std::is_function<std::remove_pointer_t<Signature>>, meta::neg<std::is_same<Signature, lua_CFunction>>,
+		          meta::neg<std::is_same<Signature, std::remove_pointer_t<lua_CFunction>>>
+#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE)
+		          ,
+		          meta::neg<std::is_same<Signature, detail::lua_CFunction_noexcept>>,
+		          meta::neg<std::is_same<Signature, std::remove_pointer_t<detail::lua_CFunction_noexcept>>>
+#endif // noexcept function types
+		          >::value>> {
+			template <typename F>
+			static int push(lua_State* L, F&& f) {
+				function_detail::select<false, true>(L, std::forward<F>(f));
+				return 1;
+			}
+		};
+
+		template <typename... Functions>
+		struct unqualified_pusher<overload_set<Functions...>> {
+			static int push(lua_State* L, overload_set<Functions...>&& set) {
+				using F = function_detail::overloaded_function<0, Functions...>;
+				function_detail::select_set_fx<false, false, F>(L, std::move(set.functions));
+				return 1;
+			}
+
+			static int push(lua_State* L, const overload_set<Functions...>& set) {
+				using F = function_detail::overloaded_function<0, Functions...>;
+				function_detail::select_set_fx<false, false, F>(L, set.functions);
+				return 1;
+			}
+		};
+
+		template <typename T>
+		struct unqualified_pusher<protect_t<T>> {
+			static int push(lua_State* L, protect_t<T>&& pw) {
+				lua_CFunction cf = call_detail::call_user<void, false, false, protect_t<T>, 2>;
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<protect_t<T>>>(L, std::move(pw.value));
+				return stack::push(L, c_closure(cf, upvalues));
+			}
+
+			static int push(lua_State* L, const protect_t<T>& pw) {
+				lua_CFunction cf = call_detail::call_user<void, false, false, protect_t<T>, 2>;
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<protect_t<T>>>(L, pw.value);
+				return stack::push(L, c_closure(cf, upvalues));
+			}
+		};
+
+		template <typename F, typename G>
+		struct unqualified_pusher<property_wrapper<F, G>> {
+			static int push(lua_State* L, property_wrapper<F, G>&& pw) {
+				if constexpr (std::is_void_v<F>) {
+					return stack::push(L, std::move(pw.write()));
+				}
+				else if constexpr (std::is_void_v<G>) {
+					return stack::push(L, std::move(pw.read()));
+				}
+				else {
+					return stack::push(L, overload(std::move(pw.read()), std::move(pw.write())));
+				}
+			}
+
+			static int push(lua_State* L, const property_wrapper<F, G>& pw) {
+				if constexpr (std::is_void_v<F>) {
+					return stack::push(L, pw.write);
+				}
+				else if constexpr (std::is_void_v<G>) {
+					return stack::push(L, pw.read);
+				}
+				else {
+					return stack::push(L, overload(pw.read, pw.write));
+				}
+			}
+		};
+
+		template <typename T>
+		struct unqualified_pusher<var_wrapper<T>> {
+			static int push(lua_State* L, var_wrapper<T>&& vw) {
+				return stack::push(L, std::move(vw.value()));
+			}
+			static int push(lua_State* L, const var_wrapper<T>& vw) {
+				return stack::push(L, vw.value());
+			}
+		};
+
+		template <typename... Functions>
+		struct unqualified_pusher<factory_wrapper<Functions...>> {
+			static int push(lua_State* L, const factory_wrapper<Functions...>& fw) {
+				using F = function_detail::overloaded_function<0, Functions...>;
+				function_detail::select_set_fx<false, false, F>(L, fw.functions);
+				return 1;
+			}
+
+			static int push(lua_State* L, factory_wrapper<Functions...>&& fw) {
+				using F = function_detail::overloaded_function<0, Functions...>;
+				function_detail::select_set_fx<false, false, F>(L, std::move(fw.functions));
+				return 1;
+			}
+
+			static int push(lua_State* L, const factory_wrapper<Functions...>& fw, function_detail::call_indicator) {
+				using F = function_detail::overloaded_function<1, Functions...>;
+				function_detail::select_set_fx<false, false, F>(L, fw.functions);
+				return 1;
+			}
+
+			static int push(lua_State* L, factory_wrapper<Functions...>&& fw, function_detail::call_indicator) {
+				using F = function_detail::overloaded_function<1, Functions...>;
+				function_detail::select_set_fx<false, false, F>(L, std::move(fw.functions));
+				return 1;
+			}
+		};
+
+		template <>
+		struct unqualified_pusher<no_construction> {
+			static int push(lua_State* L, no_construction) {
+				lua_CFunction cf = &function_detail::no_construction_error;
+				return stack::push(L, cf);
+			}
+
+			static int push(lua_State* L, no_construction c, function_detail::call_indicator) {
+				return push(L, c);
+			}
+		};
+
+		template <typename T>
+		struct unqualified_pusher<detail::tagged<T, no_construction>> {
+			static int push(lua_State* L, detail::tagged<T, no_construction>) {
+				lua_CFunction cf = &function_detail::no_construction_error;
+				return stack::push(L, cf);
+			}
+
+			static int push(lua_State* L, no_construction, function_detail::call_indicator) {
+				lua_CFunction cf = &function_detail::no_construction_error;
+				return stack::push(L, cf);
+			}
+		};
+
+		template <typename T, typename... Lists>
+		struct unqualified_pusher<detail::tagged<T, constructor_list<Lists...>>> {
+			static int push(lua_State* L, detail::tagged<T, constructor_list<Lists...>>) {
+				lua_CFunction cf = call_detail::construct<T, detail::default_safe_function_calls, true, Lists...>;
+				return stack::push(L, cf);
+			}
+
+			static int push(lua_State* L, constructor_list<Lists...>) {
+				lua_CFunction cf = call_detail::construct<T, detail::default_safe_function_calls, true, Lists...>;
+				return stack::push(L, cf);
+			}
+		};
+
+		template <typename L0, typename... Lists>
+		struct unqualified_pusher<constructor_list<L0, Lists...>> {
+			typedef constructor_list<L0, Lists...> cl_t;
+			static int push(lua_State* L, cl_t cl) {
+				typedef typename meta::bind_traits<L0>::return_type T;
+				return stack::push<detail::tagged<T, cl_t>>(L, cl);
+			}
+		};
+
+		template <typename T, typename... Fxs>
+		struct unqualified_pusher<detail::tagged<T, constructor_wrapper<Fxs...>>> {
+			static int push(lua_State* L, detail::tagged<T, constructor_wrapper<Fxs...>>&& c) {
+				return push(L, std::move(c.value()));
+			}
+
+			static int push(lua_State* L, const detail::tagged<T, const constructor_wrapper<Fxs...>>& c) {
+				return push(L, c.value());
+			}
+
+			static int push(lua_State* L, constructor_wrapper<Fxs...>&& c) {
+				lua_CFunction cf = call_detail::call_user<T, false, false, constructor_wrapper<Fxs...>, 2>;
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<constructor_wrapper<Fxs...>>>(L, std::move(c));
+				return stack::push(L, c_closure(cf, upvalues));
+			}
+
+			static int push(lua_State* L, const constructor_wrapper<Fxs...>& c) {
+				lua_CFunction cf = call_detail::call_user<T, false, false, constructor_wrapper<Fxs...>, 2>;
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<constructor_wrapper<Fxs...>>>(L, c);
+				return stack::push(L, c_closure(cf, upvalues));
+			}
+		};
+
+		template <typename F, typename... Fxs>
+		struct unqualified_pusher<constructor_wrapper<F, Fxs...>> {
+			static int push(lua_State* L, const constructor_wrapper<F, Fxs...>& c) {
+				typedef typename meta::bind_traits<F>::template arg_at<0> arg0;
+				typedef meta::unqualified_t<std::remove_pointer_t<arg0>> T;
+				return stack::push<detail::tagged<T, constructor_wrapper<F, Fxs...>>>(L, c);
+			}
+
+			static int push(lua_State* L, constructor_wrapper<F, Fxs...>&& c) {
+				typedef typename meta::bind_traits<F>::template arg_at<0> arg0;
+				typedef meta::unqualified_t<std::remove_pointer_t<arg0>> T;
+				return stack::push<detail::tagged<T, constructor_wrapper<F, Fxs...>>>(L, std::move(c));
+			}
+		};
+
+		template <typename T>
+		struct unqualified_pusher<detail::tagged<T, destructor_wrapper<void>>> {
+			static int push(lua_State* L, destructor_wrapper<void>) {
+				lua_CFunction cf = detail::usertype_alloc_destroy<T>;
+				return stack::push(L, cf);
+			}
+		};
+
+		template <typename T, typename Fx>
+		struct unqualified_pusher<detail::tagged<T, destructor_wrapper<Fx>>> {
+			static int push(lua_State* L, destructor_wrapper<Fx>&& c) {
+				lua_CFunction cf = call_detail::call_user<T, false, false, destructor_wrapper<Fx>, 2>;
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<destructor_wrapper<Fx>>>(L, std::move(c));
+				return stack::push(L, c_closure(cf, upvalues));
+			}
+
+			static int push(lua_State* L, const destructor_wrapper<Fx>& c) {
+				lua_CFunction cf = call_detail::call_user<T, false, false, destructor_wrapper<Fx>, 2>;
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<destructor_wrapper<Fx>>>(L, c);
+				return stack::push(L, c_closure(cf, upvalues));
+			}
+		};
+
+		template <typename Fx>
+		struct unqualified_pusher<destructor_wrapper<Fx>> {
+			static int push(lua_State* L, destructor_wrapper<Fx>&& c) {
+				lua_CFunction cf = call_detail::call_user<void, false, false, destructor_wrapper<Fx>, 2>;
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<destructor_wrapper<Fx>>>(L, std::move(c));
+				return stack::push(L, c_closure(cf, upvalues));
+			}
+
+			static int push(lua_State* L, const destructor_wrapper<Fx>& c) {
+				lua_CFunction cf = call_detail::call_user<void, false, false, destructor_wrapper<Fx>, 2>;
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<destructor_wrapper<Fx>>>(L, c);
+				return stack::push(L, c_closure(cf, upvalues));
+			}
+		};
+
+		template <typename F, typename... Policies>
+		struct unqualified_pusher<policy_wrapper<F, Policies...>> {
+			using P = policy_wrapper<F, Policies...>;
+
+			static int push(lua_State* L, const P& p) {
+				lua_CFunction cf = call_detail::call_user<void, false, false, P, 2>;
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<P>>(L, p);
+				return stack::push(L, c_closure(cf, upvalues));
+			}
+
+			static int push(lua_State* L, P&& p) {
+				lua_CFunction cf = call_detail::call_user<void, false, false, P, 2>;
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<P>>(L, std::move(p));
+				return stack::push(L, c_closure(cf, upvalues));
+			}
+		};
+
+		template <typename T, typename F, typename... Policies>
+		struct unqualified_pusher<detail::tagged<T, policy_wrapper<F, Policies...>>> {
+			using P = policy_wrapper<F, Policies...>;
+			using Tagged = detail::tagged<T, P>;
+
+			static int push(lua_State* L, const Tagged& p) {
+				lua_CFunction cf = call_detail::call_user<T, false, false, P, 2>;
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<P>>(L, p.value());
+				return stack::push(L, c_closure(cf, upvalues));
+			}
+
+			static int push(lua_State* L, Tagged&& p) {
+				lua_CFunction cf = call_detail::call_user<T, false, false, P, 2>;
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<P>>(L, std::move(p.value()));
+				return stack::push(L, c_closure(cf, upvalues));
+			}
+		};
+
+		template <typename T>
+		struct unqualified_pusher<push_invoke_t<T>> {
+			static int push(lua_State* L, push_invoke_t<T>&& pi) {
+				if constexpr (std::is_invocable_v<std::add_rvalue_reference_t<T>, lua_State*>) {
+					return stack::push(L, std::move(pi.value())(L));
+				}
+				else {
+					return stack::push(L, std::move(pi.value())());
+				}
+			}
+
+			static int push(lua_State* L, const push_invoke_t<T>& pi) {
+				if constexpr (std::is_invocable_v<const T, lua_State*>) {
+					return stack::push(L, pi.value()(L));
+				}
+				else {
+					return stack::push(L, pi.value()());
+				}
+			}
+		};
+
+		namespace stack_detail {
+			template <typename Function, typename Handler>
+			bool check_function_pointer(lua_State* L, int index, Handler&& handler, record& tracking) noexcept {
+#if SOL_IS_ON(SOL_GET_FUNCTION_POINTER_UNSAFE)
+				tracking.use(1);
+				bool success = lua_iscfunction(L, index) == 1;
+				if (success) {
+					// there must be at LEAST 2 upvalues; otherwise, we didn't serialize it.
+					const char* upvalue_name = lua_getupvalue(L, index, 2);
+					lua_pop(L, 1);
+					success = upvalue_name != nullptr;
+				}
+				if (!success) {
+					// expected type, actual type
+					handler(
+					     L, index, type::function, type_of(L, index), "type must be a Lua C Function gotten from a function pointer serialized by sol2");
+				}
+				return success;
+#else
+				(void)L;
+				(void)index;
+				(void)handler;
+				(void)tracking;
+				return false;
+#endif
+			}
+
+			template <typename Function>
+			Function* get_function_pointer(lua_State* L, int index, record& tracking) noexcept {
+#if SOL_IS_ON(SOL_GET_FUNCTION_POINTER_UNSAFE)
+				tracking.use(1);
+				auto udata = stack::stack_detail::get_as_upvalues_using_function<Function*>(L, index);
+				Function* fx = udata.first;
+				return fx;
+#else
+				(void)L;
+				(void)index;
+				(void)tracking;
+				static_assert(meta::meta_detail::always_true<Function>::value,
+#if SOL_IS_DEFAULT_OFF(SOL_GET_FUNCTION_POINTER_UNSAFE)
+				     "You are attempting to retrieve a function pointer type. "
+				     "This is inherently unsafe in sol2. In order to do this, you must turn on the "
+				     "SOL_GET_FUNCTION_POINTER_UNSAFE configuration macro, as detailed in the documentation. "
+				     "Please be careful!"
+#else
+				     "You are attempting to retrieve a function pointer type. "
+				     "You explicitly turned off the ability to do this by defining "
+				     "SOL_GET_FUNCTION_POINTER_UNSAFE or similar to be off. "
+				     "Please reconsider this!"
+#endif
+				);
+				return nullptr;
+#endif
+			}
+		} // namespace stack_detail
+	}      // namespace stack
+} // namespace sol
+
+// end of sol/function_types.hpp
+
+// beginning of sol/dump_handler.hpp
+
+#include <cstdint>
+#include <exception>
+
+namespace sol {
+
+	class dump_error : public error {
+	private:
+		int m_ec;
+
+	public:
+		dump_error(int error_code_) : error("dump returned non-zero error of " + std::to_string(error_code_)), m_ec(error_code_) {
+		}
+
+		int error_code() const {
+			return m_ec;
+		}
+	};
+
+	inline int dump_pass_on_error(lua_State* L_, int result_code, lua_Writer writer_function, void* userdata_pointer_, bool strip) {
+		(void)L_;
+		(void)writer_function;
+		(void)userdata_pointer_;
+		(void)strip;
+		return result_code;
+	}
+
+	inline int dump_panic_on_error(lua_State* L_, int result_code, lua_Writer writer_function, void* userdata_pointer_, bool strip) {
+		(void)L_;
+		(void)writer_function;
+		(void)userdata_pointer_;
+		(void)strip;
+		return luaL_error(L_, "a non-zero error code (%d) was returned by the lua_Writer for the dump function", result_code);
+	}
+
+	inline int dump_throw_on_error(lua_State* L_, int result_code, lua_Writer writer_function, void* userdata_pointer_, bool strip) {
+#if SOL_IS_OFF(SOL_EXCEPTIONS)
+		return dump_panic_on_error(L_, result_code, writer_function, userdata_pointer_, strip);
+#else
+		(void)L_;
+		(void)writer_function;
+		(void)userdata_pointer_;
+		(void)strip;
+		throw dump_error(result_code);
+#endif // no exceptions stuff
+	}
+
+} // namespace sol
+
+// end of sol/dump_handler.hpp
+
+#include <cstdint>
+
+namespace sol {
+	template <typename ref_t, bool aligned = false>
+	class basic_function : public basic_object<ref_t> {
+	private:
+		using base_t = basic_object<ref_t>;
+
+		void luacall(std::ptrdiff_t argcount, std::ptrdiff_t resultcount) const {
+			lua_call(lua_state(), static_cast<int>(argcount), static_cast<int>(resultcount));
+		}
+
+		template <std::size_t... I, typename... Ret>
+		auto invoke(types<Ret...>, std::index_sequence<I...>, std::ptrdiff_t n) const {
+			luacall(n, lua_size<std::tuple<Ret...>>::value);
+			return stack::pop<std::tuple<Ret...>>(lua_state());
+		}
+
+		template <std::size_t I, typename Ret, meta::enable<meta::neg<std::is_void<Ret>>> = meta::enabler>
+		Ret invoke(types<Ret>, std::index_sequence<I>, std::ptrdiff_t n) const {
+			luacall(n, lua_size<Ret>::value);
+			return stack::pop<Ret>(lua_state());
+		}
+
+		template <std::size_t I>
+		void invoke(types<void>, std::index_sequence<I>, std::ptrdiff_t n) const {
+			luacall(n, 0);
+		}
+
+		unsafe_function_result invoke(types<>, std::index_sequence<>, std::ptrdiff_t n) const {
+			int stacksize = lua_gettop(lua_state());
+			int firstreturn = (std::max)(1, stacksize - static_cast<int>(n));
+			luacall(n, LUA_MULTRET);
+			int poststacksize = lua_gettop(lua_state());
+			int returncount = poststacksize - (firstreturn - 1);
+			return unsafe_function_result(lua_state(), firstreturn, returncount);
+		}
+
+	public:
+		using base_t::lua_state;
+
+		basic_function() = default;
+		template <typename T,
+		     meta::enable<meta::neg<std::is_same<meta::unqualified_t<T>, basic_function>>, meta::neg<std::is_same<base_t, stack_reference>>,
+		          meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_function(T&& r) noexcept : base_t(std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			if (!is_function<meta::unqualified_t<T>>::value) {
+				auto pp = stack::push_pop(*this);
+				constructor_handler handler {};
+				stack::check<basic_function>(lua_state(), -1, handler);
+			}
+#endif // Safety
+		}
+		basic_function(const basic_function&) = default;
+		basic_function& operator=(const basic_function&) = default;
+		basic_function(basic_function&&) = default;
+		basic_function& operator=(basic_function&&) = default;
+		basic_function(const stack_reference& r) : basic_function(r.lua_state(), r.stack_index()) {
+		}
+		basic_function(stack_reference&& r) : basic_function(r.lua_state(), r.stack_index()) {
+		}
+		basic_function(lua_nil_t n) : base_t(n) {
+		}
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_function(lua_State* L, T&& r) : base_t(L, std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_function>(lua_state(), -1, handler);
+#endif // Safety
+		}
+		basic_function(lua_State* L, int index = -1) : base_t(L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			constructor_handler handler {};
+			stack::check<basic_function>(L, index, handler);
+#endif // Safety
+		}
+		basic_function(lua_State* L, ref_index index) : base_t(L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_function>(lua_state(), -1, handler);
+#endif // Safety
+		}
+
+		template <typename Fx>
+		int dump(lua_Writer writer, void* userdata, bool strip, Fx&& on_error) const {
+			this->push();
+			auto ppn = stack::push_popper_n<false>(this->lua_state(), 1);
+			int r = lua_dump(this->lua_state(), writer, userdata, strip ? 1 : 0);
+			if (r != 0) {
+				return on_error(this->lua_state(), r, writer, userdata, strip);
+			}
+			return r;
+		}
+
+		int dump(lua_Writer writer, void* userdata, bool strip = false) const {
+			return dump(writer, userdata, strip, &dump_throw_on_error);
+		}
+
+		template <typename Container = bytecode>
+		Container dump() const {
+			Container bc;
+			(void)dump(static_cast<lua_Writer>(&basic_insert_dump_writer<Container>), static_cast<void*>(&bc), false, &dump_panic_on_error);
+			return bc;
+		}
+
+		template <typename Container = bytecode, typename Fx>
+		Container dump(Fx&& on_error) const {
+			Container bc;
+			(void)dump(static_cast<lua_Writer>(&basic_insert_dump_writer<Container>), static_cast<void*>(&bc), false, std::forward<Fx>(on_error));
+			return bc;
+		}
+
+		template <typename... Args>
+		unsafe_function_result operator()(Args&&... args) const {
+			return call<>(std::forward<Args>(args)...);
+		}
+
+		template <typename... Ret, typename... Args>
+		decltype(auto) operator()(types<Ret...>, Args&&... args) const {
+			return call<Ret...>(std::forward<Args>(args)...);
+		}
+
+		template <typename... Ret, typename... Args>
+		decltype(auto) call(Args&&... args) const {
+			if (!aligned) {
+				base_t::push();
+			}
+			int pushcount = stack::multi_push_reference(lua_state(), std::forward<Args>(args)...);
+			return invoke(types<Ret...>(), std::make_index_sequence<sizeof...(Ret)>(), static_cast<std::ptrdiff_t>(pushcount));
+		}
+	};
+} // namespace sol
+
+// end of sol/unsafe_function.hpp
+
+// beginning of sol/protected_function.hpp
+
+// beginning of sol/protected_handler.hpp
+
+#include <cstdint>
+
+namespace sol { namespace detail {
+	inline const char (&default_handler_name())[9] {
+		static const char name[9] = "sol.\xF0\x9F\x94\xA9";
+		return name;
+	}
+
+	template <bool ShouldPush, typename Target = reference>
+	struct protected_handler {
+		lua_State* m_L;
+		const Target& target;
+		int stack_index;
+
+		protected_handler(std::false_type, lua_State* L_, const Target& target_) : m_L(L_), target(target_), stack_index(0) {
+			if (ShouldPush) {
+				stack_index = lua_gettop(L_) + 1;
+				target.push(L_);
+			}
+		}
+
+		protected_handler(std::true_type, lua_State* L_, const Target& target_) : m_L(L_), target(target_), stack_index(0) {
+			if (ShouldPush) {
+				stack_index = target.stack_index();
+			}
+		}
+
+		protected_handler(lua_State* L_, const Target& target_) : protected_handler(meta::boolean<is_stack_based_v<Target>>(), L_, target_) {
+		}
+
+		bool valid() const noexcept {
+			return ShouldPush;
+		}
+
+		~protected_handler() {
+			if constexpr (!is_stack_based_v<Target>) {
+				if (stack_index != 0) {
+					lua_remove(m_L, stack_index);
+				}
+			}
+		}
+	};
+
+	template <typename Base, typename T>
+	inline basic_function<Base> force_cast(T& p) {
+		return p;
+	}
+
+	template <typename Reference, bool IsMainReference = false>
+	inline Reference get_default_handler(lua_State* L_) {
+		if (is_stack_based_v<Reference> || L_ == nullptr)
+			return Reference(L_, lua_nil);
+		L_ = IsMainReference ? main_thread(L_, L_) : L_;
+		lua_getglobal(L_, default_handler_name());
+		auto pp = stack::pop_n(L_, 1);
+		return Reference(L_, -1);
+	}
+
+	template <typename T>
+	inline void set_default_handler(lua_State* L, const T& ref) {
+		if (L == nullptr) {
+			return;
+		}
+		if (!ref.valid()) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushnil(L);
+			lua_setglobal(L, default_handler_name());
+		}
+		else {
+			ref.push(L);
+			lua_setglobal(L, default_handler_name());
+		}
+	}
+}} // namespace sol::detail
+
+// end of sol/protected_handler.hpp
+
+#include <cstdint>
+#include <algorithm>
+
+namespace sol {
+
+	namespace detail {
+		template <bool ShouldPush_, typename Handler_>
+		inline void handle_protected_exception(
+		     lua_State* L_, optional<const std::exception&> maybe_ex, const char* error, detail::protected_handler<ShouldPush_, Handler_>& handler_) {
+			handler_.stack_index = 0;
+			if (ShouldPush_) {
+				handler_.target.push(L_);
+				detail::call_exception_handler(L_, maybe_ex, error);
+				lua_call(L_, 1, 1);
+			}
+			else {
+				detail::call_exception_handler(L_, maybe_ex, error);
+			}
+		}
+	} // namespace detail
+
+	template <typename Reference, bool Aligned = false, typename Handler = reference>
+	class basic_protected_function : public basic_object<Reference> {
+	private:
+		using base_t = basic_object<Reference>;
+		using handler_t = Handler;
+		inline static constexpr bool is_stack_handler_v = is_stack_based_v<handler_t>;
+
+		basic_protected_function(std::true_type, const basic_protected_function& other_) noexcept
+		: base_t(other_), m_error_handler(other_.m_error_handler.copy(lua_state())) {
+		}
+
+		basic_protected_function(std::false_type, const basic_protected_function& other_) noexcept : base_t(other_), m_error_handler(other_.m_error_handler) {
+		}
+
+	public:
+		basic_protected_function() = default;
+		template <typename T,
+		     meta::enable<meta::neg<std::is_same<meta::unqualified_t<T>, basic_protected_function>>,
+		          meta::neg<std::is_base_of<proxy_base_tag, meta::unqualified_t<T>>>, meta::neg<std::is_same<base_t, stack_reference>>,
+		          meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_protected_function(T&& r) noexcept : base_t(std::forward<T>(r)), m_error_handler(get_default_handler(r.lua_state())) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			if (!is_function<meta::unqualified_t<T>>::value) {
+				auto pp = stack::push_pop(*this);
+				constructor_handler handler {};
+				stack::check<basic_protected_function>(lua_state(), -1, handler);
+			}
+#endif // Safety
+		}
+		basic_protected_function(const basic_protected_function& other_) noexcept
+		: basic_protected_function(meta::boolean<is_stateless_lua_reference_v<Handler>>(), other_) {
+		}
+		basic_protected_function& operator=(const basic_protected_function& other_) {
+			base_t::operator=(other_);
+			if constexpr (is_stateless_lua_reference_v<Handler>) {
+				m_error_handler.copy_assign(lua_state(), other_.m_error_handler);
+			}
+			else {
+				m_error_handler = other_.m_error_handler;
+			}
+			return *this;
+		}
+		basic_protected_function(basic_protected_function&&) = default;
+		basic_protected_function& operator=(basic_protected_function&&) = default;
+		basic_protected_function(const basic_function<base_t>& b) : basic_protected_function(b, get_default_handler(b.lua_state())) {
+		}
+		basic_protected_function(basic_function<base_t>&& b) : basic_protected_function(std::move(b), get_default_handler(b.lua_state())) {
+		}
+		basic_protected_function(const basic_function<base_t>& b, handler_t eh) : base_t(b), m_error_handler(std::move(eh)) {
+		}
+		basic_protected_function(basic_function<base_t>&& b, handler_t eh) : base_t(std::move(b)), m_error_handler(std::move(eh)) {
+		}
+		basic_protected_function(const stack_reference& r) : basic_protected_function(r.lua_state(), r.stack_index(), get_default_handler(r.lua_state())) {
+		}
+		basic_protected_function(stack_reference&& r) : basic_protected_function(r.lua_state(), r.stack_index(), get_default_handler(r.lua_state())) {
+		}
+		basic_protected_function(const stack_reference& r, handler_t eh) : basic_protected_function(r.lua_state(), r.stack_index(), std::move(eh)) {
+		}
+		basic_protected_function(stack_reference&& r, handler_t eh) : basic_protected_function(r.lua_state(), r.stack_index(), std::move(eh)) {
+		}
+
+		template <typename Super>
+		basic_protected_function(const proxy_base<Super>& p) : basic_protected_function(p, get_default_handler(p.lua_state())) {
+		}
+		template <typename Super>
+		basic_protected_function(proxy_base<Super>&& p) : basic_protected_function(std::move(p), get_default_handler(p.lua_state())) {
+		}
+		template <typename Proxy, typename HandlerReference,
+		     meta::enable<std::is_base_of<proxy_base_tag, meta::unqualified_t<Proxy>>,
+		          meta::neg<is_lua_index<meta::unqualified_t<HandlerReference>>>> = meta::enabler>
+		basic_protected_function(Proxy&& p, HandlerReference&& eh)
+		: basic_protected_function(detail::force_cast<base_t>(p), make_reference<handler_t>(p.lua_state(), std::forward<HandlerReference>(eh))) {
+		}
+
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_protected_function(lua_State* L_, T&& r) : basic_protected_function(L_, std::forward<T>(r), get_default_handler(L_)) {
+		}
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_protected_function(lua_State* L_, T&& r, handler_t eh) : base_t(L_, std::forward<T>(r)), m_error_handler(std::move(eh)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_protected_function>(lua_state(), -1, handler);
+#endif // Safety
+		}
+
+		basic_protected_function(lua_nil_t n) : base_t(n), m_error_handler(n) {
+		}
+
+		basic_protected_function(lua_State* L_, int index_ = -1) : basic_protected_function(L_, index_, get_default_handler(L_)) {
+		}
+		basic_protected_function(lua_State* L_, int index_, handler_t eh) : base_t(L_, index_), m_error_handler(std::move(eh)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			constructor_handler handler {};
+			stack::check<basic_protected_function>(L_, index_, handler);
+#endif // Safety
+		}
+		basic_protected_function(lua_State* L_, absolute_index index_) : basic_protected_function(L_, index_, get_default_handler(L_)) {
+		}
+		basic_protected_function(lua_State* L_, absolute_index index_, handler_t eh) : base_t(L_, index_), m_error_handler(std::move(eh)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			constructor_handler handler {};
+			stack::check<basic_protected_function>(L_, index_, handler);
+#endif // Safety
+		}
+		basic_protected_function(lua_State* L_, raw_index index_) : basic_protected_function(L_, index_, get_default_handler(L_)) {
+		}
+		basic_protected_function(lua_State* L_, raw_index index_, handler_t eh) : base_t(L_, index_), m_error_handler(std::move(eh)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			constructor_handler handler {};
+			stack::check<basic_protected_function>(L_, index_, handler);
+#endif // Safety
+		}
+		basic_protected_function(lua_State* L_, ref_index index_) : basic_protected_function(L_, index_, get_default_handler(L_)) {
+		}
+		basic_protected_function(lua_State* L_, ref_index index_, handler_t eh) : base_t(L_, index_), m_error_handler(std::move(eh)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_protected_function>(lua_state(), -1, handler);
+#endif // Safety
+		}
+
+		using base_t::lua_state;
+
+		template <typename Fx>
+		int dump(lua_Writer writer, void* userdata_pointer_, bool strip, Fx&& on_error) const {
+			this->push();
+			auto ppn = stack::push_popper_n<false>(this->lua_state(), 1);
+			int r = lua_dump(this->lua_state(), writer, userdata_pointer_, strip ? 1 : 0);
+			if (r != 0) {
+				return on_error(this->lua_state(), r, writer, userdata_pointer_, strip);
+			}
+			return r;
+		}
+
+		int dump(lua_Writer writer, void* userdata_pointer_, bool strip = false) const {
+			return dump(writer, userdata_pointer_, strip, &dump_pass_on_error);
+		}
+
+		template <typename Container = bytecode>
+		Container dump() const {
+			Container bc;
+			(void)dump(static_cast<lua_Writer>(&basic_insert_dump_writer<Container>), static_cast<void*>(&bc), false, &dump_throw_on_error);
+			return bc;
+		}
+
+		template <typename Container = bytecode, typename Fx>
+		Container dump(Fx&& on_error) const {
+			Container bc;
+			(void)dump(static_cast<lua_Writer>(&basic_insert_dump_writer<Container>), static_cast<void*>(&bc), false, std::forward<Fx>(on_error));
+			return bc;
+		}
+
+		template <typename... Args>
+		protected_function_result operator()(Args&&... args) const {
+			return call<>(std::forward<Args>(args)...);
+		}
+
+		template <typename... Ret, typename... Args>
+		decltype(auto) operator()(types<Ret...>, Args&&... args) const {
+			return call<Ret...>(std::forward<Args>(args)...);
+		}
+
+		template <typename... Ret, typename... Args>
+		decltype(auto) call(Args&&... args) const {
+			if constexpr (!Aligned) {
+				// we do not expect the function to already be on the stack: push it
+				if (m_error_handler.valid(lua_state())) {
+					detail::protected_handler<true, handler_t> h(lua_state(), m_error_handler);
+					base_t::push();
+					int pushcount = stack::multi_push_reference(lua_state(), std::forward<Args>(args)...);
+					return invoke(types<Ret...>(), std::make_index_sequence<sizeof...(Ret)>(), pushcount, h);
+				}
+				else {
+					detail::protected_handler<false, handler_t> h(lua_state(), m_error_handler);
+					base_t::push();
+					int pushcount = stack::multi_push_reference(lua_state(), std::forward<Args>(args)...);
+					return invoke(types<Ret...>(), std::make_index_sequence<sizeof...(Ret)>(), pushcount, h);
+				}
+			}
+			else {
+				// the function is already on the stack at the right location
+				if (m_error_handler.valid()) {
+					// the handler will be pushed onto the stack manually,
+					// since it's not already on the stack this means we need to push our own
+					// function on the stack too and swap things to be in-place
+					if constexpr (!is_stack_handler_v) {
+						// so, we need to remove the function at the top and then dump the handler out ourselves
+						base_t::push();
+					}
+					detail::protected_handler<true, handler_t> h(lua_state(), m_error_handler);
+					if constexpr (!is_stack_handler_v) {
+						lua_replace(lua_state(), -3);
+						h.stack_index = lua_absindex(lua_state(), -2);
+					}
+					int pushcount = stack::multi_push_reference(lua_state(), std::forward<Args>(args)...);
+					return invoke(types<Ret...>(), std::make_index_sequence<sizeof...(Ret)>(), pushcount, h);
+				}
+				else {
+					detail::protected_handler<false, handler_t> h(lua_state(), m_error_handler);
+					int pushcount = stack::multi_push_reference(lua_state(), std::forward<Args>(args)...);
+					return invoke(types<Ret...>(), std::make_index_sequence<sizeof...(Ret)>(), pushcount, h);
+				}
+			}
+		}
+
+		~basic_protected_function() {
+			if constexpr (is_stateless_lua_reference_v<handler_t>) {
+				this->m_error_handler.reset(lua_state());
+			}
+		}
+
+		static handler_t get_default_handler(lua_State* L_) {
+			return detail::get_default_handler<handler_t, is_main_threaded_v<base_t>>(L_);
+		}
+
+		template <typename T>
+		static void set_default_handler(const T& ref) {
+			detail::set_default_handler(ref.lua_state(), ref);
+		}
+
+		auto get_error_handler() const noexcept {
+			if constexpr (is_stateless_lua_reference_v<handler_t>) {
+				if constexpr (is_stack_based_v<handler_t>) {
+					return stack_reference(lua_state(), m_error_handler.stack_index());
+				}
+				else {
+					return basic_reference<is_main_threaded_v<base_t>>(lua_state(), ref_index(m_error_handler.registry_index()));
+				}
+			}
+			else {
+				return m_error_handler;
+			}
+		}
+
+		template <typename ErrorHandler_>
+		void set_error_handler(ErrorHandler_&& error_handler_) noexcept {
+			static_assert(!is_stack_based_v<handler_t> || is_stack_based_v<ErrorHandler_>,
+			     "A stack-based error handler can only be set from a parameter that is also stack-based.");
+			if constexpr (std::is_rvalue_reference_v<ErrorHandler_>) {
+				m_error_handler = std::forward<ErrorHandler_>(error_handler_);
+			}
+			else {
+				m_error_handler.copy_assign(lua_state(), std::forward<ErrorHandler_>(error_handler_));
+			}
+		}
+
+		void abandon () noexcept {
+			this->m_error_handler.abandon();
+			base_t::abandon();
+		}
+
+	private:
+		handler_t m_error_handler;
+
+		template <bool b>
+		call_status luacall(std::ptrdiff_t argcount, std::ptrdiff_t result_count_, detail::protected_handler<b, handler_t>& h) const {
+			return static_cast<call_status>(lua_pcall(lua_state(), static_cast<int>(argcount), static_cast<int>(result_count_), h.stack_index));
+		}
+
+		template <std::size_t... I, bool b, typename... Ret>
+		auto invoke(types<Ret...>, std::index_sequence<I...>, std::ptrdiff_t n, detail::protected_handler<b, handler_t>& h) const {
+			luacall(n, sizeof...(Ret), h);
+			return stack::pop<std::tuple<Ret...>>(lua_state());
+		}
+
+		template <std::size_t I, bool b, typename Ret>
+		Ret invoke(types<Ret>, std::index_sequence<I>, std::ptrdiff_t n, detail::protected_handler<b, handler_t>& h) const {
+			luacall(n, 1, h);
+			return stack::pop<Ret>(lua_state());
+		}
+
+		template <std::size_t I, bool b>
+		void invoke(types<void>, std::index_sequence<I>, std::ptrdiff_t n, detail::protected_handler<b, handler_t>& h) const {
+			luacall(n, 0, h);
+		}
+
+		template <bool b>
+		protected_function_result invoke(types<>, std::index_sequence<>, std::ptrdiff_t n, detail::protected_handler<b, handler_t>& h) const {
+			int stacksize = lua_gettop(lua_state());
+			int poststacksize = stacksize;
+			int firstreturn = 1;
+			int returncount = 0;
+			call_status code = call_status::ok;
+#if SOL_IS_ON(SOL_EXCEPTIONS) && SOL_IS_OFF(SOL_PROPAGATE_EXCEPTIONS)
+			try {
+#endif // No Exceptions
+				firstreturn = (std::max)(1, static_cast<int>(stacksize - n - static_cast<int>(h.valid() && !is_stack_handler_v)));
+				code = luacall(n, LUA_MULTRET, h);
+				poststacksize = lua_gettop(lua_state()) - static_cast<int>(h.valid() && !is_stack_handler_v);
+				returncount = poststacksize - (firstreturn - 1);
+#if SOL_IS_ON(SOL_EXCEPTIONS) && SOL_IS_OFF(SOL_PROPAGATE_EXCEPTIONS)
+			}
+			// Handle C++ errors thrown from C++ functions bound inside of lua
+			catch (const char* error) {
+				detail::handle_protected_exception(lua_state(), optional<const std::exception&>(nullopt), error, h);
+				firstreturn = lua_gettop(lua_state());
+				return protected_function_result(lua_state(), firstreturn, 0, 1, call_status::runtime);
+			}
+			catch (const std::string& error) {
+				detail::handle_protected_exception(lua_state(), optional<const std::exception&>(nullopt), error.c_str(), h);
+				firstreturn = lua_gettop(lua_state());
+				return protected_function_result(lua_state(), firstreturn, 0, 1, call_status::runtime);
+			}
+			catch (const std::exception& error) {
+				detail::handle_protected_exception(lua_state(), optional<const std::exception&>(error), error.what(), h);
+				firstreturn = lua_gettop(lua_state());
+				return protected_function_result(lua_state(), firstreturn, 0, 1, call_status::runtime);
+			}
+#if SOL_IS_ON(SOL_EXCEPTIONS_CATCH_ALL)
+			// LuaJIT cannot have the catchall when the safe propagation is on
+			// but LuaJIT will swallow all C++ errors
+			// if we don't at least catch std::exception ones
+			catch (...) {
+				detail::handle_protected_exception(lua_state(), optional<const std::exception&>(nullopt), detail::protected_function_error, h);
+				firstreturn = lua_gettop(lua_state());
+				return protected_function_result(lua_state(), firstreturn, 0, 1, call_status::runtime);
+			}
+#endif // Always catch edge case
+#else
+			// do not handle exceptions: they can be propogated into C++ and keep all type information / rich information
+#endif // Exceptions vs. No Exceptions
+			return protected_function_result(lua_state(), firstreturn, returncount, returncount, code);
+		}
+	};
+} // namespace sol
+
+// end of sol/protected_function.hpp
+
+#include <functional>
+
+namespace sol {
+	template <typename... Ret, typename... Args>
+	decltype(auto) stack_proxy::call(Args&&... args) {
+		stack_function sf(this->lua_state(), this->stack_index());
+		return sf.template call<Ret...>(std::forward<Args>(args)...);
+	}
+
+	inline protected_function_result::protected_function_result(unsafe_function_result&& o) noexcept
+	: L(o.lua_state()), index(o.stack_index()), returncount(o.return_count()), popcount(o.return_count()), err(o.status()) {
+		// Must be manual, otherwise destructor will screw us
+		// return count being 0 is enough to keep things clean
+		// but we will be thorough
+		o.abandon();
+	}
+
+	inline protected_function_result& protected_function_result::operator=(unsafe_function_result&& o) noexcept {
+		L = o.lua_state();
+		index = o.stack_index();
+		returncount = o.return_count();
+		popcount = o.return_count();
+		err = o.status();
+		// Must be manual, otherwise destructor will screw us
+		// return count being 0 is enough to keep things clean
+		// but we will be thorough
+		o.abandon();
+		return *this;
+	}
+
+	inline unsafe_function_result::unsafe_function_result(protected_function_result&& o) noexcept
+	: L(o.lua_state()), index(o.stack_index()), returncount(o.return_count()) {
+		// Must be manual, otherwise destructor will screw us
+		// return count being 0 is enough to keep things clean
+		// but we will be thorough
+		o.abandon();
+	}
+	inline unsafe_function_result& unsafe_function_result::operator=(protected_function_result&& o) noexcept {
+		L = o.lua_state();
+		index = o.stack_index();
+		returncount = o.return_count();
+		// Must be manual, otherwise destructor will screw us
+		// return count being 0 is enough to keep things clean
+		// but we will be thorough
+		o.abandon();
+		return *this;
+	}
+
+	namespace detail {
+		template <typename... R>
+		struct std_shim {
+			unsafe_function lua_func_;
+
+			std_shim(unsafe_function lua_func) : lua_func_(std::move(lua_func)) {
+			}
+
+			template <typename... Args>
+			meta::return_type_t<R...> operator()(Args&&... args) {
+				return lua_func_.call<R...>(std::forward<Args>(args)...);
+			}
+		};
+
+		template <>
+		struct std_shim<void> {
+			unsafe_function lua_func_;
+
+			std_shim(unsafe_function lua_func) : lua_func_(std::move(lua_func)) {
+			}
+
+			template <typename... Args>
+			void operator()(Args&&... args) {
+				lua_func_.call<void>(std::forward<Args>(args)...);
+			}
+		};
+	} // namespace detail
+
+	namespace stack {
+		template <typename Signature>
+		struct unqualified_getter<std::function<Signature>> {
+			typedef meta::bind_traits<Signature> fx_t;
+			typedef typename fx_t::args_list args_lists;
+			typedef meta::tuple_types<typename fx_t::return_type> return_types;
+
+			template <typename... R>
+			static std::function<Signature> get_std_func(types<R...>, lua_State* L, int index) {
+				detail::std_shim<R...> fx(unsafe_function(L, index));
+				return fx;
+			}
+
+			static std::function<Signature> get(lua_State* L, int index, record& tracking) {
+				tracking.use(1);
+				type t = type_of(L, index);
+				if (t == type::none || t == type::lua_nil) {
+					return nullptr;
+				}
+				return get_std_func(return_types(), L, index);
+			}
+		};
+
+		template <typename Allocator>
+		struct unqualified_getter<basic_bytecode<Allocator>> {
+			static basic_bytecode<Allocator> get(lua_State* L, int index, record& tracking) {
+				tracking.use(1);
+				stack_function sf(L, index);
+				return sf.dump(&dump_panic_on_error);
+			}
+		};
+	} // namespace stack
+
+} // namespace sol
+
+// end of sol/function.hpp
+
+// beginning of sol/usertype.hpp
+
+// beginning of sol/usertype_core.hpp
+
+// beginning of sol/deprecate.hpp
+
+#ifndef SOL_DEPRECATED
+#ifdef _MSC_VER
+#define SOL_DEPRECATED __declspec(deprecated)
+#elif __GNUC__
+#define SOL_DEPRECATED __attribute__((deprecated))
+#else
+#define SOL_DEPRECATED [[deprecated]]
+#endif // compilers
+#endif // SOL_DEPRECATED
+
+namespace sol { namespace detail {
+	template <typename T>
+	struct SOL_DEPRECATED deprecate_type {
+		using type = T;
+	};
+}} // namespace sol::detail
+
+// end of sol/deprecate.hpp
+
+// beginning of sol/usertype_container_launch.hpp
+
+// beginning of sol/usertype_container.hpp
+
+namespace sol {
+
+	template <typename T>
+	struct usertype_container;
+
+	namespace container_detail {
+
+		template <typename T>
+		struct has_clear_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::clear));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_empty_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::empty));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_erase_after_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(
+			     decltype(std::declval<C>().erase_after(std::declval<std::add_rvalue_reference_t<typename C::const_iterator>>()))*);
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T, typename = void>
+		struct has_find_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(std::declval<C>().find(std::declval<std::add_rvalue_reference_t<typename C::value_type>>()))*);
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_find_test<T, std::enable_if_t<meta::is_lookup<T>::value>> {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(std::declval<C>().find(std::declval<std::add_rvalue_reference_t<typename C::key_type>>()))*);
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_erase_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(std::declval<C>().erase(std::declval<typename C::iterator>()))*);
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_erase_key_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(std::declval<C>().erase(std::declval<typename C::key_type>()))*);
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_find_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::find));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_index_of_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::index_of));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_insert_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::insert));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_erase_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::erase));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_index_set_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::index_set));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_index_get_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::index_get));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_set_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::set));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_get_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::get));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_at_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::at));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_pairs_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::pairs));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_ipairs_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::ipairs));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_next_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::next));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_add_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::add));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_size_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::size));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		using has_clear = meta::boolean<has_clear_test<T>::value>;
+
+		template <typename T>
+		using has_empty = meta::boolean<has_empty_test<T>::value>;
+
+		template <typename T>
+		using has_find = meta::boolean<has_find_test<T>::value>;
+
+		template <typename T>
+		using has_erase = meta::boolean<has_erase_test<T>::value>;
+
+		template <typename T>
+		using has_erase_key = meta::boolean<has_erase_key_test<T>::value>;
+
+		template <typename T>
+		using has_erase_after = meta::boolean<has_erase_after_test<T>::value>;
+
+		template <typename T>
+		using has_traits_get = meta::boolean<has_traits_get_test<T>::value>;
+
+		template <typename T>
+		using has_traits_at = meta::boolean<has_traits_at_test<T>::value>;
+
+		template <typename T>
+		using has_traits_set = meta::boolean<has_traits_set_test<T>::value>;
+
+		template <typename T>
+		using has_traits_index_get = meta::boolean<has_traits_index_get_test<T>::value>;
+
+		template <typename T>
+		using has_traits_index_set = meta::boolean<has_traits_index_set_test<T>::value>;
+
+		template <typename T>
+		using has_traits_pairs = meta::boolean<has_traits_pairs_test<T>::value>;
+
+		template <typename T>
+		using has_traits_ipairs = meta::boolean<has_traits_ipairs_test<T>::value>;
+
+		template <typename T>
+		using has_traits_next = meta::boolean<has_traits_next_test<T>::value>;
+
+		template <typename T>
+		using has_traits_add = meta::boolean<has_traits_add_test<T>::value>;
+
+		template <typename T>
+		using has_traits_size = meta::boolean<has_traits_size_test<T>::value>;
+
+		template <typename T>
+		using has_traits_clear = has_clear<T>;
+
+		template <typename T>
+		using has_traits_empty = has_empty<T>;
+
+		template <typename T>
+		using has_traits_find = meta::boolean<has_traits_find_test<T>::value>;
+
+		template <typename T>
+		using has_traits_index_of = meta::boolean<has_traits_index_of_test<T>::value>;
+
+		template <typename T>
+		using has_traits_insert = meta::boolean<has_traits_insert_test<T>::value>;
+
+		template <typename T>
+		using has_traits_erase = meta::boolean<has_traits_erase_test<T>::value>;
+
+		template <typename T>
+		struct is_forced_container : is_container<T> { };
+
+		template <typename T>
+		struct is_forced_container<as_container_t<T>> : std::true_type { };
+
+		template <typename T>
+		struct container_decay {
+			typedef T type;
+		};
+
+		template <typename T>
+		struct container_decay<as_container_t<T>> {
+			typedef T type;
+		};
+
+		template <typename T>
+		using container_decay_t = typename container_decay<meta::unqualified_t<T>>::type;
+
+		template <typename T>
+		decltype(auto) get_key(std::false_type, T&& t) {
+			return std::forward<T>(t);
+		}
+
+		template <typename T>
+		decltype(auto) get_key(std::true_type, T&& t) {
+			return t.first;
+		}
+
+		template <typename T>
+		decltype(auto) get_value(std::false_type, T&& t) {
+			return std::forward<T>(t);
+		}
+
+		template <typename T>
+		decltype(auto) get_value(std::true_type, T&& t) {
+			return t.second;
+		}
+
+		template <typename X, typename = void>
+		struct usertype_container_default {
+		private:
+			typedef std::remove_pointer_t<meta::unwrap_unqualified_t<X>> T;
+
+		public:
+			typedef lua_nil_t iterator;
+			typedef iterator sentinel;
+			typedef lua_nil_t value_type;
+
+			static int at(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'at(index)' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int get(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'get(key)' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int index_get(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'container[key]' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int set(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'set(key, value)' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int index_set(lua_State* L_) {
+				return luaL_error(
+				     L_, "sol: cannot call 'container[key] = value' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int add(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'add' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int insert(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'insert' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int find(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'find' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int index_of(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'index_of' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int size(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'end' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int clear(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'clear' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int empty(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'empty' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int erase(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'erase' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int next(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'next' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int pairs(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call '__pairs/pairs' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int ipairs(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call '__ipairs' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static iterator begin(lua_State* L_, T&) {
+				luaL_error(L_, "sol: cannot call 'being' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+				return lua_nil;
+			}
+
+			static sentinel end(lua_State* L_, T&) {
+				luaL_error(L_, "sol: cannot call 'end' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+				return lua_nil;
+			}
+		};
+
+		template <typename X>
+		struct usertype_container_default<X,
+		     std::enable_if_t<meta::all<is_forced_container<meta::unqualified_t<X>>, meta::has_value_type<meta::unqualified_t<container_decay_t<X>>>,
+		          meta::has_iterator<meta::unqualified_t<container_decay_t<X>>>>::value>> {
+		private:
+			using T = std::remove_pointer_t<meta::unwrap_unqualified_t<container_decay_t<X>>>;
+
+		private:
+			using deferred_uc = usertype_container<X>;
+			using is_associative = meta::is_associative<T>;
+			using is_lookup = meta::is_lookup<T>;
+			using is_ordered = meta::is_ordered<T>;
+			using is_matched_lookup = meta::is_matched_lookup<T>;
+			using iterator = typename T::iterator;
+			using sentinel = meta::sentinel_or_t<T, iterator>;
+			using value_type = typename T::value_type;
+			typedef meta::conditional_t<is_matched_lookup::value, std::pair<value_type, value_type>,
+			     meta::conditional_t<is_associative::value || is_lookup::value, value_type, std::pair<std::ptrdiff_t, value_type>>>
+			     KV;
+			typedef typename KV::first_type K;
+			typedef typename KV::second_type V;
+			typedef meta::conditional_t<is_matched_lookup::value, std::ptrdiff_t, K> next_K;
+			typedef decltype(*std::declval<iterator&>()) iterator_return;
+			typedef meta::conditional_t<is_associative::value || is_matched_lookup::value, std::add_lvalue_reference_t<V>,
+			     meta::conditional_t<is_lookup::value, V, iterator_return>>
+			     captured_type;
+			typedef typename meta::iterator_tag<iterator>::type iterator_category;
+			typedef std::is_same<iterator_category, std::input_iterator_tag> is_input_iterator;
+			typedef meta::conditional_t<is_input_iterator::value, V, decltype(detail::deref_move_only(std::declval<captured_type>()))> push_type;
+			typedef std::is_copy_assignable<V> is_copyable;
+			typedef meta::neg<meta::any<std::is_const<V>, std::is_const<std::remove_reference_t<iterator_return>>, meta::neg<is_copyable>>> is_writable;
+			typedef meta::unqualified_t<decltype(get_key(is_associative(), std::declval<std::add_lvalue_reference_t<value_type>>()))> key_type;
+			typedef meta::all<std::is_integral<K>, meta::neg<meta::any<is_associative, is_lookup>>> is_linear_integral;
+
+			struct iter : detail::ebco<iterator, 0>, detail::ebco<sentinel, 1> {
+				using it_base = detail::ebco<iterator, 0>;
+				using sen_base = detail::ebco<sentinel, 1>;
+				main_reference keep_alive;
+				std::size_t index;
+
+				iter(lua_State* L_, int stack_index_, iterator it_, sentinel sen_) noexcept
+				: it_base(std::move(it_)), sen_base(std::move(sen_)), keep_alive(L_, stack_index_), index(0) {
+				}
+
+				iterator& it() noexcept {
+					return it_base::value();
+				}
+
+				const iterator& it() const noexcept {
+					return it_base::value();
+				}
+
+				sentinel& sen() noexcept {
+					return sen_base::value();
+				}
+
+				const sentinel& sen() const noexcept {
+					return sen_base::value();
+				}
+			};
+
+			static auto& get_src(lua_State* L_) {
+#if SOL_IS_ON(SOL_SAFE_USERTYPE)
+				auto p = stack::unqualified_check_get<T*>(L_, 1);
+				if (!p) {
+					luaL_error(L_,
+					     "sol: 'self' is not of type '%s' (pass 'self' as first argument with ':' or call on proper type)",
+					     detail::demangle<T>().c_str());
+				}
+				if (p.value() == nullptr) {
+					luaL_error(
+					     L_, "sol: 'self' argument is nil (pass 'self' as first argument with ':' or call on a '%s' type)", detail::demangle<T>().c_str());
+				}
+				return *p.value();
+#else
+				return stack::unqualified_get<T>(L_, 1);
+#endif // Safe getting with error
+			}
+
+			static detail::error_result at_category(std::input_iterator_tag, lua_State* L_, T& self, std::ptrdiff_t pos) {
+				pos += deferred_uc::index_adjustment(L_, self);
+				if (pos < 0) {
+					return stack::push(L_, lua_nil);
+				}
+				auto it = deferred_uc::begin(L_, self);
+				auto e = deferred_uc::end(L_, self);
+				if (it == e) {
+					return stack::push(L_, lua_nil);
+				}
+				while (pos > 0) {
+					--pos;
+					++it;
+					if (it == e) {
+						return stack::push(L_, lua_nil);
+					}
+				}
+				return get_associative(is_associative(), L_, it);
+			}
+
+			static detail::error_result at_category(std::random_access_iterator_tag, lua_State* L_, T& self, std::ptrdiff_t pos) {
+				std::ptrdiff_t len = static_cast<std::ptrdiff_t>(size_start(L_, self));
+				pos += deferred_uc::index_adjustment(L_, self);
+				if (pos < 0 || pos >= len) {
+					return stack::push(L_, lua_nil);
+				}
+				auto it = std::next(deferred_uc::begin(L_, self), pos);
+				return get_associative(is_associative(), L_, it);
+			}
+
+			static detail::error_result at_start(lua_State* L_, T& self, std::ptrdiff_t pos) {
+				return at_category(iterator_category(), L_, self, pos);
+			}
+
+			template <typename Iter>
+			static detail::error_result get_associative(std::true_type, lua_State* L_, Iter& it) {
+				decltype(auto) v = *it;
+				return stack::stack_detail::push_reference<push_type>(L_, detail::deref_move_only(v.second));
+			}
+
+			template <typename Iter>
+			static detail::error_result get_associative(std::false_type, lua_State* L_, Iter& it) {
+				return stack::stack_detail::push_reference<push_type>(L_, detail::deref_move_only(*it));
+			}
+
+			static detail::error_result get_category(std::input_iterator_tag, lua_State* L_, T& self, K& key) {
+				key = static_cast<K>(key + deferred_uc::index_adjustment(L_, self));
+				if (key < 0) {
+					return stack::push(L_, lua_nil);
+				}
+				auto it = deferred_uc::begin(L_, self);
+				auto e = deferred_uc::end(L_, self);
+				if (it == e) {
+					return stack::push(L_, lua_nil);
+				}
+				while (key > 0) {
+					--key;
+					++it;
+					if (it == e) {
+						return stack::push(L_, lua_nil);
+					}
+				}
+				return get_associative(is_associative(), L_, it);
+			}
+
+			static detail::error_result get_category(std::random_access_iterator_tag, lua_State* L_, T& self, K& key) {
+				std::ptrdiff_t len = static_cast<std::ptrdiff_t>(size_start(L_, self));
+				key = static_cast<K>(static_cast<std::ptrdiff_t>(key) + deferred_uc::index_adjustment(L_, self));
+				if (key < 0 || key >= len) {
+					return stack::push(L_, lua_nil);
+				}
+				auto it = std::next(deferred_uc::begin(L_, self), key);
+				return get_associative(is_associative(), L_, it);
+			}
+
+			static detail::error_result get_it(std::true_type, lua_State* L_, T& self, K& key) {
+				return get_category(iterator_category(), L_, self, key);
+			}
+
+			static detail::error_result get_comparative(std::true_type, lua_State* L_, T& self, K& key) {
+				auto fx = [&](const value_type& r) -> bool { return key == get_key(is_associative(), r); };
+				auto e = deferred_uc::end(L_, self);
+				auto it = std::find_if(deferred_uc::begin(L_, self), e, std::ref(fx));
+				if (it == e) {
+					return stack::push(L_, lua_nil);
+				}
+				return get_associative(is_associative(), L_, it);
+			}
+
+			static detail::error_result get_comparative(std::false_type, lua_State*, T&, K&) {
+				return detail::error_result("cannot get this key on '%s': no suitable way to increment iterator and compare to key value '%s'",
+				     detail::demangle<T>().data(),
+				     detail::demangle<K>().data());
+			}
+
+			static detail::error_result get_it(std::false_type, lua_State* L_, T& self, K& key) {
+				return get_comparative(meta::supports_op_equal<K, key_type>(), L_, self, key);
+			}
+
+			static detail::error_result set_associative(std::true_type, iterator& it, stack_object value) {
+				decltype(auto) v = *it;
+				v.second = value.as<V>();
+				return {};
+			}
+
+			static detail::error_result set_associative(std::false_type, iterator& it, stack_object value) {
+				decltype(auto) v = *it;
+				v = value.as<V>();
+				return {};
+			}
+
+			static detail::error_result set_writable(std::true_type, lua_State*, T&, iterator& it, stack_object value) {
+				return set_associative(is_associative(), it, std::move(value));
+			}
+
+			static detail::error_result set_writable(std::false_type, lua_State*, T&, iterator&, stack_object) {
+				return detail::error_result(
+				     "cannot perform a 'set': '%s's iterator reference is not writable (non-copy-assignable or const)", detail::demangle<T>().data());
+			}
+
+			static detail::error_result set_category(std::input_iterator_tag, lua_State* L_, T& self, stack_object okey, stack_object value) {
+				decltype(auto) key = okey.as<K>();
+				key = static_cast<K>(static_cast<std::ptrdiff_t>(key) + deferred_uc::index_adjustment(L_, self));
+				auto e = deferred_uc::end(L_, self);
+				auto it = deferred_uc::begin(L_, self);
+				auto backit = it;
+				for (; key > 0 && it != e; --key, ++it) {
+					backit = it;
+				}
+				if (it == e) {
+					if (key == 0) {
+						return add_copyable(is_copyable(), L_, self, std::move(value), meta::has_insert_after<T>::value ? backit : it);
+					}
+					return detail::error_result("out of bounds (too big) for set on '%s'", detail::demangle<T>().c_str());
+				}
+				return set_writable(is_writable(), L_, self, it, std::move(value));
+			}
+
+			static detail::error_result set_category(std::random_access_iterator_tag, lua_State* L_, T& self, stack_object okey, stack_object value) {
+				decltype(auto) key = okey.as<K>();
+				key = static_cast<K>(static_cast<std::ptrdiff_t>(key) + deferred_uc::index_adjustment(L_, self));
+				if (key < 0) {
+					return detail::error_result("sol: out of bounds (too small) for set on '%s'", detail::demangle<T>().c_str());
+				}
+				std::ptrdiff_t len = static_cast<std::ptrdiff_t>(size_start(L_, self));
+				if (key == len) {
+					return add_copyable(is_copyable(), L_, self, std::move(value));
+				}
+				else if (key >= len) {
+					return detail::error_result("sol: out of bounds (too big) for set on '%s'", detail::demangle<T>().c_str());
+				}
+				auto it = std::next(deferred_uc::begin(L_, self), key);
+				return set_writable(is_writable(), L_, self, it, std::move(value));
+			}
+
+			static detail::error_result set_comparative(std::true_type, lua_State* L_, T& self, stack_object okey, stack_object value) {
+				decltype(auto) key = okey.as<K>();
+				if (!is_writable::value) {
+					return detail::error_result(
+					     "cannot perform a 'set': '%s's iterator reference is not writable (non-copy-assignable or const)", detail::demangle<T>().data());
+				}
+				auto fx = [&](const value_type& r) -> bool { return key == get_key(is_associative(), r); };
+				auto e = deferred_uc::end(L_, self);
+				auto it = std::find_if(deferred_uc::begin(L_, self), e, std::ref(fx));
+				if (it == e) {
+					return {};
+				}
+				return set_writable(is_writable(), L_, self, it, std::move(value));
+			}
+
+			static detail::error_result set_comparative(std::false_type, lua_State*, T&, stack_object, stack_object) {
+				return detail::error_result("cannot set this value on '%s': no suitable way to increment iterator or compare to '%s' key",
+				     detail::demangle<T>().data(),
+				     detail::demangle<K>().data());
+			}
+
+			template <typename Iter>
+			static detail::error_result set_associative_insert(std::true_type, lua_State*, T& self, Iter& it, K& key, stack_object value) {
+				if constexpr (meta::has_insert_with_iterator<T>::value) {
+					self.insert(it, value_type(key, value.as<V>()));
+					return {};
+				}
+				else if constexpr (meta::has_insert<T>::value) {
+					self.insert(value_type(key, value.as<V>()));
+					return {};
+				}
+				else {
+					(void)self;
+					(void)it;
+					(void)key;
+					return detail::error_result(
+					     "cannot call 'set' on '%s': there is no 'insert' function on this associative type", detail::demangle<T>().c_str());
+				}
+			}
+
+			template <typename Iter>
+			static detail::error_result set_associative_insert(std::false_type, lua_State*, T& self, Iter& it, K& key, stack_object) {
+				if constexpr (meta::has_insert_with_iterator<T>::value) {
+					self.insert(it, key);
+					return {};
+				}
+				else if constexpr (meta::has_insert<T>::value) {
+					self.insert(key);
+					return {};
+				}
+				else {
+					(void)self;
+					(void)it;
+					(void)key;
+					return detail::error_result(
+					     "cannot call 'set' on '%s': there is no 'insert' function on this non-associative type", detail::demangle<T>().c_str());
+				}
+			}
+
+			static detail::error_result set_associative_find(std::true_type, lua_State* L_, T& self, stack_object okey, stack_object value) {
+				decltype(auto) key = okey.as<K>();
+				auto it = self.find(key);
+				if (it == deferred_uc::end(L_, self)) {
+					return set_associative_insert(is_associative(), L_, self, it, key, std::move(value));
+				}
+				return set_writable(is_writable(), L_, self, it, std::move(value));
+			}
+
+			static detail::error_result set_associative_find(std::false_type, lua_State* L_, T& self, stack_object key, stack_object value) {
+				return set_comparative(meta::supports_op_equal<K, key_type>(), L_, self, std::move(key), std::move(value));
+			}
+
+			static detail::error_result set_it(std::true_type, lua_State* L_, T& self, stack_object key, stack_object value) {
+				return set_category(iterator_category(), L_, self, std::move(key), std::move(value));
+			}
+
+			static detail::error_result set_it(std::false_type, lua_State* L_, T& self, stack_object key, stack_object value) {
+				return set_associative_find(meta::all<has_find<T>, meta::any<is_associative, is_lookup>>(), L_, self, std::move(key), std::move(value));
+			}
+
+			template <bool idx_of = false>
+			static detail::error_result find_has_associative_lookup(std::true_type, lua_State* L_, T& self) {
+				if constexpr (!is_ordered::value && idx_of) {
+					(void)L_;
+					(void)self;
+					return detail::error_result("cannot perform an 'index_of': '%s's is not an ordered container", detail::demangle<T>().data());
+				}
+				else {
+					decltype(auto) key = stack::unqualified_get<K>(L_, 2);
+					auto it = self.find(key);
+					if (it == deferred_uc::end(L_, self)) {
+						return stack::push(L_, lua_nil);
+					}
+					if constexpr (idx_of) {
+						auto dist = std::distance(deferred_uc::begin(L_, self), it);
+						dist -= deferred_uc::index_adjustment(L_, self);
+						return stack::push(L_, dist);
+					}
+					else {
+						return get_associative(is_associative(), L_, it);
+					}
+				}
+			}
+
+			template <bool idx_of = false>
+			static detail::error_result find_has_associative_lookup(std::false_type, lua_State* L_, T& self) {
+				if constexpr (!is_ordered::value && idx_of) {
+					(void)L_;
+					(void)self;
+					return detail::error_result("cannot perform an 'index_of': '%s's is not an ordered container", detail::demangle<T>().data());
+				}
+				else {
+					decltype(auto) value = stack::unqualified_get<V>(L_, 2);
+					auto it = self.find(value);
+					if (it == deferred_uc::end(L_, self)) {
+						return stack::push(L_, lua_nil);
+					}
+					if constexpr (idx_of) {
+						auto dist = std::distance(deferred_uc::begin(L_, self), it);
+						dist -= deferred_uc::index_adjustment(L_, self);
+						return stack::push(L_, dist);
+					}
+					else {
+						return get_associative(is_associative(), L_, it);
+					}
+				}
+			}
+
+			template <bool idx_of = false>
+			static detail::error_result find_has(std::true_type, lua_State* L_, T& self) {
+				return find_has_associative_lookup<idx_of>(meta::any<is_lookup, is_associative>(), L_, self);
+			}
+
+			template <typename Iter>
+			static detail::error_result find_associative_lookup(std::true_type, lua_State* L_, T&, Iter& it, std::size_t) {
+				return get_associative(is_associative(), L_, it);
+			}
+
+			template <typename Iter>
+			static detail::error_result find_associative_lookup(std::false_type, lua_State* L_, T& self, Iter&, std::size_t idx) {
+				idx = static_cast<std::size_t>(static_cast<std::ptrdiff_t>(idx) - deferred_uc::index_adjustment(L_, self));
+				return stack::push(L_, idx);
+			}
+
+			template <bool = false>
+			static detail::error_result find_comparative(std::false_type, lua_State*, T&) {
+				return detail::error_result("cannot call 'find' on '%s': there is no 'find' function and the value_type is not equality comparable",
+				     detail::demangle<T>().c_str());
+			}
+
+			template <bool idx_of = false>
+			static detail::error_result find_comparative(std::true_type, lua_State* L_, T& self) {
+				decltype(auto) value = stack::unqualified_get<V>(L_, 2);
+				auto it = deferred_uc::begin(L_, self);
+				auto e = deferred_uc::end(L_, self);
+				std::size_t idx = 0;
+				for (;; ++it, ++idx) {
+					if (it == e) {
+						return stack::push(L_, lua_nil);
+					}
+					if (value == get_value(is_associative(), *it)) {
+						break;
+					}
+				}
+				return find_associative_lookup(meta::all<meta::boolean<!idx_of>, meta::any<is_lookup, is_associative>>(), L_, self, it, idx);
+			}
+
+			template <bool idx_of = false>
+			static detail::error_result find_has(std::false_type, lua_State* L_, T& self) {
+				return find_comparative<idx_of>(meta::supports_op_equal<V>(), L_, self);
+			}
+
+			template <typename Iter>
+			static detail::error_result add_insert_after(std::false_type, lua_State* L_, T& self, stack_object value, Iter&) {
+				return add_insert_after(std::false_type(), L_, self, value);
+			}
+
+			static detail::error_result add_insert_after(std::false_type, lua_State*, T&, stack_object) {
+				return detail::error_result("cannot call 'add' on type '%s': no suitable insert/push_back C++ functions", detail::demangle<T>().data());
+			}
+
+			template <typename Iter>
+			static detail::error_result add_insert_after(std::true_type, lua_State*, T& self, stack_object value, Iter& pos) {
+				self.insert_after(pos, value.as<V>());
+				return {};
+			}
+
+			static detail::error_result add_insert_after(std::true_type, lua_State* L_, T& self, stack_object value) {
+				auto backit = self.before_begin();
+				{
+					auto e = deferred_uc::end(L_, self);
+					for (auto it = deferred_uc::begin(L_, self); it != e; ++backit, ++it) { }
+				}
+				return add_insert_after(std::true_type(), L_, self, value, backit);
+			}
+
+			template <typename Iter>
+			static detail::error_result add_insert(std::true_type, lua_State*, T& self, stack_object value, Iter& pos) {
+				self.insert(pos, value.as<V>());
+				return {};
+			}
+
+			static detail::error_result add_insert(std::true_type, lua_State* L_, T& self, stack_object value) {
+				auto pos = deferred_uc::end(L_, self);
+				return add_insert(std::true_type(), L_, self, value, pos);
+			}
+
+			template <typename Iter>
+			static detail::error_result add_insert(std::false_type, lua_State* L_, T& self, stack_object value, Iter& pos) {
+				return add_insert_after(meta::has_insert_after<T>(), L_, self, std::move(value), pos);
+			}
+
+			static detail::error_result add_insert(std::false_type, lua_State* L_, T& self, stack_object value) {
+				return add_insert_after(meta::has_insert_after<T>(), L_, self, std::move(value));
+			}
+
+			template <typename Iter>
+			static detail::error_result add_push_back(std::true_type, lua_State*, T& self, stack_object value, Iter&) {
+				self.push_back(value.as<V>());
+				return {};
+			}
+
+			static detail::error_result add_push_back(std::true_type, lua_State*, T& self, stack_object value) {
+				self.push_back(value.as<V>());
+				return {};
+			}
+
+			template <typename Iter>
+			static detail::error_result add_push_back(std::false_type, lua_State* L_, T& self, stack_object value, Iter& pos) {
+				return add_insert(
+				     std::integral_constant < bool, meta::has_insert<T>::value || meta::has_insert_with_iterator<T>::value > (), L_, self, value, pos);
+			}
+
+			static detail::error_result add_push_back(std::false_type, lua_State* L_, T& self, stack_object value) {
+				return add_insert(
+				     std::integral_constant < bool, meta::has_insert<T>::value || meta::has_insert_with_iterator<T>::value > (), L_, self, value);
+			}
+
+			template <typename Iter>
+			static detail::error_result add_associative(std::true_type, lua_State* L_, T& self, stack_object key, Iter& pos) {
+				if constexpr (meta::has_insert_with_iterator<T>::value) {
+					self.insert(pos, value_type(key.as<K>(), stack::unqualified_get<V>(L_, 3)));
+					return {};
+				}
+				else if constexpr (meta::has_insert<T>::value) {
+					self.insert(value_type(key.as<K>(), stack::unqualified_get<V>(L_, 3)));
+					return {};
+				}
+				else {
+					(void)L_;
+					(void)self;
+					(void)key;
+					(void)pos;
+					return detail::error_result(
+					     "cannot call 'insert' on '%s': there is no 'insert' function on this associative type", detail::demangle<T>().c_str());
+				}
+			}
+
+			static detail::error_result add_associative(std::true_type, lua_State* L_, T& self, stack_object key) {
+				auto pos = deferred_uc::end(L_, self);
+				return add_associative(std::true_type(), L_, self, std::move(key), pos);
+			}
+
+			template <typename Iter>
+			static detail::error_result add_associative(std::false_type, lua_State* L_, T& self, stack_object value, Iter& pos) {
+				return add_push_back(meta::has_push_back<T>(), L_, self, value, pos);
+			}
+
+			static detail::error_result add_associative(std::false_type, lua_State* L_, T& self, stack_object value) {
+				return add_push_back(meta::has_push_back<T>(), L_, self, value);
+			}
+
+			template <typename Iter>
+			static detail::error_result add_copyable(std::true_type, lua_State* L_, T& self, stack_object value, Iter& pos) {
+				return add_associative(is_associative(), L_, self, std::move(value), pos);
+			}
+
+			static detail::error_result add_copyable(std::true_type, lua_State* L_, T& self, stack_object value) {
+				return add_associative(is_associative(), L_, self, value);
+			}
+
+			template <typename Iter>
+			static detail::error_result add_copyable(std::false_type, lua_State* L_, T& self, stack_object value, Iter&) {
+				return add_copyable(std::false_type(), L_, self, std::move(value));
+			}
+
+			static detail::error_result add_copyable(std::false_type, lua_State*, T&, stack_object) {
+				return detail::error_result("cannot call 'add' on '%s': value_type is non-copyable", detail::demangle<T>().data());
+			}
+
+			static detail::error_result insert_lookup(std::true_type, lua_State* L_, T& self, stack_object, stack_object value) {
+				// TODO: should we warn or error about someone calling insert on an ordered / lookup container with no associativity?
+				return add_copyable(std::true_type(), L_, self, std::move(value));
+			}
+
+			static detail::error_result insert_lookup(std::false_type, lua_State* L_, T& self, stack_object where, stack_object value) {
+				auto it = deferred_uc::begin(L_, self);
+				auto key = where.as<K>();
+				key = static_cast<K>(static_cast<std::ptrdiff_t>(key) + deferred_uc::index_adjustment(L_, self));
+				std::advance(it, key);
+				self.insert(it, value.as<V>());
+				return {};
+			}
+
+			static detail::error_result insert_after_has(std::true_type, lua_State* L_, T& self, stack_object where, stack_object value) {
+				auto key = where.as<K>();
+				auto backit = self.before_begin();
+				{
+					key = static_cast<K>(static_cast<std::ptrdiff_t>(key) + deferred_uc::index_adjustment(L_, self));
+					auto e = deferred_uc::end(L_, self);
+					for (auto it = deferred_uc::begin(L_, self); key > 0; ++backit, ++it, --key) {
+						if (backit == e) {
+							return detail::error_result("sol: out of bounds (too big) for set on '%s'", detail::demangle<T>().c_str());
+						}
+					}
+				}
+				self.insert_after(backit, value.as<V>());
+				return {};
+			}
+
+			static detail::error_result insert_after_has(std::false_type, lua_State*, T&, stack_object, stack_object) {
+				return detail::error_result(
+				     "cannot call 'insert' on '%s': no suitable or similar functionality detected on this container", detail::demangle<T>().data());
+			}
+
+			static detail::error_result insert_has(std::true_type, lua_State* L_, T& self, stack_object key, stack_object value) {
+				return insert_lookup(meta::any<is_associative, is_lookup>(), L_, self, std::move(key), std::move(value));
+			}
+
+			static detail::error_result insert_has(std::false_type, lua_State* L_, T& self, stack_object where, stack_object value) {
+				return insert_after_has(meta::has_insert_after<T>(), L_, self, where, value);
+			}
+
+			static detail::error_result insert_copyable(std::true_type, lua_State* L_, T& self, stack_object key, stack_object value) {
+				return insert_has(std::integral_constant < bool,
+				     meta::has_insert<T>::value || meta::has_insert_with_iterator<T>::value > (),
+				     L_,
+				     self,
+				     std::move(key),
+				     std::move(value));
+			}
+
+			static detail::error_result insert_copyable(std::false_type, lua_State*, T&, stack_object, stack_object) {
+				return detail::error_result("cannot call 'insert' on '%s': value_type is non-copyable", detail::demangle<T>().data());
+			}
+
+			static detail::error_result erase_integral(std::true_type, lua_State* L_, T& self, K& key) {
+				auto it = deferred_uc::begin(L_, self);
+				key = (static_cast<std::ptrdiff_t>(key) + deferred_uc::index_adjustment(L_, self));
+				std::advance(it, key);
+				self.erase(it);
+
+				return {};
+			}
+
+			static detail::error_result erase_integral(std::false_type, lua_State* L_, T& self, const K& key) {
+				auto fx = [&](const value_type& r) -> bool { return key == r; };
+				auto e = deferred_uc::end(L_, self);
+				auto it = std::find_if(deferred_uc::begin(L_, self), e, std::ref(fx));
+				if (it == e) {
+					return {};
+				}
+				self.erase(it);
+
+				return {};
+			}
+
+			static detail::error_result erase_associative_lookup(std::true_type, lua_State*, T& self, const K& key) {
+				self.erase(key);
+				return {};
+			}
+
+			static detail::error_result erase_associative_lookup(std::false_type, lua_State* L_, T& self, K& key) {
+				return erase_integral(std::is_integral<K>(), L_, self, key);
+			}
+
+			static detail::error_result erase_after_has(std::true_type, lua_State* L_, T& self, K& key) {
+				auto backit = self.before_begin();
+				{
+					key = static_cast<K>(static_cast<std::ptrdiff_t>(key) + deferred_uc::index_adjustment(L_, self));
+					auto e = deferred_uc::end(L_, self);
+					for (auto it = deferred_uc::begin(L_, self); key > 0; ++backit, ++it, --key) {
+						if (backit == e) {
+							return detail::error_result("sol: out of bounds for erase on '%s'", detail::demangle<T>().c_str());
+						}
+					}
+				}
+				self.erase_after(backit);
+				return {};
+			}
+
+			static detail::error_result erase_after_has(std::false_type, lua_State*, T&, const K&) {
+				return detail::error_result("sol: cannot call erase on '%s'", detail::demangle<T>().c_str());
+			}
+
+			static detail::error_result erase_key_has(std::true_type, lua_State* L_, T& self, K& key) {
+				return erase_associative_lookup(meta::any<is_associative, is_lookup>(), L_, self, key);
+			}
+
+			static detail::error_result erase_key_has(std::false_type, lua_State* L_, T& self, K& key) {
+				return erase_after_has(has_erase_after<T>(), L_, self, key);
+			}
+
+			static detail::error_result erase_has(std::true_type, lua_State* L_, T& self, K& key) {
+				return erase_associative_lookup(meta::any<is_associative, is_lookup>(), L_, self, key);
+			}
+
+			static detail::error_result erase_has(std::false_type, lua_State* L_, T& self, K& key) {
+				return erase_key_has(has_erase_key<T>(), L_, self, key);
+			}
+
+			static auto size_has(std::false_type, lua_State* L_, T& self) {
+				return std::distance(deferred_uc::begin(L_, self), deferred_uc::end(L_, self));
+			}
+
+			static auto size_has(std::true_type, lua_State*, T& self) {
+				return self.size();
+			}
+
+			static void clear_has(std::true_type, lua_State*, T& self) {
+				self.clear();
+			}
+
+			static void clear_has(std::false_type, lua_State* L_, T&) {
+				luaL_error(L_, "sol: cannot call clear on '%s'", detail::demangle<T>().c_str());
+			}
+
+			static bool empty_has(std::true_type, lua_State*, T& self) {
+				return self.empty();
+			}
+
+			static bool empty_has(std::false_type, lua_State* L_, T& self) {
+				return deferred_uc::begin(L_, self) == deferred_uc::end(L_, self);
+			}
+
+			static detail::error_result get_associative_find(std::true_type, lua_State* L_, T& self, K& key) {
+				auto it = self.find(key);
+				if (it == deferred_uc::end(L_, self)) {
+					stack::push(L_, lua_nil);
+					return {};
+				}
+				return get_associative(std::true_type(), L_, it);
+			}
+
+			static detail::error_result get_associative_find(std::false_type, lua_State* L_, T& self, K& key) {
+				return get_it(is_linear_integral(), L_, self, key);
+			}
+
+			static detail::error_result get_start(lua_State* L_, T& self, K& key) {
+				return get_associative_find(std::integral_constant < bool, is_associative::value&& has_find<T>::value > (), L_, self, key);
+			}
+
+			static detail::error_result set_start(lua_State* L_, T& self, stack_object key, stack_object value) {
+				return set_it(is_linear_integral(), L_, self, std::move(key), std::move(value));
+			}
+
+			static std::size_t size_start(lua_State* L_, T& self) {
+				return static_cast<std::size_t>(size_has(meta::has_size<T>(), L_, self));
+			}
+
+			static void clear_start(lua_State* L_, T& self) {
+				clear_has(has_clear<T>(), L_, self);
+			}
+
+			static bool empty_start(lua_State* L_, T& self) {
+				return empty_has(has_empty<T>(), L_, self);
+			}
+
+			static detail::error_result erase_start(lua_State* L_, T& self, K& key) {
+				return erase_has(has_erase<T>(), L_, self, key);
+			}
+
+			template <bool ip>
+			static int next_associative(std::true_type, lua_State* L_) {
+				iter& i = stack::unqualified_get<user<iter>>(L_, 1);
+				auto& it = i.it;
+				auto& end = i.end;
+				if (it == end) {
+					return stack::push(L_, lua_nil);
+				}
+				int p;
+				if constexpr (ip) {
+					++i.index;
+					p = stack::push_reference(L_, i.index);
+				}
+				else {
+					p = stack::push_reference(L_, it->first);
+				}
+				p += stack::stack_detail::push_reference<push_type>(L_, detail::deref_move_only(it->second));
+				std::advance(it, 1);
+				return p;
+			}
+
+			template <bool>
+			static int next_associative(std::false_type, lua_State* L_) {
+				iter& i = stack::unqualified_get<user<iter>>(L_, 1);
+				auto& it = i.it();
+				auto& end = i.sen();
+				next_K k = stack::unqualified_get<next_K>(L_, 2);
+				if (it == end) {
+					return stack::push(L_, lua_nil);
+				}
+				int p;
+				if constexpr (std::is_integral_v<next_K>) {
+					p = stack::push_reference(L_, k + 1);
+				}
+				else {
+					p = stack::stack_detail::push_reference(L_, k + 1);
+				}
+				p += stack::stack_detail::push_reference<push_type>(L_, detail::deref_move_only(*it));
+				std::advance(it, 1);
+				return p;
+			}
+
+			template <bool ip>
+			static int next_iter(lua_State* L_) {
+				typedef meta::any<is_associative, meta::all<is_lookup, meta::neg<is_matched_lookup>>> is_assoc;
+				return next_associative<ip>(is_assoc(), L_);
+			}
+
+			template <bool ip>
+			static int pairs_associative(std::true_type, lua_State* L_) {
+				auto& src = get_src(L_);
+				stack::push(L_, next_iter<ip>);
+				stack::push<user<iter>>(L_, L_, 1, deferred_uc::begin(L_, src), deferred_uc::begin(L_, src));
+				stack::push(L_, lua_nil);
+				return 3;
+			}
+
+			template <bool ip>
+			static int pairs_associative(std::false_type, lua_State* L_) {
+				auto& src = get_src(L_);
+				stack::push(L_, next_iter<ip>);
+				stack::push<user<iter>>(L_, L_, 1, deferred_uc::begin(L_, src), deferred_uc::end(L_, src));
+				stack::push(L_, 0);
+				return 3;
+			}
+
+		public:
+			static int at(lua_State* L_) {
+				auto& self = get_src(L_);
+				detail::error_result er;
+				{
+					std::ptrdiff_t pos = stack::unqualified_get<std::ptrdiff_t>(L_, 2);
+					er = at_start(L_, self, pos);
+				}
+				return handle_errors(L_, er);
+			}
+
+			static int get(lua_State* L_) {
+				auto& self = get_src(L_);
+				detail::error_result er;
+				{
+					decltype(auto) key = stack::unqualified_get<K>(L_);
+					er = get_start(L_, self, key);
+				}
+				return handle_errors(L_, er);
+			}
+
+			static int index_get(lua_State* L_) {
+				return get(L_);
+			}
+
+			static int set(lua_State* L_) {
+				stack_object value = stack_object(L_, raw_index(3));
+				if constexpr (is_linear_integral::value) {
+					// for non-associative containers,
+					// erasure only happens if it is the
+					// last index in the container
+					auto key = stack::get<K>(L_, 2);
+					auto self_size = deferred_uc::size(L_);
+					if (key == static_cast<K>(self_size)) {
+						if (type_of(L_, 3) == type::lua_nil) {
+							return erase(L_);
+						}
+					}
+				}
+				else {
+					if (type_of(L_, 3) == type::lua_nil) {
+						return erase(L_);
+					}
+				}
+				auto& self = get_src(L_);
+				detail::error_result er = set_start(L_, self, stack_object(L_, raw_index(2)), std::move(value));
+				return handle_errors(L_, er);
+			}
+
+			static int index_set(lua_State* L_) {
+				return set(L_);
+			}
+
+			static int add(lua_State* L_) {
+				auto& self = get_src(L_);
+				detail::error_result er = add_copyable(is_copyable(), L_, self, stack_object(L_, raw_index(2)));
+				return handle_errors(L_, er);
+			}
+
+			static int insert(lua_State* L_) {
+				auto& self = get_src(L_);
+				detail::error_result er = insert_copyable(is_copyable(), L_, self, stack_object(L_, raw_index(2)), stack_object(L_, raw_index(3)));
+				return handle_errors(L_, er);
+			}
+
+			static int find(lua_State* L_) {
+				auto& self = get_src(L_);
+				detail::error_result er = find_has(has_find<T>(), L_, self);
+				return handle_errors(L_, er);
+			}
+
+			static int index_of(lua_State* L_) {
+				auto& self = get_src(L_);
+				detail::error_result er = find_has<true>(has_find<T>(), L_, self);
+				return handle_errors(L_, er);
+			}
+
+			static iterator begin(lua_State*, T& self) {
+				if constexpr (meta::has_begin_end_v<T>) {
+					return self.begin();
+				}
+				else {
+					using std::begin;
+					return begin(self);
+				}
+			}
+
+			static sentinel end(lua_State*, T& self) {
+				if constexpr (meta::has_begin_end_v<T>) {
+					return self.end();
+				}
+				else {
+					using std::end;
+					return end(self);
+				}
+			}
+
+			static int size(lua_State* L_) {
+				auto& self = get_src(L_);
+				std::size_t r = size_start(L_, self);
+				return stack::push(L_, r);
+			}
+
+			static int clear(lua_State* L_) {
+				auto& self = get_src(L_);
+				clear_start(L_, self);
+				return 0;
+			}
+
+			static int erase(lua_State* L_) {
+				auto& self = get_src(L_);
+				detail::error_result er;
+				{
+					decltype(auto) key = stack::unqualified_get<K>(L_, 2);
+					er = erase_start(L_, self, key);
+				}
+				return handle_errors(L_, er);
+			}
+
+			static int empty(lua_State* L_) {
+				auto& self = get_src(L_);
+				return stack::push(L_, empty_start(L_, self));
+			}
+
+			static std::ptrdiff_t index_adjustment(lua_State*, T&) {
+				return static_cast<std::ptrdiff_t>((SOL_CONTAINER_START_INDEX_I_) == 0 ? 0 : -(SOL_CONTAINER_START_INDEX_I_));
+			}
+
+			static int pairs(lua_State* L_) {
+				typedef meta::any<is_associative, meta::all<is_lookup, meta::neg<is_matched_lookup>>> is_assoc;
+				return pairs_associative<false>(is_assoc(), L_);
+			}
+
+			static int ipairs(lua_State* L_) {
+				typedef meta::any<is_associative, meta::all<is_lookup, meta::neg<is_matched_lookup>>> is_assoc;
+				return pairs_associative<true>(is_assoc(), L_);
+			}
+
+			static int next(lua_State* L_) {
+				return stack::push(L_, next_iter<false>);
+			}
+		};
+
+		template <typename X>
+		struct usertype_container_default<X, std::enable_if_t<std::is_array<std::remove_pointer_t<meta::unwrap_unqualified_t<X>>>::value>> {
+		private:
+			typedef std::remove_pointer_t<meta::unwrap_unqualified_t<X>> T;
+			typedef usertype_container<X> deferred_uc;
+
+		public:
+			typedef std::remove_extent_t<T> value_type;
+			typedef value_type* iterator;
+			typedef iterator sentinel;
+
+		private:
+			struct iter : detail::ebco<iterator, 0>, detail::ebco<sentinel, 1> {
+				using it_base = detail::ebco<iterator, 0>;
+				using sen_base = detail::ebco<sentinel, 1>;
+				reference keep_alive;
+				
+				iter(lua_State* L_, int stack_index_, iterator it_, sentinel sen_) noexcept
+				: it_base(std::move(it_)), sen_base(std::move(sen_)), keep_alive(sol::main_thread(L_, L_), stack_index_) {
+				}
+
+				iterator& it() noexcept {
+					return it_base::value();
+				}
+
+				const iterator& it() const noexcept {
+					return it_base::value();
+				}
+
+				sentinel& sen() noexcept {
+					return sen_base::value();
+				}
+
+				const sentinel& sen() const noexcept {
+					return sen_base::value();
+				}
+			};
+
+			static auto& get_src(lua_State* L_) {
+				auto p = stack::unqualified_check_get<T*>(L_, 1);
+#if SOL_IS_ON(SOL_SAFE_USERTYPE)
+				if (!p) {
+					luaL_error(L_,
+					     "sol: 'self' is not of type '%s' (pass 'self' as first argument with ':' or call on proper type)",
+					     detail::demangle<T>().c_str());
+				}
+				if (p.value() == nullptr) {
+					luaL_error(
+					     L_, "sol: 'self' argument is nil (pass 'self' as first argument with ':' or call on a '%s' type)", detail::demangle<T>().c_str());
+				}
+#endif // Safe getting with error
+				return *p.value();
+			}
+
+			static int find(std::true_type, lua_State* L_) {
+				T& self = get_src(L_);
+				decltype(auto) value = stack::unqualified_get<value_type>(L_, 2);
+				std::size_t N = std::extent<T>::value;
+				for (std::size_t idx = 0; idx < N; ++idx) {
+					using v_t = std::add_const_t<decltype(self[idx])>;
+					v_t v = self[idx];
+					if (v == value) {
+						idx = static_cast<std::size_t>(static_cast<std::ptrdiff_t>(idx) - deferred_uc::index_adjustment(L_, self));
+						return stack::push(L_, idx);
+					}
+				}
+				return stack::push(L_, lua_nil);
+			}
+
+			static int find(std::false_type, lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'find' on '%s': no supported comparison operator for the value type", detail::demangle<T>().c_str());
+			}
+
+			static int next_iter(lua_State* L_) {
+				iter& i = stack::unqualified_get<user<iter>>(L_, 1);
+				auto& it = i.it();
+				auto& end = i.sen();
+				std::size_t k = stack::unqualified_get<std::size_t>(L_, 2);
+				if (it == end) {
+					return 0;
+				}
+				int p;
+				p = stack::push(L_, k + 1);
+				p += stack::push_reference(L_, detail::deref_move_only(*it));
+				std::advance(it, 1);
+				return p;
+			}
+
+		public:
+			static int clear(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'clear' on type '%s': cannot remove all items from a fixed array", detail::demangle<T>().c_str());
+			}
+
+			static int erase(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'erase' on type '%s': cannot remove an item from fixed arrays", detail::demangle<T>().c_str());
+			}
+
+			static int add(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'add' on type '%s': cannot add to fixed arrays", detail::demangle<T>().c_str());
+			}
+
+			static int insert(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'insert' on type '%s': cannot insert new entries into fixed arrays", detail::demangle<T>().c_str());
+			}
+
+			static int at(lua_State* L_) {
+				return get(L_);
+			}
+
+			static int get(lua_State* L_) {
+				T& self = get_src(L_);
+				std::ptrdiff_t idx = stack::unqualified_get<std::ptrdiff_t>(L_, 2);
+				idx += deferred_uc::index_adjustment(L_, self);
+				if (idx >= static_cast<std::ptrdiff_t>(std::extent<T>::value) || idx < 0) {
+					return stack::push(L_, lua_nil);
+				}
+				return stack::push_reference(L_, detail::deref_move_only(self[idx]));
+			}
+
+			static int index_get(lua_State* L_) {
+				return get(L_);
+			}
+
+			static int set(lua_State* L_) {
+				T& self = get_src(L_);
+				std::ptrdiff_t idx = stack::unqualified_get<std::ptrdiff_t>(L_, 2);
+				idx += deferred_uc::index_adjustment(L_, self);
+				if (idx >= static_cast<std::ptrdiff_t>(std::extent<T>::value)) {
+					return luaL_error(L_, "sol: index out of bounds (too big) for set on '%s'", detail::demangle<T>().c_str());
+				}
+				if (idx < 0) {
+					return luaL_error(L_, "sol: index out of bounds (too small) for set on '%s'", detail::demangle<T>().c_str());
+				}
+				self[idx] = stack::unqualified_get<value_type>(L_, 3);
+				return 0;
+			}
+
+			static int index_set(lua_State* L_) {
+				return set(L_);
+			}
+
+			static int index_of(lua_State* L_) {
+				return find(L_);
+			}
+
+			static int find(lua_State* L_) {
+				return find(meta::supports_op_equal<value_type, value_type>(), L_);
+			}
+
+			static int size(lua_State* L_) {
+				return stack::push(L_, std::extent<T>::value);
+			}
+
+			static int empty(lua_State* L_) {
+				return stack::push(L_, std::extent<T>::value > 0);
+			}
+
+			static int pairs(lua_State* L_) {
+				auto& src = get_src(L_);
+				stack::push(L_, next_iter);
+				stack::push<user<iter>>(L_, L_, 1, deferred_uc::begin(L_, src), deferred_uc::end(L_, src));
+				stack::push(L_, 0);
+				return 3;
+			}
+
+			static int ipairs(lua_State* L_) {
+				return pairs(L_);
+			}
+
+			static int next(lua_State* L_) {
+				return stack::push(L_, next_iter);
+			}
+
+			static std::ptrdiff_t index_adjustment(lua_State*, T&) {
+				return (SOL_CONTAINER_START_INDEX_I_) == 0 ? 0 : -(SOL_CONTAINER_START_INDEX_I_);
+			}
+
+			static iterator begin(lua_State*, T& self) {
+				return std::addressof(self[0]);
+			}
+
+			static sentinel end(lua_State*, T& self) {
+				return std::addressof(self[0]) + std::extent<T>::value;
+			}
+		};
+
+		template <typename X>
+		struct usertype_container_default<usertype_container<X>> : usertype_container_default<X> { };
+	} // namespace container_detail
+
+	template <typename T>
+	struct usertype_container : container_detail::usertype_container_default<T> { };
+
+} // namespace sol
+
+// end of sol/usertype_container.hpp
+
+#include <unordered_map>
+
+namespace sol {
+
+	namespace container_detail {
+		template <typename X>
+		struct u_c_launch {
+			using T = std::remove_pointer_t<meta::unqualified_t<X>>;
+			using uc = usertype_container<T>;
+			using default_uc = usertype_container_default<T>;
+
+			static inline int real_index_get_traits(std::true_type, lua_State* L) {
+				return uc::index_get(L);
+			}
+
+			static inline int real_index_get_traits(std::false_type, lua_State* L) {
+				return default_uc::index_get(L);
+			}
+
+			static inline int real_index_call(lua_State* L) {
+				static const std::unordered_map<string_view, lua_CFunction> calls {
+					{ "at", &real_at_call },
+					{ "get", &real_get_call },
+					{ "set", &real_set_call },
+					{ "size", &real_length_call },
+					{ "add", &real_add_call },
+					{ "empty", &real_empty_call },
+					{ "insert", &real_insert_call },
+					{ "clear", &real_clear_call },
+					{ "find", &real_find_call },
+					{ "index_of", &real_index_of_call },
+					{ "erase", &real_erase_call },
+					{ "pairs", &pairs_call },
+					{ "next", &next_call },
+				};
+				auto maybenameview = stack::unqualified_check_get<string_view>(L, 2);
+				if (maybenameview) {
+					const string_view& name = *maybenameview;
+					auto it = calls.find(name);
+					if (it != calls.cend()) {
+						return stack::push(L, it->second);
+					}
+				}
+				return real_index_get_traits(container_detail::has_traits_index_get<uc>(), L);
+			}
+
+			static inline int real_at_traits(std::true_type, lua_State* L) {
+				return uc::at(L);
+			}
+
+			static inline int real_at_traits(std::false_type, lua_State* L) {
+				return default_uc::at(L);
+			}
+
+			static inline int real_at_call(lua_State* L) {
+				return real_at_traits(container_detail::has_traits_at<uc>(), L);
+			}
+
+			static inline int real_get_traits(std::true_type, lua_State* L) {
+				return uc::get(L);
+			}
+
+			static inline int real_get_traits(std::false_type, lua_State* L) {
+				return default_uc::get(L);
+			}
+
+			static inline int real_get_call(lua_State* L) {
+				return real_get_traits(container_detail::has_traits_get<uc>(), L);
+			}
+
+			static inline int real_set_traits(std::true_type, lua_State* L) {
+				return uc::set(L);
+			}
+
+			static inline int real_set_traits(std::false_type, lua_State* L) {
+				return default_uc::set(L);
+			}
+
+			static inline int real_set_call(lua_State* L) {
+				return real_set_traits(container_detail::has_traits_set<uc>(), L);
+			}
+
+			static inline int real_index_set_traits(std::true_type, lua_State* L) {
+				return uc::index_set(L);
+			}
+
+			static inline int real_index_set_traits(std::false_type, lua_State* L) {
+				return default_uc::index_set(L);
+			}
+
+			static inline int real_new_index_call(lua_State* L) {
+				return real_index_set_traits(container_detail::has_traits_index_set<uc>(), L);
+			}
+
+			static inline int real_pairs_traits(std::true_type, lua_State* L) {
+				return uc::pairs(L);
+			}
+
+			static inline int real_pairs_traits(std::false_type, lua_State* L) {
+				return default_uc::pairs(L);
+			}
+
+			static inline int real_pairs_call(lua_State* L) {
+				return real_pairs_traits(container_detail::has_traits_pairs<uc>(), L);
+			}
+
+			static inline int real_ipairs_traits(std::true_type, lua_State* L) {
+				return uc::ipairs(L);
+			}
+
+			static inline int real_ipairs_traits(std::false_type, lua_State* L) {
+				return default_uc::ipairs(L);
+			}
+
+			static inline int real_ipairs_call(lua_State* L) {
+				return real_ipairs_traits(container_detail::has_traits_ipairs<uc>(), L);
+			}
+
+			static inline int real_next_traits(std::true_type, lua_State* L) {
+				return uc::next(L);
+			}
+
+			static inline int real_next_traits(std::false_type, lua_State* L) {
+				return default_uc::next(L);
+			}
+
+			static inline int real_next_call(lua_State* L) {
+				return real_next_traits(container_detail::has_traits_next<uc>(), L);
+			}
+
+			static inline int real_size_traits(std::true_type, lua_State* L) {
+				return uc::size(L);
+			}
+
+			static inline int real_size_traits(std::false_type, lua_State* L) {
+				return default_uc::size(L);
+			}
+
+			static inline int real_length_call(lua_State* L) {
+				return real_size_traits(container_detail::has_traits_size<uc>(), L);
+			}
+
+			static inline int real_add_traits(std::true_type, lua_State* L) {
+				return uc::add(L);
+			}
+
+			static inline int real_add_traits(std::false_type, lua_State* L) {
+				return default_uc::add(L);
+			}
+
+			static inline int real_add_call(lua_State* L) {
+				return real_add_traits(container_detail::has_traits_add<uc>(), L);
+			}
+
+			static inline int real_insert_traits(std::true_type, lua_State* L) {
+				return uc::insert(L);
+			}
+
+			static inline int real_insert_traits(std::false_type, lua_State* L) {
+				return default_uc::insert(L);
+			}
+
+			static inline int real_insert_call(lua_State* L) {
+				return real_insert_traits(container_detail::has_traits_insert<uc>(), L);
+			}
+
+			static inline int real_clear_traits(std::true_type, lua_State* L) {
+				return uc::clear(L);
+			}
+
+			static inline int real_clear_traits(std::false_type, lua_State* L) {
+				return default_uc::clear(L);
+			}
+
+			static inline int real_clear_call(lua_State* L) {
+				return real_clear_traits(container_detail::has_traits_clear<uc>(), L);
+			}
+
+			static inline int real_empty_traits(std::true_type, lua_State* L) {
+				return uc::empty(L);
+			}
+
+			static inline int real_empty_traits(std::false_type, lua_State* L) {
+				return default_uc::empty(L);
+			}
+
+			static inline int real_empty_call(lua_State* L) {
+				return real_empty_traits(container_detail::has_traits_empty<uc>(), L);
+			}
+
+			static inline int real_erase_traits(std::true_type, lua_State* L) {
+				return uc::erase(L);
+			}
+
+			static inline int real_erase_traits(std::false_type, lua_State* L) {
+				return default_uc::erase(L);
+			}
+
+			static inline int real_erase_call(lua_State* L) {
+				return real_erase_traits(container_detail::has_traits_erase<uc>(), L);
+			}
+
+			static inline int real_find_traits(std::true_type, lua_State* L) {
+				return uc::find(L);
+			}
+
+			static inline int real_find_traits(std::false_type, lua_State* L) {
+				return default_uc::find(L);
+			}
+
+			static inline int real_find_call(lua_State* L) {
+				return real_find_traits(container_detail::has_traits_find<uc>(), L);
+			}
+
+			static inline int real_index_of_call(lua_State* L) {
+				if constexpr (container_detail::has_traits_index_of<uc>()) {
+					return uc::index_of(L);
+				}
+				else {
+					return default_uc::index_of(L);
+				}
+			}
+
+			static inline int add_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_add_call), (&real_add_call)>(L);
+			}
+
+			static inline int erase_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_erase_call), (&real_erase_call)>(L);
+			}
+
+			static inline int insert_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_insert_call), (&real_insert_call)>(L);
+			}
+
+			static inline int clear_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_clear_call), (&real_clear_call)>(L);
+			}
+
+			static inline int empty_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_empty_call), (&real_empty_call)>(L);
+			}
+
+			static inline int find_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_find_call), (&real_find_call)>(L);
+			}
+
+			static inline int index_of_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_index_of_call), (&real_index_of_call)>(L);
+			}
+
+			static inline int length_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_length_call), (&real_length_call)>(L);
+			}
+
+			static inline int pairs_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_pairs_call), (&real_pairs_call)>(L);
+			}
+
+			static inline int ipairs_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_ipairs_call), (&real_ipairs_call)>(L);
+			}
+
+			static inline int next_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_next_call), (&real_next_call)>(L);
+			}
+
+			static inline int at_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_at_call), (&real_at_call)>(L);
+			}
+
+			static inline int get_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_get_call), (&real_get_call)>(L);
+			}
+
+			static inline int set_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_set_call), (&real_set_call)>(L);
+			}
+
+			static inline int index_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_index_call), (&real_index_call)>(L);
+			}
+
+			static inline int new_index_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_new_index_call), (&real_new_index_call)>(L);
+			}
+		};
+	} // namespace container_detail
+
+	namespace stack {
+		namespace stack_detail {
+			template <typename T, bool is_shim = false>
+			struct metatable_setup {
+				lua_State* L;
+
+				metatable_setup(lua_State* L) : L(L) {
+				}
+
+				void operator()() {
+					using meta_usertype_container
+					     = container_detail::u_c_launch<meta::conditional_t<is_shim, as_container_t<std::remove_pointer_t<T>>, std::remove_pointer_t<T>>>;
+					static const char* metakey
+					     = is_shim ? &usertype_traits<as_container_t<std::remove_pointer_t<T>>>::metatable()[0] : &usertype_traits<T>::metatable()[0];
+					static const std::array<luaL_Reg, 20> reg = { {
+						// clang-format off
+						{ "__pairs", &meta_usertype_container::pairs_call },
+						{ "__ipairs", &meta_usertype_container::ipairs_call },
+						{ "__len", &meta_usertype_container::length_call },
+						{ "__index", &meta_usertype_container::index_call },
+						{ "__newindex", &meta_usertype_container::new_index_call },
+						{ "pairs", &meta_usertype_container::pairs_call },
+						{ "next", &meta_usertype_container::next_call },
+						{ "at", &meta_usertype_container::at_call },
+						{ "get", &meta_usertype_container::get_call },
+						{ "set", &meta_usertype_container::set_call },
+						{ "size", &meta_usertype_container::length_call },
+						{ "empty", &meta_usertype_container::empty_call },
+						{ "clear", &meta_usertype_container::clear_call },
+						{ "insert", &meta_usertype_container::insert_call },
+						{ "add", &meta_usertype_container::add_call },
+						{ "find", &meta_usertype_container::find_call },
+						{ "index_of", &meta_usertype_container::index_of_call },
+						{ "erase", &meta_usertype_container::erase_call },
+						std::is_pointer<T>::value ? luaL_Reg{ nullptr, nullptr } : luaL_Reg{ "__gc", &detail::usertype_alloc_destroy<T> },
+						{ nullptr, nullptr }
+						// clang-format on 
+					} };
+
+					if (luaL_newmetatable(L, metakey) == 1) {
+						luaL_setfuncs(L, reg.data(), 0);
+					}
+					lua_setmetatable(L, -2);
+				}
+			};
+		} // namespace stack_detail
+
+		template <typename T>
+		struct unqualified_pusher<as_container_t<T>> {
+			using C = meta::unqualified_t<T>;
+
+			static int push_lvalue(std::true_type, lua_State* L, const C& cont) {
+				stack_detail::metatable_setup<C*, true> fx(L);
+				return stack::push<detail::as_pointer_tag<const C>>(L, detail::with_function_tag(), fx, detail::ptr(cont));
+			}
+
+			static int push_lvalue(std::false_type, lua_State* L, const C& cont) {
+				stack_detail::metatable_setup<C, true> fx(L);
+				return stack::push<detail::as_value_tag<C>>(L, detail::with_function_tag(), fx, cont);
+			}
+
+			static int push_rvalue(std::true_type, lua_State* L, C&& cont) {
+				stack_detail::metatable_setup<C, true> fx(L);
+				return stack::push<detail::as_value_tag<C>>(L, detail::with_function_tag(), fx, std::move(cont));
+			}
+
+			static int push_rvalue(std::false_type, lua_State* L, const C& cont) {
+				return push_lvalue(std::is_lvalue_reference<T>(), L, cont);
+			}
+
+			static int push(lua_State* L, const as_container_t<T>& as_cont) {
+				return push_lvalue(std::is_lvalue_reference<T>(), L, as_cont.value());
+			}
+
+			static int push(lua_State* L, as_container_t<T>&& as_cont) {
+				return push_rvalue(meta::all<std::is_rvalue_reference<T>, meta::neg<std::is_lvalue_reference<T>>>(), L, std::forward<T>(as_cont.value()));
+			}
+		};
+
+		template <typename T>
+		struct unqualified_pusher<as_container_t<T*>> {
+			using C = std::add_pointer_t<meta::unqualified_t<std::remove_pointer_t<T>>>;
+
+			static int push(lua_State* L, T* cont) {
+				stack_detail::metatable_setup<C> fx(L);
+				return stack::push<detail::as_pointer_tag<T>>(L, detail::with_function_tag(), fx, cont);
+			}
+		};
+
+		template <typename T>
+		struct unqualified_pusher<T, std::enable_if_t<is_container_v<T>>> {
+			using C = T;
+
+			template <typename... Args>
+			static int push(lua_State* L, Args&&... args) {
+				stack_detail::metatable_setup<C> fx(L);
+				return stack::push<detail::as_value_tag<T>>(L, detail::with_function_tag(), fx, std::forward<Args>(args)...);
+			}
+		};
+
+		template <typename T>
+		struct unqualified_pusher<T*, std::enable_if_t<is_container_v<T>>> {
+			using C = std::add_pointer_t<meta::unqualified_t<std::remove_pointer_t<T>>>;
+
+			static int push(lua_State* L, T* cont) {
+				stack_detail::metatable_setup<C> fx(L);
+				return stack::push<detail::as_pointer_tag<T>>(L, detail::with_function_tag(), fx, cont);
+			}
+		};
+	} // namespace stack
+
+} // namespace sol
+
+// end of sol/usertype_container_launch.hpp
+
+#include <sstream>
+#include <type_traits>
+
+namespace sol {
+	namespace u_detail {
+		constexpr const lua_Integer toplevel_magic = static_cast<lua_Integer>(0xCCC2CCC1);
+
+		constexpr const int environment_index = 1;
+		constexpr const int usertype_storage_index = 2;
+		constexpr const int usertype_storage_base_index = 3;
+		constexpr const int exact_function_index = 4;
+		constexpr const int magic_index = 5;
+
+		constexpr const int simple_usertype_storage_index = 2;
+		constexpr const int index_function_index = 3;
+		constexpr const int new_index_function_index = 4;
+
+		constexpr const int base_walking_failed_index = -32467;
+		constexpr const int lookup_failed_index = -42469;
+
+		enum class submetatable_type {
+			// must be sequential
+			value,
+			reference,
+			unique,
+			const_reference,
+			const_value,
+			// must be LAST!
+			named
+		};
+
+		inline auto make_string_view(string_view s) {
+			return s;
+		}
+
+#if SOL_IS_ON(SOL_CHAR8_T)
+		inline auto make_string_view(const char8_t* s) {
+			return string_view(reinterpret_cast<const char*>(s));
+		}
+#endif
+
+		inline auto make_string_view(call_construction) {
+			return string_view(to_string(meta_function::call_function));
+		}
+
+		inline auto make_string_view(meta_function mf) {
+			return string_view(to_string(mf));
+		}
+
+		inline auto make_string_view(base_classes_tag) {
+			return string_view(detail::base_class_cast_key());
+		}
+
+		template <typename Arg>
+		inline std::string make_string(Arg&& arg) {
+			string_view s = make_string_view(arg);
+			return std::string(s.data(), s.size());
+		}
+
+		inline int is_indexer(string_view s) {
+			if (s == to_string(meta_function::index)) {
+				return 1;
+			}
+			else if (s == to_string(meta_function::new_index)) {
+				return 2;
+			}
+			return 0;
+		}
+
+		inline int is_indexer(meta_function mf) {
+			if (mf == meta_function::index) {
+				return 1;
+			}
+			else if (mf == meta_function::new_index) {
+				return 2;
+			}
+			return 0;
+		}
+
+		inline int is_indexer(call_construction) {
+			return 0;
+		}
+	} // namespace u_detail
+
+	namespace detail {
+
+		template <typename T, typename IFx, typename Fx>
+		inline void insert_default_registrations(IFx&& ifx, Fx&& fx) {
+			(void)ifx;
+			(void)fx;
+			if constexpr (is_automagical<T>::value) {
+				if (fx(meta_function::less_than)) {
+					if constexpr (meta::supports_op_less<T>::value) {
+						lua_CFunction f = &comparsion_operator_wrap<T, std::less<>>;
+						ifx(meta_function::less_than, f);
+					}
+				}
+				if (fx(meta_function::less_than_or_equal_to)) {
+					if constexpr (meta::supports_op_less_equal<T>::value) {
+						lua_CFunction f = &comparsion_operator_wrap<T, std::less_equal<>>;
+						ifx(meta_function::less_than_or_equal_to, f);
+					}
+				}
+				if (fx(meta_function::equal_to)) {
+					if constexpr (meta::supports_op_equal<T>::value) {
+						lua_CFunction f = &comparsion_operator_wrap<T, std::equal_to<>>;
+						ifx(meta_function::equal_to, f);
+					}
+					else {
+						lua_CFunction f = &comparsion_operator_wrap<T, no_comp>;
+						ifx(meta_function::equal_to, f);
+					}
+				}
+				if (fx(meta_function::pairs)) {
+					ifx(meta_function::pairs, &container_detail::u_c_launch<as_container_t<T>>::pairs_call);
+				}
+				if (fx(meta_function::length)) {
+					if constexpr (meta::has_size<const T>::value || meta::has_size<T>::value) {
+						auto f = &default_size<T>;
+						ifx(meta_function::length, f);
+					}
+				}
+				if (fx(meta_function::to_string)) {
+					if constexpr (is_to_stringable_v<T>) {
+						if constexpr (!meta::is_probably_stateless_lambda_v<T> && !std::is_member_pointer_v<T>) {
+							auto f = &detail::static_trampoline<&default_to_string<T>>;
+							ifx(meta_function::to_string, f);
+						}
+					}
+				}
+				if (fx(meta_function::call_function)) {
+					if constexpr (is_callable_v<T>) {
+						if constexpr (meta::call_operator_deducible_v<T>) {
+							auto f = &c_call<decltype(&T::operator()), &T::operator()>;
+							ifx(meta_function::call_function, f);
+						}
+					}
+				}
+			}
+		}
+	} // namespace detail
+
+	namespace stack { namespace stack_detail {
+		template <typename X>
+		void set_undefined_methods_on(stack_reference t) {
+			using T = std::remove_pointer_t<X>;
+
+			lua_State* L = t.lua_state();
+
+			t.push();
+
+			detail::lua_reg_table l {};
+			int index = 0;
+			detail::indexed_insert insert_fx(l, index);
+			detail::insert_default_registrations<T>(insert_fx, detail::property_always_true);
+			if constexpr (!std::is_pointer_v<X>) {
+				l[index] = luaL_Reg { to_string(meta_function::garbage_collect).c_str(), detail::make_destructor<T>() };
+			}
+			luaL_setfuncs(L, l, 0);
+
+			// __type table
+			lua_createtable(L, 0, 2);
+			const std::string& name = detail::demangle<T>();
+			lua_pushlstring(L, name.c_str(), name.size());
+			lua_setfield(L, -2, "name");
+			lua_CFunction is_func = &detail::is_check<T>;
+			lua_pushcclosure(L, is_func, 0);
+			lua_setfield(L, -2, "is");
+			lua_setfield(L, t.stack_index(), to_string(meta_function::type).c_str());
+
+			t.pop();
+		}
+	}} // namespace stack::stack_detail
+} // namespace sol
+
+// end of sol/usertype_core.hpp
+
+// beginning of sol/usertype_storage.hpp
+
+#include <bitset>
+#include <unordered_map>
+#include <memory>
+
+namespace sol { namespace u_detail {
+
+	struct usertype_storage_base;
+	template <typename T>
+	struct usertype_storage;
+
+	optional<usertype_storage_base&> maybe_get_usertype_storage_base(lua_State* L_, int index);
+	usertype_storage_base& get_usertype_storage_base(lua_State* L_, const char* gcmetakey);
+	template <typename T>
+	optional<usertype_storage<T>&> maybe_get_usertype_storage(lua_State* L_);
+	template <typename T>
+	usertype_storage<T>& get_usertype_storage(lua_State* L_);
+
+	using index_call_function = int(lua_State*, void*);
+	using change_indexing_mem_func = void (usertype_storage_base::*)(
+		lua_State*, submetatable_type, void*, stateless_stack_reference&, lua_CFunction, lua_CFunction, lua_CFunction, lua_CFunction);
+
+	struct index_call_storage {
+		index_call_function* index;
+		index_call_function* new_index;
+		void* binding_data;
+	};
+
+	struct new_index_call_storage : index_call_storage {
+		void* new_binding_data;
+	};
+
+	struct binding_base {
+		virtual void* data() = 0;
+		virtual ~binding_base() {
+		}
+	};
+
+	template <typename K, typename Fq, typename T = void>
+	struct binding : binding_base {
+		using uF = meta::unqualified_t<Fq>;
+		using F = meta::conditional_t<meta::is_c_str_of_v<uF, char>
+#if SOL_IS_ON(SOL_CHAR8_T)
+			     || meta::is_c_str_of_v<uF, char8_t>
+#endif
+			     || meta::is_c_str_of_v<uF, char16_t> || meta::is_c_str_of_v<uF, char32_t> || meta::is_c_str_of_v<uF, wchar_t>,
+			std::add_pointer_t<std::add_const_t<std::remove_all_extents_t<Fq>>>, std::decay_t<Fq>>;
+		F data_;
+
+		template <typename... Args>
+		binding(Args&&... args) : data_(std::forward<Args>(args)...) {
+		}
+
+		virtual void* data() override {
+			return static_cast<void*>(std::addressof(data_));
+		}
+
+		template <bool is_index = true, bool is_variable = false>
+		static inline int call_with_(lua_State* L_, void* target) {
+			constexpr int boost = !detail::is_non_factory_constructor<F>::value && std::is_same<K, call_construction>::value ? 1 : 0;
+			auto& f = *static_cast<F*>(target);
+			return call_detail::call_wrapped<T, is_index, is_variable, boost>(L_, f);
+		}
+
+		template <bool is_index = true, bool is_variable = false>
+		static inline int call_(lua_State* L_) {
+			void* f = stack::get<void*>(L_, upvalue_index(usertype_storage_index));
+			return call_with_<is_index, is_variable>(L_, f);
+		}
+
+		template <bool is_index = true, bool is_variable = false>
+		static inline int call(lua_State* L_) {
+			int r = detail::typed_static_trampoline<decltype(&call_<is_index, is_variable>), (&call_<is_index, is_variable>)>(L_);
+			if constexpr (meta::is_specialization_of_v<uF, yielding_t>) {
+				return lua_yield(L_, r);
+			}
+			else {
+				return r;
+			}
+		}
+
+		template <bool is_index = true, bool is_variable = false>
+		static inline int index_call_with_(lua_State* L_, void* target) {
+			if constexpr (!is_variable) {
+				if constexpr (is_lua_c_function_v<std::decay_t<F>>) {
+					auto& f = *static_cast<std::decay_t<F>*>(target);
+					return stack::push(L_, f);
+				}
+				else {
+					// set up upvalues
+					// for a chained call
+					int upvalues = 0;
+					upvalues += stack::push(L_, nullptr);
+					upvalues += stack::push(L_, target);
+					auto cfunc = &call<is_index, is_variable>;
+					return stack::push(L_, c_closure(cfunc, upvalues));
+				}
+			}
+			else {
+				constexpr int boost = !detail::is_non_factory_constructor<F>::value && std::is_same<K, call_construction>::value ? 1 : 0;
+				auto& f = *static_cast<F*>(target);
+				return call_detail::call_wrapped<T, is_index, is_variable, boost>(L_, f);
+			}
+		}
+
+		template <bool is_index = true, bool is_variable = false>
+		static inline int index_call_(lua_State* L_) {
+			void* f = stack::get<void*>(L_, upvalue_index(usertype_storage_index));
+			return index_call_with_<is_index, is_variable>(L_, f);
+		}
+
+		template <bool is_index = true, bool is_variable = false>
+		static inline int index_call(lua_State* L_) {
+			int r = detail::typed_static_trampoline<decltype(&index_call_<is_index, is_variable>), (&index_call_<is_index, is_variable>)>(L_);
+			if constexpr (meta::is_specialization_of_v<uF, yielding_t>) {
+				return lua_yield(L_, r);
+			}
+			else {
+				return r;
+			}
+		}
+	};
+
+	inline int index_fail(lua_State* L_) {
+		if (lua_getmetatable(L_, 1) == 1) {
+			int metatarget = lua_gettop(L_);
+			stack::get_field<false, true>(L_, stack_reference(L_, raw_index(2)), metatarget);
+			return 1;
+		}
+		// With runtime extensibility, we can't
+		// hard-error things. They have to
+		// return nil, like regular table types
+		return stack::push(L_, lua_nil);
+	}
+
+	inline int index_target_fail(lua_State* L_, void*) {
+		return index_fail(L_);
+	}
+
+	inline int new_index_fail(lua_State* L_) {
+		return luaL_error(L_, "sol: cannot set (new_index) into this object: no defined new_index operation on usertype");
+	}
+
+	inline int new_index_target_fail(lua_State* L_, void*) {
+		return new_index_fail(L_);
+	}
+
+	struct string_for_each_metatable_func {
+		bool is_destruction = false;
+		bool is_index = false;
+		bool is_new_index = false;
+		bool is_static_index = false;
+		bool is_static_new_index = false;
+		bool poison_indexing = false;
+		bool is_unqualified_lua_CFunction = false;
+		bool is_unqualified_lua_reference = false;
+		std::string* p_key = nullptr;
+		reference* p_binding_ref = nullptr;
+		lua_CFunction call_func = nullptr;
+		index_call_storage* p_ics = nullptr;
+		usertype_storage_base* p_usb = nullptr;
+		void* p_derived_usb = nullptr;
+		lua_CFunction idx_call = nullptr, new_idx_call = nullptr, meta_idx_call = nullptr, meta_new_idx_call = nullptr;
+		change_indexing_mem_func change_indexing;
+
+		void operator()(lua_State* L_, submetatable_type smt_, stateless_reference& fast_index_table_) {
+			std::string& key = *p_key;
+			usertype_storage_base& usb = *p_usb;
+			index_call_storage& ics = *p_ics;
+
+			if (smt_ == submetatable_type::named) {
+				// do not override __call or
+				// other specific meta functions on named metatable:
+				// we need that for call construction
+				// and other amenities
+				return;
+			}
+			int fast_index_table_push = fast_index_table_.push(L_);
+			stateless_stack_reference t(L_, -fast_index_table_push);
+			if (poison_indexing) {
+				(usb.*change_indexing)(L_, smt_, p_derived_usb, t, idx_call, new_idx_call, meta_idx_call, meta_new_idx_call);
+			}
+			if (is_destruction
+				&& (smt_ == submetatable_type::reference || smt_ == submetatable_type::const_reference || smt_ == submetatable_type::named
+				     || smt_ == submetatable_type::unique)) {
+				// gc does not apply to us here
+				// for reference types (raw T*, std::ref)
+				// for the named metatable itself,
+				// or for unique_usertypes, which do their own custom destroyion
+				t.pop(L_);
+				return;
+			}
+			if (is_index || is_new_index || is_static_index || is_static_new_index) {
+				// do not serialize the new_index and index functions here directly
+				// we control those...
+				t.pop(L_);
+				return;
+			}
+			if (is_unqualified_lua_CFunction) {
+				stack::set_field<false, true>(L_, key, call_func, t.stack_index());
+			}
+			else if (is_unqualified_lua_reference) {
+				reference& binding_ref = *p_binding_ref;
+				stack::set_field<false, true>(L_, key, binding_ref, t.stack_index());
+			}
+			else {
+				stack::set_field<false, true>(L_, key, make_closure(call_func, nullptr, ics.binding_data), t.stack_index());
+			}
+			t.pop(L_);
+		}
+	};
+
+	struct lua_reference_func {
+		reference key;
+		reference value;
+
+		void operator()(lua_State* L_, submetatable_type smt_, stateless_reference& fast_index_table_) {
+			if (smt_ == submetatable_type::named) {
+				return;
+			}
+			int fast_index_table_push = fast_index_table_.push(L_);
+			stateless_stack_reference t(L_, -fast_index_table_push);
+			stack::set_field<false, true>(L_, key, value, t.stack_index());
+			t.pop(L_);
+		}
+	};
+
+	struct update_bases_func {
+		detail::inheritance_check_function base_class_check_func;
+		detail::inheritance_cast_function base_class_cast_func;
+		lua_CFunction idx_call, new_idx_call, meta_idx_call, meta_new_idx_call;
+		usertype_storage_base* p_usb;
+		void* p_derived_usb;
+		change_indexing_mem_func change_indexing;
+
+		void operator()(lua_State* L_, submetatable_type smt_, stateless_reference& fast_index_table_) {
+			int fast_index_table_push = fast_index_table_.push(L_);
+			stateless_stack_reference t(L_, -fast_index_table_push);
+			stack::set_field(L_, detail::base_class_check_key(), reinterpret_cast<void*>(base_class_check_func), t.stack_index());
+			stack::set_field(L_, detail::base_class_cast_key(), reinterpret_cast<void*>(base_class_cast_func), t.stack_index());
+			// change indexing, forcefully
+			(p_usb->*change_indexing)(L_, smt_, p_derived_usb, t, idx_call, new_idx_call, meta_idx_call, meta_new_idx_call);
+			t.pop(L_);
+		}
+	};
+
+	struct binding_data_equals {
+		void* binding_data;
+
+		binding_data_equals(void* b) : binding_data(b) {
+		}
+
+		bool operator()(const std::unique_ptr<binding_base>& ptr) const {
+			return binding_data == ptr->data();
+		}
+	};
+
+	struct usertype_storage_base {
+	public:
+		lua_State* m_L;
+		std::vector<std::unique_ptr<binding_base>> storage;
+		std::vector<std::unique_ptr<char[]>> string_keys_storage;
+		std::unordered_map<string_view, index_call_storage> string_keys;
+		std::unordered_map<stateless_reference, stateless_reference, stateless_reference_hash, stateless_reference_equals> auxiliary_keys;
+		stateless_reference value_index_table;
+		stateless_reference reference_index_table;
+		stateless_reference unique_index_table;
+		stateless_reference const_reference_index_table;
+		stateless_reference const_value_index_table;
+		stateless_reference named_index_table;
+		stateless_reference type_table;
+		stateless_reference gc_names_table;
+		stateless_reference named_metatable;
+		new_index_call_storage base_index;
+		new_index_call_storage static_base_index;
+		bool is_using_index;
+		bool is_using_new_index;
+		std::bitset<64> properties;
+
+		usertype_storage_base(lua_State* L_)
+		: m_L(L_)
+		, storage()
+		, string_keys_storage()
+		, string_keys()
+		, auxiliary_keys(0, stateless_reference_hash(L_), stateless_reference_equals(L_))
+		, value_index_table()
+		, reference_index_table()
+		, unique_index_table()
+		, const_reference_index_table()
+		, const_value_index_table()
+		, named_index_table()
+		, type_table(make_reference<stateless_reference>(L_, create))
+		, gc_names_table(make_reference<stateless_reference>(L_, create))
+		, named_metatable(make_reference<stateless_reference>(L_, create))
+		, base_index()
+		, static_base_index()
+		, is_using_index(false)
+		, is_using_new_index(false)
+		, properties() {
+			base_index.binding_data = nullptr;
+			base_index.index = index_target_fail;
+			base_index.new_index = new_index_target_fail;
+			base_index.new_binding_data = nullptr;
+			static_base_index.binding_data = nullptr;
+			static_base_index.index = index_target_fail;
+			static_base_index.new_binding_data = this;
+			static_base_index.new_index = new_index_target_set;
+		}
+
+		template <typename Fx>
+		void for_each_table(lua_State* L_, Fx&& fx) {
+			for (int i = 0; i < 6; ++i) {
+				submetatable_type smt = static_cast<submetatable_type>(i);
+				stateless_reference* p_fast_index_table = nullptr;
+				switch (smt) {
+				case submetatable_type::const_value:
+					p_fast_index_table = &this->const_value_index_table;
+					break;
+				case submetatable_type::reference:
+					p_fast_index_table = &this->reference_index_table;
+					break;
+				case submetatable_type::unique:
+					p_fast_index_table = &this->unique_index_table;
+					break;
+				case submetatable_type::const_reference:
+					p_fast_index_table = &this->const_reference_index_table;
+					break;
+				case submetatable_type::named:
+					p_fast_index_table = &this->named_index_table;
+					break;
+				case submetatable_type::value:
+				default:
+					p_fast_index_table = &this->value_index_table;
+					break;
+				}
+				fx(L_, smt, *p_fast_index_table);
+			}
+		}
+
+		void add_entry(string_view sv, index_call_storage ics) {
+			string_keys_storage.emplace_back(new char[sv.size()]);
+			std::unique_ptr<char[]>& sv_storage = string_keys_storage.back();
+			std::memcpy(sv_storage.get(), sv.data(), sv.size());
+			string_view stored_sv(sv_storage.get(), sv.size());
+			string_keys.insert_or_assign(std::move(stored_sv), std::move(ics));
+		}
+
+		template <typename T, typename... Bases>
+		void update_bases(lua_State* L_, bases<Bases...>) {
+			static_assert(sizeof(void*) <= sizeof(detail::inheritance_check_function),
+				"The size of this data pointer is too small to fit the inheritance checking function: Please file "
+				"a bug report.");
+			static_assert(sizeof(void*) <= sizeof(detail::inheritance_cast_function),
+				"The size of this data pointer is too small to fit the inheritance checking function: Please file "
+				"a bug report.");
+			static_assert(!meta::any_same<T, Bases...>::value, "base classes cannot list the original class as part of the bases");
+			if constexpr (sizeof...(Bases) > 0) {
+				(void)detail::swallow { 0, ((weak_derive<Bases>::value = true), 0)... };
+
+				void* derived_this = static_cast<void*>(static_cast<usertype_storage<T>*>(this));
+
+				update_bases_func for_each_fx;
+				for_each_fx.base_class_check_func = &detail::inheritance<T>::template type_check_with<Bases...>;
+				for_each_fx.base_class_cast_func = &detail::inheritance<T>::template type_cast_with<Bases...>;
+				for_each_fx.idx_call = &usertype_storage<T>::template index_call_with_bases<false, Bases...>;
+				for_each_fx.new_idx_call = &usertype_storage<T>::template index_call_with_bases<true, Bases...>;
+				for_each_fx.meta_idx_call = &usertype_storage<T>::template meta_index_call_with_bases<false, Bases...>;
+				for_each_fx.meta_new_idx_call = &usertype_storage<T>::template meta_index_call_with_bases<true, Bases...>;
+				for_each_fx.p_usb = this;
+				for_each_fx.p_derived_usb = derived_this;
+				for_each_fx.change_indexing = &usertype_storage_base::change_indexing;
+				for_each_fx.p_derived_usb = derived_this;
+				this->for_each_table(L_, for_each_fx);
+			}
+			else {
+				(void)L_;
+			}
+		}
+
+		void clear() {
+			if (value_index_table.valid(m_L)) {
+				stack::clear(m_L, value_index_table);
+			}
+			if (reference_index_table.valid(m_L)) {
+				stack::clear(m_L, reference_index_table);
+			}
+			if (unique_index_table.valid(m_L)) {
+				stack::clear(m_L, unique_index_table);
+			}
+			if (const_reference_index_table.valid(m_L)) {
+				stack::clear(m_L, const_reference_index_table);
+			}
+			if (const_value_index_table.valid(m_L)) {
+				stack::clear(m_L, const_value_index_table);
+			}
+			if (named_index_table.valid(m_L)) {
+				stack::clear(m_L, named_index_table);
+			}
+			if (type_table.valid(m_L)) {
+				stack::clear(m_L, type_table);
+			}
+			if (gc_names_table.valid(m_L)) {
+				stack::clear(m_L, gc_names_table);
+			}
+			if (named_metatable.valid(m_L)) {
+				auto pp = stack::push_pop(m_L, named_metatable);
+				int named_metatable_index = pp.index_of(named_metatable);
+				if (lua_getmetatable(m_L, named_metatable_index) == 1) {
+					stack::clear(m_L, absolute_index(m_L, -1));
+				}
+				stack::clear(m_L, named_metatable);
+			}
+
+			value_index_table.reset(m_L);
+			reference_index_table.reset(m_L);
+			unique_index_table.reset(m_L);
+			const_reference_index_table.reset(m_L);
+			const_value_index_table.reset(m_L);
+			named_index_table.reset(m_L);
+			type_table.reset(m_L);
+			gc_names_table.reset(m_L);
+			named_metatable.reset(m_L);
+
+			storage.clear();
+			string_keys.clear();
+			auxiliary_keys.clear();
+			string_keys_storage.clear();
+		}
+
+		template <bool is_new_index, typename Base>
+		static void base_walk_index(lua_State* L_, usertype_storage_base& self, bool& keep_going, int& base_result) {
+			using bases = typename base<Base>::type;
+			if (!keep_going) {
+				return;
+			}
+			(void)L_;
+			(void)self;
+#if SOL_IS_ON(SOL_USE_UNSAFE_BASE_LOOKUP)
+			usertype_storage_base& base_storage = get_usertype_storage<Base>(L_);
+			base_result = self_index_call<is_new_index, true>(bases(), L_, base_storage);
+#else
+			optional<usertype_storage<Base>&> maybe_base_storage = maybe_get_usertype_storage<Base>(L_);
+			if (static_cast<bool>(maybe_base_storage)) {
+				base_result = self_index_call<is_new_index, true>(bases(), L_, *maybe_base_storage);
+				keep_going = base_result == base_walking_failed_index;
+			}
+#endif // Fast versus slow, safe base lookup
+		}
+
+		template <bool is_new_index = false, bool base_walking = false, bool from_named_metatable = false, typename... Bases>
+		static inline int self_index_call(types<Bases...>, lua_State* L, usertype_storage_base& self) {
+			if constexpr (!from_named_metatable || !is_new_index) {
+				type k_type = stack::get<type>(L, 2);
+				if (k_type == type::string) {
+					index_call_storage* target = nullptr;
+					string_view k = stack::get<string_view>(L, 2);
+					{
+						auto it = self.string_keys.find(k);
+						if (it != self.string_keys.cend()) {
+							target = &it->second;
+						}
+					}
+					if (target != nullptr) {
+						// let the target decide what to do, unless it's named...
+						if constexpr (is_new_index) {
+							return (target->new_index)(L, target->binding_data);
+						}
+						else {
+							return (target->index)(L, target->binding_data);
+						}
+					}
+				}
+				else if (k_type != type::lua_nil && k_type != type::none) {
+					stateless_reference* target = nullptr;
+					{
+						stack_reference k = stack::get<stack_reference>(L, 2);
+						auto it = self.auxiliary_keys.find(k);
+						if (it != self.auxiliary_keys.cend()) {
+							target = &it->second;
+						}
+					}
+					if (target != nullptr) {
+						if constexpr (is_new_index) {
+							// set value and return
+							target->reset(L, 3);
+							return 0;
+						}
+						else {
+							// push target to return
+							// what we found
+							return stack::push(L, *target);
+						}
+					}
+				}
+			}
+
+			// retrieve bases and walk through them.
+			bool keep_going = true;
+			int base_result;
+			(void)keep_going;
+			(void)base_result;
+			(void)detail::swallow { 1, (base_walk_index<is_new_index, Bases>(L, self, keep_going, base_result), 1)... };
+			if constexpr (sizeof...(Bases) > 0) {
+				if (!keep_going) {
+					return base_result;
+				}
+			}
+			if constexpr (base_walking) {
+				// if we're JUST base-walking then don't index-fail, just
+				// return the false bits
+				return base_walking_failed_index;
+			}
+			else if constexpr (from_named_metatable) {
+				if constexpr (is_new_index) {
+					return self.static_base_index.new_index(L, self.static_base_index.new_binding_data);
+				}
+				else {
+					return self.static_base_index.index(L, self.static_base_index.binding_data);
+				}
+			}
+			else {
+				if constexpr (is_new_index) {
+					return self.base_index.new_index(L, self.base_index.new_binding_data);
+				}
+				else {
+					return self.base_index.index(L, self.base_index.binding_data);
+				}
+			}
+		}
+
+		void change_indexing(lua_State* L_, submetatable_type submetatable_, void* derived_this_, stateless_stack_reference& t_, lua_CFunction index_,
+			lua_CFunction new_index_, lua_CFunction meta_index_, lua_CFunction meta_new_index_) {
+			usertype_storage_base& this_base = *this;
+			void* base_this = static_cast<void*>(&this_base);
+
+			this->is_using_index |= true;
+			this->is_using_new_index |= true;
+			if (submetatable_ == submetatable_type::named) {
+				stack::set_field(L_, metatable_key, named_index_table, t_.stack_index());
+				stateless_stack_reference stack_metametatable(L_, -named_metatable.push(L_));
+				stack::set_field<false, true>(L_,
+					meta_function::index,
+					make_closure(meta_index_, nullptr, derived_this_, base_this, nullptr, toplevel_magic),
+					stack_metametatable.stack_index());
+				stack::set_field<false, true>(L_,
+					meta_function::new_index,
+					make_closure(meta_new_index_, nullptr, derived_this_, base_this, nullptr, toplevel_magic),
+					stack_metametatable.stack_index());
+				stack_metametatable.pop(L_);
+			}
+			else {
+				stack::set_field<false, true>(
+					L_, meta_function::index, make_closure(index_, nullptr, derived_this_, base_this, nullptr, toplevel_magic), t_.stack_index());
+				stack::set_field<false, true>(
+					L_, meta_function::new_index, make_closure(new_index_, nullptr, derived_this_, base_this, nullptr, toplevel_magic), t_.stack_index());
+			}
+		}
+
+		template <typename T = void, typename Key, typename Value>
+		void set(lua_State* L, Key&& key, Value&& value);
+
+		static int new_index_target_set(lua_State* L, void* target) {
+			usertype_storage_base& self = *static_cast<usertype_storage_base*>(target);
+			self.set(L, reference(L, raw_index(2)), reference(L, raw_index(3)));
+			return 0;
+		}
+
+		~usertype_storage_base() {
+			value_index_table.reset(m_L);
+			reference_index_table.reset(m_L);
+			unique_index_table.reset(m_L);
+			const_reference_index_table.reset(m_L);
+			const_value_index_table.reset(m_L);
+			named_index_table.reset(m_L);
+			type_table.reset(m_L);
+			gc_names_table.reset(m_L);
+			named_metatable.reset(m_L);
+
+			auto auxiliary_first = auxiliary_keys.cbegin();
+			auto auxiliary_last = auxiliary_keys.cend();
+			while (auxiliary_first != auxiliary_last) {
+				// save a copy to what we're going to destroy
+				auto auxiliary_target = auxiliary_first;
+				// move the iterator up by 1
+				++auxiliary_first;
+				// extract the node and destroy the key
+				auto extracted_node = auxiliary_keys.extract(auxiliary_target);
+				extracted_node.key().reset(m_L);
+				extracted_node.mapped().reset(m_L);
+				// continue if auxiliary_first hasn't been exhausted
+			}
+		}
+	};
+
+	template <typename T>
+	struct usertype_storage : usertype_storage_base {
+
+		using usertype_storage_base::usertype_storage_base;
+
+		template <bool is_new_index, bool from_named_metatable>
+		static inline int index_call_(lua_State* L) {
+			using bases = typename base<T>::type;
+			usertype_storage_base& self = stack::get<light<usertype_storage_base>>(L, upvalue_index(usertype_storage_index));
+			return self_index_call<is_new_index, false, from_named_metatable>(bases(), L, self);
+		}
+
+		template <bool is_new_index, bool from_named_metatable, typename... Bases>
+		static inline int index_call_with_bases_(lua_State* L) {
+			using bases = types<Bases...>;
+			usertype_storage_base& self = stack::get<light<usertype_storage_base>>(L, upvalue_index(usertype_storage_index));
+			return self_index_call<is_new_index, false, from_named_metatable>(bases(), L, self);
+		}
+
+		template <bool is_new_index>
+		static inline int index_call(lua_State* L) {
+			return detail::static_trampoline<&index_call_<is_new_index, false>>(L);
+		}
+
+		template <bool is_new_index, typename... Bases>
+		static inline int index_call_with_bases(lua_State* L) {
+			return detail::static_trampoline<&index_call_with_bases_<is_new_index, false, Bases...>>(L);
+		}
+
+		template <bool is_new_index>
+		static inline int meta_index_call(lua_State* L) {
+			return detail::static_trampoline<&index_call_<is_new_index, true>>(L);
+		}
+
+		template <bool is_new_index, typename... Bases>
+		static inline int meta_index_call_with_bases(lua_State* L) {
+			return detail::static_trampoline<&index_call_with_bases_<is_new_index, true, Bases...>>(L);
+		}
+
+		template <typename Key, typename Value>
+		inline void set(lua_State* L, Key&& key, Value&& value);
+	};
+
+	template <typename T, typename Key, typename Value>
+	void usertype_storage_base::set(lua_State* L, Key&& key, Value&& value) {
+		using ValueU = meta::unwrap_unqualified_t<Value>;
+		using KeyU = meta::unwrap_unqualified_t<Key>;
+		using Binding = binding<KeyU, ValueU, T>;
+		using is_var_bind = is_variable_binding<ValueU>;
+		if constexpr (std::is_same_v<KeyU, call_construction>) {
+			(void)key;
+			std::unique_ptr<Binding> p_binding = std::make_unique<Binding>(std::forward<Value>(value));
+			Binding& b = *p_binding;
+			this->storage.push_back(std::move(p_binding));
+
+			this->named_index_table.push(L);
+			absolute_index metametatable_index(L, -1);
+			std::string_view call_metamethod_name = to_string(meta_function::call);
+			lua_pushlstring(L, call_metamethod_name.data(), call_metamethod_name.size());
+			stack::push(L, nullptr);
+			stack::push(L, b.data());
+			lua_CFunction target_func = &b.template call<false, false>;
+			lua_pushcclosure(L, target_func, 2);
+			lua_rawset(L, metametatable_index);
+			this->named_index_table.pop(L);
+		}
+		else if constexpr (std::is_same_v<KeyU, base_classes_tag>) {
+			(void)key;
+			this->update_bases<T>(L, std::forward<Value>(value));
+		}
+		else if constexpr ((meta::is_string_like_or_constructible<KeyU>::value || std::is_same_v<KeyU, meta_function>)) {
+			std::string s = u_detail::make_string(std::forward<Key>(key));
+			auto storage_it = this->storage.end();
+			auto string_it = this->string_keys.find(s);
+			if (string_it != this->string_keys.cend()) {
+				const auto& binding_data = string_it->second.binding_data;
+				storage_it = std::find_if(this->storage.begin(), this->storage.end(), binding_data_equals(binding_data));
+				this->string_keys.erase(string_it);
+			}
+
+			std::unique_ptr<Binding> p_binding = std::make_unique<Binding>(std::forward<Value>(value));
+			Binding& b = *p_binding;
+			if (storage_it != this->storage.cend()) {
+				*storage_it = std::move(p_binding);
+			}
+			else {
+				this->storage.push_back(std::move(p_binding));
+			}
+
+			bool is_index = (s == to_string(meta_function::index));
+			bool is_new_index = (s == to_string(meta_function::new_index));
+			bool is_static_index = (s == to_string(meta_function::static_index));
+			bool is_static_new_index = (s == to_string(meta_function::static_new_index));
+			bool is_destruction = s == to_string(meta_function::garbage_collect);
+			bool poison_indexing = (!is_using_index || !is_using_new_index) && (is_var_bind::value || is_index || is_new_index);
+			void* derived_this = static_cast<void*>(static_cast<usertype_storage<T>*>(this));
+			index_call_storage ics;
+			ics.binding_data = b.data();
+			ics.index = is_index || is_static_index ? &Binding::template call_with_<true, is_var_bind::value>
+				                                   : &Binding::template index_call_with_<true, is_var_bind::value>;
+			ics.new_index = is_new_index || is_static_new_index ? &Binding::template call_with_<false, is_var_bind::value>
+				                                               : &Binding::template index_call_with_<false, is_var_bind::value>;
+
+			string_for_each_metatable_func for_each_fx;
+			for_each_fx.is_destruction = is_destruction;
+			for_each_fx.is_index = is_index;
+			for_each_fx.is_new_index = is_new_index;
+			for_each_fx.is_static_index = is_static_index;
+			for_each_fx.is_static_new_index = is_static_new_index;
+			for_each_fx.poison_indexing = poison_indexing;
+			for_each_fx.p_key = &s;
+			for_each_fx.p_ics = &ics;
+			if constexpr (is_lua_c_function_v<ValueU>) {
+				for_each_fx.is_unqualified_lua_CFunction = true;
+				for_each_fx.call_func = *static_cast<lua_CFunction*>(ics.binding_data);
+			}
+			else if constexpr (is_lua_reference_or_proxy_v<ValueU>) {
+				for_each_fx.is_unqualified_lua_reference = true;
+				for_each_fx.p_binding_ref = static_cast<reference*>(ics.binding_data);
+			}
+			else {
+				for_each_fx.call_func = &b.template call<false, is_var_bind::value>;
+			}
+			for_each_fx.p_usb = this;
+			for_each_fx.p_derived_usb = derived_this;
+			for_each_fx.idx_call = &usertype_storage<T>::template index_call<false>;
+			for_each_fx.new_idx_call = &usertype_storage<T>::template index_call<true>;
+			for_each_fx.meta_idx_call = &usertype_storage<T>::template meta_index_call<false>;
+			for_each_fx.meta_new_idx_call = &usertype_storage<T>::template meta_index_call<true>;
+			for_each_fx.change_indexing = &usertype_storage_base::change_indexing;
+			// set base index and base new_index
+			// functions here
+			if (is_index) {
+				this->base_index.index = ics.index;
+				this->base_index.binding_data = ics.binding_data;
+			}
+			if (is_new_index) {
+				this->base_index.new_index = ics.new_index;
+				this->base_index.new_binding_data = ics.binding_data;
+			}
+			if (is_static_index) {
+				this->static_base_index.index = ics.index;
+				this->static_base_index.binding_data = ics.binding_data;
+			}
+			if (is_static_new_index) {
+				this->static_base_index.new_index = ics.new_index;
+				this->static_base_index.new_binding_data = ics.binding_data;
+			}
+			this->for_each_table(L, for_each_fx);
+			this->add_entry(s, std::move(ics));
+		}
+		else {
+			// the reference-based implementation might compare poorly and hash
+			// poorly in some cases...
+			if constexpr (is_lua_reference_v<KeyU> && is_lua_reference_v<ValueU>) {
+				if (key.get_type() == type::string) {
+					stack::push(L, key);
+					std::string string_key = stack::pop<std::string>(L);
+					this->set<T>(L, string_key, std::forward<Value>(value));
+				}
+				else {
+					lua_reference_func ref_additions_fx { key, value };
+
+					this->for_each_table(L, ref_additions_fx);
+					this->auxiliary_keys.insert_or_assign(std::forward<Key>(key), std::forward<Value>(value));
+				}
+			}
+			else {
+				reference ref_key = make_reference(L, std::forward<Key>(key));
+				reference ref_value = make_reference(L, std::forward<Value>(value));
+				lua_reference_func ref_additions_fx { ref_key, ref_value };
+
+				this->for_each_table(L, ref_additions_fx);
+				this->auxiliary_keys.insert_or_assign(std::move(ref_key), std::move(ref_value));
+			}
+		}
+	}
+
+	template <typename T>
+	template <typename Key, typename Value>
+	void usertype_storage<T>::set(lua_State* L, Key&& key, Value&& value) {
+		static_cast<usertype_storage_base&>(*this).set<T>(L, std::forward<Key>(key), std::forward<Value>(value));
+	}
+
+	template <typename T>
+	inline void clear_usertype_registry_names(lua_State* L) {
+		using u_traits = usertype_traits<T>;
+		using u_const_traits = usertype_traits<const T>;
+		using u_unique_traits = usertype_traits<d::u<T>>;
+		using u_ref_traits = usertype_traits<T*>;
+		using u_const_ref_traits = usertype_traits<T const*>;
+
+		stack_reference registry(L, raw_index(LUA_REGISTRYINDEX));
+		registry.push();
+		// eliminate all named entries for this usertype
+		// in the registry (luaL_newmetatable does
+		// [name] = new table
+		// in registry upon creation
+		stack::set_field(L, &u_traits::metatable()[0], lua_nil, registry.stack_index());
+		stack::set_field(L, &u_const_traits::metatable()[0], lua_nil, registry.stack_index());
+		stack::set_field(L, &u_const_ref_traits::metatable()[0], lua_nil, registry.stack_index());
+		stack::set_field(L, &u_ref_traits::metatable()[0], lua_nil, registry.stack_index());
+		stack::set_field(L, &u_unique_traits::metatable()[0], lua_nil, registry.stack_index());
+		registry.pop();
+	}
+
+	template <typename T>
+	inline int destroy_usertype_storage(lua_State* L) noexcept {
+		clear_usertype_registry_names<T>(L);
+		return detail::user_alloc_destroy<usertype_storage<T>>(L);
+	}
+
+	template <typename T>
+	inline usertype_storage<T>& create_usertype_storage(lua_State* L) {
+		const char* gcmetakey = &usertype_traits<T>::gc_table()[0];
+
+		// Make sure userdata's memory is properly in lua first,
+		// otherwise all the light userdata we make later will become invalid
+		int usertype_storage_push_count = stack::push<user<usertype_storage<T>>>(L, no_metatable, L);
+		stack_reference usertype_storage_ref(L, -usertype_storage_push_count);
+
+		// create and push onto the stack a table to use as metatable for this GC
+		// we create a metatable to attach to the regular gc_table
+		// so that the destructor is called for the usertype storage
+		int usertype_storage_metatabe_count = stack::push(L, new_table(0, 1));
+		stack_reference usertype_storage_metatable(L, -usertype_storage_metatabe_count);
+		// set the destroyion routine on the metatable
+		stack::set_field(L, meta_function::garbage_collect, &destroy_usertype_storage<T>, usertype_storage_metatable.stack_index());
+		// set the metatable on the usertype storage userdata
+		stack::set_field(L, metatable_key, usertype_storage_metatable, usertype_storage_ref.stack_index());
+		usertype_storage_metatable.pop();
+
+		// set the usertype storage and its metatable
+		// into the global table...
+		stack::set_field<true>(L, gcmetakey, usertype_storage_ref);
+		usertype_storage_ref.pop();
+
+		// then retrieve the lua-stored version so we have a well-pinned
+		// reference that does not die
+		stack::get_field<true>(L, gcmetakey);
+		usertype_storage<T>& target_umt = stack::pop<user<usertype_storage<T>>>(L);
+		return target_umt;
+	}
+
+	inline optional<usertype_storage_base&> maybe_as_usertype_storage_base(lua_State* L, int index) {
+		if (type_of(L, index) != type::lightuserdata) {
+			return nullopt;
+		}
+		usertype_storage_base& base_storage = *static_cast<usertype_storage_base*>(stack::get<void*>(L, index));
+		return base_storage;
+	}
+
+	inline optional<usertype_storage_base&> maybe_get_usertype_storage_base_inside(lua_State* L, int index) {
+		// okay, maybe we're looking at a table that is nested?
+		if (type_of(L, index) != type::table) {
+			return nullopt;
+		}
+		stack::get_field(L, meta_function::storage, index);
+		auto maybe_storage_base = maybe_as_usertype_storage_base(L, -1);
+		lua_pop(L, 1);
+		return maybe_storage_base;
+	}
+
+	inline optional<usertype_storage_base&> maybe_get_usertype_storage_base(lua_State* L, int index) {
+		// If we can get the index directly as this type, go for it
+		auto maybe_already_is_usertype_storage_base = maybe_as_usertype_storage_base(L, index);
+		if (maybe_already_is_usertype_storage_base) {
+			return maybe_already_is_usertype_storage_base;
+		}
+		return maybe_get_usertype_storage_base_inside(L, index);
+	}
+
+	inline optional<usertype_storage_base&> maybe_get_usertype_storage_base(lua_State* L, const char* gcmetakey) {
+		stack::get_field<true>(L, gcmetakey);
+		auto maybe_storage = maybe_as_usertype_storage_base(L, lua_gettop(L));
+		lua_pop(L, 1);
+		return maybe_storage;
+	}
+
+	inline usertype_storage_base& get_usertype_storage_base(lua_State* L, const char* gcmetakey) {
+		stack::get_field<true>(L, gcmetakey);
+		stack::record tracking;
+		usertype_storage_base& target_umt = stack::stack_detail::unchecked_unqualified_get<user<usertype_storage_base>>(L, -1, tracking);
+		lua_pop(L, 1);
+		return target_umt;
+	}
+
+	template <typename T>
+	inline optional<usertype_storage<T>&> maybe_get_usertype_storage(lua_State* L) {
+		const char* gcmetakey = &usertype_traits<T>::gc_table()[0];
+		stack::get_field<true>(L, gcmetakey);
+		int target = lua_gettop(L);
+		if (!stack::check<user<usertype_storage<T>>>(L, target)) {
+			return nullopt;
+		}
+		usertype_storage<T>& target_umt = stack::pop<user<usertype_storage<T>>>(L);
+		return target_umt;
+	}
+
+	template <typename T>
+	inline usertype_storage<T>& get_usertype_storage(lua_State* L) {
+		const char* gcmetakey = &usertype_traits<T>::gc_table()[0];
+		stack::get_field<true>(L, gcmetakey);
+		usertype_storage<T>& target_umt = stack::pop<user<usertype_storage<T>>>(L);
+		return target_umt;
+	}
+
+	template <typename T>
+	inline void clear_usertype_storage(lua_State* L) {
+		using u_traits = usertype_traits<T>;
+
+		const char* gcmetakey = &u_traits::gc_table()[0];
+		stack::get_field<true>(L, gcmetakey);
+		if (!stack::check<user<usertype_storage<T>>>(L)) {
+			lua_pop(L, 1);
+			return;
+		}
+		usertype_storage<T>& target_umt = stack::pop<user<usertype_storage<T>>>(L);
+		target_umt.clear();
+
+		clear_usertype_registry_names<T>(L);
+
+		stack::set_field<true>(L, gcmetakey, lua_nil);
+	}
+
+	template <typename T, automagic_flags enrollment_flags>
+	inline int register_usertype(lua_State* L_, automagic_enrollments enrollments_ = {}) {
+		using u_traits = usertype_traits<T>;
+		using u_const_traits = usertype_traits<const T>;
+		using u_unique_traits = usertype_traits<d::u<T>>;
+		using u_ref_traits = usertype_traits<T*>;
+		using u_const_ref_traits = usertype_traits<T const*>;
+		using uts = usertype_storage<T>;
+
+		// always have __new_index point to usertype_storage method
+		// have __index always point to regular fast-lookup
+		// meta_method table
+		// if __new_index is invoked, runtime-swap
+		// to slow __index if necessary
+		// (no speed penalty because function calls
+		// are all read-only -- only depend on __index
+		// to retrieve function and then call happens VIA Lua)
+
+		// __type entry:
+		// table contains key -> value lookup,
+		// where key is entry in metatable
+		// and value is type information as a string as
+		// best as we can give it
+
+		// name entry:
+		// string that contains raw class name,
+		// as defined from C++
+
+		// is entry:
+		// checks if argument supplied is of type T
+
+		// __storage entry:
+		// a light userdata pointing to the storage
+		// mostly to enable this new abstraction
+		// to not require the type name `T`
+		// to get at the C++ usertype storage within
+
+		// we then let typical definitions potentially override these intrinsics
+		// it's the user's fault if they override things or screw them up:
+		// these names have been reserved and documented since sol2
+
+		// STEP 0: tell the old usertype (if it exists)
+		// to fuck off
+		clear_usertype_storage<T>(L_);
+
+		// STEP 1: Create backing store for usertype storage
+		// Pretty much the most important step.
+		// STEP 2: Create Lua tables used for fast method indexing.
+		// This is done inside of the storage table's constructor
+		usertype_storage<T>& storage = create_usertype_storage<T>(L_);
+		usertype_storage_base& base_storage = storage;
+		void* light_storage = static_cast<void*>(&storage);
+		void* light_base_storage = static_cast<void*>(&base_storage);
+
+		// STEP 3: set up GC escape hatch table entirely
+		storage.gc_names_table.push(L_);
+		stateless_stack_reference gnt(L_, -1);
+		stack::set_field(L_, submetatable_type::named, &u_traits::gc_table()[0], gnt.stack_index());
+		stack::set_field(L_, submetatable_type::const_value, &u_const_traits::metatable()[0], gnt.stack_index());
+		stack::set_field(L_, submetatable_type::const_reference, &u_const_ref_traits::metatable()[0], gnt.stack_index());
+		stack::set_field(L_, submetatable_type::reference, &u_ref_traits::metatable()[0], gnt.stack_index());
+		stack::set_field(L_, submetatable_type::unique, &u_unique_traits::metatable()[0], gnt.stack_index());
+		stack::set_field(L_, submetatable_type::value, &u_traits::metatable()[0], gnt.stack_index());
+		gnt.pop(L_);
+
+		// STEP 4: add some useful information to the type table
+		stateless_stack_reference stacked_type_table(L_, -storage.type_table.push(L_));
+		stack::set_field(L_, "name", detail::demangle<T>(), stacked_type_table.stack_index());
+		stack::set_field(L_, "is", &detail::is_check<T>, stacked_type_table.stack_index());
+		stacked_type_table.pop(L_);
+
+		// STEP 5: create and hook up metatable,
+		// add intrinsics
+		// this one is the actual meta-handling table,
+		// the next one will be the one for
+		int for_each_backing_metatable_calls = 0;
+		auto for_each_backing_metatable = [&](lua_State* L_, submetatable_type smt_, stateless_reference& fast_index_table_) {
+			// Pointer types, AKA "references" from C++
+			const char* metakey = nullptr;
+			switch (smt_) {
+			case submetatable_type::const_value:
+				metakey = &u_const_traits::metatable()[0];
+				break;
+			case submetatable_type::reference:
+				metakey = &u_ref_traits::metatable()[0];
+				break;
+			case submetatable_type::unique:
+				metakey = &u_unique_traits::metatable()[0];
+				break;
+			case submetatable_type::const_reference:
+				metakey = &u_const_ref_traits::metatable()[0];
+				break;
+			case submetatable_type::named:
+				metakey = &u_traits::user_metatable()[0];
+				break;
+			case submetatable_type::value:
+			default:
+				metakey = &u_traits::metatable()[0];
+				break;
+			}
+
+			luaL_newmetatable(L_, metakey);
+			if (smt_ == submetatable_type::named) {
+				// the named table itself
+				// gets the associated name value
+				storage.named_metatable.reset(L_, -1);
+				lua_pop(L_, 1);
+				// but the thing we perform the methods on
+				// is still the metatable of the named
+				// table
+				lua_createtable(L_, 0, 6);
+			}
+			stateless_stack_reference t(L_, -1);
+			fast_index_table_.reset(L_, t.stack_index());
+			stack::set_field<false, true>(L_, meta_function::type, storage.type_table, t.stack_index());
+			// destructible? serialize default destructor here
+			// otherwise, not destructible: serialize a "hey you messed up"
+			switch (smt_) {
+			case submetatable_type::const_reference:
+			case submetatable_type::reference:
+			case submetatable_type::named:
+				break;
+			case submetatable_type::unique:
+				if constexpr (std::is_destructible_v<T>) {
+					stack::set_field<false, true>(L_, meta_function::garbage_collect, &detail::unique_destroy<T>, t.stack_index());
+				}
+				else {
+					stack::set_field<false, true>(L_, meta_function::garbage_collect, &detail::cannot_destroy<T>, t.stack_index());
+				}
+				break;
+			case submetatable_type::value:
+			case submetatable_type::const_value:
+			default:
+				if constexpr (std::is_destructible_v<T>) {
+					stack::set_field<false, true>(L_, meta_function::garbage_collect, detail::make_destructor<T>(), t.stack_index());
+				}
+				else {
+					stack::set_field<false, true>(L_, meta_function::garbage_collect, &detail::cannot_destroy<T>, t.stack_index());
+				}
+				break;
+			}
+
+			static_assert(sizeof(void*) <= sizeof(detail::inheritance_check_function),
+				"The size of this data pointer is too small to fit the inheritance checking function: file a bug "
+				"report.");
+			static_assert(sizeof(void*) <= sizeof(detail::inheritance_cast_function),
+				"The size of this data pointer is too small to fit the inheritance checking function: file a bug "
+				"report.");
+			stack::set_field<false, true>(L_, detail::base_class_check_key(), reinterpret_cast<void*>(&detail::inheritance<T>::type_check), t.stack_index());
+			stack::set_field<false, true>(L_, detail::base_class_cast_key(), reinterpret_cast<void*>(&detail::inheritance<T>::type_cast), t.stack_index());
+
+			auto prop_fx = detail::properties_enrollment_allowed(for_each_backing_metatable_calls, storage.properties, enrollments_);
+			auto insert_fx = [&L_, &t, &storage](meta_function mf, lua_CFunction reg) {
+				stack::set_field<false, true>(L_, mf, reg, t.stack_index());
+				storage.properties[static_cast<std::size_t>(mf)] = true;
+			};
+			detail::insert_default_registrations<T>(insert_fx, prop_fx);
+
+			// There are no variables, so serialize the fast function stuff
+			// be sure to reset the index stuff to the non-fast version
+			// if the user ever adds something later!
+			if (smt_ == submetatable_type::named) {
+				// add escape hatch storage pointer and gc names
+				stack::set_field<false, true>(L_, meta_function::storage, light_base_storage, t.stack_index());
+				stack::set_field<false, true>(L_, meta_function::gc_names, storage.gc_names_table, t.stack_index());
+
+				// fancy new_indexing when using the named table
+				{
+					absolute_index named_metatable_index(L_, -storage.named_metatable.push(L_));
+					stack::set_field<false, true>(L_, metatable_key, t, named_metatable_index);
+					storage.named_metatable.pop(L_);
+				}
+				stack_reference stack_metametatable(L_, -storage.named_index_table.push(L_));
+				stack::set_field<false, true>(L_,
+					meta_function::index,
+					make_closure(uts::template meta_index_call<false>, nullptr, light_storage, light_base_storage, nullptr, toplevel_magic),
+					stack_metametatable.stack_index());
+				stack::set_field<false, true>(L_,
+					meta_function::new_index,
+					make_closure(uts::template meta_index_call<true>, nullptr, light_storage, light_base_storage, nullptr, toplevel_magic),
+					stack_metametatable.stack_index());
+				stack_metametatable.pop();
+			}
+			else {
+				// otherwise just plain for index,
+				// and elaborated for new_index
+				stack::set_field<false, true>(L_, meta_function::index, t, t.stack_index());
+				stack::set_field<false, true>(L_,
+					meta_function::new_index,
+					make_closure(uts::template index_call<true>, nullptr, light_storage, light_base_storage, nullptr, toplevel_magic),
+					t.stack_index());
+				storage.is_using_new_index = true;
+			}
+
+			++for_each_backing_metatable_calls;
+			fast_index_table_.reset(L_, t.stack_index());
+			t.pop(L_);
+		};
+
+		storage.for_each_table(L_, for_each_backing_metatable);
+
+		// can only use set AFTER we initialize all the metatables
+		if constexpr (std::is_default_constructible_v<T> && has_flag(enrollment_flags, automagic_flags::default_constructor)) {
+			if (enrollments_.default_constructor) {
+				storage.set(L_, meta_function::construct, constructors<T()>());
+			}
+		}
+
+		// return the named metatable we want names linked into
+		storage.named_metatable.push(L_);
+		return 1;
+	}
+}} // namespace sol::u_detail
+
+// end of sol/usertype_storage.hpp
+
+// beginning of sol/usertype_proxy.hpp
+
+namespace sol {
+	template <typename Table, typename Key>
+	struct usertype_proxy : public proxy_base<usertype_proxy<Table, Key>> {
+	private:
+		using key_type = detail::proxy_key_t<Key>;
+
+		template <typename T, std::size_t... I>
+		decltype(auto) tuple_get(std::index_sequence<I...>) const& {
+			return tbl.template traverse_get<T>(std::get<I>(key)...);
+		}
+
+		template <typename T, std::size_t... I>
+		decltype(auto) tuple_get(std::index_sequence<I...>) && {
+			return tbl.template traverse_get<T>(std::get<I>(std::move(key))...);
+		}
+
+		template <std::size_t... I, typename T>
+		void tuple_set(std::index_sequence<I...>, T&& value) & {
+			if constexpr (sizeof...(I) > 1) {
+				tbl.traverse_set(std::get<I>(key)..., std::forward<T>(value));
+			}
+			else {
+				tbl.set(std::get<I>(key)..., std::forward<T>(value));
+			}
+		}
+
+		template <std::size_t... I, typename T>
+		void tuple_set(std::index_sequence<I...>, T&& value) && {
+			if constexpr (sizeof...(I) > 1) {
+				tbl.traverse_set(std::get<I>(std::move(key))..., std::forward<T>(value));
+			}
+			else {
+				tbl.set(std::get<I>(std::move(key))..., std::forward<T>(value));
+			}
+		}
+
+	public:
+		Table tbl;
+		key_type key;
+
+		template <typename T>
+		usertype_proxy(Table table, T&& k) : tbl(table), key(std::forward<T>(k)) {
+		}
+
+		template <typename T>
+		usertype_proxy& set(T&& item) & {
+			using idx_seq = std::make_index_sequence<std::tuple_size_v<meta::unqualified_t<key_type>>>;
+			tuple_set(idx_seq(), std::forward<T>(item));
+			return *this;
+		}
+
+		template <typename T>
+		usertype_proxy&& set(T&& item) && {
+			using idx_seq = std::make_index_sequence<std::tuple_size_v<meta::unqualified_t<key_type>>>;
+			std::move(*this).tuple_set(idx_seq(), std::forward<T>(item));
+			return std::move(*this);
+		}
+
+		template <typename T>
+		usertype_proxy& operator=(T&& other) & {
+			return set(std::forward<T>(other));
+		}
+
+		template <typename T>
+		usertype_proxy&& operator=(T&& other) && {
+			return std::move(*this).set(std::forward<T>(other));
+		}
+
+		template <typename T>
+		usertype_proxy& operator=(std::initializer_list<T> other) & {
+			return set(std::move(other));
+		}
+
+		template <typename T>
+		usertype_proxy&& operator=(std::initializer_list<T> other) && {
+			return std::move(*this).set(std::move(other));
+		}
+
+		template <typename T>
+		decltype(auto) get() const& {
+			using idx_seq = std::make_index_sequence<std::tuple_size_v<meta::unqualified_t<key_type>>>;
+			return tuple_get<T>(idx_seq());
+		}
+
+		template <typename T>
+		decltype(auto) get() && {
+			using idx_seq = std::make_index_sequence<std::tuple_size_v<meta::unqualified_t<key_type>>>;
+			return std::move(*this).template tuple_get<T>(idx_seq());
+		}
+
+		template <typename K>
+		decltype(auto) operator[](K&& k) const& {
+			auto keys = meta::tuplefy(key, std::forward<K>(k));
+			return usertype_proxy<Table, decltype(keys)>(tbl, std::move(keys));
+		}
+
+		template <typename K>
+		decltype(auto) operator[](K&& k) & {
+			auto keys = meta::tuplefy(key, std::forward<K>(k));
+			return usertype_proxy<Table, decltype(keys)>(tbl, std::move(keys));
+		}
+
+		template <typename K>
+		decltype(auto) operator[](K&& k) && {
+			auto keys = meta::tuplefy(std::move(key), std::forward<K>(k));
+			return usertype_proxy<Table, decltype(keys)>(tbl, std::move(keys));
+		}
+
+		template <typename... Ret, typename... Args>
+		decltype(auto) call(Args&&... args) {
+#if !defined(__clang__) && defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 191200000
+			// MSVC is ass sometimes
+			return get<function>().call<Ret...>(std::forward<Args>(args)...);
+#else
+			return get<function>().template call<Ret...>(std::forward<Args>(args)...);
+#endif
+		}
+
+		template <typename... Args>
+		decltype(auto) operator()(Args&&... args) {
+			return call<>(std::forward<Args>(args)...);
+		}
+
+		bool valid() const {
+			auto pp = stack::push_pop(tbl);
+			auto p = stack::probe_get_field<std::is_same<meta::unqualified_t<Table>, global_table>::value>(lua_state(), key, lua_gettop(lua_state()));
+			lua_pop(lua_state(), p.levels);
+			return p;
+		}
+
+		int push() const noexcept {
+			return push(this->lua_state());
+		}
+
+		int push(lua_State* L) const noexcept {
+			return get<reference>().push(L);
+		}
+
+		type get_type() const {
+			type t = type::none;
+			auto pp = stack::push_pop(tbl);
+			auto p = stack::probe_get_field<std::is_same<meta::unqualified_t<Table>, global_table>::value>(lua_state(), key, lua_gettop(lua_state()));
+			if (p) {
+				t = type_of(lua_state(), -1);
+			}
+			lua_pop(lua_state(), p.levels);
+			return t;
+		}
+
+		lua_State* lua_state() const {
+			return tbl.lua_state();
+		}
+	};
+} // namespace sol
+
+// end of sol/usertype_proxy.hpp
+
+// beginning of sol/metatable.hpp
+
+// beginning of sol/table_core.hpp
+
+// beginning of sol/table_proxy.hpp
+
+namespace sol {
+
+	template <typename Table, typename Key>
+	struct table_proxy : public proxy_base<table_proxy<Table, Key>> {
+	private:
+		using key_type = detail::proxy_key_t<Key>;
+
+		template <typename T, std::size_t... I>
+		decltype(auto) tuple_get(std::index_sequence<I...>) const& {
+			return tbl.template traverse_get<T>(std::get<I>(key)...);
+		}
+
+		template <typename T, std::size_t... I>
+		decltype(auto) tuple_get(std::index_sequence<I...>) && {
+			return tbl.template traverse_get<T>(std::get<I>(std::move(key))...);
+		}
+
+		template <std::size_t... I, typename T>
+		void tuple_set(std::index_sequence<I...>, T&& value) & {
+			tbl.traverse_set(std::get<I>(key)..., std::forward<T>(value));
+		}
+
+		template <std::size_t... I, typename T>
+		void tuple_set(std::index_sequence<I...>, T&& value) && {
+			tbl.traverse_set(std::get<I>(std::move(key))..., std::forward<T>(value));
+		}
+
+		auto setup_table(std::true_type) {
+			auto p = stack::probe_get_field<std::is_same_v<meta::unqualified_t<Table>, global_table>>(lua_state(), key, tbl.stack_index());
+			lua_pop(lua_state(), p.levels);
+			return p;
+		}
+
+		bool is_valid(std::false_type) {
+			auto pp = stack::push_pop(tbl);
+			auto p = stack::probe_get_field<std::is_same_v<meta::unqualified_t<Table>, global_table>>(lua_state(), key, lua_gettop(lua_state()));
+			lua_pop(lua_state(), p.levels);
+			return p;
+		}
+
+	public:
+		Table tbl;
+		key_type key;
+
+		template <typename T>
+		table_proxy(Table table, T&& k) : tbl(table), key(std::forward<T>(k)) {
+		}
+
+		table_proxy(const table_proxy&) = default;
+		table_proxy(table_proxy&&) = default;
+		table_proxy& operator=(const table_proxy& right) {
+			return set(right);
+		}
+		table_proxy& operator=(table_proxy&& right) {
+			return set(std::move(right));
+		}
+
+		template <typename T>
+		table_proxy& set(T&& item) & {
+			tuple_set(std::make_index_sequence<std::tuple_size_v<meta::unqualified_t<key_type>>>(), std::forward<T>(item));
+			return *this;
+		}
+
+		template <typename T>
+		table_proxy&& set(T&& item) && {
+			std::move(*this).tuple_set(std::make_index_sequence<std::tuple_size_v<meta::unqualified_t<key_type>>>(), std::forward<T>(item));
+			return std::move(*this);
+		}
+
+		template <typename... Args>
+		table_proxy& set_function(Args&&... args) & {
+			tbl.set_function(key, std::forward<Args>(args)...);
+			return *this;
+		}
+
+		template <typename... Args>
+		table_proxy&& set_function(Args&&... args) && {
+			tbl.set_function(std::move(key), std::forward<Args>(args)...);
+			return std::move(*this);
+		}
+
+		template <typename T, std::enable_if_t<!std::is_same_v<meta::unqualified_t<T>, table_proxy>>* = nullptr>
+		table_proxy& operator=(T&& other) & {
+			using Tu = meta::unwrap_unqualified_t<T>;
+			if constexpr (!is_lua_reference_or_proxy_v<Tu> && meta::is_invocable_v<Tu>) {
+				return set_function(std::forward<T>(other));
+			}
+			else {
+				return set(std::forward<T>(other));
+			}
+		}
+
+		template <typename T, std::enable_if_t<!std::is_same_v<meta::unqualified_t<T>, table_proxy>>* = nullptr>
+		table_proxy&& operator=(T&& other) && {
+			using Tu = meta::unwrap_unqualified_t<T>;
+			if constexpr (!is_lua_reference_or_proxy_v<Tu> && meta::is_invocable_v<Tu> && !detail::is_msvc_callable_rigged_v<T>) {
+				return std::move(*this).set_function(std::forward<T>(other));
+			}
+			else {
+				return std::move(*this).set(std::forward<T>(other));
+			}
+		}
+
+		template <typename T>
+		table_proxy& operator=(std::initializer_list<T> other) & {
+			return set(std::move(other));
+		}
+
+		template <typename T>
+		table_proxy&& operator=(std::initializer_list<T> other) && {
+			return std::move(*this).set(std::move(other));
+		}
+
+		template <typename T>
+		bool is() const {
+			typedef decltype(get<T>()) U;
+			optional<U> option = this->get<optional<U>>();
+			return option.has_value();
+		}
+
+		template <typename T>
+		decltype(auto) get() const& {
+			using idx_seq = std::make_index_sequence<std::tuple_size_v<meta::unqualified_t<key_type>>>;
+			return tuple_get<T>(idx_seq());
+		}
+
+		template <typename T>
+		decltype(auto) get() && {
+			using idx_seq = std::make_index_sequence<std::tuple_size_v<meta::unqualified_t<key_type>>>;
+			return std::move(*this).template tuple_get<T>(idx_seq());
+		}
+
+		template <typename T>
+		decltype(auto) get_or(T&& otherwise) const {
+			typedef decltype(get<T>()) U;
+			optional<U> option = get<optional<U>>();
+			if (option) {
+				return static_cast<U>(option.value());
+			}
+			return static_cast<U>(std::forward<T>(otherwise));
+		}
+
+		template <typename T, typename D>
+		decltype(auto) get_or(D&& otherwise) const {
+			optional<T> option = get<optional<T>>();
+			if (option) {
+				return static_cast<T>(option.value());
+			}
+			return static_cast<T>(std::forward<D>(otherwise));
+		}
+
+		template <typename T>
+		decltype(auto) get_or_create() {
+			return get_or_create<T>(new_table());
+		}
+
+		template <typename T, typename Otherwise>
+		decltype(auto) get_or_create(Otherwise&& other) {
+			if (!this->valid()) {
+				this->set(std::forward<Otherwise>(other));
+			}
+			return get<T>();
+		}
+
+		template <typename K>
+		decltype(auto) operator[](K&& k) const& {
+			auto keys = meta::tuplefy(key, std::forward<K>(k));
+			return table_proxy<Table, decltype(keys)>(tbl, std::move(keys));
+		}
+
+		template <typename K>
+		decltype(auto) operator[](K&& k) & {
+			auto keys = meta::tuplefy(key, std::forward<K>(k));
+			return table_proxy<Table, decltype(keys)>(tbl, std::move(keys));
+		}
+
+		template <typename K>
+		decltype(auto) operator[](K&& k) && {
+			auto keys = meta::tuplefy(std::move(key), std::forward<K>(k));
+			return table_proxy<Table, decltype(keys)>(tbl, std::move(keys));
+		}
+
+		template <typename... Ret, typename... Args>
+		decltype(auto) call(Args&&... args) {
+			lua_State* L = this->lua_state();
+			push(L);
+			int idx = lua_gettop(L);
+			stack_aligned_function func(L, idx);
+			return func.call<Ret...>(std::forward<Args>(args)...);
+		}
+
+		template <typename... Args>
+		decltype(auto) operator()(Args&&... args) {
+			return call<>(std::forward<Args>(args)...);
+		}
+
+		bool valid() const {
+			auto pp = stack::push_pop(tbl);
+			auto p = stack::probe_get_field<std::is_same<meta::unqualified_t<Table>, global_table>::value>(lua_state(), key, lua_gettop(lua_state()));
+			lua_pop(lua_state(), p.levels);
+			return p;
+		}
+
+		int push() const noexcept {
+			return push(this->lua_state());
+		}
+
+		int push(lua_State* L) const noexcept {
+			if constexpr (std::is_same_v<meta::unqualified_t<Table>, global_table> || is_stack_table_v<meta::unqualified_t<Table>>) {
+				auto pp = stack::push_pop<true>(tbl);
+				int tableindex = pp.index_of(tbl);
+				int top_index = lua_gettop(L);
+				stack::get_field<true>(lua_state(), key, tableindex);
+				lua_replace(L, top_index + 1);
+				lua_settop(L, top_index + 1);
+			}
+			else {
+				auto pp = stack::push_pop<false>(tbl);
+				int tableindex = pp.index_of(tbl);
+				int aftertableindex = lua_gettop(L);
+				stack::get_field<false>(lua_state(), key, tableindex);
+				lua_replace(L, tableindex);
+				lua_settop(L, aftertableindex + 1);
+			}
+			return 1;
+		}
+
+		type get_type() const {
+			type t = type::none;
+			auto pp = stack::push_pop(tbl);
+			auto p = stack::probe_get_field<std::is_same<meta::unqualified_t<Table>, global_table>::value>(lua_state(), key, lua_gettop(lua_state()));
+			if (p) {
+				t = type_of(lua_state(), -1);
+			}
+			lua_pop(lua_state(), p.levels);
+			return t;
+		}
+
+		lua_State* lua_state() const {
+			return tbl.lua_state();
+		}
+
+		table_proxy& force() {
+			if (!this->valid()) {
+				this->set(new_table());
+			}
+			return *this;
+		}
+	};
+
+	template <typename Table, typename Key, typename T>
+	inline bool operator==(T&& left, const table_proxy<Table, Key>& right) {
+		using G = decltype(stack::get<T>(nullptr, 0));
+		return right.template get<optional<G>>() == left;
+	}
+
+	template <typename Table, typename Key, typename T>
+	inline bool operator==(const table_proxy<Table, Key>& right, T&& left) {
+		using G = decltype(stack::get<T>(nullptr, 0));
+		return right.template get<optional<G>>() == left;
+	}
+
+	template <typename Table, typename Key, typename T>
+	inline bool operator!=(T&& left, const table_proxy<Table, Key>& right) {
+		using G = decltype(stack::get<T>(nullptr, 0));
+		return right.template get<optional<G>>() != left;
+	}
+
+	template <typename Table, typename Key, typename T>
+	inline bool operator!=(const table_proxy<Table, Key>& right, T&& left) {
+		using G = decltype(stack::get<T>(nullptr, 0));
+		return right.template get<optional<G>>() != left;
+	}
+
+	template <typename Table, typename Key>
+	inline bool operator==(lua_nil_t, const table_proxy<Table, Key>& right) {
+		return !right.valid();
+	}
+
+	template <typename Table, typename Key>
+	inline bool operator==(const table_proxy<Table, Key>& right, lua_nil_t) {
+		return !right.valid();
+	}
+
+	template <typename Table, typename Key>
+	inline bool operator!=(lua_nil_t, const table_proxy<Table, Key>& right) {
+		return right.valid();
+	}
+
+	template <typename Table, typename Key>
+	inline bool operator!=(const table_proxy<Table, Key>& right, lua_nil_t) {
+		return right.valid();
+	}
+
+	template <bool b>
+	template <typename Super>
+	basic_reference<b>& basic_reference<b>::operator=(proxy_base<Super>&& r) {
+		basic_reference<b> v = r;
+		this->operator=(std::move(v));
+		return *this;
+	}
+
+	template <bool b>
+	template <typename Super>
+	basic_reference<b>& basic_reference<b>::operator=(const proxy_base<Super>& r) {
+		basic_reference<b> v = r;
+		this->operator=(std::move(v));
+		return *this;
+	}
+
+	namespace stack {
+		template <typename Table, typename Key>
+		struct unqualified_pusher<table_proxy<Table, Key>> {
+			static int push(lua_State* L, const table_proxy<Table, Key>& p) {
+				return p.push(L);
+			}
+		};
+	} // namespace stack
+} // namespace sol
+
+// end of sol/table_proxy.hpp
+
+// beginning of sol/table_iterator.hpp
+
+#include <iterator>
+
+namespace sol {
+
+	template <typename reference_type>
+	class basic_table_iterator {
+	public:
+		typedef object key_type;
+		typedef object mapped_type;
+		typedef std::pair<object, object> value_type;
+		typedef std::input_iterator_tag iterator_category;
+		typedef std::ptrdiff_t difference_type;
+		typedef value_type* pointer;
+		typedef value_type& reference;
+		typedef const value_type& const_reference;
+
+	private:
+		std::pair<object, object> kvp;
+		reference_type ref;
+		int tableidx = 0;
+		int keyidx = 0;
+		std::ptrdiff_t idx = 0;
+
+	public:
+		basic_table_iterator() noexcept : keyidx(-1), idx(-1) {
+		}
+
+		basic_table_iterator(reference_type x) noexcept : ref(std::move(x)) {
+			ref.push();
+			tableidx = lua_gettop(ref.lua_state());
+			stack::push(ref.lua_state(), lua_nil);
+			this->operator++();
+			if (idx == -1) {
+				return;
+			}
+			--idx;
+		}
+
+		basic_table_iterator& operator++() noexcept {
+			if (idx == -1)
+				return *this;
+
+			if (lua_next(ref.lua_state(), tableidx) == 0) {
+				idx = -1;
+				keyidx = -1;
+				return *this;
+			}
+			++idx;
+			kvp.first = object(ref.lua_state(), -2);
+			kvp.second = object(ref.lua_state(), -1);
+			lua_pop(ref.lua_state(), 1);
+			// leave key on the stack
+			keyidx = lua_gettop(ref.lua_state());
+			return *this;
+		}
+
+		basic_table_iterator operator++(int) noexcept {
+			auto saved = *this;
+			this->operator++();
+			return saved;
+		}
+
+		reference operator*() const noexcept {
+			return const_cast<reference>(kvp);
+		}
+
+		bool operator==(const basic_table_iterator& right) const noexcept {
+			return idx == right.idx;
+		}
+
+		bool operator!=(const basic_table_iterator& right) const noexcept {
+			return idx != right.idx;
+		}
+
+		~basic_table_iterator() {
+			if (keyidx != -1) {
+				stack::remove(ref.lua_state(), keyidx, 1);
+			}
+			if (ref.lua_state() != nullptr && ref.valid()) {
+				stack::remove(ref.lua_state(), tableidx, 1);
+			}
+		}
+	};
+
+} // namespace sol
+
+// end of sol/table_iterator.hpp
+
+// beginning of sol/pairs_iterator.hpp
+
+// beginning of sol/stack/detail/pairs.hpp
+
+#include <optional>
+
+namespace sol { namespace stack { namespace stack_detail {
+
+	inline bool maybe_push_lua_next_function(lua_State* L_) {
+		stack::get_field<true, false>(L_, "next");
+		bool is_next = stack::check<protected_function>(L_);
+		if (is_next) {
+			return true;
+		}
+		stack::get_field<true, false>(L_, "table");
+		stack::record tracking{};
+		if (!stack::loose_table_check(L_, -1, &no_panic, tracking)) {
+			return false;
+		}
+		lua_getfield(L_, -1, "next");
+		bool is_table_next_func = stack::check<protected_function>(L_, -1);
+		if (is_table_next_func) {
+			return true;
+		}
+		lua_pop(L_, 1);
+		return false;
+	}
+
+	inline std::optional<protected_function> find_lua_next_function(lua_State* L_) {
+		if (maybe_push_lua_next_function(L_)) {
+			return stack::pop<protected_function>(L_);
+		}
+		return std::nullopt;
+	}
+
+	inline int c_lua_next(lua_State* L_) noexcept {
+		stack_reference table_stack_ref(L_, raw_index(1));
+		stateless_stack_reference key_stack_ref(L_, raw_index(2));
+		int result = lua_next(table_stack_ref.lua_state(), table_stack_ref.stack_index());
+		if (result == 0) {
+			stack::push(L_, lua_nil);
+			return 1;
+		}
+		return 2;
+	}
+
+	inline int readonly_pairs(lua_State* L_) noexcept {
+		int pushed = 0;
+		if (!maybe_push_lua_next_function(L_)) {
+			// we do not have the "next" function in the global namespace
+			// from the "table" global entiry, use our own
+			pushed += stack::push(L_, &c_lua_next);
+		}
+		else {
+			pushed += 1;
+		}
+		int metatable_exists = lua_getmetatable(L_, 1);
+		SOL_ASSERT(metatable_exists == 1);
+		const auto& index_key = to_string(sol::meta_function::index);
+		lua_getfield(L_, lua_gettop(L_), index_key.c_str());
+		lua_remove(L_, -2);
+		pushed += 1;
+		pushed += stack::push(L_, lua_nil);
+		return pushed;
+	}
+
+}}} // sol::stack::stack_detail
+
+// end of sol/stack/detail/pairs.hpp
+
+namespace sol {
+
+	struct pairs_sentinel { };
+
+	class pairs_iterator {
+	private:
+		inline static constexpr int empty_key_index = -1;
+
+	public:
+		using key_type = object;
+		using mapped_type = object;
+		using value_type = std::pair<object, object>;
+		using iterator_category = std::input_iterator_tag;
+		using difference_type = std::ptrdiff_t;
+		using pointer = value_type*;
+		using const_pointer = value_type const*;
+		using reference = value_type&;
+		using const_reference = const value_type&;
+
+		pairs_iterator() noexcept
+		: m_L(nullptr)
+		, m_next_function_ref(lua_nil)
+		, m_table_ref(lua_nil)
+		, m_cached_key_value_pair({ lua_nil, lua_nil })
+		, m_key_index(empty_key_index)
+		, m_iteration_index(0) {
+		}
+
+		pairs_iterator(const pairs_iterator&) = delete;
+		pairs_iterator& operator=(const pairs_iterator&) = delete;
+
+		pairs_iterator(pairs_iterator&& right) noexcept
+		: m_L(right.m_L)
+		, m_next_function_ref(std::move(right.m_next_function_ref))
+		, m_table_ref(std::move(right.m_table_ref))
+		, m_cached_key_value_pair(std::move(right.m_cached_key_value_pair))
+		, m_key_index(right.m_key_index)
+		, m_iteration_index(right.m_iteration_index) {
+			right.m_key_index = empty_key_index;
+		}
+
+		pairs_iterator& operator=(pairs_iterator&& right) noexcept {
+			m_L = right.m_L;
+			m_next_function_ref = std::move(right.m_next_function_ref);
+			m_table_ref = std::move(right.m_table_ref);
+			m_cached_key_value_pair = std::move(right.m_cached_key_value_pair);
+			m_key_index = right.m_key_index;
+			m_iteration_index = right.m_iteration_index;
+			right.m_key_index = empty_key_index;
+			return *this;
+		}
+
+		template <typename Source>
+		pairs_iterator(const Source& source_) noexcept : m_L(source_.lua_state()), m_key_index(empty_key_index), m_iteration_index(0) {
+			if (m_L == nullptr || !source_.valid()) {
+				m_key_index = empty_key_index;
+				return;
+			}
+			int source_index = -source_.push(m_L);
+			int abs_source_index = lua_absindex(m_L, source_index);
+			int metatable_exists = lua_getmetatable(m_L, abs_source_index);
+			lua_remove(m_L, abs_source_index);
+			if (metatable_exists == 1) {
+				// just has a metatable, but does it have __pairs ?
+				stack_reference metatable(m_L, raw_index(abs_source_index));
+				stack::get_field<is_global_table_v<Source>, true>(m_L, meta_function::pairs, metatable.stack_index());
+				optional<protected_function> maybe_pairs_function = stack::pop<optional<protected_function>>(m_L);
+				if (maybe_pairs_function.has_value()) {
+					protected_function& pairs_function = *maybe_pairs_function;
+					protected_function_result next_fn_and_table_and_first_key = pairs_function(source_);
+					if (next_fn_and_table_and_first_key.valid()) {
+						m_next_function_ref = next_fn_and_table_and_first_key.get<protected_function>(0);
+						m_table_ref = next_fn_and_table_and_first_key.get<sol::reference>(1);
+						m_key_index = next_fn_and_table_and_first_key.stack_index() - 1;
+						// remove next function and table
+						lua_remove(m_L, m_key_index);
+						lua_remove(m_L, m_key_index);
+						next_fn_and_table_and_first_key.abandon();
+						lua_remove(m_L, abs_source_index);
+						this->operator++();
+						m_iteration_index = 0;
+						return;
+					}
+				}
+			}
+
+			{
+				auto maybe_next = stack::stack_detail::find_lua_next_function(m_L);
+				if (maybe_next.has_value()) {
+					m_next_function_ref = std::move(*maybe_next);
+					m_table_ref = source_;
+
+					stack::push(m_L, lua_nil);
+					m_key_index = lua_gettop(m_L);
+					this->operator++();
+					m_iteration_index = 0;
+					return;
+				}
+			}
+
+			// okay, so none of the above worked and now we need to create
+			// a shim / polyfill instead
+			stack::push(m_L, &stack::stack_detail::c_lua_next);
+			m_next_function_ref = stack::pop<protected_function>(m_L);
+			m_table_ref = source_;
+			stack::push(m_L, lua_nil);
+			m_key_index = lua_gettop(m_L);
+			this->operator++();
+			m_iteration_index = 0;
+		}
+
+		pairs_iterator& operator++() {
+			if (m_key_index == empty_key_index) {
+				return *this;
+			}
+			{
+				sol::protected_function_result next_results = m_next_function_ref(m_table_ref, stack_reference(m_L, m_key_index));
+				if (!next_results.valid()) {
+					// TODO: abort, or throw an error?
+					m_clear();
+					m_key_index = empty_key_index;
+					return *this;
+				}
+				int next_results_count = next_results.return_count();
+				if (next_results_count < 2) {
+					// iteration is over!
+					next_results.abandon();
+					lua_settop(m_L, m_key_index - 1);
+					m_key_index = empty_key_index;
+					++m_iteration_index;
+					return *this;
+				}
+				else {
+					lua_remove(m_L, m_key_index);
+					m_key_index = next_results.stack_index() - 1;
+					m_cached_key_value_pair.first = stack::get<object>(m_L, m_key_index);
+					m_cached_key_value_pair.second = stack::get<object>(m_L, m_key_index + 1);
+					lua_settop(m_L, m_key_index);
+					next_results.abandon();
+				}
+			}
+			++m_iteration_index;
+			return *this;
+		}
+
+		std::ptrdiff_t index() const {
+			return static_cast<std::ptrdiff_t>(m_iteration_index);
+		}
+
+		const_reference operator*() const noexcept {
+			return m_cached_key_value_pair;
+		}
+
+		reference operator*() noexcept {
+			return m_cached_key_value_pair;
+		}
+
+		friend bool operator==(const pairs_iterator& left, const pairs_iterator& right) noexcept {
+			return left.m_table_ref == right.m_table_ref && left.m_iteration_index == right.m_iteration_index;
+		}
+
+		friend bool operator!=(const pairs_iterator& left, const pairs_iterator& right) noexcept {
+			return left.m_table_ref != right.m_table_ref || left.m_iteration_index != right.m_iteration_index;
+		}
+
+		friend bool operator==(const pairs_iterator& left, const pairs_sentinel&) noexcept {
+			return left.m_key_index == empty_key_index;
+		}
+
+		friend bool operator!=(const pairs_iterator& left, const pairs_sentinel&) noexcept {
+			return left.m_key_index != empty_key_index;
+		}
+
+		friend bool operator==(const pairs_sentinel&, const pairs_iterator& left) noexcept {
+			return left.m_key_index == empty_key_index;
+		}
+
+		friend bool operator!=(const pairs_sentinel&, const pairs_iterator& left) noexcept {
+			return left.m_key_index != empty_key_index;
+		}
+
+		~pairs_iterator() {
+			if (m_key_index != empty_key_index) {
+				m_clear();
+			}
+		}
+
+	private:
+		void m_clear() noexcept {
+			lua_remove(m_L, m_key_index);
+		}
+
+		lua_State* m_L;
+		protected_function m_next_function_ref;
+		sol::reference m_table_ref;
+		std::pair<object, object> m_cached_key_value_pair;
+		int m_key_index;
+		int m_iteration_index;
+	};
+
+	template <typename Source>
+	class basic_pairs_range {
+	private:
+		using source_t = std::add_lvalue_reference_t<Source>;
+		source_t m_source;
+
+	public:
+		using iterator = pairs_iterator;
+		using const_iterator = pairs_iterator;
+
+		basic_pairs_range(source_t source_) noexcept : m_source(source_) {
+		}
+
+		iterator begin() noexcept {
+			return iterator(m_source);
+		}
+
+		iterator begin() const noexcept {
+			return iterator(m_source);
+		}
+
+		const_iterator cbegin() const noexcept {
+			return const_iterator(m_source);
+		}
+
+		pairs_sentinel end() noexcept {
+			return {};
+		}
+
+		pairs_sentinel end() const noexcept {
+			return {};
+		}
+
+		pairs_sentinel cend() const noexcept {
+			return {};
+		}
+	};
+} // namespace sol
+
+// end of sol/pairs_iterator.hpp
+
+namespace sol {
+	namespace detail {
+		template <std::size_t n>
+		struct clean {
+			lua_State* L;
+			clean(lua_State* luastate) : L(luastate) {
+			}
+			~clean() {
+				lua_pop(L, static_cast<int>(n));
+			}
+		};
+
+		struct ref_clean {
+			lua_State* L;
+			int& pop_count;
+
+			ref_clean(lua_State* L_, int& pop_count_) noexcept : L(L_), pop_count(pop_count_) {
+			}
+			~ref_clean() {
+				lua_pop(L, static_cast<int>(pop_count));
+			}
+		};
+
+		inline int fail_on_newindex(lua_State* L_) {
+			return luaL_error(L_, "sol: cannot modify the elements of an enumeration table");
+		}
+
+	} // namespace detail
+
+	template <bool top_level, typename ref_t>
+	class basic_table_core : public basic_object<ref_t> {
+	private:
+		using base_t = basic_object<ref_t>;
+
+		friend class state;
+		friend class state_view;
+		template <typename, typename>
+		friend class basic_usertype;
+		template <typename>
+		friend class basic_metatable;
+
+		template <typename T>
+		using is_get_direct_tableless = meta::boolean<stack::stack_detail::is_get_direct_tableless_v<T, top_level, false>>;
+
+		template <typename T>
+		using is_raw_get_direct_tableless = std::false_type;
+
+		template <typename T>
+		using is_set_direct_tableless = meta::boolean<stack::stack_detail::is_set_direct_tableless_v<T, top_level, false>>;
+
+		template <typename T>
+		using is_raw_set_direct_tableless = std::false_type;
+
+		template <bool raw, typename... Ret, typename... Keys>
+		decltype(auto) tuple_get(int table_index, Keys&&... keys) const {
+			if constexpr (sizeof...(Ret) < 2) {
+				return traverse_get_single_maybe_tuple<raw, Ret...>(table_index, std::forward<Keys>(keys)...);
+			}
+			else {
+				using multi_ret = decltype(stack::pop<std::tuple<Ret...>>(nullptr));
+				return multi_ret(traverse_get_single_maybe_tuple<raw, Ret>(table_index, std::forward<Keys>(keys))...);
+			}
+		}
+
+		template <bool raw, typename Ret, size_t... I, typename Key>
+		decltype(auto) traverse_get_single_tuple(int table_index, std::index_sequence<I...>, Key&& key) const {
+			return traverse_get_single<raw, Ret>(table_index, std::get<I>(std::forward<Key>(key))...);
+		}
+
+		template <bool raw, typename Ret, typename Key>
+		decltype(auto) traverse_get_single_maybe_tuple(int table_index, Key&& key) const {
+			if constexpr (meta::is_tuple_v<meta::unqualified_t<Key>>) {
+				return traverse_get_single_tuple<raw, Ret>(
+				     table_index, std::make_index_sequence<std::tuple_size_v<meta::unqualified_t<Key>>>(), std::forward<Key>(key));
+			}
+			else {
+				return traverse_get_single<raw, Ret>(table_index, std::forward<Key>(key));
+			}
+		}
+
+		template <bool raw, typename Ret, typename... Keys>
+		decltype(auto) traverse_get_single(int table_index, Keys&&... keys) const {
+			constexpr static bool global = (meta::count_for_to_pack_v < 1, is_get_direct_tableless, meta::unqualified_t<Keys>... >> 0);
+			if constexpr (meta::is_optional_v<meta::unqualified_t<Ret>>) {
+				int popcount = 0;
+				detail::ref_clean c(base_t::lua_state(), popcount);
+				return traverse_get_deep_optional<global, raw, detail::insert_mode::none, Ret>(popcount, table_index, std::forward<Keys>(keys)...);
+			}
+			else {
+				detail::clean<sizeof...(Keys) - meta::count_for_pack_v<detail::is_insert_mode, meta::unqualified_t<Keys>...>> c(base_t::lua_state());
+				return traverse_get_deep<global, raw, detail::insert_mode::none, Ret>(table_index, std::forward<Keys>(keys)...);
+			}
+		}
+
+		template <bool raw, typename Pairs, std::size_t... I>
+		void tuple_set(std::index_sequence<I...>, Pairs&& pairs) {
+			constexpr static bool global = (meta::count_even_for_pack_v < is_set_direct_tableless,
+			     meta::unqualified_t<decltype(std::get<I * 2>(std::forward<Pairs>(pairs)))>... >> 0);
+			auto pp = stack::push_pop<global>(*this);
+			int table_index = pp.index_of(*this);
+			lua_State* L = base_t::lua_state();
+			(void)table_index;
+			(void)L;
+			void(detail::swallow { (stack::set_field<(top_level), raw>(
+			                             L, std::get<I * 2>(std::forward<Pairs>(pairs)), std::get<I * 2 + 1>(std::forward<Pairs>(pairs)), table_index),
+			     0)... });
+		}
+
+		template <bool global, bool raw, detail::insert_mode mode, typename T, typename Key, typename... Keys>
+		decltype(auto) traverse_get_deep(int table_index, Key&& key, Keys&&... keys) const {
+			if constexpr (std::is_same_v<meta::unqualified_t<Key>, create_if_nil_t>) {
+				(void)key;
+				return traverse_get_deep<false, raw, static_cast<detail::insert_mode>(mode | detail::insert_mode::create_if_nil), T>(
+				     table_index, std::forward<Keys>(keys)...);
+			}
+			else {
+				lua_State* L = base_t::lua_state();
+				stack::get_field<global, raw>(L, std::forward<Key>(key), table_index);
+				if constexpr (sizeof...(Keys) > 0) {
+					if constexpr ((mode & detail::insert_mode::create_if_nil) == detail::insert_mode::create_if_nil) {
+						type t = type_of(L, -1);
+						if (t == type::lua_nil || t == type::none) {
+							lua_pop(L, 1);
+							stack::push(L, new_table(0, 0));
+						}
+					}
+					return traverse_get_deep<false, raw, mode, T>(lua_gettop(L), std::forward<Keys>(keys)...);
+				}
+				else {
+					if constexpr ((mode & detail::insert_mode::create_if_nil) == detail::insert_mode::create_if_nil) {
+						type t = type_of(L, -1);
+						if ((t == type::lua_nil || t == type::none) && (is_table_like_v<T>)) {
+							lua_pop(L, 1);
+							stack::push(L, new_table(0, 0));
+						}
+					}
+					return stack::get<T>(L);
+				}
+			}
+		}
+
+		template <bool global, bool raw, detail::insert_mode mode, typename T, typename Key, typename... Keys>
+		decltype(auto) traverse_get_deep_optional(int& popcount, int table_index, Key&& key, Keys&&... keys) const {
+			if constexpr (std::is_same_v<meta::unqualified_t<Key>, create_if_nil_t>) {
+				constexpr detail::insert_mode new_mode = static_cast<detail::insert_mode>(mode | detail::insert_mode::create_if_nil);
+				(void)key;
+				return traverse_get_deep_optional<global, raw, new_mode, T>(popcount, table_index, std::forward<Keys>(keys)...);
+			}
+			else if constexpr (std::is_same_v<meta::unqualified_t<Key>, update_if_empty_t>) {
+				constexpr detail::insert_mode new_mode = static_cast<detail::insert_mode>(mode | detail::insert_mode::update_if_empty);
+				(void)key;
+				return traverse_get_deep_optional<global, raw, new_mode, T>(popcount, table_index, std::forward<Keys>(keys)...);
+			}
+			else if constexpr (std::is_same_v<meta::unqualified_t<Key>, override_value_t>) {
+				constexpr detail::insert_mode new_mode = static_cast<detail::insert_mode>(mode | detail::insert_mode::override_value);
+				(void)key;
+				return traverse_get_deep_optional<global, raw, new_mode, T>(popcount, table_index, std::forward<Keys>(keys)...);
+			}
+			else {
+				if constexpr (sizeof...(Keys) > 0) {
+					lua_State* L = base_t::lua_state();
+					auto p = stack::probe_get_field<global, raw>(L, std::forward<Key>(key), table_index);
+					popcount += p.levels;
+					if (!p.success) {
+						if constexpr ((mode & detail::insert_mode::create_if_nil) == detail::insert_mode::create_if_nil) {
+							lua_pop(L, 1);
+							constexpr bool is_seq = meta::count_for_to_pack_v < 1, std::is_integral, Keys... >> 0;
+							stack::push(L, new_table(static_cast<int>(is_seq), static_cast<int>(!is_seq)));
+							stack::set_field<global, raw>(L, std::forward<Key>(key), stack_reference(L, -1), table_index);
+						}
+						else {
+							return T(nullopt);
+						}
+					}
+					return traverse_get_deep_optional<false, raw, mode, T>(popcount, lua_gettop(L), std::forward<Keys>(keys)...);
+				}
+				else {
+					using R = decltype(stack::get<T>(nullptr));
+					using value_type = typename meta::unqualified_t<R>::value_type;
+					lua_State* L = base_t::lua_state();
+					auto p = stack::probe_get_field<global, raw, value_type>(L, key, table_index);
+					popcount += p.levels;
+					if (!p.success) {
+						if constexpr ((mode & detail::insert_mode::create_if_nil) == detail::insert_mode::create_if_nil) {
+							lua_pop(L, 1);
+							stack::push(L, new_table(0, 0));
+							stack::set_field<global, raw>(L, std::forward<Key>(key), stack_reference(L, -1), table_index);
+							if (stack::check<value_type>(L, lua_gettop(L), &no_panic)) {
+								return stack::get<T>(L);
+							}
+						}
+						return R(nullopt);
+					}
+					return stack::get<T>(L);
+				}
+			}
+		}
+
+		template <bool global, bool raw, detail::insert_mode mode, typename Key, typename... Keys>
+		void traverse_set_deep(int table_index, Key&& key, Keys&&... keys) const {
+			using KeyU = meta::unqualified_t<Key>;
+			if constexpr (std::is_same_v<KeyU, update_if_empty_t>) {
+				(void)key;
+				traverse_set_deep<global, raw, static_cast<detail::insert_mode>(mode | detail::insert_mode::update_if_empty)>(
+				     table_index, std::forward<Keys>(keys)...);
+			}
+			else if constexpr (std::is_same_v<KeyU, create_if_nil_t>) {
+				(void)key;
+				traverse_set_deep<global, raw, static_cast<detail::insert_mode>(mode | detail::insert_mode::create_if_nil)>(
+				     table_index, std::forward<Keys>(keys)...);
+			}
+			else if constexpr (std::is_same_v<KeyU, override_value_t>) {
+				(void)key;
+				traverse_set_deep<global, raw, static_cast<detail::insert_mode>(mode | detail::insert_mode::override_value)>(
+				     table_index, std::forward<Keys>(keys)...);
+			}
+			else {
+				lua_State* L = base_t::lua_state();
+				if constexpr (sizeof...(Keys) == 1) {
+					if constexpr ((mode & detail::insert_mode::update_if_empty) == detail::insert_mode::update_if_empty) {
+						auto p = stack::probe_get_field<global, raw>(L, key, table_index);
+						lua_pop(L, p.levels);
+						if (!p.success) {
+							stack::set_field<global, raw>(L, std::forward<Key>(key), std::forward<Keys>(keys)..., table_index);
+						}
+					}
+					else {
+						stack::set_field<global, raw>(L, std::forward<Key>(key), std::forward<Keys>(keys)..., table_index);
+					}
+				}
+				else {
+					if constexpr (mode != detail::insert_mode::none) {
+						stack::get_field<global, raw>(L, key, table_index);
+						type vt = type_of(L, -1);
+						if constexpr ((mode & detail::insert_mode::update_if_empty) == detail::insert_mode::update_if_empty
+						     || (mode & detail::insert_mode::create_if_nil) == detail::insert_mode::create_if_nil) {
+							if (vt == type::lua_nil || vt == type::none) {
+								constexpr bool is_seq = meta::count_for_to_pack_v < 1, std::is_integral, Keys... >> 0;
+								lua_pop(L, 1);
+								stack::push(L, new_table(static_cast<int>(is_seq), static_cast<int>(!is_seq)));
+								stack::set_field<global, raw>(L, std::forward<Key>(key), stack_reference(L, -1), table_index);
+							}
+						}
+						else {
+							if (vt != type::table) {
+								constexpr bool is_seq = meta::count_for_to_pack_v < 1, std::is_integral, Keys... >> 0;
+								lua_pop(L, 1);
+								stack::push(L, new_table(static_cast<int>(is_seq), static_cast<int>(!is_seq)));
+								stack::set_field<global, raw>(L, std::forward<Key>(key), stack_reference(L, -1), table_index);
+							}
+						}
+					}
+					else {
+						stack::get_field<global, raw>(L, std::forward<Key>(key), table_index);
+					}
+					traverse_set_deep<false, raw, mode>(lua_gettop(L), std::forward<Keys>(keys)...);
+				}
+			}
+		}
+
+	protected:
+		basic_table_core(detail::no_safety_tag, lua_nil_t n) : base_t(n) {
+		}
+		basic_table_core(detail::no_safety_tag, lua_State* L, int index) : base_t(L, index) {
+		}
+		basic_table_core(detail::no_safety_tag, lua_State* L, ref_index index) : base_t(L, index) {
+		}
+		template <typename T,
+		     meta::enable<meta::neg<meta::any_same<meta::unqualified_t<T>, basic_table_core>>, meta::neg<std::is_same<ref_t, stack_reference>>,
+		          meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_table_core(detail::no_safety_tag, T&& r) noexcept : base_t(std::forward<T>(r)) {
+		}
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_table_core(detail::no_safety_tag, lua_State* L, T&& r) noexcept : base_t(L, std::forward<T>(r)) {
+		}
+
+	public:
+		using iterator = basic_table_iterator<ref_t>;
+		using const_iterator = iterator;
+
+		using base_t::lua_state;
+
+		basic_table_core() noexcept = default;
+		basic_table_core(const basic_table_core&) = default;
+		basic_table_core(basic_table_core&&) = default;
+		basic_table_core& operator=(const basic_table_core&) = default;
+		basic_table_core& operator=(basic_table_core&&) = default;
+
+		basic_table_core(const stack_reference& r) : basic_table_core(r.lua_state(), r.stack_index()) {
+		}
+
+		basic_table_core(stack_reference&& r) : basic_table_core(r.lua_state(), r.stack_index()) {
+		}
+
+		template <typename T, meta::enable_any<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_table_core(lua_State* L, T&& r) : base_t(L, std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			auto pp = stack::push_pop(*this);
+			int table_index = pp.index_of(*this);
+			constructor_handler handler {};
+			stack::check<basic_table_core>(lua_state(), table_index, handler);
+#endif // Safety
+		}
+
+		basic_table_core(lua_State* L, const new_table& nt) : base_t(L, -stack::push(L, nt)) {
+			if (!is_stack_based<meta::unqualified_t<ref_t>>::value) {
+				lua_pop(L, 1);
+			}
+		}
+
+		basic_table_core(lua_State* L, int index = -1) : basic_table_core(detail::no_safety, L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			constructor_handler handler {};
+			stack::check<basic_table_core>(L, index, handler);
+#endif // Safety
+		}
+
+		basic_table_core(lua_State* L, ref_index index) : basic_table_core(detail::no_safety, L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			auto pp = stack::push_pop(*this);
+			int table_index = pp.index_of(*this);
+			constructor_handler handler {};
+			stack::check<basic_table_core>(lua_state(), table_index, handler);
+#endif // Safety
+		}
+
+		template <typename T,
+		     meta::enable<meta::neg<meta::any_same<meta::unqualified_t<T>, basic_table_core>>, meta::neg<std::is_same<ref_t, stack_reference>>,
+		          meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_table_core(T&& r) noexcept : basic_table_core(detail::no_safety, std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			if (!is_table<meta::unqualified_t<T>>::value) {
+				auto pp = stack::push_pop(*this);
+				int table_index = pp.index_of(*this);
+				constructor_handler handler {};
+				stack::check<basic_table_core>(lua_state(), table_index, handler);
+			}
+#endif // Safety
+		}
+
+		basic_table_core(lua_nil_t r) noexcept : basic_table_core(detail::no_safety, r) {
+		}
+
+		basic_table_core(lua_State* L, global_tag_t t) noexcept : base_t(L, t) {
+		}
+
+		iterator begin() const {
+			if (this->get_type() == type::table) {
+				return iterator(*this);
+			}
+			return iterator();
+		}
+
+		iterator end() const {
+			return iterator();
+		}
+
+		const_iterator cbegin() const {
+			return begin();
+		}
+
+		const_iterator cend() const {
+			return end();
+		}
+
+		basic_pairs_range<basic_table_core> pairs() noexcept {
+			return basic_pairs_range<basic_table_core>(*this);
+		}
+
+		basic_pairs_range<const basic_table_core> pairs() const noexcept {
+			return basic_pairs_range<const basic_table_core>(*this);
+		}
+
+		void clear() {
+			auto pp = stack::push_pop<false>(*this);
+			int table_index = pp.index_of(*this);
+			stack::clear(lua_state(), table_index);
+		}
+
+		template <typename... Ret, typename... Keys>
+		decltype(auto) get(Keys&&... keys) const {
+			static_assert(sizeof...(Keys) == sizeof...(Ret), "number of keys and number of return types do not match");
+			constexpr static bool global = meta::all<meta::boolean<top_level>, is_get_direct_tableless<meta::unqualified_t<Keys>>...>::value;
+			auto pp = stack::push_pop<global>(*this);
+			int table_index = pp.index_of(*this);
+			return tuple_get<false, Ret...>(table_index, std::forward<Keys>(keys)...);
+		}
+
+		template <typename T, typename Key>
+		decltype(auto) get_or(Key&& key, T&& otherwise) const {
+			typedef decltype(get<T>("")) U;
+			optional<U> option = get<optional<U>>(std::forward<Key>(key));
+			if (option) {
+				return static_cast<U>(option.value());
+			}
+			return static_cast<U>(std::forward<T>(otherwise));
+		}
+
+		template <typename T, typename Key, typename D>
+		decltype(auto) get_or(Key&& key, D&& otherwise) const {
+			optional<T> option = get<optional<T>>(std::forward<Key>(key));
+			if (option) {
+				return static_cast<T>(option.value());
+			}
+			return static_cast<T>(std::forward<D>(otherwise));
+		}
+
+		template <typename T, typename... Keys>
+		decltype(auto) traverse_get(Keys&&... keys) const {
+			static_assert(sizeof...(Keys) > 0, "must pass at least 1 key to get");
+			constexpr static bool global = (meta::count_for_to_pack_v < 1, is_get_direct_tableless, meta::unqualified_t<Keys>... >> 0);
+			auto pp = stack::push_pop<global>(*this);
+			int table_index = pp.index_of(*this);
+			return traverse_get_single<false, T>(table_index, std::forward<Keys>(keys)...);
+		}
+
+		template <typename... Keys>
+		basic_table_core& traverse_set(Keys&&... keys) {
+			static_assert(sizeof...(Keys) > 1, "must pass at least 1 key and 1 value to set");
+			constexpr static bool global
+			     = (meta::count_when_for_to_pack_v < detail::is_not_insert_mode, 1, is_set_direct_tableless, meta::unqualified_t<Keys>... >> 0);
+			auto pp = stack::push_pop<global>(*this);
+			int table_index = pp.index_of(*this);
+			lua_State* L = base_t::lua_state();
+			auto pn = stack::pop_n(L, static_cast<int>(sizeof...(Keys) - 2 - meta::count_for_pack_v<detail::is_insert_mode, meta::unqualified_t<Keys>...>));
+			traverse_set_deep<top_level, false, detail::insert_mode::none>(table_index, std::forward<Keys>(keys)...);
+			return *this;
+		}
+
+		template <typename... Args>
+		basic_table_core& set(Args&&... args) {
+			if constexpr (sizeof...(Args) == 2) {
+				traverse_set(std::forward<Args>(args)...);
+			}
+			else {
+				tuple_set<false>(std::make_index_sequence<sizeof...(Args) / 2>(), std::forward_as_tuple(std::forward<Args>(args)...));
+			}
+			return *this;
+		}
+
+		template <typename... Ret, typename... Keys>
+		decltype(auto) raw_get(Keys&&... keys) const {
+			static_assert(sizeof...(Keys) == sizeof...(Ret), "number of keys and number of return types do not match");
+			constexpr static bool global = (meta::count_for_to_pack_v < 1, is_raw_get_direct_tableless, meta::unqualified_t<Keys>... >> 0);
+			auto pp = stack::push_pop<global>(*this);
+			int table_index = pp.index_of(*this);
+			return tuple_get<true, Ret...>(table_index, std::forward<Keys>(keys)...);
+		}
+
+		template <typename T, typename Key>
+		decltype(auto) raw_get_or(Key&& key, T&& otherwise) const {
+			typedef decltype(raw_get<T>("")) U;
+			optional<U> option = raw_get<optional<U>>(std::forward<Key>(key));
+			if (option) {
+				return static_cast<U>(option.value());
+			}
+			return static_cast<U>(std::forward<T>(otherwise));
+		}
+
+		template <typename T, typename Key, typename D>
+		decltype(auto) raw_get_or(Key&& key, D&& otherwise) const {
+			optional<T> option = raw_get<optional<T>>(std::forward<Key>(key));
+			if (option) {
+				return static_cast<T>(option.value());
+			}
+			return static_cast<T>(std::forward<D>(otherwise));
+		}
+
+		template <typename T, typename... Keys>
+		decltype(auto) traverse_raw_get(Keys&&... keys) const {
+			constexpr static bool global = (meta::count_for_to_pack_v < 1, is_raw_get_direct_tableless, meta::unqualified_t<Keys>... >> 0);
+			auto pp = stack::push_pop<global>(*this);
+			int table_index = pp.index_of(*this);
+			return traverse_get_single<true, T>(table_index, std::forward<Keys>(keys)...);
+		}
+
+		template <typename... Keys>
+		basic_table_core& traverse_raw_set(Keys&&... keys) {
+			constexpr static bool global = (meta::count_for_to_pack_v < 1, is_raw_set_direct_tableless, meta::unqualified_t<Keys>... >> 0);
+			auto pp = stack::push_pop<global>(*this);
+			lua_State* L = base_t::lua_state();
+			auto pn = stack::pop_n(L, static_cast<int>(sizeof...(Keys) - 2 - meta::count_for_pack_v<detail::is_insert_mode, meta::unqualified_t<Keys>...>));
+			traverse_set_deep<top_level, true, false>(std::forward<Keys>(keys)...);
+			return *this;
+		}
+
+		template <typename... Args>
+		basic_table_core& raw_set(Args&&... args) {
+			tuple_set<true>(std::make_index_sequence<sizeof...(Args) / 2>(), std::forward_as_tuple(std::forward<Args>(args)...));
+			return *this;
+		}
+
+		template <typename Class, typename Key>
+		usertype<Class> new_usertype(Key&& key);
+
+		template <typename Class, typename Key, automagic_flags enrollment_flags>
+		usertype<Class> new_usertype(Key&& key, constant_automagic_enrollments<enrollment_flags> enrollment);
+
+		template <typename Class, typename Key>
+		usertype<Class> new_usertype(Key&& key, automagic_enrollments enrollment);
+
+		template <typename Class, typename Key, typename Arg, typename... Args,
+		     typename = std::enable_if_t<!std::is_base_of_v<automagic_enrollments, meta::unqualified_t<Arg>>>>
+		usertype<Class> new_usertype(Key&& key, Arg&& arg, Args&&... args);
+
+		template <bool read_only = true, typename... Args>
+		table new_enum(const string_view& name, Args&&... args) {
+			table target = create_with(std::forward<Args>(args)...);
+			if constexpr (read_only) {
+				// Need to create a special iterator to handle this
+				table x
+				     = create_with(meta_function::new_index, detail::fail_on_newindex, meta_function::index, target, meta_function::pairs, stack::stack_detail::readonly_pairs);
+				table shim = create_named(name, metatable_key, x);
+				return shim;
+			}
+			else {
+				set(name, target);
+				return target;
+			}
+		}
+
+		template <typename T, bool read_only = true>
+		table new_enum(const string_view& name, std::initializer_list<std::pair<string_view, T>> items) {
+			table target = create(static_cast<int>(items.size()), static_cast<int>(0));
+			for (const auto& kvp : items) {
+				target.set(kvp.first, kvp.second);
+			}
+			if constexpr (read_only) {
+				table x = create_with(meta_function::new_index, detail::fail_on_newindex, meta_function::index, target);
+				table shim = create_named(name, metatable_key, x);
+				return shim;
+			}
+			else {
+				set(name, target);
+				return target;
+			}
+		}
+
+		template <typename Key = object, typename Value = object, typename Fx>
+		void for_each(Fx&& fx) const {
+			lua_State* L = base_t::lua_state();
+			if constexpr (std::is_invocable_v<Fx, Key, Value>) {
+				auto pp = stack::push_pop(*this);
+				int table_index = pp.index_of(*this);
+				stack::push(L, lua_nil);
+				while (lua_next(L, table_index)) {
+					Key key(L, -2);
+					Value value(L, -1);
+					auto pn = stack::pop_n(L, 1);
+					fx(key, value);
+				}
+			}
+			else {
+				auto pp = stack::push_pop(*this);
+				int table_index = pp.index_of(*this);
+				stack::push(L, lua_nil);
+				while (lua_next(L, table_index)) {
+					Key key(L, -2);
+					Value value(L, -1);
+					auto pn = stack::pop_n(L, 1);
+					std::pair<Key&, Value&> keyvalue(key, value);
+					fx(keyvalue);
+				}
+			}
+		}
+
+		size_t size() const {
+			auto pp = stack::push_pop(*this);
+			int table_index = pp.index_of(*this);
+			lua_State* L = base_t::lua_state();
+			lua_len(L, table_index);
+			return stack::pop<size_t>(L);
+		}
+
+		bool empty() const {
+			return cbegin() == cend();
+		}
+
+		template <typename T>
+		auto operator[](T&& key) & {
+			return table_proxy<basic_table_core&, detail::proxy_key_t<T>>(*this, std::forward<T>(key));
+		}
+
+		template <typename T>
+		auto operator[](T&& key) const& {
+			return table_proxy<const basic_table_core&, detail::proxy_key_t<T>>(*this, std::forward<T>(key));
+		}
+
+		template <typename T>
+		auto operator[](T&& key) && {
+			return table_proxy<basic_table_core, detail::proxy_key_t<T>>(std::move(*this), std::forward<T>(key));
+		}
+
+		template <typename Sig, typename Key, typename... Args>
+		basic_table_core& set_function(Key&& key, Args&&... args) {
+			set_fx(types<Sig>(), std::forward<Key>(key), std::forward<Args>(args)...);
+			return *this;
+		}
+
+		template <typename Key, typename... Args>
+		basic_table_core& set_function(Key&& key, Args&&... args) {
+			set_fx(types<>(), std::forward<Key>(key), std::forward<Args>(args)...);
+			return *this;
+		}
+
+		template <typename... Args>
+		basic_table_core& add(Args&&... args) {
+			auto pp = stack::push_pop(*this);
+			int table_index = pp.index_of(*this);
+			lua_State* L = base_t::lua_state();
+			(void)detail::swallow { 0, (stack::stack_detail::raw_table_set(L, std::forward<Args>(args), table_index), 0)... };
+			return *this;
+		}
+
+	private:
+		template <typename R, typename... Args, typename Fx, typename Key, typename = std::invoke_result_t<Fx, Args...>>
+		void set_fx(types<R(Args...)>, Key&& key, Fx&& fx) {
+			set_resolved_function<R(Args...)>(std::forward<Key>(key), std::forward<Fx>(fx));
+		}
+
+		template <typename Fx, typename Key, meta::enable<meta::is_specialization_of<meta::unqualified_t<Fx>, overload_set>> = meta::enabler>
+		void set_fx(types<>, Key&& key, Fx&& fx) {
+			set(std::forward<Key>(key), std::forward<Fx>(fx));
+		}
+
+		template <typename Fx, typename Key, typename... Args,
+		     meta::disable<meta::is_specialization_of<meta::unqualified_t<Fx>, overload_set>> = meta::enabler>
+		void set_fx(types<>, Key&& key, Fx&& fx, Args&&... args) {
+			set(std::forward<Key>(key), as_function_reference(std::forward<Fx>(fx), std::forward<Args>(args)...));
+		}
+
+		template <typename... Sig, typename... Args, typename Key>
+		void set_resolved_function(Key&& key, Args&&... args) {
+			set(std::forward<Key>(key), as_function_reference<function_sig<Sig...>>(std::forward<Args>(args)...));
+		}
+
+	public:
+		static inline table create(lua_State* L, int narr = 0, int nrec = 0) {
+			lua_createtable(L, narr, nrec);
+			table result(L);
+			lua_pop(L, 1);
+			return result;
+		}
+
+		template <typename Key, typename Value, typename... Args>
+		static inline table create(lua_State* L, int narr, int nrec, Key&& key, Value&& value, Args&&... args) {
+			lua_createtable(L, narr, nrec);
+			table result(L);
+			result.set(std::forward<Key>(key), std::forward<Value>(value), std::forward<Args>(args)...);
+			lua_pop(L, 1);
+			return result;
+		}
+
+		template <typename... Args>
+		static inline table create_with(lua_State* L, Args&&... args) {
+			static_assert(sizeof...(Args) % 2 == 0, "You must have an even number of arguments for a key, value ... list.");
+			constexpr int narr = static_cast<int>(meta::count_odd_for_pack_v<std::is_integral, Args...>);
+			return create(L, narr, static_cast<int>((sizeof...(Args) / 2) - narr), std::forward<Args>(args)...);
+		}
+
+		table create(int narr = 0, int nrec = 0) {
+			return create(base_t::lua_state(), narr, nrec);
+		}
+
+		template <typename Key, typename Value, typename... Args>
+		table create(int narr, int nrec, Key&& key, Value&& value, Args&&... args) {
+			return create(base_t::lua_state(), narr, nrec, std::forward<Key>(key), std::forward<Value>(value), std::forward<Args>(args)...);
+		}
+
+		template <typename Name>
+		table create(Name&& name, int narr = 0, int nrec = 0) {
+			table x = create(base_t::lua_state(), narr, nrec);
+			this->set(std::forward<Name>(name), x);
+			return x;
+		}
+
+		template <typename Name, typename Key, typename Value, typename... Args>
+		table create(Name&& name, int narr, int nrec, Key&& key, Value&& value, Args&&... args) {
+			table x = create(base_t::lua_state(), narr, nrec, std::forward<Key>(key), std::forward<Value>(value), std::forward<Args>(args)...);
+			this->set(std::forward<Name>(name), x);
+			return x;
+		}
+
+		template <typename... Args>
+		table create_with(Args&&... args) {
+			return create_with(base_t::lua_state(), std::forward<Args>(args)...);
+		}
+
+		template <typename Name, typename... Args>
+		table create_named(Name&& name, Args&&... args) {
+			static const int narr = static_cast<int>(meta::count_even_for_pack_v<std::is_integral, Args...>);
+			return create(std::forward<Name>(name), narr, (sizeof...(Args) / 2) - narr, std::forward<Args>(args)...);
+		}
+	};
+} // namespace sol
+
+// end of sol/table_core.hpp
+
+namespace sol {
+
+	template <typename base_type>
+	class basic_metatable : public basic_table<base_type> {
+		typedef basic_table<base_type> base_t;
+		friend class state;
+		friend class state_view;
+
+	protected:
+		basic_metatable(detail::no_safety_tag, lua_nil_t n) : base_t(n) {
+		}
+		basic_metatable(detail::no_safety_tag, lua_State* L, int index) : base_t(L, index) {
+		}
+		basic_metatable(detail::no_safety_tag, lua_State* L, ref_index index) : base_t(L, index) {
+		}
+		template <typename T,
+		     meta::enable<meta::neg<meta::any_same<meta::unqualified_t<T>, basic_metatable>>, meta::neg<std::is_same<base_type, stack_reference>>,
+		          meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_metatable(detail::no_safety_tag, T&& r) noexcept : base_t(std::forward<T>(r)) {
+		}
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_metatable(detail::no_safety_tag, lua_State* L, T&& r) noexcept : base_t(L, std::forward<T>(r)) {
+		}
+
+		template <typename R, typename... Args, typename Fx, typename Key, typename = std::invoke_result_t<Fx, Args...>>
+		void set_fx(types<R(Args...)>, Key&& key, Fx&& fx) {
+			set_resolved_function<R(Args...)>(std::forward<Key>(key), std::forward<Fx>(fx));
+		}
+
+		template <typename Fx, typename Key, meta::enable<meta::is_specialization_of<meta::unqualified_t<Fx>, overload_set>> = meta::enabler>
+		void set_fx(types<>, Key&& key, Fx&& fx) {
+			set(std::forward<Key>(key), std::forward<Fx>(fx));
+		}
+
+		template <typename Fx, typename Key, typename... Args,
+		     meta::disable<meta::is_specialization_of<meta::unqualified_t<Fx>, overload_set>> = meta::enabler>
+		void set_fx(types<>, Key&& key, Fx&& fx, Args&&... args) {
+			set(std::forward<Key>(key), as_function_reference(std::forward<Fx>(fx), std::forward<Args>(args)...));
+		}
+
+		template <typename... Sig, typename... Args, typename Key>
+		void set_resolved_function(Key&& key, Args&&... args) {
+			set(std::forward<Key>(key), as_function_reference<function_sig<Sig...>>(std::forward<Args>(args)...));
+		}
+
+	public:
+		using base_t::lua_state;
+
+		basic_metatable() noexcept = default;
+		basic_metatable(const basic_metatable&) = default;
+		basic_metatable(basic_metatable&&) = default;
+		basic_metatable& operator=(const basic_metatable&) = default;
+		basic_metatable& operator=(basic_metatable&&) = default;
+		basic_metatable(const stack_reference& r) : basic_metatable(r.lua_state(), r.stack_index()) {
+		}
+		basic_metatable(stack_reference&& r) : basic_metatable(r.lua_state(), r.stack_index()) {
+		}
+		template <typename T, meta::enable_any<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_metatable(lua_State* L, T&& r) : base_t(L, std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_metatable>(lua_state(), -1, handler);
+#endif // Safety
+		}
+		basic_metatable(lua_State* L, int index = -1) : basic_metatable(detail::no_safety, L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			constructor_handler handler {};
+			stack::check<basic_metatable>(L, index, handler);
+#endif // Safety
+		}
+		basic_metatable(lua_State* L, ref_index index) : basic_metatable(detail::no_safety, L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_metatable>(lua_state(), -1, handler);
+#endif // Safety
+		}
+		template <typename T,
+		     meta::enable<meta::neg<meta::any_same<meta::unqualified_t<T>, basic_metatable>>, meta::neg<std::is_same<base_type, stack_reference>>,
+		          meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_metatable(T&& r) noexcept : basic_metatable(detail::no_safety, std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			if (!is_table<meta::unqualified_t<T>>::value) {
+				auto pp = stack::push_pop(*this);
+				constructor_handler handler {};
+				stack::check<basic_metatable>(base_t::lua_state(), -1, handler);
+			}
+#endif // Safety
+		}
+		basic_metatable(lua_nil_t r) noexcept : basic_metatable(detail::no_safety, r) {
+		}
+
+		template <typename Key, typename Value>
+		basic_metatable<base_type>& set(Key&& key, Value&& value);
+
+		template <typename Sig, typename Key, typename... Args>
+		basic_metatable& set_function(Key&& key, Args&&... args) {
+			set_fx(types<Sig>(), std::forward<Key>(key), std::forward<Args>(args)...);
+			return *this;
+		}
+
+		template <typename Key, typename... Args>
+		basic_metatable& set_function(Key&& key, Args&&... args) {
+			set_fx(types<>(), std::forward<Key>(key), std::forward<Args>(args)...);
+			return *this;
+		}
+
+		void unregister() {
+			using ustorage_base = u_detail::usertype_storage_base;
+
+			lua_State* L = this->lua_state();
+
+			auto pp = stack::push_pop(*this);
+			int top = lua_gettop(L);
+
+			stack_reference mt(L, -1);
+			stack::get_field(L, meta_function::gc_names, mt.stack_index());
+			if (type_of(L, -1) != type::table) {
+				lua_settop(L, top);
+				return;
+			}
+			stack_reference gc_names_table(L, -1);
+			stack::get_field(L, meta_function::storage, mt.stack_index());
+			if (type_of(L, -1) != type::lightuserdata) {
+				lua_settop(L, top);
+				return;
+			}
+			ustorage_base& base_storage = *static_cast<ustorage_base*>(stack::get<void*>(L, -1));
+			std::array<string_view, 6> registry_traits;
+			for (std::size_t i = 0; i < registry_traits.size(); ++i) {
+				u_detail::submetatable_type smt = static_cast<u_detail::submetatable_type>(i);
+				stack::get_field<false, true>(L, smt, gc_names_table.stack_index());
+				registry_traits[i] = stack::get<string_view>(L, -1);
+			}
+
+			// get the registry
+			stack_reference registry(L, raw_index(LUA_REGISTRYINDEX));
+			registry.push();
+			// eliminate all named entries for this usertype
+			// in the registry (luaL_newmetatable does
+			// [name] = new table
+			// in registry upon creation)
+			for (std::size_t i = 0; i < registry_traits.size(); ++i) {
+				u_detail::submetatable_type smt = static_cast<u_detail::submetatable_type>(i);
+				const string_view& gcmetakey = registry_traits[i];
+				if (smt == u_detail::submetatable_type::named) {
+					// use .data() to make it treat it like a c string,
+					// which it is...
+					stack::set_field<true>(L, gcmetakey.data(), lua_nil);
+				}
+				else {
+					// do not change the values in the registry: they need to be present
+					// no matter what, for safety's sake
+					// stack::set_field(L, gcmetakey, lua_nil, registry.stack_index());
+				}
+			}
+
+			// destroy all storage and tables
+			base_storage.clear();
+
+			// 6 strings from gc_names table,
+			// + 1 registry,
+			// + 1 gc_names table
+			// + 1 light userdata of storage
+			// + 1 registry
+			// 10 total, 4 left since popping off 6 gc_names tables
+			lua_settop(L, top);
+		}
+	};
+
+} // namespace sol
+
+// end of sol/metatable.hpp
+
+namespace sol {
+
+	template <typename T, typename base_type>
+	class basic_usertype : private basic_metatable<base_type> {
+	private:
+		using base_t = basic_metatable<base_type>;
+		using table_base_t = basic_table<base_type>;
+
+		template <typename>
+		friend class basic_metatable;
+
+		template <bool, typename>
+		friend class basic_table_core;
+
+		template <std::size_t... I, typename... Args>
+		void tuple_set(std::index_sequence<I...>, std::tuple<Args...>&& args) {
+			(void)args;
+			(void)detail::swallow { 0, (this->set(std::get<I * 2>(std::move(args)), std::get<I * 2 + 1>(std::move(args))), 0)... };
+		}
+
+		template <typename R, typename... Args, typename Fx, typename Key, typename = std::invoke_result_t<Fx, Args...>>
+		void set_fx(types<R(Args...)>, Key&& key, Fx&& fx) {
+			set_resolved_function<R(Args...)>(std::forward<Key>(key), std::forward<Fx>(fx));
+		}
+
+		template <typename Fx, typename Key, meta::enable<meta::is_specialization_of<meta::unqualified_t<Fx>, overload_set>> = meta::enabler>
+		void set_fx(types<>, Key&& key, Fx&& fx) {
+			set(std::forward<Key>(key), std::forward<Fx>(fx));
+		}
+
+		template <typename Fx, typename Key, typename... Args,
+		     meta::disable<meta::is_specialization_of<meta::unqualified_t<Fx>, overload_set>> = meta::enabler>
+		void set_fx(types<>, Key&& key, Fx&& fx, Args&&... args) {
+			set(std::forward<Key>(key), as_function_reference(std::forward<Fx>(fx), std::forward<Args>(args)...));
+		}
+
+		template <typename... Sig, typename... Args, typename Key>
+		void set_resolved_function(Key&& key, Args&&... args) {
+			set(std::forward<Key>(key), as_function_reference<function_sig<Sig...>>(std::forward<Args>(args)...));
+		}
+
+	public:
+		using base_t::base_t;
+
+		using base_t::get;
+		using base_t::lua_state;
+		using base_t::pop;
+		using base_t::push;
+		using base_t::traverse_get;
+		using base_t::traverse_set;
+		using base_t::unregister;
+
+		template <typename Key, typename Value>
+		basic_usertype& set(Key&& key, Value&& value) {
+			optional<u_detail::usertype_storage<T>&> maybe_uts = u_detail::maybe_get_usertype_storage<T>(this->lua_state());
+			if (maybe_uts) {
+				u_detail::usertype_storage<T>& uts = *maybe_uts;
+				uts.set(this->lua_state(), std::forward<Key>(key), std::forward<Value>(value));
+			}
+			else {
+				using ValueU = meta::unqualified_t<Value>;
+				// cannot get metatable: try regular table set?
+				if constexpr (detail::is_non_factory_constructor_v<ValueU> || detail::is_policy_v<ValueU>) {
+					// tag constructors so we don't get destroyed by lack of info
+					table_base_t::set(std::forward<Key>(key), detail::tagged<T, Value>(std::forward<Value>(value)));
+				}
+				else {
+					table_base_t::set(std::forward<Key>(key), std::forward<Value>(value));
+				}
+			}
+			return *this;
+		}
+
+		template <typename Sig, typename Key, typename... Args>
+		basic_usertype& set_function(Key&& key, Args&&... args) {
+			set_fx(types<Sig>(), std::forward<Key>(key), std::forward<Args>(args)...);
+			return *this;
+		}
+
+		template <typename Key, typename... Args>
+		basic_usertype& set_function(Key&& key, Args&&... args) {
+			set_fx(types<>(), std::forward<Key>(key), std::forward<Args>(args)...);
+			return *this;
+		}
+
+		template <typename Key>
+		usertype_proxy<basic_usertype&, std::decay_t<Key>> operator[](Key&& key) {
+			return usertype_proxy<basic_usertype&, std::decay_t<Key>>(*this, std::forward<Key>(key));
+		}
+
+		template <typename Key>
+		usertype_proxy<const basic_usertype&, std::decay_t<Key>> operator[](Key&& key) const {
+			return usertype_proxy<const basic_usertype&, std::decay_t<Key>>(*this, std::forward<Key>(key));
+		}
+	};
+
+} // namespace sol
+
+// end of sol/usertype.hpp
+
+// beginning of sol/table.hpp
+
+// beginning of sol/lua_table.hpp
+
+namespace sol {
+
+	template <typename ref_t>
+	struct basic_lua_table : basic_table_core<false, ref_t> {
+	private:
+		using base_t = basic_table_core<false, ref_t>;
+
+		friend class state;
+		friend class state_view;
+
+	public:
+		using base_t::lua_state;
+
+		basic_lua_table() noexcept = default;
+		basic_lua_table(const basic_lua_table&) = default;
+		basic_lua_table(basic_lua_table&&) = default;
+		basic_lua_table& operator=(const basic_lua_table&) = default;
+		basic_lua_table& operator=(basic_lua_table&&) = default;
+		basic_lua_table(const stack_reference& r) : basic_lua_table(r.lua_state(), r.stack_index()) {
+		}
+		basic_lua_table(stack_reference&& r) : basic_lua_table(r.lua_state(), r.stack_index()) {
+		}
+		template <typename T, meta::enable_any<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_lua_table(lua_State* L, T&& r) : base_t(L, std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_lua_table>(lua_state(), -1, handler);
+#endif // Safety
+		}
+		basic_lua_table(lua_State* L, const new_table& nt) : base_t(L, nt) {
+			if (!is_stack_based<meta::unqualified_t<ref_t>>::value) {
+				lua_pop(L, 1);
+			}
+		}
+		basic_lua_table(lua_State* L, int index = -1) : base_t(detail::no_safety, L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			constructor_handler handler {};
+			stack::check<basic_lua_table>(L, index, handler);
+#endif // Safety
+		}
+		basic_lua_table(lua_State* L, ref_index index) : base_t(detail::no_safety, L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_lua_table>(lua_state(), -1, handler);
+#endif // Safety
+		}
+		template <typename T,
+		     meta::enable<meta::neg<meta::any_same<meta::unqualified_t<T>, basic_lua_table>>, meta::neg<std::is_same<ref_t, stack_reference>>,
+		          meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_lua_table(T&& r) noexcept : basic_lua_table(detail::no_safety, std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			if (!is_table<meta::unqualified_t<T>>::value) {
+				auto pp = stack::push_pop(*this);
+				constructor_handler handler {};
+				stack::check<basic_lua_table>(lua_state(), -1, handler);
+			}
+#endif // Safety
+		}
+		basic_lua_table(lua_nil_t r) noexcept : basic_lua_table(detail::no_safety, r) {
+		}
+	};
+
+} // namespace sol
+
+// end of sol/lua_table.hpp
+
+namespace sol {
+	typedef table_core<false> table;
+
+	template <bool is_global, typename base_type>
+	template <typename Class, typename Key>
+	usertype<Class> basic_table_core<is_global, base_type>::new_usertype(Key&& key) {
+		constant_automagic_enrollments<> enrollments {};
+		return this->new_usertype<Class>(std::forward<Key>(key), std::move(enrollments));
+	}
+
+	template <bool is_global, typename base_type>
+	template <typename Class, typename Key, automagic_flags enrollment_flags>
+	usertype<Class> basic_table_core<is_global, base_type>::new_usertype(Key&& key, constant_automagic_enrollments<enrollment_flags> enrollments) {
+		int mt_index = u_detail::register_usertype<Class, enrollment_flags>(this->lua_state(), std::move(enrollments));
+		usertype<Class> mt(this->lua_state(), -mt_index);
+		lua_pop(this->lua_state(), 1);
+		set(std::forward<Key>(key), mt);
+		return mt;
+	}
+
+	template <bool is_global, typename base_type>
+	template <typename Class, typename Key>
+	usertype<Class> basic_table_core<is_global, base_type>::new_usertype(Key&& key, automagic_enrollments enrollments) {
+		int mt_index = u_detail::register_usertype<Class, automagic_flags::all>(this->lua_state(), std::move(enrollments));
+		usertype<Class> mt(this->lua_state(), -mt_index);
+		lua_pop(this->lua_state(), 1);
+		set(std::forward<Key>(key), mt);
+		return mt;
+	}
+
+	template <bool is_global, typename base_type>
+	template <typename Class, typename Key, typename Arg, typename... Args, typename>
+	usertype<Class> basic_table_core<is_global, base_type>::new_usertype(Key&& key, Arg&& arg, Args&&... args) {
+		constexpr automagic_flags enrollment_flags = meta::any_same_v<no_construction, meta::unqualified_t<Arg>, meta::unqualified_t<Args>...>
+		     ? clear_flags(automagic_flags::all, automagic_flags::default_constructor)
+		     : automagic_flags::all;
+		constant_automagic_enrollments<enrollment_flags> enrollments;
+		enrollments.default_constructor = !detail::any_is_constructor_v<Arg, Args...>;
+		enrollments.destructor = !detail::any_is_destructor_v<Arg, Args...>;
+		usertype<Class> ut = this->new_usertype<Class>(std::forward<Key>(key), std::move(enrollments));
+		static_assert(sizeof...(Args) % 2 == static_cast<std::size_t>(!detail::any_is_constructor_v<Arg>),
+		     "you must pass an even number of arguments to new_usertype after first passing a constructor");
+		if constexpr (detail::any_is_constructor_v<Arg>) {
+			ut.set(meta_function::construct, std::forward<Arg>(arg));
+			ut.tuple_set(std::make_index_sequence<(sizeof...(Args)) / 2>(), std::forward_as_tuple(std::forward<Args>(args)...));
+		}
+		else {
+			ut.tuple_set(std::make_index_sequence<(sizeof...(Args) + 1) / 2>(), std::forward_as_tuple(std::forward<Arg>(arg), std::forward<Args>(args)...));
+		}
+		return ut;
+	}
+
+	template <typename base_type>
+	template <typename Key, typename Value>
+	basic_metatable<base_type>& basic_metatable<base_type>::set(Key&& key, Value&& value) {
+		this->push();
+		lua_State* L = this->lua_state();
+		int target = lua_gettop(L);
+		optional<u_detail::usertype_storage_base&> maybe_uts = nullopt;
+		maybe_uts = u_detail::maybe_get_usertype_storage_base(L, target);
+		if (maybe_uts) {
+			u_detail::usertype_storage_base& uts = *maybe_uts;
+			uts.set(L, std::forward<Key>(key), std::forward<Value>(value));
+			return *this;
+		}
+		else {
+			base_t::set(std::forward<Key>(key), std::forward<Value>(value));
+		}
+		this->pop();
+		return *this;
+	}
+
+	namespace stack {
+		template <>
+		struct unqualified_getter<metatable_key_t> {
+			static metatable get(lua_State* L, int index = -1) {
+				if (lua_getmetatable(L, index) == 0) {
+					return metatable(L, ref_index(LUA_REFNIL));
+				}
+				return metatable(L, -1);
+			}
+		};
+	} // namespace stack
+} // namespace sol
+
+// end of sol/table.hpp
+
+// beginning of sol/state.hpp
+
+// beginning of sol/state_view.hpp
+
+// beginning of sol/environment.hpp
+
+namespace sol {
+
+	template <typename base_type>
+	struct basic_environment : basic_table<base_type> {
+	private:
+		typedef basic_table<base_type> base_t;
+
+	public:
+		using base_t::lua_state;
+
+		basic_environment() noexcept = default;
+		basic_environment(const basic_environment&) = default;
+		basic_environment(basic_environment&&) = default;
+		basic_environment& operator=(const basic_environment&) = default;
+		basic_environment& operator=(basic_environment&&) = default;
+		basic_environment(const stack_reference& r) : basic_environment(r.lua_state(), r.stack_index()) {
+		}
+		basic_environment(stack_reference&& r) : basic_environment(r.lua_state(), r.stack_index()) {
+		}
+
+		basic_environment(lua_State* L, new_table nt) : base_t(L, std::move(nt)) {
+		}
+		template <bool b>
+		basic_environment(lua_State* L, new_table t, const basic_reference<b>& fallback) : basic_environment(L, std::move(t)) {
+			stack_table mt(L, new_table(0, 1));
+			mt.set(meta_function::index, fallback);
+			this->set(metatable_key, mt);
+			mt.pop();
+		}
+
+		basic_environment(env_key_t, const stack_reference& extraction_target)
+		: base_t(detail::no_safety, extraction_target.lua_state(), (stack::push_environment_of(extraction_target), -1)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			constructor_handler handler {};
+			stack::check<env_key_t>(this->lua_state(), -1, handler);
+#endif // Safety
+			lua_pop(this->lua_state(), 1);
+		}
+		template <bool b>
+		basic_environment(env_key_t, const basic_reference<b>& extraction_target)
+		: base_t(detail::no_safety, extraction_target.lua_state(), (stack::push_environment_of(extraction_target), -1)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			constructor_handler handler {};
+			stack::check<env_key_t>(this->lua_state(), -1, handler);
+#endif // Safety
+			lua_pop(this->lua_state(), 1);
+		}
+		basic_environment(lua_State* L, int index = -1) : base_t(detail::no_safety, L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			constructor_handler handler {};
+			stack::check<basic_environment>(L, index, handler);
+#endif // Safety
+		}
+		basic_environment(lua_State* L, ref_index index) : base_t(detail::no_safety, L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_environment>(L, -1, handler);
+#endif // Safety
+		}
+		template <typename T,
+		     meta::enable<meta::neg<meta::any_same<meta::unqualified_t<T>, basic_environment>>, meta::neg<std::is_same<base_type, stack_reference>>,
+		          meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_environment(T&& r) noexcept : base_t(detail::no_safety, std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			if (!is_environment<meta::unqualified_t<T>>::value) {
+				auto pp = stack::push_pop(*this);
+				constructor_handler handler {};
+				stack::check<basic_environment>(lua_state(), -1, handler);
+			}
+#endif // Safety
+		}
+		basic_environment(lua_nil_t r) noexcept : base_t(detail::no_safety, r) {
+		}
+
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_environment(lua_State* L, T&& r) noexcept : base_t(detail::no_safety, L, std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			if (!is_environment<meta::unqualified_t<T>>::value) {
+				auto pp = stack::push_pop(*this);
+				constructor_handler handler {};
+				stack::check<basic_environment>(lua_state(), -1, handler);
+			}
+#endif // Safety
+		}
+
+		template <typename T>
+		bool set_on(const T& target) const {
+			lua_State* L = target.lua_state();
+			auto pp = stack::push_pop(target);
+			int target_index = pp.index_of(target);
+#if SOL_LUA_VERSION_I_ < 502
+			// Use lua_setfenv
+			this->push();
+			int success_result = lua_setfenv(L, target_index);
+			return success_result != 0;
+#else
+			// If this is a C function, the environment is always placed in
+			// the first value, as is expected of sol2 (all upvalues have an empty name, "")
+			if (lua_iscfunction(L, target_index) != 0) {
+				const char* maybe_upvalue_name = lua_getupvalue(L, target_index, 1);
+				if (maybe_upvalue_name == nullptr) {
+					return false;
+				}
+				string_view upvalue_name(maybe_upvalue_name);
+				if (upvalue_name == "") {
+					this->push();
+					const char* success = lua_setupvalue(L, target_index, 1);
+					if (success == nullptr) {
+						// left things alone on the stack, pop them off
+						lua_pop(L, 2);
+						return false;
+					}
+					lua_pop(L, 1);
+					return true;
+				}
+				lua_pop(L, 1);
+				return false;
+			}
+			else {
+				// Must search for the right upvalue target on index
+				for (int upvalue_index = 1;; ++upvalue_index) {
+					const char* maybe_upvalue_name = lua_getupvalue(L, target_index, upvalue_index);
+					if (maybe_upvalue_name == nullptr) {
+						break;
+					}
+					string_view upvalue_name(maybe_upvalue_name);
+					if (upvalue_name == "_ENV") {
+						lua_pop(L, 1);
+						this->push();
+						const char* success = lua_setupvalue(L, target_index, upvalue_index);
+						if (success == nullptr) {
+							// left things alone on the stack, pop them off
+							lua_pop(L, 1);
+							break;
+						}
+						// whether or not we succeeded, we found _ENV
+						// so we need to break
+						return true;
+					}
+					lua_pop(L, 1);
+				}
+				// if we get here,
+				// we did not find an _ENV here...
+				return false;
+			}
+#endif
+		}
+	};
+
+	template <typename T, typename E>
+	bool set_environment(const basic_environment<E>& env, const T& target) {
+		return env.set_on(target);
+	}
+
+	template <typename E = reference, typename T>
+	basic_environment<E> get_environment(const T& target) {
+		lua_State* L = target.lua_state();
+		auto pp = stack::pop_n(L, stack::push_environment_of(target));
+		return basic_environment<E>(L, -1);
+	}
+
+	struct this_environment {
+		optional<environment> env;
+
+		this_environment() : env(nullopt) {
+		}
+		this_environment(environment e) : env(std::move(e)) {
+		}
+		this_environment(const this_environment&) = default;
+		this_environment(this_environment&&) = default;
+		this_environment& operator=(const this_environment&) = default;
+		this_environment& operator=(this_environment&&) = default;
+
+		explicit operator bool() const {
+			return static_cast<bool>(env);
+		}
+
+		operator optional<environment>&() {
+			return env;
+		}
+
+		operator const optional<environment>&() const {
+			return env;
+		}
+
+		operator environment&() {
+			return env.value();
+		}
+
+		operator const environment&() const {
+			return env.value();
+		}
+	};
+
+	namespace stack {
+		template <>
+		struct unqualified_getter<env_key_t> {
+			static environment get(lua_State* L, int index, record& tracking) {
+				tracking.use(1);
+				return get_environment(stack_reference(L, raw_index(index)));
+			}
+		};
+
+		template <>
+		struct unqualified_getter<this_environment> {
+			static this_environment get(lua_State* L, int, record& tracking) {
+				tracking.use(0);
+				lua_Debug info;
+				// Level 0 means current function (this C function, which may or may not be useful for us?)
+				// Level 1 means next call frame up the stack. (Can be nothing if function called directly from C++ with lua_p/call)
+				int pre_stack_size = lua_gettop(L);
+				if (lua_getstack(L, 1, &info) != 1) {
+					if (lua_getstack(L, 0, &info) != 1) {
+						lua_settop(L, pre_stack_size);
+						return this_environment();
+					}
+				}
+				if (lua_getinfo(L, "f", &info) == 0) {
+					lua_settop(L, pre_stack_size);
+					return this_environment();
+				}
+
+				stack_reference f(L, -1);
+				environment env(env_key, f);
+				if (!env.valid()) {
+					lua_settop(L, pre_stack_size);
+					return this_environment();
+				}
+				return this_environment(std::move(env));
+			}
+		};
+	} // namespace stack
+} // namespace sol
+
+// end of sol/environment.hpp
+
+// beginning of sol/load_result.hpp
+
+#include <cstdint>
+
+namespace sol {
+	struct load_result : public proxy_base<load_result> {
+	private:
+		lua_State* L;
+		int index;
+		int returncount;
+		int popcount;
+		load_status err;
+
+	public:
+		load_result() noexcept : load_result(nullptr) {}
+		load_result(lua_State* Ls, int stackindex = -1, int retnum = 0, int popnum = 0, load_status lerr = load_status::ok) noexcept
+		: L(Ls), index(stackindex), returncount(retnum), popcount(popnum), err(lerr) {
+		}
+
+		// We do not want anyone to copy these around willy-nilly
+		// Will likely break people, but also will probably get rid of quiet bugs that have
+		// been lurking. (E.g., Vanilla Lua will just quietly discard over-pops and under-pops:
+		// LuaJIT and other Lua engines will implode and segfault at random later times.)
+		load_result(const load_result&) = delete;
+		load_result& operator=(const load_result&) = delete;
+
+		load_result(load_result&& o) noexcept : L(o.L), index(o.index), returncount(o.returncount), popcount(o.popcount), err(o.err) {
+			// Must be manual, otherwise destructor will screw us
+			// return count being 0 is enough to keep things clean
+			// but we will be thorough
+			o.L = nullptr;
+			o.index = 0;
+			o.returncount = 0;
+			o.popcount = 0;
+			o.err = load_status::syntax;
+		}
+		load_result& operator=(load_result&& o) noexcept {
+			L = o.L;
+			index = o.index;
+			returncount = o.returncount;
+			popcount = o.popcount;
+			err = o.err;
+			// Must be manual, otherwise destructor will screw us
+			// return count being 0 is enough to keep things clean
+			// but we will be thorough
+			o.L = nullptr;
+			o.index = 0;
+			o.returncount = 0;
+			o.popcount = 0;
+			o.err = load_status::syntax;
+			return *this;
+		}
+
+		load_status status() const noexcept {
+			return err;
+		}
+
+		bool valid() const noexcept {
+			return status() == load_status::ok;
+		}
+
+		template <typename T>
+		T get() const {
+			using UT = meta::unqualified_t<T>;
+			if constexpr (meta::is_optional_v<UT>) {
+				using ValueType = typename UT::value_type;
+				if constexpr (std::is_same_v<ValueType, error>) {
+					if (valid()) {
+						return UT(nullopt);
+					}
+					return error(detail::direct_error, stack::get<std::string>(L, index));
+				}
+				else {
+					if (!valid()) {
+						return UT(nullopt);
+					}
+					return stack::get<UT>(L, index);
+				}
+			}
+			else {
+				if constexpr (std::is_same_v<T, error>) {
+#if SOL_IS_ON(SOL_SAFE_PROXIES)
+					if (valid()) {
+						type_panic_c_str(L, index, type_of(L, index), type::none, "expecting an error type (a string, from Lua)");
+					}
+#endif // Check proxy type's safety
+					return error(detail::direct_error, stack::get<std::string>(L, index));
+				}
+				else {
+#if SOL_IS_ON(SOL_SAFE_PROXIES)
+					if (!valid()) {
+						type_panic_c_str(L, index, type_of(L, index), type::none);
+					}
+#endif // Check proxy type's safety
+					return stack::get<T>(L, index);
+				}
+			}
+		}
+
+		template <typename... Ret, typename... Args>
+		decltype(auto) call(Args&&... args) {
+			return get<protected_function>().template call<Ret...>(std::forward<Args>(args)...);
+		}
+
+		template <typename... Args>
+		decltype(auto) operator()(Args&&... args) {
+			return call<>(std::forward<Args>(args)...);
+		}
+
+		lua_State* lua_state() const noexcept {
+			return L;
+		};
+		int stack_index() const noexcept {
+			return index;
+		};
+
+		~load_result() {
+			if (L != nullptr) {
+				stack::remove(L, index, popcount);
+			}
+		}
+	};
+} // namespace sol
+
+// end of sol/load_result.hpp
+
+// beginning of sol/state_handling.hpp
+
+// beginning of sol/lua_value.hpp
+
+namespace sol {
+	struct lua_value {
+	public:
+		struct arr : detail::ebco<std::initializer_list<lua_value>> {
+		private:
+			using base_t = detail::ebco<std::initializer_list<lua_value>>;
+
+		public:
+			using base_t::base_t;
+		};
+
+	private:
+		template <typename T>
+		using is_reference_or_lua_value_init_list
+		     = meta::any<meta::is_specialization_of<T, std::initializer_list>, std::is_same<T, reference>, std::is_same<T, arr>>;
+
+		template <typename T>
+		using is_lua_value_single_constructible = meta::any<std::is_same<T, lua_value>, is_reference_or_lua_value_init_list<T>>;
+
+		static lua_State*& thread_local_lua_state() {
+#if SOL_IS_ON(SOL_USE_THREAD_LOCAL)
+			static thread_local lua_State* L = nullptr;
+#else
+			static lua_State* L = nullptr;
+#endif
+			return L;
+		}
+
+		reference ref_value;
+
+	public:
+		static void set_lua_state(lua_State* L) {
+			thread_local_lua_state() = L;
+		}
+
+		template <typename T, meta::disable<is_reference_or_lua_value_init_list<meta::unqualified_t<T>>> = meta::enabler>
+		lua_value(lua_State* L_, T&& value) : lua_value(((set_lua_state(L_)), std::forward<T>(value))) {
+		}
+
+		template <typename T, meta::disable<is_lua_value_single_constructible<meta::unqualified_t<T>>> = meta::enabler>
+		lua_value(T&& value) : ref_value(make_reference(thread_local_lua_state(), std::forward<T>(value))) {
+		}
+
+		lua_value(lua_State* L_, std::initializer_list<std::pair<lua_value, lua_value>> il)
+		: lua_value([&L_, &il]() {
+			set_lua_state(L_);
+			return std::move(il);
+		}()) {
+		}
+
+		lua_value(std::initializer_list<std::pair<lua_value, lua_value>> il) : ref_value(make_reference(thread_local_lua_state(), std::move(il))) {
+		}
+
+		lua_value(lua_State* L_, arr il)
+		: lua_value([&L_, &il]() {
+			set_lua_state(L_);
+			return std::move(il);
+		}()) {
+		}
+
+		lua_value(arr il) : ref_value(make_reference(thread_local_lua_state(), std::move(il.value()))) {
+		}
+
+		lua_value(lua_State* L_, reference r)
+		: lua_value([&L_, &r]() {
+			set_lua_state(L_);
+			return std::move(r);
+		}()) {
+		}
+
+		lua_value(reference r) : ref_value(std::move(r)) {
+		}
+
+		lua_value(const lua_value&) noexcept = default;
+		lua_value(lua_value&&) = default;
+		lua_value& operator=(const lua_value&) = default;
+		lua_value& operator=(lua_value&&) = default;
+
+		const reference& value() const& {
+			return ref_value;
+		}
+
+		reference& value() & {
+			return ref_value;
+		}
+
+		reference&& value() && {
+			return std::move(ref_value);
+		}
+
+		template <typename T>
+		decltype(auto) as() const {
+			ref_value.push();
+			return stack::pop<T>(ref_value.lua_state());
+		}
+
+		template <typename T>
+		bool is() const {
+			int r = ref_value.registry_index();
+			if (r == LUA_REFNIL)
+				return meta::any_same<meta::unqualified_t<T>, lua_nil_t, nullopt_t, std::nullptr_t>::value ? true : false;
+			if (r == LUA_NOREF)
+				return false;
+			auto pp = stack::push_pop(ref_value);
+			return stack::check<T>(ref_value.lua_state(), -1, &no_panic);
+		}
+	};
+
+	using array_value = typename lua_value::arr;
+
+	namespace stack {
+		template <>
+		struct unqualified_pusher<lua_value> {
+			static int push(lua_State* L, const lua_value& lv) {
+				return stack::push(L, lv.value());
+			}
+
+			static int push(lua_State* L, lua_value&& lv) {
+				return stack::push(L, std::move(lv).value());
+			}
+		};
+
+		template <>
+		struct unqualified_getter<lua_value> {
+			static lua_value get(lua_State* L, int index, record& tracking) {
+				return lua_value(L, stack::get<reference>(L, index, tracking));
+			}
+		};
+	} // namespace stack
+} // namespace sol
+
+// end of sol/lua_value.hpp
+
+#if SOL_IS_ON(SOL_PRINT_ERRORS)
+#include <iostream>
+#endif
+
+namespace sol {
+	inline void register_main_thread(lua_State* L) {
+#if SOL_LUA_VERSION_I_ < 502
+		if (L == nullptr) {
+			lua_pushnil(L);
+			lua_setglobal(L, detail::default_main_thread_name());
+			return;
+		}
+		lua_pushthread(L);
+		lua_setglobal(L, detail::default_main_thread_name());
+#else
+		(void)L;
+#endif
+	}
+
+	inline int default_at_panic(lua_State* L) {
+#if SOL_IS_OFF(SOL_EXCEPTIONS)
+		(void)L;
+		return -1;
+#else
+		size_t messagesize;
+		const char* message = lua_tolstring(L, -1, &messagesize);
+		if (message) {
+			std::string err(message, messagesize);
+			lua_settop(L, 0);
+#if SOL_IS_ON(SOL_PRINT_ERRORS)
+			std::cerr << "[sol2] An error occurred and panic has been invoked: ";
+			std::cerr << err;
+			std::cerr << std::endl;
+#endif
+			throw error(err);
+		}
+		lua_settop(L, 0);
+		throw error(std::string("An unexpected error occurred and panic has been invoked"));
+#endif // Printing Errors
+	}
+
+	inline int default_traceback_error_handler(lua_State* L) {
+		std::string msg = "An unknown error has triggered the default error handler";
+		optional<string_view> maybetopmsg = stack::unqualified_check_get<string_view>(L, 1, &no_panic);
+		if (maybetopmsg) {
+			const string_view& topmsg = maybetopmsg.value();
+			msg.assign(topmsg.data(), topmsg.size());
+		}
+		luaL_traceback(L, L, msg.c_str(), 1);
+		optional<string_view> maybetraceback = stack::unqualified_check_get<string_view>(L, -1, &no_panic);
+		if (maybetraceback) {
+			const string_view& traceback = maybetraceback.value();
+			msg.assign(traceback.data(), traceback.size());
+		}
+#if SOL_IS_ON(SOL_PRINT_ERRORS)
+		// std::cerr << "[sol2] An error occurred and was caught in traceback: ";
+		// std::cerr << msg;
+		// std::cerr << std::endl;
+#endif // Printing
+		return stack::push(L, msg);
+	}
+
+	inline void set_default_state(lua_State* L, lua_CFunction panic_function = &default_at_panic,
+	     lua_CFunction traceback_function = c_call<decltype(&default_traceback_error_handler), &default_traceback_error_handler>,
+	     exception_handler_function exf = detail::default_exception_handler) {
+		lua_atpanic(L, panic_function);
+		protected_function::set_default_handler(object(L, in_place, traceback_function));
+		set_default_exception_handler(L, exf);
+		register_main_thread(L);
+		stack::luajit_exception_handler(L);
+		lua_value::set_lua_state(L);
+	}
+
+	inline std::size_t total_memory_used(lua_State* L) {
+		std::size_t kb = static_cast<std::size_t>(lua_gc(L, LUA_GCCOUNT, 0));
+		kb *= 1024;
+		kb += static_cast<std::size_t>(lua_gc(L, LUA_GCCOUNTB, 0));
+		return kb;
+	}
+
+	inline protected_function_result script_pass_on_error(lua_State*, protected_function_result result) {
+		return result;
+	}
+
+	inline protected_function_result script_throw_on_error(lua_State* L, protected_function_result result) {
+		type t = type_of(L, result.stack_index());
+		std::string err = "sol: ";
+		err += to_string(result.status());
+		err += " error";
+#if SOL_IS_ON(SOL_EXCEPTIONS)
+		std::exception_ptr eptr = std::current_exception();
+		if (eptr) {
+			err += " with a ";
+			try {
+				std::rethrow_exception(eptr);
+			}
+			catch (const std::exception& ex) {
+				err += "std::exception -- ";
+				err.append(ex.what());
+			}
+			catch (const std::string& message) {
+				err += "thrown message -- ";
+				err.append(message);
+			}
+			catch (const char* message) {
+				err += "thrown message -- ";
+				err.append(message);
+			}
+			catch (...) {
+				err.append("thrown but unknown type, cannot serialize into error message");
+			}
+		}
+#endif // serialize exception information if possible
+		if (t == type::string) {
+			err += ": ";
+			string_view serr = stack::unqualified_get<string_view>(L, result.stack_index());
+			err.append(serr.data(), serr.size());
+		}
+#if SOL_IS_ON(SOL_PRINT_ERRORS)
+		std::cerr << "[sol2] An error occurred and has been passed to an error handler: ";
+		std::cerr << err;
+		std::cerr << std::endl;
+#endif
+		// replacing information of stack error into pfr
+		int target = result.stack_index();
+		if (result.pop_count() > 0) {
+			stack::remove(L, target, result.pop_count());
+		}
+		stack::push(L, err);
+		int top = lua_gettop(L);
+		int towards = top - target;
+		if (towards != 0) {
+			lua_rotate(L, top, towards);
+		}
+#if SOL_IS_OFF(SOL_EXCEPTIONS)
+		return result;
+#else
+		// just throw our error
+		throw error(detail::direct_error, err);
+#endif // If exceptions are allowed
+	}
+
+	inline protected_function_result script_default_on_error(lua_State* L, protected_function_result pfr) {
+#if SOL_IS_ON(SOL_DEFAULT_PASS_ON_ERROR)
+		return script_pass_on_error(L, std::move(pfr));
+#else
+		return script_throw_on_error(L, std::move(pfr));
+#endif
+	}
+
+	namespace stack {
+		inline error get_traceback_or_errors(lua_State* L) {
+			int p = default_traceback_error_handler(L);
+			sol::error err = stack::get<sol::error>(L, -p);
+			lua_pop(L, p);
+			return err;
+		}
+	} // namespace stack
+} // namespace sol
+
+// end of sol/state_handling.hpp
+
+#include <memory>
+#include <cstddef>
+
+namespace sol {
+
+	class state_view {
+	private:
+		lua_State* L;
+		table reg;
+		global_table global;
+
+		optional<object> is_loaded_package(const std::string& key) {
+			auto loaded = reg.traverse_get<optional<object>>("_LOADED", key);
+			bool is53mod = loaded && !(loaded->is<bool>() && !loaded->as<bool>());
+			if (is53mod)
+				return loaded;
+#if SOL_LUA_VERSION_I_ <= 501
+			auto loaded51 = global.traverse_get<optional<object>>("package", "loaded", key);
+			bool is51mod = loaded51 && !(loaded51->is<bool>() && !loaded51->as<bool>());
+			if (is51mod)
+				return loaded51;
+#endif
+			return nullopt;
+		}
+
+		template <typename T>
+		void ensure_package(const std::string& key, T&& sr) {
+#if SOL_LUA_VERSION_I_ <= 501
+			auto pkg = global["package"];
+			if (!pkg.valid()) {
+				pkg = create_table_with("loaded", create_table_with(key, sr));
+			}
+			else {
+				auto ld = pkg["loaded"];
+				if (!ld.valid()) {
+					ld = create_table_with(key, sr);
+				}
+				else {
+					ld[key] = sr;
+				}
+			}
+#endif
+			auto loaded = reg["_LOADED"];
+			if (!loaded.valid()) {
+				loaded = create_table_with(key, sr);
+			}
+			else {
+				loaded[key] = sr;
+			}
+		}
+
+		template <typename Fx>
+		object require_core(const std::string& key, Fx&& action, bool create_global = true) {
+			optional<object> loaded = is_loaded_package(key);
+			if (loaded && loaded->valid())
+				return std::move(*loaded);
+			int before = lua_gettop(L);
+			action();
+			int after = lua_gettop(L);
+			if (before == after) {
+				// I mean, you were supposed to return
+				// something, ANYTHING, from your requires script. I guess I'll just
+				// but some trash in here, it's on you after that?
+				ensure_package(key, static_cast<void*>(L));
+				return object(L, lua_nil);
+			}
+			stack_reference sr(L, -1);
+			if (create_global)
+				set(key, sr);
+			ensure_package(key, sr);
+			return stack::pop<object>(L);
+		}
+
+	public:
+		using iterator = typename global_table::iterator;
+		using const_iterator = typename global_table::const_iterator;
+
+		state_view(lua_State* Ls) : L(Ls), reg(Ls, LUA_REGISTRYINDEX), global(Ls, global_tag) {
+		}
+
+		state_view(this_state Ls) : state_view(Ls.L) {
+		}
+
+		lua_State* lua_state() const {
+			return L;
+		}
+
+		template <typename... Args>
+		void open_libraries(Args&&... args) {
+			static_assert(meta::all_same<lib, meta::unqualified_t<Args>...>::value, "all types must be libraries");
+			if constexpr (sizeof...(args) == 0) {
+				luaL_openlibs(L);
+				return;
+			}
+			else {
+				lib libraries[1 + sizeof...(args)] = { lib::count, std::forward<Args>(args)... };
+
+				for (auto&& library : libraries) {
+					switch (library) {
+#if SOL_LUA_VERSION_I_ <= 501 && SOL_IS_ON(SOL_USE_LUAJIT)
+					case lib::coroutine:
+#endif // luajit opens coroutine base stuff
+					case lib::base:
+						luaL_requiref(L, "base", luaopen_base, 1);
+						lua_pop(L, 1);
+						break;
+					case lib::package:
+						luaL_requiref(L, "package", luaopen_package, 1);
+						lua_pop(L, 1);
+						break;
+#if SOL_IS_OFF(SOL_USE_LUAJIT)
+					case lib::coroutine:
+#if SOL_LUA_VERSION_I_ > 501
+						luaL_requiref(L, "coroutine", luaopen_coroutine, 1);
+						lua_pop(L, 1);
+#endif // Lua 5.2+ only
+						break;
+#endif // Not LuaJIT - comes builtin
+					case lib::string:
+						luaL_requiref(L, "string", luaopen_string, 1);
+						lua_pop(L, 1);
+						break;
+					case lib::table:
+						luaL_requiref(L, "table", luaopen_table, 1);
+						lua_pop(L, 1);
+						break;
+					case lib::math:
+						luaL_requiref(L, "math", luaopen_math, 1);
+						lua_pop(L, 1);
+						break;
+					case lib::bit32:
+#if SOL_IS_ON(SOL_USE_LUAJIT)
+						luaL_requiref(L, "bit32", luaopen_bit, 1);
+						lua_pop(L, 1);
+#elif SOL_IS_ON(SOL_LUA_BIT32_LIB)
+						luaL_requiref(L, "bit32", luaopen_bit32, 1);
+						lua_pop(L, 1);
+#else
+#endif
+						break;
+					case lib::io:
+						luaL_requiref(L, "io", luaopen_io, 1);
+						lua_pop(L, 1);
+						break;
+					case lib::os:
+						luaL_requiref(L, "os", luaopen_os, 1);
+						lua_pop(L, 1);
+						break;
+					case lib::debug:
+						luaL_requiref(L, "debug", luaopen_debug, 1);
+						lua_pop(L, 1);
+						break;
+					case lib::utf8:
+#if SOL_LUA_VERSION_I_ > 502 && SOL_IS_OFF(SOL_USE_LUAJIT)
+						luaL_requiref(L, "utf8", luaopen_utf8, 1);
+						lua_pop(L, 1);
+#endif // Lua 5.3+ only
+						break;
+					case lib::ffi:
+#if SOL_IS_ON(SOL_USE_LUAJIT) && SOL_IS_OFF(SOL_LUAJIT_FFI_DISABLED)
+						luaL_requiref(L, "ffi", luaopen_ffi, 1);
+						lua_pop(L, 1);
+#endif // LuaJIT only
+						break;
+					case lib::jit:
+#if SOL_IS_ON(SOL_USE_LUAJIT)
+						luaL_requiref(L, "jit", luaopen_jit, 0);
+						lua_pop(L, 1);
+#endif // LuaJIT Only
+						break;
+					case lib::count:
+					default:
+						break;
+					}
+				}
+			}
+		}
+
+		object require(const std::string& key, lua_CFunction open_function, bool create_global = true) {
+			luaL_requiref(L, key.c_str(), open_function, create_global ? 1 : 0);
+			return stack::pop<object>(L);
+		}
+
+		object require_script(const std::string& key, const string_view& code, bool create_global = true,
+		     const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			auto action = [this, &code, &chunkname, &mode]() { stack::script(L, code, chunkname, mode); };
+			return require_core(key, action, create_global);
+		}
+
+		object require_file(const std::string& key, const std::string& filename, bool create_global = true, load_mode mode = load_mode::any) {
+			auto action = [this, &filename, &mode]() { stack::script_file(L, filename, mode); };
+			return require_core(key, action, create_global);
+		}
+
+		void clear_package_loaders() {
+			optional<table> maybe_package = this->global["package"];
+			if (!maybe_package) {
+				// package lib wasn't opened
+				// open package lib
+				return;
+			}
+			table& package = *maybe_package;
+			// yay for version differences...
+			// one day Lua 5.1 will die a peaceful death
+			// and its old bones will find blissful rest
+			auto loaders_proxy = package
+#if SOL_LUA_VERSION_I_ < 502
+			     ["loaders"]
+#else
+			     ["searchers"]
+#endif
+			     ;
+			if (!loaders_proxy.valid()) {
+				// nothing to clear
+				return;
+			}
+			// we need to create the table for loaders
+			// table does not exist, so create and move forward
+			loaders_proxy = new_table(1, 0);
+		}
+
+		template <typename Fx>
+		void add_package_loader(Fx&& fx, bool clear_all_package_loaders = false) {
+			optional<table> maybe_package = this->global["package"];
+			if (!maybe_package) {
+				// package lib wasn't opened
+				// open package lib
+				return;
+			}
+			table& package = *maybe_package;
+			// yay for version differences...
+			// one day Lua 5.1 will die a peaceful death
+			// and its old bones will find blissful rest
+			auto loaders_proxy = package
+#if SOL_LUA_VERSION_I_ < 502
+			     ["loaders"]
+#else
+			     ["searchers"]
+#endif
+			     ;
+			bool make_new_table = clear_all_package_loaders || !loaders_proxy.valid();
+			if (make_new_table) {
+				// we need to create the table for loaders
+				// table does not exist, so create and move forward
+				loaders_proxy = new_table(1, 0);
+			}
+			optional<table> maybe_loaders = loaders_proxy;
+			if (!maybe_loaders) {
+				// loaders/searches
+				// thing exists in package, but it
+				// ain't a table or a table-alike...!
+				return;
+			}
+			table loaders = loaders_proxy;
+			loaders.add(std::forward<Fx>(fx));
+		}
+
+		template <typename E>
+		protected_function_result do_reader(lua_Reader reader, void* data, const basic_environment<E>& env,
+		     const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			detail::typical_chunk_name_t basechunkname = {};
+			const char* chunknametarget = detail::make_chunk_name("lua_Reader", chunkname, basechunkname);
+			load_status x = static_cast<load_status>(lua_load(L, reader, data, chunknametarget, to_string(mode).c_str()));
+			if (x != load_status::ok) {
+				return protected_function_result(L, absolute_index(L, -1), 0, 1, static_cast<call_status>(x));
+			}
+			stack_aligned_protected_function pf(L, -1);
+			set_environment(env, pf);
+			return pf();
+		}
+
+		protected_function_result do_reader(
+		     lua_Reader reader, void* data, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			detail::typical_chunk_name_t basechunkname = {};
+			const char* chunknametarget = detail::make_chunk_name("lua_Reader", chunkname, basechunkname);
+			load_status x = static_cast<load_status>(lua_load(L, reader, data, chunknametarget, to_string(mode).c_str()));
+			if (x != load_status::ok) {
+				return protected_function_result(L, absolute_index(L, -1), 0, 1, static_cast<call_status>(x));
+			}
+			stack_aligned_protected_function pf(L, -1);
+			return pf();
+		}
+
+		template <typename E>
+		protected_function_result do_string(const string_view& code, const basic_environment<E>& env,
+		     const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			detail::typical_chunk_name_t basechunkname = {};
+			const char* chunknametarget = detail::make_chunk_name(code, chunkname, basechunkname);
+			load_status x = static_cast<load_status>(luaL_loadbufferx(L, code.data(), code.size(), chunknametarget, to_string(mode).c_str()));
+			if (x != load_status::ok) {
+				return protected_function_result(L, absolute_index(L, -1), 0, 1, static_cast<call_status>(x));
+			}
+			stack_aligned_protected_function pf(L, -1);
+			set_environment(env, pf);
+			return pf();
+		}
+
+		protected_function_result do_string(
+		     const string_view& code, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			detail::typical_chunk_name_t basechunkname = {};
+			const char* chunknametarget = detail::make_chunk_name(code, chunkname, basechunkname);
+			load_status x = static_cast<load_status>(luaL_loadbufferx(L, code.data(), code.size(), chunknametarget, to_string(mode).c_str()));
+			if (x != load_status::ok) {
+				return protected_function_result(L, absolute_index(L, -1), 0, 1, static_cast<call_status>(x));
+			}
+			stack_aligned_protected_function pf(L, -1);
+			return pf();
+		}
+
+		template <typename E>
+		protected_function_result do_file(const std::string& filename, const basic_environment<E>& env, load_mode mode = load_mode::any) {
+			load_status x = static_cast<load_status>(luaL_loadfilex(L, filename.c_str(), to_string(mode).c_str()));
+			if (x != load_status::ok) {
+				return protected_function_result(L, absolute_index(L, -1), 0, 1, static_cast<call_status>(x));
+			}
+			stack_aligned_protected_function pf(L, -1);
+			set_environment(env, pf);
+			return pf();
+		}
+
+		protected_function_result do_file(const std::string& filename, load_mode mode = load_mode::any) {
+			load_status x = static_cast<load_status>(luaL_loadfilex(L, filename.c_str(), to_string(mode).c_str()));
+			if (x != load_status::ok) {
+				return protected_function_result(L, absolute_index(L, -1), 0, 1, static_cast<call_status>(x));
+			}
+			stack_aligned_protected_function pf(L, -1);
+			return pf();
+		}
+
+		template <typename Fx,
+		     meta::disable_any<meta::is_string_constructible<meta::unqualified_t<Fx>>,
+		          meta::is_specialization_of<meta::unqualified_t<Fx>, basic_environment>> = meta::enabler>
+		protected_function_result safe_script(
+		     lua_Reader reader, void* data, Fx&& on_error, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			protected_function_result pfr = do_reader(reader, data, chunkname, mode);
+			if (!pfr.valid()) {
+				return on_error(L, std::move(pfr));
+			}
+			return pfr;
+		}
+
+		protected_function_result safe_script(
+		     lua_Reader reader, void* data, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			return safe_script(reader, data, script_default_on_error, chunkname, mode);
+		}
+
+		template <typename Fx,
+		     meta::disable_any<meta::is_string_constructible<meta::unqualified_t<Fx>>,
+		          meta::is_specialization_of<meta::unqualified_t<Fx>, basic_environment>> = meta::enabler>
+		protected_function_result safe_script(
+		     const string_view& code, Fx&& on_error, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			protected_function_result pfr = do_string(code, chunkname, mode);
+			if (!pfr.valid()) {
+				return on_error(L, std::move(pfr));
+			}
+			return pfr;
+		}
+
+		template <typename Fx, typename E>
+		protected_function_result safe_script(const string_view& code, const basic_environment<E>& env, Fx&& on_error,
+		     const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			protected_function_result pfr = do_string(code, env, chunkname, mode);
+			if (!pfr.valid()) {
+				return on_error(L, std::move(pfr));
+			}
+			return pfr;
+		}
+
+		template <typename E>
+		protected_function_result safe_script(const string_view& code, const basic_environment<E>& env,
+		     const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			return safe_script(code, env, script_default_on_error, chunkname, mode);
+		}
+
+		protected_function_result safe_script(
+		     const string_view& code, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			return safe_script(code, script_default_on_error, chunkname, mode);
+		}
+
+		template <typename Fx,
+		     meta::disable_any<meta::is_string_constructible<meta::unqualified_t<Fx>>,
+		          meta::is_specialization_of<meta::unqualified_t<Fx>, basic_environment>> = meta::enabler>
+		protected_function_result safe_script_file(const std::string& filename, Fx&& on_error, load_mode mode = load_mode::any) {
+			protected_function_result pfr = do_file(filename, mode);
+			if (!pfr.valid()) {
+				return on_error(L, std::move(pfr));
+			}
+			return pfr;
+		}
+
+		template <typename Fx, typename E>
+		protected_function_result safe_script_file(
+		     const std::string& filename, const basic_environment<E>& env, Fx&& on_error, load_mode mode = load_mode::any) {
+			protected_function_result pfr = do_file(filename, env, mode);
+			if (!pfr.valid()) {
+				return on_error(L, std::move(pfr));
+			}
+			return pfr;
+		}
+
+		template <typename E>
+		protected_function_result safe_script_file(const std::string& filename, const basic_environment<E>& env, load_mode mode = load_mode::any) {
+			return safe_script_file(filename, env, script_default_on_error, mode);
+		}
+
+		protected_function_result safe_script_file(const std::string& filename, load_mode mode = load_mode::any) {
+			return safe_script_file(filename, script_default_on_error, mode);
+		}
+
+		template <typename E>
+		unsafe_function_result unsafe_script(lua_Reader reader, void* data, const basic_environment<E>& env,
+		     const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			detail::typical_chunk_name_t basechunkname = {};
+			const char* chunknametarget = detail::make_chunk_name("lua_Reader", chunkname, basechunkname);
+			int index = lua_gettop(L);
+			if (lua_load(L, reader, data, chunknametarget, to_string(mode).c_str())) {
+				lua_error(L);
+			}
+			set_environment(env, stack_reference(L, raw_index(index + 1)));
+			if (lua_pcall(L, 0, LUA_MULTRET, 0)) {
+				lua_error(L);
+			}
+			int postindex = lua_gettop(L);
+			int returns = postindex - index;
+			return unsafe_function_result(L, (std::max)(postindex - (returns - 1), 1), returns);
+		}
+
+		unsafe_function_result unsafe_script(
+		     lua_Reader reader, void* data, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			int index = lua_gettop(L);
+			stack::script(L, reader, data, chunkname, mode);
+			int postindex = lua_gettop(L);
+			int returns = postindex - index;
+			return unsafe_function_result(L, (std::max)(postindex - (returns - 1), 1), returns);
+		}
+
+		template <typename E>
+		unsafe_function_result unsafe_script(const string_view& code, const basic_environment<E>& env,
+		     const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			detail::typical_chunk_name_t basechunkname = {};
+			const char* chunknametarget = detail::make_chunk_name(code, chunkname, basechunkname);
+			int index = lua_gettop(L);
+			if (luaL_loadbufferx(L, code.data(), code.size(), chunknametarget, to_string(mode).c_str())) {
+				lua_error(L);
+			}
+			set_environment(env, stack_reference(L, raw_index(index + 1)));
+			if (lua_pcall(L, 0, LUA_MULTRET, 0)) {
+				lua_error(L);
+			}
+			int postindex = lua_gettop(L);
+			int returns = postindex - index;
+			return unsafe_function_result(L, (std::max)(postindex - (returns - 1), 1), returns);
+		}
+
+		unsafe_function_result unsafe_script(
+		     const string_view& code, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			int index = lua_gettop(L);
+			stack::script(L, code, chunkname, mode);
+			int postindex = lua_gettop(L);
+			int returns = postindex - index;
+			return unsafe_function_result(L, (std::max)(postindex - (returns - 1), 1), returns);
+		}
+
+		template <typename E>
+		unsafe_function_result unsafe_script_file(const std::string& filename, const basic_environment<E>& env, load_mode mode = load_mode::any) {
+			int index = lua_gettop(L);
+			if (luaL_loadfilex(L, filename.c_str(), to_string(mode).c_str())) {
+				lua_error(L);
+			}
+			set_environment(env, stack_reference(L, raw_index(index + 1)));
+			if (lua_pcall(L, 0, LUA_MULTRET, 0)) {
+				lua_error(L);
+			}
+			int postindex = lua_gettop(L);
+			int returns = postindex - index;
+			return unsafe_function_result(L, (std::max)(postindex - (returns - 1), 1), returns);
+		}
+
+		unsafe_function_result unsafe_script_file(const std::string& filename, load_mode mode = load_mode::any) {
+			int index = lua_gettop(L);
+			stack::script_file(L, filename, mode);
+			int postindex = lua_gettop(L);
+			int returns = postindex - index;
+			return unsafe_function_result(L, (std::max)(postindex - (returns - 1), 1), returns);
+		}
+
+		template <typename Fx,
+		     meta::disable_any<meta::is_string_constructible<meta::unqualified_t<Fx>>,
+		          meta::is_specialization_of<meta::unqualified_t<Fx>, basic_environment>> = meta::enabler>
+		protected_function_result script(
+		     const string_view& code, Fx&& on_error, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			return safe_script(code, std::forward<Fx>(on_error), chunkname, mode);
+		}
+
+		template <typename Fx,
+		     meta::disable_any<meta::is_string_constructible<meta::unqualified_t<Fx>>,
+		          meta::is_specialization_of<meta::unqualified_t<Fx>, basic_environment>> = meta::enabler>
+		protected_function_result script_file(const std::string& filename, Fx&& on_error, load_mode mode = load_mode::any) {
+			return safe_script_file(filename, std::forward<Fx>(on_error), mode);
+		}
+
+		template <typename Fx, typename E>
+		protected_function_result script(const string_view& code, const basic_environment<E>& env, Fx&& on_error,
+		     const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			return safe_script(code, env, std::forward<Fx>(on_error), chunkname, mode);
+		}
+
+		template <typename Fx, typename E>
+		protected_function_result script_file(const std::string& filename, const basic_environment<E>& env, Fx&& on_error, load_mode mode = load_mode::any) {
+			return safe_script_file(filename, env, std::forward<Fx>(on_error), mode);
+		}
+
+		protected_function_result script(
+		     const string_view& code, const environment& env, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			return safe_script(code, env, script_default_on_error, chunkname, mode);
+		}
+
+		protected_function_result script_file(const std::string& filename, const environment& env, load_mode mode = load_mode::any) {
+			return safe_script_file(filename, env, script_default_on_error, mode);
+		}
+
+#if SOL_IS_ON(SOL_SAFE_FUNCTION_OBJECTS)
+		protected_function_result script(
+		     lua_Reader reader, void* data, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			return safe_script(reader, data, chunkname, mode);
+		}
+
+		protected_function_result script(
+		     const string_view& code, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			return safe_script(code, chunkname, mode);
+		}
+
+		protected_function_result script_file(const std::string& filename, load_mode mode = load_mode::any) {
+			return safe_script_file(filename, mode);
+		}
+#else
+		unsafe_function_result script(const string_view& code, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			return unsafe_script(code, chunkname, mode);
+		}
+
+		unsafe_function_result script_file(const std::string& filename, load_mode mode = load_mode::any) {
+			return unsafe_script_file(filename, mode);
+		}
+#endif
+		load_result load(const string_view& code, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			detail::typical_chunk_name_t basechunkname = {};
+			const char* chunknametarget = detail::make_chunk_name(code, chunkname, basechunkname);
+			load_status x = static_cast<load_status>(luaL_loadbufferx(L, code.data(), code.size(), chunknametarget, to_string(mode).c_str()));
+			return load_result(L, absolute_index(L, -1), 1, 1, x);
+		}
+
+		load_result load_buffer(const char* buff, size_t size, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			return load(string_view(buff, size), chunkname, mode);
+		}
+
+		load_result load_buffer(
+		     const std::byte* buff, size_t size, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			return load(string_view(reinterpret_cast<const char*>(buff), size), chunkname, mode);
+		}
+
+		load_result load_file(const std::string& filename, load_mode mode = load_mode::any) {
+			load_status x = static_cast<load_status>(luaL_loadfilex(L, filename.c_str(), to_string(mode).c_str()));
+			return load_result(L, absolute_index(L, -1), 1, 1, x);
+		}
+
+		load_result load(lua_Reader reader, void* data, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			detail::typical_chunk_name_t basechunkname = {};
+			const char* chunknametarget = detail::make_chunk_name("lua_Reader", chunkname, basechunkname);
+			load_status x = static_cast<load_status>(lua_load(L, reader, data, chunknametarget, to_string(mode).c_str()));
+			return load_result(L, absolute_index(L, -1), 1, 1, x);
+		}
+
+		iterator begin() const {
+			return global.begin();
+		}
+
+		iterator end() const {
+			return global.end();
+		}
+
+		const_iterator cbegin() const {
+			return global.cbegin();
+		}
+
+		const_iterator cend() const {
+			return global.cend();
+		}
+
+		global_table globals() const {
+			// if we return a reference
+			// we'll be screwed a bit
+			return global;
+		}
+
+		global_table& globals() {
+			return global;
+		}
+
+		table registry() const {
+			return reg;
+		}
+
+		std::size_t memory_used() const {
+			return total_memory_used(lua_state());
+		}
+
+		int stack_top() const {
+			return stack::top(L);
+		}
+
+		int stack_clear() {
+			int s = stack_top();
+			lua_pop(L, s);
+			return s;
+		}
+
+		bool supports_gc_mode(gc_mode mode) const noexcept {
+#if SOL_LUA_VERSION_I_ >= 504
+			// supports all modes
+			(void)mode;
+			return true;
+#endif
+			return mode == gc_mode::default_value;
+		}
+
+		bool is_gc_on() const {
+#if SOL_LUA_VERSION_I_ >= 502
+			return lua_gc(lua_state(), LUA_GCISRUNNING, 0) == 1;
+#else
+			// You cannot turn it off in Lua 5.1
+			return true;
+#endif
+		}
+
+		void collect_garbage() {
+			lua_gc(lua_state(), LUA_GCCOLLECT, 0);
+		}
+
+		void collect_gc() {
+			collect_garbage();
+		}
+
+		bool step_gc(int step_size_kilobytes) {
+			// THOUGHT: std::chrono-alikes to map "kilobyte size" here...?
+			// Make it harder to give MB or KB to a B parameter...?
+			// Probably overkill for now.
+#if SOL_LUA_VERSION_I_ >= 504
+			// The manual implies that this function is almost always successful...
+			// is it?? It could depend on the GC mode...
+			return lua_gc(lua_state(), LUA_GCSTEP, step_size_kilobytes) != 0;
+#else
+			return lua_gc(lua_state(), LUA_GCSTEP, step_size_kilobytes) == 1;
+#endif
+		}
+
+		void restart_gc() {
+			lua_gc(lua_state(), LUA_GCRESTART, 0);
+		}
+
+		void stop_gc() {
+			lua_gc(lua_state(), LUA_GCSTOP, 0);
+		}
+
+		// Returns the old GC mode. Check support using the supports_gc_mode function.
+		gc_mode change_gc_mode_incremental(int pause, int step_multiplier, int step_byte_size) {
+			// "What the fuck does any of this mean??"
+			// http://www.lua.org/manual/5.4/manual.html#2.5.1
+
+			// THOUGHT: std::chrono-alikes to map "byte size" here...?
+			// Make it harder to give MB or KB to a B parameter...?
+			// Probably overkill for now.
+#if SOL_LUA_VERSION_I_ >= 504
+			int old_mode = lua_gc(lua_state(), LUA_GCINC, pause, step_multiplier, step_byte_size);
+			if (old_mode == LUA_GCGEN) {
+				return gc_mode::generational;
+			}
+			else if (old_mode == LUA_GCINC) {
+				return gc_mode::incremental;
+			}
+#else
+			lua_gc(lua_state(), LUA_GCSETPAUSE, pause);
+			lua_gc(lua_state(), LUA_GCSETSTEPMUL, step_multiplier);
+			(void)step_byte_size; // means nothing in older versions
+#endif
+			return gc_mode::default_value;
+		}
+
+		// Returns the old GC mode. Check support using the supports_gc_mode function.
+		gc_mode change_gc_mode_generational(int minor_multiplier, int major_multiplier) {
+#if SOL_LUA_VERSION_I_ >= 504
+			// "What does this shit mean?"
+			// http://www.lua.org/manual/5.4/manual.html#2.5.2
+			int old_mode = lua_gc(lua_state(), LUA_GCGEN, minor_multiplier, major_multiplier);
+			if (old_mode == LUA_GCGEN) {
+				return gc_mode::generational;
+			}
+			else if (old_mode == LUA_GCINC) {
+				return gc_mode::incremental;
+			}
+#else
+			(void)minor_multiplier;
+			(void)major_multiplier;
+#endif
+			return gc_mode::default_value;
+		}
+
+		operator lua_State*() const {
+			return lua_state();
+		}
+
+		void set_panic(lua_CFunction panic) {
+			lua_atpanic(lua_state(), panic);
+		}
+
+		void set_exception_handler(exception_handler_function handler) {
+			set_default_exception_handler(lua_state(), handler);
+		}
+
+		template <typename... Args, typename... Keys>
+		decltype(auto) get(Keys&&... keys) const {
+			return global.get<Args...>(std::forward<Keys>(keys)...);
+		}
+
+		template <typename T, typename Key>
+		decltype(auto) get_or(Key&& key, T&& otherwise) const {
+			return global.get_or(std::forward<Key>(key), std::forward<T>(otherwise));
+		}
+
+		template <typename T, typename Key, typename D>
+		decltype(auto) get_or(Key&& key, D&& otherwise) const {
+			return global.get_or<T>(std::forward<Key>(key), std::forward<D>(otherwise));
+		}
+
+		template <typename... Args>
+		state_view& set(Args&&... args) {
+			global.set(std::forward<Args>(args)...);
+			return *this;
+		}
+
+		template <typename T, typename... Keys>
+		decltype(auto) traverse_get(Keys&&... keys) const {
+			return global.traverse_get<T>(std::forward<Keys>(keys)...);
+		}
+
+		template <typename... Args>
+		state_view& traverse_set(Args&&... args) {
+			global.traverse_set(std::forward<Args>(args)...);
+			return *this;
+		}
+
+		template <typename Class, typename... Args>
+		usertype<Class> new_usertype(Args&&... args) {
+			return global.new_usertype<Class>(std::forward<Args>(args)...);
+		}
+
+		template <bool read_only = true, typename... Args>
+		state_view& new_enum(const string_view& name, Args&&... args) {
+			global.new_enum<read_only>(name, std::forward<Args>(args)...);
+			return *this;
+		}
+
+		template <typename T, bool read_only = true>
+		state_view& new_enum(const string_view& name, std::initializer_list<std::pair<string_view, T>> items) {
+			global.new_enum<T, read_only>(name, std::move(items));
+			return *this;
+		}
+
+		template <typename Fx>
+		void for_each(Fx&& fx) {
+			global.for_each(std::forward<Fx>(fx));
+		}
+
+		template <typename T>
+		table_proxy<global_table&, detail::proxy_key_t<T>> operator[](T&& key) {
+			return global[std::forward<T>(key)];
+		}
+
+		template <typename T>
+		table_proxy<const global_table&, detail::proxy_key_t<T>> operator[](T&& key) const {
+			return global[std::forward<T>(key)];
+		}
+
+		template <typename Sig, typename... Args, typename Key>
+		state_view& set_function(Key&& key, Args&&... args) {
+			global.set_function<Sig>(std::forward<Key>(key), std::forward<Args>(args)...);
+			return *this;
+		}
+
+		template <typename... Args, typename Key>
+		state_view& set_function(Key&& key, Args&&... args) {
+			global.set_function(std::forward<Key>(key), std::forward<Args>(args)...);
+			return *this;
+		}
+
+		template <typename Name>
+		table create_table(Name&& name, int narr = 0, int nrec = 0) {
+			return global.create(std::forward<Name>(name), narr, nrec);
+		}
+
+		template <typename Name, typename Key, typename Value, typename... Args>
+		table create_table(Name&& name, int narr, int nrec, Key&& key, Value&& value, Args&&... args) {
+			return global.create(std::forward<Name>(name), narr, nrec, std::forward<Key>(key), std::forward<Value>(value), std::forward<Args>(args)...);
+		}
+
+		template <typename Name, typename... Args>
+		table create_named_table(Name&& name, Args&&... args) {
+			table x = global.create_with(std::forward<Args>(args)...);
+			global.set(std::forward<Name>(name), x);
+			return x;
+		}
+
+		table create_table(int narr = 0, int nrec = 0) {
+			return create_table(lua_state(), narr, nrec);
+		}
+
+		template <typename Key, typename Value, typename... Args>
+		table create_table(int narr, int nrec, Key&& key, Value&& value, Args&&... args) {
+			return create_table(lua_state(), narr, nrec, std::forward<Key>(key), std::forward<Value>(value), std::forward<Args>(args)...);
+		}
+
+		template <typename... Args>
+		table create_table_with(Args&&... args) {
+			return create_table_with(lua_state(), std::forward<Args>(args)...);
+		}
+
+		static inline table create_table(lua_State* L, int narr = 0, int nrec = 0) {
+			return global_table::create(L, narr, nrec);
+		}
+
+		template <typename Key, typename Value, typename... Args>
+		static inline table create_table(lua_State* L, int narr, int nrec, Key&& key, Value&& value, Args&&... args) {
+			return global_table::create(L, narr, nrec, std::forward<Key>(key), std::forward<Value>(value), std::forward<Args>(args)...);
+		}
+
+		template <typename... Args>
+		static inline table create_table_with(lua_State* L, Args&&... args) {
+			return global_table::create_with(L, std::forward<Args>(args)...);
+		}
+	};
+} // namespace sol
+
+// end of sol/state_view.hpp
+
+// beginning of sol/thread.hpp
+
+namespace sol {
+	struct lua_thread_state {
+		lua_State* L;
+
+		lua_thread_state(lua_State* Ls) : L(Ls) {
+		}
+
+		lua_State* lua_state() const noexcept {
+			return L;
+		}
+		operator lua_State*() const noexcept {
+			return lua_state();
+		}
+		lua_State* operator->() const noexcept {
+			return lua_state();
+		}
+	};
+
+	namespace stack {
+		template <>
+		struct unqualified_pusher<lua_thread_state> {
+			int push(lua_State*, lua_thread_state lts) {
+				lua_pushthread(lts.L);
+				return 1;
+			}
+		};
+
+		template <>
+		struct unqualified_getter<lua_thread_state> {
+			lua_thread_state get(lua_State* L, int index, record& tracking) {
+				tracking.use(1);
+				lua_thread_state lts(lua_tothread(L, index));
+				return lts;
+			}
+		};
+
+		template <>
+		struct unqualified_check_getter<lua_thread_state> {
+			template <typename Handler>
+			optional<lua_thread_state> get(lua_State* L, int index, Handler&& handler, record& tracking) {
+				lua_thread_state lts(lua_tothread(L, index));
+				if (lts.lua_state() == nullptr) {
+					handler(L, index, type::thread, type_of(L, index), "value is not a valid thread type");
+					return nullopt;
+				}
+				tracking.use(1);
+				return lts;
+			}
+		};
+	} // namespace stack
+
+	template <typename ref_t>
+	class basic_thread : public basic_object<ref_t> {
+	private:
+		using base_t = basic_object<ref_t>;
+
+	public:
+		using base_t::lua_state;
+
+		basic_thread() noexcept = default;
+		basic_thread(const basic_thread&) = default;
+		basic_thread(basic_thread&&) = default;
+		template <typename T,
+		     meta::enable<meta::neg<std::is_same<meta::unqualified_t<T>, basic_thread>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_thread(T&& r) : base_t(std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_thread>(lua_state(), -1, handler);
+#endif // Safety
+		}
+		basic_thread(const stack_reference& r) : basic_thread(r.lua_state(), r.stack_index()) {};
+		basic_thread(stack_reference&& r) : basic_thread(r.lua_state(), r.stack_index()) {};
+		basic_thread& operator=(const basic_thread&) = default;
+		basic_thread& operator=(basic_thread&&) = default;
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_thread(lua_State* L, T&& r) : base_t(L, std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_thread>(lua_state(), -1, handler);
+#endif // Safety
+		}
+		basic_thread(lua_State* L, int index = -1) : base_t(L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			constructor_handler handler {};
+			stack::check<basic_thread>(L, index, handler);
+#endif // Safety
+		}
+		basic_thread(lua_State* L, ref_index index) : base_t(L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_thread>(lua_state(), -1, handler);
+#endif // Safety
+		}
+		basic_thread(lua_State* L, lua_State* actualthread) : basic_thread(L, lua_thread_state { actualthread }) {
+		}
+		basic_thread(lua_State* L, this_state actualthread) : basic_thread(L, lua_thread_state { actualthread.L }) {
+		}
+		basic_thread(lua_State* L, lua_thread_state actualthread) : base_t(L, -stack::push(L, actualthread)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			constructor_handler handler {};
+			stack::check<basic_thread>(lua_state(), -1, handler);
+#endif // Safety
+			if (!is_stack_based<base_t>::value) {
+				lua_pop(lua_state(), 1);
+			}
+		}
+
+		state_view state() const {
+			return state_view(this->thread_state());
+		}
+
+		bool is_main_thread() const {
+			return stack::is_main_thread(this->thread_state());
+		}
+
+		lua_State* thread_state() const {
+			auto pp = stack::push_pop(*this);
+			lua_State* lthread = lua_tothread(lua_state(), -1);
+			return lthread;
+		}
+
+		thread_status status() const {
+			lua_State* lthread = thread_state();
+			auto lstat = static_cast<thread_status>(lua_status(lthread));
+			if (lstat == thread_status::ok) {
+				lua_Debug ar;
+				if (lua_getstack(lthread, 0, &ar) > 0)
+					return thread_status::ok;
+				else if (lua_gettop(lthread) == 0)
+					return thread_status::dead;
+				else
+					return thread_status::yielded;
+			}
+			return lstat;
+		}
+
+		basic_thread create() {
+			return create(lua_state());
+		}
+
+		static basic_thread create(lua_State* L) {
+			lua_newthread(L);
+			basic_thread result(L);
+			if (!is_stack_based<base_t>::value) {
+				lua_pop(L, 1);
+			}
+			return result;
+		}
+	};
+
+	typedef basic_thread<reference> thread;
+	typedef basic_thread<stack_reference> stack_thread;
+} // namespace sol
+
+// end of sol/thread.hpp
+
+namespace sol {
+
+	class state : private std::unique_ptr<lua_State, detail::state_deleter>, public state_view {
+	private:
+		typedef std::unique_ptr<lua_State, detail::state_deleter> unique_base;
+
+	public:
+		state(lua_CFunction panic = default_at_panic) : unique_base(luaL_newstate()), state_view(unique_base::get()) {
+			set_default_state(unique_base::get(), panic);
+		}
+
+		state(lua_CFunction panic, lua_Alloc alfunc, void* alpointer = nullptr)
+		: unique_base(lua_newstate(alfunc, alpointer)), state_view(unique_base::get()) {
+			set_default_state(unique_base::get(), panic);
+		}
+
+		state(const state&) = delete;
+		state(state&&) = default;
+		state& operator=(const state&) = delete;
+		state& operator=(state&& that) {
+			state_view::operator=(std::move(that));
+			unique_base::operator=(std::move(that));
+			return *this;
+		}
+
+		using state_view::get;
+
+		~state() {
+		}
+	};
+} // namespace sol
+
+// end of sol/state.hpp
+
+// beginning of sol/coroutine.hpp
+
+namespace sol {
+	template <typename Reference>
+	class basic_coroutine : public basic_object<Reference> {
+	private:
+		using base_t = basic_object<Reference>;
+		using handler_t = reference;
+
+	private:
+		call_status stats = call_status::yielded;
+
+		void luacall(std::ptrdiff_t argcount, std::ptrdiff_t) {
+#if SOL_LUA_VERSION_I_ >= 504
+			int nresults;
+			stats = static_cast<call_status>(lua_resume(lua_state(), nullptr, static_cast<int>(argcount), &nresults));
+#else
+			stats = static_cast<call_status>(lua_resume(lua_state(), nullptr, static_cast<int>(argcount)));
+#endif
+		}
+
+		template <std::size_t... I, typename... Ret>
+		auto invoke(types<Ret...>, std::index_sequence<I...>, std::ptrdiff_t n) {
+			luacall(n, sizeof...(Ret));
+			return stack::pop<std::tuple<Ret...>>(lua_state());
+		}
+
+		template <std::size_t I, typename Ret>
+		Ret invoke(types<Ret>, std::index_sequence<I>, std::ptrdiff_t n) {
+			luacall(n, 1);
+			return stack::pop<Ret>(lua_state());
+		}
+
+		template <std::size_t I>
+		void invoke(types<void>, std::index_sequence<I>, std::ptrdiff_t n) {
+			luacall(n, 0);
+		}
+
+		protected_function_result invoke(types<>, std::index_sequence<>, std::ptrdiff_t n) {
+			int firstreturn = 1;
+			luacall(n, LUA_MULTRET);
+			int poststacksize = lua_gettop(this->lua_state());
+			int returncount = poststacksize - (firstreturn - 1);
+			if (error()) {
+				if (m_error_handler.valid()) {
+					string_view err = stack::get<string_view>(this->lua_state(), poststacksize);
+					m_error_handler.push();
+					stack::push(this->lua_state(), err);
+					lua_call(lua_state(), 1, 1);
+				}
+				return protected_function_result(this->lua_state(), lua_absindex(this->lua_state(), -1), 1, returncount, status());
+			}
+			return protected_function_result(this->lua_state(), firstreturn, returncount, returncount, status());
+		}
+
+	public:
+		using base_t::lua_state;
+
+		basic_coroutine() = default;
+		template <typename T,
+		     meta::enable<meta::neg<std::is_same<meta::unqualified_t<T>, basic_coroutine>>,
+		          meta::neg<std::is_base_of<proxy_base_tag, meta::unqualified_t<T>>>, meta::neg<std::is_same<base_t, stack_reference>>,
+		          meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_coroutine(T&& r) noexcept
+		: base_t(std::forward<T>(r)), m_error_handler(detail::get_default_handler<reference, is_main_threaded<base_t>::value>(r.lua_state())) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			if (!is_function<meta::unqualified_t<T>>::value) {
+				auto pp = stack::push_pop(*this);
+				constructor_handler handler {};
+				stack::check<basic_coroutine>(lua_state(), -1, handler);
+			}
+#endif // Safety
+		}
+
+		basic_coroutine(const basic_coroutine& other) = default;
+		basic_coroutine& operator=(const basic_coroutine&) = default;
+
+		basic_coroutine(basic_coroutine&& other) noexcept : base_t(std::move(other)), m_error_handler(this->lua_state(), std::move(other.m_error_handler)) {
+		}
+
+		basic_coroutine& operator=(basic_coroutine&& other) noexcept {
+			base_t::operator=(std::move(other));
+			// must change the state, since it could change on the coroutine type
+			m_error_handler = handler_t(this->lua_state(), std::move(other.m_error_handler));
+			return *this;
+		}
+
+		basic_coroutine(const basic_function<base_t>& b) noexcept
+		: basic_coroutine(b, detail::get_default_handler<reference, is_main_threaded<base_t>::value>(b.lua_state())) {
+		}
+		basic_coroutine(basic_function<base_t>&& b) noexcept
+		: basic_coroutine(std::move(b), detail::get_default_handler<reference, is_main_threaded<base_t>::value>(b.lua_state())) {
+		}
+		basic_coroutine(const basic_function<base_t>& b, handler_t eh) noexcept : base_t(b), m_error_handler(std::move(eh)) {
+		}
+		basic_coroutine(basic_function<base_t>&& b, handler_t eh) noexcept : base_t(std::move(b)), m_error_handler(std::move(eh)) {
+		}
+		basic_coroutine(const stack_reference& r) noexcept
+		: basic_coroutine(r.lua_state(), r.stack_index(), detail::get_default_handler<reference, is_main_threaded<base_t>::value>(r.lua_state())) {
+		}
+		basic_coroutine(stack_reference&& r) noexcept
+		: basic_coroutine(r.lua_state(), r.stack_index(), detail::get_default_handler<reference, is_main_threaded<base_t>::value>(r.lua_state())) {
+		}
+		basic_coroutine(const stack_reference& r, handler_t eh) noexcept : basic_coroutine(r.lua_state(), r.stack_index(), std::move(eh)) {
+		}
+		basic_coroutine(stack_reference&& r, handler_t eh) noexcept : basic_coroutine(r.lua_state(), r.stack_index(), std::move(eh)) {
+		}
+
+		template <typename Super>
+		basic_coroutine(const proxy_base<Super>& p)
+		: basic_coroutine(p, detail::get_default_handler<reference, is_main_threaded<base_t>::value>(p.lua_state())) {
+		}
+		template <typename Super>
+		basic_coroutine(proxy_base<Super>&& p)
+		: basic_coroutine(std::move(p), detail::get_default_handler<reference, is_main_threaded<base_t>::value>(p.lua_state())) {
+		}
+		template <typename Proxy, typename HandlerReference,
+		     meta::enable<std::is_base_of<proxy_base_tag, meta::unqualified_t<Proxy>>,
+		          meta::neg<is_lua_index<meta::unqualified_t<HandlerReference>>>> = meta::enabler>
+		basic_coroutine(Proxy&& p, HandlerReference&& eh) : basic_coroutine(detail::force_cast<base_t>(p), std::forward<HandlerReference>(eh)) {
+		}
+
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_coroutine(lua_State* L, T&& r) noexcept
+		: basic_coroutine(L, std::forward<T>(r), detail::get_default_handler<reference, is_main_threaded<base_t>::value>(L)) {
+		}
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_coroutine(lua_State* L, T&& r, handler_t eh) : base_t(L, std::forward<T>(r)), m_error_handler(std::move(eh)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_coroutine>(lua_state(), -1, handler);
+#endif // Safety
+		}
+
+		basic_coroutine(lua_nil_t n) : base_t(n), m_error_handler(n) {
+		}
+
+		basic_coroutine(lua_State* L, int index = -1)
+		: basic_coroutine(L, index, detail::get_default_handler<reference, is_main_threaded<base_t>::value>(L)) {
+		}
+		basic_coroutine(lua_State* L, int index, handler_t eh) : base_t(L, index), m_error_handler(std::move(eh)) {
+#ifdef SOL_SAFE_REFERENCES
+			constructor_handler handler {};
+			stack::check<basic_coroutine>(L, index, handler);
+#endif // Safety
+		}
+		basic_coroutine(lua_State* L, absolute_index index)
+		: basic_coroutine(L, index, detail::get_default_handler<reference, is_main_threaded<base_t>::value>(L)) {
+		}
+		basic_coroutine(lua_State* L, absolute_index index, handler_t eh) : base_t(L, index), m_error_handler(std::move(eh)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			constructor_handler handler {};
+			stack::check<basic_coroutine>(L, index, handler);
+#endif // Safety
+		}
+		basic_coroutine(lua_State* L, raw_index index)
+		: basic_coroutine(L, index, detail::get_default_handler<reference, is_main_threaded<base_t>::value>(L)) {
+		}
+		basic_coroutine(lua_State* L, raw_index index, handler_t eh) : base_t(L, index), m_error_handler(std::move(eh)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			constructor_handler handler {};
+			stack::check<basic_coroutine>(L, index, handler);
+#endif // Safety
+		}
+		basic_coroutine(lua_State* L, ref_index index)
+		: basic_coroutine(L, index, detail::get_default_handler<reference, is_main_threaded<base_t>::value>(L)) {
+		}
+		basic_coroutine(lua_State* L, ref_index index, handler_t eh) : base_t(L, index), m_error_handler(std::move(eh)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_coroutine>(lua_state(), -1, handler);
+#endif // Safety
+		}
+
+		call_status status() const noexcept {
+			return stats;
+		}
+
+		bool error() const noexcept {
+			call_status cs = status();
+			return cs != call_status::ok && cs != call_status::yielded;
+		}
+
+		bool runnable() const noexcept {
+			return base_t::valid() && (status() == call_status::yielded);
+		}
+
+		explicit operator bool() const noexcept {
+			return runnable();
+		}
+
+		template <typename... Args>
+		protected_function_result operator()(Args&&... args) {
+			return call<>(std::forward<Args>(args)...);
+		}
+
+		template <typename... Ret, typename... Args>
+		decltype(auto) operator()(types<Ret...>, Args&&... args) {
+			return call<Ret...>(std::forward<Args>(args)...);
+		}
+
+		template <typename... Ret, typename... Args>
+		decltype(auto) call(Args&&... args) {
+			// some users screw up coroutine.create
+			// and try to use it with sol::coroutine without ever calling the first resume in Lua
+			// this makes the stack incompatible with other kinds of stacks: protect against this
+			// make sure coroutines don't screw us over
+			base_t::push();
+			int pushcount = stack::multi_push_reference(lua_state(), std::forward<Args>(args)...);
+			return invoke(types<Ret...>(), std::make_index_sequence<sizeof...(Ret)>(), pushcount);
+		}
+
+	private:
+		handler_t m_error_handler;
+	};
+} // namespace sol
+
+// end of sol/coroutine.hpp
+
+// beginning of sol/userdata.hpp
+
+namespace sol {
+	template <typename base_type>
+	class basic_userdata : public basic_table<base_type> {
+	private:
+		using base_t = basic_table<base_type>;
+
+	public:
+		using base_t::lua_state;
+
+		basic_userdata() noexcept = default;
+		template <typename T,
+		     meta::enable<meta::neg<std::is_same<meta::unqualified_t<T>, basic_userdata>>, meta::neg<std::is_same<base_t, stack_reference>>,
+		          is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_userdata(T&& r) noexcept : base_t(std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			if (!is_userdata<meta::unqualified_t<T>>::value) {
+				auto pp = stack::push_pop(*this);
+				type_assert(lua_state(), -1, type::userdata);
+			}
+#endif // Safety
+		}
+		basic_userdata(const basic_userdata&) = default;
+		basic_userdata(basic_userdata&&) = default;
+		basic_userdata& operator=(const basic_userdata&) = default;
+		basic_userdata& operator=(basic_userdata&&) = default;
+		basic_userdata(const stack_reference& r) : basic_userdata(r.lua_state(), r.stack_index()) {
+		}
+		basic_userdata(stack_reference&& r) : basic_userdata(r.lua_state(), r.stack_index()) {
+		}
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_userdata(lua_State* L, T&& r) : base_t(L, std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_userdata>(L, -1, handler);
+#endif // Safety
+		}
+		basic_userdata(lua_State* L, int index = -1) : base_t(detail::no_safety, L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			constructor_handler handler {};
+			stack::check<basic_userdata>(L, index, handler);
+#endif // Safety
+		}
+		basic_userdata(lua_State* L, ref_index index) : base_t(detail::no_safety, L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_userdata>(L, -1, handler);
+#endif // Safety
+		}
+	};
+
+	template <typename base_type>
+	class basic_lightuserdata : public basic_object_base<base_type> {
+		typedef basic_object_base<base_type> base_t;
+
+	public:
+		using base_t::lua_state;
+
+		basic_lightuserdata() noexcept = default;
+		template <typename T,
+		     meta::enable<meta::neg<std::is_same<meta::unqualified_t<T>, basic_lightuserdata>>, meta::neg<std::is_same<base_t, stack_reference>>,
+		          is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_lightuserdata(T&& r) noexcept : base_t(std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			if (!is_lightuserdata<meta::unqualified_t<T>>::value) {
+				auto pp = stack::push_pop(*this);
+				type_assert(lua_state(), -1, type::lightuserdata);
+			}
+#endif // Safety
+		}
+		basic_lightuserdata(const basic_lightuserdata&) = default;
+		basic_lightuserdata(basic_lightuserdata&&) = default;
+		basic_lightuserdata& operator=(const basic_lightuserdata&) = default;
+		basic_lightuserdata& operator=(basic_lightuserdata&&) = default;
+		basic_lightuserdata(const stack_reference& r) : basic_lightuserdata(r.lua_state(), r.stack_index()) {
+		}
+		basic_lightuserdata(stack_reference&& r) : basic_lightuserdata(r.lua_state(), r.stack_index()) {
+		}
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_lightuserdata(lua_State* L, T&& r) : basic_lightuserdata(L, std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_lightuserdata>(lua_state(), -1, handler);
+#endif // Safety
+		}
+		basic_lightuserdata(lua_State* L, int index = -1) : base_t(L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			constructor_handler handler {};
+			stack::check<basic_lightuserdata>(L, index, handler);
+#endif // Safety
+		}
+		basic_lightuserdata(lua_State* L, ref_index index) : base_t(L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_lightuserdata>(lua_state(), index, handler);
+#endif // Safety
+		}
+	};
+
+} // namespace sol
+
+// end of sol/userdata.hpp
+
+// beginning of sol/as_args.hpp
+
+namespace sol {
+	template <typename T>
+	struct as_args_t {
+		T src;
+	};
+
+	template <typename Source>
+	auto as_args(Source&& source) {
+		return as_args_t<Source> { std::forward<Source>(source) };
+	}
+
+	namespace stack {
+		template <typename T>
+		struct unqualified_pusher<as_args_t<T>> {
+			int push(lua_State* L, const as_args_t<T>& e) {
+				int p = 0;
+				for (const auto& i : e.src) {
+					p += stack::push(L, i);
+				}
+				return p;
+			}
+		};
+	} // namespace stack
+} // namespace sol
+
+// end of sol/as_args.hpp
+
+// beginning of sol/variadic_args.hpp
+
+#include <limits>
+#include <iterator>
+
+namespace sol {
+	struct variadic_args {
+	private:
+		lua_State* L;
+		int index;
+		int stacktop;
+
+	public:
+		typedef stack_proxy reference_type;
+		typedef stack_proxy value_type;
+		typedef stack_proxy* pointer;
+		typedef std::ptrdiff_t difference_type;
+		typedef std::size_t size_type;
+		typedef stack_iterator<stack_proxy, false> iterator;
+		typedef stack_iterator<stack_proxy, true> const_iterator;
+		typedef std::reverse_iterator<iterator> reverse_iterator;
+		typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
+
+		variadic_args() = default;
+		variadic_args(lua_State* luastate, int stackindex = -1) : L(luastate), index(lua_absindex(luastate, stackindex)), stacktop(lua_gettop(luastate)) {
+		}
+		variadic_args(lua_State* luastate, int stackindex, int lastindex) : L(luastate), index(lua_absindex(luastate, stackindex)), stacktop(lastindex) {
+		}
+		variadic_args(const variadic_args&) = default;
+		variadic_args& operator=(const variadic_args&) = default;
+		variadic_args(variadic_args&& o) : L(o.L), index(o.index), stacktop(o.stacktop) {
+			// Must be manual, otherwise destructor will screw us
+			// return count being 0 is enough to keep things clean
+			// but will be thorough
+			o.L = nullptr;
+			o.index = 0;
+			o.stacktop = 0;
+		}
+		variadic_args& operator=(variadic_args&& o) {
+			L = o.L;
+			index = o.index;
+			stacktop = o.stacktop;
+			// Must be manual, otherwise destructor will screw us
+			// return count being 0 is enough to keep things clean
+			// but will be thorough
+			o.L = nullptr;
+			o.index = 0;
+			o.stacktop = 0;
+			return *this;
+		}
+
+		iterator begin() {
+			return iterator(L, index, stacktop + 1);
+		}
+		iterator end() {
+			return iterator(L, stacktop + 1, stacktop + 1);
+		}
+		const_iterator begin() const {
+			return const_iterator(L, index, stacktop + 1);
+		}
+		const_iterator end() const {
+			return const_iterator(L, stacktop + 1, stacktop + 1);
+		}
+		const_iterator cbegin() const {
+			return begin();
+		}
+		const_iterator cend() const {
+			return end();
+		}
+
+		reverse_iterator rbegin() {
+			return std::reverse_iterator<iterator>(begin());
+		}
+		reverse_iterator rend() {
+			return std::reverse_iterator<iterator>(end());
+		}
+		const_reverse_iterator rbegin() const {
+			return std::reverse_iterator<const_iterator>(begin());
+		}
+		const_reverse_iterator rend() const {
+			return std::reverse_iterator<const_iterator>(end());
+		}
+		const_reverse_iterator crbegin() const {
+			return std::reverse_iterator<const_iterator>(cbegin());
+		}
+		const_reverse_iterator crend() const {
+			return std::reverse_iterator<const_iterator>(cend());
+		}
+
+		int push() const {
+			return push(L);
+		}
+
+		int push(lua_State* target) const {
+			int pushcount = 0;
+			for (int i = index; i <= stacktop; ++i) {
+				lua_pushvalue(L, i);
+				pushcount += 1;
+			}
+			if (target != L) {
+				lua_xmove(L, target, pushcount);
+			}
+			return pushcount;
+		}
+
+		template <typename T>
+		decltype(auto) get(difference_type index_offset = 0) const {
+			return stack::get<T>(L, index + static_cast<int>(index_offset));
+		}
+
+		type get_type(difference_type index_offset = 0) const noexcept {
+			return type_of(L, index + static_cast<int>(index_offset));
+		}
+
+		stack_proxy operator[](difference_type index_offset) const {
+			return stack_proxy(L, index + static_cast<int>(index_offset));
+		}
+
+		lua_State* lua_state() const {
+			return L;
+		};
+		int stack_index() const {
+			return index;
+		};
+		int leftover_count() const {
+			return stacktop - (index - 1);
+		}
+		std::size_t size() const {
+			return static_cast<std::size_t>(leftover_count());
+		}
+		int top() const {
+			return stacktop;
+		}
+	};
+
+	namespace stack {
+		template <>
+		struct unqualified_getter<variadic_args> {
+			static variadic_args get(lua_State* L, int index, record& tracking) {
+				tracking.last = 0;
+				return variadic_args(L, index);
+			}
+		};
+
+		template <>
+		struct unqualified_pusher<variadic_args> {
+			static int push(lua_State* L, const variadic_args& ref) {
+				return ref.push(L);
+			}
+		};
+	} // namespace stack
+} // namespace sol
+
+// end of sol/variadic_args.hpp
+
+// beginning of sol/variadic_results.hpp
+
+// beginning of sol/as_returns.hpp
+
+namespace sol {
+	template <typename T>
+	struct as_returns_t : private detail::ebco<T> {
+	private:
+		using base_t = detail::ebco<T>;
+
+	public:
+		using base_t::base_t;
+		using base_t::value;
+	};
+
+	template <typename Source>
+	auto as_returns(Source&& source) {
+		return as_returns_t<std::decay_t<Source>> { std::forward<Source>(source) };
+	}
+
+	namespace stack {
+		template <typename T>
+		struct unqualified_pusher<as_returns_t<T>> {
+			int push(lua_State* L, const as_returns_t<T>& e) {
+				auto& src = detail::unwrap(e.value());
+				int p = 0;
+				for (const auto& i : src) {
+					p += stack::push(L, i);
+				}
+				return p;
+			}
+		};
+	} // namespace stack
+} // namespace sol
+
+// end of sol/as_returns.hpp
+
+#include <vector>
+
+namespace sol {
+
+	template <typename Al = typename std::allocator<object>>
+	struct basic_variadic_results : public std::vector<object, Al> {
+	private:
+		using base_t = std::vector<object, Al>;
+
+	public:
+		basic_variadic_results() : base_t() {
+		}
+
+		basic_variadic_results(unsafe_function_result fr) : base_t() {
+			this->reserve(fr.return_count());
+			this->insert(this->cend(), fr.begin(), fr.end());
+		}
+
+		basic_variadic_results(protected_function_result fr) : base_t() {
+			this->reserve(fr.return_count());
+			this->insert(this->cend(), fr.begin(), fr.end());
+		}
+
+		template <typename Arg0, typename... Args,
+		     meta::disable_any<std::is_same<meta::unqualified_t<Arg0>, basic_variadic_results>, std::is_same<meta::unqualified_t<Arg0>, function_result>,
+		          std::is_same<meta::unqualified_t<Arg0>, protected_function_result>> = meta::enabler>
+		basic_variadic_results(Arg0&& arg0, Args&&... args) : base_t(std::forward<Arg0>(arg0), std::forward<Args>(args)...) {
+		}
+
+		basic_variadic_results(const basic_variadic_results&) = default;
+		basic_variadic_results(basic_variadic_results&&) = default;
+	};
+
+	struct variadic_results : public basic_variadic_results<> {
+	private:
+		using base_t = basic_variadic_results<>;
+
+	public:
+		using base_t::base_t;
+	};
+
+	template <typename Al>
+	struct is_container<basic_variadic_results<Al>> : std::false_type { };
+
+	template <>
+	struct is_container<variadic_results> : std::false_type { };
+
+	namespace stack {
+		template <typename Al>
+		struct unqualified_pusher<basic_variadic_results<Al>> {
+			int push(lua_State* L, const basic_variadic_results<Al>& e) {
+				int p = 0;
+				for (const auto& i : e) {
+					p += stack::push(L, i);
+				}
+				return p;
+			}
+		};
+
+		template <>
+		struct unqualified_pusher<variadic_results> {
+			int push(lua_State* L, const variadic_results& r) {
+				using base_t = basic_variadic_results<>;
+				return stack::push(L, static_cast<const base_t&>(r));
+			}
+		};
+	} // namespace stack
+
+} // namespace sol
+
+// end of sol/variadic_results.hpp
+
+#if SOL_IS_ON(SOL_COMPILER_GCC)
+#pragma GCC diagnostic pop
+#elif SOL_IS_ON(SOL_COMPILER_CLANG)
+#elif SOL_IS_ON(SOL_COMPILER_VCXX)
+#pragma warning(pop)
+#endif // g++
+
+#if SOL_IS_ON(SOL_INSIDE_UNREAL_ENGINE)
+#undef check
+#pragma pop_macro("check")
+#endif // Unreal Engine 4 Bullshit
+
+#endif // SOL_HPP
+// end of sol/sol.hpp
+
+#endif // SOL_SINGLE_INCLUDE_SOL_HPP
diff --git a/src/libs/3rdparty/sol2/sol2.qbs b/src/libs/3rdparty/sol2/sol2.qbs
new file mode 100644
index 0000000000..fb435308f7
--- /dev/null
+++ b/src/libs/3rdparty/sol2/sol2.qbs
@@ -0,0 +1,17 @@
+Product {
+    name: "sol2"
+
+    Group {
+        prefix: "include/"
+        files: [
+            "sol/config.hpp",
+            "sol/forward.hpp",
+            "sol/sol.hpp",
+        ]
+    }
+
+    Export {
+        Depends { name: "cpp" }
+        cpp.includePaths: project.ide_source_tree + "/src/libs/3rdparty/sol2/include"
+    }
+}
diff --git a/src/libs/3rdparty/sqlite/sqlite3.c b/src/libs/3rdparty/sqlite/sqlite3.c
index 139ee46a6a..08c593e55c 100644
--- a/src/libs/3rdparty/sqlite/sqlite3.c
+++ b/src/libs/3rdparty/sqlite/sqlite3.c
@@ -1,6 +1,6 @@
 /******************************************************************************
 ** This file is an amalgamation of many separate C source files from SQLite
-** version 3.45.1.  By combining all the individual C code files into this
+** version 3.45.3.  By combining all the individual C code files into this
 ** single large file, the entire code can be compiled as a single translation
 ** unit.  This allows many compilers to do optimizations that would not be
 ** possible if the files were compiled separately.  Performance improvements
@@ -18,7 +18,7 @@
 ** separate file. This file contains only code for the core SQLite library.
 **
 ** The content in this amalgamation comes from Fossil check-in
-** e876e51a0ed5c5b3126f52e532044363a014.
+** 8653b758870e6ef0c98d46b3ace27849054a.
 */
 #define SQLITE_CORE 1
 #define SQLITE_AMALGAMATION 1
@@ -459,9 +459,9 @@ extern "C" {
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
 ** [sqlite_version()] and [sqlite_source_id()].
 */
-#define SQLITE_VERSION        "3.45.1"
-#define SQLITE_VERSION_NUMBER 3045001
-#define SQLITE_SOURCE_ID      "2024-01-30 16:01:20 e876e51a0ed5c5b3126f52e532044363a014bc594cfefa87ffb5b82257cc467a"
+#define SQLITE_VERSION        "3.45.3"
+#define SQLITE_VERSION_NUMBER 3045003
+#define SQLITE_SOURCE_ID      "2024-04-15 13:34:05 8653b758870e6ef0c98d46b3ace27849054af85da891eb121e9aaa537f1e8355"
 
 /*
 ** CAPI3REF: Run-Time Library Version Numbers
@@ -733,6 +733,8 @@ typedef int (*sqlite3_callback)(void*,int,char**, char**);
 **      the 1st parameter to sqlite3_exec() while sqlite3_exec() is running.
 ** <li> The application must not modify the SQL statement text passed into
 **      the 2nd parameter of sqlite3_exec() while sqlite3_exec() is running.
+** <li> The application must not dereference the arrays or string pointers
+**       passed as the 3rd and 4th callback parameters after it returns.
 ** </ul>
 */
 SQLITE_API int sqlite3_exec(
@@ -2454,6 +2456,22 @@ struct sqlite3_mem_methods {
 ** configuration setting is never used, then the default maximum is determined
 ** by the [SQLITE_MEMDB_DEFAULT_MAXSIZE] compile-time option.  If that
 ** compile-time option is not set, then the default maximum is 1073741824.
+**
+** [[SQLITE_CONFIG_ROWID_IN_VIEW]]
+** <dt>SQLITE_CONFIG_ROWID_IN_VIEW
+** <dd>The SQLITE_CONFIG_ROWID_IN_VIEW option enables or disables the ability
+** for VIEWs to have a ROWID.  The capability can only be enabled if SQLite is
+** compiled with -DSQLITE_ALLOW_ROWID_IN_VIEW, in which case the capability
+** defaults to on.  This configuration option queries the current setting or
+** changes the setting to off or on.  The argument is a pointer to an integer.
+** If that integer initially holds a value of 1, then the ability for VIEWs to
+** have ROWIDs is activated.  If the integer initially holds zero, then the
+** ability is deactivated.  Any other initial value for the integer leaves the
+** setting unchanged.  After changes, if any, the integer is written with
+** a 1 or 0, if the ability for VIEWs to have ROWIDs is on or off.  If SQLite
+** is compiled without -DSQLITE_ALLOW_ROWID_IN_VIEW (which is the usual and
+** recommended case) then the integer is always filled with zero, regardless
+** if its initial value.
 ** </dl>
 */
 #define SQLITE_CONFIG_SINGLETHREAD         1  /* nil */
@@ -2485,6 +2503,7 @@ struct sqlite3_mem_methods {
 #define SQLITE_CONFIG_SMALL_MALLOC        27  /* boolean */
 #define SQLITE_CONFIG_SORTERREF_SIZE      28  /* int nByte */
 #define SQLITE_CONFIG_MEMDB_MAXSIZE       29  /* sqlite3_int64 */
+#define SQLITE_CONFIG_ROWID_IN_VIEW       30  /* int* */
 
 /*
 ** CAPI3REF: Database Connection Configuration Options
@@ -15097,6 +15116,7 @@ SQLITE_PRIVATE u32 sqlite3TreeTrace;
 **   0x00010000     Beginning of DELETE/INSERT/UPDATE processing
 **   0x00020000     Transform DISTINCT into GROUP BY
 **   0x00040000     SELECT tree dump after all code has been generated
+**   0x00080000     NOT NULL strength reduction
 */
 
 /*
@@ -18427,6 +18447,15 @@ struct Table {
 #define HasRowid(X)     (((X)->tabFlags & TF_WithoutRowid)==0)
 #define VisibleRowid(X) (((X)->tabFlags & TF_NoVisibleRowid)==0)
 
+/* Macro is true if the SQLITE_ALLOW_ROWID_IN_VIEW (mis-)feature is
+** available.  By default, this macro is false
+*/
+#ifndef SQLITE_ALLOW_ROWID_IN_VIEW
+# define ViewCanHaveRowid     0
+#else
+# define ViewCanHaveRowid     (sqlite3Config.mNoVisibleRowid==0)
+#endif
+
 /*
 ** Each foreign key constraint is an instance of the following structure.
 **
@@ -19346,6 +19375,7 @@ struct NameContext {
 #define NC_InAggFunc 0x020000 /* True if analyzing arguments to an agg func */
 #define NC_FromDDL   0x040000 /* SQL text comes from sqlite_schema */
 #define NC_NoSelect  0x080000 /* Do not descend into sub-selects */
+#define NC_Where     0x100000 /* Processing WHERE clause of a SELECT */
 #define NC_OrderAgg 0x8000000 /* Has an aggregate other than count/min/max */
 
 /*
@@ -19369,6 +19399,7 @@ struct Upsert {
   Expr *pUpsertWhere;       /* WHERE clause for the ON CONFLICT UPDATE */
   Upsert *pNextUpsert;      /* Next ON CONFLICT clause in the list */
   u8 isDoUpdate;            /* True for DO UPDATE.  False for DO NOTHING */
+  u8 isDup;                 /* True if 2nd or later with same pUpsertIdx */
   /* Above this point is the parse tree for the ON CONFLICT clauses.
   ** The next group of fields stores intermediate data. */
   void *pToFree;            /* Free memory when deleting the Upsert object */
@@ -20140,6 +20171,11 @@ struct Sqlite3Config {
 #ifndef SQLITE_UNTESTABLE
   int (*xTestCallback)(int);        /* Invoked by sqlite3FaultSim() */
 #endif
+#ifdef SQLITE_ALLOW_ROWID_IN_VIEW
+  u32 mNoVisibleRowid;              /* TF_NoVisibleRowid if the ROWID_IN_VIEW
+                                    ** feature is disabled.  0 if rowids can
+                                    ** occur in views. */
+#endif
   int bLocaltimeFault;              /* True to fail localtime() calls */
   int (*xAltLocaltime)(const void*,void*); /* Alternative localtime() routine */
   int iOnceResetThreshold;          /* When to reset OP_Once counters */
@@ -20595,10 +20631,13 @@ SQLITE_PRIVATE void sqlite3MutexWarnOnContention(sqlite3_mutex*);
 # define EXP754 (((u64)0x7ff)<<52)
 # define MAN754 ((((u64)1)<<52)-1)
 # define IsNaN(X) (((X)&EXP754)==EXP754 && ((X)&MAN754)!=0)
+# define IsOvfl(X) (((X)&EXP754)==EXP754)
 SQLITE_PRIVATE   int sqlite3IsNaN(double);
+SQLITE_PRIVATE   int sqlite3IsOverflow(double);
 #else
-# define IsNaN(X)         0
-# define sqlite3IsNaN(X)  0
+# define IsNaN(X)             0
+# define sqlite3IsNaN(X)      0
+# define sqlite3IsOVerflow(X) 0
 #endif
 
 /*
@@ -21444,7 +21483,7 @@ SQLITE_PRIVATE   With *sqlite3WithPush(Parse*, With*, u8);
 SQLITE_PRIVATE   Upsert *sqlite3UpsertNew(sqlite3*,ExprList*,Expr*,ExprList*,Expr*,Upsert*);
 SQLITE_PRIVATE   void sqlite3UpsertDelete(sqlite3*,Upsert*);
 SQLITE_PRIVATE   Upsert *sqlite3UpsertDup(sqlite3*,Upsert*);
-SQLITE_PRIVATE   int sqlite3UpsertAnalyzeTarget(Parse*,SrcList*,Upsert*);
+SQLITE_PRIVATE   int sqlite3UpsertAnalyzeTarget(Parse*,SrcList*,Upsert*,Upsert*);
 SQLITE_PRIVATE   void sqlite3UpsertDoUpdate(Parse*,Upsert*,Table*,Index*,int);
 SQLITE_PRIVATE   Upsert *sqlite3UpsertOfIndex(Upsert*,Index*);
 SQLITE_PRIVATE   int sqlite3UpsertNextIsIPK(Upsert*);
@@ -21834,6 +21873,9 @@ static const char * const sqlite3azCompileOpt[] = {
   "ALLOW_COVERING_INDEX_SCAN=" CTIMEOPT_VAL(SQLITE_ALLOW_COVERING_INDEX_SCAN),
 # endif
 #endif
+#ifdef SQLITE_ALLOW_ROWID_IN_VIEW
+  "ALLOW_ROWID_IN_VIEW",
+#endif
 #ifdef SQLITE_ALLOW_URI_AUTHORITY
   "ALLOW_URI_AUTHORITY",
 #endif
@@ -22854,6 +22896,9 @@ SQLITE_PRIVATE SQLITE_WSD struct Sqlite3Config sqlite3Config = {
 #ifndef SQLITE_UNTESTABLE
    0,                         /* xTestCallback */
 #endif
+#ifdef SQLITE_ALLOW_ROWID_IN_VIEW
+   0,                         /* mNoVisibleRowid.  0 == allow rowid-in-view */
+#endif
    0,                         /* bLocaltimeFault */
    0,                         /* xAltLocaltime */
    0x7ffffffe,                /* iOnceResetThreshold */
@@ -31309,6 +31354,7 @@ SQLITE_API void sqlite3_str_vappendf(
         if( xtype==etFLOAT ){
           iRound = -precision;
         }else if( xtype==etGENERIC ){
+          if( precision==0 ) precision = 1;
           iRound = precision;
         }else{
           iRound = precision+1;
@@ -34640,6 +34686,19 @@ SQLITE_PRIVATE int sqlite3IsNaN(double x){
 }
 #endif /* SQLITE_OMIT_FLOATING_POINT */
 
+#ifndef SQLITE_OMIT_FLOATING_POINT
+/*
+** Return true if the floating point value is NaN or +Inf or -Inf.
+*/
+SQLITE_PRIVATE int sqlite3IsOverflow(double x){
+  int rc;   /* The value return */
+  u64 y;
+  memcpy(&y,&x,sizeof(y));
+  rc = IsOvfl(y);
+  return rc;
+}
+#endif /* SQLITE_OMIT_FLOATING_POINT */
+
 /*
 ** Compute a string length that is limited to what can be stored in
 ** lower 30 bits of a 32-bit signed integer.
@@ -35199,6 +35258,9 @@ do_atof_calc:
     u64 s2;
     rr[0] = (double)s;
     s2 = (u64)rr[0];
+#if defined(_MSC_VER) && _MSC_VER<1700
+    if( s2==0x8000000000000000LL ){ s2 = 2*(u64)(0.5*rr[0]); }
+#endif
     rr[1] = s>=s2 ? (double)(s - s2) : -(double)(s2 - s);
     if( e>0 ){
       while( e>=100  ){
@@ -35641,7 +35703,7 @@ SQLITE_PRIVATE void sqlite3FpDecode(FpDecode *p, double r, int iRound, int mxRou
   assert( p->n>0 );
   assert( p->n<sizeof(p->zBuf) );
   p->iDP = p->n + exp;
-  if( iRound<0 ){
+  if( iRound<=0 ){
     iRound = p->iDP - iRound;
     if( iRound==0 && p->zBuf[i+1]>='5' ){
       iRound = 1;
@@ -53262,6 +53324,14 @@ SQLITE_API unsigned char *sqlite3_serialize(
     pOut = 0;
   }else{
     sz = sqlite3_column_int64(pStmt, 0)*szPage;
+    if( sz==0 ){
+      sqlite3_reset(pStmt);
+      sqlite3_exec(db, "BEGIN IMMEDIATE; COMMIT;", 0, 0, 0);
+      rc = sqlite3_step(pStmt);
+      if( rc==SQLITE_ROW ){
+        sz = sqlite3_column_int64(pStmt, 0)*szPage;
+      }
+    }
     if( piSize ) *piSize = sz;
     if( mFlags & SQLITE_SERIALIZE_NOCOPY ){
       pOut = 0;
@@ -63785,7 +63855,7 @@ SQLITE_PRIVATE sqlite3_file *sqlite3PagerFile(Pager *pPager){
 ** This will be either the rollback journal or the WAL file.
 */
 SQLITE_PRIVATE sqlite3_file *sqlite3PagerJrnlFile(Pager *pPager){
-#if SQLITE_OMIT_WAL
+#ifdef SQLITE_OMIT_WAL
   return pPager->jfd;
 #else
   return pPager->pWal ? sqlite3WalFile(pPager->pWal) : pPager->jfd;
@@ -77088,7 +77158,10 @@ static int fillInCell(
     n = nHeader + nPayload;
     testcase( n==3 );
     testcase( n==4 );
-    if( n<4 ) n = 4;
+    if( n<4 ){
+      n = 4;
+      pPayload[nPayload] = 0;
+    }
     *pnSize = n;
     assert( nSrc<=nPayload );
     testcase( nSrc<nPayload );
@@ -79534,7 +79607,10 @@ SQLITE_PRIVATE int sqlite3BtreeInsert(
   if( flags & BTREE_PREFORMAT ){
     rc = SQLITE_OK;
     szNew = p->pBt->nPreformatSize;
-    if( szNew<4 ) szNew = 4;
+    if( szNew<4 ){
+      szNew = 4;
+      newCell[3] = 0;
+    }
     if( ISAUTOVACUUM(p->pBt) && szNew>pPage->maxLocal ){
       CellInfo info;
       pPage->xParseCell(pPage, newCell, &info);
@@ -79596,7 +79672,7 @@ SQLITE_PRIVATE int sqlite3BtreeInsert(
   }else if( loc<0 && pPage->nCell>0 ){
     assert( pPage->leaf );
     idx = ++pCur->ix;
-    pCur->curFlags &= ~BTCF_ValidNKey;
+    pCur->curFlags &= ~(BTCF_ValidNKey|BTCF_ValidOvfl);
   }else{
     assert( pPage->leaf );
   }
@@ -79626,7 +79702,7 @@ SQLITE_PRIVATE int sqlite3BtreeInsert(
   */
   if( pPage->nOverflow ){
     assert( rc==SQLITE_OK );
-    pCur->curFlags &= ~(BTCF_ValidNKey);
+    pCur->curFlags &= ~(BTCF_ValidNKey|BTCF_ValidOvfl);
     rc = balance(pCur);
 
     /* Must make sure nOverflow is reset to zero even if the balance()
@@ -88379,6 +88455,23 @@ static void serialGet(
     pMem->flags = IsNaN(x) ? MEM_Null : MEM_Real;
   }
 }
+static int serialGet7(
+  const unsigned char *buf,     /* Buffer to deserialize from */
+  Mem *pMem                     /* Memory cell to write value into */
+){
+  u64 x = FOUR_BYTE_UINT(buf);
+  u32 y = FOUR_BYTE_UINT(buf+4);
+  x = (x<<32) + y;
+  assert( sizeof(x)==8 && sizeof(pMem->u.r)==8 );
+  swapMixedEndianFloat(x);
+  memcpy(&pMem->u.r, &x, sizeof(x));
+  if( IsNaN(x) ){
+    pMem->flags = MEM_Null;
+    return 1;
+  }
+  pMem->flags = MEM_Real;
+  return 0;
+}
 SQLITE_PRIVATE void sqlite3VdbeSerialGet(
   const unsigned char *buf,     /* Buffer to deserialize from */
   u32 serial_type,              /* Serial type to deserialize */
@@ -89058,7 +89151,7 @@ SQLITE_PRIVATE int sqlite3VdbeRecordCompareWithSkip(
       }else if( serial_type==0 ){
         rc = -1;
       }else if( serial_type==7 ){
-        sqlite3VdbeSerialGet(&aKey1[d1], serial_type, &mem1);
+        serialGet7(&aKey1[d1], &mem1);
         rc = -sqlite3IntFloatCompare(pRhs->u.i, mem1.u.r);
       }else{
         i64 lhs = vdbeRecordDecodeInt(serial_type, &aKey1[d1]);
@@ -89083,14 +89176,18 @@ SQLITE_PRIVATE int sqlite3VdbeRecordCompareWithSkip(
       }else if( serial_type==0 ){
         rc = -1;
       }else{
-        sqlite3VdbeSerialGet(&aKey1[d1], serial_type, &mem1);
         if( serial_type==7 ){
-          if( mem1.u.r<pRhs->u.r ){
+          if( serialGet7(&aKey1[d1], &mem1) ){
+            rc = -1;  /* mem1 is a NaN */
+          }else if( mem1.u.r<pRhs->u.r ){
             rc = -1;
           }else if( mem1.u.r>pRhs->u.r ){
             rc = +1;
+          }else{
+            assert( rc==0 );
           }
         }else{
+          sqlite3VdbeSerialGet(&aKey1[d1], serial_type, &mem1);
           rc = sqlite3IntFloatCompare(mem1.u.i, pRhs->u.r);
         }
       }
@@ -89160,7 +89257,14 @@ SQLITE_PRIVATE int sqlite3VdbeRecordCompareWithSkip(
     /* RHS is null */
     else{
       serial_type = aKey1[idx1];
-      rc = (serial_type!=0 && serial_type!=10);
+      if( serial_type==0
+       || serial_type==10
+       || (serial_type==7 && serialGet7(&aKey1[d1], &mem1)!=0)
+      ){
+        assert( rc==0 );
+      }else{
+        rc = 1;
+      }
     }
 
     if( rc!=0 ){
@@ -94858,7 +94962,9 @@ case OP_Ge: {             /* same as TK_GE, jump, in1, in3 */
         }
       }
     }else if( affinity==SQLITE_AFF_TEXT && ((flags1 | flags3) & MEM_Str)!=0 ){
-      if( (flags1 & MEM_Str)==0 && (flags1&(MEM_Int|MEM_Real|MEM_IntReal))!=0 ){
+      if( (flags1 & MEM_Str)!=0 ){
+        pIn1->flags &= ~(MEM_Int|MEM_Real|MEM_IntReal);
+      }else if( (flags1&(MEM_Int|MEM_Real|MEM_IntReal))!=0 ){
         testcase( pIn1->flags & MEM_Int );
         testcase( pIn1->flags & MEM_Real );
         testcase( pIn1->flags & MEM_IntReal );
@@ -94867,7 +94973,9 @@ case OP_Ge: {             /* same as TK_GE, jump, in1, in3 */
         flags1 = (pIn1->flags & ~MEM_TypeMask) | (flags1 & MEM_TypeMask);
         if( NEVER(pIn1==pIn3) ) flags3 = flags1 | MEM_Str;
       }
-      if( (flags3 & MEM_Str)==0 && (flags3&(MEM_Int|MEM_Real|MEM_IntReal))!=0 ){
+      if( (flags3 & MEM_Str)!=0 ){
+        pIn3->flags &= ~(MEM_Int|MEM_Real|MEM_IntReal);
+      }else if( (flags3&(MEM_Int|MEM_Real|MEM_IntReal))!=0 ){
         testcase( pIn3->flags & MEM_Int );
         testcase( pIn3->flags & MEM_Real );
         testcase( pIn3->flags & MEM_IntReal );
@@ -106212,6 +106320,8 @@ static void resolveAlias(
   assert( iCol>=0 && iCol<pEList->nExpr );
   pOrig = pEList->a[iCol].pExpr;
   assert( pOrig!=0 );
+  assert( !ExprHasProperty(pExpr, EP_Reduced|EP_TokenOnly) );
+  if( pExpr->pAggInfo ) return;
   db = pParse->db;
   pDup = sqlite3ExprDup(db, pOrig, 0);
   if( db->mallocFailed ){
@@ -106599,8 +106709,37 @@ static int lookupName(
           }
         }
         if( 0==cnt && VisibleRowid(pTab) ){
+          /* pTab is a potential ROWID match.  Keep track of it and match
+          ** the ROWID later if that seems appropriate.  (Search for "cntTab"
+          ** to find related code.)  Only allow a ROWID match if there is
+          ** a single ROWID match candidate.
+          */
+#ifdef SQLITE_ALLOW_ROWID_IN_VIEW
+          /* In SQLITE_ALLOW_ROWID_IN_VIEW mode, allow a ROWID match
+          ** if there is a single VIEW candidate or if there is a single
+          ** non-VIEW candidate plus multiple VIEW candidates.  In other
+          ** words non-VIEW candidate terms take precedence over VIEWs.
+          */
+          if( cntTab==0
+           || (cntTab==1
+               && ALWAYS(pMatch!=0)
+               && ALWAYS(pMatch->pTab!=0)
+               && (pMatch->pTab->tabFlags & TF_Ephemeral)!=0
+               && (pTab->tabFlags & TF_Ephemeral)==0)
+          ){
+            cntTab = 1;
+            pMatch = pItem;
+          }else{
+            cntTab++;
+          }
+#else
+          /* The (much more common) non-SQLITE_ALLOW_ROWID_IN_VIEW case is
+          ** simpler since we require exactly one candidate, which will
+          ** always be a non-VIEW
+          */
           cntTab++;
           pMatch = pItem;
+#endif
         }
       }
       if( pMatch ){
@@ -106726,13 +106865,13 @@ static int lookupName(
     ** Perhaps the name is a reference to the ROWID
     */
     if( cnt==0
-     && cntTab==1
+     && cntTab>=1
      && pMatch
      && (pNC->ncFlags & (NC_IdxExpr|NC_GenCol))==0
      && sqlite3IsRowid(zCol)
      && ALWAYS(VisibleRowid(pMatch->pTab) || pMatch->fg.isNestedFrom)
     ){
-      cnt = 1;
+      cnt = cntTab;
       if( pMatch->fg.isNestedFrom==0 ) pExpr->iColumn = -1;
       pExpr->affExpr = SQLITE_AFF_INTEGER;
     }
@@ -107097,6 +107236,19 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){
     ** resolved.  This prevents "column" from being counted as having been
     ** referenced, which might prevent a SELECT from being erroneously
     ** marked as correlated.
+    **
+    ** 2024-03-28: Beware of aggregates.  A bare column of aggregated table
+    ** can still evaluate to NULL even though it is marked as NOT NULL.
+    ** Example:
+    **
+    **       CREATE TABLE t1(a INT NOT NULL);
+    **       SELECT a, a IS NULL, a IS NOT NULL, count(*) FROM t1;
+    **
+    ** The "a IS NULL" and "a IS NOT NULL" expressions cannot be optimized
+    ** here because at the time this case is hit, we do not yet know whether
+    ** or not t1 is being aggregated.  We have to assume the worst and omit
+    ** the optimization.  The only time it is safe to apply this optimization
+    ** is within the WHERE clause.
     */
     case TK_NOTNULL:
     case TK_ISNULL: {
@@ -107107,19 +107259,36 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){
         anRef[i] = p->nRef;
       }
       sqlite3WalkExpr(pWalker, pExpr->pLeft);
-      if( 0==sqlite3ExprCanBeNull(pExpr->pLeft) && !IN_RENAME_OBJECT ){
-        testcase( ExprHasProperty(pExpr, EP_OuterON) );
-        assert( !ExprHasProperty(pExpr, EP_IntValue) );
-        pExpr->u.iValue = (pExpr->op==TK_NOTNULL);
-        pExpr->flags |= EP_IntValue;
-        pExpr->op = TK_INTEGER;
+      if( IN_RENAME_OBJECT ) return WRC_Prune;
+      if( sqlite3ExprCanBeNull(pExpr->pLeft) ){
+        /* The expression can be NULL.  So the optimization does not apply */
+        return WRC_Prune;
+      }
 
-        for(i=0, p=pNC; p && i<ArraySize(anRef); p=p->pNext, i++){
-          p->nRef = anRef[i];
+      for(i=0, p=pNC; p; p=p->pNext, i++){
+        if( (p->ncFlags & NC_Where)==0 ){
+          return WRC_Prune;  /* Not in a WHERE clause.  Unsafe to optimize. */
         }
-        sqlite3ExprDelete(pParse->db, pExpr->pLeft);
-        pExpr->pLeft = 0;
       }
+      testcase( ExprHasProperty(pExpr, EP_OuterON) );
+      assert( !ExprHasProperty(pExpr, EP_IntValue) );
+#if TREETRACE_ENABLED
+      if( sqlite3TreeTrace & 0x80000 ){
+        sqlite3DebugPrintf(
+           "NOT NULL strength reduction converts the following to %d:\n",
+           pExpr->op==TK_NOTNULL
+        );
+        sqlite3ShowExpr(pExpr);
+      }
+#endif /* TREETRACE_ENABLED */
+      pExpr->u.iValue = (pExpr->op==TK_NOTNULL);
+      pExpr->flags |= EP_IntValue;
+      pExpr->op = TK_INTEGER;
+      for(i=0, p=pNC; p && i<ArraySize(anRef); p=p->pNext, i++){
+        p->nRef = anRef[i];
+      }
+      sqlite3ExprDelete(pParse->db, pExpr->pLeft);
+      pExpr->pLeft = 0;
       return WRC_Prune;
     }
 
@@ -108019,7 +108188,9 @@ static int resolveSelectStep(Walker *pWalker, Select *p){
       }
       if( sqlite3ResolveExprNames(&sNC, p->pHaving) ) return WRC_Abort;
     }
+    sNC.ncFlags |= NC_Where;
     if( sqlite3ResolveExprNames(&sNC, p->pWhere) ) return WRC_Abort;
+    sNC.ncFlags &= ~NC_Where;
 
     /* Resolve names in table-valued-function arguments */
     for(i=0; i<p->pSrc->nSrc; i++){
@@ -108558,9 +108729,10 @@ SQLITE_PRIVATE Expr *sqlite3ExprSkipCollateAndLikely(Expr *pExpr){
       assert( pExpr->x.pList->nExpr>0 );
       assert( pExpr->op==TK_FUNCTION );
       pExpr = pExpr->x.pList->a[0].pExpr;
-    }else{
-      assert( pExpr->op==TK_COLLATE );
+    }else if( pExpr->op==TK_COLLATE ){
       pExpr = pExpr->pLeft;
+    }else{
+      break;
     }
   }
   return pExpr;
@@ -111079,9 +111251,12 @@ SQLITE_PRIVATE int sqlite3ExprCanBeNull(const Expr *p){
       return 0;
     case TK_COLUMN:
       assert( ExprUseYTab(p) );
-      return ExprHasProperty(p, EP_CanBeNull) ||
-             NEVER(p->y.pTab==0) ||  /* Reference to column of index on expr */
-             (p->iColumn>=0
+      return ExprHasProperty(p, EP_CanBeNull)
+          || NEVER(p->y.pTab==0) /* Reference to column of index on expr */
+#ifdef SQLITE_ALLOW_ROWID_IN_VIEW
+          || (p->iColumn==XN_ROWID && IsView(p->y.pTab))
+#endif
+          || (p->iColumn>=0
               && p->y.pTab->aCol!=0 /* Possible due to prior error */
               && ALWAYS(p->iColumn<p->y.pTab->nCol)
               && p->y.pTab->aCol[p->iColumn].notNull==0);
@@ -123572,9 +123747,12 @@ SQLITE_PRIVATE void sqlite3CreateView(
   ** on a view, even though views do not have rowids.  The following flag
   ** setting fixes this problem.  But the fix can be disabled by compiling
   ** with -DSQLITE_ALLOW_ROWID_IN_VIEW in case there are legacy apps that
-  ** depend upon the old buggy behavior. */
-#ifndef SQLITE_ALLOW_ROWID_IN_VIEW
-  p->tabFlags |= TF_NoVisibleRowid;
+  ** depend upon the old buggy behavior.  The ability can also be toggled
+  ** using sqlite3_config(SQLITE_CONFIG_ROWID_IN_VIEW,...) */
+#ifdef SQLITE_ALLOW_ROWID_IN_VIEW
+  p->tabFlags |= sqlite3Config.mNoVisibleRowid; /* Optional. Allow by default */
+#else
+  p->tabFlags |= TF_NoVisibleRowid;             /* Never allow rowid in view */
 #endif
 
   sqlite3TwoPartName(pParse, pName1, pName2, &pName);
@@ -128947,13 +129125,13 @@ SQLITE_PRIVATE void sqlite3QuoteValue(StrAccum *pStr, sqlite3_value *pValue){
       double r1, r2;
       const char *zVal;
       r1 = sqlite3_value_double(pValue);
-      sqlite3_str_appendf(pStr, "%!.15g", r1);
+      sqlite3_str_appendf(pStr, "%!0.15g", r1);
       zVal = sqlite3_str_value(pStr);
       if( zVal ){
         sqlite3AtoF(zVal, &r2, pStr->nChar, SQLITE_UTF8);
         if( r1!=r2 ){
           sqlite3_str_reset(pStr);
-          sqlite3_str_appendf(pStr, "%!.20e", r1);
+          sqlite3_str_appendf(pStr, "%!0.20e", r1);
         }
       }
       break;
@@ -129255,7 +129433,7 @@ static void replaceFunc(
   }
   if( zPattern[0]==0 ){
     assert( sqlite3_value_type(argv[1])!=SQLITE_NULL );
-    sqlite3_result_value(context, argv[0]);
+    sqlite3_result_text(context, (const char*)zStr, nStr, SQLITE_TRANSIENT);
     return;
   }
   nPattern = sqlite3_value_bytes(argv[1]);
@@ -129738,7 +129916,7 @@ static void sumFinalize(sqlite3_context *context){
     if( p->approx ){
       if( p->ovrfl ){
         sqlite3_result_error(context,"integer overflow",-1);
-      }else if( !sqlite3IsNaN(p->rErr) ){
+      }else if( !sqlite3IsOverflow(p->rErr) ){
         sqlite3_result_double(context, p->rSum+p->rErr);
       }else{
         sqlite3_result_double(context, p->rSum);
@@ -129755,7 +129933,7 @@ static void avgFinalize(sqlite3_context *context){
     double r;
     if( p->approx ){
       r = p->rSum;
-      if( !sqlite3IsNaN(p->rErr) ) r += p->rErr;
+      if( !sqlite3IsOverflow(p->rErr) ) r += p->rErr;
     }else{
       r = (double)(p->iSum);
     }
@@ -129769,7 +129947,7 @@ static void totalFinalize(sqlite3_context *context){
   if( p ){
     if( p->approx ){
       r = p->rSum;
-      if( !sqlite3IsNaN(p->rErr) ) r += p->rErr;
+      if( !sqlite3IsOverflow(p->rErr) ) r += p->rErr;
     }else{
       r = (double)(p->iSum);
     }
@@ -133175,7 +133353,7 @@ SQLITE_PRIVATE void sqlite3Insert(
       pNx->iDataCur = iDataCur;
       pNx->iIdxCur = iIdxCur;
       if( pNx->pUpsertTarget ){
-        if( sqlite3UpsertAnalyzeTarget(pParse, pTabList, pNx) ){
+        if( sqlite3UpsertAnalyzeTarget(pParse, pTabList, pNx, pUpsert) ){
           goto insert_cleanup;
         }
       }
@@ -135067,7 +135245,10 @@ static int xferOptimization(
     }
   }
 #ifndef SQLITE_OMIT_CHECK
-  if( pDest->pCheck && sqlite3ExprListCompare(pSrc->pCheck,pDest->pCheck,-1) ){
+  if( pDest->pCheck
+   && (db->mDbFlags & DBFLAG_Vacuum)==0
+   && sqlite3ExprListCompare(pSrc->pCheck,pDest->pCheck,-1)
+  ){
     return 0;   /* Tables have different CHECK constraints.  Ticket #2252 */
   }
 #endif
@@ -139474,31 +139655,7 @@ SQLITE_PRIVATE void sqlite3Pragma(
         int mxCol;              /* Maximum non-virtual column number */
 
         if( pObjTab && pObjTab!=pTab ) continue;
-        if( !IsOrdinaryTable(pTab) ){
-#ifndef SQLITE_OMIT_VIRTUALTABLE
-          sqlite3_vtab *pVTab;
-          int a1;
-          if( !IsVirtual(pTab) ) continue;
-          if( pTab->nCol<=0 ){
-            const char *zMod = pTab->u.vtab.azArg[0];
-            if( sqlite3HashFind(&db->aModule, zMod)==0 ) continue;
-          }
-          sqlite3ViewGetColumnNames(pParse, pTab);
-          if( pTab->u.vtab.p==0 ) continue;
-          pVTab = pTab->u.vtab.p->pVtab;
-          if( NEVER(pVTab==0) ) continue;
-          if( NEVER(pVTab->pModule==0) ) continue;
-          if( pVTab->pModule->iVersion<4 ) continue;
-          if( pVTab->pModule->xIntegrity==0 ) continue;
-          sqlite3VdbeAddOp3(v, OP_VCheck, i, 3, isQuick);
-          pTab->nTabRef++;
-          sqlite3VdbeAppendP4(v, pTab, P4_TABLEREF);
-          a1 = sqlite3VdbeAddOp1(v, OP_IsNull, 3); VdbeCoverage(v);
-          integrityCheckResultRow(v);
-          sqlite3VdbeJumpHere(v, a1);
-#endif
-          continue;
-        }
+        if( !IsOrdinaryTable(pTab) ) continue;
         if( isQuick || HasRowid(pTab) ){
           pPk = 0;
           r2 = 0;
@@ -139633,6 +139790,7 @@ SQLITE_PRIVATE void sqlite3Pragma(
               ** is REAL, we have to load the actual data using OP_Column
               ** to reliably determine if the value is a NULL. */
               sqlite3VdbeAddOp3(v, OP_Column, p1, p3, 3);
+              sqlite3ColumnDefault(v, pTab, j, 3);
               jmp3 = sqlite3VdbeAddOp2(v, OP_NotNull, 3, labelOk);
               VdbeCoverage(v);
             }
@@ -139823,6 +139981,38 @@ SQLITE_PRIVATE void sqlite3Pragma(
           }
         }
       }
+
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+      /* Second pass to invoke the xIntegrity method on all virtual
+      ** tables.
+      */
+      for(x=sqliteHashFirst(pTbls); x; x=sqliteHashNext(x)){
+        Table *pTab = sqliteHashData(x);
+        sqlite3_vtab *pVTab;
+        int a1;
+        if( pObjTab && pObjTab!=pTab ) continue;
+        if( IsOrdinaryTable(pTab) ) continue;
+        if( !IsVirtual(pTab) ) continue;
+        if( pTab->nCol<=0 ){
+          const char *zMod = pTab->u.vtab.azArg[0];
+          if( sqlite3HashFind(&db->aModule, zMod)==0 ) continue;
+        }
+        sqlite3ViewGetColumnNames(pParse, pTab);
+        if( pTab->u.vtab.p==0 ) continue;
+        pVTab = pTab->u.vtab.p->pVtab;
+        if( NEVER(pVTab==0) ) continue;
+        if( NEVER(pVTab->pModule==0) ) continue;
+        if( pVTab->pModule->iVersion<4 ) continue;
+        if( pVTab->pModule->xIntegrity==0 ) continue;
+        sqlite3VdbeAddOp3(v, OP_VCheck, i, 3, isQuick);
+        pTab->nTabRef++;
+        sqlite3VdbeAppendP4(v, pTab, P4_TABLEREF);
+        a1 = sqlite3VdbeAddOp1(v, OP_IsNull, 3); VdbeCoverage(v);
+        integrityCheckResultRow(v);
+        sqlite3VdbeJumpHere(v, a1);
+        continue;
+      }
+#endif
     }
     {
       static const int iLn = VDBE_OFFSET_LINENO(2);
@@ -140459,7 +140649,11 @@ static int pragmaVtabBestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){
   j = seen[0]-1;
   pIdxInfo->aConstraintUsage[j].argvIndex = 1;
   pIdxInfo->aConstraintUsage[j].omit = 1;
-  if( seen[1]==0 ) return SQLITE_OK;
+  if( seen[1]==0 ){
+    pIdxInfo->estimatedCost = (double)1000;
+    pIdxInfo->estimatedRows = 1000;
+    return SQLITE_OK;
+  }
   pIdxInfo->estimatedCost = (double)20;
   pIdxInfo->estimatedRows = 20;
   j = seen[1]-1;
@@ -143686,11 +143880,7 @@ static const char *columnTypeImpl(
         ** data for the result-set column of the sub-select.
         */
         if( iCol<pS->pEList->nExpr
-#ifdef SQLITE_ALLOW_ROWID_IN_VIEW
-         && iCol>=0
-#else
-         && ALWAYS(iCol>=0)
-#endif
+         && (!ViewCanHaveRowid || iCol>=0)
         ){
           /* If iCol is less than zero, then the expression requests the
           ** rowid of the sub-select or view. This expression is legal (see
@@ -146865,6 +147055,10 @@ static int pushDownWindowCheck(Parse *pParse, Select *pSubq, Expr *pExpr){
 **
 **  (11) The subquery is not a VALUES clause
 **
+**  (12) The WHERE clause is not "rowid ISNULL" or the equivalent.  This
+**       case only comes up if SQLite is compiled using
+**       SQLITE_ALLOW_ROWID_IN_VIEW.
+**
 ** Return 0 if no changes are made and non-zero if one or more WHERE clause
 ** terms are duplicated into the subquery.
 */
@@ -146975,6 +147169,18 @@ static int pushDownWhereTerms(
   }
 #endif
 
+#ifdef SQLITE_ALLOW_ROWID_IN_VIEW
+  if( ViewCanHaveRowid && (pWhere->op==TK_ISNULL || pWhere->op==TK_NOTNULL) ){
+    Expr *pLeft = pWhere->pLeft;
+    if( ALWAYS(pLeft)
+     && pLeft->op==TK_COLUMN
+     && pLeft->iColumn < 0
+    ){
+      return 0;  /* Restriction (12) */
+    }
+  }
+#endif
+
   if( sqlite3ExprIsSingleTableConstraint(pWhere, pSrcList, iSrc) ){
     nChng++;
     pSubq->selFlags |= SF_PushDown;
@@ -147602,12 +147808,14 @@ SQLITE_PRIVATE int sqlite3ExpandSubquery(Parse *pParse, SrcItem *pFrom){
   while( pSel->pPrior ){ pSel = pSel->pPrior; }
   sqlite3ColumnsFromExprList(pParse, pSel->pEList,&pTab->nCol,&pTab->aCol);
   pTab->iPKey = -1;
+  pTab->eTabType = TABTYP_VIEW;
   pTab->nRowLogEst = 200; assert( 200==sqlite3LogEst(1048576) );
 #ifndef SQLITE_ALLOW_ROWID_IN_VIEW
   /* The usual case - do not allow ROWID on a subquery */
   pTab->tabFlags |= TF_Ephemeral | TF_NoVisibleRowid;
 #else
-  pTab->tabFlags |= TF_Ephemeral;  /* Legacy compatibility mode */
+  /* Legacy compatibility mode */
+  pTab->tabFlags |= TF_Ephemeral | sqlite3Config.mNoVisibleRowid;
 #endif
   return pParse->nErr ? SQLITE_ERROR : SQLITE_OK;
 }
@@ -147875,7 +148083,7 @@ static int selectExpander(Walker *pWalker, Select *p){
             pNestedFrom = pFrom->pSelect->pEList;
             assert( pNestedFrom!=0 );
             assert( pNestedFrom->nExpr==pTab->nCol );
-            assert( VisibleRowid(pTab)==0 );
+            assert( VisibleRowid(pTab)==0 || ViewCanHaveRowid );
           }else{
             if( zTName && sqlite3StrICmp(zTName, zTabName)!=0 ){
               continue;
@@ -147907,7 +148115,8 @@ static int selectExpander(Walker *pWalker, Select *p){
             pUsing = 0;
           }
 
-          nAdd = pTab->nCol + (VisibleRowid(pTab) && (selFlags&SF_NestedFrom));
+          nAdd = pTab->nCol;
+          if( VisibleRowid(pTab) && (selFlags & SF_NestedFrom)!=0 ) nAdd++;
           for(j=0; j<nAdd; j++){
             const char *zName;
             struct ExprList_item *pX; /* Newly added ExprList term */
@@ -147989,7 +148198,8 @@ static int selectExpander(Walker *pWalker, Select *p){
             pX = &pNew->a[pNew->nExpr-1];
             assert( pX->zEName==0 );
             if( (selFlags & SF_NestedFrom)!=0 && !IN_RENAME_OBJECT ){
-              if( pNestedFrom ){
+              if( pNestedFrom && (!ViewCanHaveRowid || j<pNestedFrom->nExpr) ){
+                assert( j<pNestedFrom->nExpr );
                 pX->zEName = sqlite3DbStrDup(db, pNestedFrom->a[j].zEName);
                 testcase( pX->zEName==0 );
               }else{
@@ -152923,6 +153133,9 @@ SQLITE_PRIVATE void sqlite3Update(
       }
     }
     if( chngRowid==0 && pPk==0 ){
+#ifdef SQLITE_ALLOW_ROWID_IN_VIEW
+      if( isView ) sqlite3VdbeAddOp2(v, OP_Null, 0, regOldRowid);
+#endif
       sqlite3VdbeAddOp2(v, OP_Copy, regOldRowid, regNewRowid);
     }
   }
@@ -153460,7 +153673,8 @@ SQLITE_PRIVATE Upsert *sqlite3UpsertNew(
 SQLITE_PRIVATE int sqlite3UpsertAnalyzeTarget(
   Parse *pParse,     /* The parsing context */
   SrcList *pTabList, /* Table into which we are inserting */
-  Upsert *pUpsert    /* The ON CONFLICT clauses */
+  Upsert *pUpsert,   /* The ON CONFLICT clauses */
+  Upsert *pAll       /* Complete list of all ON CONFLICT clauses */
 ){
   Table *pTab;            /* That table into which we are inserting */
   int rc;                 /* Result code */
@@ -153563,6 +153777,14 @@ SQLITE_PRIVATE int sqlite3UpsertAnalyzeTarget(
         continue;
       }
       pUpsert->pUpsertIdx = pIdx;
+      if( sqlite3UpsertOfIndex(pAll,pIdx)!=pUpsert ){
+        /* Really this should be an error.  The isDup ON CONFLICT clause will
+        ** never fire.  But this problem was not discovered until three years
+        ** after multi-CONFLICT upsert was added, and so we silently ignore
+        ** the problem to prevent breaking applications that might actually
+        ** have redundant ON CONFLICT clauses. */
+        pUpsert->isDup = 1;
+      }
       break;
     }
     if( pUpsert->pUpsertIdx==0 ){
@@ -153589,9 +153811,13 @@ SQLITE_PRIVATE int sqlite3UpsertNextIsIPK(Upsert *pUpsert){
   Upsert *pNext;
   if( NEVER(pUpsert==0) ) return 0;
   pNext = pUpsert->pNextUpsert;
-  if( pNext==0 ) return 1;
-  if( pNext->pUpsertTarget==0 ) return 1;
-  if( pNext->pUpsertIdx==0 ) return 1;
+  while( 1 /*exit-by-return*/ ){
+    if( pNext==0 ) return 1;
+    if( pNext->pUpsertTarget==0 ) return 1;
+    if( pNext->pUpsertIdx==0 ) return 1;
+    if( !pNext->isDup ) return 0;
+    pNext = pNext->pNextUpsert;
+  }
   return 0;
 }
 
@@ -166619,16 +166845,10 @@ static SQLITE_NOINLINE void whereAddIndexedExpr(
   for(i=0; i<pIdx->nColumn; i++){
     Expr *pExpr;
     int j = pIdx->aiColumn[i];
-    int bMaybeNullRow;
     if( j==XN_EXPR ){
       pExpr = pIdx->aColExpr->a[i].pExpr;
-      testcase( pTabItem->fg.jointype & JT_LEFT );
-      testcase( pTabItem->fg.jointype & JT_RIGHT );
-      testcase( pTabItem->fg.jointype & JT_LTORJ );
-      bMaybeNullRow = (pTabItem->fg.jointype & (JT_LEFT|JT_LTORJ|JT_RIGHT))!=0;
     }else if( j>=0 && (pTab->aCol[j].colFlags & COLFLAG_VIRTUAL)!=0 ){
       pExpr = sqlite3ColumnExpr(pTab, &pTab->aCol[j]);
-      bMaybeNullRow = 0;
     }else{
       continue;
     }
@@ -166660,7 +166880,7 @@ static SQLITE_NOINLINE void whereAddIndexedExpr(
     p->iDataCur = pTabItem->iCursor;
     p->iIdxCur = iIdxCur;
     p->iIdxCol = i;
-    p->bMaybeNullRow = bMaybeNullRow;
+    p->bMaybeNullRow = (pTabItem->fg.jointype & (JT_LEFT|JT_LTORJ|JT_RIGHT))!=0;
     if( sqlite3IndexAffinityStr(pParse->db, pIdx) ){
       p->aff = pIdx->zColAff[i];
     }
@@ -178865,6 +179085,18 @@ SQLITE_API int sqlite3_config(int op, ...){
     }
 #endif /* SQLITE_OMIT_DESERIALIZE */
 
+    case SQLITE_CONFIG_ROWID_IN_VIEW: {
+      int *pVal = va_arg(ap,int*);
+#ifdef SQLITE_ALLOW_ROWID_IN_VIEW
+      if( 0==*pVal ) sqlite3GlobalConfig.mNoVisibleRowid = TF_NoVisibleRowid;
+      if( 1==*pVal ) sqlite3GlobalConfig.mNoVisibleRowid = 0;
+      *pVal = (sqlite3GlobalConfig.mNoVisibleRowid==0);
+#else
+      *pVal = 0;
+#endif
+      break;
+    }
+
     default: {
       rc = SQLITE_ERROR;
       break;
@@ -204785,6 +205017,7 @@ json_parse_restart:
   case '[': {
     /* Parse array */
     iThis = pParse->nBlob;
+    assert( i<=(u32)pParse->nJson );
     jsonBlobAppendNode(pParse, JSONB_ARRAY, pParse->nJson - i, 0);
     iStart = pParse->nBlob;
     if( pParse->oom ) return -1;
@@ -205183,6 +205416,10 @@ static void jsonReturnStringAsBlob(JsonString *pStr){
   JsonParse px;
   memset(&px, 0, sizeof(px));
   jsonStringTerminate(pStr);
+  if( pStr->eErr ){
+    sqlite3_result_error_nomem(pStr->pCtx);
+    return;
+  }
   px.zJson = pStr->zBuf;
   px.nJson = pStr->nUsed;
   px.db = sqlite3_context_db_handle(pStr->pCtx);
@@ -206508,8 +206745,9 @@ rebuild_from_cache:
   }
   p->zJson = (char*)sqlite3_value_text(pArg);
   p->nJson = sqlite3_value_bytes(pArg);
+  if( db->mallocFailed ) goto json_pfa_oom;
   if( p->nJson==0 ) goto json_pfa_malformed;
-  if( NEVER(p->zJson==0) ) goto json_pfa_oom;
+  assert( p->zJson!=0 );
   if( jsonConvertTextToBlob(p, (flgs & JSON_KEEPERROR) ? 0 : ctx) ){
     if( flgs & JSON_KEEPERROR ){
       p->nErr = 1;
@@ -206675,10 +206913,10 @@ static void jsonDebugPrintBlob(
       if( sz==0 && x<=JSONB_FALSE ){
         sqlite3_str_append(pOut, "\n", 1);
       }else{
-        u32 i;
+        u32 j;
         sqlite3_str_appendall(pOut, ": \"");
-        for(i=iStart+n; i<iStart+n+sz; i++){
-          u8 c = pParse->aBlob[i];
+        for(j=iStart+n; j<iStart+n+sz; j++){
+          u8 c = pParse->aBlob[j];
           if( c<0x20 || c>=0x7f ) c = '.';
           sqlite3_str_append(pOut, (char*)&c, 1);
         }
@@ -208086,6 +208324,9 @@ static int jsonEachColumn(
     case JEACH_VALUE: {
       u32 i = jsonSkipLabel(p);
       jsonReturnFromBlob(&p->sParse, i, ctx, 1);
+      if( (p->sParse.aBlob[i] & 0x0f)>=JSONB_ARRAY ){
+        sqlite3_result_subtype(ctx, JSON_SUBTYPE);
+      }
       break;
     }
     case JEACH_TYPE: {
@@ -208132,9 +208373,9 @@ static int jsonEachColumn(
     case JEACH_JSON: {
       if( p->sParse.zJson==0 ){
         sqlite3_result_blob(ctx, p->sParse.aBlob, p->sParse.nBlob,
-                            SQLITE_STATIC);
+                            SQLITE_TRANSIENT);
       }else{
-        sqlite3_result_text(ctx, p->sParse.zJson, -1, SQLITE_STATIC);
+        sqlite3_result_text(ctx, p->sParse.zJson, -1, SQLITE_TRANSIENT);
       }
       break;
     }
@@ -209160,11 +209401,9 @@ static RtreeNode *nodeNew(Rtree *pRtree, RtreeNode *pParent){
 ** Clear the Rtree.pNodeBlob object
 */
 static void nodeBlobReset(Rtree *pRtree){
-  if( pRtree->pNodeBlob && pRtree->inWrTrans==0 && pRtree->nCursor==0 ){
-    sqlite3_blob *pBlob = pRtree->pNodeBlob;
-    pRtree->pNodeBlob = 0;
-    sqlite3_blob_close(pBlob);
-  }
+  sqlite3_blob *pBlob = pRtree->pNodeBlob;
+  pRtree->pNodeBlob = 0;
+  sqlite3_blob_close(pBlob);
 }
 
 /*
@@ -209208,7 +209447,6 @@ static int nodeAcquire(
                            &pRtree->pNodeBlob);
   }
   if( rc ){
-    nodeBlobReset(pRtree);
     *ppNode = 0;
     /* If unable to open an sqlite3_blob on the desired row, that can only
     ** be because the shadow tables hold erroneous data. */
@@ -209268,6 +209506,7 @@ static int nodeAcquire(
     }
     *ppNode = pNode;
   }else{
+    nodeBlobReset(pRtree);
     if( pNode ){
       pRtree->nNodeRef--;
       sqlite3_free(pNode);
@@ -209412,6 +209651,7 @@ static void nodeGetCoord(
   int iCoord,                  /* Which coordinate to extract */
   RtreeCoord *pCoord           /* OUT: Space to write result to */
 ){
+  assert( iCell<NCELL(pNode) );
   readCoord(&pNode->zData[12 + pRtree->nBytesPerCell*iCell + 4*iCoord], pCoord);
 }
 
@@ -209601,7 +209841,9 @@ static int rtreeClose(sqlite3_vtab_cursor *cur){
   sqlite3_finalize(pCsr->pReadAux);
   sqlite3_free(pCsr);
   pRtree->nCursor--;
-  nodeBlobReset(pRtree);
+  if( pRtree->nCursor==0 && pRtree->inWrTrans==0 ){
+    nodeBlobReset(pRtree);
+  }
   return SQLITE_OK;
 }
 
@@ -210186,7 +210428,11 @@ static int rtreeRowid(sqlite3_vtab_cursor *pVtabCursor, sqlite_int64 *pRowid){
   int rc = SQLITE_OK;
   RtreeNode *pNode = rtreeNodeOfFirstSearchPoint(pCsr, &rc);
   if( rc==SQLITE_OK && ALWAYS(p) ){
-    *pRowid = nodeGetRowid(RTREE_OF_CURSOR(pCsr), pNode, p->iCell);
+    if( p->iCell>=NCELL(pNode) ){
+      rc = SQLITE_ABORT;
+    }else{
+      *pRowid = nodeGetRowid(RTREE_OF_CURSOR(pCsr), pNode, p->iCell);
+    }
   }
   return rc;
 }
@@ -210204,6 +210450,7 @@ static int rtreeColumn(sqlite3_vtab_cursor *cur, sqlite3_context *ctx, int i){
 
   if( rc ) return rc;
   if( NEVER(p==0) ) return SQLITE_OK;
+  if( p->iCell>=NCELL(pNode) ) return SQLITE_ABORT;
   if( i==0 ){
     sqlite3_result_int64(ctx, nodeGetRowid(pRtree, pNode, p->iCell));
   }else if( i<=pRtree->nDim2 ){
@@ -211685,8 +211932,7 @@ constraint:
 */
 static int rtreeBeginTransaction(sqlite3_vtab *pVtab){
   Rtree *pRtree = (Rtree *)pVtab;
-  assert( pRtree->inWrTrans==0 );
-  pRtree->inWrTrans++;
+  pRtree->inWrTrans = 1;
   return SQLITE_OK;
 }
 
@@ -211700,6 +211946,9 @@ static int rtreeEndTransaction(sqlite3_vtab *pVtab){
   nodeBlobReset(pRtree);
   return SQLITE_OK;
 }
+static int rtreeRollback(sqlite3_vtab *pVtab){
+  return rtreeEndTransaction(pVtab);
+}
 
 /*
 ** The xRename method for rtree module virtual tables.
@@ -211818,7 +212067,7 @@ static sqlite3_module rtreeModule = {
   rtreeBeginTransaction,      /* xBegin - begin transaction */
   rtreeEndTransaction,        /* xSync - sync transaction */
   rtreeEndTransaction,        /* xCommit - commit transaction */
-  rtreeEndTransaction,        /* xRollback - rollback transaction */
+  rtreeRollback,              /* xRollback - rollback transaction */
   0,                          /* xFindFunction - function overloading */
   rtreeRename,                /* xRename - rename the table */
   rtreeSavepoint,             /* xSavepoint */
@@ -245377,23 +245626,26 @@ static void fts5IterSetOutputsTokendata(Fts5Iter *pIter){
 static void fts5TokendataIterNext(Fts5Iter *pIter, int bFrom, i64 iFrom){
   int ii;
   Fts5TokenDataIter *pT = pIter->pTokenDataIter;
+  Fts5Index *pIndex = pIter->pIndex;
 
   for(ii=0; ii<pT->nIter; ii++){
     Fts5Iter *p = pT->apIter[ii];
     if( p->base.bEof==0
      && (p->base.iRowid==pIter->base.iRowid || (bFrom && p->base.iRowid<iFrom))
     ){
-      fts5MultiIterNext(p->pIndex, p, bFrom, iFrom);
+      fts5MultiIterNext(pIndex, p, bFrom, iFrom);
       while( bFrom && p->base.bEof==0
           && p->base.iRowid<iFrom
-          && p->pIndex->rc==SQLITE_OK
+          && pIndex->rc==SQLITE_OK
       ){
-        fts5MultiIterNext(p->pIndex, p, 0, 0);
+        fts5MultiIterNext(pIndex, p, 0, 0);
       }
     }
   }
 
-  fts5IterSetOutputsTokendata(pIter);
+  if( pIndex->rc==SQLITE_OK ){
+    fts5IterSetOutputsTokendata(pIter);
+  }
 }
 
 /*
@@ -250547,7 +250799,7 @@ static void fts5SourceIdFunc(
 ){
   assert( nArg==0 );
   UNUSED_PARAM2(nArg, apUnused);
-  sqlite3_result_text(pCtx, "fts5: 2024-01-30 16:01:20 e876e51a0ed5c5b3126f52e532044363a014bc594cfefa87ffb5b82257cc467a", -1, SQLITE_TRANSIENT);
+  sqlite3_result_text(pCtx, "fts5: 2024-04-15 13:34:05 8653b758870e6ef0c98d46b3ace27849054af85da891eb121e9aaa537f1e8355", -1, SQLITE_TRANSIENT);
 }
 
 /*
diff --git a/src/libs/3rdparty/sqlite/sqlite3.h b/src/libs/3rdparty/sqlite/sqlite3.h
index 4fdfde004e..2618b37a7b 100644
--- a/src/libs/3rdparty/sqlite/sqlite3.h
+++ b/src/libs/3rdparty/sqlite/sqlite3.h
@@ -146,9 +146,9 @@ extern "C" {
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
 ** [sqlite_version()] and [sqlite_source_id()].
 */
-#define SQLITE_VERSION        "3.45.1"
-#define SQLITE_VERSION_NUMBER 3045001
-#define SQLITE_SOURCE_ID      "2024-01-30 16:01:20 e876e51a0ed5c5b3126f52e532044363a014bc594cfefa87ffb5b82257cc467a"
+#define SQLITE_VERSION        "3.45.3"
+#define SQLITE_VERSION_NUMBER 3045003
+#define SQLITE_SOURCE_ID      "2024-04-15 13:34:05 8653b758870e6ef0c98d46b3ace27849054af85da891eb121e9aaa537f1e8355"
 
 /*
 ** CAPI3REF: Run-Time Library Version Numbers
@@ -420,6 +420,8 @@ typedef int (*sqlite3_callback)(void*,int,char**, char**);
 **      the 1st parameter to sqlite3_exec() while sqlite3_exec() is running.
 ** <li> The application must not modify the SQL statement text passed into
 **      the 2nd parameter of sqlite3_exec() while sqlite3_exec() is running.
+** <li> The application must not dereference the arrays or string pointers
+**       passed as the 3rd and 4th callback parameters after it returns.
 ** </ul>
 */
 SQLITE_API int sqlite3_exec(
@@ -2141,6 +2143,22 @@ struct sqlite3_mem_methods {
 ** configuration setting is never used, then the default maximum is determined
 ** by the [SQLITE_MEMDB_DEFAULT_MAXSIZE] compile-time option.  If that
 ** compile-time option is not set, then the default maximum is 1073741824.
+**
+** [[SQLITE_CONFIG_ROWID_IN_VIEW]]
+** <dt>SQLITE_CONFIG_ROWID_IN_VIEW
+** <dd>The SQLITE_CONFIG_ROWID_IN_VIEW option enables or disables the ability
+** for VIEWs to have a ROWID.  The capability can only be enabled if SQLite is
+** compiled with -DSQLITE_ALLOW_ROWID_IN_VIEW, in which case the capability
+** defaults to on.  This configuration option queries the current setting or
+** changes the setting to off or on.  The argument is a pointer to an integer.
+** If that integer initially holds a value of 1, then the ability for VIEWs to
+** have ROWIDs is activated.  If the integer initially holds zero, then the
+** ability is deactivated.  Any other initial value for the integer leaves the
+** setting unchanged.  After changes, if any, the integer is written with
+** a 1 or 0, if the ability for VIEWs to have ROWIDs is on or off.  If SQLite
+** is compiled without -DSQLITE_ALLOW_ROWID_IN_VIEW (which is the usual and
+** recommended case) then the integer is always filled with zero, regardless
+** if its initial value.
 ** </dl>
 */
 #define SQLITE_CONFIG_SINGLETHREAD         1  /* nil */
@@ -2172,6 +2190,7 @@ struct sqlite3_mem_methods {
 #define SQLITE_CONFIG_SMALL_MALLOC        27  /* boolean */
 #define SQLITE_CONFIG_SORTERREF_SIZE      28  /* int nByte */
 #define SQLITE_CONFIG_MEMDB_MAXSIZE       29  /* sqlite3_int64 */
+#define SQLITE_CONFIG_ROWID_IN_VIEW       30  /* int* */
 
 /*
 ** CAPI3REF: Database Connection Configuration Options
diff --git a/src/libs/cplusplus/ResolveExpression.cpp b/src/libs/cplusplus/ResolveExpression.cpp
index 4fc1cd2d56..e779c447bf 100644
--- a/src/libs/cplusplus/ResolveExpression.cpp
+++ b/src/libs/cplusplus/ResolveExpression.cpp
@@ -1062,6 +1062,8 @@ ClassOrNamespace *ResolveExpression::baseExpression(const QList<LookupItem> &bas
         }
 
         typedefsResolver.resolve(&ty, &scope, r.binding());
+        if (auto ref = ty->asReferenceType()) // deref if needed
+            ty = ref->elementType();
 
         if (Q_UNLIKELY(debug))
             qDebug() << "-  after typedef resolving:" << oo.prettyType(ty);
@@ -1082,6 +1084,9 @@ ClassOrNamespace *ResolveExpression::baseExpression(const QList<LookupItem> &bas
                 if (ClassOrNamespace *binding = findClass(type, scope))
                     return binding;
 
+                if (ClassOrNamespace *binding = findClass(type, r.scope())) // local classes and structs
+                    return binding;
+
             } else {
                 ClassOrNamespace *binding
                         = findClassForTemplateParameterInExpressionScope(r.binding(),
@@ -1176,6 +1181,9 @@ ClassOrNamespace *ResolveExpression::baseExpression(const QList<LookupItem> &bas
 
             if (ClassOrNamespace *binding = findClass(ty, scope, enclosingBinding))
                 return binding;
+
+            if (ClassOrNamespace *binding = findClass(ty, r.scope())) // local classes and structs
+                return binding;
         }
     }
 
diff --git a/src/libs/extensionsystem/CMakeLists.txt b/src/libs/extensionsystem/CMakeLists.txt
index c8e3766806..a1768577b0 100644
--- a/src/libs/extensionsystem/CMakeLists.txt
+++ b/src/libs/extensionsystem/CMakeLists.txt
@@ -20,10 +20,16 @@ add_qtc_library(ExtensionSystem
 
 find_package(Qt6 COMPONENTS Test QUIET)
 
+# If ExtensionSystem was compiled with QtTest, it should provide the test options
+# and the test related API, regardless if Qt Creator was compiled with tests or not,
+# and regardless if an external plugin is compiled with tests or not.
+# ExtensionSystem may not require QtTest in public headers though.
+# API with EXTENSIONSYSTEM_TEST_EXPORT (like CppPluginSpec) should only be exported
+# if Qt Creator is compiled with tests.
 extend_qtc_library(ExtensionSystem
   CONDITION TARGET Qt::Test
   DEPENDS Qt::Test
-  DEFINES WITH_TESTS
+  PUBLIC_DEFINES EXTENSIONSYSTEM_WITH_TESTOPTION
 )
 
 extend_qtc_library(ExtensionSystem
diff --git a/src/libs/extensionsystem/extensionsystem.qbs b/src/libs/extensionsystem/extensionsystem.qbs
index 72fe2f4c3c..c34e97e754 100644
--- a/src/libs/extensionsystem/extensionsystem.qbs
+++ b/src/libs/extensionsystem/extensionsystem.qbs
@@ -2,6 +2,7 @@ QtcLibrary {
     name: "ExtensionSystem"
 
     cpp.defines: base.concat(["EXTENSIONSYSTEM_LIBRARY", "IDE_TEST_DIR=\".\""])
+                     .concat(qtc.withPluginTests ? ["EXTENSIONSYSTEM_WITH_TESTOPTION"] : [])
 
     Depends { name: "Qt"; submodules: ["core", "widgets"] }
     Depends { name: "Qt.testlib"; condition: qtc.withPluginTests }
@@ -35,5 +36,7 @@ QtcLibrary {
 
     Export {
         Depends { name: "Qt.core" }
+        Depends { name: "qtc" }
+        cpp.defines: qtc.withPluginTests ? ["EXTENSIONSYSTEM_WITH_TESTOPTION"] : []
     }
 }
diff --git a/src/libs/extensionsystem/optionsparser.cpp b/src/libs/extensionsystem/optionsparser.cpp
index dd9d03944a..21dfba16ec 100644
--- a/src/libs/extensionsystem/optionsparser.cpp
+++ b/src/libs/extensionsystem/optionsparser.cpp
@@ -64,7 +64,7 @@ bool OptionsParser::parse()
             continue;
         if (checkForNoCrashcheckOption())
             continue;
-#ifdef WITH_TESTS
+#ifdef EXTENSIONSYSTEM_WITH_TESTOPTION
         if (checkForTestOptions())
             continue;
         if (checkForScenarioOption())
diff --git a/src/libs/extensionsystem/plugindetailsview.cpp b/src/libs/extensionsystem/plugindetailsview.cpp
index 73fa2b1229..35e646bad7 100644
--- a/src/libs/extensionsystem/plugindetailsview.cpp
+++ b/src/libs/extensionsystem/plugindetailsview.cpp
@@ -8,6 +8,7 @@
 #include "pluginspec.h"
 
 #include <utils/algorithm.h>
+#include <utils/infolabel.h>
 #include <utils/layoutbuilder.h>
 
 #include <QCoreApplication>
@@ -54,6 +55,7 @@ public:
         , copyright(createContentsLabel())
         , license(createTextEdit())
         , dependencies(new QListWidget(q))
+        , softLoadable(new Utils::InfoLabel)
     {
         using namespace Layouting;
 
@@ -70,7 +72,8 @@ public:
             Tr::tr("Description:"), description, br,
             Tr::tr("Copyright:"), copyright, br,
             Tr::tr("License:"), license, br,
-            Tr::tr("Dependencies:"), dependencies,
+            Tr::tr("Dependencies:"), dependencies, br,
+            Tr::tr("Loadable without restart:"), softLoadable, br,
             noMargin
         }.attachTo(q);
         // clang-format on
@@ -90,6 +93,7 @@ public:
     QLabel *copyright = nullptr;
     QTextEdit *license = nullptr;
     QListWidget *dependencies = nullptr;
+    Utils::InfoLabel *softLoadable = nullptr;
 
 private:
     QLabel *createContentsLabel() {
@@ -142,7 +146,7 @@ void PluginDetailsView::update(PluginSpec *spec)
     d->vendor->setText(spec->vendor());
     d->component->setText(spec->category().isEmpty() ? Tr::tr("None") : spec->category());
     d->url->setText(QString::fromLatin1("<a href=\"%1\">%1</a>").arg(spec->url()));
-    d->location->setText(QDir::toNativeSeparators(spec->filePath()));
+    d->location->setText(spec->filePath().toUserOutput());
     const QString pattern = spec->platformSpecification().pattern();
     const QString platform = pattern.isEmpty() ? Tr::tr("All") : pattern;
     const QString platformString = Tr::tr("%1 (current: \"%2\")")
@@ -157,6 +161,8 @@ void PluginDetailsView::update(PluginSpec *spec)
     d->license->setText(spec->license());
     d->dependencies->addItems(Utils::transform<QList>(spec->dependencies(),
                                                       &PluginDependency::toString));
+    d->softLoadable->setType(spec->isSoftLoadable() ? Utils::InfoLabel::Ok
+                                                    : Utils::InfoLabel::NotOk);
 }
 
 void PluginDetailsView::showModal(QWidget *parent, PluginSpec *spec)
diff --git a/src/libs/extensionsystem/pluginmanager.cpp b/src/libs/extensionsystem/pluginmanager.cpp
index b5a64e2054..718a66a727 100644
--- a/src/libs/extensionsystem/pluginmanager.cpp
+++ b/src/libs/extensionsystem/pluginmanager.cpp
@@ -42,7 +42,7 @@
 #include <QTimer>
 #include <QWriteLocker>
 
-#ifdef WITH_TESTS
+#ifdef EXTENSIONSYSTEM_WITH_TESTOPTION
 #include <utils/hostosinfo.h>
 #include <QTest>
 #include <QThread>
@@ -443,7 +443,7 @@ FutureSynchronizer *PluginManager::futureSynchronizer()
 
     \sa setPluginPaths()
 */
-QStringList PluginManager::pluginPaths()
+FilePaths PluginManager::pluginPaths()
 {
     return d->pluginPaths;
 }
@@ -455,7 +455,7 @@ QStringList PluginManager::pluginPaths()
     \sa pluginPaths()
     \sa loadPlugins()
 */
-void PluginManager::setPluginPaths(const QStringList &paths)
+void PluginManager::setPluginPaths(const FilePaths &paths)
 {
     d->setPluginPaths(paths);
 }
@@ -641,11 +641,13 @@ void PluginManager::remoteArguments(const QString &serializedArgument, QObject *
     for (const PluginSpec *ps : plugins()) {
         if (ps->state() == PluginSpec::Running) {
             const QStringList pluginOptions = subList(serializedArguments, QLatin1Char(':') + ps->name());
-            QObject *socketParent = ps->plugin()->remoteCommand(pluginOptions, workingDirectory,
-                                                                arguments);
-            if (socketParent && socket) {
-                socket->setParent(socketParent);
-                socket = nullptr;
+            if (IPlugin *plugin = ps->plugin()) {
+                QObject *socketParent
+                    = plugin->remoteCommand(pluginOptions, workingDirectory, arguments);
+                if (socketParent && socket) {
+                    socket->setParent(socketParent);
+                    socket = nullptr;
+                }
             }
         }
     }
@@ -745,7 +747,7 @@ void PluginManager::formatOptions(QTextStream &str, int optionIndentation, int d
                  QLatin1String("Disable startup check for previously crashed instance"),
                  optionIndentation,
                  descriptionIndentation);
-#ifdef WITH_TESTS
+#ifdef EXTENSIONSYSTEM_WITH_TESTOPTION
     formatOption(str, QString::fromLatin1(OptionsParser::TEST_OPTION)
                  + QLatin1String(" <plugin>[,testfunction[:testdata]]..."), QString(),
                  QLatin1String("Run plugin's tests (by default a separate settings path is used)"),
@@ -798,7 +800,7 @@ bool PluginManager::testRunRequested()
     return !d->testSpecs.empty();
 }
 
-#ifdef WITH_TESTS
+#ifdef EXTENSIONSYSTEM_WITH_TESTOPTION
 // Called in plugin initialization, the scenario function will be called later, from main
 bool PluginManager::registerScenario(const QString &scenarioId, std::function<bool()> scenarioStarter)
 {
@@ -956,17 +958,18 @@ void PluginManagerPrivate::startDelayedInitialize()
     }
     NANOTRACE_SHUTDOWN();
     emit q->initializationDone();
-#ifdef WITH_TESTS
-        if (PluginManager::testRunRequested())
-            startTests();
-        else if (PluginManager::isScenarioRequested()) {
-            if (PluginManager::runScenario()) {
-                const QString info = QString("Successfully started scenario \"%1\"...").arg(d->m_requestedScenario);
-                qInfo("%s", qPrintable(info));
-            } else {
-                QMetaObject::invokeMethod(this, [] { emit m_instance->scenarioFinished(1); });
-            }
+#ifdef EXTENSIONSYSTEM_WITH_TESTOPTION
+    if (PluginManager::testRunRequested())
+        startTests();
+    else if (PluginManager::isScenarioRequested()) {
+        if (PluginManager::runScenario()) {
+            const QString info
+                = QString("Successfully started scenario \"%1\"...").arg(d->m_requestedScenario);
+            qInfo("%s", qPrintable(info));
+        } else {
+            QMetaObject::invokeMethod(this, [] { emit m_instance->scenarioFinished(1); });
         }
+    }
 #endif
 }
 
@@ -1068,14 +1071,15 @@ void PluginManagerPrivate::checkForDuplicatePlugins()
 
 static QHash<IPlugin *, QList<TestCreator>> g_testCreators;
 
-void PluginManagerPrivate::addTestCreator(IPlugin *plugin, const TestCreator &testCreator)
+void PluginManagerPrivate::addTestCreator(
+    [[maybe_unused]] IPlugin *plugin, [[maybe_unused]] const TestCreator &testCreator)
 {
-#ifdef WITH_TESTS
+#ifdef EXTENSIONSYSTEM_WITH_TESTOPTION
     g_testCreators[plugin].append(testCreator);
 #endif
 }
 
-#ifdef WITH_TESTS
+#ifdef EXTENSIONSYSTEM_WITH_TESTOPTION
 
 using TestPlan = QHash<QObject *, QStringList>; // Object -> selected test functions
 
@@ -1456,7 +1460,7 @@ void PluginManagerPrivate::shutdown()
         shutdownEventLoop->exec();
     }
     deleteAll();
-#ifdef WITH_TESTS
+#ifdef EXTENSIONSYSTEM_WITH_TESTOPTION
     if (PluginManager::isScenarioRunning("TestModelManagerInterface")) {
         qDebug() << "Point 2: Expect the next call to Point 3 triggers a crash";
         QThread::sleep(5);
@@ -1728,7 +1732,7 @@ void PluginManagerPrivate::loadPlugin(PluginSpec *spec, PluginSpec::State destSt
 /*!
     \internal
 */
-void PluginManagerPrivate::setPluginPaths(const QStringList &paths)
+void PluginManagerPrivate::setPluginPaths(const FilePaths &paths)
 {
     qCDebug(pluginLog) << "Plugin search paths:" << paths;
     qCDebug(pluginLog) << "Required IID:" << pluginIID;
@@ -1737,17 +1741,18 @@ void PluginManagerPrivate::setPluginPaths(const QStringList &paths)
     readPluginPaths();
 }
 
-static const QStringList pluginFiles(const QStringList &pluginPaths)
+static const FilePaths pluginFiles(const FilePaths &pluginPaths)
 {
-    QStringList pluginFiles;
-    QStringList searchPaths = pluginPaths;
+    FilePaths pluginFiles;
+    FilePaths searchPaths = pluginPaths;
     while (!searchPaths.isEmpty()) {
-        const QDir dir(searchPaths.takeFirst());
-        const QFileInfoList files = dir.entryInfoList(QDir::Files | QDir::NoSymLinks);
-        const QStringList absoluteFilePaths = Utils::transform(files, &QFileInfo::absoluteFilePath);
-        pluginFiles += Utils::filtered(absoluteFilePaths, [](const QString &path) { return QLibrary::isLibrary(path); });
-        const QFileInfoList dirs = dir.entryInfoList(QDir::Dirs|QDir::NoDotAndDotDot);
-        searchPaths += Utils::transform(dirs, &QFileInfo::absoluteFilePath);
+        const FilePath dir = searchPaths.takeFirst().absoluteFilePath();
+        const FilePaths files = dir.dirEntries(QDir::Files | QDir::NoSymLinks);
+        pluginFiles += Utils::filtered(files, [](const FilePath &path) {
+            return QLibrary::isLibrary(path.toFSPathString());
+        });
+        const FilePaths dirs = dir.dirEntries(QDir::Dirs | QDir::NoDotAndDotDot);
+        searchPaths += dirs;
     }
     return pluginFiles;
 }
@@ -1789,11 +1794,12 @@ void PluginManagerPrivate::readPluginPaths()
     QVector<PluginSpec *> newSpecs;
 
     // from the file system
-    for (const QString &pluginFile : pluginFiles(pluginPaths)) {
-        expected_str<PluginSpec *> spec = PluginSpecImpl::read(pluginFile);
+    for (const FilePath &pluginFile : pluginFiles(pluginPaths)) {
+        expected_str<PluginSpec *> spec = readCppPluginSpec(pluginFile);
         if (!spec) {
-            qCInfo(pluginLog).noquote()
-                << QString("Ignoring plugin \"%1\" because: %2").arg(pluginFile).arg(spec.error());
+            qCInfo(pluginLog).noquote() << QString("Ignoring plugin \"%1\" because: %2")
+                                               .arg(pluginFile.toUserOutput())
+                                               .arg(spec.error());
             continue;
         }
         newSpecs.append(*spec);
@@ -1801,7 +1807,7 @@ void PluginManagerPrivate::readPluginPaths()
 
     // static
     for (const QStaticPlugin &plugin : QPluginLoader::staticPlugins()) {
-        expected_str<PluginSpec *> spec = PluginSpecImpl::read(plugin);
+        expected_str<PluginSpec *> spec = readCppPluginSpec(plugin);
         QTC_ASSERT_EXPECTED(spec, continue);
         newSpecs.append(*spec);
     }
diff --git a/src/libs/extensionsystem/pluginmanager.h b/src/libs/extensionsystem/pluginmanager.h
index 74237db5b3..c5045e7187 100644
--- a/src/libs/extensionsystem/pluginmanager.h
+++ b/src/libs/extensionsystem/pluginmanager.h
@@ -6,6 +6,7 @@
 #include "extensionsystem_global.h"
 
 #include <aggregation/aggregate.h>
+#include <utils/filepath.h>
 #include <utils/qtcsettings.h>
 
 #include <QObject>
@@ -69,8 +70,8 @@ public:
     static QVector<PluginSpec *> loadQueue();
     static void loadPlugins();
     static void loadPluginsAtRuntime(const QSet<PluginSpec *> &plugins);
-    static QStringList pluginPaths();
-    static void setPluginPaths(const QStringList &paths);
+    static Utils::FilePaths pluginPaths();
+    static void setPluginPaths(const Utils::FilePaths &paths);
     static QString pluginIID();
     static void setPluginIID(const QString &iid);
     static const QVector<PluginSpec *> plugins();
@@ -106,7 +107,7 @@ public:
 
     static bool testRunRequested();
 
-#ifdef WITH_TESTS
+#ifdef EXTENSIONSYSTEM_WITH_TESTOPTION
     static bool registerScenario(const QString &scenarioId, std::function<bool()> scenarioStarter);
     static bool isScenarioRequested();
     static bool runScenario();
diff --git a/src/libs/extensionsystem/pluginmanager_p.h b/src/libs/extensionsystem/pluginmanager_p.h
index 2404a8b49e..a761614223 100644
--- a/src/libs/extensionsystem/pluginmanager_p.h
+++ b/src/libs/extensionsystem/pluginmanager_p.h
@@ -53,7 +53,7 @@ public:
     void addPlugins(const QVector<PluginSpec *> &specs);
 
     void shutdown();
-    void setPluginPaths(const QStringList &paths);
+    void setPluginPaths(const Utils::FilePaths &paths);
     const QVector<ExtensionSystem::PluginSpec *> loadQueue();
     void loadPlugin(PluginSpec *spec, PluginSpec::State destState);
     void resolveDependencies();
@@ -91,7 +91,7 @@ public:
     QHash<QString, QVector<PluginSpec *>> pluginCategories;
     QVector<PluginSpec *> pluginSpecs;
     std::vector<TestSpec> testSpecs;
-    QStringList pluginPaths;
+    Utils::FilePaths pluginPaths;
     QString pluginIID;
     QVector<QObject *> allObjects;      // ### make this a QVector<QPointer<QObject> > > ?
     QStringList defaultDisabledPlugins; // Plugins/Ignored from install settings
@@ -151,7 +151,7 @@ private:
     void deleteAll();
     void checkForDuplicatePlugins();
 
-#ifdef WITH_TESTS
+#ifdef EXTENSIONSYSTEM_WITH_TESTOPTION
     void startTests();
 #endif
 };
diff --git a/src/libs/extensionsystem/pluginspec.cpp b/src/libs/extensionsystem/pluginspec.cpp
index abed26c7fb..2d492c385f 100644
--- a/src/libs/extensionsystem/pluginspec.cpp
+++ b/src/libs/extensionsystem/pluginspec.cpp
@@ -23,6 +23,8 @@
 #include <QJsonValue>
 #include <QPluginLoader>
 
+Q_LOGGING_CATEGORY(pluginSpecLog, "qtc.extensionsystem.plugin", QtWarningMsg)
+
 using namespace ExtensionSystem::Internal;
 using namespace Utils;
 
@@ -198,9 +200,9 @@ public:
     QRegularExpression platformSpecification;
     QVector<ExtensionSystem::PluginDependency> dependencies;
 
-    PluginSpecImpl::PluginArgumentDescriptions argumentDescriptions;
-    QString location;
-    QString filePath;
+    PluginSpec::PluginArgumentDescriptions argumentDescriptions;
+    FilePath location;
+    FilePath filePath;
 
     bool experimental{false};
     bool deprecated{false};
@@ -232,14 +234,14 @@ public:
 /*!
     \internal
 */
-PluginSpecImpl::PluginSpecImpl()
+CppPluginSpec::CppPluginSpec()
     : d(new PluginSpecImplPrivate)
 {}
 
 /*!
     \internal
 */
-PluginSpecImpl::~PluginSpecImpl() = default;
+CppPluginSpec::~CppPluginSpec() = default;
 
 /*!
     Returns the plugin name. This is valid after the PluginSpec::Read state is
@@ -489,7 +491,7 @@ PluginSpec::PluginArgumentDescriptions PluginSpec::argumentDescriptions() const
 /*!
     Returns the absolute path to the directory containing the plugin.
 */
-QString PluginSpec::location() const
+FilePath PluginSpec::location() const
 {
     return d->location;
 }
@@ -497,7 +499,7 @@ QString PluginSpec::location() const
 /*!
     Returns the absolute path to the plugin.
 */
-QString PluginSpec::filePath() const
+FilePath PluginSpec::filePath() const
 {
     return d->filePath;
 }
@@ -576,7 +578,7 @@ bool PluginSpec::provides(const QString &pluginName, const QString &pluginVersio
     already been successfully loaded. That is, the PluginSpec::Loaded state
     is reached.
 */
-IPlugin *PluginSpecImpl::plugin() const
+IPlugin *CppPluginSpec::plugin() const
 {
     return d->plugin;
 }
@@ -690,19 +692,20 @@ namespace {
     \internal
     Returns false if the file does not represent a Qt Creator plugin.
 */
-expected_str<PluginSpec *> PluginSpecImpl::read(const QString &fileName)
+expected_str<PluginSpec *> readCppPluginSpec(const FilePath &fileName)
 {
-    auto spec = new PluginSpecImpl;
+    auto spec = new CppPluginSpec;
+
+    const FilePath absPath = fileName.absoluteFilePath();
 
-    QFileInfo fileInfo(fileName);
-    spec->setLocation(fileInfo.absolutePath());
-    spec->setFilePath(fileInfo.absoluteFilePath());
+    spec->setLocation(absPath.parentDir());
+    spec->setFilePath(absPath);
     spec->d->loader.emplace();
 
     if (Utils::HostOsInfo::isMacHost())
         spec->d->loader->setLoadHints(QLibrary::ExportExternalSymbolsHint);
 
-    spec->d->loader->setFileName(fileInfo.absoluteFilePath());
+    spec->d->loader->setFileName(absPath.toFSPathString());
     if (spec->d->loader->fileName().isEmpty())
         return make_unexpected(::ExtensionSystem::Tr::tr("Cannot open file"));
 
@@ -713,9 +716,9 @@ expected_str<PluginSpec *> PluginSpecImpl::read(const QString &fileName)
     return spec;
 }
 
-expected_str<PluginSpec *> PluginSpecImpl::read(const QStaticPlugin &plugin)
+expected_str<PluginSpec *> readCppPluginSpec(const QStaticPlugin &plugin)
 {
-    auto spec = new PluginSpecImpl;
+    auto spec = new CppPluginSpec;
 
     qCDebug(pluginLog) << "\nReading meta data of static plugin";
     spec->d->staticPlugin = plugin;
@@ -769,7 +772,7 @@ Utils::expected_str<void> PluginSpec::reportError(const QString &error)
 /*!
     \internal
 */
-expected_str<void> PluginSpecImpl::readMetaData(const QJsonObject &pluginMetaData)
+expected_str<void> CppPluginSpec::readMetaData(const QJsonObject &pluginMetaData)
 {
     qCDebug(pluginLog).noquote() << "MetaData:" << QJsonDocument(pluginMetaData).toJson();
     QJsonValue value;
@@ -1009,7 +1012,7 @@ Utils::expected_str<void> PluginSpecPrivate::readMetaData(const QJsonObject &dat
         }
     }
 
-    state = PluginSpecImpl::Read;
+    state = PluginSpec::Read;
 
     return {};
 }
@@ -1059,11 +1062,11 @@ bool PluginSpec::resolveDependencies(const QVector<PluginSpec *> &specs)
 {
     if (hasError())
         return false;
-    if (state() > PluginSpecImpl::Resolved)
+    if (state() > PluginSpec::Resolved)
         return true; // We are resolved already.
-    if (state() == PluginSpecImpl::Resolved)
-        setState(PluginSpecImpl::Read); // Go back, so we just re-resolve the dependencies.
-    if (state() != PluginSpecImpl::Read) {
+    if (state() == PluginSpec::Resolved)
+        setState(PluginSpec::Read); // Go back, so we just re-resolve the dependencies.
+    if (state() != PluginSpec::Read) {
         setError(::ExtensionSystem::Tr::tr("Resolving dependencies failed because state != Read"));
         return false;
     }
@@ -1092,7 +1095,7 @@ bool PluginSpec::resolveDependencies(const QVector<PluginSpec *> &specs)
 
     d->dependencySpecs = resolvedDependencies;
 
-    d->state = PluginSpecImpl::Resolved;
+    d->state = PluginSpec::Resolved;
 
     return true;
 }
@@ -1108,38 +1111,39 @@ void PluginSpec::setState(State state)
     d->state = state;
 }
 
-void PluginSpec::setLocation(const QString &location)
+void PluginSpec::setLocation(const FilePath &location)
 {
     d->location = location;
 }
 
-void PluginSpec::setFilePath(const QString &filePath)
+void PluginSpec::setFilePath(const FilePath &filePath)
 {
     d->filePath = filePath;
 }
 
 void PluginSpec::setError(const QString &errorString)
 {
+    qCWarning(pluginSpecLog).noquote() << "[" << name() << "]"
+                                       << "Plugin error:" << errorString;
     d->errorString = errorString;
 }
 
 /*!
     \internal
 */
-bool PluginSpecImpl::loadLibrary()
+bool CppPluginSpec::loadLibrary()
 {
     if (hasError())
         return false;
 
-    if (state() != PluginSpecImpl::Resolved) {
-        if (state() == PluginSpecImpl::Loaded)
+    if (state() != PluginSpec::Resolved) {
+        if (state() == PluginSpec::Loaded)
             return true;
         setError(::ExtensionSystem::Tr::tr("Loading the library failed because state != Resolved"));
         return false;
     }
     if (d->loader && !d->loader->load()) {
-        setError(QDir::toNativeSeparators(filePath()) + QString::fromLatin1(": ")
-                 + d->loader->errorString());
+        setError(filePath().toUserOutput() + QString::fromLatin1(": ") + d->loader->errorString());
         return false;
     }
     auto *pluginObject = d->loader ? qobject_cast<IPlugin *>(d->loader->instance())
@@ -1150,7 +1154,7 @@ bool PluginSpecImpl::loadLibrary()
             d->loader->unload();
         return false;
     }
-    setState(PluginSpecImpl::Loaded);
+    setState(PluginSpec::Loaded);
     d->plugin = pluginObject;
     return true;
 }
@@ -1158,13 +1162,13 @@ bool PluginSpecImpl::loadLibrary()
 /*!
     \internal
 */
-bool PluginSpecImpl::initializePlugin()
+bool CppPluginSpec::initializePlugin()
 {
     if (hasError())
         return false;
 
-    if (state() != PluginSpecImpl::Loaded) {
-        if (state() == PluginSpecImpl::Initialized)
+    if (state() != PluginSpec::Loaded) {
+        if (state() == PluginSpec::Initialized)
             return true;
         setError(
             ::ExtensionSystem::Tr::tr("Initializing the plugin failed because state != Loaded"));
@@ -1180,20 +1184,20 @@ bool PluginSpecImpl::initializePlugin()
         setError(::ExtensionSystem::Tr::tr("Plugin initialization failed: %1").arg(err));
         return false;
     }
-    setState(PluginSpecImpl::Initialized);
+    setState(PluginSpec::Initialized);
     return true;
 }
 
 /*!
     \internal
 */
-bool PluginSpecImpl::initializeExtensions()
+bool CppPluginSpec::initializeExtensions()
 {
     if (hasError())
         return false;
 
-    if (state() != PluginSpecImpl::Initialized) {
-        if (state() == PluginSpecImpl::Running)
+    if (state() != PluginSpec::Initialized) {
+        if (state() == PluginSpec::Running)
             return true;
         setError(::ExtensionSystem::Tr::tr(
             "Cannot perform extensionsInitialized because state != Initialized"));
@@ -1205,19 +1209,19 @@ bool PluginSpecImpl::initializeExtensions()
         return false;
     }
     d->plugin->extensionsInitialized();
-    setState(PluginSpecImpl::Running);
+    setState(PluginSpec::Running);
     return true;
 }
 
 /*!
     \internal
 */
-bool PluginSpecImpl::delayedInitialize()
+bool CppPluginSpec::delayedInitialize()
 {
     if (hasError())
         return true;
 
-    if (state() != PluginSpecImpl::Running)
+    if (state() != PluginSpec::Running)
         return false;
     if (!d->plugin) {
         setError(::ExtensionSystem::Tr::tr(
@@ -1231,21 +1235,21 @@ bool PluginSpecImpl::delayedInitialize()
 /*!
     \internal
 */
-IPlugin::ShutdownFlag PluginSpecImpl::stop()
+IPlugin::ShutdownFlag CppPluginSpec::stop()
 {
     if (hasError())
         return IPlugin::ShutdownFlag::SynchronousShutdown;
 
     if (!d->plugin)
         return IPlugin::SynchronousShutdown;
-    setState(PluginSpecImpl::Stopped);
+    setState(PluginSpec::Stopped);
     return d->plugin->aboutToShutdown();
 }
 
 /*!
     \internal
 */
-void PluginSpecImpl::kill()
+void CppPluginSpec::kill()
 {
     if (hasError())
         return;
@@ -1254,6 +1258,6 @@ void PluginSpecImpl::kill()
         return;
     delete d->plugin;
     d->plugin = nullptr;
-    setState(PluginSpecImpl::Deleted);
+    setState(PluginSpec::Deleted);
 }
 } // namespace ExtensionSystem
diff --git a/src/libs/extensionsystem/pluginspec.h b/src/libs/extensionsystem/pluginspec.h
index 09b8f55618..7d45fe82c1 100644
--- a/src/libs/extensionsystem/pluginspec.h
+++ b/src/libs/extensionsystem/pluginspec.h
@@ -8,6 +8,7 @@
 #include "iplugin.h"
 
 #include <utils/expected.h>
+#include <utils/filepath.h>
 
 #include <QHash>
 #include <QStaticPlugin>
@@ -120,8 +121,8 @@ public:
     virtual QJsonObject metaData() const;
     virtual PerformanceData &performanceData() const;
     virtual PluginArgumentDescriptions argumentDescriptions() const;
-    virtual QString location() const;
-    virtual QString filePath() const;
+    virtual Utils::FilePath location() const;
+    virtual Utils::FilePath filePath() const;
     virtual QStringList arguments() const;
     virtual void setArguments(const QStringList &arguments);
     virtual void addArgument(const QString &argument);
@@ -160,8 +161,8 @@ protected:
 protected:
     virtual void setState(State state);
 
-    virtual void setLocation(const QString &location);
-    virtual void setFilePath(const QString &filePath);
+    virtual void setLocation(const Utils::FilePath &location);
+    virtual void setFilePath(const Utils::FilePath &filePath);
     virtual Utils::expected_str<void> readMetaData(const QJsonObject &metaData);
     Utils::expected_str<void> reportError(const QString &error);
 
@@ -169,10 +170,20 @@ private:
     std::unique_ptr<Internal::PluginSpecPrivate> d;
 };
 
-class EXTENSIONSYSTEM_TEST_EXPORT PluginSpecImpl : public PluginSpec
+EXTENSIONSYSTEM_EXPORT Utils::expected_str<PluginSpec *> readCppPluginSpec(
+    const Utils::FilePath &filePath);
+EXTENSIONSYSTEM_EXPORT Utils::expected_str<PluginSpec *> readCppPluginSpec(
+    const QStaticPlugin &plugin);
+
+class EXTENSIONSYSTEM_TEST_EXPORT CppPluginSpec : public PluginSpec
 {
+    friend EXTENSIONSYSTEM_EXPORT Utils::expected_str<PluginSpec *> readCppPluginSpec(
+        const Utils::FilePath &filePath);
+    friend EXTENSIONSYSTEM_EXPORT Utils::expected_str<PluginSpec *> readCppPluginSpec(
+        const QStaticPlugin &plugin);
+
 public:
-    ~PluginSpecImpl() override;
+    ~CppPluginSpec() override;
 
     // linked plugin instance, valid after 'Loaded' state is reached
     IPlugin *plugin() const override;
@@ -184,13 +195,10 @@ public:
     IPlugin::ShutdownFlag stop() override;
     void kill() override;
 
-    static Utils::expected_str<PluginSpec *> read(const QString &filePath);
-    static Utils::expected_str<PluginSpec *> read(const QStaticPlugin &plugin);
-
     Utils::expected_str<void> readMetaData(const QJsonObject &pluginMetaData) override;
 
 protected:
-    PluginSpecImpl();
+    CppPluginSpec();
 
 private:
     std::unique_ptr<Internal::PluginSpecImplPrivate> d;
diff --git a/src/libs/extensionsystem/pluginview.cpp b/src/libs/extensionsystem/pluginview.cpp
index 07fa11c7a9..902f90aca4 100644
--- a/src/libs/extensionsystem/pluginview.cpp
+++ b/src/libs/extensionsystem/pluginview.cpp
@@ -119,7 +119,7 @@ public:
                     toolTip = Tr::tr("Path: %1\nPlugin is disabled by command line argument.");
                 else
                     toolTip = Tr::tr("Path: %1");
-                return toolTip.arg(QDir::toNativeSeparators(m_spec->filePath()));
+                return toolTip.arg(m_spec->filePath().toUserOutput());
             }
             if (role == Qt::DecorationRole) {
                 bool ok = !m_spec->hasError();
diff --git a/src/libs/languageserverprotocol/jsonobject.h b/src/libs/languageserverprotocol/jsonobject.h
index fd90453da1..ce2ad50a40 100644
--- a/src/libs/languageserverprotocol/jsonobject.h
+++ b/src/libs/languageserverprotocol/jsonobject.h
@@ -93,7 +93,8 @@ private:
 template<typename T, typename V>
 JsonObject::iterator JsonObject::insertVariant(const Key key, const V &variant)
 {
-    return std::holds_alternative<T>(variant) ? insert(key, std::get<T>(variant)) : end();
+    const auto v = std::get_if<T>(&variant);
+    return v ? insert(key, *v) : end();
 }
 
 template<typename T1, typename T2, typename... Args, typename V>
diff --git a/src/libs/languageserverprotocol/jsonrpcmessages.h b/src/libs/languageserverprotocol/jsonrpcmessages.h
index 680bff9578..a794f7f819 100644
--- a/src/libs/languageserverprotocol/jsonrpcmessages.h
+++ b/src/libs/languageserverprotocol/jsonrpcmessages.h
@@ -68,19 +68,19 @@ public:
 private:
     friend size_t qHash(const MessageId &id)
     {
-        if (std::holds_alternative<int>(id))
-            return QT_PREPEND_NAMESPACE(qHash(std::get<int>(id)));
-        if (std::holds_alternative<QString>(id))
-            return QT_PREPEND_NAMESPACE(qHash(std::get<QString>(id)));
+        if (const int *iid = std::get_if<int>(&id))
+            return QT_PREPEND_NAMESPACE(qHash(*iid));
+        if (const QString *sid = std::get_if<QString>(&id))
+            return QT_PREPEND_NAMESPACE(qHash(*sid));
         return QT_PREPEND_NAMESPACE(qHash(0));
     }
 
     friend QDebug operator<<(QDebug stream, const MessageId &id)
     {
-        if (std::holds_alternative<int>(id))
-            stream << std::get<int>(id);
+        if (const int *iid = std::get_if<int>(&id))
+            stream << *iid;
         else
-            stream << std::get<QString>(id);
+            stream << *std::get_if<QString>(&id);
         return stream;
     }
 };
diff --git a/src/libs/languageserverprotocol/languagefeatures.cpp b/src/libs/languageserverprotocol/languagefeatures.cpp
index dcf076bd03..30e2b6bd84 100644
--- a/src/libs/languageserverprotocol/languagefeatures.cpp
+++ b/src/libs/languageserverprotocol/languagefeatures.cpp
@@ -303,8 +303,8 @@ HoverContent::HoverContent(const QJsonValue &value)
 
 bool HoverContent::isValid() const
 {
-    if (std::holds_alternative<MarkedString>(*this))
-        return std::get<MarkedString>(*this).isValid();
+    if (const auto s = std::get_if<MarkedString>(this))
+        return s->isValid();
     return true;
 }
 
diff --git a/src/libs/languageserverprotocol/lsptypes.cpp b/src/libs/languageserverprotocol/lsptypes.cpp
index cb327642e3..1bc8707572 100644
--- a/src/libs/languageserverprotocol/lsptypes.cpp
+++ b/src/libs/languageserverprotocol/lsptypes.cpp
@@ -101,10 +101,10 @@ MarkupOrString::MarkupOrString(const QJsonValue &val)
 
 QJsonValue MarkupOrString::toJson() const
 {
-    if (std::holds_alternative<QString>(*this))
-        return std::get<QString>(*this);
-    if (std::holds_alternative<MarkupContent>(*this))
-        return QJsonValue(std::get<MarkupContent>(*this));
+    if (const auto s = std::get_if<QString>(this))
+        return *s;
+    if (const auto c = std::get_if<MarkupContent>(this))
+        return QJsonValue(*c);
     return {};
 }
 
diff --git a/src/libs/languageserverprotocol/lsputils.h b/src/libs/languageserverprotocol/lsputils.h
index 0c815bafd8..32e2bfa6b7 100644
--- a/src/libs/languageserverprotocol/lsputils.h
+++ b/src/libs/languageserverprotocol/lsputils.h
@@ -89,15 +89,16 @@ public:
 
     QList<T> toListOrEmpty() const
     {
-        if (std::holds_alternative<QList<T>>(*this))
-            return std::get<QList<T>>(*this);
+        if (const auto l = std::get_if<QList<T>>(this))
+            return *l;
         return {};
     }
 
     QList<T> toList() const
     {
-        QTC_ASSERT(std::holds_alternative<QList<T>>(*this), return {});
-        return std::get<QList<T>>(*this);
+        const auto l = std::get_if<QList<T>>(this);
+        QTC_ASSERT(l, return {});
+        return *l;
     }
     bool isNull() const { return std::holds_alternative<std::nullptr_t>(*this); }
 };
@@ -127,15 +128,17 @@ public:
 
     T value(const T &defaultValue = T()) const
     {
-        QTC_ASSERT(std::holds_alternative<T>(*this), return defaultValue);
-        return std::get<T>(*this);
+        const auto t = std::get_if<T>(this);
+        QTC_ASSERT(t, return defaultValue);
+        return *t;
     }
 
     template<typename Type>
     LanguageClientValue<Type> transform()
     {
-        QTC_ASSERT(!std::holds_alternative<T>(*this), return LanguageClientValue<Type>());
-        return Type(std::get<T>(*this));
+        const auto t = std::get_if<T>(this);
+        QTC_ASSERT(t, return LanguageClientValue<Type>());
+        return Type(*t);
     }
 
     bool isNull() const { return std::holds_alternative<std::nullptr_t>(*this); }
diff --git a/src/libs/languageserverprotocol/progresssupport.cpp b/src/libs/languageserverprotocol/progresssupport.cpp
index 2ae4af1b98..ce110782dc 100644
--- a/src/libs/languageserverprotocol/progresssupport.cpp
+++ b/src/libs/languageserverprotocol/progresssupport.cpp
@@ -21,9 +21,9 @@ ProgressToken::ProgressToken(const QJsonValue &value)
 
 ProgressToken::operator QJsonValue() const
 {
-    if (std::holds_alternative<QString>(*this))
-        return QJsonValue(std::get<QString>(*this));
-    return QJsonValue(std::get<int>(*this));
+    if (const auto s = std::get_if<QString>(this))
+        return QJsonValue(*s);
+    return QJsonValue(*std::get_if<int>(this));
 }
 
 ProgressParams::ProgressType ProgressParams::value() const
diff --git a/src/libs/languageserverprotocol/servercapabilities.cpp b/src/libs/languageserverprotocol/servercapabilities.cpp
index 0c57f47131..b109d08687 100644
--- a/src/libs/languageserverprotocol/servercapabilities.cpp
+++ b/src/libs/languageserverprotocol/servercapabilities.cpp
@@ -189,10 +189,10 @@ void ServerCapabilities::setCallHierarchyProvider(
     const std::variant<bool, WorkDoneProgressOptions> &callHierarchyProvider)
 {
     QJsonValue val;
-    if (std::holds_alternative<bool>(callHierarchyProvider))
-        val = std::get<bool>(callHierarchyProvider);
-    else if (std::holds_alternative<WorkDoneProgressOptions>(callHierarchyProvider))
-        val = QJsonObject(std::get<WorkDoneProgressOptions>(callHierarchyProvider));
+    if (const auto boolvalue = std::get_if<bool>(&callHierarchyProvider))
+        val = *boolvalue;
+    else if (const auto options = std::get_if<WorkDoneProgressOptions>(&callHierarchyProvider))
+        val = QJsonObject(*options);
     insert(callHierarchyProviderKey, val);
 }
 
@@ -211,10 +211,10 @@ void ServerCapabilities::setTypeHierarchyProvider(
     const std::variant<bool, WorkDoneProgressOptions> &typeHierarchyProvider)
 {
     QJsonValue val;
-    if (std::holds_alternative<bool>(typeHierarchyProvider))
-        val = std::get<bool>(typeHierarchyProvider);
-    else if (std::holds_alternative<WorkDoneProgressOptions>(typeHierarchyProvider))
-        val = QJsonObject(std::get<WorkDoneProgressOptions>(typeHierarchyProvider));
+    if (const auto boolvalue = std::get_if<bool>(&typeHierarchyProvider))
+        val = *boolvalue;
+    else if (const auto options = std::get_if<WorkDoneProgressOptions>(&typeHierarchyProvider))
+        val = QJsonObject(*options);
     insert(typeHierarchyProviderKey, val);
 }
 
diff --git a/src/libs/languageserverprotocol/workspace.cpp b/src/libs/languageserverprotocol/workspace.cpp
index 2d49be2d5f..0d37b80934 100644
--- a/src/libs/languageserverprotocol/workspace.cpp
+++ b/src/libs/languageserverprotocol/workspace.cpp
@@ -64,10 +64,11 @@ ExecuteCommandParams::ExecuteCommandParams(const Command &command)
 
 LanguageServerProtocol::WorkSpaceFolderResult::operator const QJsonValue() const
 {
-    if (!std::holds_alternative<QList<WorkSpaceFolder>>(*this))
+    const auto folders = std::get_if<QList<WorkSpaceFolder>>(this);
+    if (!folders)
         return QJsonValue::Null;
     QJsonArray array;
-    for (const auto &folder : std::get<QList<WorkSpaceFolder>>(*this))
+    for (const auto &folder : *folders)
         array.append(QJsonValue(folder));
     return array;
 }
diff --git a/src/libs/languageutils/componentversion.cpp b/src/libs/languageutils/componentversion.cpp
index 6c599e300b..f041740d3b 100644
--- a/src/libs/languageutils/componentversion.cpp
+++ b/src/libs/languageutils/componentversion.cpp
@@ -10,27 +10,17 @@
 
 namespace LanguageUtils {
 
-const int ComponentVersion::NoVersion = -1;
-const int ComponentVersion::MaxVersion = std::numeric_limits<int>::max();
+// QTC_TEMP
 
-ComponentVersion::ComponentVersion()
-    : _major(NoVersion), _minor(NoVersion)
+ComponentVersion::ComponentVersion(QStringView versionString)
+    : _major(NoVersion)
+    , _minor(NoVersion)
 {
-}
-
-ComponentVersion::ComponentVersion(int major, int minor)
-    : _major(major), _minor(minor)
-{
-}
-
-ComponentVersion::ComponentVersion(const QString &versionString)
-    : _major(NoVersion), _minor(NoVersion)
-{
-    int dotIdx = versionString.indexOf(QLatin1Char('.'));
+    auto dotIdx = versionString.indexOf(QLatin1Char('.'));
     if (dotIdx == -1)
         return;
     bool ok = false;
-    int maybeMajor = versionString.left(dotIdx).toInt(&ok);
+    auto maybeMajor = versionString.left(dotIdx).toInt(&ok);
     if (!ok)
         return;
     int maybeMinor = versionString.mid(dotIdx + 1).toInt(&ok);
@@ -40,15 +30,6 @@ ComponentVersion::ComponentVersion(const QString &versionString)
     _minor = maybeMinor;
 }
 
-ComponentVersion::~ComponentVersion()
-{
-}
-
-bool ComponentVersion::isValid() const
-{
-    return _major >= 0 && _minor >= 0;
-}
-
 QString ComponentVersion::toString() const
 {
     QByteArray temp;
@@ -65,36 +46,4 @@ void ComponentVersion::addToHash(QCryptographicHash &hash) const
     hash.addData(reinterpret_cast<const char *>(&_minor), sizeof(_minor));
 }
 
-bool operator<(const ComponentVersion &lhs, const ComponentVersion &rhs)
-{
-    return lhs.majorVersion() < rhs.majorVersion()
-            || (lhs.majorVersion() == rhs.majorVersion() && lhs.minorVersion() < rhs.minorVersion());
-}
-
-bool operator<=(const ComponentVersion &lhs, const ComponentVersion &rhs)
-{
-    return lhs.majorVersion() < rhs.majorVersion()
-            || (lhs.majorVersion() == rhs.majorVersion() && lhs.minorVersion() <= rhs.minorVersion());
-}
-
-bool operator>(const ComponentVersion &lhs, const ComponentVersion &rhs)
-{
-    return rhs < lhs;
-}
-
-bool operator>=(const ComponentVersion &lhs, const ComponentVersion &rhs)
-{
-    return rhs <= lhs;
-}
-
-bool operator==(const ComponentVersion &lhs, const ComponentVersion &rhs)
-{
-    return lhs.majorVersion() == rhs.majorVersion() && lhs.minorVersion() == rhs.minorVersion();
-}
-
-bool operator!=(const ComponentVersion &lhs, const ComponentVersion &rhs)
-{
-    return !(lhs == rhs);
-}
-
 } // namespace LanguageUtils
diff --git a/src/libs/languageutils/componentversion.h b/src/libs/languageutils/componentversion.h
index 4b39e8402a..2b8311a6cb 100644
--- a/src/libs/languageutils/componentversion.h
+++ b/src/libs/languageutils/componentversion.h
@@ -9,6 +9,10 @@ QT_BEGIN_NAMESPACE
 class QCryptographicHash;
 QT_END_NAMESPACE
 
+#include <QStringView>
+
+#include <limits>
+
 namespace LanguageUtils {
 
 class LANGUAGEUTILS_EXPORT ComponentVersion
@@ -17,25 +21,56 @@ class LANGUAGEUTILS_EXPORT ComponentVersion
     int _minor;
 
 public:
-    static const int NoVersion;
-    static const int MaxVersion;
+    static constexpr int NoVersion = -1;
+    static constexpr int MaxVersion = std::numeric_limits<int>::max();
+
+    ComponentVersion()
+        : _major(NoVersion)
+        , _minor(NoVersion)
+    {}
 
-    ComponentVersion();
-    ComponentVersion(int major, int minor);
-    explicit ComponentVersion(const QString &versionString);
-    ~ComponentVersion();
+    ComponentVersion(int major, int minor)
+        : _major(major)
+        , _minor(minor)
+    {}
+
+    explicit ComponentVersion(QStringView versionString);
+    ~ComponentVersion() = default;
 
     int majorVersion() const { return _major; }
     int minorVersion() const { return _minor; }
 
-    friend bool LANGUAGEUTILS_EXPORT operator<(const ComponentVersion &lhs, const ComponentVersion &rhs);
-    friend bool LANGUAGEUTILS_EXPORT operator<=(const ComponentVersion &lhs, const ComponentVersion &rhs);
-    friend bool LANGUAGEUTILS_EXPORT operator>(const ComponentVersion &lhs, const ComponentVersion &rhs);
-    friend bool LANGUAGEUTILS_EXPORT operator>=(const ComponentVersion &lhs, const ComponentVersion &rhs);
-    friend bool LANGUAGEUTILS_EXPORT operator==(const ComponentVersion &lhs, const ComponentVersion &rhs);
-    friend bool LANGUAGEUTILS_EXPORT operator!=(const ComponentVersion &lhs, const ComponentVersion &rhs);
+    friend bool operator<(const ComponentVersion &lhs, const ComponentVersion &rhs)
+    {
+        return std::tie(lhs._major, lhs._minor) < std::tie(rhs._major, rhs._minor);
+    }
+
+    friend bool operator<=(const ComponentVersion &lhs, const ComponentVersion &rhs)
+    {
+        return std::tie(lhs._major, lhs._minor) <= std::tie(rhs._major, rhs._minor);
+    }
+
+    friend bool operator>(const ComponentVersion &lhs, const ComponentVersion &rhs)
+    {
+        return rhs < lhs;
+    }
+
+    friend bool operator>=(const ComponentVersion &lhs, const ComponentVersion &rhs)
+    {
+        return rhs <= lhs;
+    }
+
+    friend bool operator==(const ComponentVersion &lhs, const ComponentVersion &rhs)
+    {
+        return lhs.majorVersion() == rhs.majorVersion() && lhs.minorVersion() == rhs.minorVersion();
+    }
+
+    friend bool operator!=(const ComponentVersion &lhs, const ComponentVersion &rhs)
+    {
+        return !(lhs == rhs);
+    }
 
-    bool isValid() const;
+    bool isValid() const { return _major >= 0 && _minor >= 0; }
     QString toString() const;
     void addToHash(QCryptographicHash &hash) const;
 };
diff --git a/src/libs/libs.qbs b/src/libs/libs.qbs
index a6426d4ae4..aaf42e181c 100644
--- a/src/libs/libs.qbs
+++ b/src/libs/libs.qbs
@@ -26,7 +26,9 @@ Project {
         "utils/utils.qbs",
         "3rdparty/libptyqt/ptyqt.qbs",
         "3rdparty/libvterm/vterm.qbs",
+        "3rdparty/lua/lua.qbs",
         "3rdparty/qtkeychain/qtkeychain.qbs",
+        "3rdparty/sol2/sol2.qbs",
         "3rdparty/syntax-highlighting/syntax-highlighting.qbs",
         "3rdparty/winpty/winpty.qbs",
         "3rdparty/yaml-cpp/yaml-cpp.qbs",
diff --git a/src/libs/modelinglib/CMakeLists.txt b/src/libs/modelinglib/CMakeLists.txt
index 27801f479a..e966b39459 100644
--- a/src/libs/modelinglib/CMakeLists.txt
+++ b/src/libs/modelinglib/CMakeLists.txt
@@ -126,12 +126,15 @@ add_qtc_library(Modeling
     qmt/model/mrelation.cpp qmt/model/mrelation.h
     qmt/model/msourceexpansion.cpp qmt/model/msourceexpansion.h
     qmt/model/mvisitor.h
+    qmt/model_ui/modeltreefilterdata.h qmt/model_ui/modeltreefilterdata.cpp
     qmt/model_ui/modeltreeviewinterface.h
     qmt/model_ui/sortedtreemodel.cpp qmt/model_ui/sortedtreemodel.h
     qmt/model_ui/stereotypescontroller.cpp qmt/model_ui/stereotypescontroller.h
     qmt/model_ui/treemodel.cpp qmt/model_ui/treemodel.h
     qmt/model_ui/treemodelmanager.cpp qmt/model_ui/treemodelmanager.h
+    qmt/model_widgets_ui/addrelatedelementsdialog.h qmt/model_widgets_ui/addrelatedelementsdialog.cpp
     qmt/model_widgets_ui/classmembersedit.cpp qmt/model_widgets_ui/classmembersedit.h
+    qmt/model_widgets_ui/modeltreefilter.h qmt/model_widgets_ui/modeltreefilter.cpp
     qmt/model_widgets_ui/modeltreeview.cpp qmt/model_widgets_ui/modeltreeview.h
     qmt/model_widgets_ui/palettebox.cpp qmt/model_widgets_ui/palettebox.h
     qmt/model_widgets_ui/propertiesview.cpp qmt/model_widgets_ui/propertiesview.h
@@ -158,6 +161,7 @@ add_qtc_library(Modeling
     qmt/style/defaultstyle.h
     qmt/style/objectvisuals.cpp qmt/style/objectvisuals.h
     qmt/style/relationstarterstyle.cpp qmt/style/relationstarterstyle.h
+    qmt/style/relationvisuals.cpp qmt/style/relationvisuals.h
     qmt/style/stylecontroller.cpp qmt/style/stylecontroller.h
     qmt/style/style.cpp
     qmt/style/styledobject.cpp qmt/style/styledobject.h
diff --git a/src/libs/modelinglib/modelinglib.qbs b/src/libs/modelinglib/modelinglib.qbs
index 90fc1d0d98..9929bf33c0 100644
--- a/src/libs/modelinglib/modelinglib.qbs
+++ b/src/libs/modelinglib/modelinglib.qbs
@@ -238,6 +238,8 @@ QtcLibrary {
             "model_controller/mselection.h",
             "model_controller/mvoidvisitor.cpp",
             "model_controller/mvoidvisitor.h",
+            "model_ui/modeltreefilterdata.cpp",
+            "model_ui/modeltreefilterdata.h",
             "model_ui/modeltreeviewinterface.h",
             "model_ui/sortedtreemodel.cpp",
             "model_ui/sortedtreemodel.h",
@@ -247,8 +249,12 @@ QtcLibrary {
             "model_ui/treemodel.h",
             "model_ui/treemodelmanager.cpp",
             "model_ui/treemodelmanager.h",
+            "model_widgets_ui/addrelatedelementsdialog.h",
+            "model_widgets_ui/addrelatedelementsdialog.cpp",
             "model_widgets_ui/classmembersedit.cpp",
             "model_widgets_ui/classmembersedit.h",
+            "model_widgets_ui/modeltreefilter.cpp",
+            "model_widgets_ui/modeltreefilter.h",
             "model_widgets_ui/modeltreeview.cpp",
             "model_widgets_ui/modeltreeview.h",
             "model_widgets_ui/palettebox.cpp",
@@ -295,6 +301,8 @@ QtcLibrary {
             "style/objectvisuals.h",
             "style/relationstarterstyle.cpp",
             "style/relationstarterstyle.h",
+            "style/relationvisuals.cpp",
+            "style/relationvisuals.h",
             "style/style.cpp",
             "style/style.h",
             "style/stylecontroller.cpp",
diff --git a/src/libs/modelinglib/qmt/config/stereotypedefinitionparser.cpp b/src/libs/modelinglib/qmt/config/stereotypedefinitionparser.cpp
index b3caebb164..981641e0ad 100644
--- a/src/libs/modelinglib/qmt/config/stereotypedefinitionparser.cpp
+++ b/src/libs/modelinglib/qmt/config/stereotypedefinitionparser.cpp
@@ -28,12 +28,15 @@ static const int KEYWORD_WIDTH         =  6;
 static const int KEYWORD_HEIGHT        =  7;
 static const int KEYWORD_MINWIDTH      =  8;
 static const int KEYWORD_MINHEIGHT     =  9;
-static const int KEYWORD_LOCK_SIZE     = 10;
-static const int KEYWORD_DISPLAY       = 11;
-static const int KEYWORD_TEXTALIGN     = 12;
-static const int KEYWORD_BASECOLOR     = 13;
-static const int KEYWORD_SHAPE         = 14;
-static const int KEYWORD_OUTLINE       = 15;
+static const int KEYWORD_ICONWIDTH     = 10;
+static const int KEYWORD_ICONHEIGHT    = 11;
+static const int KEYWORD_LOCK_SIZE     = 12;
+static const int KEYWORD_DISPLAY       = 13;
+static const int KEYWORD_TEXTALIGN     = 14;
+static const int KEYWORD_BASECOLOR     = 15;
+static const int KEYWORD_SHAPE         = 16;
+static const int KEYWORD_OUTLINE       = 17;
+static const int KEYWORD_Z             = 18;
 
 // Shape items
 static const int KEYWORD_CIRCLE        = 30;
@@ -102,8 +105,18 @@ static const int KEYWORD_DASH          = 136;
 static const int KEYWORD_DASHDOT       = 137;
 static const int KEYWORD_DASHDOTDOT    = 138;
 static const int KEYWORD_COLOR         = 139;
-
-// Operatoren
+static const int KEYWORD_EMPHASIZED    = 140;
+
+// Shape Value Units and Origin
+static const int KEYWORD_ABS           = 150;
+static const int KEYWORD_FIX           = 151;
+static const int KEYWORD_SCALE         = 152;
+static const int KEYWORD_FRACT         = 153;
+static const int KEYWORD_ORIGIN        = 154;
+static const int KEYWORD_CENTER        = 155;
+static const int KEYWORD_SIZE          = 156;
+
+// Operators
 static const int OPERATOR_SEMICOLON    =  1;
 static const int OPERATOR_BRACE_OPEN   =  2;
 static const int OPERATOR_BRACE_CLOSE  =  3;
@@ -111,6 +124,7 @@ static const int OPERATOR_COLON        =  4;
 static const int OPERATOR_COMMA        =  5;
 static const int OPERATOR_PERIOD       =  6;
 static const int OPERATOR_MINUS        =  7;
+static const int OPERATOR_PERCENTAGE   =  8;
 
 template <typename T, typename U>
 QHash<T, U> operator<<(QHash<T, U> hash, QPair<T, U> pair) {
@@ -213,12 +227,15 @@ void StereotypeDefinitionParser::parse(ITextSource *source)
                              {"height", KEYWORD_HEIGHT},
                              {"minwidth", KEYWORD_MINWIDTH},
                              {"minheight", KEYWORD_MINHEIGHT},
+                             {"iconwidth", KEYWORD_ICONWIDTH},
+                             {"iconheight", KEYWORD_ICONHEIGHT},
                              {"locksize", KEYWORD_LOCK_SIZE},
                              {"display", KEYWORD_DISPLAY},
                              {"textalignment", KEYWORD_TEXTALIGN},
                              {"basecolor", KEYWORD_BASECOLOR},
                              {"shape", KEYWORD_SHAPE},
                              {"outline", KEYWORD_OUTLINE},
+                             {"z", KEYWORD_Z},
                              {"circle", KEYWORD_CIRCLE},
                              {"ellipse", KEYWORD_ELLIPSE},
                              {"line", KEYWORD_LINE},
@@ -276,7 +293,15 @@ void StereotypeDefinitionParser::parse(ITextSource *source)
                              {"dash", KEYWORD_DASH},
                              {"dashdot", KEYWORD_DASHDOT},
                              {"dashdotdot", KEYWORD_DASHDOTDOT},
-                             {"color", KEYWORD_COLOR}});
+                             {"color", KEYWORD_COLOR},
+                             {"emphasized", KEYWORD_EMPHASIZED},
+                             {"abs", KEYWORD_ABS},
+                             {"fix", KEYWORD_FIX},
+                             {"scale", KEYWORD_SCALE},
+                             {"fract", KEYWORD_FRACT},
+                             {"origin", KEYWORD_ORIGIN},
+                             {"center", KEYWORD_CENTER},
+                             {"size", KEYWORD_SIZE}});
 
     textScanner.setOperators({{";", OPERATOR_SEMICOLON},
                               {"{", OPERATOR_BRACE_OPEN},
@@ -284,7 +309,8 @@ void StereotypeDefinitionParser::parse(ITextSource *source)
                               {":", OPERATOR_COLON},
                               {",", OPERATOR_COMMA},
                               {".", OPERATOR_PERIOD},
-                              {"-", OPERATOR_MINUS}});
+                              {"-", OPERATOR_MINUS},
+                              {"%", OPERATOR_PERCENTAGE}});
 
     textScanner.setSource(source);
 
@@ -364,6 +390,23 @@ void StereotypeDefinitionParser::parseIcon()
         case KEYWORD_MINHEIGHT:
             stereotypeIcon.setMinHeight(parseFloatProperty());
             break;
+        case KEYWORD_ICONWIDTH:
+            stereotypeIcon.setIconWith(parseFloatProperty());
+            break;
+        case KEYWORD_ICONHEIGHT:
+            stereotypeIcon.setIconHeight(parseFloatProperty());
+            break;
+        case KEYWORD_Z:
+        {
+            const static QHash<QString, StereotypeIcon::DepthLayer> zNames = QHash<QString, StereotypeIcon::DepthLayer>()
+                    << qMakePair(QString("behinditems"), StereotypeIcon::DepthBehindItems)
+                    << qMakePair(QString("amongitems"), StereotypeIcon::DepthAmongItems)
+                    << qMakePair(QString("beforeitems"), StereotypeIcon::DepthBeforeItems);
+            parseEnum<StereotypeIcon::DepthLayer>(
+                        parseIdentifierProperty(), zNames, token.sourcePos(),
+                        [&](StereotypeIcon::DepthLayer layer) { stereotypeIcon.setDepthLayer(layer); });
+            break;
+        }
         case KEYWORD_LOCK_SIZE:
         {
             const static QHash<QString, StereotypeIcon::SizeLock> lockNames
@@ -577,7 +620,7 @@ QHash<int, StereotypeDefinitionParser::IconCommandParameter> StereotypeDefinitio
                 throw StereotypeDefinitionParserError("Property given twice.", token.sourcePos());
             IconCommandParameter parameter = parameters.value(token.subtype());
             if (parameter.type() == IconCommandParameter::ShapeValue)
-                parameter.setShapeValue(ShapeValueF(parseFloatProperty(), parameter.unit(), parameter.origin()));
+                parameter.setShapeValue(parseShapeValueProperty(parameter.unit(), parameter.origin()));
             else if (parameter.type() == IconCommandParameter::Boolean)
                 parameter.setBoolean(parseBoolProperty());
             else
@@ -650,8 +693,6 @@ void StereotypeDefinitionParser::parseRelation(CustomRelation::Element element)
         }
         case KEYWORD_COLOR:
         {
-            if (element != CustomRelation::Element::Relation)
-                throwUnknownPropertyError(token);
             Value expression = parseProperty();
             if (expression.type() == Color) {
                 relation.setColorType(CustomRelation::ColorType::Custom);
@@ -663,6 +704,10 @@ void StereotypeDefinitionParser::parseRelation(CustomRelation::Element element)
                     relation.setColorType(CustomRelation::ColorType::EndA);
                 } else if (colorName == "b") {
                     relation.setColorType(CustomRelation::ColorType::EndB);
+                } else if (colorName == "warning") {
+                    relation.setColorType(CustomRelation::ColorType::Warning);
+                } else if (colorName == "error") {
+                    relation.setColorType(CustomRelation::ColorType::Error);
                 } else if (QColor::isValidColor(colorName)) {
                     relation.setColorType(CustomRelation::ColorType::Custom);
                     relation.setColor(QColor(colorName));
@@ -674,6 +719,9 @@ void StereotypeDefinitionParser::parseRelation(CustomRelation::Element element)
             }
             break;
         }
+        case KEYWORD_EMPHASIZED:
+            relation.setEmphasized(parseBoolProperty());
+            break;
         case KEYWORD_END:
             parseRelationEnd(&relation);
             break;
@@ -976,6 +1024,65 @@ StereotypeDefinitionParser::Value StereotypeDefinitionParser::parseProperty()
     return parseExpression();
 }
 
+ShapeValueF StereotypeDefinitionParser::parseShapeValueProperty(ShapeValueF::Unit unit, ShapeValueF::Origin origin)
+{
+    expectColon();
+    qreal value = parseFloatExpression();
+    // unit
+    Token token = d->m_scanner->read();
+    if (token.type() == Token::TokenOperator) {
+        switch (token.subtype()) {
+        case OPERATOR_PERCENTAGE:
+            unit = ShapeValueF::UnitPercentage;
+            break;
+        default:
+            d->m_scanner->unread(token);
+            break;
+        }
+    } else if (token.type() == Token::TokenKeyword) {
+        switch (token.subtype()) {
+        case KEYWORD_ABS:
+            unit = ShapeValueF::UnitAbsolute;
+            break;
+        case KEYWORD_FIX:
+            unit = ShapeValueF::UnitRelative;
+            break;
+        case KEYWORD_SCALE:
+            unit = ShapeValueF::UnitScaled;
+            break;
+        case KEYWORD_FRACT:
+            unit = ShapeValueF::UnitPercentage;
+            break;
+        default:
+            d->m_scanner->unread(token);
+            break;
+        }
+    } else {
+        d->m_scanner->unread(token);
+    }
+    // origin
+    token = d->m_scanner->read();
+    if (token.type() == Token::TokenKeyword) {
+        switch (token.subtype()) {
+        case KEYWORD_ORIGIN:
+            origin = ShapeValueF::OriginTopOrLeft;
+            break;
+        case KEYWORD_CENTER:
+            origin = ShapeValueF::OriginCenter;
+            break;
+        case KEYWORD_SIZE:
+            origin = ShapeValueF::OriginBottomOrRight;
+            break;
+        default:
+            d->m_scanner->unread(token);
+            break;
+        }
+    } else {
+        d->m_scanner->unread(token);
+    }
+    return ShapeValueF(value, unit, origin);
+}
+
 QString StereotypeDefinitionParser::parseStringExpression()
 {
     Token token = d->m_scanner->read();
diff --git a/src/libs/modelinglib/qmt/config/stereotypedefinitionparser.h b/src/libs/modelinglib/qmt/config/stereotypedefinitionparser.h
index e32126c730..97b14211ca 100644
--- a/src/libs/modelinglib/qmt/config/stereotypedefinitionparser.h
+++ b/src/libs/modelinglib/qmt/config/stereotypedefinitionparser.h
@@ -6,6 +6,7 @@
 #include <QObject>
 #include "qmt/infrastructure/exceptions.h"
 #include "qmt/stereotype/customrelation.h"
+#include "qmt/stereotype/shapevalue.h"
 #include "qmt/stereotype/toolbar.h"
 
 #include "sourcepos.h"
@@ -20,7 +21,6 @@ class ITextSource;
 class Token;
 class StereotypeIcon;
 class Toolbar;
-class ShapeValueF;
 
 class QMT_EXPORT StereotypeDefinitionParserError : public Exception
 {
@@ -97,6 +97,7 @@ private:
     bool parseBoolProperty();
     QColor parseColorProperty();
     Value parseProperty();
+    ShapeValueF parseShapeValueProperty(ShapeValueF::Unit unit, ShapeValueF::Origin origin);
 
     QString parseStringExpression();
     qreal parseFloatExpression();
diff --git a/src/libs/modelinglib/qmt/diagram/dobject.cpp b/src/libs/modelinglib/qmt/diagram/dobject.cpp
index 4e0e5cb642..68e954b857 100644
--- a/src/libs/modelinglib/qmt/diagram/dobject.cpp
+++ b/src/libs/modelinglib/qmt/diagram/dobject.cpp
@@ -25,7 +25,10 @@ DObject::DObject(const DObject &rhs)
       m_visualSecondaryRole(rhs.m_visualSecondaryRole),
       m_stereotypeDisplay(rhs.m_stereotypeDisplay),
       m_isAutoSized(rhs.m_isAutoSized),
-      m_isVisualEmphasized(rhs.m_isVisualEmphasized)
+      m_isVisualEmphasized(rhs.m_isVisualEmphasized),
+      m_hasLinkedFile(rhs.m_hasLinkedFile),
+      m_imagePath(rhs.m_imagePath),
+      m_image(rhs.m_image)
 {
 }
 
@@ -49,6 +52,9 @@ DObject &DObject::operator =(const DObject &rhs)
         m_stereotypeDisplay = rhs.m_stereotypeDisplay;
         m_isAutoSized = rhs.m_isAutoSized;
         m_isVisualEmphasized = rhs.m_isVisualEmphasized;
+        m_hasLinkedFile = rhs.m_hasLinkedFile;
+        m_imagePath = rhs.m_imagePath;
+        m_image = rhs.m_image;
     }
     return *this;
 }
@@ -113,6 +119,26 @@ void DObject::setVisualEmphasized(bool visualEmphasized)
     m_isVisualEmphasized = visualEmphasized;
 }
 
+void DObject::setLinkedFile(bool linkedFile)
+{
+    m_hasLinkedFile = linkedFile;
+}
+
+bool DObject::hasImage() const
+{
+    return !m_image.isNull();
+}
+
+void DObject::setImagePath(const QString &path)
+{
+    m_imagePath = path;
+}
+
+void DObject::setImage(const QImage &image)
+{
+    m_image = image;
+}
+
 void DObject::accept(DVisitor *visitor)
 {
     visitor->visitDObject(this);
diff --git a/src/libs/modelinglib/qmt/diagram/dobject.h b/src/libs/modelinglib/qmt/diagram/dobject.h
index c8cf2b0e4d..bf43edea12 100644
--- a/src/libs/modelinglib/qmt/diagram/dobject.h
+++ b/src/libs/modelinglib/qmt/diagram/dobject.h
@@ -7,6 +7,7 @@
 
 #include "qmt/infrastructure/uid.h"
 
+#include <QImage>
 #include <QList>
 #include <QPointF>
 #include <QRectF>
@@ -78,6 +79,13 @@ public:
     void setAutoSized(bool autoSized);
     bool isVisualEmphasized() const { return m_isVisualEmphasized; }
     void setVisualEmphasized(bool visualEmphasized);
+    bool hasLinkedFile() const { return m_hasLinkedFile; }
+    void setLinkedFile(bool linkedFile);
+    QString imagePath() const { return m_imagePath; }
+    void setImagePath(const QString &path);
+    bool hasImage() const;
+    QImage image() const { return m_image; }
+    void setImage(const QImage &image);
 
     void accept(DVisitor *visitor) override;
     void accept(DConstVisitor *visitor) const override;
@@ -95,6 +103,9 @@ private:
     StereotypeDisplay m_stereotypeDisplay = StereotypeSmart;
     bool m_isAutoSized = true;
     bool m_isVisualEmphasized = false;
+    bool m_hasLinkedFile = false;
+    QString m_imagePath;
+    QImage m_image;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/diagram/drelation.cpp b/src/libs/modelinglib/qmt/diagram/drelation.cpp
index a21f61c707..890bd275e4 100644
--- a/src/libs/modelinglib/qmt/diagram/drelation.cpp
+++ b/src/libs/modelinglib/qmt/diagram/drelation.cpp
@@ -65,6 +65,31 @@ void DRelation::setIntermediatePoints(const QList<DRelation::IntermediatePoint>
     m_intermediatePoints = intermediatePoints;
 }
 
+void DRelation::setVisualPrimaryRole(VisualPrimaryRole visualPrimaryRole)
+{
+    m_visualPrimaryRole = visualPrimaryRole;
+}
+
+void DRelation::setVisualSecondaryRole(VisualSecondaryRole visualSecondaryRole)
+{
+    m_visualSecondaryRole = visualSecondaryRole;
+}
+
+void DRelation::setVisualEmphasized(bool visualEmphasized)
+{
+    m_isVisualEmphasized = visualEmphasized;
+}
+
+void DRelation::setColor(const QColor &color)
+{
+    m_color = color;
+}
+
+void DRelation::setThickness(qreal thickness)
+{
+    m_thickness = thickness;
+}
+
 void DRelation::accept(DVisitor *visitor)
 {
     visitor->visitDRelation(this);
diff --git a/src/libs/modelinglib/qmt/diagram/drelation.h b/src/libs/modelinglib/qmt/diagram/drelation.h
index 34bdaf1986..ed5624ad9f 100644
--- a/src/libs/modelinglib/qmt/diagram/drelation.h
+++ b/src/libs/modelinglib/qmt/diagram/drelation.h
@@ -5,6 +5,7 @@
 
 #include "delement.h"
 
+#include <QColor>
 #include <QList>
 #include <QPointF>
 
@@ -15,6 +16,22 @@ class DObject;
 class QMT_EXPORT DRelation : public DElement
 {
 public:
+    enum VisualPrimaryRole {
+        PrimaryRoleNormal,
+        PrimaryRoleCustom1,
+        PrimaryRoleCustom2,
+        PrimaryRoleCustom3,
+        PrimaryRoleCustom4,
+        PrimaryRoleCustom5
+    };
+
+    enum VisualSecondaryRole {
+        SecondaryRoleNone,
+        SecondaryRoleWarning,
+        SecondaryRoleError,
+        SecondaryRoleSoften
+    };
+
     class IntermediatePoint
     {
     public:
@@ -42,6 +59,16 @@ public:
     void setName(const QString &name);
     const QList<IntermediatePoint> intermediatePoints() const { return m_intermediatePoints; }
     void setIntermediatePoints(const QList<IntermediatePoint> &intermediatePoints);
+    VisualPrimaryRole visualPrimaryRole() const { return m_visualPrimaryRole; }
+    void setVisualPrimaryRole(VisualPrimaryRole visualPrimaryRole);
+    VisualSecondaryRole visualSecondaryRole() const { return m_visualSecondaryRole; }
+    void setVisualSecondaryRole(VisualSecondaryRole visualSecondaryRole);
+    bool isVisualEmphasized() const { return m_isVisualEmphasized; }
+    void setVisualEmphasized(bool visualEmphasized);
+    QColor color() const { return m_color; }
+    void setColor(const QColor &color);
+    qreal thickness() const { return m_thickness; }
+    void setThickness(qreal thickness);
 
     void accept(DVisitor *visitor) override;
     void accept(DConstVisitor *visitor) const override;
@@ -53,6 +80,11 @@ private:
     Uid m_endBUid;
     QString m_name;
     QList<IntermediatePoint> m_intermediatePoints;
+    VisualPrimaryRole m_visualPrimaryRole = PrimaryRoleNormal;
+    VisualSecondaryRole m_visualSecondaryRole = SecondaryRoleNone;
+    bool m_isVisualEmphasized = false;
+    QColor m_color;
+    qreal m_thickness = 0;
 };
 
 bool operator==(const DRelation::IntermediatePoint &lhs, const DRelation::IntermediatePoint &rhs);
diff --git a/src/libs/modelinglib/qmt/diagram_controller/dflatassignmentvisitor.cpp b/src/libs/modelinglib/qmt/diagram_controller/dflatassignmentvisitor.cpp
index 5e88175812..5e4c072588 100644
--- a/src/libs/modelinglib/qmt/diagram_controller/dflatassignmentvisitor.cpp
+++ b/src/libs/modelinglib/qmt/diagram_controller/dflatassignmentvisitor.cpp
@@ -49,7 +49,10 @@ void DFlatAssignmentVisitor::visitDObject(const DObject *object)
     target->setVisualPrimaryRole(object->visualPrimaryRole());
     target->setVisualSecondaryRole(object->visualSecondaryRole());
     target->setVisualEmphasized(object->isVisualEmphasized());
+    target->setLinkedFile(object->hasLinkedFile());
     target->setStereotypeDisplay(object->stereotypeDisplay());
+    target->setImagePath(object->imagePath());
+    target->setImage(object->image());
 }
 
 void DFlatAssignmentVisitor::visitDPackage(const DPackage *package)
@@ -100,6 +103,8 @@ void DFlatAssignmentVisitor::visitDRelation(const DRelation *relation)
     QMT_ASSERT(target, return);
     target->setStereotypes(relation->stereotypes());
     target->setIntermediatePoints(relation->intermediatePoints());
+    target->setVisualPrimaryRole(relation->visualPrimaryRole());
+    target->setThickness(relation->thickness());
 }
 
 void DFlatAssignmentVisitor::visitDInheritance(const DInheritance *inheritance)
diff --git a/src/libs/modelinglib/qmt/diagram_controller/dupdatevisitor.cpp b/src/libs/modelinglib/qmt/diagram_controller/dupdatevisitor.cpp
index 91a95438ad..2dd079e1bc 100644
--- a/src/libs/modelinglib/qmt/diagram_controller/dupdatevisitor.cpp
+++ b/src/libs/modelinglib/qmt/diagram_controller/dupdatevisitor.cpp
@@ -65,13 +65,16 @@ void DUpdateVisitor::visitMObject(const MObject *object)
     }
     if (isUpdating(object->name() != dobject->name()))
         dobject->setName(object->name());
+    bool hasLinkedFile = !object->linkedFileName().isEmpty();
+    if (isUpdating(hasLinkedFile != dobject->hasLinkedFile()))
+        dobject->setLinkedFile(hasLinkedFile);
     // TODO unlikely that this is called for all objects if hierarchy is modified
     // PERFORM remove loop
     int depth = 1;
     const MObject *owner = object->owner();
     while (owner) {
         owner = owner->owner();
-        depth += 1;
+        depth += 3;
     }
     if (isUpdating(depth != dobject->depth()))
         dobject->setDepth(depth);
diff --git a/src/libs/modelinglib/qmt/diagram_scene/capabilities/windable.h b/src/libs/modelinglib/qmt/diagram_scene/capabilities/windable.h
index a21f1caea3..c31249e5c1 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/capabilities/windable.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/capabilities/windable.h
@@ -20,7 +20,7 @@ public:
     virtual void insertHandle(int beforeIndex, const QPointF &pos, double rasterWidth, double rasterHeight) = 0;
     virtual void deleteHandle(int index) = 0;
     virtual void setHandlePos(int index, const QPointF &pos) = 0;
-    virtual void dropHandle(int index, double rasterWidth, double rasterHeight) = 0;
+    virtual void dropHandle(int index, bool extraSnap, double rasterWidth, double rasterHeight) = 0;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.cpp b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.cpp
index de8b82de20..9366a39503 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.cpp
@@ -209,15 +209,26 @@ DSelection DiagramSceneModel::selectedElements() const
     return selection;
 }
 
-DElement *DiagramSceneModel::findTopmostElement(const QPointF &scenePos) const
+QGraphicsItem *DiagramSceneModel::findTopmostItem(const QPointF &scenePos) const
 {
     // fetch affected items from scene in correct drawing order to find topmost element
     const QList<QGraphicsItem *> items = m_graphicsScene->items(scenePos);
+    QGraphicsItem *candidate = NULL;
     for (QGraphicsItem *item : items) {
-        if (m_graphicsItems.contains(item))
-            return m_itemToElementMap.value(item);
+        if (m_graphicsItems.contains(item)) {
+            if (!candidate || item->zValue() > candidate->zValue())
+                candidate = item;
+        }
     }
-    return nullptr;
+    return candidate;
+}
+
+DElement *DiagramSceneModel::findTopmostElement(const QPointF &scenePos) const
+{
+    QGraphicsItem *item = findTopmostItem(scenePos);
+    if (!item)
+        return nullptr;
+    return m_itemToElementMap.value(item);
 }
 
 DObject *DiagramSceneModel::findTopmostObject(const QPointF &scenePos) const
@@ -230,16 +241,13 @@ DObject *DiagramSceneModel::findTopmostObject(const QPointF &scenePos) const
 
 ObjectItem *DiagramSceneModel::findTopmostObjectItem(const QPointF &scenePos) const
 {
-    // fetch affected items from scene in correct drawing order to find topmost element
-    const QList<QGraphicsItem *> items = m_graphicsScene->items(scenePos);
-    for (QGraphicsItem *item : std::as_const(items)) {
-        if (m_graphicsItems.contains(item)) {
-            DObject *object = dynamic_cast<DObject *>(m_itemToElementMap.value(item));
-            if (object)
-                return dynamic_cast<ObjectItem *>(item);
-        }
-    }
-    return nullptr;
+    QGraphicsItem *item = findTopmostItem(scenePos);
+    if (!item)
+        return nullptr;
+    DObject *object = dynamic_cast<DObject *>(m_itemToElementMap.value(item));
+    if (!object)
+        return nullptr;
+    return dynamic_cast<ObjectItem *>(item);
 }
 
 QGraphicsItem *DiagramSceneModel::graphicsItem(DElement *element) const
@@ -353,7 +361,8 @@ void DiagramSceneModel::selectAllElements()
 void DiagramSceneModel::selectElement(DElement *element)
 {
     QGraphicsItem *selectItem = m_elementToItemMap.value(element);
-    for (QGraphicsItem *item : std::as_const(m_selectedItems)) {
+    auto selectedItems = m_selectedItems;
+    for (QGraphicsItem *item : std::as_const(selectedItems)) {
         if (item != selectItem)
             item->setSelected(false);
     }
@@ -363,9 +372,17 @@ void DiagramSceneModel::selectElement(DElement *element)
 
 void DiagramSceneModel::editElement(DElement *element)
 {
-    auto editable = dynamic_cast<IEditable *>(m_elementToItemMap.value(element));
-    if (editable && editable->isEditable())
+    QGraphicsItem *item = m_elementToItemMap.value(element);
+    auto editable = dynamic_cast<IEditable *>(item);
+    if (editable && editable->isEditable()) {
+        auto selectable = dynamic_cast<ISelectable *>(item);
+        if (selectable && item != m_focusItem) {
+            unsetFocusItem();
+            selectable->setFocusSelected(true);
+            m_focusItem = item;
+        }
         editable->edit();
+    }
 }
 
 void DiagramSceneModel::copyToClipboard()
@@ -507,9 +524,8 @@ void DiagramSceneModel::selectItem(QGraphicsItem *item, bool multiSelect)
 {
     if (!multiSelect) {
         if (!item->isSelected()) {
-            // We have to create a copy since "setSelected" may modify m_selectedItems
-            const QSet<QGraphicsItem *> copy = m_selectedItems;
-            for (QGraphicsItem *selectedItem : copy) {
+            auto selectedItems = m_selectedItems;
+            for (QGraphicsItem *selectedItem : std::as_const(selectedItems)) {
                 if (selectedItem != item)
                     selectedItem->setSelected(false);
             }
@@ -624,6 +640,7 @@ void DiagramSceneModel::keyReleaseEvent(QKeyEvent *event)
 
 void DiagramSceneModel::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
+    m_mousePressed = true;
     updateFocusItem(Utils::toSet(m_graphicsScene->selectedItems()));
     m_latchController->mousePressEventLatching(event);
     mousePressEventReparenting(event);
@@ -658,8 +675,10 @@ void DiagramSceneModel::mouseMoveEventReparenting(QGraphicsSceneMouseEvent *even
 
 void DiagramSceneModel::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
+    m_mousePressed = false;
     m_latchController->mouseReleaseEventLatching(event);
     mouseReleaseEventReparenting(event);
+    recalcSceneRectSize();
 }
 
 void DiagramSceneModel::mouseReleaseEventReparenting(QGraphicsSceneMouseEvent *event)
@@ -851,7 +870,7 @@ void DiagramSceneModel::onSelectionChanged()
     QSet<QGraphicsItem *> newSecondarySelectedItems;
 
     // select all contained objects secondarily
-    for (QGraphicsItem *selectedItem : std::as_const(m_secondarySelectedItems)) {
+    for (QGraphicsItem *selectedItem : std::as_const(m_selectedItems)) {
         const QList<QGraphicsItem *> items = collectCollidingObjectItems(selectedItem, CollidingInnerItems);
         for (QGraphicsItem *item : items) {
             if (!item->isSelected() && dynamic_cast<ISelectable *>(item)
@@ -908,7 +927,8 @@ void DiagramSceneModel::onSelectionChanged()
         }
     }
 
-    for (QGraphicsItem *item : std::as_const(m_secondarySelectedItems)) {
+    auto secondarySelectedItems = m_secondarySelectedItems;
+    for (QGraphicsItem *item : std::as_const(secondarySelectedItems)) {
         if (!newSecondarySelectedItems.contains(item)) {
             auto selectable = dynamic_cast<ISelectable *>(item);
             QMT_ASSERT(selectable, return);
@@ -1039,8 +1059,19 @@ void DiagramSceneModel::recalcSceneRectSize()
         if (!dynamic_cast<SwimlaneItem *>(item))
             sceneRect |= item->mapRectToScene(item->boundingRect());
     }
-    m_sceneRect = sceneRect;
-    emit sceneRectChanged(sceneRect);
+    if (m_mousePressed) {
+        if (sceneRect.left() < m_sceneRect.left())
+            m_sceneRect.setLeft(sceneRect.left());
+        if (sceneRect.right() > m_sceneRect.right())
+            m_sceneRect.setRight(sceneRect.right());
+        if (sceneRect.top() < m_sceneRect.top())
+            m_sceneRect.setTop(sceneRect.top());
+        if (sceneRect.bottom() > m_sceneRect.bottom())
+            m_sceneRect.setBottom(sceneRect.bottom());
+    } else {
+        m_sceneRect = sceneRect;
+    }
+    emit sceneRectChanged(m_sceneRect);
 }
 
 QGraphicsItem *DiagramSceneModel::createGraphicsItem(DElement *element)
diff --git a/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.h b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.h
index 0021faf459..b976f421f9 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.h
@@ -79,6 +79,7 @@ public:
     bool hasSelection() const;
     bool hasMultiObjectsSelection() const;
     DSelection selectedElements() const;
+    QGraphicsItem *findTopmostItem(const QPointF &scenePos) const;
     DElement *findTopmostElement(const QPointF &scenePos) const;
     DObject *findTopmostObject(const QPointF &scenePos) const;
     ObjectItem *findTopmostObjectItem(const QPointF &scenePos) const;
@@ -169,6 +170,7 @@ private:
     QGraphicsItem *m_focusItem = nullptr;
     QRectF m_sceneRect;
     QList<Uid> m_relationEndsUid;
+    bool m_mousePressed = false;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp
index 14ad25b2c1..23a9c524a2 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp
@@ -85,29 +85,16 @@ void ClassItem::update()
         m_methodsText.clear();
     }
 
-    // custom icon
-    if (stereotypeIconDisplay() == StereotypeIcon::DisplayIcon) {
-        if (!m_customIcon)
-            m_customIcon = new CustomIconItem(diagramSceneModel(), this);
-        m_customIcon->setStereotypeIconId(stereotypeIconId());
-        m_customIcon->setBaseSize(stereotypeIconMinimumSize(m_customIcon->stereotypeIcon(), CUSTOM_ICON_MINIMUM_AUTO_WIDTH, CUSTOM_ICON_MINIMUM_AUTO_HEIGHT));
-        m_customIcon->setBrush(style->fillBrush());
-        m_customIcon->setPen(style->outerLinePen());
-        m_customIcon->setZValue(SHAPE_ZVALUE);
-    } else if (m_customIcon) {
-        m_customIcon->scene()->removeItem(m_customIcon);
-        delete m_customIcon;
-        m_customIcon = nullptr;
-    }
+    updateCustomIcon(style);
 
     // shape
-    if (!m_customIcon) {
+    if (!customIconItem()) {
         if (!m_shape)
             m_shape = new QGraphicsRectItem(this);
         m_shape->setBrush(style->fillBrush());
         m_shape->setPen(style->outerLinePen());
         m_shape->setZValue(SHAPE_ZVALUE);
-    } else if (m_shape){
+    } else if (m_shape) {
         m_shape->scene()->removeItem(m_shape);
         delete m_shape;
         m_shape = nullptr;
@@ -259,7 +246,7 @@ void ClassItem::update()
         m_templateParameterBox = nullptr;
     }
 
-    updateSelectionMarker(m_customIcon);
+    updateSelectionMarker(customIconItem());
     updateRelationStarter();
     updateAlignmentButtons();
     updateGeometry();
@@ -267,8 +254,8 @@ void ClassItem::update()
 
 bool ClassItem::intersectShapeWithLine(const QLineF &line, QPointF *intersectionPoint, QLineF *intersectionLine) const
 {
-    if (m_customIcon) {
-        QList<QPolygonF> polygons = m_customIcon->outline();
+    if (customIconItem()) {
+        QList<QPolygonF> polygons = customIconItem()->outline();
         for (int i = 0; i < polygons.size(); ++i)
             polygons[i].translate(object()->pos() + object()->rect().topLeft());
         if (shapeIcon().textAlignment() == qmt::StereotypeIcon::TextalignBelow) {
@@ -508,7 +495,7 @@ DClass::TemplateDisplay ClassItem::templateDisplay() const
 
     DClass::TemplateDisplay templateDisplay = diagramClass->templateDisplay();
     if (templateDisplay == DClass::TemplateSmart) {
-        if (m_customIcon)
+        if (customIconItem())
             templateDisplay = DClass::TemplateName;
         else
             templateDisplay = DClass::TemplateBox;
@@ -521,8 +508,8 @@ QSizeF ClassItem::calcMinimumGeometry() const
     double width = 0.0;
     double height = 0.0;
 
-    if (m_customIcon) {
-        QSizeF sz = stereotypeIconMinimumSize(m_customIcon->stereotypeIcon(),
+    if (customIconItem()) {
+        QSizeF sz = customIconItemMinimumSize(customIconItem(),
                                               CUSTOM_ICON_MINIMUM_AUTO_WIDTH, CUSTOM_ICON_MINIMUM_AUTO_HEIGHT);
         if (shapeIcon().textAlignment() != qmt::StereotypeIcon::TextalignTop
                 && shapeIcon().textAlignment() != qmt::StereotypeIcon::TextalignCenter)
@@ -589,12 +576,7 @@ void ClassItem::updateGeometry()
     height = geometry.height();
 
     if (object()->isAutoSized()) {
-        if (!m_customIcon) {
-            if (width < MINIMUM_AUTO_WIDTH)
-                width = MINIMUM_AUTO_WIDTH;
-            if (height < MINIMUM_AUTO_HEIGHT)
-                height = MINIMUM_AUTO_HEIGHT;
-        }
+        correctAutoSize(customIconItem(), width, height, MINIMUM_AUTO_WIDTH, MINIMUM_AUTO_HEIGHT);
     } else {
         QRectF rect = object()->rect();
         if (rect.width() > width)
@@ -619,15 +601,15 @@ void ClassItem::updateGeometry()
     // a backup for the graphics item used for manual resized and persistency.
     object()->setRect(rect);
 
-    if (m_customIcon) {
-        m_customIcon->setPos(left, top);
-        m_customIcon->setActualSize(QSizeF(width, height));
+    if (customIconItem()) {
+        customIconItem()->setPos(left, top);
+        customIconItem()->setActualSize(QSizeF(width, height));
     }
 
     if (m_shape)
         m_shape->setRect(rect);
 
-    if (m_customIcon) {
+    if (customIconItem()) {
         switch (shapeIcon().textAlignment()) {
         case qmt::StereotypeIcon::TextalignBelow:
             y += height + BODY_VERT_BORDER;
@@ -679,7 +661,7 @@ void ClassItem::updateGeometry()
         y += nameItem()->boundingRect().height();
     }
     if (m_contextLabel) {
-        if (m_customIcon)
+        if (customIconItem())
             m_contextLabel->resetMaxWidth();
         else
             m_contextLabel->setMaxWidth(width - 2 * BODY_HORIZ_BORDER);
@@ -692,7 +674,7 @@ void ClassItem::updateGeometry()
         y += 8.0;
     }
     if (m_attributes) {
-        if (m_customIcon)
+        if (customIconItem())
             m_attributes->setPos(-m_attributes->boundingRect().width() / 2.0, y);
         else
             m_attributes->setPos(left + BODY_HORIZ_BORDER, y);
@@ -704,7 +686,7 @@ void ClassItem::updateGeometry()
         y += 8.0;
     }
     if (m_methods) {
-        if (m_customIcon)
+        if (customIconItem())
             m_methods->setPos(-m_methods->boundingRect().width() / 2.0, y);
         else
             m_methods->setPos(left + BODY_HORIZ_BORDER, y);
@@ -765,21 +747,22 @@ void ClassItem::updateMembers(const Style *style)
             break;
         }
 
+        bool needBr = false;
         if (text && !text->isEmpty())
-            *text += "<br/>";
+            needBr = true;
 
-        bool addNewline = false;
-        bool addSpace = false;
         if (currentVisibility)
             *currentVisibility = member.visibility();
         if (currentGroup && member.group() != *currentGroup) {
-            *text += QString("[%1]").arg(member.group());
-            addNewline = true;
+            needBr = false;
+            *text += QString("<p style=\"padding:0;margin-top:6;margin-bottom:0;\"><b>[%1]</b></p>").arg(member.group());
             *currentGroup = member.group();
         }
-        if (addNewline)
+
+        if (needBr)
             *text += "<br/>";
 
+        bool addSpace = false;
         bool haveSignal = false;
         bool haveSlot = false;
         if (member.visibility() != MClassMember::VisibilityUndefined) {
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/classitem.h b/src/libs/modelinglib/qmt/diagram_scene/items/classitem.h
index 83ce0a9a5a..cc92ab1ff5 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/classitem.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/classitem.h
@@ -53,7 +53,6 @@ private:
     void updateGeometry();
     void updateMembers(const Style *style);
 
-    CustomIconItem *m_customIcon = nullptr;
     QGraphicsRectItem *m_shape = nullptr;
     QGraphicsSimpleTextItem *m_baseClasses = nullptr;
     QGraphicsSimpleTextItem *m_namespace = nullptr;
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/componentitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/componentitem.cpp
index 6a54a001e5..e7fffcbf9a 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/componentitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/componentitem.cpp
@@ -53,24 +53,11 @@ void ComponentItem::update()
 
     const Style *style = adaptedStyle(stereotypeIconId());
 
-    // custom icon
-    if (stereotypeIconDisplay() == StereotypeIcon::DisplayIcon) {
-        if (!m_customIcon)
-            m_customIcon = new CustomIconItem(diagramSceneModel(), this);
-        m_customIcon->setStereotypeIconId(stereotypeIconId());
-        m_customIcon->setBaseSize(stereotypeIconMinimumSize(m_customIcon->stereotypeIcon(), CUSTOM_ICON_MINIMUM_AUTO_WIDTH, CUSTOM_ICON_MINIMUM_AUTO_HEIGHT));
-        m_customIcon->setBrush(style->fillBrush());
-        m_customIcon->setPen(style->outerLinePen());
-        m_customIcon->setZValue(SHAPE_ZVALUE);
-    } else if (m_customIcon) {
-        m_customIcon->scene()->removeItem(m_customIcon);
-        delete m_customIcon;
-        m_customIcon = nullptr;
-    }
+    updateCustomIcon(style);
 
     // shape
     bool deleteRects = false;
-    if (!m_customIcon) {
+    if (!customIconItem()) {
         if (!m_shape)
             m_shape = new QGraphicsRectItem(this);
         m_shape->setBrush(style->fillBrush());
@@ -130,7 +117,7 @@ void ComponentItem::update()
         m_contextLabel = nullptr;
     }
 
-    updateSelectionMarker(m_customIcon);
+    updateSelectionMarker(customIconItem());
     updateRelationStarter();
     updateAlignmentButtons();
     updateGeometry();
@@ -138,8 +125,8 @@ void ComponentItem::update()
 
 bool ComponentItem::intersectShapeWithLine(const QLineF &line, QPointF *intersectionPoint, QLineF *intersectionLine) const
 {
-    if (m_customIcon) {
-        QList<QPolygonF> polygons = m_customIcon->outline();
+    if (customIconItem()) {
+        QList<QPolygonF> polygons = customIconItem()->outline();
         for (int i = 0; i < polygons.size(); ++i)
             polygons[i].translate(object()->pos() + object()->rect().topLeft());
         if (shapeIcon().textAlignment() == qmt::StereotypeIcon::TextalignBelow) {
@@ -207,14 +194,16 @@ QSizeF ComponentItem::calcMinimumGeometry() const
 {
     double width = 0.0;
     double height = 0.0;
+    double customMinHeight = 0.0;
 
-    if (m_customIcon) {
-        QSizeF sz = stereotypeIconMinimumSize(m_customIcon->stereotypeIcon(),
+    if (customIconItem()) {
+        QSizeF sz = customIconItemMinimumSize(customIconItem(),
                                               CUSTOM_ICON_MINIMUM_AUTO_WIDTH, CUSTOM_ICON_MINIMUM_AUTO_HEIGHT);
         if (shapeIcon().textAlignment() != qmt::StereotypeIcon::TextalignTop
                 && shapeIcon().textAlignment() != qmt::StereotypeIcon::TextalignCenter)
             return sz;
         width = sz.width();
+        customMinHeight = sz.height();
     }
 
     height += BODY_VERT_BORDER;
@@ -234,7 +223,7 @@ QSizeF ComponentItem::calcMinimumGeometry() const
         height += m_contextLabel->height();
     height += BODY_VERT_BORDER;
 
-    if (!hasPlainShape()) {
+    if (!customIconItem() && !hasPlainShape()) {
         width = RECT_WIDTH * 0.5 + BODY_HORIZ_BORDER + width + BODY_HORIZ_BORDER + RECT_WIDTH * 0.5;
         double minHeight = UPPER_RECT_Y + RECT_HEIGHT + RECT_Y_DISTANCE + RECT_HEIGHT + LOWER_RECT_MIN_Y;
         if (height < minHeight)
@@ -243,6 +232,9 @@ QSizeF ComponentItem::calcMinimumGeometry() const
         width = BODY_HORIZ_BORDER + width + BODY_HORIZ_BORDER;
     }
 
+    if (height < customMinHeight)
+        height = customMinHeight;
+
     return GeometryUtilities::ensureMinimumRasterSize(QSizeF(width, height), 2 * RASTER_WIDTH, 2 * RASTER_HEIGHT);
 }
 
@@ -259,7 +251,7 @@ void ComponentItem::updateGeometry()
     height = geometry.height();
 
     if (object()->isAutoSized()) {
-        // nothing
+        correctAutoSize(customIconItem(), width, height, 0, 0);
     } else {
         QRectF rect = object()->rect();
         if (rect.width() > width)
@@ -283,9 +275,9 @@ void ComponentItem::updateGeometry()
     // a backup for the graphics item used for manual resized and persistency.
     object()->setRect(rect);
 
-    if (m_customIcon) {
-        m_customIcon->setPos(left, top);
-        m_customIcon->setActualSize(QSizeF(width, height));
+    if (customIconItem()) {
+        customIconItem()->setPos(left, top);
+        customIconItem()->setActualSize(QSizeF(width, height));
     }
 
     if (m_shape)
@@ -303,7 +295,7 @@ void ComponentItem::updateGeometry()
         m_lowerRect->setPos(left - RECT_WIDTH * 0.5, top + UPPER_RECT_Y + RECT_HEIGHT + RECT_Y_DISTANCE);
     }
 
-    if (m_customIcon) {
+    if (customIconItem()) {
         switch (shapeIcon().textAlignment()) {
         case qmt::StereotypeIcon::TextalignBelow:
             y += height + BODY_VERT_BORDER;
@@ -345,7 +337,7 @@ void ComponentItem::updateGeometry()
         y += nameItem()->boundingRect().height();
     }
     if (m_contextLabel) {
-        if (m_customIcon) {
+        if (customIconItem()) {
             m_contextLabel->resetMaxWidth();
         } else {
             double maxContextWidth = width - 2 * BODY_HORIZ_BORDER - (hasPlainShape() ? 0 : RECT_WIDTH);
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/componentitem.h b/src/libs/modelinglib/qmt/diagram_scene/items/componentitem.h
index f00fbf30eb..f4910f53ce 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/componentitem.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/componentitem.h
@@ -41,7 +41,6 @@ private:
     QSizeF calcMinimumGeometry() const;
     void updateGeometry();
 
-    CustomIconItem *m_customIcon = nullptr;
     QGraphicsRectItem *m_shape = nullptr;
     QGraphicsRectItem *m_upperRect = nullptr;
     QGraphicsRectItem *m_lowerRect = nullptr;
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/diagramitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/diagramitem.cpp
index c37c38b3bb..951d6f3b1a 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/diagramitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/diagramitem.cpp
@@ -47,23 +47,10 @@ void DiagramItem::update()
 
     const Style *style = adaptedStyle(stereotypeIconId());
 
-    // custom icon
-    if (stereotypeIconDisplay() == StereotypeIcon::DisplayIcon) {
-        if (!m_customIcon)
-            m_customIcon = new CustomIconItem(diagramSceneModel(), this);
-        m_customIcon->setStereotypeIconId(stereotypeIconId());
-        m_customIcon->setBaseSize(stereotypeIconMinimumSize(m_customIcon->stereotypeIcon(), CUSTOM_ICON_MINIMUM_AUTO_WIDTH, CUSTOM_ICON_MINIMUM_AUTO_HEIGHT));
-        m_customIcon->setBrush(style->fillBrush());
-        m_customIcon->setPen(style->outerLinePen());
-        m_customIcon->setZValue(SHAPE_ZVALUE);
-    } else if (m_customIcon) {
-        m_customIcon->scene()->removeItem(m_customIcon);
-        delete m_customIcon;
-        m_customIcon = nullptr;
-    }
+    updateCustomIcon(style);
 
     // shape
-    if (!m_customIcon) {
+    if (!customIconItem()) {
         if (!m_body)
             m_body = new QGraphicsPolygonItem(this);
         m_body->setBrush(style->fillBrush());
@@ -93,15 +80,15 @@ void DiagramItem::update()
     // diagram name
     updateNameItem(style);
 
-    updateSelectionMarker(m_customIcon);
+    updateSelectionMarker(customIconItem());
     updateAlignmentButtons();
     updateGeometry();
 }
 
 bool DiagramItem::intersectShapeWithLine(const QLineF &line, QPointF *intersectionPoint, QLineF *intersectionLine) const
 {
-    if (m_customIcon) {
-        QList<QPolygonF> polygons = m_customIcon->outline();
+    if (customIconItem()) {
+        QList<QPolygonF> polygons = customIconItem()->outline();
         for (int i = 0; i < polygons.size(); ++i)
             polygons[i].translate(object()->pos() + object()->rect().topLeft());
         if (shapeIcon().textAlignment() == qmt::StereotypeIcon::TextalignBelow) {
@@ -131,8 +118,8 @@ QSizeF DiagramItem::calcMinimumGeometry() const
     double width = MINIMUM_WIDTH;
     double height = 0.0;
 
-    if (m_customIcon) {
-        QSizeF sz = stereotypeIconMinimumSize(m_customIcon->stereotypeIcon(),
+    if (customIconItem()) {
+        QSizeF sz = customIconItemMinimumSize(customIconItem(),
                                               CUSTOM_ICON_MINIMUM_AUTO_WIDTH, CUSTOM_ICON_MINIMUM_AUTO_HEIGHT);
         if (shapeIcon().textAlignment() != qmt::StereotypeIcon::TextalignTop
                 && shapeIcon().textAlignment() != qmt::StereotypeIcon::TextalignCenter)
@@ -175,12 +162,7 @@ void DiagramItem::updateGeometry()
     height = geometry.height();
 
     if (object()->isAutoSized()) {
-        if (!m_customIcon) {
-            if (width < MINIMUM_AUTO_WIDTH)
-                width = MINIMUM_AUTO_WIDTH;
-            if (height < MINIMUM_AUTO_HEIGHT)
-                height = MINIMUM_AUTO_HEIGHT;
-        }
+        correctAutoSize(customIconItem(), width, height, MINIMUM_AUTO_WIDTH, MINIMUM_AUTO_HEIGHT);
     } else {
         QRectF rect = object()->rect();
         if (rect.width() > width)
@@ -203,9 +185,9 @@ void DiagramItem::updateGeometry()
     // a backup for the graphics item used for manual resized and persistency.
     object()->setRect(rect);
 
-    if (m_customIcon) {
-        m_customIcon->setPos(left, top);
-        m_customIcon->setActualSize(QSizeF(width, height));
+    if (customIconItem()) {
+        customIconItem()->setPos(left, top);
+        customIconItem()->setActualSize(QSizeF(width, height));
     }
 
     if (m_body) {
@@ -227,7 +209,7 @@ void DiagramItem::updateGeometry()
         m_fold->setPolygon(foldPolygon);
     }
 
-    if (m_customIcon) {
+    if (customIconItem()) {
         switch (shapeIcon().textAlignment()) {
         case qmt::StereotypeIcon::TextalignBelow:
             y += height + BODY_VERT_BORDER;
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/diagramitem.h b/src/libs/modelinglib/qmt/diagram_scene/items/diagramitem.h
index 81012b04a1..88d9f9a7a8 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/diagramitem.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/diagramitem.h
@@ -29,7 +29,6 @@ private:
     QSizeF calcMinimumGeometry() const;
     void updateGeometry();
 
-    CustomIconItem *m_customIcon = nullptr;
     QGraphicsPolygonItem *m_body = nullptr;
     QGraphicsPolygonItem *m_fold = nullptr;
 };
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/itemitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/itemitem.cpp
index 97a1b337fc..9855889b08 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/itemitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/itemitem.cpp
@@ -52,22 +52,10 @@ void ItemItem::update()
 
     const Style *style = adaptedStyle(shapeIconId());
 
-    if (!shapeIconId().isEmpty()) {
-        if (!m_customIcon)
-            m_customIcon = new CustomIconItem(diagramSceneModel(), this);
-        m_customIcon->setStereotypeIconId(shapeIconId());
-        m_customIcon->setBaseSize(stereotypeIconMinimumSize(m_customIcon->stereotypeIcon(), CUSTOM_ICON_MINIMUM_AUTO_WIDTH, CUSTOM_ICON_MINIMUM_AUTO_HEIGHT));
-        m_customIcon->setBrush(style->fillBrush());
-        m_customIcon->setPen(style->outerLinePen());
-        m_customIcon->setZValue(SHAPE_ZVALUE);
-    } else if (m_customIcon) {
-        m_customIcon->scene()->removeItem(m_customIcon);
-        delete m_customIcon;
-        m_customIcon = nullptr;
-    }
+    updateCustomIcon(style);
 
     // shape
-    if (!m_customIcon) {
+    if (!customIconItem()) {
         if (!m_shape)
             m_shape = new QGraphicsRectItem(this);
         m_shape->setBrush(style->fillBrush());
@@ -100,7 +88,7 @@ void ItemItem::update()
         m_contextLabel = nullptr;
     }
 
-    updateSelectionMarker(m_customIcon);
+    updateSelectionMarker(customIconItem());
     updateRelationStarter();
     updateAlignmentButtons();
     updateGeometry();
@@ -108,8 +96,8 @@ void ItemItem::update()
 
 bool ItemItem::intersectShapeWithLine(const QLineF &line, QPointF *intersectionPoint, QLineF *intersectionLine) const
 {
-    if (m_customIcon) {
-        QList<QPolygonF> polygons = m_customIcon->outline();
+    if (customIconItem()) {
+        QList<QPolygonF> polygons = customIconItem()->outline();
         for (int i = 0; i < polygons.size(); ++i)
             polygons[i].translate(object()->pos() + object()->rect().topLeft());
         if (shapeIcon().textAlignment() == qmt::StereotypeIcon::TextalignBelow) {
@@ -152,14 +140,16 @@ QSizeF ItemItem::calcMinimumGeometry() const
 {
     double width = 0.0;
     double height = 0.0;
+    double customMinHeight = 0.0;
 
-    if (m_customIcon) {
-        QSizeF sz = stereotypeIconMinimumSize(m_customIcon->stereotypeIcon(),
+    if (customIconItem()) {
+        QSizeF sz = customIconItemMinimumSize(customIconItem(),
                                               CUSTOM_ICON_MINIMUM_AUTO_WIDTH, CUSTOM_ICON_MINIMUM_AUTO_HEIGHT);
         if (shapeIcon().textAlignment() != qmt::StereotypeIcon::TextalignTop
                   && shapeIcon().textAlignment() != qmt::StereotypeIcon::TextalignCenter)
             return sz;
         width = sz.width();
+        customMinHeight = sz.height();
     }
 
     height += BODY_VERT_BORDER;
@@ -181,6 +171,9 @@ QSizeF ItemItem::calcMinimumGeometry() const
 
     width = BODY_HORIZ_BORDER + width + BODY_HORIZ_BORDER;
 
+    if (height < customMinHeight)
+        height = customMinHeight;
+
     return GeometryUtilities::ensureMinimumRasterSize(QSizeF(width, height), 2 * RASTER_WIDTH, 2 * RASTER_HEIGHT);
 }
 
@@ -197,7 +190,7 @@ void ItemItem::updateGeometry()
     height = geometry.height();
 
     if (object()->isAutoSized()) {
-        // nothing
+        correctAutoSize(customIconItem(), width, height, 0, 0);
     } else {
         QRectF rect = object()->rect();
         if (rect.width() > width)
@@ -221,15 +214,15 @@ void ItemItem::updateGeometry()
     // a backup for the graphics item used for manual resized and persistency.
     object()->setRect(rect);
 
-    if (m_customIcon) {
-        m_customIcon->setPos(left, top);
-        m_customIcon->setActualSize(QSizeF(width, height));
+    if (customIconItem()) {
+        customIconItem()->setPos(left, top);
+        customIconItem()->setActualSize(QSizeF(width, height));
     }
 
     if (m_shape)
         m_shape->setRect(rect);
 
-    if (m_customIcon) {
+    if (customIconItem()) {
         switch (shapeIcon().textAlignment()) {
         case qmt::StereotypeIcon::TextalignBelow:
             y += height + BODY_VERT_BORDER;
@@ -271,7 +264,7 @@ void ItemItem::updateGeometry()
         y += nameItem()->boundingRect().height();
     }
     if (m_contextLabel) {
-        if (m_customIcon) {
+        if (customIconItem()) {
             m_contextLabel->resetMaxWidth();
         } else {
             double maxContextWidth = width - 2 * BODY_HORIZ_BORDER;
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/itemitem.h b/src/libs/modelinglib/qmt/diagram_scene/items/itemitem.h
index 327b3799ac..de091a2bc7 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/itemitem.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/itemitem.h
@@ -39,7 +39,6 @@ private:
     QSizeF calcMinimumGeometry() const;
     void updateGeometry();
 
-    CustomIconItem *m_customIcon = nullptr;
     QGraphicsRectItem *m_shape = nullptr;
     ContextLabelItem *m_contextLabel = nullptr;
 };
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.cpp
index 0fe32080cf..d4f6bd386b 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.cpp
@@ -185,6 +185,8 @@ void ObjectItem::setFocusSelected(bool focusSelected)
     if (m_isFocusSelected != focusSelected) {
         m_isFocusSelected = focusSelected;
         update();
+        if (m_nameItem)
+            m_nameItem->setEditable(focusSelected);
     }
 }
 
@@ -353,9 +355,9 @@ void ObjectItem::relationDrawn(const QString &id, ObjectItem *targetItem, const
                         elementType = targetItem->stereotypeIconId();
                     else if (!targetItem->shapeIconId().isEmpty())
                         elementType = targetItem->shapeIconId();
-                    else
-                        elementType = targetItem->elementType();
-                    if (!endItems.contains(elementType)) {
+                    if ((!elementType.isEmpty() && !endItems.contains(elementType))
+                         && !endItems.contains(targetItem->elementType()))
+                    {
                         return;
                     }
                     // create relation
@@ -498,6 +500,7 @@ void ObjectItem::updateStereotypes(const QString &stereotypeIconId, StereotypeIc
             m_stereotypeIcon = new CustomIconItem(m_diagramSceneModel, this);
         m_stereotypeIcon->setStereotypeIconId(stereotypeIconId);
         m_stereotypeIcon->setBaseSize(QSizeF(m_stereotypeIcon->shapeWidth(), m_stereotypeIcon->shapeHeight()));
+        m_stereotypeIcon->setActualSize(QSizeF(m_stereotypeIcon->shapeWidth(), m_stereotypeIcon->shapeHeight()));
         m_stereotypeIcon->setBrush(style->fillBrush());
         m_stereotypeIcon->setPen(style->innerLinePen());
     } else if (m_stereotypeIcon) {
@@ -518,45 +521,92 @@ void ObjectItem::updateStereotypes(const QString &stereotypeIconId, StereotypeIc
     }
 }
 
-QSizeF ObjectItem::stereotypeIconMinimumSize(const StereotypeIcon &stereotypeIcon,
+QSizeF ObjectItem::customIconItemMinimumSize(const CustomIconItem *customIconItem,
                                              qreal minimumWidth, qreal minimumHeight) const
 {
     Q_UNUSED(minimumWidth)
 
     qreal width = 0.0;
     qreal height = 0.0;
-    if (stereotypeIcon.hasMinWidth() && !stereotypeIcon.hasMinHeight()) {
-        width = stereotypeIcon.minWidth();
-        if (stereotypeIcon.sizeLock() == StereotypeIcon::LockHeight || stereotypeIcon.sizeLock() == StereotypeIcon::LockSize)
-            height = stereotypeIcon.minHeight();
-        else
-            height = width * stereotypeIcon.height() / stereotypeIcon.width();
-    } else if (!stereotypeIcon.hasMinWidth() && stereotypeIcon.hasMinHeight()) {
-        height = stereotypeIcon.minHeight();
-        if (stereotypeIcon.sizeLock() == StereotypeIcon::LockWidth || stereotypeIcon.sizeLock() == StereotypeIcon::LockSize)
-            width = stereotypeIcon.minWidth();
-        else
-            width = height * stereotypeIcon.width() / stereotypeIcon.height();
-    } else if (stereotypeIcon.hasMinWidth() && stereotypeIcon.hasMinHeight()) {
-        if (stereotypeIcon.sizeLock() == StereotypeIcon::LockRatio) {
+    if (customIconItem->hasImage()) {
+        const QImage &image = customIconItem->image();
+        width = minimumWidth;
+        height = image.height() * width / image.width();
+        if (height < minimumHeight) {
+            height = minimumHeight;
+            width = image.width() * height / image.height();
+        }
+    } else {
+        const StereotypeIcon &stereotypeIcon = customIconItem->stereotypeIcon();
+        if (stereotypeIcon.hasMinWidth() && !stereotypeIcon.hasMinHeight()) {
             width = stereotypeIcon.minWidth();
-            height = width * stereotypeIcon.height() / stereotypeIcon.width();
-            if (height < stereotypeIcon.minHeight()) {
+            if (stereotypeIcon.sizeLock() == StereotypeIcon::LockHeight || stereotypeIcon.sizeLock() == StereotypeIcon::LockSize)
                 height = stereotypeIcon.minHeight();
+            else
+                height = width * stereotypeIcon.height() / stereotypeIcon.width();
+        } else if (!stereotypeIcon.hasMinWidth() && stereotypeIcon.hasMinHeight()) {
+            height = stereotypeIcon.minHeight();
+            if (stereotypeIcon.sizeLock() == StereotypeIcon::LockWidth || stereotypeIcon.sizeLock() == StereotypeIcon::LockSize)
+                width = stereotypeIcon.minWidth();
+            else
                 width = height * stereotypeIcon.width() / stereotypeIcon.height();
-                QMT_CHECK(width <= stereotypeIcon.minWidth());
+        } else if (stereotypeIcon.hasMinWidth() && stereotypeIcon.hasMinHeight()) {
+            if (stereotypeIcon.sizeLock() == StereotypeIcon::LockRatio) {
+                width = stereotypeIcon.minWidth();
+                height = width * stereotypeIcon.height() / stereotypeIcon.width();
+                if (height < stereotypeIcon.minHeight()) {
+                    height = stereotypeIcon.minHeight();
+                    width = height * stereotypeIcon.width() / stereotypeIcon.height();
+                    QMT_CHECK(width <= stereotypeIcon.minWidth());
+                }
+            } else {
+                width = stereotypeIcon.minWidth();
+                height = stereotypeIcon.minHeight();
             }
         } else {
-            width = stereotypeIcon.minWidth();
-            height = stereotypeIcon.minHeight();
+            height = minimumHeight;
+            width = height * stereotypeIcon.width() / stereotypeIcon.height();
         }
-    } else {
-        height = minimumHeight;
-        width = height * stereotypeIcon.width() / stereotypeIcon.height();
     }
     return QSizeF(width, height);
 }
 
+void ObjectItem::correctAutoSize(const CustomIconItem* customIconItem, qreal &width, qreal &height, qreal minimumWidth, qreal minimumHeight) const
+{
+    if (customIconItem) {
+        if (customIconItem->hasImage()) {
+            width = customIconItem->image().width();
+            height = customIconItem->image().height();
+        }
+    } else {
+        if (width < minimumWidth)
+            width = minimumWidth;
+        if (height < minimumHeight)
+            height = minimumHeight;
+    }
+}
+
+void ObjectItem::updateCustomIcon(const Style *style)
+{
+    if (object()->hasImage()) {
+        if (!m_customIcon)
+            m_customIcon = new CustomIconItem(diagramSceneModel(), this);
+        m_customIcon->setImage(object()->image());
+        m_customIcon->setZValue(SHAPE_ZVALUE);
+    } else if (!shapeIconId().isEmpty()) {
+        if (!m_customIcon)
+            m_customIcon = new CustomIconItem(diagramSceneModel(), this);
+        m_customIcon->setStereotypeIconId(shapeIconId());
+        m_customIcon->setBrush(style->fillBrush());
+        m_customIcon->setPen(style->outerLinePen());
+        m_customIcon->setZValue(SHAPE_ZVALUE);
+    } else if (m_customIcon) {
+        m_customIcon->scene()->removeItem(m_customIcon);
+        delete m_customIcon;
+        m_customIcon = nullptr;
+    }
+}
+
 bool ObjectItem::suppressTextDisplay() const
 {
     return m_shapeIcon.textAlignment() == StereotypeIcon::TextalignNone;
@@ -564,6 +614,7 @@ bool ObjectItem::suppressTextDisplay() const
 
 void ObjectItem::updateNameItem(const Style *style)
 {
+    QString display_name = buildDisplayName();
     if (!suppressTextDisplay()) {
         if (!m_nameItem) {
             m_nameItem = new EditableTextItem(this);
@@ -582,16 +633,18 @@ void ObjectItem::updateNameItem(const Style *style)
             QObject::connect(m_nameItem, &EditableTextItem::returnKeyPressed, m_nameItem,
                              [this] { this->m_nameItem->clearFocus(); });
         }
-        if (style->headerFont() != m_nameItem->font())
-            m_nameItem->setFont(style->headerFont());
+        QFont font = style->headerFont();
+        if (object()->hasLinkedFile())
+            font.setUnderline(true);
+        if (font != m_nameItem->font())
+            m_nameItem->setFont(font);
         if (style->textBrush().color() != m_nameItem->defaultTextColor())
             m_nameItem->setDefaultTextColor(style->textBrush().color());
         if (!m_nameItem->hasFocus()) {
-            QString name = buildDisplayName();
-            if (name != m_nameItem->toPlainText())
-                m_nameItem->setPlainText(name);
+            if (display_name != m_nameItem->toPlainText())
+                m_nameItem->setPlainText(display_name);
         }
-    } else if (m_nameItem ){
+    } else if (m_nameItem) {
         m_nameItem->scene()->removeItem(m_nameItem);
         delete m_nameItem;
         m_nameItem = nullptr;
@@ -621,30 +674,45 @@ void ObjectItem::setObjectName(const QString &objectName)
 
 void ObjectItem::updateDepth()
 {
-    setZValue(m_object->depth());
+    int depth_delta = 0;
+    switch (m_shapeIcon.depthLayer()) {
+    case StereotypeIcon::DepthBehindItems:
+        depth_delta = -1;
+        break;
+    case StereotypeIcon::DepthAmongItems:
+        depth_delta = 0;
+        break;
+    case StereotypeIcon::DepthBeforeItems:
+        depth_delta = 1;
+        break;
+    }
+    setZValue(m_object->depth() + depth_delta);
 }
 
-void ObjectItem::updateSelectionMarker(CustomIconItem *customIconItem)
+void ObjectItem::updateSelectionMarker(const CustomIconItem *customIconItem)
 {
     if (customIconItem) {
-        StereotypeIcon stereotypeIcon = customIconItem->stereotypeIcon();
         ResizeFlags resizeFlags = ResizeUnlocked;
-        switch (stereotypeIcon.sizeLock()) {
-        case StereotypeIcon::LockNone:
-            resizeFlags = ResizeUnlocked;
-            break;
-        case StereotypeIcon::LockWidth:
-            resizeFlags = ResizeLockedWidth;
-            break;
-        case StereotypeIcon::LockHeight:
-            resizeFlags = ResizeLockedHeight;
-            break;
-        case StereotypeIcon::LockSize:
-            resizeFlags = ResizeLockedSize;
-            break;
-        case StereotypeIcon::LockRatio:
+        if (customIconItem->hasImage()) {
             resizeFlags = ResizeLockedRatio;
-            break;
+        } else {
+            switch (customIconItem->stereotypeIcon().sizeLock()) {
+            case StereotypeIcon::LockNone:
+                resizeFlags = ResizeUnlocked;
+                break;
+            case StereotypeIcon::LockWidth:
+                resizeFlags = ResizeLockedWidth;
+                break;
+            case StereotypeIcon::LockHeight:
+                resizeFlags = ResizeLockedHeight;
+                break;
+            case StereotypeIcon::LockSize:
+                resizeFlags = ResizeLockedSize;
+                break;
+            case StereotypeIcon::LockRatio:
+                resizeFlags = ResizeLockedRatio;
+                break;
+            }
         }
         updateSelectionMarker(resizeFlags);
     } else {
@@ -990,6 +1058,10 @@ void ObjectItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
         addSeparator = true;
     if (element_tasks->extendContextMenu(object(), diagramSceneModel()->diagram(), &menu))
         addSeparator = true;
+    if (element_tasks->hasLinkedFile(m_object, m_diagramSceneModel->diagram())) {
+        menu.addAction(new ContextMenuAction(Tr::tr("Open Linked File"), "openLinkedFile", &menu));
+        addSeparator = true;
+    }
     if (addSeparator)
         menu.addSeparator();
     menu.addAction(new ContextMenuAction(Tr::tr("Remove"), "remove",
@@ -1000,12 +1072,12 @@ void ObjectItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
     QMenu alignMenu;
     alignMenu.setTitle(Tr::tr("Align Objects"));
     alignMenu.addAction(new ContextMenuAction(Tr::tr("Align Left"), "alignLeft", &alignMenu));
-    alignMenu.addAction(new ContextMenuAction(Tr::tr("Center Vertically"), "centerVertically",
+    alignMenu.addAction(new ContextMenuAction(Tr::tr("Center Horizontally"), "centerHorizontally",
                                               &alignMenu));
     alignMenu.addAction(new ContextMenuAction(Tr::tr("Align Right"), "alignRight", &alignMenu));
     alignMenu.addSeparator();
     alignMenu.addAction(new ContextMenuAction(Tr::tr("Align Top"), "alignTop", &alignMenu));
-    alignMenu.addAction(new ContextMenuAction(Tr::tr("Center Horizontally"), "centerHorizontally",
+    alignMenu.addAction(new ContextMenuAction(Tr::tr("Center Vertically"), "centerVertically",
                                               &alignMenu));
     alignMenu.addAction(new ContextMenuAction(Tr::tr("Align Bottom"), "alignBottom", &alignMenu));
     alignMenu.addSeparator();
@@ -1022,7 +1094,6 @@ void ObjectItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
     layoutMenu.addAction(new ContextMenuAction(Tr::tr("Equal Vertical Space"), "sameVBorderDistance", &alignMenu));
     layoutMenu.setEnabled(m_diagramSceneModel->hasMultiObjectsSelection());
     menu.addMenu(&layoutMenu);
-    menu.addAction(new ContextMenuAction(Tr::tr("Add Related Elements"), "addRelatedElements", &menu));
 
     QAction *selectedAction = menu.exec(event->screenPos());
     if (selectedAction) {
@@ -1035,6 +1106,8 @@ void ObjectItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
                 m_diagramSceneModel->diagramSceneController()->elementTasks()->openDiagram(m_object, m_diagramSceneModel->diagram());
             } else if (action->id() == "createDiagram") {
                 m_diagramSceneModel->diagramSceneController()->elementTasks()->createAndOpenDiagram(m_object, m_diagramSceneModel->diagram());
+            } else if (action->id() == "openLinkedFile") {
+                m_diagramSceneModel->diagramSceneController()->elementTasks()->openLinkedFile(m_object, m_diagramSceneModel->diagram());
             } else if (action->id() == "remove") {
                 DSelection selection = m_diagramSceneModel->selectedElements();
                 if (selection.isEmpty())
@@ -1073,11 +1146,6 @@ void ObjectItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
                 align(IAlignable::AlignHeight, "height");
             } else if (action->id() == "sameSize") {
                 align(IAlignable::AlignSize, "size");
-            } else if (action->id() == "addRelatedElements") {
-                DSelection selection = m_diagramSceneModel->selectedElements();
-                if (selection.isEmpty())
-                    selection.append(m_object->uid(), m_diagramSceneModel->diagram()->uid());
-                m_diagramSceneModel->diagramSceneController()->addRelatedElements(selection, m_diagramSceneModel->diagram());
             }
         }
     }
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.h b/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.h
index e7acd5705c..254ef215ca 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.h
@@ -120,8 +120,12 @@ protected:
                            StereotypeIcon::Display stereotypeDisplay, const Style *style);
     StereotypesItem *stereotypesItem() const { return m_stereotypesItem; }
     CustomIconItem *stereotypeIconItem() const { return m_stereotypeIcon; }
-    QSizeF stereotypeIconMinimumSize(const StereotypeIcon &stereotypeIcon, qreal minimumWidth,
+    CustomIconItem *customIconItem() const { return m_customIcon; }
+    QSizeF customIconItemMinimumSize(const CustomIconItem* customIconItem, qreal minimumWidth,
                                      qreal minimumHeight) const;
+    void correctAutoSize(const CustomIconItem *customIconItem, qreal& width, qreal& height,
+                           qreal minimumWidth, qreal minimumHeight) const;
+    void updateCustomIcon(const Style* style);
     bool suppressTextDisplay() const;
     void updateNameItem(const Style *style);
     EditableTextItem *nameItem() const { return m_nameItem; }
@@ -130,7 +134,7 @@ protected:
     void setObjectName(const QString &objectName);
 
     void updateDepth();
-    void updateSelectionMarker(CustomIconItem *customIconItem);
+    void updateSelectionMarker(const CustomIconItem* customIconItem);
     void updateSelectionMarker(ResizeFlags resizeFlags);
     void updateSelectionMarkerGeometry(const QRectF &objectRect);
     void updateRelationStarter();
@@ -169,6 +173,7 @@ private:
     StereotypeIcon::Display m_stereotypeIconDisplay = StereotypeIcon::DisplayLabel;
     StereotypesItem *m_stereotypesItem = nullptr;
     CustomIconItem *m_stereotypeIcon = nullptr;
+    CustomIconItem *m_customIcon = nullptr;
     EditableTextItem *m_nameItem = nullptr;
     RectangularSelectionItem *m_selectionMarker = nullptr;
     RelationStarter *m_relationStarter = nullptr;
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/packageitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/packageitem.cpp
index b473d17ec8..03e6d8d0f5 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/packageitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/packageitem.cpp
@@ -64,23 +64,10 @@ void PackageItem::update()
 
     const Style *style = adaptedStyle(stereotypeIconId());
 
-    // custom icon
-    if (stereotypeIconDisplay() == StereotypeIcon::DisplayIcon) {
-        if (!m_customIcon)
-            m_customIcon = new CustomIconItem(diagramSceneModel(), this);
-        m_customIcon->setStereotypeIconId(stereotypeIconId());
-        m_customIcon->setBaseSize(stereotypeIconMinimumSize(m_customIcon->stereotypeIcon(), CUSTOM_ICON_MINIMUM_AUTO_WIDTH, CUSTOM_ICON_MINIMUM_AUTO_HEIGHT));
-        m_customIcon->setBrush(style->fillBrush());
-        m_customIcon->setPen(style->outerLinePen());
-        m_customIcon->setZValue(SHAPE_ZVALUE);
-    } else if (m_customIcon) {
-        m_customIcon->scene()->removeItem(m_customIcon);
-        delete m_customIcon;
-        m_customIcon = nullptr;
-    }
+    updateCustomIcon(style);
 
     // shape
-    if (!m_customIcon) {
+    if (!customIconItem()) {
         if (!m_shape)
             m_shape = new QGraphicsPolygonItem(this);
         m_shape->setBrush(style->fillBrush());
@@ -111,7 +98,7 @@ void PackageItem::update()
         m_contextLabel = nullptr;
     }
 
-    updateSelectionMarker(m_customIcon);
+    updateSelectionMarker(customIconItem());
     updateRelationStarter();
     updateAlignmentButtons();
     updateGeometry();
@@ -119,8 +106,8 @@ void PackageItem::update()
 
 bool PackageItem::intersectShapeWithLine(const QLineF &line, QPointF *intersectionPoint, QLineF *intersectionLine) const
 {
-    if (m_customIcon) {
-        QList<QPolygonF> polygons = m_customIcon->outline();
+    if (customIconItem()) {
+        QList<QPolygonF> polygons = customIconItem()->outline();
         for (int i = 0; i < polygons.size(); ++i)
             polygons[i].translate(object()->pos() + object()->rect().topLeft());
         if (shapeIcon().textAlignment() == qmt::StereotypeIcon::TextalignBelow) {
@@ -169,8 +156,8 @@ PackageItem::ShapeGeometry PackageItem::calcMinimumGeometry() const
     double width = 0.0;
     double height = 0.0;
 
-    if (m_customIcon) {
-        QSizeF sz = stereotypeIconMinimumSize(m_customIcon->stereotypeIcon(),
+    if (customIconItem()) {
+        QSizeF sz = customIconItemMinimumSize(customIconItem(),
                                               CUSTOM_ICON_MINIMUM_AUTO_WIDTH, CUSTOM_ICON_MINIMUM_AUTO_HEIGHT);
         if (shapeIcon().textAlignment() != qmt::StereotypeIcon::TextalignTop
                 && shapeIcon().textAlignment() != qmt::StereotypeIcon::TextalignCenter)
@@ -244,12 +231,7 @@ void PackageItem::updateGeometry()
 
     // calc width and height
     if (object()->isAutoSized()) {
-        if (!m_customIcon) {
-            if (width < MINIMUM_AUTO_WIDTH)
-                width = MINIMUM_AUTO_WIDTH;
-            if (height < MINIMUM_AUTO_HEIGHT)
-                height = MINIMUM_AUTO_HEIGHT;
-        }
+        correctAutoSize(customIconItem(), width, height, MINIMUM_AUTO_WIDTH, MINIMUM_AUTO_HEIGHT);
     } else {
         QRectF rect = object()->rect();
         if (rect.width() > width)
@@ -273,9 +255,9 @@ void PackageItem::updateGeometry()
     // a backup for the graphics item used for manual resized and persistency.
     object()->setRect(rect);
 
-    if (m_customIcon) {
-        m_customIcon->setPos(left, top);
-        m_customIcon->setActualSize(QSizeF(width, height));
+    if (customIconItem()) {
+        customIconItem()->setPos(left, top);
+        customIconItem()->setActualSize(QSizeF(width, height));
 
         switch (shapeIcon().textAlignment()) {
         case qmt::StereotypeIcon::TextalignBelow:
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/packageitem.h b/src/libs/modelinglib/qmt/diagram_scene/items/packageitem.h
index 19c2fe54ab..f87af2fa35 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/packageitem.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/packageitem.h
@@ -40,7 +40,6 @@ private:
     ShapeGeometry calcMinimumGeometry() const;
     void updateGeometry();
 
-    CustomIconItem *m_customIcon = nullptr;
     QGraphicsPolygonItem *m_shape = nullptr;
     ContextLabelItem *m_contextLabel = nullptr;
 };
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.cpp
index a2f444f59e..ca9dd8c3a2 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.cpp
@@ -380,7 +380,12 @@ void RelationItem::setHandlePos(int index, const QPointF &pos)
     }
 }
 
-void RelationItem::dropHandle(int index, double rasterWidth, double rasterHeight)
+static inline bool between(double v, double mid, double range)
+{
+    return v >= mid-range && v <= mid+range;
+}
+
+void RelationItem::dropHandle(int index, bool extraSnap, double rasterWidth, double rasterHeight)
 {
     if (index == 0) {
         m_grabbedEndA = false;
@@ -398,9 +403,40 @@ void RelationItem::dropHandle(int index, double rasterWidth, double rasterHeight
         QMT_ASSERT(index >= 0 && index < intermediatePoints.size(), return);
 
         QPointF pos = intermediatePoints.at(index).pos();
-        double x = qRound(pos.x() / rasterWidth) * rasterWidth;
-        double y = qRound(pos.y() / rasterHeight) * rasterHeight;
-        intermediatePoints[index].setPos(QPointF(x, y));
+        static constexpr int ANGLE = 20.0;
+        bool roundX = true;
+        bool roundY = true;
+        if (extraSnap) {
+            if (index >= 1) {
+                double angle = GeometryUtilities::calcAngle(QLineF(intermediatePoints.at(index).pos(),
+                    intermediatePoints.at(index - 1).pos()));
+                if (between(qAbs(angle), 90, ANGLE)) {
+                    pos.setX(intermediatePoints.at(index - 1).pos().x());
+                    roundX = false;
+                }
+                if (between(angle, 0, ANGLE) || between(qAbs(angle), 180, ANGLE)) {
+                    pos.setY(intermediatePoints.at(index - 1).pos().y());
+                    roundY = false;
+                }
+            }
+            if (index < intermediatePoints.size() - 1) {
+                double angle = GeometryUtilities::calcAngle(QLineF(intermediatePoints.at(index).pos(),
+                    intermediatePoints.at(index + 1).pos()));
+                if (between(qAbs(angle), 90, ANGLE)) {
+                    pos.setX(intermediatePoints.at(index + 1).pos().x());
+                    roundX = false;
+                }
+                if (between(angle, 0, ANGLE) || between(qAbs(angle), 180, ANGLE)) {
+                    pos.setY(intermediatePoints.at(index + 1).pos().y());
+                    roundY = false;
+                }
+            }
+        }
+        if (roundX)
+            pos.setX(qRound(pos.x() / rasterWidth) * rasterWidth);
+        if (roundY)
+            pos.setY(qRound(pos.y() / rasterHeight) * rasterHeight);
+        intermediatePoints[index].setPos(pos);
 
         m_diagramSceneModel->diagramController()->startUpdateElement(m_relation, m_diagramSceneModel->diagram(), DiagramController::UpdateMinor);
         m_relation->setIntermediatePoints(intermediatePoints);
@@ -507,9 +543,11 @@ void RelationItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 
 const Style *RelationItem::adaptedStyle()
 {
-    DObject *endAObject = m_diagramSceneModel->diagramController()->findElement<DObject>(m_relation->endAUid(), m_diagramSceneModel->diagram());
-    DObject *endBObject = m_diagramSceneModel->diagramController()->findElement<DObject>(m_relation->endBUid(), m_diagramSceneModel->diagram());
-    StyledRelation styledRelation(m_relation, endAObject, endBObject);
+    const DObject *endAObject = m_diagramSceneModel->diagramController()->findElement<DObject>(m_relation->endAUid(), m_diagramSceneModel->diagram());
+    const DObject *endBObject = m_diagramSceneModel->diagramController()->findElement<DObject>(m_relation->endBUid(), m_diagramSceneModel->diagram());
+    const CustomRelation customRelation = m_diagramSceneModel->stereotypeController()
+                                              ->findCustomRelationByStereotype(m_relation->stereotypes().value(0));
+    StyledRelation styledRelation(m_relation, endAObject, endBObject, &customRelation);
     return m_diagramSceneModel->styleController()->adaptRelationStyle(styledRelation);
 }
 
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.h b/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.h
index a43b8b2749..0980d232e4 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.h
@@ -56,7 +56,7 @@ public:
     void insertHandle(int beforeIndex, const QPointF &pos, double rasterWidth, double rasterHeight) override;
     void deleteHandle(int index) override;
     void setHandlePos(int index, const QPointF &pos) override;
-    void dropHandle(int index, double rasterWidth, double rasterHeight) override;
+    void dropHandle(int index, bool extraSnap, double rasterWidth, double rasterHeight) override;
 
     virtual void update();
 
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/stereotypedisplayvisitor.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/stereotypedisplayvisitor.cpp
index ad668f6bee..9313327c87 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/stereotypedisplayvisitor.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/stereotypedisplayvisitor.cpp
@@ -57,7 +57,9 @@ void StereotypeDisplayVisitor::visitDObject(const DObject *object)
     DObject::StereotypeDisplay stereotypeDisplay = object->stereotypeDisplay();
     m_stereotypeIconId = m_stereotypeController->findStereotypeIconId(m_stereotypeIconElement, object->stereotypes());
 
-    if (m_stereotypeIconId.isEmpty() && stereotypeDisplay == DObject::StereotypeIcon) {
+    if (object->hasImage() && stereotypeDisplay == DObject::StereotypeSmart) {
+        stereotypeDisplay = DObject::StereotypeLabel;
+    } else if (m_stereotypeIconId.isEmpty() && stereotypeDisplay == DObject::StereotypeIcon) {
         stereotypeDisplay = DObject::StereotypeLabel;
     } else if (!m_stereotypeIconId.isEmpty() && stereotypeDisplay == DObject::StereotypeSmart) {
         StereotypeIcon stereotypeIcon = m_stereotypeController->findStereotypeIcon(m_stereotypeIconId);
diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/arrowitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/arrowitem.cpp
index 3a14eb10d9..632da76f05 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/parts/arrowitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/parts/arrowitem.cpp
@@ -384,27 +384,29 @@ void ArrowItem::updateShaft(const Style *style)
     QMT_ASSERT(m_shaftItem, return);
 
     QPen pen(style->linePen());
+    pen.setCapStyle(Qt::FlatCap);
+
+    auto scale = [&pen](qreal v) {
+        return v / ((pen.widthF() - 1.0) / 2.0 + 1.0);
+    };
+
     switch (m_shaft) {
     case ShaftSolid:
         break;
     case ShaftDashed:
-        pen.setDashPattern(QVector<qreal>()
-                           << (4.0 / pen.widthF()) << (4.0 / pen.widthF()));
+        pen.setDashPattern(QVector<qreal>() << scale(5.0) << scale(3.0));
         break;
     case ShaftDot:
-        pen.setDashPattern(QVector<qreal>()
-                           << (2.0 / pen.widthF()) << (2.0 / pen.widthF()));
+        pen.setDashPattern(QVector<qreal>() << scale(3.0) << scale(3.0));
         break;
     case ShaftDashDot:
-        pen.setDashPattern(QVector<qreal>()
-                           << (4.0 / pen.widthF()) << (2.0 / pen.widthF())
-                           << (2.0 / pen.widthF()) << (2.0 / pen.widthF()));
+        pen.setDashPattern(QVector<qreal>() << scale(5.0) << scale(3.0)
+                                            << scale(3.0) << scale(3.0));
         break;
     case ShaftDashDotDot:
-        pen.setDashPattern(QVector<qreal>()
-                           << (4.0 / pen.widthF()) << (2.0 / pen.widthF())
-                           << (2.0 / pen.widthF()) << (2.0 / pen.widthF())
-                           << (2.0 / pen.widthF()) << (2.0 / pen.widthF()));
+        pen.setDashPattern(QVector<qreal>() << scale(5.0) << scale(3.0)
+                                            << scale(3.0) << scale(3.0)
+                                            << scale(3.0) << scale(3.0));
         break;
     }
     m_shaftItem->setPen(pen);
diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/customiconitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/customiconitem.cpp
index 066f9b7875..36e4c4f789 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/parts/customiconitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/parts/customiconitem.cpp
@@ -57,55 +57,97 @@ void CustomIconItem::setPen(const QPen &pen)
     m_pen = pen;
 }
 
+void CustomIconItem::setImage(const QImage &image)
+{
+    m_image = image;
+}
+
 double CustomIconItem::shapeWidth() const
 {
-    return m_stereotypeIcon.width();
+    if (!m_image.isNull())
+        return m_image.width();
+    return m_stereotypeIcon.hasIconWidth() ? m_stereotypeIcon.iconWidth()
+                                           : m_stereotypeIcon.width();
 }
 
 double CustomIconItem::shapeHeight() const
 {
-    return m_stereotypeIcon.height();
+    if (!m_image.isNull())
+        return m_image.height();
+    return m_stereotypeIcon.hasIconHeight() ? m_stereotypeIcon.iconHeight()
+                                            : m_stereotypeIcon.height();
 }
 
 QRectF CustomIconItem::boundingRect() const
 {
-    ShapeSizeVisitor visitor(QPointF(0.0, 0.0), QSizeF(m_stereotypeIcon.width(), m_stereotypeIcon.height()), m_baseSize, m_actualSize);
+    if (!m_image.isNull())
+        return QRectF(QPointF(0.0, 0.0), m_actualSize) | childrenBoundingRect();
+    ShapeSizeVisitor visitor(QPointF(0.0, 0.0),
+                             QSizeF(m_stereotypeIcon.width(), m_stereotypeIcon.height()),
+                             m_baseSize,
+                             m_actualSize);
     m_stereotypeIcon.iconShape().visitShapes(&visitor);
     return visitor.boundingRect() | childrenBoundingRect();
 }
 
-void CustomIconItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+void CustomIconItem::paint(QPainter *painter,
+                           const QStyleOptionGraphicsItem *option,
+                           QWidget *widget)
 {
     Q_UNUSED(option)
     Q_UNUSED(widget)
 
     painter->save();
-    painter->setBrush(m_brush);
-    painter->setPen(m_pen);
+    if (!m_image.isNull()) {
+        painter->drawImage(QRectF(QPointF(0.0, 0.0), m_actualSize), m_image);
+    } else {
+        painter->setBrush(m_brush);
+        painter->setPen(m_pen);
 #ifdef DEBUG_OUTLINE
-    ShapePolygonVisitor visitor(QPointF(0.0, 0.0), QSizeF(m_stereotypeIcon.width(), m_stereotypeIcon.height()), m_baseSize, m_actualSize);
-    IconShape shape = m_stereotypeIcon.outlineShape();
-    if (shape.isEmpty())
-        shape = m_stereotypeIcon.iconShape();
-    shape.visitShapes(&visitor);
-    painter->drawPath(visitor.path());
-    ShapePaintVisitor visitor1(painter, QPointF(0.0, 0.0), QSizeF(m_stereotypeIcon.width(), m_stereotypeIcon.height()), m_baseSize, m_actualSize);
-    m_stereotypeIcon.iconShape().visitShapes(&visitor1);
+        ShapePolygonVisitor visitor(QPointF(0.0, 0.0),
+                                    QSizeF(m_stereotypeIcon.width(), m_stereotypeIcon.height()),
+                                    m_baseSize,
+                                    m_actualSize);
+        IconShape shape = m_stereotypeIcon.outlineShape();
+        if (shape.isEmpty())
+            shape = m_stereotypeIcon.iconShape();
+        shape.visitShapes(&visitor);
+        painter->drawPath(visitor.path());
+        ShapePaintVisitor visitor1(painter,
+                                   QPointF(0.0, 0.0),
+                                   QSizeF(m_stereotypeIcon.width(), m_stereotypeIcon.height()),
+                                   m_baseSize,
+                                   m_actualSize);
+        m_stereotypeIcon.iconShape().visitShapes(&visitor1);
 #else
-    ShapePaintVisitor visitor(painter, QPointF(0.0, 0.0), QSizeF(m_stereotypeIcon.width(), m_stereotypeIcon.height()), m_baseSize, m_actualSize);
-    m_stereotypeIcon.iconShape().visitShapes(&visitor);
+        ShapePaintVisitor visitor(painter,
+                                  QPointF(0.0, 0.0),
+                                  QSizeF(m_stereotypeIcon.width(), m_stereotypeIcon.height()),
+                                  m_baseSize,
+                                  m_actualSize);
+        m_stereotypeIcon.iconShape().visitShapes(&visitor);
 #endif
+    }
     painter->restore();
 }
 
 QList<QPolygonF> CustomIconItem::outline() const
 {
-    ShapePolygonVisitor visitor(QPointF(0.0, 0.0), QSizeF(m_stereotypeIcon.width(), m_stereotypeIcon.height()), m_baseSize, m_actualSize);
-    IconShape shape = m_stereotypeIcon.outlineShape();
-    if (shape.isEmpty())
-        shape = m_stereotypeIcon.iconShape();
-    shape.visitShapes(&visitor);
-    return visitor.toPolygons();
+    if (!m_image.isNull()) {
+        QList<QPolygonF> polygons;
+        polygons.append(QPolygonF(QRectF(QPointF(0.0, 0.0), m_actualSize)));
+        return polygons;
+    } else {
+        ShapePolygonVisitor visitor(QPointF(0.0, 0.0),
+                                    QSizeF(m_stereotypeIcon.width(), m_stereotypeIcon.height()),
+                                    m_baseSize,
+                                    m_actualSize);
+        IconShape shape = m_stereotypeIcon.outlineShape();
+        if (shape.isEmpty())
+            shape = m_stereotypeIcon.iconShape();
+        shape.visitShapes(&visitor);
+        return visitor.toPolygons();
+    }
 }
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/customiconitem.h b/src/libs/modelinglib/qmt/diagram_scene/parts/customiconitem.h
index 7f85e87516..f61db552ac 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/parts/customiconitem.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/parts/customiconitem.h
@@ -9,6 +9,7 @@
 #include "qmt/stereotype/stereotypeicon.h"
 
 #include <QBrush>
+#include <QImage>
 #include <QPen>
 
 namespace qmt {
@@ -26,6 +27,9 @@ public:
     void setActualSize(const QSizeF &actualSize);
     void setBrush(const QBrush &brush);
     void setPen(const QPen &pen);
+    QImage image() const { return m_image; }
+    bool hasImage() const { return !m_image.isNull(); }
+    void setImage(const QImage &image);
     StereotypeIcon stereotypeIcon() const { return m_stereotypeIcon; }
     double shapeWidth() const;
     double shapeHeight() const;
@@ -43,6 +47,7 @@ private:
     QSizeF m_actualSize;
     QBrush m_brush;
     QPen m_pen;
+    QImage m_image;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/editabletextitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/editabletextitem.cpp
index 60275cb5ec..185321d84c 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/parts/editabletextitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/parts/editabletextitem.cpp
@@ -13,13 +13,18 @@ namespace qmt {
 EditableTextItem::EditableTextItem(QGraphicsItem *parent)
     : QGraphicsTextItem(parent)
 {
-    setTextInteractionFlags(Qt::TextEditorInteraction);
+    setTextInteractionFlags(Qt::NoTextInteraction);
 }
 
 EditableTextItem::~EditableTextItem()
 {
 }
 
+void EditableTextItem::setEditable(bool editable)
+{
+    setTextInteractionFlags(editable ? Qt::TextEditorInteraction : Qt::NoTextInteraction);
+}
+
 void EditableTextItem::setShowFocus(bool showFocus)
 {
     m_showFocus = showFocus;
@@ -72,13 +77,6 @@ void EditableTextItem::keyReleaseEvent(QKeyEvent *event)
         QGraphicsTextItem::keyReleaseEvent(event);
 }
 
-void EditableTextItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
-{
-    scene()->clearSelection();
-    parentItem()->setSelected(true);
-    QGraphicsTextItem::mousePressEvent(event);
-}
-
 void EditableTextItem::focusOutEvent(QFocusEvent *event)
 {
     QGraphicsTextItem::focusOutEvent(event);
diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/editabletextitem.h b/src/libs/modelinglib/qmt/diagram_scene/parts/editabletextitem.h
index 7c361b72fd..b18bf85cfc 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/parts/editabletextitem.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/parts/editabletextitem.h
@@ -19,6 +19,7 @@ signals:
     void returnKeyPressed();
 
 public:
+    void setEditable(bool editable);
     void setShowFocus(bool showFocus);
     void setFilterReturnKey(bool filterReturnKey);
     void setFilterTabKey(bool filterTabKey);
@@ -30,7 +31,6 @@ public:
 protected:
     void keyPressEvent(QKeyEvent *event) override;
     void keyReleaseEvent(QKeyEvent *event) override;
-    void mousePressEvent(QGraphicsSceneMouseEvent *event) override;
     void focusOutEvent(QFocusEvent *event) override;
 
 private:
diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.cpp
index 8206a7fe9a..231b78a3a0 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.cpp
@@ -79,7 +79,10 @@ protected:
     {
         m_lastPos = event->scenePos();
         QPointF delta = m_lastPos - m_startPos;
-        m_owner->moveHandle(m_pointIndex, delta, Release, m_qualifier);
+        HandleQualifier qualifier = m_qualifier;
+        if (qualifier == None && (event->modifiers() & Qt::ShiftModifier) != 0)
+            qualifier = SnapHandle;
+        m_owner->moveHandle(m_pointIndex, delta, Release, qualifier);
         clearFocus();
     }
 
@@ -267,6 +270,7 @@ void PathSelectionItem::moveHandle(int pointIndex, const QPointF &deltaMove, Han
 {
     switch (handleQualifier) {
     case None:
+    case SnapHandle:
     {
         if (handleStatus == Press) {
             m_focusHandleItem = m_handles.at(pointIndex);
@@ -275,13 +279,13 @@ void PathSelectionItem::moveHandle(int pointIndex, const QPointF &deltaMove, Han
         QPointF newPos = m_originalHandlePos + deltaMove;
         m_windable->setHandlePos(pointIndex, newPos);
         if (handleStatus == Release) {
-            m_windable->dropHandle(pointIndex, RASTER_WIDTH, RASTER_HEIGHT);
+            m_windable->dropHandle(pointIndex, handleQualifier == SnapHandle, RASTER_WIDTH, RASTER_HEIGHT);
             m_focusHandleItem = nullptr;
         }
         break;
     }
     case DeleteHandle:
-        if (handleStatus == Press)
+        if (handleStatus == Release)
             m_windable->deleteHandle(pointIndex);
         break;
     }
diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.h b/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.h
index 0c4891948a..06a2d36c49 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.h
@@ -25,7 +25,8 @@ class PathSelectionItem : public QGraphicsItem
 
     enum HandleQualifier {
         None,
-        DeleteHandle
+        DeleteHandle,
+        SnapHandle
     };
 
 public:
diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/relationstarter.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/relationstarter.cpp
index 26b8ebc1c4..49bca85162 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/parts/relationstarter.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/parts/relationstarter.cpp
@@ -121,11 +121,13 @@ void RelationStarter::keyPressEvent(QKeyEvent *event)
             m_currentPreviewArrowIntermediatePoints.append(p);
             // Do not update the preview arrow here because last two points are now identical which looks wired
         }
+        event->accept();
     } else if (event->key() == Qt::Key_Control) {
         if (!m_currentPreviewArrowIntermediatePoints.isEmpty()) {
             m_currentPreviewArrowIntermediatePoints.removeLast();
             updateCurrentPreviewArrow(m_currentPreviewArrow->lastLineSegment().p1());
         }
+        event->accept();
     }
 }
 
diff --git a/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramview.cpp b/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramview.cpp
index 5634c4eb7f..eba246676d 100644
--- a/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramview.cpp
+++ b/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramview.cpp
@@ -14,9 +14,14 @@
 #include <QDragLeaveEvent>
 #include <QDropEvent>
 #include <QMimeData>
+#include <QScrollBar>
 
 namespace qmt {
 
+namespace {
+const qreal ADJUSTMENT = 80;
+};
+
 DiagramView::DiagramView(QWidget *parent)
     : QGraphicsView(parent)
 {
@@ -25,6 +30,9 @@ DiagramView::DiagramView(QWidget *parent)
     setDragMode(QGraphicsView::RubberBandDrag);
     setFrameShape(QFrame::NoFrame);
     setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform);
+    m_panTimer.setInterval(200);
+    m_panTimer.setSingleShot(false);
+    connect(&m_panTimer, &QTimer::timeout, this, &DiagramView::onPanTimeout);
 }
 
 DiagramView::~DiagramView()
@@ -130,12 +138,41 @@ void DiagramView::dropEvent(QDropEvent *event)
     }
 }
 
+void DiagramView::mousePressEvent(QMouseEvent *event)
+{
+    m_panTimer.start();
+    QGraphicsView::mousePressEvent(event);
+}
+
+void DiagramView::mouseReleaseEvent(QMouseEvent *event)
+{
+    m_panTimer.stop();
+    QGraphicsView::mouseReleaseEvent(event);
+}
+
+void DiagramView::mouseMoveEvent(QMouseEvent *event)
+{
+    QGraphicsView::mouseMoveEvent(event);
+    m_lastMouse = event->pos();
+}
+
 void DiagramView::onSceneRectChanged(const QRectF &sceneRect)
 {
     // add some adjustment to all 4 sides
-    static const qreal ADJUSTMENT = 80;
     QRectF rect = sceneRect.adjusted(-ADJUSTMENT, -ADJUSTMENT, ADJUSTMENT, ADJUSTMENT);
     setSceneRect(rect);
 }
 
+void DiagramView::onPanTimeout()
+{
+    if (m_lastMouse.x() < ADJUSTMENT)
+        horizontalScrollBar()->triggerAction(QScrollBar::SliderSingleStepSub);
+    else if (m_lastMouse.x() > viewport()->size().width() - ADJUSTMENT)
+        horizontalScrollBar()->triggerAction(QScrollBar::SliderSingleStepAdd);
+    if (m_lastMouse.y() < ADJUSTMENT)
+        verticalScrollBar()->triggerAction(QScrollBar::SliderSingleStepSub);
+    else if (m_lastMouse.y() > viewport()->size().height() - ADJUSTMENT)
+        verticalScrollBar()->triggerAction(QScrollBar::SliderSingleStepAdd);
+}
+
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramview.h b/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramview.h
index 41386f09bd..4eee60ff44 100644
--- a/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramview.h
+++ b/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramview.h
@@ -7,6 +7,7 @@
 #include "qmt/infrastructure/qmt_global.h"
 
 #include <QPointer>
+#include <QTimer>
 
 namespace qmt {
 
@@ -27,11 +28,17 @@ protected:
     void dragLeaveEvent(QDragLeaveEvent *event) override;
     void dragMoveEvent(QDragMoveEvent *event) override;
     void dropEvent(QDropEvent *event) override;
+    void mousePressEvent(QMouseEvent *event) override;
+    void mouseReleaseEvent(QMouseEvent *event) override;
+    void mouseMoveEvent(QMouseEvent *event) override;
 
 private:
     void onSceneRectChanged(const QRectF &sceneRect);
+    void onPanTimeout();
 
     QPointer<DiagramSceneModel> m_diagramSceneModel;
+    QPointF m_lastMouse;
+    QTimer m_panTimer;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/model/mdiagram.h b/src/libs/modelinglib/qmt/model/mdiagram.h
index 8f327daabc..bebe17cb50 100644
--- a/src/libs/modelinglib/qmt/model/mdiagram.h
+++ b/src/libs/modelinglib/qmt/model/mdiagram.h
@@ -21,7 +21,7 @@ public:
 
     MDiagram &operator=(const MDiagram &rhs);
 
-    const QList<DElement *> &diagramElements() const { return m_elements; }
+    const QList<DElement *> diagramElements() const { return m_elements; }
     DElement *findDiagramElement(const Uid &key) const;
     DElement *findDelegate(const Uid &modelUid) const;
     void setDiagramElements(const QList<DElement *> &elements);
diff --git a/src/libs/modelinglib/qmt/model/mobject.cpp b/src/libs/modelinglib/qmt/model/mobject.cpp
index 734be13567..1e6bf8d0b3 100644
--- a/src/libs/modelinglib/qmt/model/mobject.cpp
+++ b/src/libs/modelinglib/qmt/model/mobject.cpp
@@ -20,6 +20,7 @@ MObject::MObject()
 MObject::MObject(const MObject &rhs)
     : MElement(rhs),
       m_name(rhs.m_name),
+      m_linkedfilename(rhs.m_linkedfilename),
       m_children(true),
       m_relations(true)
 {
@@ -34,6 +35,7 @@ MObject &MObject::operator =(const MObject &rhs)
     if (this != &rhs) {
         MElement::operator=(rhs);
         m_name = rhs.m_name;
+        m_linkedfilename = rhs.m_linkedfilename;
         // no deep copy; list of children remains unchanged
     }
     return *this;
@@ -44,6 +46,11 @@ void MObject::setName(const QString &name)
     m_name = name;
 }
 
+void MObject::setLinkedFileName(const QString &linkedfilename)
+{
+    m_linkedfilename = linkedfilename;
+}
+
 void MObject::setChildren(const Handles<MObject> &children)
 {
     m_children = children;
diff --git a/src/libs/modelinglib/qmt/model/mobject.h b/src/libs/modelinglib/qmt/model/mobject.h
index 1dc95887d9..33a475ed6e 100644
--- a/src/libs/modelinglib/qmt/model/mobject.h
+++ b/src/libs/modelinglib/qmt/model/mobject.h
@@ -23,6 +23,8 @@ public:
 
     QString name() const { return m_name; }
     void setName(const QString &name);
+    QString linkedFileName() const { return m_linkedfilename; }
+    void setLinkedFileName(const QString &linkedfilename);
 
     const Handles<MObject> &children() const { return m_children; }
     void setChildren(const Handles<MObject> &children);
@@ -48,6 +50,7 @@ public:
 
 private:
     QString m_name;
+    QString m_linkedfilename;
     Handles<MObject> m_children;
     Handles<MRelation> m_relations;
 };
diff --git a/src/libs/modelinglib/qmt/model_controller/mflatassignmentvisitor.cpp b/src/libs/modelinglib/qmt/model_controller/mflatassignmentvisitor.cpp
index deb458e4bc..66cfb4576f 100644
--- a/src/libs/modelinglib/qmt/model_controller/mflatassignmentvisitor.cpp
+++ b/src/libs/modelinglib/qmt/model_controller/mflatassignmentvisitor.cpp
@@ -35,6 +35,7 @@ void MFlatAssignmentVisitor::visitMObject(const MObject *object)
     auto targetObject = dynamic_cast<MObject *>(m_target);
     QMT_ASSERT(targetObject, return);
     targetObject->setName(object->name());
+    targetObject->setLinkedFileName(object->linkedFileName());
 }
 
 void MFlatAssignmentVisitor::visitMPackage(const MPackage *package)
diff --git a/src/libs/modelinglib/qmt/model_ui/modeltreefilterdata.cpp b/src/libs/modelinglib/qmt/model_ui/modeltreefilterdata.cpp
new file mode 100644
index 0000000000..ba411690f5
--- /dev/null
+++ b/src/libs/modelinglib/qmt/model_ui/modeltreefilterdata.cpp
@@ -0,0 +1,43 @@
+// Copyright (C) 2018 Jochen Becher
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "modeltreefilterdata.h"
+
+namespace qmt {
+
+void ModelTreeViewData::setShowRelations(bool newShowRelations)
+{
+    m_showRelations = newShowRelations;
+}
+
+void ModelTreeViewData::setShowDiagramElements(bool newShowDiagramElements)
+{
+    m_showDiagramElements = newShowDiagramElements;
+}
+
+void ModelTreeFilterData::setType(Type newType)
+{
+    m_type = newType;
+}
+
+void ModelTreeFilterData::setCustomId(const QString &newCustomId)
+{
+    m_customId = newCustomId;
+}
+
+void ModelTreeFilterData::setStereotypes(const QStringList &newStereotypes)
+{
+    m_stereotypes = newStereotypes;
+}
+
+void ModelTreeFilterData::setName(const QString &newName)
+{
+    m_name = newName;
+}
+
+void ModelTreeFilterData::setDirection(Direction newDirection)
+{
+    m_direction = newDirection;
+}
+
+} // namespace qmt
diff --git a/src/libs/modelinglib/qmt/model_ui/modeltreefilterdata.h b/src/libs/modelinglib/qmt/model_ui/modeltreefilterdata.h
new file mode 100644
index 0000000000..3af018fefd
--- /dev/null
+++ b/src/libs/modelinglib/qmt/model_ui/modeltreefilterdata.h
@@ -0,0 +1,72 @@
+// Copyright (C) 2018 Jochen Becher
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include <QString>
+#include <QStringList>
+
+namespace qmt {
+
+class ModelTreeViewData
+{
+public:
+
+    bool showRelations() const { return m_showRelations; }
+    void setShowRelations(bool newShowRelations);
+
+    bool showDiagramElements() const { return m_showDiagramElements; }
+    void setShowDiagramElements(bool newShowDiagramElements);
+
+private:
+    bool m_showRelations = true;
+    bool m_showDiagramElements = false;
+};
+
+class ModelTreeFilterData
+{
+public:
+    enum class Type {
+        Any,
+        Package,
+        Component,
+        Class,
+        Diagram,
+        Item,
+        Dependency,
+        Association,
+        Inheritance,
+        Connection
+    };
+
+    enum class Direction {
+        Any,
+        Outgoing,
+        Incoming,
+        Bidirectional
+    };
+
+    Type type() const { return m_type; }
+    void setType(Type newType);
+
+    QString customId() const { return m_customId; }
+    void setCustomId(const QString &newCustomId);
+
+    QStringList stereotypes() const { return m_stereotypes; }
+    void setStereotypes(const QStringList &newStereotypes);
+
+    QString name() const { return m_name; }
+    void setName(const QString &newName);
+
+    Direction direction() const { return m_direction; }
+    void setDirection(Direction newDirection);
+
+private:
+    Type m_type = Type::Any;
+    QString m_customId;
+    QStringList m_stereotypes;
+    QString m_name;
+    Direction m_direction = Direction::Any;
+};
+
+} // namespace qmt
diff --git a/src/libs/modelinglib/qmt/model_ui/sortedtreemodel.cpp b/src/libs/modelinglib/qmt/model_ui/sortedtreemodel.cpp
index 972c2f9c00..e69e1635a7 100644
--- a/src/libs/modelinglib/qmt/model_ui/sortedtreemodel.cpp
+++ b/src/libs/modelinglib/qmt/model_ui/sortedtreemodel.cpp
@@ -3,14 +3,203 @@
 
 #include "sortedtreemodel.h"
 
+#include "qmt/model/massociation.h"
+#include "qmt/model/mcanvasdiagram.h"
+#include "qmt/model/mclass.h"
+#include "qmt/model/mcomponent.h"
+#include "qmt/model/mconnection.h"
+#include "qmt/model/mdependency.h"
+#include "qmt/model/minheritance.h"
+#include "qmt/model/mitem.h"
+#include "qmt/model/mpackage.h"
+#include "qmt/model/mconstvisitor.h"
 #include "treemodel.h"
 
 namespace qmt {
 
+namespace {
+
+class Filter : public MConstVisitor {
+public:
+
+    void setModelTreeViewData(const ModelTreeViewData *viewData)
+    {
+        m_viewData = viewData;
+    }
+
+    void setModelTreeFilterData(const ModelTreeFilterData *filterData)
+    {
+        m_filterData = filterData;
+    }
+
+    bool keep() const { return m_keep; }
+
+    void visitMElement(const MElement *element) override
+    {
+        if (!m_filterData->stereotypes().isEmpty()) {
+            const QStringList stereotypes = element->stereotypes();
+            bool containsElementStereotype = std::any_of(
+                stereotypes.constBegin(), stereotypes.constEnd(),
+                [&](const QString &s) { return m_filterData->stereotypes().contains(s); });
+            if (!containsElementStereotype) {
+                m_keep = false;
+                return;
+            }
+        }
+    }
+
+    void visitMObject(const MObject *object) override
+    {
+        if (!m_filterData->name().isEmpty() && m_filterData->name() != object->name())
+            m_keep = false;
+        else
+            visitMElement(object);
+    }
+
+    void visitMPackage(const MPackage *package) override
+    {
+        if (m_filterData->type() != ModelTreeFilterData::Type::Any
+            && m_filterData->type() != ModelTreeFilterData::Type::Package)
+        {
+            m_keep = false;
+        } else {
+            visitMObject(package);
+        }
+    }
+
+    void visitMClass(const MClass *klass) override
+    {
+        if (m_filterData->type() != ModelTreeFilterData::Type::Any
+            && m_filterData->type() != ModelTreeFilterData::Type::Class)
+        {
+            m_keep = false;
+        } else {
+            visitMObject(klass);
+        }
+    }
+
+    void visitMComponent(const MComponent *component) override
+    {
+        if (m_filterData->type() != ModelTreeFilterData::Type::Any
+            && m_filterData->type() != ModelTreeFilterData::Type::Component)
+        {
+            m_keep = false;
+        } else {
+            visitMObject(component);
+        }
+    }
+
+    void visitMDiagram(const MDiagram *diagram) override
+    {
+        if (m_filterData->type() != ModelTreeFilterData::Type::Any
+            && m_filterData->type() != ModelTreeFilterData::Type::Diagram)
+        {
+            m_keep = false;
+        } else {
+            visitMObject(diagram);
+        }
+    }
+
+    void visitMCanvasDiagram(const MCanvasDiagram *diagram) override
+    {
+        visitMDiagram(diagram);
+    }
+
+    void visitMItem(const MItem *item) override
+    {
+        if (m_filterData->type() != ModelTreeFilterData::Type::Any
+            && m_filterData->type() != ModelTreeFilterData::Type::Item)
+        {
+            m_keep = false;
+        } else {
+            visitMObject(item);
+        }
+    }
+
+    void visitMRelation(const MRelation *relation) override
+    {
+        if (!m_viewData->showRelations())
+            m_keep = false;
+        else if (!m_filterData->name().isEmpty() && m_filterData->name() != relation->name())
+            m_keep = false;
+        else
+            visitMElement(relation);
+    }
+
+    void visitMDependency(const MDependency *dependency) override
+    {
+        if (m_filterData->type() != ModelTreeFilterData::Type::Any
+            && m_filterData->type() != ModelTreeFilterData::Type::Dependency)
+        {
+            m_keep = false;
+        } else {
+            switch (m_filterData->direction()) {
+            case ModelTreeFilterData::Direction::Any:
+                break;
+            case ModelTreeFilterData::Direction::Outgoing:
+                if (dependency->direction() != MDependency::AToB)
+                    m_keep = false;
+                break;
+            case ModelTreeFilterData::Direction::Incoming:
+                if (dependency->direction() != MDependency::BToA)
+                    m_keep = false;
+                break;
+            case ModelTreeFilterData::Direction::Bidirectional:
+                if (dependency->direction() != MDependency::Bidirectional)
+                    m_keep = false;
+                break;
+            }
+            if (m_keep)
+                visitMRelation(dependency);
+        }
+    }
+
+    void visitMInheritance(const MInheritance *inheritance) override
+    {
+        if (m_filterData->type() != ModelTreeFilterData::Type::Any
+            && m_filterData->type() != ModelTreeFilterData::Type::Inheritance)
+        {
+            m_keep = false;
+        } else {
+            visitMRelation(inheritance);
+        }
+    }
+
+    void visitMAssociation(const MAssociation *association) override
+    {
+        if (m_filterData->type() != ModelTreeFilterData::Type::Any
+            && m_filterData->type() != ModelTreeFilterData::Type::Association)
+        {
+            m_keep = false;
+        } else {
+            visitMRelation(association);
+        }
+    }
+
+    void visitMConnection(const MConnection *connection) override
+    {
+        if (m_filterData->type() != ModelTreeFilterData::Type::Any
+            && m_filterData->type() != ModelTreeFilterData::Type::Connection)
+        {
+            m_keep = false;
+        } else {
+            visitMRelation(connection);
+        }
+    }
+
+private:
+    const ModelTreeViewData *m_viewData = nullptr;
+    const ModelTreeFilterData *m_filterData = nullptr;
+    bool m_keep = true;
+};
+
+}
+
 SortedTreeModel::SortedTreeModel(QObject *parent)
     : QSortFilterProxyModel(parent)
 {
     setDynamicSortFilter(false);
+    setRecursiveFilteringEnabled(true);
     setSortCaseSensitivity(Qt::CaseInsensitive);
 
     m_delayedSortTimer.setSingleShot(true);
@@ -33,6 +222,37 @@ void SortedTreeModel::setTreeModel(TreeModel *treeModel)
     startDelayedSortTimer();
 }
 
+void SortedTreeModel::setModelTreeViewData(const ModelTreeViewData &viewData)
+{
+    m_modelTreeViewData = viewData;
+    beginResetModel();
+    endResetModel();
+    startDelayedSortTimer();
+}
+
+void SortedTreeModel::setModelTreeFilterData(const ModelTreeFilterData &filterData)
+{
+    m_modelTreeViewFilterData = filterData;
+    beginResetModel();
+    endResetModel();
+    startDelayedSortTimer();
+}
+
+bool SortedTreeModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const
+{
+    QModelIndex index = sourceModel()->index(source_row, 0, source_parent);
+    MElement *element = m_treeModel->element(index);
+    if (element) {
+        Filter filter;
+        filter.setModelTreeViewData(&m_modelTreeViewData);
+        filter.setModelTreeFilterData(&m_modelTreeViewFilterData);
+        element->accept(&filter);
+        if (!filter.keep())
+            return false;
+    }
+    return true;
+}
+
 bool SortedTreeModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
 {
     TreeModel::ItemType leftItemType = TreeModel::ItemType(sourceModel()->data(left, TreeModel::RoleItemType).toInt());
diff --git a/src/libs/modelinglib/qmt/model_ui/sortedtreemodel.h b/src/libs/modelinglib/qmt/model_ui/sortedtreemodel.h
index 0c01cf7de7..797a321132 100644
--- a/src/libs/modelinglib/qmt/model_ui/sortedtreemodel.h
+++ b/src/libs/modelinglib/qmt/model_ui/sortedtreemodel.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include "qmt/infrastructure/qmt_global.h"
+#include "qmt/model_ui/modeltreefilterdata.h"
 
 #include <QSortFilterProxyModel>
 #include <QTimer>
@@ -21,7 +22,11 @@ public:
     TreeModel *treeModel() const { return m_treeModel; }
     void setTreeModel(TreeModel *treeModel);
 
+    void setModelTreeViewData(const ModelTreeViewData &viewData);
+    void setModelTreeFilterData(const ModelTreeFilterData &filterData);
+
 protected:
+    bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override;
     bool lessThan(const QModelIndex &left, const QModelIndex &right) const override;
 
 private:
@@ -32,6 +37,8 @@ private:
     void startDelayedSortTimer();
 
     TreeModel *m_treeModel = nullptr;
+    ModelTreeViewData m_modelTreeViewData;
+    ModelTreeFilterData m_modelTreeViewFilterData;
     QTimer m_delayedSortTimer;
 };
 
diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/addrelatedelementsdialog.cpp b/src/libs/modelinglib/qmt/model_widgets_ui/addrelatedelementsdialog.cpp
new file mode 100644
index 0000000000..40499e2839
--- /dev/null
+++ b/src/libs/modelinglib/qmt/model_widgets_ui/addrelatedelementsdialog.cpp
@@ -0,0 +1,426 @@
+// Copyright (C) 2018 Jochen Becher
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "addrelatedelementsdialog.h"
+
+#include <qmt/tasks/diagramscenecontroller.h>
+#include <qmt/diagram_controller/dselection.h>
+#include <qmt/model/mdiagram.h>
+#include <qmt/model/mrelation.h>
+#include <qmt/model/mdependency.h>
+#include <qmt/model/minheritance.h>
+#include <qmt/model/massociation.h>
+#include <qmt/model/mconnection.h>
+#include <qmt/model_controller/modelcontroller.h>
+#include <qmt/model_controller/mvoidvisitor.h>
+
+#include "../../modelinglibtr.h"
+
+#include <utils/layoutbuilder.h>
+
+#include <QComboBox>
+#include <QDialogButtonBox>
+#include <QLabel>
+#include <QStringListModel>
+
+namespace qmt {
+
+namespace {
+
+enum class RelationType {
+    Any,
+    Dependency,
+    Association,
+    Inheritance,
+    Connection
+};
+
+enum class RelationDirection {
+    Any,
+    Outgoing,
+    Incoming,
+    Bidirectional
+};
+
+enum class ElementType {
+    Any,
+    Package,
+    Component,
+    Class,
+    Diagram,
+    Item,
+};
+
+class Filter : public qmt::MVoidConstVisitor {
+public:
+
+    void setRelationType(RelationType newRelationType)
+    {
+        m_relationType = newRelationType;
+    }
+
+    void setRelationTypeId(const QString &newRelationTypeId)
+    {
+        m_relationTypeId = newRelationTypeId;
+    }
+
+    void setRelationDirection(RelationDirection newRelationDirection)
+    {
+        m_relationDirection = newRelationDirection;
+    }
+
+    void setRelationStereotypes(const QStringList &newRelationStereotypes)
+    {
+        m_relationStereotypes = newRelationStereotypes;
+    }
+
+    void setElementType(ElementType newElementType)
+    {
+        m_elementType = newElementType;
+    }
+
+    void setElementStereotypes(const QStringList &newElementStereotypes)
+    {
+        m_elementStereotypes = newElementStereotypes;
+    }
+
+    void setObject(const qmt::DObject *dobject, const qmt::MObject *mobject)
+    {
+        m_dobject = dobject;
+        m_mobject = mobject;
+    }
+
+    void setRelation(const qmt::MRelation *relation)
+    {
+        m_relation = relation;
+    }
+
+    bool keep() const { return m_keep; }
+
+    void reset()
+    {
+        m_dobject = nullptr;
+        m_mobject = nullptr;
+        m_relation = nullptr;
+        m_keep = true;
+    }
+
+    // MConstVisitor interface
+    void visitMObject(const qmt::MObject *object) override
+    {
+        if (!m_elementStereotypes.isEmpty()) {
+            const QStringList stereotypes = object->stereotypes();
+            bool containsElementStereotype = std::any_of(
+                stereotypes.constBegin(), stereotypes.constEnd(),
+                [&](const QString &s) { return m_elementStereotypes.contains(s); });
+            if (!containsElementStereotype) {
+                m_keep = false;
+                return;
+            }
+        }
+    }
+
+    void visitMPackage(const qmt::MPackage *package) override
+    {
+        if (m_elementType == ElementType::Any || m_elementType == ElementType::Package)
+            qmt::MVoidConstVisitor::visitMPackage(package);
+        else
+            m_keep = false;
+    }
+
+    void visitMClass(const qmt::MClass *klass) override
+    {
+        if (m_elementType == ElementType::Any || m_elementType == ElementType::Class)
+            qmt::MVoidConstVisitor::visitMClass(klass);
+        else
+            m_keep = false;
+    }
+
+    void visitMComponent(const qmt::MComponent *component) override
+    {
+        if (m_elementType == ElementType::Any || m_elementType == ElementType::Component)
+            qmt::MVoidConstVisitor::visitMComponent(component);
+        else
+            m_keep = false;
+    }
+
+    void visitMDiagram(const qmt::MDiagram *diagram) override
+    {
+        if (m_elementType == ElementType::Any || m_elementType == ElementType::Diagram)
+            qmt::MVoidConstVisitor::visitMDiagram(diagram);
+        else
+            m_keep = false;
+    }
+
+    void visitMItem(const qmt::MItem *item) override
+    {
+        if (m_elementType == ElementType::Any || m_elementType == ElementType::Item)
+            qmt::MVoidConstVisitor::visitMItem(item);
+        else
+            m_keep = false;
+    }
+
+    void visitMRelation(const qmt::MRelation *relation) override
+    {
+        if (!m_relationStereotypes.isEmpty()) {
+            const QStringList relationStereotypes = relation->stereotypes();
+            bool containsRelationStereotype = std::any_of(
+                relationStereotypes.constBegin(), relationStereotypes.constEnd(),
+                [&](const QString &s) { return m_relationStereotypes.contains(s); });
+            if (!containsRelationStereotype) {
+                m_keep = false;
+                return;
+            }
+        }
+    }
+
+    void visitMDependency(const qmt::MDependency *dependency) override
+    {
+        if (m_relationDirection != RelationDirection::Any) {
+            bool keep = false;
+            if (m_relationDirection == RelationDirection::Outgoing) {
+                if (dependency->direction() == qmt::MDependency::AToB && dependency->endAUid() == m_mobject->uid())
+                    keep = true;
+                else if (dependency->direction() == qmt::MDependency::BToA && dependency->endBUid() == m_mobject->uid())
+                    keep = true;
+            } else if (m_relationDirection == RelationDirection::Incoming) {
+                if (dependency->direction() == qmt::MDependency::AToB && dependency->endBUid() == m_mobject->uid())
+                    keep = true;
+                else if (dependency->direction() == qmt::MDependency::BToA && dependency->endAUid() == m_mobject->uid())
+                    keep = true;
+            } else if (m_relationDirection == RelationDirection::Bidirectional) {
+                if (dependency->direction() == qmt::MDependency::Bidirectional)
+                    keep = true;
+            }
+            m_keep = keep;
+            if (!keep)
+                return;
+        }
+        if (m_relationType == RelationType::Any || m_relationType == RelationType::Dependency)
+            qmt::MVoidConstVisitor::visitMDependency(dependency);
+        else
+            m_keep = false;
+    }
+
+    bool testDirection(const qmt::MRelation *relation)
+    {
+        if (m_relationDirection != RelationDirection::Any) {
+            bool keep = false;
+            if (m_relationDirection == RelationDirection::Outgoing) {
+                if (relation->endAUid() == m_mobject->uid())
+                    keep = true;
+            } else if (m_relationDirection == RelationDirection::Incoming) {
+                if (relation->endBUid() == m_mobject->uid())
+                    keep = true;
+            }
+            m_keep = keep;
+            if (!keep)
+                return false;
+        }
+        return true;
+    }
+
+    void visitMInheritance(const qmt::MInheritance *inheritance) override
+    {
+        if (!testDirection(inheritance))
+            return;
+        if (m_relationType == RelationType::Any || m_relationType == RelationType::Inheritance)
+            qmt::MVoidConstVisitor::visitMInheritance(inheritance);
+        else
+            m_keep = false;
+    }
+
+    void visitMAssociation(const qmt::MAssociation *association) override
+    {
+        if (!testDirection(association))
+            return;
+        if (m_relationType == RelationType::Any || m_relationType == RelationType::Association)
+            qmt::MVoidConstVisitor::visitMAssociation(association);
+        else
+            m_keep = false;
+    }
+
+    void visitMConnection(const qmt::MConnection *connection) override
+    {
+        if (!testDirection(connection))
+            return;
+        if (m_relationType == RelationType::Any || m_relationType == RelationType::Connection)
+            qmt::MVoidConstVisitor::visitMConnection(connection);
+        else
+            m_keep = false;
+    }
+
+private:
+    RelationType m_relationType = RelationType::Any;
+    QString m_relationTypeId;
+    RelationDirection m_relationDirection = RelationDirection::Any;
+    QStringList m_relationStereotypes;
+    ElementType m_elementType = ElementType::Any;
+    QStringList m_elementStereotypes;
+    const qmt::DObject *m_dobject = nullptr;
+    const qmt::MObject *m_mobject = nullptr;
+    const qmt::MRelation *m_relation = nullptr;
+    bool m_keep = true;
+};
+} // namespace
+
+class AddRelatedElementsDialog::Private {
+public:
+    qmt::DiagramSceneController *m_diagramSceneController = nullptr;
+    qmt::DSelection m_selection;
+    qmt::Uid m_diagramUid;
+    QStringListModel m_relationTypeModel;
+    QStringListModel m_relationDirectionModel;
+    QStringListModel m_relationStereotypesModel;
+    QStringListModel m_elementTypeModel;
+    QStringListModel m_elementStereotypesModel;
+    Filter m_filter;
+
+    QComboBox *RelationTypeCombobox;
+    QComboBox *DirectionCombobox;
+    QComboBox *StereotypesCombobox;
+    QComboBox *ElementStereotypesCombobox;
+    QComboBox *ElementTypeComboBox;
+    QLabel *NumberOfMatchingElementsValue;
+    QDialogButtonBox *buttonBox;
+};
+
+AddRelatedElementsDialog::AddRelatedElementsDialog(QWidget *parent) :
+    QDialog(parent),
+    d(new Private)
+{
+    setMinimumWidth(500);
+
+    d->RelationTypeCombobox = new QComboBox;
+    d->DirectionCombobox = new QComboBox;
+    d->StereotypesCombobox = new QComboBox;
+    d->StereotypesCombobox->setEditable(true);
+    d->ElementTypeComboBox = new QComboBox;
+    d->ElementStereotypesCombobox = new QComboBox;
+    d->ElementStereotypesCombobox->setEditable(true);
+    d->NumberOfMatchingElementsValue = new QLabel;
+    d->buttonBox = new QDialogButtonBox(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
+
+    using namespace Layouting;
+    Column {
+        Group {
+            title(Tr::tr("Relation Attributes")),
+            Form {
+                Tr::tr("Type"), d->RelationTypeCombobox, br,
+                Tr::tr("Direction"), d->DirectionCombobox, br,
+                Tr::tr("Stereotypes"), d->StereotypesCombobox, br,
+            },
+        },
+        Group {
+            title(Tr::tr("Other Element Attributes")),
+            Form {
+                Tr::tr("Type"), d->ElementTypeComboBox, br,
+                Tr::tr("Stereotypes"), d->ElementStereotypesCombobox, br,
+            },
+        },
+        Row {
+            Tr::tr("Number of matching elements: "), d->NumberOfMatchingElementsValue, st,
+        },
+        st,
+        d->buttonBox,
+    }.attachTo(this);
+
+    connect(d->RelationTypeCombobox, &QComboBox::currentIndexChanged, this, &AddRelatedElementsDialog::updateNumberOfElements);
+    connect(d->DirectionCombobox, &QComboBox::currentIndexChanged, this, &AddRelatedElementsDialog::updateNumberOfElements);
+    connect(d->StereotypesCombobox, &QComboBox::currentTextChanged, this, &AddRelatedElementsDialog::updateNumberOfElements);
+    connect(d->ElementTypeComboBox, &QComboBox::currentIndexChanged, this, &AddRelatedElementsDialog::updateNumberOfElements);
+    connect(d->ElementStereotypesCombobox, &QComboBox::currentTextChanged, this, &AddRelatedElementsDialog::updateNumberOfElements);
+    connect(d->buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
+    connect(d->buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
+    connect(this, &QDialog::accepted, this, &AddRelatedElementsDialog::onAccepted);
+}
+
+AddRelatedElementsDialog::~AddRelatedElementsDialog()
+{
+    delete d;
+}
+
+void AddRelatedElementsDialog::setDiagramSceneController(qmt::DiagramSceneController *diagramSceneController)
+{
+    d->m_diagramSceneController = diagramSceneController;
+}
+
+void AddRelatedElementsDialog::setElements(const qmt::DSelection &selection, qmt::MDiagram *diagram)
+{
+    d->m_selection = selection;
+    d->m_diagramUid = diagram->uid();
+    QStringList relationTypes = {"Any", "Dependency", "Association", "Inheritance"};
+    d->m_relationTypeModel.setStringList(relationTypes);
+    d->RelationTypeCombobox->setModel(&d->m_relationTypeModel);
+    QStringList relationDirections = {"Any", "Outgoing (->)", "Incoming (<-)", "Bidirectional (<->)"};
+    d->m_relationDirectionModel.setStringList(relationDirections);
+    d->DirectionCombobox->setModel(&d->m_relationDirectionModel);
+    QStringList relationStereotypes = { };
+    d->m_relationStereotypesModel.setStringList(relationStereotypes);
+    d->StereotypesCombobox->setModel(&d->m_relationStereotypesModel);
+    QStringList elementTypes = {"Any", "Package", "Component", "Class", "Diagram", "Item"};
+    d->m_elementTypeModel.setStringList(elementTypes);
+    d->ElementTypeComboBox->setModel(&d->m_elementTypeModel);
+    QStringList elementStereotypes = { };
+    d->m_elementStereotypesModel.setStringList(elementStereotypes);
+    d->ElementStereotypesCombobox->setModel(&d->m_elementStereotypesModel);
+    updateNumberOfElements();
+}
+
+void AddRelatedElementsDialog::onAccepted()
+{
+    qmt::MDiagram *diagram = d->m_diagramSceneController->modelController()->findElement<qmt::MDiagram>(d->m_diagramUid);
+    if (diagram) {
+        updateFilter();
+        d->m_diagramSceneController->addRelatedElements(
+            d->m_selection, diagram,
+            [this](qmt::DObject *dobject, qmt::MObject *mobject, qmt::MRelation *relation) -> bool
+            {
+                return this->filter(dobject, mobject, relation);
+            });
+    }
+}
+
+void AddRelatedElementsDialog::updateFilter()
+{
+    d->m_filter.setRelationType((RelationType) d->RelationTypeCombobox->currentIndex());
+    d->m_filter.setRelationDirection((RelationDirection) d->DirectionCombobox->currentIndex());
+    d->m_filter.setRelationStereotypes(d->StereotypesCombobox->currentText().split(',', Qt::SkipEmptyParts));
+    d->m_filter.setElementType((ElementType) d->ElementTypeComboBox->currentIndex());
+    d->m_filter.setElementStereotypes(d->ElementStereotypesCombobox->currentText().split(',', Qt::SkipEmptyParts));
+}
+
+bool AddRelatedElementsDialog::filter(qmt::DObject *dobject, qmt::MObject *mobject, qmt::MRelation *relation)
+{
+    d->m_filter.reset();
+    d->m_filter.setObject(dobject, mobject);
+    d->m_filter.setRelation(relation);
+    relation->accept(&d->m_filter);
+    if (!d->m_filter.keep())
+        return false;
+    qmt::MObject *targetObject = nullptr;
+    if (relation->endAUid() != mobject->uid())
+        targetObject = d->m_diagramSceneController->modelController()->findObject(relation->endAUid());
+    else if (relation->endBUid() != mobject->uid())
+        targetObject = d->m_diagramSceneController->modelController()->findObject(relation->endBUid());
+    if (!targetObject)
+        return false;
+    targetObject->accept(&d->m_filter);
+    return d->m_filter.keep();
+}
+
+void AddRelatedElementsDialog::updateNumberOfElements()
+{
+    qmt::MDiagram *diagram = d->m_diagramSceneController->modelController()->findElement<qmt::MDiagram>(d->m_diagramUid);
+    if (diagram) {
+        updateFilter();
+        d->NumberOfMatchingElementsValue->setText(QString::number(d->m_diagramSceneController->countRelatedElements(
+            d->m_selection, diagram,
+            [this](qmt::DObject *dobject, qmt::MObject *mobject, qmt::MRelation *relation) -> bool
+            {
+                return this->filter(dobject, mobject, relation);
+            })));
+    }
+}
+
+} // namespace qmt
diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/addrelatedelementsdialog.h b/src/libs/modelinglib/qmt/model_widgets_ui/addrelatedelementsdialog.h
new file mode 100644
index 0000000000..e0fefa1c6c
--- /dev/null
+++ b/src/libs/modelinglib/qmt/model_widgets_ui/addrelatedelementsdialog.h
@@ -0,0 +1,43 @@
+// Copyright (C) 2018 Jochen Becher
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include "qmt/infrastructure/qmt_global.h"
+
+#include <QDialog>
+
+namespace qmt {
+
+class DSelection;
+class DObject;
+class MObject;
+class MDiagram;
+class MRelation;
+class DiagramSceneController;
+}
+
+namespace qmt {
+
+class QMT_EXPORT AddRelatedElementsDialog : public QDialog
+{
+    Q_OBJECT
+    class Private;
+
+public:
+    explicit AddRelatedElementsDialog(QWidget *parent = nullptr);
+    ~AddRelatedElementsDialog();
+
+    void setDiagramSceneController(qmt::DiagramSceneController *diagramSceneController);
+    void setElements(const qmt::DSelection &selection, qmt::MDiagram *diagram);
+
+private:
+    void onAccepted();
+    void updateFilter();
+    bool filter(qmt::DObject *dobject, qmt::MObject *mobject, qmt::MRelation *relation);
+    void updateNumberOfElements();
+
+    Private *d = nullptr;
+};
+
+} // namespace qmt
diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/modeltreefilter.cpp b/src/libs/modelinglib/qmt/model_widgets_ui/modeltreefilter.cpp
new file mode 100644
index 0000000000..3fa671283a
--- /dev/null
+++ b/src/libs/modelinglib/qmt/model_widgets_ui/modeltreefilter.cpp
@@ -0,0 +1,173 @@
+// Copyright (C) 2018 Jochen Becher
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "modeltreefilter.h"
+
+#include "../../modelinglibtr.h"
+
+#include <utils/layoutbuilder.h>
+
+#include <QCheckBox>
+#include <QComboBox>
+#include <QFrame>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QStringListModel>
+
+namespace qmt {
+
+class ModelTreeFilter::Private {
+public:
+    QStringListModel m_typeModel;
+    QStringListModel m_stereotypesModel;
+    QStringListModel m_directionModel;
+
+    QPushButton *resetViewButton;
+    QCheckBox *relationsCheckBox;
+    QCheckBox *diagramElementsCheckBox;
+    QPushButton *clearFilterButton;
+    QComboBox *typeComboBox;
+    QComboBox *stereotypesComboBox;
+    QLineEdit *nameLineEdit;
+    QComboBox *directionComboBox;
+};
+
+ModelTreeFilter::ModelTreeFilter(QWidget *parent) :
+    QWidget(parent),
+    d(new Private)
+{
+    d->resetViewButton = new QPushButton(Tr::tr("Reset"));
+    d->relationsCheckBox = new QCheckBox(Tr::tr("Relations"));
+    d->diagramElementsCheckBox = new QCheckBox(Tr::tr("Diagram Elements"));
+    d->diagramElementsCheckBox->setMaximumHeight(0);
+    d->clearFilterButton = new QPushButton(Tr::tr("Clear"));
+    d->typeComboBox = new QComboBox;
+    d->stereotypesComboBox = new QComboBox;
+    d->stereotypesComboBox->setEditable(true);
+    d->nameLineEdit = new QLineEdit;
+    d->directionComboBox = new QComboBox;
+
+    const auto boldLabel = [] (const QString &title) -> QLabel * {
+        auto label = new QLabel(title);
+        QFont boldFont = label->font();
+        boldFont.setWeight(QFont::Bold);
+        label->setFont(boldFont);
+        return label;
+    };
+
+    const auto line = [] () -> QFrame * {
+        auto line = new QFrame;
+        line->setFrameShadow(QFrame::Plain);
+        line->setFrameShape(QFrame::HLine);
+        return line;
+    };
+
+    const int margin = 9;
+
+    using namespace Layouting;
+    Column {
+        Column {
+            Row {
+                boldLabel(Tr::tr("View")), st, d->resetViewButton
+            },
+            d->relationsCheckBox,
+            d->diagramElementsCheckBox,
+            customMargin({margin, 0, margin, 0}),
+        },
+        Space(10),
+        line(),
+        Column {
+            Row {
+                boldLabel(Tr::tr("Filter")), st, d->clearFilterButton
+            },
+            Space(10),
+            Form {
+                Tr::tr("Type:"), d->typeComboBox, br,
+                Tr::tr("Stereotypes:"), d->stereotypesComboBox, br,
+                Tr::tr("Name:"), d->nameLineEdit, br,
+                Tr::tr("Direction:"), d->directionComboBox, br,
+            },
+            customMargin({margin, 0, margin, 0}),
+        },
+        st,
+        line(),
+        customMargin({0, margin, 0, 0}),
+    }.attachTo(this);
+
+    connect(d->resetViewButton, &QPushButton::clicked, this, &ModelTreeFilter::resetView);
+    connect(d->relationsCheckBox, &QCheckBox::clicked, this, &ModelTreeFilter::onViewChanged);
+    connect(d->diagramElementsCheckBox, &QCheckBox::clicked, this, &ModelTreeFilter::onViewChanged);
+    connect(d->clearFilterButton, &QPushButton::clicked, this, &ModelTreeFilter::clearFilter);
+    connect(d->typeComboBox, &QComboBox::currentIndexChanged, this, [this](int index) {
+        d->directionComboBox->setDisabled(index != (int) ModelTreeFilterData::Type::Dependency);
+    });
+    connect(d->typeComboBox, &QComboBox::currentIndexChanged, this, &ModelTreeFilter::onFilterChanged);
+    connect(d->stereotypesComboBox, &QComboBox::currentTextChanged, this, &ModelTreeFilter::onFilterChanged);
+    connect(d->nameLineEdit, &QLineEdit::textChanged, this, &ModelTreeFilter::onFilterChanged);
+    connect(d->directionComboBox, &QComboBox::currentTextChanged, this, &ModelTreeFilter::onFilterChanged);
+    setupFilter();
+    resetView();
+    clearFilter();
+}
+
+ModelTreeFilter::~ModelTreeFilter()
+{
+    delete d;
+}
+
+void ModelTreeFilter::setupFilter()
+{
+    QStringList types = {"Any", "Package", "Component", "Class", "Diagram", "Item",
+                         "Dependency", "Association", "Inheritance", "Connection"};
+    d->m_typeModel.setStringList(types);
+    d->typeComboBox->setModel(&d->m_typeModel);
+
+    QStringList stereotypes = { };
+    d->m_stereotypesModel.setStringList(stereotypes);
+    d->stereotypesComboBox->setModel(&d->m_stereotypesModel);
+
+    QStringList directions = {"Any", "Outgoing (->)", "Incoming (<-)", "Bidirectional (<->)"};
+    d->m_directionModel.setStringList(directions);
+    d->directionComboBox->setModel(&d->m_directionModel);
+}
+
+void ModelTreeFilter::resetView()
+{
+    d->relationsCheckBox->setChecked(true);
+    d->diagramElementsCheckBox->setChecked(false);
+    onViewChanged();
+}
+
+void ModelTreeFilter::clearFilter()
+{
+    d->typeComboBox->setCurrentIndex(0);
+    d->stereotypesComboBox->clearEditText();
+    d->nameLineEdit->clear();
+    d->directionComboBox->setCurrentIndex(0);
+    onFilterChanged();
+}
+
+void ModelTreeFilter::onViewChanged()
+{
+    ModelTreeViewData modelTreeViewData;
+    modelTreeViewData.setShowRelations(d->relationsCheckBox->isChecked());
+    modelTreeViewData.setShowDiagramElements(d->diagramElementsCheckBox->isChecked());
+    emit viewDataChanged(modelTreeViewData);
+}
+
+void ModelTreeFilter::onFilterChanged()
+{
+    ModelTreeFilterData modelTreeFilterData;
+    modelTreeFilterData.setType((ModelTreeFilterData::Type) d->typeComboBox->currentIndex());
+    modelTreeFilterData.setCustomId(QString());
+    modelTreeFilterData.setStereotypes(d->stereotypesComboBox->currentText().split(',', Qt::SkipEmptyParts));
+    modelTreeFilterData.setName(d->nameLineEdit->text().trimmed());
+    if (modelTreeFilterData.type() == ModelTreeFilterData::Type::Dependency)
+        modelTreeFilterData.setDirection((ModelTreeFilterData::Direction) d->directionComboBox->currentIndex());
+    else
+        modelTreeFilterData.setDirection(ModelTreeFilterData::Direction::Any);
+    emit filterDataChanged(modelTreeFilterData);
+}
+
+} // namespace qmt
diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/modeltreefilter.h b/src/libs/modelinglib/qmt/model_widgets_ui/modeltreefilter.h
new file mode 100644
index 0000000000..1de7237c6e
--- /dev/null
+++ b/src/libs/modelinglib/qmt/model_widgets_ui/modeltreefilter.h
@@ -0,0 +1,39 @@
+// Copyright (C) 2018 Jochen Becher
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include "qmt/infrastructure/qmt_global.h"
+#include "qmt/model_ui/modeltreefilterdata.h"
+
+#include <QWidget>
+
+namespace qmt {
+
+class QMT_EXPORT ModelTreeFilter : public QWidget
+{
+    Q_OBJECT
+    class Private;
+
+public:
+    explicit ModelTreeFilter(QWidget *parent = nullptr);
+    ~ModelTreeFilter();
+
+signals:
+    void viewDataChanged(const ModelTreeViewData &modelTreeViewData);
+    void filterDataChanged(const ModelTreeFilterData &modelTreeFilterData);
+
+private:
+
+    void setupFilter();
+    void resetView();
+    void clearFilter();
+    void onViewChanged();
+    void onFilterChanged();
+
+private:
+    Private *d = nullptr;
+};
+
+
+} // namespace qmt
diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.cpp b/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.cpp
index 68c22ce6df..875b1fa105 100644
--- a/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.cpp
+++ b/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.cpp
@@ -71,6 +71,46 @@ void ModelTreeView::setElementTasks(IElementTasks *elementTasks)
     m_elementTasks = elementTasks;
 }
 
+static void StoreStatus(QTreeView *view, QSortFilterProxyModel *model, const QModelIndex &parent, QVector<QModelIndex> &expanded_items)
+{
+    for (int index = 0; index < model->rowCount(parent); ++index) {
+        auto proxy_index = model->index(index, 0, parent);
+        if (view->isExpanded(proxy_index)) {
+            auto source_index = model->mapToSource(proxy_index);
+            expanded_items.append(source_index);
+        }
+        StoreStatus(view, model, proxy_index, expanded_items);
+    }
+}
+
+static void ApplyStatus(QTreeView *view, QSortFilterProxyModel *model, QVector<QModelIndex> &expanded_items)
+{
+    for (auto source_index : expanded_items) {
+        auto proxy_index = model->mapFromSource(source_index);
+        view->setExpanded(proxy_index, true);
+    }
+}
+
+void ModelTreeView::setModelTreeViewData(const ModelTreeViewData &viewData)
+{
+    if (m_sortedTreeModel) {
+        QVector<QModelIndex> expanded_items;
+        StoreStatus(this, m_sortedTreeModel, QModelIndex(), expanded_items);
+        m_sortedTreeModel->setModelTreeViewData(viewData);
+        ApplyStatus(this, m_sortedTreeModel, expanded_items);
+    }
+}
+
+void ModelTreeView::setModelTreeFilterData(const ModelTreeFilterData &filterData)
+{
+    if (m_sortedTreeModel) {
+        QVector<QModelIndex> expanded_items;
+        StoreStatus(this, m_sortedTreeModel, QModelIndex(), expanded_items);
+        m_sortedTreeModel->setModelTreeFilterData(filterData);
+        ApplyStatus(this, m_sortedTreeModel, expanded_items);
+    }
+}
+
 QModelIndex ModelTreeView::mapToSourceModelIndex(const QModelIndex &index) const
 {
     return m_sortedTreeModel->mapToSource(index);
@@ -237,6 +277,10 @@ void ModelTreeView::contextMenuEvent(QContextMenuEvent *event)
             menu.addAction(new ContextMenuAction(Tr::tr("Open Diagram"), "openDiagram", &menu));
             addSeparator = true;
         }
+        if (m_elementTasks->hasLinkedFile(melement)) {
+            menu.addAction(new ContextMenuAction(Tr::tr("Open Linked File"), "openLinkedFile", &menu));
+            addSeparator = true;
+        }
         if (melement->owner()) {
             if (addSeparator)
                 menu.addSeparator();
@@ -253,6 +297,8 @@ void ModelTreeView::contextMenuEvent(QContextMenuEvent *event)
                 m_elementTasks->openClassDefinition(melement);
             } else if (action->id() == "openDiagram") {
                 m_elementTasks->openDiagram(melement);
+            } else if (action->id() == "openLinkedFile") {
+                m_elementTasks->openLinkedFile(melement);
             } else if (action->id() == "delete") {
                 MSelection selection;
                 selection.append(melement->uid(), melement->owner()->uid());
diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.h b/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.h
index 0c07cb0372..e5537644a3 100644
--- a/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.h
+++ b/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.h
@@ -5,6 +5,7 @@
 
 #include "qmt/infrastructure/qmt_global.h"
 #include "qmt/model_ui/modeltreeviewinterface.h"
+#include "qmt/model_ui/modeltreefilterdata.h"
 
 #include <QElapsedTimer>
 #include <QTreeView>
@@ -32,6 +33,9 @@ public:
     void setTreeModel(SortedTreeModel *model);
     void setElementTasks(IElementTasks *elementTasks);
 
+    void setModelTreeViewData(const ModelTreeViewData &viewData);
+    void setModelTreeFilterData(const ModelTreeFilterData &filterData);
+
     QModelIndex mapToSourceModelIndex(const QModelIndex &index) const;
     void selectFromSourceModelIndex(const QModelIndex &index);
 
diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp
index 969313ca33..11df24188d 100644
--- a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp
+++ b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp
@@ -43,6 +43,7 @@
 #include "qmt/diagram_scene/items/stereotypedisplayvisitor.h"
 #include "qmt/stereotype/stereotypecontroller.h"
 #include "qmt/stereotype/customrelation.h"
+#include "qmt/style/relationvisuals.h"
 #include "qmt/style/stylecontroller.h"
 #include "qmt/style/style.h"
 #include "qmt/style/objectvisuals.h"
@@ -237,6 +238,61 @@ static DClass::TemplateDisplay translateIndexToTemplateDisplay(int index)
     return map[index];
 }
 
+static int translateRelationVisualPrimaryRoleToIndex(DRelation::VisualPrimaryRole visualRole)
+{
+    switch (visualRole) {
+    case DRelation::PrimaryRoleNormal:
+        return 0;
+    case DRelation::PrimaryRoleCustom1:
+        return 1;
+    case DRelation::PrimaryRoleCustom2:
+        return 2;
+    case DRelation::PrimaryRoleCustom3:
+        return 3;
+    case DRelation::PrimaryRoleCustom4:
+        return 4;
+    case DRelation::PrimaryRoleCustom5:
+        return 5;
+    }
+    return 0;
+}
+
+static DRelation::VisualPrimaryRole translateIndexToRelationVisualPrimaryRole(int index)
+{
+    static const DRelation::VisualPrimaryRole map[] = {
+        DRelation::PrimaryRoleNormal,
+        DRelation::PrimaryRoleCustom1, DRelation::PrimaryRoleCustom2, DRelation::PrimaryRoleCustom3,
+        DRelation::PrimaryRoleCustom4, DRelation::PrimaryRoleCustom5
+    };
+    QMT_ASSERT(index >= 0 && index <= 5, return DRelation::PrimaryRoleNormal);
+    return map[index];
+}
+
+static int translateRelationVisualSecondaryRoleToIndex(DRelation::VisualSecondaryRole visualRole)
+{
+    switch (visualRole) {
+    case DRelation::SecondaryRoleNone:
+        return 0;
+    case DRelation::SecondaryRoleWarning:
+        return 1;
+    case DRelation::SecondaryRoleError:
+        return 2;
+    case DRelation::SecondaryRoleSoften:
+        return 3;
+    }
+    return 0;
+}
+
+static DRelation::VisualSecondaryRole translateIndexToRelationVisualSecondaryRole(int index)
+{
+    static const DRelation::VisualSecondaryRole map[] = {
+        DRelation::SecondaryRoleNone,
+        DRelation::SecondaryRoleWarning, DRelation::SecondaryRoleError, DRelation::SecondaryRoleSoften
+    };
+    QMT_ASSERT(index >= 0 && index <= 5, return DRelation::SecondaryRoleNone);
+    return map[index];
+}
+
 static int translateAnnotationVisualRoleToIndex(DAnnotation::VisualRole visualRole)
 {
     switch (visualRole) {
@@ -398,6 +454,7 @@ void PropertiesView::MView::visitMPackage(const MPackage *package)
     else
         setTitle<MPackage>(m_modelElements, Tr::tr("Package"), Tr::tr("Packages"));
     visitMObject(package);
+    visitMObjectBehind(package);
 }
 
 void PropertiesView::MView::visitMClass(const MClass *klass)
@@ -472,12 +529,14 @@ void PropertiesView::MView::visitMClass(const MClass *klass)
     }
     if (m_classMembersEdit->isEnabled() != isSingleSelection)
         m_classMembersEdit->setEnabled(isSingleSelection);
+    visitMObjectBehind(klass);
 }
 
 void PropertiesView::MView::visitMComponent(const MComponent *component)
 {
     setTitle<MComponent>(m_modelElements, Tr::tr("Component"), Tr::tr("Components"));
     visitMObject(component);
+    visitMObjectBehind(component);
 }
 
 void PropertiesView::MView::visitMDiagram(const MDiagram *diagram)
@@ -497,6 +556,7 @@ void PropertiesView::MView::visitMCanvasDiagram(const MCanvasDiagram *diagram)
 {
     setTitle<MCanvasDiagram>(m_modelElements, Tr::tr("Canvas Diagram"), Tr::tr("Canvas Diagrams"));
     visitMDiagram(diagram);
+    visitMDiagramBehind(diagram);
 }
 
 void PropertiesView::MView::visitMItem(const MItem *item)
@@ -521,6 +581,7 @@ void PropertiesView::MView::visitMItem(const MItem *item)
         if (m_itemVarietyEdit->isEnabled() != isSingleSelection)
             m_itemVarietyEdit->setEnabled(isSingleSelection);
     }
+    visitMObjectBehind(item);
 }
 
 void PropertiesView::MView::visitMRelation(const MRelation *relation)
@@ -850,6 +911,7 @@ void PropertiesView::MView::visitDElement(const DElement *element)
 void PropertiesView::MView::visitDObject(const DObject *object)
 {
     visitDElement(object);
+    visitDObjectBefore(object);
 #ifdef SHOW_DEBUG_PROPERTIES
     if (!m_posRectLabel) {
         m_posRectLabel = new QLabel(m_topWidget);
@@ -1057,6 +1119,52 @@ void PropertiesView::MView::visitDItem(const DItem *item)
 void PropertiesView::MView::visitDRelation(const DRelation *relation)
 {
     visitDElement(relation);
+    if (!m_relationVisualPrimaryRoleSelector) {
+        m_relationVisualPrimaryRoleSelector = new PaletteBox(m_topWidget);
+        setRelationPrimaryRolePalette(m_styleElementType, DRelation::PrimaryRoleNormal);
+        setRelationPrimaryRolePalette(m_styleElementType, DRelation::PrimaryRoleCustom1);
+        setRelationPrimaryRolePalette(m_styleElementType, DRelation::PrimaryRoleCustom2);
+        setRelationPrimaryRolePalette(m_styleElementType, DRelation::PrimaryRoleCustom3);
+        setRelationPrimaryRolePalette(m_styleElementType, DRelation::PrimaryRoleCustom4);
+        setRelationPrimaryRolePalette(m_styleElementType, DRelation::PrimaryRoleCustom5);
+        addRow(Tr::tr("Color:"), m_relationVisualPrimaryRoleSelector, "color");
+        connect(m_relationVisualPrimaryRoleSelector, &PaletteBox::activated,
+                this, &PropertiesView::MView::onRelationVisualPrimaryRoleChanged);
+    }
+    if (!m_relationVisualPrimaryRoleSelector->hasFocus()) {
+        DRelation::VisualPrimaryRole visualPrimaryRole;
+        if (haveSameValue(m_diagramElements, &DRelation::visualPrimaryRole, &visualPrimaryRole))
+            m_relationVisualPrimaryRoleSelector->setCurrentIndex(translateRelationVisualPrimaryRoleToIndex(visualPrimaryRole));
+        else
+            m_relationVisualPrimaryRoleSelector->setCurrentIndex(-1);
+    }
+    if (!m_relationVisualSecondaryRoleSelector) {
+        m_relationVisualSecondaryRoleSelector = new QComboBox(m_topWidget);
+        m_relationVisualSecondaryRoleSelector->addItems({ Tr::tr("Normal"), Tr::tr("Warning"), Tr::tr("Error"), Tr::tr("Soften") });
+        addRow(Tr::tr("Role:"), m_relationVisualSecondaryRoleSelector, "role");
+        connect(m_relationVisualSecondaryRoleSelector, QOverload<int>::of(&QComboBox::activated),
+                this, &PropertiesView::MView::onRelationVisualSecondaryRoleChanged);
+    }
+    if (!m_relationVisualSecondaryRoleSelector->hasFocus()) {
+        DRelation::VisualSecondaryRole visualSecondaryRole;
+        if (haveSameValue(m_diagramElements, &DRelation::visualSecondaryRole, &visualSecondaryRole))
+            m_relationVisualSecondaryRoleSelector->setCurrentIndex(translateRelationVisualSecondaryRoleToIndex(visualSecondaryRole));
+        else
+            m_relationVisualSecondaryRoleSelector->setCurrentIndex(-1);
+    }
+    if (!m_relationVisualEmphasizedCheckbox) {
+        m_relationVisualEmphasizedCheckbox = new QCheckBox(Tr::tr("Emphasized"), m_topWidget);
+        addRow(QString(), m_relationVisualEmphasizedCheckbox, "emphasized");
+        connect(m_relationVisualEmphasizedCheckbox, &QAbstractButton::clicked,
+                this, &PropertiesView::MView::onRelationVisualEmphasizedChanged);
+    }
+    if (!m_relationVisualEmphasizedCheckbox->hasFocus()) {
+        bool emphasized;
+        if (haveSameValue(m_diagramElements, &DRelation::isVisualEmphasized, &emphasized))
+            m_relationVisualEmphasizedCheckbox->setChecked(emphasized);
+        else
+            m_relationVisualEmphasizedCheckbox->setChecked(false);
+    }
 #ifdef SHOW_DEBUG_PROPERTIES
     if (!m_pointsLabel) {
         m_pointsLabel = new QLabel(m_topWidget);
@@ -1145,6 +1253,26 @@ void PropertiesView::MView::visitDSwimlane(const DSwimlane *swimlane)
     visitDElement(swimlane);
 }
 
+void PropertiesView::MView::visitMElementBehind(const MElement *element)
+{
+    Q_UNUSED(element)
+}
+
+void PropertiesView::MView::visitMObjectBehind(const MObject *object)
+{
+    visitMElementBehind(object);
+}
+
+void PropertiesView::MView::visitMDiagramBehind(const MDiagram *diagram)
+{
+    visitMObjectBehind(diagram);
+}
+
+void PropertiesView::MView::visitDObjectBefore(const DObject *object)
+{
+    Q_UNUSED(object);
+}
+
 void PropertiesView::MView::onStereotypesChanged(const QString &stereotypes)
 {
     QList<QString> set = m_stereotypesController->fromString(stereotypes);
@@ -1392,7 +1520,42 @@ void PropertiesView::MView::onAnnotationVisualRoleChanged(int visualRoleIndex)
 {
     DAnnotation::VisualRole visualRole = translateIndexToAnnotationVisualRole((visualRoleIndex));
     assignModelElement<DAnnotation, DAnnotation::VisualRole>(
-                m_diagramElements, SelectionMulti, visualRole, &DAnnotation::visualRole, &DAnnotation::setVisualRole);
+        m_diagramElements, SelectionMulti, visualRole, &DAnnotation::visualRole, &DAnnotation::setVisualRole);
+}
+
+
+void PropertiesView::MView::onRelationVisualPrimaryRoleChanged(int visualRoleIndex)
+{
+    DRelation::VisualPrimaryRole visualRole = translateIndexToRelationVisualPrimaryRole(visualRoleIndex);
+    assignModelElement<DRelation, DRelation::VisualPrimaryRole>(
+        m_diagramElements, SelectionMulti, visualRole,
+        &DRelation::visualPrimaryRole, &DRelation::setVisualPrimaryRole);
+}
+
+void PropertiesView::MView::onRelationVisualSecondaryRoleChanged(int visualRoleIndex)
+{
+    DRelation::VisualSecondaryRole visualRole = translateIndexToRelationVisualSecondaryRole(visualRoleIndex);
+    assignModelElement<DRelation, DRelation::VisualSecondaryRole>(
+        m_diagramElements, SelectionMulti, visualRole,
+        &DRelation::visualSecondaryRole, &DRelation::setVisualSecondaryRole);
+}
+
+void PropertiesView::MView::onRelationVisualEmphasizedChanged(bool visualEmphasized)
+{
+    assignModelElement<DRelation, bool>(m_diagramElements, SelectionMulti, visualEmphasized,
+                                      &DRelation::isVisualEmphasized, &DRelation::setVisualEmphasized);
+}
+
+void PropertiesView::MView::onRelationColorChanged(const QColor &color)
+{
+    assignModelElement<DRelation, QColor>(m_diagramElements, SelectionMulti, color,
+                                          &DRelation::color, &DRelation::setColor);
+}
+
+void PropertiesView::MView::onRelationThicknessChanged(qreal thickness)
+{
+    assignModelElement<DRelation, qreal>(m_diagramElements, SelectionMulti, thickness,
+                                         &DRelation::thickness, &DRelation::setThickness);
 }
 
 void PropertiesView::MView::prepare()
@@ -1553,7 +1716,8 @@ void PropertiesView::MView::setPrimaryRolePalette(StyleEngine::ElementType eleme
                                                   DObject::VisualPrimaryRole visualPrimaryRole, const QColor &baseColor)
 {
     int index = translateVisualPrimaryRoleToIndex(visualPrimaryRole);
-    const Style *style = m_propertiesView->styleController()->adaptObjectStyle(elementType, ObjectVisuals(visualPrimaryRole, DObject::SecondaryRoleNone, false, baseColor, 0));
+    const Style *style = m_propertiesView->styleController()->adaptObjectStyle(
+        elementType, ObjectVisuals(visualPrimaryRole, DObject::SecondaryRoleNone, false, baseColor, 0));
     m_visualPrimaryRoleSelector->setBrush(index, style->fillBrush());
     m_visualPrimaryRoleSelector->setLinePen(index, style->linePen());
 }
@@ -1595,112 +1759,15 @@ QString PropertiesView::MView::formatTemplateParameters(const QList<QString> &te
     return templateParamters;
 }
 
-template<class T, class V>
-QList<T *> PropertiesView::MView::filter(const QList<V *> &elements)
-{
-    QList<T *> filtered;
-    for (V *element : elements) {
-        auto t = dynamic_cast<T *>(element);
-        if (t)
-            filtered.append(t);
-    }
-    return filtered;
-}
-
-template<class T, class V, class BASE>
-bool PropertiesView::MView::haveSameValue(const QList<BASE *> &baseElements, V (T::*getter)() const, V *value)
+void PropertiesView::MView::setRelationPrimaryRolePalette(StyleEngine::ElementType elementType,
+                                                          DRelation::VisualPrimaryRole visualPrimaryRole)
 {
-    const QList<T *> elements = filter<T>(baseElements);
-    QMT_CHECK(!elements.isEmpty());
-    V candidate = V(); // avoid warning of reading uninitialized variable
-    bool haveCandidate = false;
-    for (T *element : elements) {
-        if (!haveCandidate) {
-            candidate = ((*element).*getter)();
-            haveCandidate = true;
-        } else {
-            if (candidate != ((*element).*getter)())
-                return false;
-        }
-    }
-    QMT_CHECK(haveCandidate);
-    if (!haveCandidate)
-        return false;
-    if (value)
-        *value = candidate;
-    return true;
-}
-
-template<class T, class V, class BASE>
-void PropertiesView::MView::assignModelElement(const QList<BASE *> &baseElements, SelectionType selectionType,
-                                               const V &value, V (T::*getter)() const, void (T::*setter)(const V &))
-{
-    const QList<T *> elements = filter<T>(baseElements);
-    if ((selectionType == SelectionSingle && elements.size() == 1) || selectionType == SelectionMulti) {
-        for (T *element : elements) {
-            if (value != ((*element).*getter)()) {
-                m_propertiesView->beginUpdate(element);
-                ((*element).*setter)(value);
-                m_propertiesView->endUpdate(element, false);
-            }
-        }
-    }
-}
-
-template<class T, class V, class BASE>
-void PropertiesView::MView::assignModelElement(const QList<BASE *> &baseElements, SelectionType selectionType,
-                                               const V &value, V (T::*getter)() const, void (T::*setter)(V))
-{
-    const QList<T *> elements = filter<T>(baseElements);
-    if ((selectionType == SelectionSingle && elements.size() == 1) || selectionType == SelectionMulti) {
-        for (T *element : elements) {
-            if (value != ((*element).*getter)()) {
-                m_propertiesView->beginUpdate(element);
-                ((*element).*setter)(value);
-                m_propertiesView->endUpdate(element, false);
-            }
-        }
-    }
-}
-
-template<class T, class E, class V, class BASE>
-void PropertiesView::MView::assignEmbeddedModelElement(const QList<BASE *> &baseElements, SelectionType selectionType,
-                                                       const V &value, E (T::*getter)() const,
-                                                       void (T::*setter)(const E &),
-                                                       V (E::*vGetter)() const, void (E::*vSetter)(const V &))
-{
-    const QList<T *> elements = filter<T>(baseElements);
-    if ((selectionType == SelectionSingle && elements.size() == 1) || selectionType == SelectionMulti) {
-        for (T *element : elements) {
-            E embedded = ((*element).*getter)();
-            if (value != (embedded.*vGetter)()) {
-                m_propertiesView->beginUpdate(element);
-                (embedded.*vSetter)(value);
-                ((*element).*setter)(embedded);
-                m_propertiesView->endUpdate(element, false);
-            }
-        }
-    }
-}
-
-template<class T, class E, class V, class BASE>
-void PropertiesView::MView::assignEmbeddedModelElement(const QList<BASE *> &baseElements, SelectionType selectionType,
-                                                       const V &value, E (T::*getter)() const,
-                                                       void (T::*setter)(const E &),
-                                                       V (E::*vGetter)() const, void (E::*vSetter)(V))
-{
-    const QList<T *> elements = filter<T>(baseElements);
-    if ((selectionType == SelectionSingle && elements.size() == 1) || selectionType == SelectionMulti) {
-        for (T *element : elements) {
-            E embedded = ((*element).*getter)();
-            if (value != (embedded.*vGetter)()) {
-                m_propertiesView->beginUpdate(element);
-                (embedded.*vSetter)(value);
-                ((*element).*setter)(embedded);
-                m_propertiesView->endUpdate(element, false);
-            }
-        }
-    }
+    int index = translateRelationVisualPrimaryRoleToIndex(visualPrimaryRole);
+    const Style *style = m_propertiesView->styleController()->adaptRelationStyle(
+        elementType, RelationVisuals(DObject::PrimaryRoleNormal, visualPrimaryRole,
+                                     DRelation::SecondaryRoleNone, false));
+    m_relationVisualPrimaryRoleSelector->setBrush(index, style->fillBrush());
+    m_relationVisualPrimaryRoleSelector->setLinePen(index, style->linePen());
 }
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.h b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.h
index 4762803a20..8fa9f0d137 100644
--- a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.h
+++ b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.h
@@ -8,6 +8,8 @@
 #include "qmt/model/mconstvisitor.h"
 #include "qmt/diagram/dconstvisitor.h"
 #include "qmt/diagram/dobject.h"
+#include "qmt/diagram/drelation.h"
+#include "qmt/infrastructure/qmtassert.h"
 #include "qmt/stereotype/stereotypeicon.h"
 #include "qmt/style/styleengine.h"
 
@@ -76,6 +78,11 @@ public:
     void edit();
 
 protected:
+    virtual void visitMElementBehind(const MElement *element);
+    virtual void visitMObjectBehind(const MObject *object);
+    virtual void visitMDiagramBehind(const MDiagram *diagram);
+    virtual void visitDObjectBefore(const DObject *object);
+
     void onStereotypesChanged(const QString &stereotypes);
     void onObjectNameChanged(const QString &name);
     void onNamespaceChanged(const QString &umlNamespace);
@@ -110,6 +117,11 @@ protected:
     void onPlainShapeChanged(bool plainShape);
     void onItemShapeChanged(const QString &shape);
     void onAutoWidthChanged(bool autoWidthed);
+    void onRelationVisualPrimaryRoleChanged(int visualRoleIndex);
+    void onRelationVisualSecondaryRoleChanged(int visualRoleIndex);
+    void onRelationVisualEmphasizedChanged(bool visualEmphasized);
+    void onRelationColorChanged(const QColor &color);
+    void onRelationThicknessChanged(qreal thickness);
     void onAnnotationVisualRoleChanged(int visualRoleIndex);
 
     void prepare();
@@ -139,6 +151,9 @@ protected:
     QList<QString> splitTemplateParameters(const QString &templateParameters);
     QString formatTemplateParameters(const QList<QString> &templateParametersList);
 
+    void setRelationPrimaryRolePalette(StyleEngine::ElementType elementType,
+                                       DRelation::VisualPrimaryRole visualPrimaryRole);
+
     enum SelectionType {
         SelectionSingle,
         SelectionMulti
@@ -149,6 +164,9 @@ protected:
     template<class T, class V, class BASE>
     bool haveSameValue(const QList<BASE *> &baseElements, V (T::*getter)() const, V *value);
     template<class T, class V, class BASE>
+    bool isValueChanged(const QList<BASE *> &baseElements, SelectionType selectionType,
+                        const V &value, V (T::*getter)() const);
+    template<class T, class V, class BASE>
     void assignModelElement(const QList<BASE *> &baseElements, SelectionType selectionType,
                             const V &value, V (T::*getter)() const, void (T::*setter)(const V &));
     template<class T, class V, class BASE>
@@ -232,7 +250,132 @@ protected:
     QCheckBox *m_annotationAutoWidthCheckbox = nullptr;
     QComboBox *m_annotationVisualRoleSelector = nullptr;
     // DRelation
+    PaletteBox *m_relationVisualPrimaryRoleSelector = nullptr;
+    QComboBox *m_relationVisualSecondaryRoleSelector = nullptr;
+    QCheckBox *m_relationVisualEmphasizedCheckbox = nullptr;
     QLabel *m_pointsLabel = nullptr;
 };
 
+template<class T, class V>
+QList<T *> PropertiesView::MView::filter(const QList<V *> &elements)
+{
+    QList<T *> filtered;
+    for (auto *element : elements) {
+        auto t = dynamic_cast<T *>(element);
+        if (t)
+            filtered.append(t);
+    }
+    return filtered;
+}
+
+template<class T, class V, class BASE>
+inline bool PropertiesView::MView::haveSameValue(const QList<BASE *> &baseElements, V (T::*getter)() const, V *value)
+{
+    QList<T *> elements = filter<T>(baseElements);
+    QMT_CHECK(!elements.isEmpty());
+    V candidate = V(); // avoid warning of reading uninitialized variable
+    bool haveCandidate = false;
+    for (const auto *element : elements) {
+        if (!haveCandidate) {
+            candidate = ((*element).*getter)();
+            haveCandidate = true;
+        } else {
+            if (candidate != ((*element).*getter)())
+                return false;
+        }
+    }
+    QMT_CHECK(haveCandidate);
+    if (!haveCandidate)
+        return false;
+    if (value)
+        *value = candidate;
+    return true;
+}
+
+template<class T, class V, class BASE>
+inline bool PropertiesView::MView::isValueChanged(const QList<BASE *> &baseElements, SelectionType selectionType,
+                                                  const V &value, V (T::*getter)() const)
+{
+    QList<T *> elements = filter<T>(baseElements);
+    if ((selectionType == SelectionSingle && elements.size() == 1) || selectionType == SelectionMulti) {
+        for (const auto *element : elements) {
+            if (value != ((*element).*getter)())
+                return true;
+        }
+    }
+    return false;
+}
+
+template<class T, class V, class BASE>
+inline void PropertiesView::MView::assignModelElement(const QList<BASE *> &baseElements, SelectionType selectionType,
+                                                      const V &value, V (T::*getter)() const, void (T::*setter)(const V &))
+{
+    QList<T *> elements = filter<T>(baseElements);
+    if ((selectionType == SelectionSingle && elements.size() == 1) || selectionType == SelectionMulti) {
+        for (auto *element : elements) {
+            if (value != ((*element).*getter)()) {
+                m_propertiesView->beginUpdate(element);
+                ((*element).*setter)(value);
+                m_propertiesView->endUpdate(element, false);
+            }
+        }
+    }
+}
+
+template<class T, class V, class BASE>
+inline void PropertiesView::MView::assignModelElement(const QList<BASE *> &baseElements, SelectionType selectionType,
+                                                      const V &value, V (T::*getter)() const, void (T::*setter)(V))
+{
+    QList<T *> elements = filter<T>(baseElements);
+    if ((selectionType == SelectionSingle && elements.size() == 1) || selectionType == SelectionMulti) {
+        for (auto *element : elements) {
+            if (value != ((*element).*getter)()) {
+                m_propertiesView->beginUpdate(element);
+                ((*element).*setter)(value);
+                m_propertiesView->endUpdate(element, false);
+            }
+        }
+    }
+}
+
+template<class T, class E, class V, class BASE>
+inline void PropertiesView::MView::assignEmbeddedModelElement(const QList<BASE *> &baseElements, SelectionType selectionType,
+                                                              const V &value, E (T::*getter)() const,
+                                                              void (T::*setter)(const E &),
+                                                              V (E::*vGetter)() const, void (E::*vSetter)(const V &))
+{
+    QList<T *> elements = filter<T>(baseElements);
+    if ((selectionType == SelectionSingle && elements.size() == 1) || selectionType == SelectionMulti) {
+        for (auto *element : elements) {
+            E embedded = ((*element).*getter)();
+            if (value != (embedded.*vGetter)()) {
+                m_propertiesView->beginUpdate(element);
+                (embedded.*vSetter)(value);
+                ((*element).*setter)(embedded);
+                m_propertiesView->endUpdate(element, false);
+            }
+        }
+    }
+}
+
+template<class T, class E, class V, class BASE>
+inline void PropertiesView::MView::assignEmbeddedModelElement(const QList<BASE *> &baseElements, SelectionType selectionType,
+                                                              const V &value, E (T::*getter)() const,
+                                                              void (T::*setter)(const E &),
+                                                              V (E::*vGetter)() const, void (E::*vSetter)(V))
+{
+    QList<T *> elements = filter<T>(baseElements);
+    if ((selectionType == SelectionSingle && elements.size() == 1) || selectionType == SelectionMulti) {
+        for (auto *element : elements) {
+            E embedded = ((*element).*getter)();
+            if (value != (embedded.*vGetter)()) {
+                m_propertiesView->beginUpdate(element);
+                (embedded.*vSetter)(value);
+                ((*element).*setter)(embedded);
+                m_propertiesView->endUpdate(element, false);
+            }
+        }
+    }
+}
+
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/serializer/diagramserializer.cpp b/src/libs/modelinglib/qmt/serializer/diagramserializer.cpp
index 5170d4fdc7..2d68862c32 100644
--- a/src/libs/modelinglib/qmt/serializer/diagramserializer.cpp
+++ b/src/libs/modelinglib/qmt/serializer/diagramserializer.cpp
@@ -29,10 +29,35 @@
 #include "qark/qxmlinarchive.h"
 #include "qark/serialize.h"
 
+#include <QBuffer>
+
 using namespace qmt;
 
 namespace qark {
 
+template<class Archive>
+inline void save(Archive &archive, const QImage &image)
+{
+    QByteArray a;
+    QBuffer buffer(&a);
+    buffer.open(QIODevice::WriteOnly);
+    image.save(&buffer, "PNG");
+    // TODO add write(const QByteArray &)
+    archive.write(QString::fromLatin1(a.toBase64()));
+}
+
+template<class Archive>
+inline void load(Archive &archive, QImage &image)
+{
+    QString s;
+    // TODO add read(QByteArray &)
+    archive.read(&s);
+    QByteArray a = QByteArray::fromBase64(s.toLatin1());
+    QBuffer buffer(&a);
+    buffer.open(QIODevice::ReadOnly);
+    image.load(&buffer, "PNG");
+}
+
 // DElement
 
 QARK_REGISTER_TYPE_NAME(DElement, "DElement")
@@ -102,7 +127,10 @@ inline void Access<Archive, DObject>::serialize(Archive &archive, DObject &objec
             || attr("visual-role", object, &visualRole, &setVisualRole)
             || attr("visual-role2", object, &DObject::visualSecondaryRole, &DObject::setVisualSecondaryRole)
             || attr("visual-emphasized", object, &DObject::isVisualEmphasized, &DObject::setVisualEmphasized)
+            || attr("linkedfile", object, &DObject::hasLinkedFile, &DObject::setLinkedFile)
             || attr("stereotype-display", object, &DObject::stereotypeDisplay, &DObject::setStereotypeDisplay)
+            || attr("image-path", object, &DObject::imagePath, &DObject::setImagePath)
+            || attr("image", object, &DObject::image, &DObject::setImage)
             // depth is not persistent
             || end;
 }
@@ -220,6 +248,9 @@ inline void Access<Archive, DRelation>::serialize(Archive &archive, DRelation &r
             || attr("b", relation, &DRelation::endBUid, &DRelation::setEndBUid)
             || attr("name", relation, &DRelation::name, &DRelation::setName)
             || attr("points", relation, &DRelation::intermediatePoints, &DRelation::setIntermediatePoints)
+            || attr("visualPrimaryRole", relation, &DRelation::visualPrimaryRole, &DRelation::setVisualPrimaryRole)
+            || attr("visualSecondaryRole", relation, &DRelation::visualSecondaryRole, &DRelation::setVisualSecondaryRole)
+            || attr("thickness", relation, &DRelation::thickness, &DRelation::setThickness)
             || end;
 }
 
diff --git a/src/libs/modelinglib/qmt/serializer/diagramserializer.h b/src/libs/modelinglib/qmt/serializer/diagramserializer.h
index a571ff94ef..aa5d1adb52 100644
--- a/src/libs/modelinglib/qmt/serializer/diagramserializer.h
+++ b/src/libs/modelinglib/qmt/serializer/diagramserializer.h
@@ -6,6 +6,7 @@
 #include "qmt/diagram/dannotation.h"
 #include "qmt/diagram/dobject.h"
 #include "qmt/diagram/dclass.h"
+#include "qmt/diagram/drelation.h"
 
 #include "qark/serialize_enum.h"
 
@@ -16,5 +17,7 @@ QARK_SERIALIZE_ENUM(qmt::DObject::VisualSecondaryRole)
 QARK_SERIALIZE_ENUM(qmt::DObject::StereotypeDisplay)
 QARK_SERIALIZE_ENUM(qmt::DClass::TemplateDisplay)
 QARK_SERIALIZE_ENUM(qmt::DAnnotation::VisualRole)
+QARK_SERIALIZE_ENUM(qmt::DRelation::VisualPrimaryRole)
+QARK_SERIALIZE_ENUM(qmt::DRelation::VisualSecondaryRole)
 
 } // namespace qark
diff --git a/src/libs/modelinglib/qmt/serializer/modelserializer.cpp b/src/libs/modelinglib/qmt/serializer/modelserializer.cpp
index 115eba08d0..935a825ab2 100644
--- a/src/libs/modelinglib/qmt/serializer/modelserializer.cpp
+++ b/src/libs/modelinglib/qmt/serializer/modelserializer.cpp
@@ -95,6 +95,7 @@ inline void Access<Archive, MObject>::serialize(Archive &archive, MObject &objec
     archive || tag(object)
             || base<MElement>(object)
             || attr("name", object, &MObject::name, &MObject::setName)
+            || attr("linkedfilename", object, &MObject::linkedFileName, &MObject::setLinkedFileName)
             || attr("children", object, &MObject::children, &MObject::setChildren)
             || attr("relations", object, &MObject::relations, &MObject::setRelations)
             || end;
diff --git a/src/libs/modelinglib/qmt/stereotype/customrelation.cpp b/src/libs/modelinglib/qmt/stereotype/customrelation.cpp
index fa9c80a1a0..cc80da1b80 100644
--- a/src/libs/modelinglib/qmt/stereotype/customrelation.cpp
+++ b/src/libs/modelinglib/qmt/stereotype/customrelation.cpp
@@ -114,4 +114,9 @@ void CustomRelation::setColor(const QColor &color)
     m_color = color;
 }
 
+void CustomRelation::setEmphasized(bool emphasized)
+{
+    m_emphasized = emphasized;
+}
+
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/stereotype/customrelation.h b/src/libs/modelinglib/qmt/stereotype/customrelation.h
index 7125865ade..dd32c542c0 100644
--- a/src/libs/modelinglib/qmt/stereotype/customrelation.h
+++ b/src/libs/modelinglib/qmt/stereotype/customrelation.h
@@ -55,7 +55,10 @@ public:
     enum class ColorType {
         EndA,
         EndB,
-        Custom
+        Custom,
+        Warning,
+        Error,
+        Soften,
     };
 
     class End {
@@ -113,6 +116,8 @@ public:
     void setColorType(ColorType colorType);
     QColor color() const { return m_color; }
     void setColor(const QColor &color);
+    bool emphasized() const { return m_emphasized; }
+    void setEmphasized(bool emphasized);
 
     friend auto qHash(CustomRelation::Relationship relationship) {
         return ::qHash(static_cast<int>(relationship));
@@ -139,6 +144,7 @@ private:
     ShaftPattern m_shaftPattern = ShaftPattern::Solid;
     ColorType m_colorType = ColorType::EndA;
     QColor m_color;
+    bool m_emphasized = false;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/stereotype/shapevalue.cpp b/src/libs/modelinglib/qmt/stereotype/shapevalue.cpp
index 9e1ee46c15..cf8ea5ef65 100644
--- a/src/libs/modelinglib/qmt/stereotype/shapevalue.cpp
+++ b/src/libs/modelinglib/qmt/stereotype/shapevalue.cpp
@@ -29,7 +29,7 @@ qreal ShapeValueF::mapScaledTo(qreal scaledOrigin, qreal originalSize, qreal bas
         v = originalSize != 0 ? (m_value * actualSize / originalSize) : m_value;
         break;
     case UnitPercentage:
-        v = m_value * actualSize;
+        v = m_value * actualSize / 100.0;
         break;
     }
     switch (m_origin) {
diff --git a/src/libs/modelinglib/qmt/stereotype/stereotypecontroller.cpp b/src/libs/modelinglib/qmt/stereotype/stereotypecontroller.cpp
index 030c9e12a5..f557e80c4b 100644
--- a/src/libs/modelinglib/qmt/stereotype/stereotypecontroller.cpp
+++ b/src/libs/modelinglib/qmt/stereotype/stereotypecontroller.cpp
@@ -68,6 +68,7 @@ public:
     QHash<QPair<StereotypeIcon::Element, QString>, QString> m_stereotypeToIconIdMap;
     QHash<QString, StereotypeIcon> m_iconIdToStereotypeIconsMap;
     QHash<QString, CustomRelation> m_relationIdToCustomRelationMap;
+    QHash<QString, CustomRelation> m_stereotypeToCustomRelationMap;
     QList<Toolbar> m_toolbars;
     QList<Toolbar> m_elementToolbars;
     QHash<IconKey, QIcon> m_iconMap;
@@ -150,6 +151,11 @@ CustomRelation StereotypeController::findCustomRelation(const QString &customRel
     return d->m_relationIdToCustomRelationMap.value(customRelationId);
 }
 
+CustomRelation StereotypeController::findCustomRelationByStereotype(const QString &steoreotype) const
+{
+    return d->m_stereotypeToCustomRelationMap.value(steoreotype);
+}
+
 QIcon StereotypeController::createIcon(StereotypeIcon::Element element, const QList<QString> &stereotypes,
                                        const QString &defaultIconPath, const Style *style, const QSize &size,
                                        const QMarginsF &margins, qreal lineWidth)
@@ -251,6 +257,9 @@ void StereotypeController::addStereotypeIcon(const StereotypeIcon &stereotypeIco
 void StereotypeController::addCustomRelation(const CustomRelation &customRelation)
 {
     d->m_relationIdToCustomRelationMap.insert(customRelation.id(), customRelation);
+    QString stereotype = Utils::toList(customRelation.stereotypes()).value(0);
+    if (!stereotype.isEmpty())
+        d->m_stereotypeToCustomRelationMap.insert(stereotype, customRelation);
 }
 
 void StereotypeController::addToolbar(const Toolbar &toolbar)
diff --git a/src/libs/modelinglib/qmt/stereotype/stereotypecontroller.h b/src/libs/modelinglib/qmt/stereotype/stereotypecontroller.h
index 676f9a275a..45bc3bbd18 100644
--- a/src/libs/modelinglib/qmt/stereotype/stereotypecontroller.h
+++ b/src/libs/modelinglib/qmt/stereotype/stereotypecontroller.h
@@ -33,6 +33,7 @@ public:
                                              const QList<QString> &stereotypes) const;
     StereotypeIcon findStereotypeIcon(const QString &stereotypeIconId) const;
     CustomRelation findCustomRelation(const QString &customRelationId) const;
+    CustomRelation findCustomRelationByStereotype(const QString &steoreotype) const;
     QIcon createIcon(StereotypeIcon::Element element, const QList<QString> &stereotypes,
                      const QString &defaultIconPath, const Style *style,
                      const QSize &size, const QMarginsF &margins, qreal lineWidth);
diff --git a/src/libs/modelinglib/qmt/stereotype/stereotypeicon.cpp b/src/libs/modelinglib/qmt/stereotype/stereotypeicon.cpp
index 8bcf5df170..19e466c509 100644
--- a/src/libs/modelinglib/qmt/stereotype/stereotypeicon.cpp
+++ b/src/libs/modelinglib/qmt/stereotype/stereotypeicon.cpp
@@ -62,6 +62,21 @@ void StereotypeIcon::setMinHeight(qreal minHeight)
     m_minHeight = minHeight;
 }
 
+void StereotypeIcon::setIconWith(qreal iconWidth)
+{
+    m_iconWidth = iconWidth;
+}
+
+void StereotypeIcon::setIconHeight(qreal iconHeight)
+{
+    m_iconHeight = iconHeight;
+}
+
+void StereotypeIcon::setDepthLayer(DepthLayer depthLayer)
+{
+    m_depthLayer = depthLayer;
+}
+
 void StereotypeIcon::setSizeLock(StereotypeIcon::SizeLock sizeLock)
 {
     m_sizeLock = sizeLock;
diff --git a/src/libs/modelinglib/qmt/stereotype/stereotypeicon.h b/src/libs/modelinglib/qmt/stereotype/stereotypeicon.h
index be45245da5..fcb5f1a15c 100644
--- a/src/libs/modelinglib/qmt/stereotype/stereotypeicon.h
+++ b/src/libs/modelinglib/qmt/stereotype/stereotypeicon.h
@@ -31,6 +31,12 @@ public:
         DisplaySmart
     };
 
+    enum DepthLayer {
+        DepthBehindItems,
+        DepthAmongItems,
+        DepthBeforeItems,
+    };
+
     enum SizeLock {
         LockNone,
         LockWidth,
@@ -62,12 +68,20 @@ public:
     void setWidth(qreal width);
     qreal height() const { return m_height; }
     void setHeight(qreal height);
-    bool hasMinWidth() const { return m_minWidth > 0; }
+    bool hasMinWidth() const { return m_minWidth > 0.0; }
     qreal minWidth() const { return m_minWidth; }
     void setMinWidth(qreal minWidth);
-    bool hasMinHeight() const { return m_minHeight > 0; }
+    bool hasMinHeight() const { return m_minHeight > 0.0; }
     qreal minHeight() const { return m_minHeight; }
     void setMinHeight(qreal minHeight);
+    bool hasIconWidth() const { return m_iconWidth > 0.0; }
+    qreal iconWidth() const { return m_iconWidth; }
+    void setIconWith(qreal iconWidth);
+    bool hasIconHeight() const { return m_iconHeight > 0.0; }
+    qreal iconHeight() const { return m_iconHeight; }
+    void setIconHeight(qreal iconHeight);
+    DepthLayer depthLayer() const { return m_depthLayer; }
+    void setDepthLayer(DepthLayer depthLayer);
     SizeLock sizeLock() const { return m_sizeLock; }
     void setSizeLock(SizeLock sizeLock);
     Display display() const { return m_display; }
@@ -90,8 +104,11 @@ private:
     QString m_name;
     qreal m_width = 100.0;
     qreal m_height = 100.0;
-    qreal m_minWidth = -1;
-    qreal m_minHeight = -1;
+    qreal m_minWidth = -1.0;
+    qreal m_minHeight = -1.0;
+    qreal m_iconWidth = -1.0;
+    qreal m_iconHeight = -1.0;
+    DepthLayer m_depthLayer = DepthAmongItems;
     SizeLock m_sizeLock = LockNone;
     Display m_display = DisplaySmart;
     TextAlignment m_textAlignment = TextalignBelow;
diff --git a/src/libs/modelinglib/qmt/style/defaultstyleengine.cpp b/src/libs/modelinglib/qmt/style/defaultstyleengine.cpp
index 74e91837dc..bce1804892 100644
--- a/src/libs/modelinglib/qmt/style/defaultstyleengine.cpp
+++ b/src/libs/modelinglib/qmt/style/defaultstyleengine.cpp
@@ -5,6 +5,7 @@
 
 #include "defaultstyle.h"
 #include "objectvisuals.h"
+#include "relationvisuals.h"
 #include "styledobject.h"
 #include "styledrelation.h"
 
@@ -14,6 +15,7 @@
 #include "qmt/diagram/ditem.h"
 #include "qmt/diagram/dannotation.h"
 #include "qmt/infrastructure/qmtassert.h"
+#include "qmt/stereotype/customrelation.h"
 
 #include <utils/algorithm.h>
 
@@ -73,25 +75,29 @@ bool operator==(const ObjectStyleKey &lhs, const ObjectStyleKey &rhs)
 class RelationStyleKey
 {
 public:
-    RelationStyleKey(StyleEngine::ElementType elementType = StyleEngine::TypeOther,
-                     DObject::VisualPrimaryRole visualPrimaryRole = DObject::PrimaryRoleNormal)
+    RelationStyleKey(StyleEngine::ElementType elementType, const RelationVisuals &relationVisuals,
+                     bool withObject = false)
         : m_elementType(elementType),
-          m_visualPrimaryRole(visualPrimaryRole)
+          m_relationVisuals(relationVisuals),
+        m_withObject(withObject)
     {
     }
 
     StyleEngine::ElementType m_elementType = StyleEngine::TypeOther;
-    DObject::VisualPrimaryRole m_visualPrimaryRole = DObject::PrimaryRoleNormal;
+    RelationVisuals m_relationVisuals;
+    bool m_withObject = false;
 };
 
 size_t qHash(const RelationStyleKey &styleKey)
 {
-    return ::qHash(styleKey.m_elementType) ^ ::qHash(styleKey.m_visualPrimaryRole);
+    return ::qHash(styleKey.m_elementType) ^ qHash(styleKey.m_relationVisuals);
 }
 
 bool operator==(const RelationStyleKey &lhs, const RelationStyleKey &rhs)
 {
-    return lhs.m_elementType == rhs.m_elementType && lhs.m_visualPrimaryRole == rhs.m_visualPrimaryRole;
+    return lhs.m_elementType == rhs.m_elementType
+           && lhs.m_relationVisuals == rhs.m_relationVisuals
+           && lhs.m_withObject == rhs.m_withObject;
 }
 
 class AnnotationStyleKey
@@ -253,34 +259,6 @@ const Style *DefaultStyleEngine::applyObjectStyle(const Style *baseStyle, StyleE
     return derivedStyle;
 }
 
-static bool areStackingRoles(DObject::VisualPrimaryRole rhsPrimaryRole,
-                             DObject::VisualSecondaryRole rhsSecondaryRole,
-                             DObject::VisualPrimaryRole lhsPrimaryRole,
-                             DObject::VisualSecondaryRole lhsSecondaryRols)
-{
-    switch (rhsSecondaryRole) {
-    case DObject::SecondaryRoleNone:
-    case DObject::SecondaryRoleLighter:
-    case DObject::SecondaryRoleDarker:
-    case DObject::SecondaryRoleFlat:
-        switch (lhsSecondaryRols) {
-        case DObject::SecondaryRoleNone:
-        case DObject::SecondaryRoleLighter:
-        case DObject::SecondaryRoleDarker:
-        case DObject::SecondaryRoleFlat:
-            return lhsPrimaryRole == rhsPrimaryRole;
-        case DObject::SecondaryRoleSoften:
-        case DObject::SecondaryRoleOutline:
-            return false;
-        }
-        break;
-    case DObject::SecondaryRoleSoften:
-    case DObject::SecondaryRoleOutline:
-        return false;
-    }
-    return true;
-}
-
 const Style *DefaultStyleEngine::applyObjectStyle(const Style *baseStyle, const StyledObject &styledObject,
                                                   const Parameters *parameters)
 {
@@ -325,10 +303,12 @@ const Style *DefaultStyleEngine::applyObjectStyle(const Style *baseStyle, const
     }
     int depth = 0;
     if (!depths.isEmpty()) {
-        for (auto it = depths.cbegin(); it != depths.cend(); ++it) {
-            if (it->m_elementType == elementType
-                && areStackingRoles(it->m_visualPrimaryRole, it->m_visualSecondaryRole,
-                                    styledVisualPrimaryRole, styledVisualSecondaryRole)) {
+        const QList<int> keys = Utils::sorted(depths.keys());
+        for (int d : keys) {
+            DepthProperties properties = depths.value(d);
+            if (properties.m_elementType == elementType
+                    && areStackingRoles(properties.m_visualPrimaryRole, properties.m_visualSecondaryRole,
+                                        styledVisualPrimaryRole, styledVisualSecondaryRole)) {
                 ++depth;
             } else {
                 depth = 0;
@@ -345,13 +325,100 @@ const Style *DefaultStyleEngine::applyObjectStyle(const Style *baseStyle, const
                             parameters);
 }
 
+const Style *DefaultStyleEngine::applyRelationStyle(const Style *baseStyle, ElementType elementType, const RelationVisuals &relationVisuals, const Parameters *parameters)
+{
+    Q_UNUSED(parameters);
+
+    RelationStyleKey key(elementType, relationVisuals);
+    const Style *derivedStyle = m_relationStyleMap.value(key);
+    if (!derivedStyle) {
+        auto style = new Style(baseStyle->type());
+        static QColor customColors[] = {
+            QColor(0xEE, 0x8E, 0x99).darker(110),  // ROLE_CUSTOM1,
+            QColor(0x80, 0xAF, 0x47).lighter(130), // ROLE_CUSTOM2,
+            QColor(0xFF, 0xA1, 0x5B).lighter(100), // ROLE_CUSTOM3,
+            QColor(0x55, 0xC4, 0xCF).lighter(120), // ROLE_CUSTOM4,
+            QColor(0xFF, 0xE1, 0x4B)               // ROLE_CUSTOM5,
+        };
+
+        int index = static_cast<int>(relationVisuals.visualPrimaryRole()) - static_cast<int>(DRelation::PrimaryRoleCustom1);
+        QColor lineColor = index >= 0 && index <= 4 ? customColors[index] : Qt::black;
+        switch (relationVisuals.visualSecondaryRole()) {
+        case DRelation::SecondaryRoleNone:
+            break;
+        case DRelation::SecondaryRoleWarning:
+            lineColor = Qt::yellow;
+            break;
+        case DRelation::SecondaryRoleError:
+            lineColor = Qt::red;
+            break;
+        case DRelation::SecondaryRoleSoften:
+            lineColor = Qt::gray;
+            break;
+        }
+
+        QColor fillColor = lineColor == Qt::black ? Qt::darkGray : lineColor.lighter(150);
+        QPen linePen = baseStyle->linePen();
+        linePen.setWidth(1);
+        linePen.setColor(lineColor);
+        style->setLinePen(linePen);
+        QBrush textBrush = baseStyle->textBrush();
+        textBrush.setColor(Qt::black);
+        style->setTextBrush(textBrush);
+        QBrush brush = baseStyle->fillBrush();
+        brush.setColor(fillColor);
+        brush.setStyle(Qt::SolidPattern);
+        style->setFillBrush(brush);
+        style->setNormalFont(baseStyle->normalFont());
+        style->setSmallFont(baseStyle->smallFont());
+        style->setHeaderFont(baseStyle->headerFont());
+        m_relationStyleMap.insert(key, style);
+        derivedStyle = style;
+    }
+    return derivedStyle;
+}
+
 const Style *DefaultStyleEngine::applyRelationStyle(const Style *baseStyle, const StyledRelation &styledRelation,
                                                     const Parameters *parameters)
 {
     Q_UNUSED(parameters)
 
     ElementType elementType = objectType(styledRelation.endA());
-    RelationStyleKey key(elementType, styledRelation.endA() ? styledRelation.endA()->visualPrimaryRole() : DObject::PrimaryRoleNormal);
+    RelationVisuals relationVisuals;
+    if (styledRelation.customRelation()) {
+        switch (styledRelation.customRelation()->colorType()) {
+        case CustomRelation::ColorType::EndA:
+            // TODO implement
+            break;
+        case CustomRelation::ColorType::EndB:
+            // TODO implement
+            break;
+        case CustomRelation::ColorType::Custom:
+            // TODO implement
+            break;
+        case CustomRelation::ColorType::Warning:
+            relationVisuals.setVisualSecondaryRole(DRelation::VisualSecondaryRole::SecondaryRoleWarning);
+            break;
+        case CustomRelation::ColorType::Error:
+            relationVisuals.setVisualSecondaryRole(DRelation::VisualSecondaryRole::SecondaryRoleError);
+            break;
+        case CustomRelation::ColorType::Soften:
+            relationVisuals.setVisualSecondaryRole(DRelation::VisualSecondaryRole::SecondaryRoleSoften);
+            break;
+        }
+        relationVisuals.setEmphasized(styledRelation.customRelation()->emphasized());
+    }
+    if (styledRelation.endA())
+        relationVisuals.setVisualObjectPrimaryRole(styledRelation.endA()->visualPrimaryRole());
+    if (styledRelation.relation()) {
+        if (styledRelation.relation()->visualPrimaryRole() != DRelation::VisualPrimaryRole::PrimaryRoleNormal)
+            relationVisuals.setVisualPrimaryRole(styledRelation.relation()->visualPrimaryRole());
+        if (styledRelation.relation()->visualSecondaryRole() != DRelation::VisualSecondaryRole::SecondaryRoleNone)
+            relationVisuals.setVisualSecondaryRole(styledRelation.relation()->visualSecondaryRole());
+        if (styledRelation.relation()->isVisualEmphasized())
+            relationVisuals.setEmphasized(styledRelation.relation()->isVisualEmphasized());
+    }
+    RelationStyleKey key(elementType, relationVisuals, true);
     const Style *derivedStyle = m_relationStyleMap.value(key);
     if (!derivedStyle) {
         auto style = new Style(baseStyle->type());
@@ -365,12 +432,36 @@ const Style *DefaultStyleEngine::applyRelationStyle(const Style *baseStyle, cons
         QColor lineColor = DefaultStyleEngine::lineColor(objectType(object), objectVisuals);
         QColor fillColor = lineColor;
 
+        static QColor customColors[] = {
+            QColor(0xEE, 0x8E, 0x99).darker(110),  // ROLE_CUSTOM1,
+            QColor(0x80, 0xAF, 0x47).lighter(130), // ROLE_CUSTOM2,
+            QColor(0xFF, 0xA1, 0x5B).lighter(100), // ROLE_CUSTOM3,
+            QColor(0x55, 0xC4, 0xCF).lighter(120), // ROLE_CUSTOM4,
+            QColor(0xFF, 0xE1, 0x4B)               // ROLE_CUSTOM5,
+        };
+
+        int index = static_cast<int>(relationVisuals.visualPrimaryRole()) - static_cast<int>(DRelation::PrimaryRoleCustom1);
+        lineColor = (index >= 0 && index <= 4) ? customColors[index] : lineColor;
+        switch (relationVisuals.visualSecondaryRole()) {
+        case DRelation::SecondaryRoleNone:
+            break;
+        case DRelation::SecondaryRoleWarning:
+            lineColor = QColor(0xffc800);
+            break;
+        case DRelation::SecondaryRoleError:
+            lineColor = Qt::red;
+            break;
+        case DRelation::SecondaryRoleSoften:
+            lineColor = Qt::gray;
+            break;
+        }
+
         QPen linePen = baseStyle->linePen();
-        linePen.setWidth(1);
+        linePen.setWidth(relationVisuals.isEmphasized() ? 3 : 1);
         linePen.setColor(lineColor);
         style->setLinePen(linePen);
         QBrush textBrush = baseStyle->textBrush();
-        textBrush.setColor(QColor("black"));
+        textBrush.setColor(Qt::black);
         style->setTextBrush(textBrush);
         QBrush brush = baseStyle->fillBrush();
         brush.setColor(fillColor);
@@ -497,6 +588,34 @@ DefaultStyleEngine::ElementType DefaultStyleEngine::objectType(const DObject *ob
     return elementType;
 }
 
+bool DefaultStyleEngine::areStackingRoles(DObject::VisualPrimaryRole rhsPrimaryRole,
+                                          DObject::VisualSecondaryRole rhsSecondaryRole,
+                                          DObject::VisualPrimaryRole lhsPrimaryRole,
+                                          DObject::VisualSecondaryRole lhsSecondaryRols)
+{
+    switch (rhsSecondaryRole) {
+    case DObject::SecondaryRoleNone:
+    case DObject::SecondaryRoleLighter:
+    case DObject::SecondaryRoleDarker:
+    case DObject::SecondaryRoleFlat:
+        switch (lhsSecondaryRols) {
+        case DObject::SecondaryRoleNone:
+        case DObject::SecondaryRoleLighter:
+        case DObject::SecondaryRoleDarker:
+        case DObject::SecondaryRoleFlat:
+            return lhsPrimaryRole == rhsPrimaryRole;
+        case DObject::SecondaryRoleSoften:
+        case DObject::SecondaryRoleOutline:
+            return false;
+        }
+        break;
+    case DObject::SecondaryRoleSoften:
+    case DObject::SecondaryRoleOutline:
+        return false;
+    }
+    return true;
+}
+
 QColor DefaultStyleEngine::baseColor(ElementType elementType, ObjectVisuals objectVisuals)
 {
     if (objectVisuals.visualSecondaryRole() == DObject::SecondaryRoleOutline)
diff --git a/src/libs/modelinglib/qmt/style/defaultstyleengine.h b/src/libs/modelinglib/qmt/style/defaultstyleengine.h
index 67cdf9ed85..b5ebe557e0 100644
--- a/src/libs/modelinglib/qmt/style/defaultstyleengine.h
+++ b/src/libs/modelinglib/qmt/style/defaultstyleengine.h
@@ -37,6 +37,9 @@ public:
                                   const Parameters *parameters) override;
     const Style *applyObjectStyle(const Style *baseStyle, const StyledObject &styledObject,
                                   const Parameters *parameters) override;
+    const Style *applyRelationStyle(const Style *baseStyle, ElementType elementType,
+                                    const RelationVisuals &relationVisuals,
+                                    const Parameters *parameters) override;
     const Style *applyRelationStyle(const Style *baseStyle, const StyledRelation &styledRelation,
                                     const Parameters *parameters) override;
     const Style *applyAnnotationStyle(const Style *baseStyle, const DAnnotation *annotation,
@@ -54,6 +57,11 @@ private:
 
     ElementType objectType(const DObject *object);
 
+    bool areStackingRoles(DObject::VisualPrimaryRole rhsPrimaryRole,
+                          DObject::VisualSecondaryRole rhsSecondaryRole,
+                          DObject::VisualPrimaryRole lhsPrimaryRole,
+                          DObject::VisualSecondaryRole lhsSecondaryRols);
+
     QColor baseColor(ElementType elementType, ObjectVisuals objectVisuals);
     QColor lineColor(ElementType elementType, const ObjectVisuals &objectVisuals);
     QColor fillColor(ElementType elementType, const ObjectVisuals &objectVisuals);
diff --git a/src/libs/modelinglib/qmt/style/relationvisuals.cpp b/src/libs/modelinglib/qmt/style/relationvisuals.cpp
new file mode 100644
index 0000000000..d297047ae1
--- /dev/null
+++ b/src/libs/modelinglib/qmt/style/relationvisuals.cpp
@@ -0,0 +1,58 @@
+// Copyright (C) 2024 Jochen Becher
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "relationvisuals.h"
+
+namespace qmt {
+
+RelationVisuals::RelationVisuals() {}
+
+RelationVisuals::RelationVisuals(DObject::VisualPrimaryRole visualObjectPrimaryRole,
+                                 DRelation::VisualPrimaryRole visualPrimaryRole,
+                                 DRelation::VisualSecondaryRole visualSecondaryRole,
+                                 bool emphasized)
+    : m_visualObjectPrimaryRole(visualObjectPrimaryRole)
+    , m_visualPrimaryRole(visualPrimaryRole)
+    , m_visualSecondaryRole(visualSecondaryRole)
+    , m_isEmphasized(emphasized)
+{}
+
+RelationVisuals::~RelationVisuals() {}
+
+void RelationVisuals::setVisualPrimaryRole(DRelation::VisualPrimaryRole VisualPrimaryRole)
+{
+    m_visualPrimaryRole = VisualPrimaryRole;
+}
+
+void RelationVisuals::setVisualObjectPrimaryRole(DObject::VisualPrimaryRole visualPrimaryRole)
+{
+    m_visualObjectPrimaryRole = visualPrimaryRole;
+}
+
+void RelationVisuals::setVisualSecondaryRole(DRelation::VisualSecondaryRole visualSecondaryRole)
+{
+    m_visualSecondaryRole = visualSecondaryRole;
+}
+
+void RelationVisuals::setEmphasized(bool emphasized)
+{
+    m_isEmphasized = emphasized;
+}
+
+bool operator==(const RelationVisuals &lhs, const RelationVisuals &rhs)
+{
+    return lhs.visualObjectPrimaryRole() == rhs.visualObjectPrimaryRole()
+           && lhs.visualPrimaryRole() == rhs.visualPrimaryRole()
+           && lhs.visualSecondaryRole() == rhs.visualSecondaryRole()
+           && lhs.isEmphasized() == rhs.isEmphasized();
+}
+
+size_t qHash(const RelationVisuals &relationVisuals)
+{
+    return ::qHash(static_cast<int>(relationVisuals.visualObjectPrimaryRole()))
+           ^ ::qHash(static_cast<int>(relationVisuals.visualPrimaryRole()))
+           ^ ::qHash(static_cast<int>(relationVisuals.visualSecondaryRole()))
+           ^ ::qHash(relationVisuals.isEmphasized());
+}
+
+} // namespace qmt
diff --git a/src/libs/modelinglib/qmt/style/relationvisuals.h b/src/libs/modelinglib/qmt/style/relationvisuals.h
new file mode 100644
index 0000000000..be87a7d291
--- /dev/null
+++ b/src/libs/modelinglib/qmt/style/relationvisuals.h
@@ -0,0 +1,42 @@
+// Copyright (C) 2024 Jochen Becher
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include "qmt/diagram/drelation.h"
+#include "qmt/diagram/dobject.h"
+
+#include <QColor>
+
+namespace qmt {
+
+class QMT_EXPORT RelationVisuals
+{
+public:
+    RelationVisuals();
+    RelationVisuals(DObject::VisualPrimaryRole visualObjectPrimaryRole,
+                    DRelation::VisualPrimaryRole visualPrimaryRole,
+                    DRelation::VisualSecondaryRole visualSecondaryRole,
+                    bool emphasized);
+    ~RelationVisuals();
+
+    DObject::VisualPrimaryRole visualObjectPrimaryRole() const { return m_visualObjectPrimaryRole; }
+    void setVisualObjectPrimaryRole(DObject::VisualPrimaryRole visualPrimaryRole);
+    DRelation::VisualPrimaryRole visualPrimaryRole() const { return m_visualPrimaryRole; }
+    void setVisualPrimaryRole(DRelation::VisualPrimaryRole visualPrimaryRole);
+    DRelation::VisualSecondaryRole visualSecondaryRole() const { return m_visualSecondaryRole; }
+    void setVisualSecondaryRole(DRelation::VisualSecondaryRole visualSecondaryRole);
+    bool isEmphasized() const { return m_isEmphasized; }
+    void setEmphasized(bool emphasized);
+
+private:
+    DObject::VisualPrimaryRole m_visualObjectPrimaryRole = DObject::PrimaryRoleNormal;
+    DRelation::VisualPrimaryRole m_visualPrimaryRole = DRelation::PrimaryRoleNormal;
+    DRelation::VisualSecondaryRole m_visualSecondaryRole = DRelation::SecondaryRoleNone;
+    bool m_isEmphasized = false;
+};
+
+bool operator==(const RelationVisuals &lhs, const RelationVisuals &rhs);
+size_t qHash(const RelationVisuals &relationVisuals);
+
+} // namespace qmt
diff --git a/src/libs/modelinglib/qmt/style/stylecontroller.cpp b/src/libs/modelinglib/qmt/style/stylecontroller.cpp
index 5cd50c1738..bbfc28622e 100644
--- a/src/libs/modelinglib/qmt/style/stylecontroller.cpp
+++ b/src/libs/modelinglib/qmt/style/stylecontroller.cpp
@@ -63,6 +63,12 @@ const Style *StyleController::adaptObjectStyle(const StyledObject &object)
     return m_defaultStyleEngine->applyObjectStyle(m_defaultStyle.data(), object, &parameters);
 }
 
+const Style *StyleController::adaptRelationStyle(StyleEngine::ElementType elementType, const RelationVisuals &relationVisuals)
+{
+    Parameters parameters(this);
+    return m_defaultStyleEngine->applyRelationStyle(m_defaultStyle.data(), elementType, relationVisuals, &parameters);
+}
+
 const Style *StyleController::adaptRelationStyle(const StyledRelation &relation)
 {
     Parameters parameters(this);
diff --git a/src/libs/modelinglib/qmt/style/stylecontroller.h b/src/libs/modelinglib/qmt/style/stylecontroller.h
index 2627bb2caa..afa566460f 100644
--- a/src/libs/modelinglib/qmt/style/stylecontroller.h
+++ b/src/libs/modelinglib/qmt/style/stylecontroller.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #include "styleengine.h"
-#include "qmt/diagram/dobject.h"
 
 #include <QObject>
 #include <QScopedPointer>
@@ -14,6 +13,7 @@ namespace qmt {
 class Style;
 class ObjectVisuals;
 class StyledObject;
+class RelationVisuals;
 class StyledRelation;
 class DAnnotation;
 class DBoundary;
@@ -33,6 +33,8 @@ public:
     const Style *adaptObjectStyle(StyleEngine::ElementType elementType,
                                   const ObjectVisuals &objectVisuals);
     const Style *adaptObjectStyle(const StyledObject &object);
+    const Style *adaptRelationStyle(StyleEngine::ElementType elementType,
+                                    const RelationVisuals &relationVisuals);
     const Style *adaptRelationStyle(const StyledRelation &relation);
     const Style *adaptAnnotationStyle(const DAnnotation *annotation);
     const Style *adaptBoundaryStyle(const DBoundary *boundary);
diff --git a/src/libs/modelinglib/qmt/style/styledrelation.cpp b/src/libs/modelinglib/qmt/style/styledrelation.cpp
index 3c78abf96d..144e5f22ac 100644
--- a/src/libs/modelinglib/qmt/style/styledrelation.cpp
+++ b/src/libs/modelinglib/qmt/style/styledrelation.cpp
@@ -5,10 +5,12 @@
 
 namespace qmt {
 
-StyledRelation::StyledRelation(const DRelation *relation, const DObject *endA, const DObject *endB)
+StyledRelation::StyledRelation(const DRelation *relation, const DObject *endA, const DObject *endB,
+                               const CustomRelation *customRelation)
     : m_relation(relation),
       m_endA(endA),
-      m_endB(endB)
+      m_endB(endB),
+      m_customRelation(customRelation)
 {
 }
 
diff --git a/src/libs/modelinglib/qmt/style/styledrelation.h b/src/libs/modelinglib/qmt/style/styledrelation.h
index 422947908e..27e8735463 100644
--- a/src/libs/modelinglib/qmt/style/styledrelation.h
+++ b/src/libs/modelinglib/qmt/style/styledrelation.h
@@ -9,21 +9,25 @@ namespace qmt {
 
 class DRelation;
 class DObject;
+class CustomRelation;
 
 class QMT_EXPORT StyledRelation
 {
 public:
-    StyledRelation(const DRelation *relation, const DObject *endA, const DObject *endB);
+    StyledRelation(const DRelation *relation, const DObject *endA, const DObject *endB,
+                   const CustomRelation *customRelation);
     ~StyledRelation();
 
     const DRelation *relation() const { return m_relation; }
     const DObject *endA() const { return m_endA; }
     const DObject *endB() const { return m_endB; }
+    const CustomRelation *customRelation() const { return m_customRelation; }
 
 private:
     const DRelation *m_relation = nullptr;
     const DObject *m_endA = nullptr;
     const DObject *m_endB = nullptr;
+    const CustomRelation *m_customRelation = nullptr;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/style/styleengine.h b/src/libs/modelinglib/qmt/style/styleengine.h
index e78f4303d9..463a62a194 100644
--- a/src/libs/modelinglib/qmt/style/styleengine.h
+++ b/src/libs/modelinglib/qmt/style/styleengine.h
@@ -14,6 +14,7 @@ namespace qmt {
 class Style;
 class ObjectVisuals;
 class StyledObject;
+class RelationVisuals;
 class StyledRelation;
 
 class DAnnotation;
@@ -51,6 +52,9 @@ public:
                                           const Parameters *parameters) = 0;
     virtual const Style *applyObjectStyle(const Style *baseStyle, const StyledObject &,
                                           const Parameters *) = 0;
+    virtual const Style *applyRelationStyle(const Style *baseStyle, ElementType elementType,
+                                            const RelationVisuals &relationVisuals,
+                                            const Parameters *) = 0;
     virtual const Style *applyRelationStyle(const Style *baseStyle, const StyledRelation &,
                                             const Parameters *) = 0;
     virtual const Style *applyAnnotationStyle(const Style *baseStyle, const DAnnotation *,
diff --git a/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.cpp b/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.cpp
index 00aacf9c82..51f414f66e 100644
--- a/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.cpp
+++ b/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.cpp
@@ -421,7 +421,44 @@ void DiagramSceneController::dropNewModelElement(MObject *modelObject, MPackage
         emit newElementCreated(element, diagram);
 }
 
-void DiagramSceneController::addRelatedElements(const DSelection &selection, MDiagram *diagram)
+int DiagramSceneController::countRelatedElements(const DSelection &selection, MDiagram *diagram, std::function<bool (qmt::DObject *, qmt::MObject *, qmt::MRelation *)> filter)
+{
+    int counter = 0;
+    const QList<DSelection::Index> indices = selection.indices();
+    for (const DSelection::Index &index : indices) {
+        DElement *delement = m_diagramController->findElement(index.elementKey(), diagram);
+        QMT_ASSERT(delement, return 0);
+        DObject *dobject = dynamic_cast<DObject *>(delement);
+        if (dobject && dobject->modelUid().isValid()) {
+            MObject *mobject = m_modelController->findElement<MObject>(delement->modelUid());
+            if (mobject) {
+                const QList<MRelation *> relations = m_modelController->findRelationsOfObject(mobject);
+                QList<MRelation *> filteredRelations;
+                const QList<MRelation *> *relationsList = nullptr;
+                if (filter) {
+                    for (MRelation *relation : relations) {
+                        if (filter(dobject, mobject, relation))
+                            filteredRelations.append(relation);
+                    }
+                    relationsList = &filteredRelations;
+                } else {
+                    relationsList = &relations;
+                }
+                for (MRelation *relation : *relationsList) {
+                    if (relation->endAUid() != mobject->uid())
+                        ++counter;
+                    else if (relation->endBUid() != mobject->uid())
+                        ++counter;
+                }
+            }
+        }
+    }
+    return counter;
+}
+
+void DiagramSceneController::addRelatedElements(
+    const DSelection &selection, MDiagram *diagram,
+    std::function<bool (qmt::DObject *dobject, qmt::MObject *mobject, qmt::MRelation *relation)> filter)
 {
     m_diagramController->undoController()->beginMergeSequence(Tr::tr("Add Related Element"));
     const QList<DSelection::Index> indices = selection.indices();
@@ -435,8 +472,19 @@ void DiagramSceneController::addRelatedElements(const DSelection &selection, MDi
                 qreal dAngle = 360.0 / 11.5;
                 qreal dRadius = 100.0;
                 const QList<MRelation *> relations = m_modelController->findRelationsOfObject(mobject);
+                QList<MRelation *> filteredRelations;
+                const QList<MRelation *> *relationsList = nullptr;
+                if (filter) {
+                    for (MRelation *relation : relations) {
+                        if (filter(dobject, mobject, relation))
+                            filteredRelations.append(relation);
+                    }
+                    relationsList = &filteredRelations;
+                } else {
+                    relationsList = &relations;
+                }
                 int count = 0;
-                for (MRelation *relation : relations) {
+                for (MRelation *relation : *relationsList) {
                     if (relation->endAUid() != mobject->uid() || relation->endBUid() != mobject->uid())
                         ++count;
                 }
@@ -446,7 +494,7 @@ void DiagramSceneController::addRelatedElements(const DSelection &selection, MDi
                 }
                 qreal radius = 200.0;
                 qreal angle = 0.0;
-                for (MRelation *relation : relations) {
+                for (MRelation *relation : *relationsList) {
                     QPointF pos(dobject->pos());
                     pos += QPointF(radius * sin(angle / 180 * M_PI), -radius * cos(angle / 180 * M_PI));
                     bool added = false;
diff --git a/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.h b/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.h
index a062fa10c4..14e704a192 100644
--- a/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.h
+++ b/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.h
@@ -86,7 +86,12 @@ public:
                         DElement *topMostElementAtPos, const QPointF &pos, MDiagram *diagram, const QPoint &viewPos, const QSize &viewSize);
     void dropNewModelElement(MObject *modelObject, MPackage *parentPackage, const QPointF &pos,
                              MDiagram *diagram);
-    void addRelatedElements(const DSelection &selection, MDiagram *diagram);
+    int countRelatedElements(
+        const DSelection &selection, MDiagram *diagram,
+        std::function<bool (qmt::DObject *dobject, qmt::MObject *mobject, qmt::MRelation *relation)> filter);
+    void addRelatedElements(
+        const DSelection &selection, MDiagram *diagram,
+        std::function<bool (qmt::DObject *dobject, qmt::MObject *mobject, qmt::MRelation *relation)> filter);
 
     MPackage *findSuitableParentPackage(DElement *topmostDiagramElement, MDiagram *diagram);
     MDiagram *findDiagramBySearchId(MPackage *package, const QString &diagramName);
diff --git a/src/libs/modelinglib/qmt/tasks/ielementtasks.h b/src/libs/modelinglib/qmt/tasks/ielementtasks.h
index a40277d874..8c22632762 100644
--- a/src/libs/modelinglib/qmt/tasks/ielementtasks.h
+++ b/src/libs/modelinglib/qmt/tasks/ielementtasks.h
@@ -59,8 +59,13 @@ public:
     virtual void createAndOpenDiagram(const MElement *) = 0;
     virtual void createAndOpenDiagram(const DElement *, const MDiagram *) = 0;
 
+    virtual bool hasLinkedFile(const MElement *) const = 0;
+    virtual bool hasLinkedFile(const DElement *, const MDiagram *) const = 0;
+    virtual void openLinkedFile(const MElement *) = 0;
+    virtual void openLinkedFile(const DElement *, const MDiagram *) = 0;
+
     virtual bool extendContextMenu(const DElement *, const MDiagram *, QMenu *) = 0;
-    virtual bool handleContextMenuAction(const DElement *, const MDiagram *, const QString &) = 0;
+    virtual bool handleContextMenuAction(DElement *, MDiagram *, const QString &) = 0;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/tasks/voidelementtasks.cpp b/src/libs/modelinglib/qmt/tasks/voidelementtasks.cpp
index 2bd7fbe049..fdc2e24bd4 100644
--- a/src/libs/modelinglib/qmt/tasks/voidelementtasks.cpp
+++ b/src/libs/modelinglib/qmt/tasks/voidelementtasks.cpp
@@ -147,12 +147,30 @@ void VoidElementTasks::createAndOpenDiagram(const DElement *, const MDiagram *)
 {
 }
 
+bool VoidElementTasks::hasLinkedFile(const MElement *) const
+{
+    return false;
+}
+
+bool VoidElementTasks::hasLinkedFile(const DElement *, const MDiagram *) const
+{
+    return false;
+}
+
+void VoidElementTasks::openLinkedFile(const MElement *)
+{
+}
+
+void VoidElementTasks::openLinkedFile(const DElement *, const MDiagram *)
+{
+}
+
 bool VoidElementTasks::extendContextMenu(const DElement *, const MDiagram *, QMenu *)
 {
     return false;
 }
 
-bool VoidElementTasks::handleContextMenuAction(const DElement *, const MDiagram *, const QString &)
+bool VoidElementTasks::handleContextMenuAction(DElement *, MDiagram *, const QString &)
 {
     return false;
 }
diff --git a/src/libs/modelinglib/qmt/tasks/voidelementtasks.h b/src/libs/modelinglib/qmt/tasks/voidelementtasks.h
index 3e3d483d9a..9e8753b71e 100644
--- a/src/libs/modelinglib/qmt/tasks/voidelementtasks.h
+++ b/src/libs/modelinglib/qmt/tasks/voidelementtasks.h
@@ -51,8 +51,13 @@ public:
     void createAndOpenDiagram(const MElement *) override;
     void createAndOpenDiagram(const DElement *, const MDiagram *) override;
 
+    bool hasLinkedFile(const qmt::MElement *) const override;
+    bool hasLinkedFile(const qmt::DElement *, const qmt::MDiagram *) const override;
+    void openLinkedFile(const qmt::MElement *) override;
+    void openLinkedFile(const qmt::DElement *, const qmt::MDiagram *) override;
+
     bool extendContextMenu(const DElement *, const MDiagram *, QMenu *) override;
-    bool handleContextMenuAction(const DElement *, const MDiagram *, const QString &) override;
+    bool handleContextMenuAction(DElement *, MDiagram *, const QString &) override;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qtserialization/inc/qark/serialize_container.h b/src/libs/modelinglib/qtserialization/inc/qark/serialize_container.h
index c95f2c3f96..109b77d991 100644
--- a/src/libs/modelinglib/qtserialization/inc/qark/serialize_container.h
+++ b/src/libs/modelinglib/qtserialization/inc/qark/serialize_container.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include "parameters.h"
+#include "tag.h"
 
 #include <QList>
 #include <QHash>
diff --git a/src/libs/nanotrace/CMakeLists.txt b/src/libs/nanotrace/CMakeLists.txt
index 011c26f049..50693644ea 100644
--- a/src/libs/nanotrace/CMakeLists.txt
+++ b/src/libs/nanotrace/CMakeLists.txt
@@ -4,6 +4,7 @@ add_qtc_library(Nanotrace
     nanotraceglobals.h
     nanotrace.cpp nanotrace.h
     nanotracehr.cpp nanotracehr.h
+    staticstring.h
   PUBLIC_DEPENDS Qt::Core Qt::Gui
   PROPERTIES
     CXX_VISIBILITY_PRESET default
diff --git a/src/libs/nanotrace/nanotracehr.cpp b/src/libs/nanotrace/nanotracehr.cpp
index 07d2ff95ac..0006227434 100644
--- a/src/libs/nanotrace/nanotracehr.cpp
+++ b/src/libs/nanotrace/nanotracehr.cpp
@@ -45,6 +45,18 @@ unsigned int getUnsignedIntegerHash(std::thread::id id)
     return static_cast<unsigned int>(std::hash<std::thread::id>{}(id) & 0xFFFFFFFF);
 }
 
+template<std::size_t capacity>
+constexpr bool isArgumentValid(const StaticString<capacity> &string)
+{
+    return string.isValid() && string.size();
+}
+
+template<typename String>
+constexpr bool isArgumentValid(const String &string)
+{
+    return string.size();
+}
+
 template<typename TraceEvent>
 void printEvent(std::ostream &out, const TraceEvent &event, qint64 processId, std::thread::id threadId)
 {
@@ -67,23 +79,24 @@ void printEvent(std::ostream &out, const TraceEvent &event, qint64 processId, st
             out << R"(,"flow_in":true)";
     }
 
-    if (event.arguments.size())
+    if (isArgumentValid(event.arguments)) {
         out << R"(,"args":)" << event.arguments;
+    }
 
     out << "}";
 }
 
-void writeMetaEvent(TraceFile<Tracing::IsEnabled> *file, std::string_view key, std::string_view value)
+void writeMetaEvent(TraceFile<Tracing::IsEnabled> &file, std::string_view key, std::string_view value)
 {
-    std::lock_guard lock{file->fileMutex};
-    auto &out = file->out;
+    std::lock_guard lock{file.fileMutex};
+    auto &out = file.out;
 
     if (out.is_open()) {
-        file->out << R"({"name":")" << key << R"(","ph":"M", "pid":)"
-                  << getUnsignedIntegerHash(QCoreApplication::applicationPid()) << R"(,"tid":)"
-                  << getUnsignedIntegerHash(std::this_thread::get_id()) << R"(,"args":{"name":")"
-                  << value << R"("}})"
-                  << ",\n";
+        file.out << R"({"name":")" << key << R"(","ph":"M", "pid":)"
+                 << getUnsignedIntegerHash(QCoreApplication::applicationPid()) << R"(,"tid":)"
+                 << getUnsignedIntegerHash(std::this_thread::get_id()) << R"(,"args":{"name":")"
+                 << value << R"("}})"
+                 << ",\n";
     }
 }
 
@@ -103,7 +116,6 @@ std::string getThreadName()
 
 } // namespace
 
-namespace Internal {
 template<typename String>
 void convertToString(String &string, const QImage &image)
 {
@@ -132,14 +144,11 @@ void convertToString(String &string, const QImage &image)
                                                      return "alpha premultiplied"sv;
                                              }))));
 
-    Internal::convertToString(string, dict);
+    convertToString(string, dict);
 }
 
-template NANOTRACE_EXPORT void convertToString(std::string &string, const QImage &image);
 template NANOTRACE_EXPORT void convertToString(ArgumentsString &string, const QImage &image);
 
-} // namespace Internal
-
 template<typename TraceEvent>
 void flushEvents(const Utils::span<TraceEvent> events,
                  std::thread::id threadId,
@@ -148,8 +157,8 @@ void flushEvents(const Utils::span<TraceEvent> events,
     if (events.empty())
         return;
 
-    std::lock_guard lock{eventQueue.file->fileMutex};
-    auto &out = eventQueue.file->out;
+    std::lock_guard lock{eventQueue.file.fileMutex};
+    auto &out = eventQueue.file.out;
 
     if (out.is_open()) {
         auto processId = QCoreApplication::applicationPid();
@@ -200,17 +209,17 @@ void finalizeFile(EnabledTraceFile &file)
 template<typename TraceEvent>
 void flushInThread(EnabledEventQueue<TraceEvent> &eventQueue)
 {
-    if (eventQueue.file->processing.valid())
-        eventQueue.file->processing.wait();
+    if (eventQueue.file.processing.valid())
+        eventQueue.file.processing.wait();
 
     auto flush = [&](const Utils::span<TraceEvent> &events, std::thread::id threadId) {
         flushEvents(events, threadId, eventQueue);
     };
 
-    eventQueue.file->processing = std::async(std::launch::async,
-                                             flush,
-                                             eventQueue.currentEvents.subspan(0, eventQueue.eventsIndex),
-                                             eventQueue.threadId);
+    eventQueue.file.processing = std::async(std::launch::async,
+                                            flush,
+                                            eventQueue.currentEvents.subspan(0, eventQueue.eventsIndex),
+                                            eventQueue.threadId);
     eventQueue.currentEvents = eventQueue.currentEvents.data() == eventQueue.eventsOne.data()
                                    ? eventQueue.eventsTwo
                                    : eventQueue.eventsOne;
@@ -223,10 +232,11 @@ template NANOTRACE_EXPORT void flushInThread(
     EnabledEventQueue<StringViewWithStringArgumentsTraceEvent> &eventQueue);
 
 template<typename TraceEvent>
-EventQueue<TraceEvent, Tracing::IsEnabled>::EventQueue(EnabledTraceFile *file)
+EventQueue<TraceEvent, Tracing::IsEnabled>::EventQueue(EnabledTraceFile &file)
     : file{file}
     , threadId{std::this_thread::get_id()}
 {
+    setEventsSpans(*eventArrayOne.get(), *eventArrayTwo.get());
     Internal::EventQueueTracker<TraceEvent>::get().addQueue(this);
     if (auto thread = QThread::currentThread()) {
         auto name = getThreadName();
diff --git a/src/libs/nanotrace/nanotracehr.h b/src/libs/nanotrace/nanotracehr.h
index 7856ea3582..810e4e3c5d 100644
--- a/src/libs/nanotrace/nanotracehr.h
+++ b/src/libs/nanotrace/nanotracehr.h
@@ -5,16 +5,22 @@
 
 #include "nanotraceglobals.h"
 
+#include "staticstring.h"
+
 #include <utils/smallstring.h>
 #include <utils/span.h>
 
 #include <QByteArrayView>
+#include <QList>
+#include <QMap>
 #include <QStringView>
+#include <QVarLengthArray>
 #include <QVariant>
 
 #include <array>
 #include <atomic>
 #include <chrono>
+#include <exception>
 #include <fstream>
 #include <future>
 #include <mutex>
@@ -41,7 +47,7 @@ enum class Tracing { IsDisabled, IsEnabled };
 #  define NO_UNIQUE_ADDRESS
 #endif
 
-using ArgumentsString = Utils::BasicSmallString<510>;
+using ArgumentsString = StaticString<3700>;
 
 namespace Literals {
 struct TracerLiteral
@@ -80,44 +86,41 @@ struct IsDictonary
 
 inline constexpr IsDictonary isDictonary;
 
-namespace Internal {
-
 template<typename String>
 void convertToString(String &string, std::string_view text)
 {
-    string.append(R"(")");
+    string.append('\"');
     string.append(text);
-    string.append(R"(")");
+    string.append('\"');
 }
 
 template<typename String>
 void convertToString(String &string, const QImage &image);
 
-extern template NANOTRACE_EXPORT void convertToString(std::string &string, const QImage &image);
 extern template NANOTRACE_EXPORT void convertToString(ArgumentsString &string, const QImage &image);
 
 template<typename String, std::size_t size>
 void convertToString(String &string, const char (&text)[size])
 {
-    string.append(R"(")");
-    string.append(text);
-    string.append(R"(")");
+    string.append('\"');
+    string.append(std::string_view{text, size - 1});
+    string.append('\"');
 }
 
 template<typename String>
 void convertToString(String &string, QStringView text)
 {
-    string.append(R"(")");
+    string.append('\"');
     string.append(Utils::PathString{text});
-    string.append(R"(")");
+    string.append('\"');
 }
 
 template<typename String>
 void convertToString(String &string, const QByteArray &text)
 {
-    string.append(R"(")");
+    string.append('\"');
     string.append(std::string_view(text.data(), Utils::usize(text)));
-    string.append(R"(")");
+    string.append('\"');
 }
 
 template<typename String>
@@ -129,28 +132,29 @@ void convertToString(String &string, bool isTrue)
         string.append("false");
 }
 
-template<typename String, typename Callable, typename = std::enable_if_t<std::is_invocable_v<Callable>>>
+template<typename String, typename Callable, typename std::enable_if_t<std::is_invocable_v<Callable>, bool> = true>
 void convertToString(String &string, Callable &&callable)
 {
     convertToString(string, callable());
 }
 
-template<typename String>
-void convertToString(String &string, int number)
+template<typename String, typename Number, typename std::enable_if_t<std::is_arithmetic_v<Number>, bool> = true>
+void convertToString(String &string, Number number)
 {
-    string.append(Utils::SmallString::number(number));
+    string.append(number);
 }
 
-template<typename String>
-void convertToString(String &string, long long number)
+template<typename Enumeration>
+constexpr std::underlying_type_t<Enumeration> to_underlying(Enumeration enumeration) noexcept
 {
-    string.append(Utils::SmallString::number(number));
+    static_assert(std::is_enum_v<Enumeration>, "to_underlying expect an enumeration");
+    return static_cast<std::underlying_type_t<Enumeration>>(enumeration);
 }
 
-template<typename String>
-void convertToString(String &string, double number)
+template<typename String, typename Enumeration, typename std::enable_if_t<std::is_enum_v<Enumeration>, bool> = true>
+void convertToString(String &string, Enumeration enumeration)
 {
-    string.append(Utils::SmallString::number(number));
+    string.append(to_underlying(enumeration));
 }
 
 template<typename String>
@@ -165,14 +169,14 @@ void convertToString(String &string, const QVariant &value)
     convertToString(string, value.toString());
 }
 
-template<typename String, typename... Arguments>
-void convertToString(String &string, const std::tuple<const IsDictonary &, Arguments...> &dictonary);
-
-template<typename String, typename... Arguments>
-void convertToString(String &string, const std::tuple<const IsArray &, Arguments...> &list);
-
-template<typename String, template<typename...> typename Container, typename... Arguments>
-void convertToString(String &string, const Container<Arguments...> &container);
+template<typename String, typename Type>
+void convertToString(String &string, const std::optional<Type> &value)
+{
+    if (value)
+        convertToString(string, *value);
+    else
+        convertToString(string, "empty optional");
+}
 
 template<typename String, typename Value>
 void convertArrayEntryToString(String &string, const Value &value)
@@ -184,15 +188,15 @@ void convertArrayEntryToString(String &string, const Value &value)
 template<typename String, typename... Entries>
 void convertArrayToString(String &string, const IsArray &, Entries &...entries)
 {
-    string.append(R"([)");
+    string.append('[');
     (convertArrayEntryToString(string, entries), ...);
     if (sizeof...(entries))
         string.pop_back();
-    string.append("]");
+    string.append(']');
 }
 
 template<typename String, typename... Arguments>
-void convertToString(String &string, const std::tuple<const IsArray &, Arguments...> &list)
+void convertToString(String &string, const std::tuple<IsArray, Arguments...> &list)
 {
     std::apply([&](auto &&...entries) { convertArrayToString(string, entries...); }, list);
 }
@@ -202,55 +206,107 @@ void convertDictonaryEntryToString(String &string, const std::tuple<Key, Value>
 {
     const auto &[key, value] = argument;
     convertToString(string, key);
-    string.append(":");
+    string.append(':');
     convertToString(string, value);
-    string.append(",");
+    string.append(',');
 }
 
 template<typename String, typename... Entries>
 void convertDictonaryToString(String &string, const IsDictonary &, Entries &...entries)
 {
-    string.append(R"({)");
+    string.append('{');
     (convertDictonaryEntryToString(string, entries), ...);
     if (sizeof...(entries))
         string.pop_back();
-    string.append("}");
+    string.append('}');
 }
 
 template<typename String, typename... Arguments>
-void convertToString(String &string, const std::tuple<const IsDictonary &, Arguments...> &dictonary)
+void convertToString(String &string, const std::tuple<IsDictonary, Arguments...> &dictonary)
 {
     std::apply([&](auto &&...entries) { convertDictonaryToString(string, entries...); }, dictonary);
 }
 
-template<typename String, template<typename...> typename Container, typename... Arguments>
-void convertToString(String &string, const Container<Arguments...> &container)
+template<typename T>
+struct is_container : std::false_type
+{};
+
+template<typename... Arguments>
+struct is_container<std::vector<Arguments...>> : std::true_type
+{};
+
+template<typename... Arguments>
+struct is_container<QList<Arguments...>> : std::true_type
+{};
+
+template<typename T, qsizetype Prealloc>
+struct is_container<QVarLengthArray<T, Prealloc>> : std::true_type
+{};
+
+template<typename String, typename Container, typename std::enable_if_t<is_container<Container>::value, bool> = true>
+void convertToString(String &string, const Container &values)
+{
+    string.append('[');
+
+    for (const auto &value : values) {
+        convertToString(string, value);
+        string.append(',');
+    }
+
+    if (values.size())
+        string.pop_back();
+
+    string.append(']');
+}
+
+template<typename T>
+struct is_map : std::false_type
+{};
+
+template<typename... Arguments>
+struct is_map<QtPrivate::QKeyValueRange<Arguments...>> : std::true_type
+{};
+
+template<typename... Arguments>
+struct is_map<std::map<Arguments...>> : std::true_type
+{};
+
+template<typename String, typename Map, typename std::enable_if_t<is_map<Map>::value, bool> = true>
+void convertToString(String &string, const Map &map)
 {
-    string.append("[");
-    for (const auto &entry : container) {
-        convertToString(string, entry);
-        string.append(",");
+    string.append('{');
+
+    for (const auto &[key, value] : map) {
+        convertToString(string, key);
+        string.append(':');
+        convertToString(string, value);
+        string.append(',');
     }
 
-    if (container.size())
+    if (map.begin() != map.end())
         string.pop_back();
 
-    string.append("]");
+    string.append('}');
+}
+
+template<typename String, typename Key, typename Value>
+void convertToString(String &string, const QMap<Key, Value> &dictonary)
+{
+    convertToString(string, dictonary.asKeyValueRange());
 }
 
+namespace Internal {
+
 template<typename String, typename... Arguments>
-String toArguments(Arguments &&...arguments)
+void toArguments(String &text, Arguments &&...arguments)
 {
-    String text;
     constexpr auto argumentCount = sizeof...(Arguments);
-    text.append("{");
+    text.append('{');
     (convertDictonaryEntryToString(text, arguments), ...);
     if (argumentCount)
         text.pop_back();
 
-    text.append("}");
-
-    return text;
+    text.append('}');
 }
 
 inline std::string_view toArguments(std::string_view arguments)
@@ -259,48 +315,58 @@ inline std::string_view toArguments(std::string_view arguments)
 }
 
 template<typename String>
-void appendArguments(String &eventArguments)
+void setArguments(String &eventArguments)
 {
-    eventArguments = {};
+    if constexpr (std::is_same_v<String, std::string_view>)
+        eventArguments = {};
+    else
+        eventArguments.clear();
 }
 
 template<typename String>
-void appendArguments(String &eventArguments, TracerLiteral arguments)
+void setArguments(String &eventArguments, TracerLiteral arguments)
 {
     eventArguments = arguments;
 }
 
 template<typename String, typename... Arguments>
-[[maybe_unused]] void appendArguments(String &eventArguments, Arguments &&...arguments)
+[[maybe_unused]] void setArguments(String &eventArguments, Arguments &&...arguments)
 {
     static_assert(
         !std::is_same_v<String, std::string_view>,
         R"(The arguments type of the tracing event queue is a string view. You can only provide trace token arguments as TracerLiteral (""_t).)");
 
-    eventArguments = Internal::toArguments<String>(std::forward<Arguments>(arguments)...);
+    if constexpr (std::is_same_v<String, std::string_view>)
+        eventArguments = {};
+    else
+        eventArguments.clear();
+    Internal::toArguments(eventArguments, std::forward<Arguments>(arguments)...);
 }
 
 } // namespace Internal
 
 template<typename Key, typename Value>
-auto keyValue(Key &&key, Value &&value)
+auto keyValue(const Key &key, Value &&value)
 {
-    return std::forward_as_tuple(std::forward<Key>(key), std::forward<Value>(value));
+    if constexpr (std::is_lvalue_reference_v<Value>)
+        return std::tuple<const Key &, const Value &>(key, value);
+    else
+        return std::tuple<const Key &, std::decay_t<Value>>(key, value);
 }
 
 template<typename... Entries>
 auto dictonary(Entries &&...entries)
 {
-    return std::forward_as_tuple(isDictonary, std::forward<Entries>(entries)...);
+    return std::make_tuple(isDictonary, std::forward<Entries>(entries)...);
 }
 
 template<typename... Entries>
 auto array(Entries &&...entries)
 {
-    return std::forward_as_tuple(isArray, std::forward<Entries>(entries)...);
+    return std::make_tuple(isArray, std::forward<Entries>(entries)...);
 }
 
-enum class IsFlow : std::size_t { No = 0, Out = 1 << 0, In = 1 << 1, InOut = In | Out };
+enum class IsFlow : char { No = 0, Out = 1 << 0, In = 1 << 1, InOut = In | Out };
 
 inline bool operator&(IsFlow first, IsFlow second)
 {
@@ -309,7 +375,7 @@ inline bool operator&(IsFlow first, IsFlow second)
 }
 
 template<typename String, typename ArgumentsString>
-struct TraceEvent
+struct alignas(4096) TraceEvent
 {
     using StringType = String;
     using ArgumentType = std::conditional_t<std::is_same_v<String, std::string_view>, TracerLiteral, String>;
@@ -324,13 +390,13 @@ struct TraceEvent
 
     String name;
     String category;
-    ArgumentsString arguments;
     TimePoint time;
     Duration duration;
     std::size_t id = 0;
-    std::size_t bindId : 62;
-    IsFlow flow : 2;
+    std::size_t bindId = 0;
+    IsFlow flow = IsFlow::No;
     char type = ' ';
+    ArgumentsString arguments;
 };
 
 using StringViewTraceEvent = TraceEvent<std::string_view, std::string_view>;
@@ -413,6 +479,8 @@ class EventQueue
 {
 public:
     using IsActive = std::false_type;
+
+    template<typename TraceFile> EventQueue(TraceFile &) {}
 };
 
 namespace Internal {
@@ -423,7 +491,13 @@ class EventQueueTracker
     using Queue = EventQueue<TraceEvent, Tracing::IsEnabled>;
 
 public:
-    EventQueueTracker() = default;
+    EventQueueTracker()
+    {
+        terminateHandler = std::get_terminate();
+
+        std::set_terminate([]() { EventQueueTracker::get().terminate(); });
+    }
+
     EventQueueTracker(const EventQueueTracker &) = delete;
     EventQueueTracker(EventQueueTracker &&) = delete;
     EventQueueTracker &operator=(const EventQueueTracker &) = delete;
@@ -457,8 +531,25 @@ public:
     }
 
 private:
+    void terminate()
+    {
+        flushAll();
+        if (terminateHandler)
+            terminateHandler();
+    }
+
+    void flushAll()
+    {
+        std::lock_guard lock{mutex};
+
+        for (auto queue : queues)
+            queue->flush();
+    }
+
+private:
     std::mutex mutex;
     std::vector<Queue *> queues;
+    std::terminate_handler terminateHandler = nullptr;
 };
 } // namespace Internal
 
@@ -466,11 +557,12 @@ template<typename TraceEvent>
 class EventQueue<TraceEvent, Tracing::IsEnabled>
 {
     using TraceEventsSpan = Utils::span<TraceEvent>;
+    using TraceEvents = std::array<TraceEvent, 1000>;
 
 public:
     using IsActive = std::true_type;
 
-    EventQueue(EnabledTraceFile *file);
+    EventQueue(EnabledTraceFile &file);
 
     ~EventQueue();
 
@@ -483,7 +575,9 @@ public:
     EventQueue &operator=(const EventQueue &) = delete;
     EventQueue &operator=(EventQueue &&) = delete;
 
-    EnabledTraceFile *file = nullptr;
+    EnabledTraceFile &file;
+    std::unique_ptr<TraceEvents> eventArrayOne = std::make_unique<TraceEvents>();
+    std::unique_ptr<TraceEvents> eventArrayTwo = std::make_unique<TraceEvents>();
     TraceEventsSpan eventsOne;
     TraceEventsSpan eventsTwo;
     TraceEventsSpan currentEvents;
@@ -505,35 +599,6 @@ extern template class NANOTRACE_EXPORT_EXTERN_TEMPLATE EventQueue<StringTraceEve
 extern template class NANOTRACE_EXPORT_EXTERN_TEMPLATE
     EventQueue<StringViewWithStringArgumentsTraceEvent, Tracing::IsEnabled>;
 
-template<typename TraceEvent, std::size_t eventCount, Tracing isEnabled>
-class EventQueueData : public EventQueue<TraceEvent, isEnabled>
-{
-public:
-    using IsActive = std::true_type;
-
-    EventQueueData(TraceFile<Tracing::IsDisabled> &) {}
-};
-
-template<typename TraceEvent, std::size_t eventCount>
-class EventQueueData<TraceEvent, eventCount, Tracing::IsEnabled>
-    : public EventQueue<TraceEvent, Tracing::IsEnabled>
-{
-    using TraceEvents = std::array<TraceEvent, eventCount>;
-    using Base = EventQueue<TraceEvent, Tracing::IsEnabled>;
-
-public:
-    using IsActive = std::true_type;
-
-    EventQueueData(EnabledTraceFile &file)
-        : Base{&file}
-    {
-        Base::setEventsSpans(*eventsOne.get(), *eventsTwo.get());
-    }
-
-    std::unique_ptr<TraceEvents> eventsOne = std::make_unique<TraceEvents>();
-    std::unique_ptr<TraceEvents> eventsTwo = std::make_unique<TraceEvents>();
-};
-
 template<typename TraceEvent>
 TraceEvent &getTraceEvent(EnabledEventQueue<TraceEvent> &eventQueue)
 {
@@ -1150,6 +1215,10 @@ public:
         return std::pair<TracerType, FlowTokenType>();
     }
 
+    template<typename... Arguments>
+    void threadEvent(ArgumentType, Arguments &&...)
+    {}
+
     static constexpr bool isActive() { return false; }
 };
 
@@ -1237,6 +1306,24 @@ public:
                 std::forward_as_tuple(PrivateTag{}, traceName, bindId, m_self)};
     }
 
+    template<typename... Arguments>
+    void threadEvent(ArgumentType traceName, Arguments &&...arguments)
+    {
+        if (isEnabled == IsEnabled::No)
+            return;
+
+        auto &traceEvent = getTraceEvent(m_eventQueue);
+
+        traceEvent.time = Clock::now();
+        traceEvent.name = std::move(traceName);
+        traceEvent.category = traceName;
+        traceEvent.type = 'i';
+        traceEvent.id = 0;
+        traceEvent.bindId = 0;
+        traceEvent.flow = IsFlow::No;
+        Internal::setArguments(traceEvent.arguments, std::forward<Arguments>(arguments)...);
+    }
+
     EnabledEventQueue<TraceEvent> &eventQueue() const { return m_eventQueue; }
 
     std::string_view name() const { return m_name; }
@@ -1270,7 +1357,7 @@ private:
         traceEvent.id = id;
         traceEvent.bindId = bindId;
         traceEvent.flow = flow;
-        Internal::appendArguments(traceEvent.arguments, std::forward<Arguments>(arguments)...);
+        Internal::setArguments(traceEvent.arguments, std::forward<Arguments>(arguments)...);
         traceEvent.time = Clock::now();
     }
 
@@ -1296,7 +1383,7 @@ private:
         traceEvent.id = id;
         traceEvent.bindId = bindId;
         traceEvent.flow = flow;
-        Internal::appendArguments(traceEvent.arguments, std::forward<Arguments>(arguments)...);
+        Internal::setArguments(traceEvent.arguments, std::forward<Arguments>(arguments)...);
     }
 
     template<typename... Arguments>
@@ -1316,9 +1403,11 @@ private:
         traceEvent.id = id;
         traceEvent.bindId = 0;
         traceEvent.flow = IsFlow::No;
-        Internal::appendArguments(traceEvent.arguments, std::forward<Arguments>(arguments)...);
+        Internal::setArguments(traceEvent.arguments, std::forward<Arguments>(arguments)...);
     }
 
+    CategoryFunctionPointer self() { return m_self; }
+
 private:
     StringType m_name;
     EnabledEventQueue<TraceEvent> &m_eventQueue;
@@ -1403,11 +1492,8 @@ class Tracer<Category, std::true_type>
         , flow{flow}
         , m_category{category}
     {
-        if (category().isEnabled == IsEnabled::Yes) {
-            Internal::appendArguments<ArgumentsStringType>(m_arguments,
-                                                           std::forward<Arguments>(arguments)...);
-            m_start = Clock::now();
-        }
+        if (category().isEnabled == IsEnabled::Yes)
+            sendBeginTrace(std::forward<Arguments>(arguments)...);
     }
 
 public:
@@ -1426,13 +1512,15 @@ public:
         : m_name{name}
         , m_category{category}
     {
-        if (category().isEnabled == IsEnabled::Yes) {
-            Internal::appendArguments<ArgumentsStringType>(m_arguments,
-                                                           std::forward<Arguments>(arguments)...);
-            m_start = Clock::now();
-        }
+        if (category().isEnabled == IsEnabled::Yes)
+            sendBeginTrace(std::forward<Arguments>(arguments)...);
     }
 
+    template<typename... Arguments>
+    [[nodiscard]] Tracer(ArgumentType name, Category &category, Arguments &&...arguments)
+        : Tracer(std::move(name), category.self(), std::forward<Arguments>(arguments)...)
+    {}
+
     Tracer(const Tracer &) = delete;
     Tracer &operator=(const Tracer &) = delete;
     Tracer(Tracer &&other) noexcept = delete;
@@ -1440,7 +1528,7 @@ public:
 
     TokenType createToken() { return {0, m_category}; }
 
-    ~Tracer() { sendTrace(); }
+    ~Tracer() { sendEndTrace(); }
 
     template<typename... Arguments>
     Tracer beginDuration(ArgumentType name, Arguments &&...arguments)
@@ -1457,44 +1545,52 @@ public:
     template<typename... Arguments>
     void end(Arguments &&...arguments)
     {
-        sendTrace(std::forward<Arguments>(arguments)...);
+        sendEndTrace(std::forward<Arguments>(arguments)...);
         m_name = {};
     }
 
 private:
     template<typename... Arguments>
-    void sendTrace(Arguments &&...arguments)
+    void sendBeginTrace(Arguments &&...arguments)
+    {
+        auto &category = m_category();
+        if (category.isEnabled == IsEnabled::Yes) {
+            auto &traceEvent = getTraceEvent(category.eventQueue());
+            traceEvent.name = m_name;
+            traceEvent.category = category.name();
+            traceEvent.bindId = m_bindId;
+            traceEvent.flow = flow;
+            traceEvent.type = 'B';
+            Internal::setArguments<ArgumentsStringType>(traceEvent.arguments,
+                                                        std::forward<Arguments>(arguments)...);
+            traceEvent.time = Clock::now();
+        }
+    }
+
+    template<typename... Arguments>
+    void sendEndTrace(Arguments &&...arguments)
     {
         if (m_name.size()) {
-            auto category = m_category();
+            auto &category = m_category();
             if (category.isEnabled == IsEnabled::Yes) {
-                auto duration = Clock::now() - m_start;
+                auto end = Clock::now();
                 auto &traceEvent = getTraceEvent(category.eventQueue());
-                traceEvent.name = m_name;
+                traceEvent.name = std::move(m_name);
                 traceEvent.category = category.name();
-                traceEvent.time = m_start;
-                traceEvent.duration = duration;
+                traceEvent.time = end;
                 traceEvent.bindId = m_bindId;
                 traceEvent.flow = flow;
-                traceEvent.type = 'X';
-                if (sizeof...(arguments)) {
-                    m_arguments.clear();
-                    Internal::appendArguments<ArgumentsStringType>(traceEvent.arguments,
-                                                                   std::forward<Arguments>(
-                                                                       arguments)...);
-                } else {
-                    traceEvent.arguments = m_arguments;
-                }
+                traceEvent.type = 'E';
+                Internal::setArguments<ArgumentsStringType>(traceEvent.arguments,
+                                                            std::forward<Arguments>(arguments)...);
             }
         }
     }
 
 private:
-    TimePoint m_start;
     StringType m_name;
-    ArgumentsStringType m_arguments;
-    std::size_t m_bindId;
-    IsFlow flow;
+    std::size_t m_bindId = 0;
+    IsFlow flow = IsFlow::No;
     CategoryFunctionPointer m_category;
 };
 
diff --git a/src/libs/nanotrace/staticstring.h b/src/libs/nanotrace/staticstring.h
new file mode 100644
index 0000000000..d787bd2fe3
--- /dev/null
+++ b/src/libs/nanotrace/staticstring.h
@@ -0,0 +1,116 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+#pragma once
+
+#include <utils/smallstringview.h>
+
+#if !(defined(__cpp_lib_to_chars) && (__cpp_lib_to_chars >= 201611L))
+#  include <QLocale>
+#endif
+
+#include <array>
+#include <charconv>
+#include <limits>
+
+namespace NanotraceHR {
+
+template<std::size_t Capacity>
+class StaticString
+{
+public:
+    StaticString() = default;
+    StaticString(const StaticString &) = delete;
+    StaticString &operator=(const StaticString &) = delete;
+
+    char *data() { return m_data.data(); }
+
+    const char *data() const { return m_data.data(); }
+
+    void append(Utils::SmallStringView string) noexcept
+    {
+        auto newSize = m_size + string.size();
+
+        if (newSize <= Capacity) {
+            std::char_traits<char>::copy(std::next(data(), static_cast<std::ptrdiff_t>(m_size)),
+                                         string.data(),
+                                         string.size());
+            m_size = newSize;
+        } else {
+            m_size = Capacity + 1;
+        }
+    }
+
+    void append(char character) noexcept
+    {
+        auto newSize = m_size + 1;
+
+        if (newSize <= Capacity) {
+            auto current = std::next(data(), static_cast<std::ptrdiff_t>(m_size));
+            *current = character;
+
+            m_size = newSize;
+        } else {
+            m_size = Capacity + 1;
+        }
+    }
+
+    template<typename Type, typename std::enable_if_t<std::is_arithmetic_v<Type>, bool> = true>
+    void append(Type number)
+    {
+#if !(defined(__cpp_lib_to_chars) && (__cpp_lib_to_chars >= 201611L))
+        if constexpr (std::is_floating_point_v<Type>) {
+            QLocale locale{QLocale::Language::C};
+            append(locale.toString(number).toStdString());
+            return;
+        }
+#endif
+        // 2 bytes for the sign and because digits10 returns the floor
+        char buffer[std::numeric_limits<Type>::digits10 + 2];
+        auto result = std::to_chars(buffer, buffer + sizeof(buffer), number);
+        auto endOfConversionString = result.ptr;
+
+        append({buffer, endOfConversionString});
+    }
+
+    void pop_back() { --m_size; }
+
+    StaticString &operator+=(Utils::SmallStringView string) noexcept
+    {
+        append(string);
+
+        return *this;
+    }
+
+    StaticString &operator+=(char character) noexcept
+    {
+        append(character);
+
+        return *this;
+    }
+
+    template<typename Type, typename = std::enable_if_t<std::is_arithmetic_v<Type>>>
+    StaticString &operator+=(Type number) noexcept
+    {
+        append(number);
+
+        return *this;
+    }
+
+    bool isValid() const { return m_size <= Capacity; }
+
+    std::size_t size() const { return m_size; }
+
+    friend std::ostream &operator<<(std::ostream &out, const StaticString &text)
+    {
+        return out << std::string_view{text.data(), text.size()};
+    }
+
+    void clear() { m_size = 0; }
+
+private:
+    std::array<char, Capacity> m_data;
+    std::size_t m_size = 0;
+};
+
+} // namespace NanotraceHR
diff --git a/src/libs/qlitehtml b/src/libs/qlitehtml
-Subproject 9c7b5d073bf4713250648cf7ea35580f489f7fd
+Subproject 4f737256c0a698ff3ba380cbaef1ba80a16fc3a
diff --git a/src/libs/qmljs/CMakeLists.txt b/src/libs/qmljs/CMakeLists.txt
index 4ca15cf7cc..a4966a8b4a 100644
--- a/src/libs/qmljs/CMakeLists.txt
+++ b/src/libs/qmljs/CMakeLists.txt
@@ -33,7 +33,6 @@ add_qtc_library(QmlJS
     qmljsfindexportedcpptypes.cpp qmljsfindexportedcpptypes.h
     qmljsicons.cpp qmljsicons.h
     qmljsimportdependencies.cpp qmljsimportdependencies.h
-    qmljsindenter.cpp qmljsindenter.h
     qmljsinterpreter.cpp qmljsinterpreter.h
     qmljslineinfo.cpp qmljslineinfo.h
     qmljslink.cpp qmljslink.h
diff --git a/src/libs/qmljs/qmljs.qbs b/src/libs/qmljs/qmljs.qbs
index 18434c83ba..d5cc21faf1 100644
--- a/src/libs/qmljs/qmljs.qbs
+++ b/src/libs/qmljs/qmljs.qbs
@@ -28,7 +28,6 @@ QtcLibrary {
             "qmljsfindexportedcpptypes.cpp", "qmljsfindexportedcpptypes.h",
             "qmljsicons.cpp", "qmljsicons.h",
             "qmljsimportdependencies.cpp", "qmljsimportdependencies.h",
-            "qmljsindenter.cpp", "qmljsindenter.h",
             "qmljsinterpreter.cpp", "qmljsinterpreter.h",
             "qmljsdialect.cpp", "qmljsdialect.h",
             "qmljslineinfo.cpp", "qmljslineinfo.h",
diff --git a/src/libs/qmljs/qmljsbind.cpp b/src/libs/qmljs/qmljsbind.cpp
index 6ccddcbe63..163680998f 100644
--- a/src/libs/qmljs/qmljsbind.cpp
+++ b/src/libs/qmljs/qmljsbind.cpp
@@ -333,6 +333,23 @@ bool Bind::visit(UiInlineComponent *ast)
     return true;
 }
 
+bool Bind::visit(UiEnumDeclaration *ast)
+{
+    if (_currentObjectValue) {
+        UiEnumValue *value = new UiEnumValue(ast, &_valueOwner, _currentObjectValue->originId());
+        _qmlObjects.insert(ast, value);
+        _currentObjectValue->setMember(ast->name, value);
+        // add enum value's keys as member to its parent object
+        for (auto it = ast->members; it; it = it->next) {
+            const QString name = it->member.toString();
+            _currentObjectValue->setMember(name, _valueOwner.intValue());
+            _currentObjectValue->setPropertyInfo(
+                        name, PropertyInfo(PropertyInfo::Readable | PropertyInfo::ValueType));
+        }
+    }
+    return true;
+}
+
 bool Bind::visit(AST::TemplateLiteral *ast)
 {
     Node::accept(ast->expression, this);
diff --git a/src/libs/qmljs/qmljsbind.h b/src/libs/qmljs/qmljsbind.h
index 08a60c17cc..d7096abdb2 100644
--- a/src/libs/qmljs/qmljsbind.h
+++ b/src/libs/qmljs/qmljsbind.h
@@ -57,6 +57,7 @@ protected:
     bool visit(AST::UiScriptBinding *ast) override;
     bool visit(AST::UiArrayBinding *ast) override;
     bool visit(AST::UiInlineComponent *ast) override;
+    bool visit(AST::UiEnumDeclaration *ast) override;
 
     // QML/JS
     bool visit(AST::TemplateLiteral *ast) override;
diff --git a/src/libs/qmljs/qmljscheck.cpp b/src/libs/qmljs/qmljscheck.cpp
index 7ceff0e78d..8cf85f11ed 100644
--- a/src/libs/qmljs/qmljscheck.cpp
+++ b/src/libs/qmljs/qmljscheck.cpp
@@ -846,6 +846,32 @@ bool Check::visit(UiObjectInitializer *)
     return true;
 }
 
+bool Check::visit(AST::UiEnumDeclaration *ast)
+{
+    const Value *localLookup = _scopeChain.lookup(ast->name.toString());
+    Utils::FilePath fp;
+    int line, column;
+    if (localLookup->getSourceLocation(&fp, &line, &column)) {
+        // if it's not "us" we get shadowed by another enum declaration
+        if (int(ast->identifierToken.startLine) != line || int(ast->identifierToken.startColumn) != column)
+            addMessage(ErrDuplicateId, SourceLocation(0, 0, line, column));
+    }
+    return true;
+}
+
+bool Check::visit(AST::UiEnumMemberList *ast)
+{
+    QStringList names;
+    for (auto it = ast; it; it = it->next) {
+        if (!it->member.first().isUpper())
+            addMessage(ErrInvalidEnumValue, it->memberToken); // better a different message?
+        if (names.contains(it->member)) // duplicate enum value
+            addMessage(ErrInvalidEnumValue, it->memberToken); // better a different message?
+        names.append(it->member.toString());
+    }
+    return true;
+}
+
 bool Check::visit(AST::TemplateLiteral *ast)
 {
     Node::accept(ast->expression, this);
diff --git a/src/libs/qmljs/qmljscheck.h b/src/libs/qmljs/qmljscheck.h
index 1fb96d251b..d7fc6cc425 100644
--- a/src/libs/qmljs/qmljscheck.h
+++ b/src/libs/qmljs/qmljscheck.h
@@ -57,6 +57,8 @@ protected:
     bool visit(AST::FunctionDeclaration *ast) override;
     bool visit(AST::FunctionExpression *ast) override;
     bool visit(AST::UiObjectInitializer *) override;
+    bool visit(AST::UiEnumDeclaration *ast) override;
+    bool visit(AST::UiEnumMemberList *ast) override;
 
     bool visit(AST::TemplateLiteral *ast) override;
     bool visit(AST::BinaryExpression *ast) override;
diff --git a/src/libs/qmljs/qmljsicons.cpp b/src/libs/qmljs/qmljsicons.cpp
index 0086843553..a0522ca726 100644
--- a/src/libs/qmljs/qmljsicons.cpp
+++ b/src/libs/qmljs/qmljsicons.cpp
@@ -120,3 +120,8 @@ QIcon Icons::functionDeclarationIcon()
 {
     return Utils::CodeModelIcon::iconForType(Utils::CodeModelIcon::FuncPublic);
 }
+
+QIcon Icons::enumMemberIcon()
+{
+    return Utils::CodeModelIcon::iconForType(Utils::CodeModelIcon::Enum);
+}
diff --git a/src/libs/qmljs/qmljsicons.h b/src/libs/qmljs/qmljsicons.h
index 4466d07a18..1565ae5355 100644
--- a/src/libs/qmljs/qmljsicons.h
+++ b/src/libs/qmljs/qmljsicons.h
@@ -28,6 +28,7 @@ public:
     static QIcon scriptBindingIcon();
     static QIcon publicMemberIcon();
     static QIcon functionDeclarationIcon();
+    static QIcon enumMemberIcon();
 
 private:
     Icons();
diff --git a/src/libs/qmljs/qmljsindenter.cpp b/src/libs/qmljs/qmljsindenter.cpp
deleted file mode 100644
index 8055847d90..0000000000
--- a/src/libs/qmljs/qmljsindenter.cpp
+++ /dev/null
@@ -1,603 +0,0 @@
-// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-/*
-    This file is a self-contained interactive indenter for Qt Script.
-
-    The general problem of indenting a program is ill posed. On
-    the one hand, an indenter has to analyze programs written in a
-    free-form formal language that is best described in terms of
-    tokens, not characters, not lines. On the other hand, indentation
-    applies to lines and white space characters matter, and otherwise
-    the programs to indent are formally invalid in general, as they
-    are begin edited.
-
-    The approach taken here works line by line. We receive a program
-    consisting of N lines or more, and we want to compute the
-    indentation appropriate for the Nth line. Lines beyond the Nth
-    lines are of no concern to us, so for simplicity we pretend the
-    program has exactly N lines and we call the Nth line the "bottom
-    line". Typically, we have to indent the bottom line when it's
-    still empty, so we concentrate our analysis on the N - 1 lines
-    that precede.
-
-    By inspecting the (N - 1)-th line, the (N - 2)-th line, ...
-    backwards, we determine the kind of the bottom line and indent it
-    accordingly.
-
-      * The bottom line is a comment line. See
-        bottomLineStartsInCComment() and
-        indentWhenBottomLineStartsInCComment().
-      * The bottom line is a continuation line. See isContinuationLine()
-        and indentForContinuationLine().
-      * The bottom line is a standalone line. See
-        indentForStandaloneLine().
-
-    Certain tokens that influence the indentation, notably braces,
-    are looked for in the lines. This is done by simple string
-    comparison, without a real tokenizer. Confusing constructs such
-    as comments and string literals are removed beforehand.
-*/
-
-#include <qmljs/qmljsindenter.h>
-#include <qmljs/qmljsscanner.h>
-
-#include <QTextBlock>
-
-using namespace QmlJS;
-
-/*
-    Saves and restores the state of the global linizer. This enables
-    backtracking.
-
-    Identical to the defines in qmljslineinfo.cpp
-*/
-#define YY_SAVE() LinizerState savedState = yyLinizerState
-#define YY_RESTORE() yyLinizerState = savedState
-
-
-QmlJSIndenter::QmlJSIndenter()
-    : caseOrDefault(QRegularExpression(QLatin1String(
-            "^\\s*(?:"
-            "case\\b[^:]+|"
-            "default)"
-            "\\s*:.*$")))
-
-{
-
-    /*
-        The indenter supports a few parameters:
-
-          * ppHardwareTabSize is the size of a '\t' in your favorite editor.
-          * ppIndentSize is the size of an indentation, or software tab
-            size.
-          * ppContinuationIndentSize is the extra indent for a continuation
-            line, when there is nothing to align against on the previous
-            line.
-          * ppCommentOffset is the indentation within a C-style comment,
-            when it cannot be picked up.
-    */
-
-    ppHardwareTabSize = 8;
-    ppIndentSize = 4;
-    ppContinuationIndentSize = 8;
-    ppCommentOffset = 2;
-}
-
-QmlJSIndenter::~QmlJSIndenter()
-{
-}
-
-void QmlJSIndenter::setTabSize(int size)
-{
-    ppHardwareTabSize = size;
-}
-
-void QmlJSIndenter::setIndentSize(int size)
-{
-    ppIndentSize = size;
-    ppContinuationIndentSize = 2 * size;
-}
-
-/*
-    Returns true if string t is made only of white space; otherwise
-    returns false.
-*/
-bool QmlJSIndenter::isOnlyWhiteSpace(const QString &t) const
-{
-    return firstNonWhiteSpace(t).isNull();
-}
-
-/*
-    Assuming string t is a line, returns the column number of a given
-    index. Column numbers and index are identical for strings that don't
-    contain '\t's.
-*/
-int QmlJSIndenter::columnForIndex(const QString &t, int index) const
-{
-    int col = 0;
-    if (index > t.length())
-        index = t.length();
-
-    for (int i = 0; i < index; i++) {
-        if (t.at(i) == QLatin1Char('\t'))
-            col = ((col / ppHardwareTabSize) + 1) * ppHardwareTabSize;
-        else
-            col++;
-    }
-    return col;
-}
-
-/*
-    Returns the indentation size of string t.
-*/
-int QmlJSIndenter::indentOfLine(const QString &t) const
-{
-    return columnForIndex(t, t.indexOf(firstNonWhiteSpace(t)));
-}
-
-/*
-    Replaces t[k] by ch, unless t[k] is '\t'. Tab characters are better
-    left alone since they break the "index equals column" rule. No
-    provisions are taken against '\n' or '\r', which shouldn't occur in
-    t anyway.
-*/
-void QmlJSIndenter::eraseChar(QString &t, int k, QChar ch) const
-{
-    if (t.at(k) != QLatin1Char('\t'))
-        t[k] = ch;
-}
-
-/*
-    Returns '(' if the last parenthesis is opening, ')' if it is
-    closing, and QChar() if there are no parentheses in t.
-*/
-QChar QmlJSIndenter::lastParen() const
-{
-    for (int index = yyLinizerState.tokens.size() - 1; index != -1; --index) {
-        const Token &token = yyLinizerState.tokens.at(index);
-
-        if (token.is(Token::LeftParenthesis))
-            return QLatin1Char('(');
-
-        else if (token.is(Token::RightParenthesis))
-            return QLatin1Char(')');
-    }
-
-    return QChar();
-}
-
-/*
-    Returns true if typedIn the same as okayCh or is null; otherwise
-    returns false.
-*/
-bool QmlJSIndenter::okay(QChar typedIn, QChar okayCh) const
-{
-    return typedIn == QChar() || typedIn == okayCh;
-}
-
-/*
-    Returns the recommended indent for the bottom line of yyProgram
-    assuming that it starts in a C-style comment, a condition that is
-    tested elsewhere.
-
-    Essentially, we're trying to align against some text on the
-    previous line.
-*/
-int QmlJSIndenter::indentWhenBottomLineStartsInMultiLineComment()
-{
-    QTextBlock block = yyProgram.lastBlock().previous();
-    QString blockText;
-
-    for (; block.isValid(); block = block.previous()) {
-        blockText = block.text();
-
-        if (! isOnlyWhiteSpace(blockText))
-            break;
-    }
-
-    return indentOfLine(blockText);
-}
-
-/*
-    Returns the recommended indent for the bottom line of yyProgram,
-    assuming it's a continuation line.
-
-    We're trying to align the continuation line against some parenthesis
-    or other bracked left opened on a previous line, or some interesting
-    operator such as '='.
-*/
-int QmlJSIndenter::indentForContinuationLine()
-{
-    int braceDepth = 0;
-    int delimDepth = 0;
-
-    bool leftBraceFollowed = *yyLeftBraceFollows;
-
-    for (int i = 0; i < SmallRoof; i++) {
-        int hook = -1;
-
-        int j = yyLine->length();
-        while (j > 0 && hook < 0) {
-            j--;
-            QChar ch = yyLine->at(j);
-
-            switch (ch.unicode()) {
-            case ')':
-                delimDepth++;
-                break;
-            case ']':
-                braceDepth++;
-                break;
-            case '}':
-                braceDepth++;
-                break;
-            case '(':
-                delimDepth--;
-                /*
-                    An unclosed delimiter is a good place to align at,
-                    at least for some styles (including Qt's).
-                */
-                if (delimDepth == -1)
-                    hook = j;
-                break;
-
-            case '[':
-                braceDepth--;
-                /*
-                    An unclosed delimiter is a good place to align at,
-                    at least for some styles (including Qt's).
-                */
-                if (braceDepth == -1)
-                    hook = j;
-                break;
-            case '{':
-                braceDepth--;
-                /*
-                    A left brace followed by other stuff on the same
-                    line is typically for an enum or an initializer.
-                    Such a brace must be treated just like the other
-                    delimiters.
-                */
-                if (braceDepth == -1) {
-                    if (j < yyLine->length() - 1)
-                        hook = j;
-                    else
-                        return 0; // shouldn't happen
-                }
-                break;
-            case '=':
-                /*
-                    An equal sign is a very natural alignment hook
-                    because it's usually the operator with the lowest
-                    precedence in statements it appears in. Case in
-                    point:
-
-                        int x = 1 +
-                                2;
-
-                    However, we have to beware of constructs such as
-                    default arguments and explicit enum constant
-                    values:
-
-                        void foo(int x = 0,
-                                  int y = 0);
-
-                    And not
-
-                        void foo(int x = 0,
-                                        int y = 0);
-
-                    These constructs are caracterized by a ',' at the
-                    end of the unfinished lines or by unbalanced
-                    parentheses.
-                */
-                Q_ASSERT(j - 1 >= 0);
-
-                if (QString::fromLatin1("!=<>").indexOf(yyLine->at(j - 1)) == -1 &&
-                     j + 1 < yyLine->length() && yyLine->at(j + 1) != QLatin1Char('=')) {
-                    if (braceDepth == 0 && delimDepth == 0 &&
-                         j < yyLine->length() - 1 &&
-                         !yyLine->endsWith(QLatin1Char(',')) &&
-                         (yyLine->contains(QLatin1Char('(')) == yyLine->contains(QLatin1Char(')'))))
-                        hook = j;
-                }
-            }
-        }
-
-        if (hook >= 0) {
-            /*
-                Yes, we have a delimiter or an operator to align
-                against! We don't really align against it, but rather
-                against the following token, if any. In this example,
-                the following token is "11":
-
-                    int x = (11 +
-                              2);
-
-                If there is no such token, we use a continuation indent:
-
-                    static QRegExp foo(QString(
-                            "foo foo foo foo foo foo foo foo foo"));
-            */
-            hook++;
-            while (hook < yyLine->length()) {
-                if (!yyLine->at(hook).isSpace())
-                    return columnForIndex(*yyLine, hook);
-                hook++;
-            }
-            return indentOfLine(*yyLine) + ppContinuationIndentSize;
-        }
-
-        if (braceDepth != 0)
-            break;
-
-        /*
-            The line's delimiters are balanced. It looks like a
-            continuation line or something.
-        */
-        if (delimDepth == 0) {
-            if (leftBraceFollowed) {
-                /*
-                    We have
-
-                        int main()
-                        {
-
-                    or
-
-                        Bar::Bar()
-                            : Foo(x)
-                        {
-
-                    The "{" should be flush left.
-                */
-                if (!isContinuationLine())
-                    return indentOfLine(*yyLine);
-            } else if (isContinuationLine() || yyLine->endsWith(QLatin1Char(','))) {
-                /*
-                    We have
-
-                        x = a +
-                            b +
-                            c;
-
-                    or
-
-                        int t[] = {
-                            1, 2, 3,
-                            4, 5, 6
-
-                    The "c;" should fall right under the "b +", and the
-                    "4, 5, 6" right under the "1, 2, 3,".
-                */
-                return indentOfLine(*yyLine);
-            } else {
-                /*
-                    We have
-
-                        stream << 1 +
-                                2;
-
-                    We could, but we don't, try to analyze which
-                    operator has precedence over which and so on, to
-                    obtain the excellent result
-
-                        stream << 1 +
-                                  2;
-
-                    We do have a special trick above for the assignment
-                    operator above, though.
-                */
-                return indentOfLine(*yyLine) + ppContinuationIndentSize;
-            }
-        }
-
-        if (!readLine())
-            break;
-    }
-    return 0;
-}
-
-/*
-    Returns the recommended indent for the bottom line of yyProgram if
-    that line is standalone (or should be indented likewise).
-
-    Indenting a standalone line is tricky, mostly because of braceless
-    control statements. Grossly, we are looking backwards for a special
-    line, a "hook line", that we can use as a starting point to indent,
-    and then modify the indentation level according to the braces met
-    along the way to that hook.
-
-    Let's consider a few examples. In all cases, we want to indent the
-    bottom line.
-
-    Example 1:
-
-        x = 1;
-        y = 2;
-
-    The hook line is "x = 1;". We met 0 opening braces and 0 closing
-    braces. Therefore, "y = 2;" inherits the indent of "x = 1;".
-
-    Example 2:
-
-        if (x) {
-            y;
-
-    The hook line is "if (x) {". No matter what precedes it, "y;" has
-    to be indented one level deeper than the hook line, since we met one
-    opening brace along the way.
-
-    Example 3:
-
-        if (a)
-            while (b) {
-                c;
-            }
-        d;
-
-    To indent "d;" correctly, we have to go as far as the "if (a)".
-    Compare with
-
-        if (a) {
-            while (b) {
-                c;
-            }
-            d;
-
-    Still, we're striving to go back as little as possible to
-    accommodate people with irregular indentation schemes. A hook line
-    near at hand is much more reliable than a remote one.
-*/
-int QmlJSIndenter::indentForStandaloneLine()
-{
-    for (int i = 0; i < SmallRoof; i++) {
-        if (!*yyLeftBraceFollows) {
-            YY_SAVE();
-
-            if (matchBracelessControlStatement()) {
-                /*
-                    The situation is this, and we want to indent "z;":
-
-                        if (x &&
-                             y)
-                            z;
-
-                    yyLine is "if (x &&".
-                */
-                return indentOfLine(*yyLine) + ppIndentSize;
-            }
-            YY_RESTORE();
-        }
-
-        if (yyLine->endsWith(QLatin1Char(';')) || yyLine->contains(QLatin1Char('{'))) {
-            /*
-                The situation is possibly this, and we want to indent
-                "z;":
-
-                    while (x)
-                        y;
-                    z;
-
-                We return the indent of "while (x)". In place of "y;",
-                any arbitrarily complex compound statement can appear.
-            */
-
-            if (*yyBraceDepth > 0) {
-                do {
-                    if (!readLine())
-                        break;
-                } while (*yyBraceDepth > 0);
-            }
-
-            LinizerState hookState;
-
-            while (isContinuationLine())
-                readLine();
-            hookState = yyLinizerState;
-
-            readLine();
-            if (*yyBraceDepth <= 0) {
-                do {
-                    if (!matchBracelessControlStatement())
-                        break;
-                    hookState = yyLinizerState;
-                } while (readLine());
-            }
-
-            yyLinizerState = hookState;
-
-            while (isContinuationLine())
-                readLine();
-
-            int indentChange = - *yyBraceDepth;
-            if (caseOrDefault.match(*yyLine).hasMatch())
-                ++indentChange;
-
-            /*
-              Never trust lines containing only '{' or '}', as some
-              people (Richard M. Stallman) format them weirdly.
-            */
-            if (yyLine->trimmed().length() > 1)
-                return indentOfLine(*yyLine) + indentChange * ppIndentSize;
-        }
-
-        if (!readLine())
-            return -*yyBraceDepth * ppIndentSize;
-    }
-    return 0;
-}
-
-/*
-    Returns the recommended indent for the bottom line of program.
-    Unless null, typedIn stores the character of yyProgram that
-    triggered reindentation.
-
-    This function works better if typedIn is set properly; it is
-    slightly more conservative if typedIn is completely wild, and
-    slighly more liberal if typedIn is always null. The user might be
-    annoyed by the liberal behavior.
-*/
-int QmlJSIndenter::indentForBottomLine(QTextBlock begin, QTextBlock end, QChar typedIn)
-{
-    if (begin == end)
-        return 0;
-
-    const QTextBlock last = end.previous();
-
-    initialize(begin, last);
-
-    QString bottomLine = last.text();
-    QChar firstCh = firstNonWhiteSpace(bottomLine);
-    int indent = 0;
-
-    if (bottomLineStartsInMultilineComment()) {
-        /*
-            The bottom line starts in a C-style comment. Indent it
-            smartly, unless the user has already played around with it,
-            in which case it's better to leave her stuff alone.
-        */
-        if (isOnlyWhiteSpace(bottomLine))
-            indent = indentWhenBottomLineStartsInMultiLineComment();
-        else
-            indent = indentOfLine(bottomLine);
-    } else {
-        if (isUnfinishedLine())
-            indent = indentForContinuationLine();
-        else
-            indent = indentForStandaloneLine();
-
-        if ((okay(typedIn, QLatin1Char('}')) && firstCh == QLatin1Char('}'))
-            || (okay(typedIn, QLatin1Char(']')) && firstCh == QLatin1Char(']'))) {
-            /*
-                A closing brace is one level more to the left than the
-                code it follows.
-            */
-            indent -= ppIndentSize;
-        } else if (okay(typedIn, QLatin1Char(':'))) {
-            if (caseOrDefault.match(bottomLine).hasMatch()) {
-                /*
-                    Move a case label (or the ':' in front of a
-                    constructor initialization list) one level to the
-                    left, but only if the user did not play around with
-                    it yet. Some users have exotic tastes in the
-                    matter, and most users probably are not patient
-                    enough to wait for the final ':' to format their
-                    code properly.
-
-                    We don't attempt the same for goto labels, as the
-                    user is probably the middle of "foo::bar". (Who
-                    uses goto, anyway?)
-                */
-                if (indentOfLine(bottomLine) <= indent)
-                    indent -= ppIndentSize;
-                else
-                    indent = indentOfLine(bottomLine);
-            }
-        }
-    }
-
-    return qMax(0, indent);
-}
-
diff --git a/src/libs/qmljs/qmljsindenter.h b/src/libs/qmljs/qmljsindenter.h
deleted file mode 100644
index 55141c1b3b..0000000000
--- a/src/libs/qmljs/qmljsindenter.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#pragma once
-
-#include <qmljs/qmljs_global.h>
-#include <qmljs/qmljslineinfo.h>
-
-#include <QRegularExpression>
-
-QT_FORWARD_DECLARE_CLASS(QTextBlock)
-
-namespace QmlJS {
-
-class QMLJS_EXPORT QmlJSIndenter : public LineInfo
-{
-    Q_DISABLE_COPY(QmlJSIndenter)
-
-public:
-    QmlJSIndenter();
-    ~QmlJSIndenter();
-
-    void setTabSize(int size);
-    void setIndentSize(int size);
-
-    int indentForBottomLine(QTextBlock firstBlock, QTextBlock lastBlock, QChar typedIn);
-
-private:
-    bool isOnlyWhiteSpace(const QString &t) const;
-    int columnForIndex(const QString &t, int index) const;
-    int indentOfLine(const QString &t) const;
-
-    void eraseChar(QString &t, int k, QChar ch) const;
-    QChar lastParen() const;
-    bool okay(QChar typedIn, QChar okayCh) const;
-
-    int indentWhenBottomLineStartsInMultiLineComment();
-    int indentForContinuationLine();
-    int indentForStandaloneLine();
-
-private:
-    int ppHardwareTabSize;
-    int ppIndentSize;
-    int ppContinuationIndentSize;
-    int ppCommentOffset;
-
-private:
-    QRegularExpression caseOrDefault;
-};
-
-} // namespace QmlJS
diff --git a/src/libs/qmljs/qmljsinterpreter.cpp b/src/libs/qmljs/qmljsinterpreter.cpp
index 5d687d5cd7..09bc6aecdb 100644
--- a/src/libs/qmljs/qmljsinterpreter.cpp
+++ b/src/libs/qmljs/qmljsinterpreter.cpp
@@ -635,6 +635,52 @@ const CppComponentValue *QmlEnumValue::owner() const
     return m_owner;
 }
 
+UiEnumValue::UiEnumValue(AST::UiEnumDeclaration *ast,
+                         ValueOwner *valueOwner, const QString &originId)
+    : ObjectValue(valueOwner, originId)
+    , m_name(ast->name.toString())
+{
+    setClassName("enum");
+    m_path = Utils::FilePath::fromUserInput(originId);
+    m_line = ast->identifierToken.startLine;
+    m_column = ast->identifierToken.startColumn;
+
+    for (auto it = ast->members; it; it = it->next) {
+        const QString name = it->member.toString();
+        setMember(name, valueOwner->intValue());
+        setPropertyInfo(name, PropertyInfo(PropertyInfo::Readable|PropertyInfo::ValueType));
+        m_keys.append(name);
+        m_values.append(it->value);
+    }
+}
+
+UiEnumValue::~UiEnumValue()
+{
+}
+
+const UiEnumValue *UiEnumValue::asUiEnumValue() const
+{
+    return this;
+}
+
+bool UiEnumValue::getSourceLocation(Utils::FilePath *path, int *line, int *column) const
+{
+    *path = m_path;
+    *line = m_line;
+    *column = m_column;
+    return true;
+}
+
+QString UiEnumValue::name() const
+{
+    return m_name;
+}
+
+QStringList UiEnumValue::keys() const
+{
+    return m_keys;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // ValueVisitor
 ////////////////////////////////////////////////////////////////////////////////
@@ -791,6 +837,11 @@ const QmlEnumValue *Value::asQmlEnumValue() const
     return nullptr;
 }
 
+const UiEnumValue *Value::asUiEnumValue() const
+{
+    return nullptr;
+}
+
 const QmlPrototypeReference *Value::asQmlPrototypeReference() const
 {
     return nullptr;
diff --git a/src/libs/qmljs/qmljsinterpreter.h b/src/libs/qmljs/qmljsinterpreter.h
index 8651196aef..aeb3c9e438 100644
--- a/src/libs/qmljs/qmljsinterpreter.h
+++ b/src/libs/qmljs/qmljsinterpreter.h
@@ -44,6 +44,7 @@ class NumberValue;
 class ModuleApiInfo;
 class ObjectValue;
 class QmlEnumValue;
+class UiEnumValue;
 class QmlPrototypeReference;
 class RealValue;
 class Reference;
@@ -115,6 +116,7 @@ public:
     virtual const CppComponentValue *asCppComponentValue() const;
     virtual const ASTObjectValue *asAstObjectValue() const;
     virtual const QmlEnumValue *asQmlEnumValue() const;
+    virtual const UiEnumValue *asUiEnumValue() const;
     virtual const QmlPrototypeReference *asQmlPrototypeReference() const;
     virtual const ASTPropertyReference *asAstPropertyReference() const;
     virtual const ASTVariableReference *asAstVariableReference() const;
@@ -246,6 +248,12 @@ template <> Q_INLINE_TEMPLATE const QmlEnumValue *value_cast(const Value *v)
     else   return nullptr;
 }
 
+template <> Q_INLINE_TEMPLATE const UiEnumValue *value_cast(const Value *v)
+{
+    if (v) return v->asUiEnumValue();
+    else   return nullptr;
+}
+
 template <> Q_INLINE_TEMPLATE const QmlPrototypeReference *value_cast(const Value *v)
 {
     if (v) return v->asQmlPrototypeReference();
@@ -559,6 +567,27 @@ private:
     int m_enumIndex;
 };
 
+class QMLJS_EXPORT UiEnumValue : public ObjectValue
+{
+public:
+    UiEnumValue(AST::UiEnumDeclaration *uiEnum, ValueOwner *valueOwner,
+                const QString &originId);
+    ~UiEnumValue();
+
+    const UiEnumValue *asUiEnumValue() const override;
+    bool getSourceLocation(Utils::FilePath *path, int *line, int *column) const override;
+    QString name() const;
+    QStringList keys() const;
+
+private:
+    const QString m_name;
+    Utils::FilePath m_path;
+    int m_line;
+    int m_column;
+    QStringList m_keys;
+    QList<int> m_values;
+};
+
 
 // A ObjectValue based on a FakeMetaObject.
 // May only have other CppComponentValue as ancestors.
diff --git a/src/libs/qmljs/qmljsstaticanalysismessage.cpp b/src/libs/qmljs/qmljsstaticanalysismessage.cpp
index 5b15e69428..432b97aba7 100644
--- a/src/libs/qmljs/qmljsstaticanalysismessage.cpp
+++ b/src/libs/qmljs/qmljsstaticanalysismessage.cpp
@@ -189,8 +189,9 @@ StaticAnalysisMessages::StaticAnalysisMessages()
            Tr::tr("Maximum string value length is %1."), 1);
     newMsg(ErrInvalidArrayValueLength, Error,
            Tr::tr("%1 elements expected in array value."), 1);
-    newMsg(WarnImperativeCodeNotEditableInVisualDesigner, Warning,
-           Tr::tr("Imperative code is not supported in Qt Design Studio."));
+    newMsg(WarnImperativeCodeNotEditableInVisualDesigner,
+           Warning,
+           Tr::tr("JavaScript can break the visual tooling in Qt Design Studio."));
     newMsg(WarnUnsupportedTypeInVisualDesigner, Warning,
            Tr::tr("This type (%1) is not supported in Qt Design Studio."), 1);
     newMsg(WarnReferenceToParentItemNotSupportedByVisualDesigner, Warning,
diff --git a/src/libs/qmlpuppetcommunication/container/imagecontainer.cpp b/src/libs/qmlpuppetcommunication/container/imagecontainer.cpp
index 545d4d927d..7747a9d118 100644
--- a/src/libs/qmlpuppetcommunication/container/imagecontainer.cpp
+++ b/src/libs/qmlpuppetcommunication/container/imagecontainer.cpp
@@ -15,7 +15,7 @@
 #define QTC_ASSERT_STRING(cond) qDebug("SOFT ASSERT: \"" cond"\" in file " __FILE__ ", line " QTC_ASSERT_STRINGIFY(__LINE__))
 #define QTC_ASSERT(cond, action) if (cond) {} else { QTC_ASSERT_STRING(#cond); action; } do {} while (0)
 
-static Q_LOGGING_CATEGORY(imageContainerDebug, "qtc.imagecontainer.debug", QtDebugMsg)
+static Q_LOGGING_CATEGORY(imageContainerDebug, "qtc.imagecontainer")
 
 namespace QmlDesigner {
 
@@ -194,9 +194,10 @@ static void readSharedMemory(qint32 key, ImageContainer &container)
         QImage image = QImage(imageWidth, imageHeight, QImage::Format(imageFormat));
         image.setDevicePixelRatio(pixelRatio);
 
-        if (image.isNull())
-            qCInfo(imageContainerDebug()) << Q_FUNC_INFO << "Not able to create image:" << imageWidth << imageHeight << imageFormat;
-        else
+        if (image.isNull()) {
+            if (imageWidth || imageHeight || imageFormat)
+                qCWarning(imageContainerDebug) << Q_FUNC_INFO << "Not able to create image:" << imageWidth << imageHeight << imageFormat;
+        } else
             std::memcpy(image.bits(), reinterpret_cast<const qint32*>(sharedMemory.constData()) + 6, byteCount);
 
         container.setImage(image);
diff --git a/src/libs/qtcreatorcdbext/pyvalue.cpp b/src/libs/qtcreatorcdbext/pyvalue.cpp
index f3813abf85..671f4d5350 100644
--- a/src/libs/qtcreatorcdbext/pyvalue.cpp
+++ b/src/libs/qtcreatorcdbext/pyvalue.cpp
@@ -13,8 +13,23 @@ constexpr bool debuggingValueEnabled() { return debugPyValue || debugPyCdbextMod
 
 static std::map<CIDebugSymbolGroup *, std::list<PyValue *>> valuesForSymbolGroup;
 
+void dumpSymbolGroup(CIDebugSymbolGroup *symbolGroup)
+{
+    if (!debuggingValueEnabled())
+        return;
+
+    ULONG count;
+    if (FAILED(symbolGroup->GetNumberSymbols(&count)))
+        return;
+    DebugPrint() << "Symbol group " << symbolGroup << " has " << count << " symbols";
+    for (ULONG i = 0; i < count; ++i)
+        DebugPrint() << "  " << i << ": " << PyValue(i, symbolGroup).name();
+}
+
 void PyValue::indicesMoved(CIDebugSymbolGroup *symbolGroup, ULONG start, ULONG delta)
 {
+    if (debuggingValueEnabled())
+        DebugPrint() << "PyValue::indicesMoved " << symbolGroup << " start " << start << " delta " << delta << "\n";
     if (delta == 0)
         return;
     ULONG count;
@@ -26,6 +41,7 @@ void PyValue::indicesMoved(CIDebugSymbolGroup *symbolGroup, ULONG start, ULONG d
         if (val->m_index >= start && val->m_index + delta < count)
             val->m_index += delta;
     }
+    dumpSymbolGroup(symbolGroup);
 }
 
 PyValue::PyValue(unsigned long index, CIDebugSymbolGroup *symbolGroup)
@@ -146,6 +162,7 @@ bool PyValue::expand()
         return false;
     if (params.Flags & DEBUG_SYMBOL_EXPANDED)
         return true;
+    dumpSymbolGroup(m_symbolGroup);
     if (FAILED(m_symbolGroup->ExpandSymbol(m_index, TRUE)))
         return false;
     if (FAILED(m_symbolGroup->GetSymbolParameters(m_index, 1, &params)))
diff --git a/src/libs/solutions/tasking/tasktree.cpp b/src/libs/solutions/tasking/tasktree.cpp
index 7d37bf9758..107559d6a5 100644
--- a/src/libs/solutions/tasking/tasktree.cpp
+++ b/src/libs/solutions/tasking/tasktree.cpp
@@ -3,6 +3,8 @@
 
 #include "tasktree.h"
 
+#include "barrier.h"
+
 #include <QDebug>
 #include <QEventLoop>
 #include <QFutureWatcher>
@@ -882,6 +884,20 @@ private:
 */
 
 /*!
+    \variable parallelIdealThreadCountLimit
+    A convenient global group's element describing the parallel execution mode with a limited
+    number of tasks running simultanously. The limit is equal to the ideal number of threads
+    excluding the calling thread.
+
+    This is a shortcut to:
+    \code
+        parallelLimit(qMax(QThread::idealThreadCount() - 1, 1))
+    \endcode
+
+    \sa parallel, parallelLimit()
+*/
+
+/*!
     \variable stopOnError
     A convenient global group's element describing the StopOnError workflow policy.
 
@@ -1161,6 +1177,7 @@ const GroupItem nullItem = GroupItem({});
 
 const GroupItem sequential = parallelLimit(1);
 const GroupItem parallel = parallelLimit(0);
+const GroupItem parallelIdealThreadCountLimit = parallelLimit(qMax(QThread::idealThreadCount() - 1, 1));
 
 const GroupItem stopOnError = workflowPolicy(WorkflowPolicy::StopOnError);
 const GroupItem continueOnError = workflowPolicy(WorkflowPolicy::ContinueOnError);
@@ -1473,6 +1490,23 @@ ExecutableItem ExecutableItem::withLog(const QString &logName) const
     };
 }
 
+ExecutableItem ExecutableItem::withCancelImpl(
+    const std::function<void(QObject *, const std::function<void()> &)> &connectWrapper) const
+{
+    const auto onSetup = [connectWrapper](Barrier &barrier) {
+        connectWrapper(&barrier, [barrierPtr = &barrier] { barrierPtr->advance(); });
+    };
+    return Group {
+        parallel,
+        stopOnSuccessOrError,
+        Group {
+            finishAllAndError,
+            BarrierTask(onSetup)
+        },
+        *this
+    };
+}
+
 class TaskTreePrivate;
 class TaskNode;
 class RuntimeContainer;
diff --git a/src/libs/solutions/tasking/tasktree.h b/src/libs/solutions/tasking/tasktree.h
index 8ea255303b..9b1e4b9eaf 100644
--- a/src/libs/solutions/tasking/tasktree.h
+++ b/src/libs/solutions/tasking/tasktree.h
@@ -187,7 +187,7 @@ public:
     }
 
 private:
-    static StorageConstructor ctor() { return [] { return new StorageStruct; }; }
+    static StorageConstructor ctor() { return [] { return new StorageStruct(); }; }
     static StorageDestructor dtor() {
         return [](void *storage) { delete static_cast<StorageStruct *>(storage); };
     }
@@ -290,10 +290,25 @@ public:
     ExecutableItem withTimeout(std::chrono::milliseconds timeout,
                                const std::function<void()> &handler = {}) const;
     ExecutableItem withLog(const QString &logName) const;
+    template <typename SenderSignalPairGetter>
+    ExecutableItem withCancel(SenderSignalPairGetter &&getter) const
+    {
+        const auto connectWrapper = [getter](QObject *guard, const std::function<void()> &trigger) {
+            const auto senderSignalPair = getter();
+            QObject::connect(senderSignalPair.first, senderSignalPair.second, guard, [trigger] {
+                trigger();
+            }, static_cast<Qt::ConnectionType>(Qt::QueuedConnection | Qt::SingleShotConnection));
+        };
+        return withCancelImpl(connectWrapper);
+    }
 
 protected:
     ExecutableItem() = default;
     ExecutableItem(const TaskHandler &handler) : GroupItem(handler) {}
+
+private:
+    ExecutableItem withCancelImpl(
+        const std::function<void(QObject *, const std::function<void()> &)> &connectWrapper) const;
 };
 
 class TASKING_EXPORT Group : public ExecutableItem
@@ -375,6 +390,7 @@ TASKING_EXPORT extern const GroupItem nullItem;
 
 TASKING_EXPORT extern const GroupItem sequential;
 TASKING_EXPORT extern const GroupItem parallel;
+TASKING_EXPORT extern const GroupItem parallelIdealThreadCountLimit;
 
 TASKING_EXPORT extern const GroupItem stopOnError;
 TASKING_EXPORT extern const GroupItem continueOnError;
diff --git a/src/libs/sqlite/CMakeLists.txt b/src/libs/sqlite/CMakeLists.txt
index 2c7e1ebbf3..f86f31871a 100644
--- a/src/libs/sqlite/CMakeLists.txt
+++ b/src/libs/sqlite/CMakeLists.txt
@@ -31,7 +31,7 @@ endif()
 
 add_qtc_library(Sqlite
   PROPERTIES AUTOMOC OFF AUTOUIC OFF
-  DEPENDS Qt::Core Threads::Threads ${CMAKE_DL_LIBS} SqliteInternal
+  DEPENDS Qt::Core Threads::Threads ${CMAKE_DL_LIBS} SqliteInternal Nanotrace
   INCLUDES
     ../3rdparty/sqlite
   PUBLIC_INCLUDES
@@ -58,7 +58,7 @@ add_qtc_library(Sqlite
     sqlitesessionchangeset.cpp sqlitesessionchangeset.h
     sqlitesessions.cpp sqlitesessions.h
     sqlitetable.h
-    sqlitetransaction.h
+    sqlitetracing.cpp sqlitetracing.h
     sqlitetransaction.h
     sqlitevalue.h
     sqlitewritestatement.h
diff --git a/src/libs/sqlite/sqlitebasestatement.cpp b/src/libs/sqlite/sqlitebasestatement.cpp
index 23466c0cea..8557bf6ad2 100644
--- a/src/libs/sqlite/sqlitebasestatement.cpp
+++ b/src/libs/sqlite/sqlitebasestatement.cpp
@@ -26,32 +26,7 @@ extern "C" int sqlite3_carray_bind(
 
 namespace Sqlite {
 
-namespace {
-using TraceFile = NanotraceHR::TraceFile<sqliteTracingStatus()>;
-
-TraceFile traceFile{"sqlite.json"};
-
-thread_local NanotraceHR::EventQueueData<NanotraceHR::StringViewTraceEvent, 10000, sqliteTracingStatus()>
-    eventQueueData(traceFile);
-
-NanotraceHR::StringViewCategory<sqliteTracingStatus()> &sqliteLowLevelCategory();
-
-thread_local NanotraceHR::StringViewCategory<sqliteTracingStatus()> sqliteLowLevelCategory_{
-    "sqlite low level"_t, eventQueueData, sqliteLowLevelCategory};
-
-NanotraceHR::StringViewCategory<sqliteTracingStatus()> &sqliteLowLevelCategory()
-{
-    return sqliteLowLevelCategory_;
-}
-
-thread_local NanotraceHR::StringViewCategory<sqliteTracingStatus()> sqliteHighLevelCategory_{
-    "sqlite high level"_t, eventQueueData, sqliteHighLevelCategory};
-} // namespace
-
-NanotraceHR::StringViewCategory<sqliteTracingStatus()> &sqliteHighLevelCategory()
-{
-    return sqliteHighLevelCategory_;
-}
+using NanotraceHR::keyValue;
 
 BaseStatement::BaseStatement(Utils::SmallStringView sqlStatement, Database &database)
     : m_database(database)
@@ -107,14 +82,18 @@ void BaseStatement::waitForUnlockNotify() const
 
 void BaseStatement::reset() const noexcept
 {
-    NanotraceHR::Tracer tracer{"reset"_t, sqliteLowLevelCategory()};
+    NanotraceHR::Tracer tracer{"reset"_t,
+                               sqliteLowLevelCategory(),
+                               keyValue("sqlite statement", handle())};
 
     sqlite3_reset(m_compiledStatement.get());
 }
 
 bool BaseStatement::next() const
 {
-    NanotraceHR::Tracer tracer{"next"_t, sqliteLowLevelCategory()};
+    NanotraceHR::Tracer tracer{"next"_t,
+                               sqliteLowLevelCategory(),
+                               keyValue("sqlite statement", handle())};
     int resultCode;
 
     do {
@@ -141,7 +120,10 @@ void BaseStatement::step() const
 
 void BaseStatement::bindNull(int index)
 {
-    NanotraceHR::Tracer tracer{"bind null"_t, sqliteLowLevelCategory()};
+    NanotraceHR::Tracer tracer{"bind null"_t,
+                               sqliteLowLevelCategory(),
+                               keyValue("sqlite statement", handle()),
+                               keyValue("index", index)};
 
     int resultCode = sqlite3_bind_null(m_compiledStatement.get(), index);
     if (resultCode != SQLITE_OK)
@@ -155,7 +137,11 @@ void BaseStatement::bind(int index, NullValue)
 
 void BaseStatement::bind(int index, int value)
 {
-    NanotraceHR::Tracer tracer{"bind int"_t, sqliteLowLevelCategory()};
+    NanotraceHR::Tracer tracer{"bind int"_t,
+                               sqliteLowLevelCategory(),
+                               keyValue("sqlite statement", handle()),
+                               keyValue("index", index),
+                               keyValue("value", value)};
 
     int resultCode = sqlite3_bind_int(m_compiledStatement.get(), index, value);
     if (resultCode != SQLITE_OK)
@@ -164,7 +150,11 @@ void BaseStatement::bind(int index, int value)
 
 void BaseStatement::bind(int index, long long value)
 {
-    NanotraceHR::Tracer tracer{"bind long long"_t, sqliteLowLevelCategory()};
+    NanotraceHR::Tracer tracer{"bind long long"_t,
+                               sqliteLowLevelCategory(),
+                               keyValue("sqlite statement", handle()),
+                               keyValue("index", index),
+                               keyValue("value", value)};
 
     int resultCode = sqlite3_bind_int64(m_compiledStatement.get(), index, value);
     if (resultCode != SQLITE_OK)
@@ -173,7 +163,11 @@ void BaseStatement::bind(int index, long long value)
 
 void BaseStatement::bind(int index, double value)
 {
-    NanotraceHR::Tracer tracer{"bind double"_t, sqliteLowLevelCategory()};
+    NanotraceHR::Tracer tracer{"bind double"_t,
+                               sqliteLowLevelCategory(),
+                               keyValue("sqlite statement", handle()),
+                               keyValue("index", index),
+                               keyValue("value", value)};
 
     int resultCode = sqlite3_bind_double(m_compiledStatement.get(), index, value);
     if (resultCode != SQLITE_OK)
@@ -182,7 +176,11 @@ void BaseStatement::bind(int index, double value)
 
 void BaseStatement::bind(int index, void *pointer)
 {
-    NanotraceHR::Tracer tracer{"bind pointer"_t, sqliteLowLevelCategory()};
+    NanotraceHR::Tracer tracer{"bind pointer"_t,
+                               sqliteLowLevelCategory(),
+                               keyValue("sqlite statement", handle()),
+                               keyValue("index", index),
+                               keyValue("pointer", reinterpret_cast<std::uintptr_t>(pointer))};
 
     int resultCode = sqlite3_bind_pointer(m_compiledStatement.get(), index, pointer, "carray", nullptr);
     if (resultCode != SQLITE_OK)
@@ -191,7 +189,12 @@ void BaseStatement::bind(int index, void *pointer)
 
 void BaseStatement::bind(int index, Utils::span<const int> values)
 {
-    NanotraceHR::Tracer tracer{"bind int span"_t, sqliteLowLevelCategory()};
+    NanotraceHR::Tracer tracer{"bind int span"_t,
+                               sqliteLowLevelCategory(),
+                               keyValue("sqlite statement", handle()),
+                               keyValue("index", index),
+                               keyValue("pointer", reinterpret_cast<std::uintptr_t>(values.data())),
+                               keyValue("size", values.size())};
 
     int resultCode = sqlite3_carray_bind(m_compiledStatement.get(),
                                          index,
@@ -205,7 +208,12 @@ void BaseStatement::bind(int index, Utils::span<const int> values)
 
 void BaseStatement::bind(int index, Utils::span<const long long> values)
 {
-    NanotraceHR::Tracer tracer{"bind long long span"_t, sqliteLowLevelCategory()};
+    NanotraceHR::Tracer tracer{"bind long long span"_t,
+                               sqliteLowLevelCategory(),
+                               keyValue("sqlite statement", handle()),
+                               keyValue("index", index),
+                               keyValue("pointer", reinterpret_cast<std::uintptr_t>(values.data())),
+                               keyValue("size", values.size())};
 
     int resultCode = sqlite3_carray_bind(m_compiledStatement.get(),
                                          index,
@@ -219,7 +227,12 @@ void BaseStatement::bind(int index, Utils::span<const long long> values)
 
 void BaseStatement::bind(int index, Utils::span<const double> values)
 {
-    NanotraceHR::Tracer tracer{"bind double span"_t, sqliteLowLevelCategory()};
+    NanotraceHR::Tracer tracer{"bind double span"_t,
+                               sqliteLowLevelCategory(),
+                               keyValue("sqlite statement", handle()),
+                               keyValue("index", index),
+                               keyValue("pointer", reinterpret_cast<std::uintptr_t>(values.data())),
+                               keyValue("size", values.size())};
 
     int resultCode = sqlite3_carray_bind(m_compiledStatement.get(),
                                          index,
@@ -233,7 +246,12 @@ void BaseStatement::bind(int index, Utils::span<const double> values)
 
 void BaseStatement::bind(int index, Utils::span<const char *> values)
 {
-    NanotraceHR::Tracer tracer{"bind const char* span"_t, sqliteLowLevelCategory()};
+    NanotraceHR::Tracer tracer{"bind const char* span"_t,
+                               sqliteLowLevelCategory(),
+                               keyValue("sqlite statement", handle()),
+                               keyValue("index", index),
+                               keyValue("pointer", reinterpret_cast<std::uintptr_t>(values.data())),
+                               keyValue("size", values.size())};
 
     int resultCode = sqlite3_carray_bind(m_compiledStatement.get(),
                                          index,
@@ -247,7 +265,11 @@ void BaseStatement::bind(int index, Utils::span<const char *> values)
 
 void BaseStatement::bind(int index, Utils::SmallStringView text)
 {
-    NanotraceHR::Tracer tracer{"bind string"_t, sqliteLowLevelCategory()};
+    NanotraceHR::Tracer tracer{"bind string"_t,
+                               sqliteLowLevelCategory(),
+                               keyValue("sqlite statement", handle()),
+                               keyValue("index", index),
+                               keyValue("text", text)};
 
     int resultCode = sqlite3_bind_text(m_compiledStatement.get(),
                                        index,
@@ -260,7 +282,12 @@ void BaseStatement::bind(int index, Utils::SmallStringView text)
 
 void BaseStatement::bind(int index, BlobView blobView)
 {
-    NanotraceHR::Tracer tracer{"bind blob"_t, sqliteLowLevelCategory()};
+    NanotraceHR::Tracer tracer{"bind blob"_t,
+                               sqliteLowLevelCategory(),
+                               keyValue("sqlite statement", handle()),
+                               keyValue("index", index),
+                               keyValue("pointer", reinterpret_cast<std::uintptr_t>(blobView.data())),
+                               keyValue("size", blobView.size())};
 
     int resultCode = SQLITE_OK;
 
@@ -280,7 +307,11 @@ void BaseStatement::bind(int index, BlobView blobView)
 
 void BaseStatement::bind(int index, const Value &value)
 {
-    NanotraceHR::Tracer tracer{"bind value"_t, sqliteLowLevelCategory()};
+    NanotraceHR::Tracer tracer{
+        "bind value"_t,
+        sqliteLowLevelCategory(),
+        keyValue("sqlite statement", handle()),
+    };
 
     switch (value.type()) {
     case ValueType::Integer:
@@ -303,7 +334,11 @@ void BaseStatement::bind(int index, const Value &value)
 
 void BaseStatement::bind(int index, ValueView value)
 {
-    NanotraceHR::Tracer tracer{"bind value"_t, sqliteLowLevelCategory()};
+    NanotraceHR::Tracer tracer{
+        "bind value"_t,
+        sqliteLowLevelCategory(),
+        keyValue("sqlite statement", handle()),
+    };
 
     switch (value.type()) {
     case ValueType::Integer:
@@ -326,7 +361,9 @@ void BaseStatement::bind(int index, ValueView value)
 
 void BaseStatement::prepare(Utils::SmallStringView sqlStatement)
 {
-    NanotraceHR::Tracer tracer{"prepare"_t, sqliteLowLevelCategory()};
+    NanotraceHR::Tracer tracer{"prepare"_t,
+                               sqliteLowLevelCategory(),
+                               keyValue("sql statement", sqlStatement)};
 
     if (!m_database.isLocked())
         throw DatabaseIsNotLocked{};
@@ -342,14 +379,18 @@ void BaseStatement::prepare(Utils::SmallStringView sqlStatement)
                                         nullptr);
         m_compiledStatement.reset(sqliteStatement);
 
-        if (resultCode == SQLITE_LOCKED)
+        if (resultCode == SQLITE_LOCKED) {
+            tracer.tick("wait for unlock"_t);
             waitForUnlockNotify();
+        }
 
     } while (resultCode == SQLITE_LOCKED);
 
 
     if (resultCode != SQLITE_OK)
         Sqlite::throwError(resultCode, sqliteDatabaseHandle());
+
+    tracer.end(keyValue("sqlite statement", handle()));
 }
 
 sqlite3 *BaseStatement::sqliteDatabaseHandle() const
@@ -427,7 +468,10 @@ StringType convertToTextForColumn(sqlite3_stmt *sqlStatment, int column)
 
 Type BaseStatement::fetchType(int column) const
 {
-    NanotraceHR::Tracer tracer{"fetch type"_t, sqliteLowLevelCategory()};
+    NanotraceHR::Tracer tracer{"fetch type"_t,
+                               sqliteLowLevelCategory(),
+                               keyValue("sqlite statement", handle()),
+                               keyValue("column", column)};
 
     auto dataType = sqlite3_column_type(m_compiledStatement.get(), column);
 
@@ -449,9 +493,16 @@ Type BaseStatement::fetchType(int column) const
 
 int BaseStatement::fetchIntValue(int column) const
 {
-    NanotraceHR::Tracer tracer{"fetch int"_t, sqliteLowLevelCategory()};
+    NanotraceHR::Tracer tracer{"fetch int"_t,
+                               sqliteLowLevelCategory(),
+                               keyValue("sqlite statement", handle()),
+                               keyValue("column", column)};
+
+    auto value = sqlite3_column_int(m_compiledStatement.get(), column);
 
-    return sqlite3_column_int(m_compiledStatement.get(), column);
+    tracer.end(keyValue("value", value));
+
+    return value;
 }
 
 template<>
@@ -473,9 +524,16 @@ long BaseStatement::fetchValue<long>(int column) const
 
 long long BaseStatement::fetchLongLongValue(int column) const
 {
-    NanotraceHR::Tracer tracer{"fetch long long"_t, sqliteLowLevelCategory()};
+    NanotraceHR::Tracer tracer{"fetch long long"_t,
+                               sqliteLowLevelCategory(),
+                               keyValue("sqlite statement", handle()),
+                               keyValue("column", column)};
+
+    auto value = sqlite3_column_int64(m_compiledStatement.get(), column);
 
-    return sqlite3_column_int64(m_compiledStatement.get(), column);
+    tracer.end(keyValue("value", value));
+
+    return value;
 }
 
 template<>
@@ -486,14 +544,24 @@ long long BaseStatement::fetchValue<long long>(int column) const
 
 double BaseStatement::fetchDoubleValue(int column) const
 {
-    NanotraceHR::Tracer tracer{"fetch double"_t, sqliteLowLevelCategory()};
+    NanotraceHR::Tracer tracer{"fetch double"_t,
+                               sqliteLowLevelCategory(),
+                               keyValue("sqlite statement", handle()),
+                               keyValue("column", column)};
+
+    auto value = sqlite3_column_double(m_compiledStatement.get(), column);
+
+    tracer.end(keyValue("value", value));
 
-    return sqlite3_column_double(m_compiledStatement.get(), column);
+    return value;
 }
 
 BlobView BaseStatement::fetchBlobValue(int column) const
 {
-    NanotraceHR::Tracer tracer{"fetch blob"_t, sqliteLowLevelCategory()};
+    NanotraceHR::Tracer tracer{"fetch blob"_t,
+                               sqliteLowLevelCategory(),
+                               keyValue("sqlite statement", handle()),
+                               keyValue("column", column)};
 
     return convertToBlobForColumn(m_compiledStatement.get(), column);
 }
@@ -507,7 +575,16 @@ double BaseStatement::fetchValue<double>(int column) const
 template<typename StringType>
 StringType BaseStatement::fetchValue(int column) const
 {
-    return convertToTextForColumn<StringType>(m_compiledStatement.get(), column);
+    NanotraceHR::Tracer tracer{"fetch string value"_t,
+                               sqliteLowLevelCategory(),
+                               keyValue("sqlite statement", handle()),
+                               keyValue("column", column)};
+
+    auto text = convertToTextForColumn<StringType>(m_compiledStatement.get(), column);
+
+    tracer.end(keyValue("text", text));
+
+    return text;
 }
 
 template SQLITE_EXPORT Utils::SmallStringView BaseStatement::fetchValue<Utils::SmallStringView>(
@@ -519,11 +596,25 @@ template SQLITE_EXPORT Utils::PathString BaseStatement::fetchValue<Utils::PathSt
 
 Utils::SmallStringView BaseStatement::fetchSmallStringViewValue(int column) const
 {
-    return fetchValue<Utils::SmallStringView>(column);
+    NanotraceHR::Tracer tracer{"fetch string view"_t,
+                               sqliteLowLevelCategory(),
+                               keyValue("sqlite statement", handle()),
+                               keyValue("column", column)};
+
+    auto text = fetchValue<Utils::SmallStringView>(column);
+
+    tracer.end(keyValue("text", text));
+
+    return text;
 }
 
 ValueView BaseStatement::fetchValueView(int column) const
 {
+    NanotraceHR::Tracer tracer{"fetch value view"_t,
+                               sqliteLowLevelCategory(),
+                               keyValue("sqlite statement", handle()),
+                               keyValue("column", column)};
+
     int dataType = sqlite3_column_type(m_compiledStatement.get(), column);
     switch (dataType) {
     case SQLITE_NULL:
@@ -543,7 +634,11 @@ ValueView BaseStatement::fetchValueView(int column) const
 
 void BaseStatement::Deleter::operator()(sqlite3_stmt *statement)
 {
-    NanotraceHR::Tracer tracer{"finalize"_t, sqliteLowLevelCategory()};
+    NanotraceHR::Tracer tracer{
+        "finalize"_t,
+        sqliteLowLevelCategory(),
+        keyValue("sqlite statement", reinterpret_cast<std::uintptr_t>(statement)),
+    };
 
     sqlite3_finalize(statement);
 }
diff --git a/src/libs/sqlite/sqlitebasestatement.h b/src/libs/sqlite/sqlitebasestatement.h
index d2306c67a5..3710021ff5 100644
--- a/src/libs/sqlite/sqlitebasestatement.h
+++ b/src/libs/sqlite/sqlitebasestatement.h
@@ -9,6 +9,7 @@
 #include "sqliteblob.h"
 #include "sqliteexception.h"
 #include "sqliteids.h"
+#include "sqlitetracing.h"
 #include "sqlitetransaction.h"
 #include "sqlitevalue.h"
 
@@ -30,8 +31,6 @@ using std::int64_t;
 
 namespace Sqlite {
 
-using namespace NanotraceHR::Literals;
-
 class Database;
 class DatabaseBackend;
 
@@ -44,17 +43,6 @@ constexpr static std::underlying_type_t<Enumeration> to_underlying(Enumeration e
     return static_cast<std::underlying_type_t<Enumeration>>(enumeration);
 }
 
-constexpr NanotraceHR::Tracing sqliteTracingStatus()
-{
-#ifdef ENABLE_SQLITE_TRACING
-    return NanotraceHR::tracingStatus();
-#else
-    return NanotraceHR::Tracing::IsDisabled;
-#endif
-}
-
-SQLITE_EXPORT NanotraceHR::StringViewCategory<sqliteTracingStatus()> &sqliteHighLevelCategory();
-
 class SQLITE_EXPORT BaseStatement
 {
 public:
@@ -136,6 +124,11 @@ public:
 protected:
     ~BaseStatement() = default;
 
+    std::uintptr_t handle() const
+    {
+        return reinterpret_cast<std::uintptr_t>(m_compiledStatement.get());
+    }
+
 private:
     struct Deleter
     {
@@ -166,7 +159,12 @@ public:
 
     void execute()
     {
-        NanotraceHR::Tracer tracer{"execute"_t, sqliteHighLevelCategory()};
+        using NanotraceHR::keyValue;
+        NanotraceHR::Tracer tracer{
+            "execute"_t,
+            sqliteHighLevelCategory(),
+            keyValue("sqlite statement", BaseStatement::handle()),
+        };
 
         Resetter resetter{this};
         BaseStatement::next();
@@ -175,7 +173,10 @@ public:
     template<typename... ValueType>
     void bindValues(const ValueType &...values)
     {
-        NanotraceHR::Tracer tracer{"bind"_t, sqliteHighLevelCategory()};
+        using NanotraceHR::keyValue;
+        NanotraceHR::Tracer tracer{"bind"_t,
+                                   sqliteHighLevelCategory(),
+                                   keyValue("sqlite statement", BaseStatement::handle())};
 
         static_assert(BindParameterCount == sizeof...(values), "Wrong binding parameter count!");
 
@@ -186,7 +187,10 @@ public:
     template<typename... ValueType>
     void write(const ValueType&... values)
     {
-        NanotraceHR::Tracer tracer{"write"_t, sqliteHighLevelCategory()};
+        using NanotraceHR::keyValue;
+        NanotraceHR::Tracer tracer{"write"_t,
+                                   sqliteHighLevelCategory(),
+                                   keyValue("sqlite statement", BaseStatement::handle())};
 
         Resetter resetter{this};
         bindValues(values...);
@@ -206,24 +210,37 @@ public:
     struct is_container<QVarLengthArray<T, Prealloc>> : std::true_type
     {};
 
+    template<typename T>
+    struct is_small_container : std::false_type
+    {};
+
+    template<typename T, qsizetype Prealloc>
+    struct is_small_container<QVarLengthArray<T, Prealloc>> : std::true_type
+    {};
+
     template<typename Container,
              std::size_t capacity = 32,
              typename = std::enable_if_t<is_container<Container>::value>,
              typename... QueryTypes>
     auto values(const QueryTypes &...queryValues)
     {
-        NanotraceHR::Tracer tracer{"values"_t, sqliteHighLevelCategory()};
+        using NanotraceHR::keyValue;
+        NanotraceHR::Tracer tracer{"values"_t,
+                                   sqliteHighLevelCategory(),
+                                   keyValue("sqlite statement", BaseStatement::handle())};
 
         Resetter resetter{this};
         Container resultValues;
-        resultValues.reserve(std::max(capacity, m_maximumResultCount));
+        using size_tupe = typename Container::size_type;
+        if constexpr (!is_small_container<Container>::value)
+            resultValues.reserve(static_cast<size_tupe>(std::max(capacity, m_maximumResultCount)));
 
         bindValues(queryValues...);
 
         while (BaseStatement::next())
             emplaceBackValues(resultValues);
 
-        setMaximumResultCount(resultValues.size());
+        setMaximumResultCount(static_cast<std::size_t>(resultValues.size()));
 
         return resultValues;
     }
@@ -241,7 +258,10 @@ public:
     template<typename ResultType, typename... QueryTypes>
     auto value(const QueryTypes &...queryValues)
     {
-        NanotraceHR::Tracer tracer{"value"_t, sqliteHighLevelCategory()};
+        using NanotraceHR::keyValue;
+        NanotraceHR::Tracer tracer{"value"_t,
+                                   sqliteHighLevelCategory(),
+                                   keyValue("sqlite statement", BaseStatement::handle())};
 
         Resetter resetter{this};
         ResultType resultValue{};
@@ -257,7 +277,10 @@ public:
     template<typename ResultType, typename... QueryTypes>
     auto optionalValue(const QueryTypes &...queryValues)
     {
-        NanotraceHR::Tracer tracer{"optionalValue"_t, sqliteHighLevelCategory()};
+        using NanotraceHR::keyValue;
+        NanotraceHR::Tracer tracer{"optionalValue"_t,
+                                   sqliteHighLevelCategory(),
+                                   keyValue("sqlite statement", BaseStatement::handle())};
 
         Resetter resetter{this};
         std::optional<ResultType> resultValue;
@@ -273,6 +296,7 @@ public:
     template<typename Type>
     static auto toValue(Utils::SmallStringView sqlStatement, Database &database)
     {
+        using NanotraceHR::keyValue;
         NanotraceHR::Tracer tracer{"toValue"_t, sqliteHighLevelCategory()};
 
         StatementImplementation statement(sqlStatement, database);
@@ -287,7 +311,10 @@ public:
     template<typename Callable, typename... QueryTypes>
     void readCallback(Callable &&callable, const QueryTypes &...queryValues)
     {
-        NanotraceHR::Tracer tracer{"readCallback"_t, sqliteHighLevelCategory()};
+        using NanotraceHR::keyValue;
+        NanotraceHR::Tracer tracer{"readCallback"_t,
+                                   sqliteHighLevelCategory(),
+                                   keyValue("sqlite statement", BaseStatement::handle())};
 
         Resetter resetter{this};
 
@@ -304,7 +331,10 @@ public:
     template<typename Container, typename... QueryTypes>
     void readTo(Container &container, const QueryTypes &...queryValues)
     {
-        NanotraceHR::Tracer tracer{"readTo"_t, sqliteHighLevelCategory()};
+        using NanotraceHR::keyValue;
+        NanotraceHR::Tracer tracer{"readTo"_t,
+                                   sqliteHighLevelCategory(),
+                                   keyValue("sqlite statement", BaseStatement::handle())};
 
         Resetter resetter{this};
 
@@ -402,9 +432,11 @@ public:
 
     private:
         using TracerCategory = std::decay_t<decltype(sqliteHighLevelCategory())>;
-        NanotraceHR::Tracer<TracerCategory, typename TracerCategory::IsActive> tracer{
-            "range"_t, sqliteHighLevelCategory()};
         StatementImplementation &m_statement;
+        NanotraceHR::Tracer<TracerCategory, typename TracerCategory::IsActive> tracer{
+            "range"_t,
+            sqliteHighLevelCategory(),
+            NanotraceHR::keyValue("sqlite statement", m_statement.handle())};
     };
 
     template<typename ResultType>
diff --git a/src/libs/sqlite/sqliteexception.cpp b/src/libs/sqlite/sqliteexception.cpp
index b5f581ad68..bb4a474adb 100644
--- a/src/libs/sqlite/sqliteexception.cpp
+++ b/src/libs/sqlite/sqliteexception.cpp
@@ -3,14 +3,20 @@
 
 #include "sqliteexception.h"
 
+#include "sqlitetracing.h"
+
 #include <utils/smallstringio.h>
 
+#include <nanotrace/nanotracehr.h>
+
 #include <sqlite.h>
 
 #include <QDebug>
 
 namespace Sqlite {
 
+using NanotraceHR::keyValue;
+
 const char *Exception::what() const noexcept
 {
     return "Sqlite::Exception";
@@ -18,7 +24,10 @@ const char *Exception::what() const noexcept
 
 const char *ExceptionWithMessage::what() const noexcept
 {
-    return "Sqlite::ExceptionWithMessage";
+    static Utils::SmallString text = Utils::SmallString::join(
+        {"Sqlite::ExceptionWithMessage", m_sqliteErrorMessage});
+
+    return text.data();
 }
 
 void ExceptionWithMessage::printWarning() const
@@ -26,6 +35,13 @@ void ExceptionWithMessage::printWarning() const
     qWarning() << what() << m_sqliteErrorMessage;
 }
 
+StatementIsBusy::StatementIsBusy(Utils::SmallString &&sqliteErrorMessage)
+    : ExceptionWithMessage{std::move(sqliteErrorMessage)}
+{
+    sqliteHighLevelCategory().threadEvent("StatementIsBusy"_t,
+                                          keyValue("error message", std::string_view{what()}));
+}
+
 const char *StatementIsBusy::what() const noexcept
 {
     return "Sqlite::StatementIsBusy";
@@ -36,9 +52,19 @@ const char *DatabaseIsBusy::what() const noexcept
     return "Sqlite::DatabaseIsBusy";
 }
 
+StatementHasError::StatementHasError(Utils::SmallString &&sqliteErrorMessage)
+    : ExceptionWithMessage{std::move(sqliteErrorMessage)}
+{
+    sqliteHighLevelCategory().threadEvent("StatementHasError"_t,
+                                          keyValue("error message", std::string_view{what()}));
+}
+
 const char *StatementHasError::what() const noexcept
 {
-    return "Sqlite::StatementHasError";
+    static Utils::SmallString text = Utils::SmallString::join(
+        {"Sqlite::StatementHasError: ", message()});
+
+    return text.data();
 }
 
 const char *StatementIsMisused::what() const noexcept
diff --git a/src/libs/sqlite/sqliteexception.h b/src/libs/sqlite/sqliteexception.h
index f0cadfc748..17a0639e19 100644
--- a/src/libs/sqlite/sqliteexception.h
+++ b/src/libs/sqlite/sqliteexception.h
@@ -23,13 +23,15 @@ public:
 class SQLITE_EXPORT ExceptionWithMessage : public Exception
 {
 public:
-    ExceptionWithMessage(Utils::SmallString &&sqliteErrorMessage = Utils::SmallString{})
+    ExceptionWithMessage(Utils::SmallString &&sqliteErrorMessage = {})
         : m_sqliteErrorMessage(std::move(sqliteErrorMessage))
     {}
 
     const char *what() const noexcept override;
     void printWarning() const;
 
+    std::string_view message() const noexcept { return m_sqliteErrorMessage; }
+
 private:
     Utils::SmallString m_sqliteErrorMessage;
 };
@@ -37,7 +39,7 @@ private:
 class SQLITE_EXPORT StatementIsBusy : public ExceptionWithMessage
 {
 public:
-    using ExceptionWithMessage::ExceptionWithMessage;
+    StatementIsBusy(Utils::SmallString &&sqliteErrorMessage);
     const char *what() const noexcept override;
 };
 
@@ -90,7 +92,8 @@ public:
 class SQLITE_EXPORT StatementHasError : public ExceptionWithMessage
 {
 public:
-    using ExceptionWithMessage::ExceptionWithMessage;
+    StatementHasError(Utils::SmallString &&sqliteErrorMessage);
+
     const char *what() const noexcept override;
 };
 
diff --git a/src/libs/sqlite/sqliteids.h b/src/libs/sqlite/sqliteids.h
index d64e4d9645..1ffd546d9f 100644
--- a/src/libs/sqlite/sqliteids.h
+++ b/src/libs/sqlite/sqliteids.h
@@ -5,6 +5,7 @@
 
 #include <utils/span.h>
 
+#include <nanotrace/nanotracehr.h>
 #include <type_traits>
 #include <vector>
 
@@ -64,6 +65,15 @@ public:
 
     [[noreturn, deprecated]] InternalIntegerType operator&() const { throw std::exception{}; }
 
+    template<typename String>
+    friend void convertToString(String &string, BasicId id)
+    {
+        if (id.isValid())
+            NanotraceHR::convertToString(string, id.internalId());
+        else
+            NanotraceHR::convertToString(string, "invalid");
+    }
+
 private:
     InternalIntegerType id = 0;
 };
@@ -88,4 +98,5 @@ struct hash<Sqlite::BasicId<Type, InternalIntegerType>>
         return std::hash<InternalIntegerType>{}(id.internalId());
     }
 };
+
 } // namespace std
diff --git a/src/libs/sqlite/sqliteindex.h b/src/libs/sqlite/sqliteindex.h
index f320fcd599..7c7a8dbb2b 100644
--- a/src/libs/sqlite/sqliteindex.h
+++ b/src/libs/sqlite/sqliteindex.h
@@ -40,6 +40,8 @@ public:
         return Utils::SmallString::join({"CREATE ",
                                          m_indexType == IndexType::Unique ? "UNIQUE " : "",
                                          "INDEX IF NOT EXISTS index_",
+                                         kindName(),
+                                         "_",
                                          m_tableName,
                                          "_",
                                          m_columnNames.join("_"),
@@ -65,6 +67,23 @@ public:
     }
 
 private:
+    std::string_view kindName() const
+    {
+        using namespace std::string_view_literals;
+
+        if (m_indexType == IndexType::Unique && m_condition.hasContent())
+            return "unique_partial"sv;
+
+        if (m_indexType == IndexType::Unique)
+            return "unique"sv;
+
+        if (m_condition.hasContent())
+            return "partial"sv;
+
+        return "normal"sv;
+    }
+
+private:
     Utils::SmallString m_tableName;
     Utils::SmallStringVector m_columnNames;
     IndexType m_indexType;
diff --git a/src/libs/sqlite/sqlitetracing.cpp b/src/libs/sqlite/sqlitetracing.cpp
new file mode 100644
index 0000000000..700546f146
--- /dev/null
+++ b/src/libs/sqlite/sqlitetracing.cpp
@@ -0,0 +1,38 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "sqlitetracing.h"
+
+namespace Sqlite {
+
+TraceFile &traceFile()
+{
+    static TraceFile traceFile{"tracing.json"};
+
+    return traceFile;
+}
+
+namespace {
+
+thread_local NanotraceHR::EventQueue<NanotraceHR::StringViewWithStringArgumentsTraceEvent,
+                                     sqliteTracingStatus()>
+    eventQueue(traceFile());
+
+} // namespace
+
+NanotraceHR::StringViewWithStringArgumentsCategory<sqliteTracingStatus()> &sqliteLowLevelCategory()
+{
+    thread_local NanotraceHR::StringViewWithStringArgumentsCategory<sqliteTracingStatus()>
+        sqliteLowLevelCategory_{"sqlite low level"_t, eventQueue, sqliteLowLevelCategory};
+    return sqliteLowLevelCategory_;
+}
+
+NanotraceHR::StringViewWithStringArgumentsCategory<sqliteTracingStatus()> &sqliteHighLevelCategory()
+{
+    thread_local NanotraceHR::StringViewWithStringArgumentsCategory<sqliteTracingStatus()>
+        sqliteHighLevelCategory_{"sqlite high level"_t, eventQueue, sqliteHighLevelCategory};
+
+    return sqliteHighLevelCategory_;
+}
+
+} // namespace Sqlite
diff --git a/src/libs/sqlite/sqlitetracing.h b/src/libs/sqlite/sqlitetracing.h
new file mode 100644
index 0000000000..8dadc6de0d
--- /dev/null
+++ b/src/libs/sqlite/sqlitetracing.h
@@ -0,0 +1,29 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "sqliteglobal.h"
+
+#include <nanotrace/nanotracehr.h>
+
+namespace Sqlite {
+using namespace NanotraceHR::Literals;
+
+constexpr NanotraceHR::Tracing sqliteTracingStatus()
+{
+#ifdef ENABLE_SQLITE_TRACING
+    return NanotraceHR::Tracing::IsEnabled;
+#else
+    return NanotraceHR::Tracing::IsDisabled;
+#endif
+}
+
+using TraceFile = NanotraceHR::TraceFile<sqliteTracingStatus()>;
+
+SQLITE_EXPORT TraceFile &traceFile();
+
+NanotraceHR::StringViewWithStringArgumentsCategory<sqliteTracingStatus()> &sqliteLowLevelCategory();
+
+SQLITE_EXPORT NanotraceHR::StringViewWithStringArgumentsCategory<sqliteTracingStatus()> &
+sqliteHighLevelCategory();
+
+} // namespace Sqlite
diff --git a/src/libs/sqlite/sqlitevalue.h b/src/libs/sqlite/sqlitevalue.h
index fe576f3fec..725682494b 100644
--- a/src/libs/sqlite/sqlitevalue.h
+++ b/src/libs/sqlite/sqlitevalue.h
@@ -6,6 +6,7 @@
 #include "sqliteblob.h"
 #include "sqliteexception.h"
 
+#include <nanotrace/nanotracehr.h>
 #include <utils/smallstring.h>
 
 #include <QVariant>
@@ -33,7 +34,7 @@ public:
     explicit ValueBase(NullValue) {}
 
     explicit ValueBase(VariantType &&value)
-        : value(value)
+        : value(std::move(value))
     {}
 
     explicit ValueBase(const char *value)
@@ -43,6 +44,7 @@ public:
     explicit ValueBase(long long value)
         : value(value)
     {}
+
     explicit ValueBase(int value)
         : value(static_cast<long long>(value))
     {}
@@ -60,11 +62,6 @@ public:
 
     {}
 
-    explicit ValueBase(StringType &&value)
-        : value(std::move(value))
-
-    {}
-
     explicit ValueBase(BlobView value)
         : value(value)
 
@@ -229,14 +226,42 @@ public:
 class ValueView : public ValueBase<Utils::SmallStringView, BlobView>
 {
 public:
+    ValueView() = default;
+
+    explicit ValueView(NullValue) {}
+
     explicit ValueView(ValueBase &&base)
         : ValueBase(std::move(base))
     {}
 
+    explicit ValueView(Utils::SmallStringView value)
+        : ValueBase(value)
+    {}
+
+    explicit ValueView(BlobView value)
+        : ValueBase(value)
+    {}
+
+    explicit ValueView(long long value)
+        : ValueBase(value)
+    {}
+
+    explicit ValueView(int value)
+        : ValueBase(static_cast<long long>(value))
+    {}
+
+    explicit ValueView(uint value)
+        : ValueBase(static_cast<long long>(value))
+    {}
+
+    explicit ValueView(double value)
+        : ValueBase(value)
+    {}
+
     template<typename Type>
     static ValueView create(Type &&value_)
     {
-        return ValueView{ValueBase{value_}};
+        return ValueView(std::forward<Type>(value_));
     }
 };
 
@@ -386,4 +411,27 @@ private:
 };
 
 using Values = std::vector<Value>;
+
+template<typename String>
+void convertToString(String &string, const Value &value)
+{
+    switch (value.type()) {
+    case ValueType::Null:
+        convertToString(string, "null");
+        break;
+    case ValueType::Integer:
+        convertToString(string, value.toInteger());
+        break;
+    case ValueType::Float:
+        convertToString(string, value.toFloat());
+        break;
+    case ValueType::String:
+        convertToString(string, value.toStringView());
+        break;
+    case ValueType::Blob:
+        convertToString(string, "blob");
+        break;
+    }
+}
+
 } // namespace Sqlite
diff --git a/src/libs/utils/CMakeLists.txt b/src/libs/utils/CMakeLists.txt
index 3dff6c4f6f..c1cf3f86a8 100644
--- a/src/libs/utils/CMakeLists.txt
+++ b/src/libs/utils/CMakeLists.txt
@@ -270,7 +270,6 @@ extend_qtc_library(Utils
           fsengine/fsengine_impl.h
           fsengine/diriterator.h
           fsengine/fileiteratordevicesappender.h
-          fsengine/rootinjectfsengine.h
           fsengine/fixedlistfsengine.h
           fsengine/fsenginehandler.cpp
           fsengine/fsenginehandler.h
diff --git a/src/libs/utils/algorithm.h b/src/libs/utils/algorithm.h
index d1c3f37bff..849316c9a9 100644
--- a/src/libs/utils/algorithm.h
+++ b/src/libs/utils/algorithm.h
@@ -987,6 +987,14 @@ C filtered(const C &container, R (S::*predicate)() const)
     return out;
 }
 
+template<typename C, typename R, typename S>
+Q_REQUIRED_RESULT C filtered(const C &container, R S::*predicate)
+{
+    C out;
+    std::copy_if(std::begin(container), std::end(container), inserter(out), std::mem_fn(predicate));
+    return out;
+}
+
 //////////////////
 // filteredCast
 /////////////////
diff --git a/src/libs/utils/devicefileaccess.cpp b/src/libs/utils/devicefileaccess.cpp
index 50d1f276ef..303ffa6bf5 100644
--- a/src/libs/utils/devicefileaccess.cpp
+++ b/src/libs/utils/devicefileaccess.cpp
@@ -1059,6 +1059,10 @@ expected_str<QByteArray> UnixDeviceFileAccess::fileContents(const FilePath &file
     if (disconnected())
         return make_unexpected_disconnected();
 
+    expected_str<FilePath> localSource = filePath.localSource();
+    if (localSource && *localSource != filePath)
+        return localSource->fileContents(limit, offset);
+
     QStringList args = {"if=" + filePath.path()};
     if (limit > 0 || offset > 0) {
         const qint64 gcd = std::gcd(limit, offset);
@@ -1088,6 +1092,10 @@ expected_str<qint64> UnixDeviceFileAccess::writeFileContents(const FilePath &fil
     if (disconnected())
         return make_unexpected_disconnected();
 
+    expected_str<FilePath> localSource = filePath.localSource();
+    if (localSource && *localSource != filePath)
+        return localSource->writeFileContents(data);
+
     QStringList args = {"of=" + filePath.path()};
     RunResult result = runInShell({"dd", args, OsType::OsTypeLinux}, data);
 
diff --git a/src/libs/utils/environment.cpp b/src/libs/utils/environment.cpp
index be43f2a206..190cde2d2d 100644
--- a/src/libs/utils/environment.cpp
+++ b/src/libs/utils/environment.cpp
@@ -433,60 +433,82 @@ const NameValueDictionary &Environment::resolved() const
             m_dict = Environment::systemEnvironment().toDictionary();
             m_fullDict = true;
             break;
-        case SetFixedDictionary:
-            m_dict = std::get<SetFixedDictionary>(item);
-            m_fullDict = true;
+        case SetFixedDictionary: {
+            const auto dict = std::get_if<SetFixedDictionary>(&item);
+            if (QTC_GUARD(dict)) {
+                m_dict = *dict;
+                m_fullDict = true;
+            }
             break;
+        }
         case SetValue: {
-            auto [key, value, enabled] = std::get<SetValue>(item);
-            m_dict.set(key, value, enabled);
+            const auto setvalue = std::get_if<SetValue>(&item);
+            if (QTC_GUARD(setvalue)) {
+                auto [key, value, enabled] = *setvalue;
+                m_dict.set(key, value, enabled);
+            }
             break;
         }
         case SetFallbackValue: {
-            auto [key, value] = std::get<SetFallbackValue>(item);
-            if (m_fullDict) {
-                if (m_dict.value(key).isEmpty())
+            const auto fallbackvalue = std::get_if<SetFallbackValue>(&item);
+            if (QTC_GUARD(fallbackvalue)) {
+                auto [key, value] = *fallbackvalue;
+                if (m_fullDict) {
+                    if (m_dict.value(key).isEmpty())
+                        m_dict.set(key, value, true);
+                } else {
+                    QTC_ASSERT(false, qDebug() << "operating on partial dictionary");
                     m_dict.set(key, value, true);
-            } else {
-                QTC_ASSERT(false, qDebug() << "operating on partial dictionary");
-                m_dict.set(key, value, true);
+                }
             }
             break;
         }
-        case UnsetValue:
-            m_dict.unset(std::get<UnsetValue>(item));
+        case UnsetValue: {
+            const auto unsetvalue = std::get_if<UnsetValue>(&item);
+            if (QTC_GUARD(unsetvalue))
+                m_dict.unset(*unsetvalue);
             break;
+        }
         case PrependOrSet: {
-            auto [key, value, sep] = std::get<PrependOrSet>(item);
-            QTC_ASSERT(!key.contains('='), return m_dict);
-            const auto it = m_dict.findKey(key);
-            if (it == m_dict.m_values.end()) {
-                m_dict.m_values.insert(DictKey(key, m_dict.nameCaseSensitivity()), {value, true});
-            } else {
-                // Prepend unless it is already there
-                const QString toPrepend = value + pathListSeparator(sep);
-                if (!it.value().first.startsWith(toPrepend))
-                    it.value().first.prepend(toPrepend);
+            const auto prependorset = std::get_if<PrependOrSet>(&item);
+            if (QTC_GUARD(prependorset)) {
+                auto [key, value, sep] = *prependorset;
+                QTC_ASSERT(!key.contains('='), return m_dict);
+                const auto it = m_dict.findKey(key);
+                if (it == m_dict.m_values.end()) {
+                    m_dict.m_values.insert(DictKey(key, m_dict.nameCaseSensitivity()), {value, true});
+                } else {
+                    // Prepend unless it is already there
+                    const QString toPrepend = value + pathListSeparator(sep);
+                    if (!it.value().first.startsWith(toPrepend))
+                        it.value().first.prepend(toPrepend);
+                }
             }
             break;
         }
         case AppendOrSet: {
-            auto [key, value, sep] = std::get<AppendOrSet>(item);
-            QTC_ASSERT(!key.contains('='), return m_dict);
-            const auto it = m_dict.findKey(key);
-            if (it == m_dict.m_values.end()) {
-                m_dict.m_values.insert(DictKey(key, m_dict.nameCaseSensitivity()), {value, true});
-            } else {
-                // Prepend unless it is already there
-                const QString toAppend = pathListSeparator(sep) + value;
-                if (!it.value().first.endsWith(toAppend))
-                    it.value().first.append(toAppend);
+            const auto appendorset = std::get_if<AppendOrSet>(&item);
+            if (QTC_GUARD(appendorset)) {
+                auto [key, value, sep] = *appendorset;
+                QTC_ASSERT(!key.contains('='), return m_dict);
+                const auto it = m_dict.findKey(key);
+                if (it == m_dict.m_values.end()) {
+                    m_dict.m_values.insert(DictKey(key, m_dict.nameCaseSensitivity()), {value, true});
+                } else {
+                    // Prepend unless it is already there
+                    const QString toAppend = pathListSeparator(sep) + value;
+                    if (!it.value().first.endsWith(toAppend))
+                        it.value().first.append(toAppend);
+                }
             }
             break;
         }
         case Modify: {
-            EnvironmentItems items = std::get<Modify>(item);
-            m_dict.modify(items);
+            const auto modify = std::get_if<Modify>(&item);
+            if (QTC_GUARD(modify)) {
+                EnvironmentItems items = *modify;
+                m_dict.modify(items);
+            }
             break;
         }
         case SetupEnglishOutput:
diff --git a/src/libs/utils/expected.h b/src/libs/utils/expected.h
index 33231c1246..0e018eb8ab 100644
--- a/src/libs/utils/expected.h
+++ b/src/libs/utils/expected.h
@@ -30,3 +30,12 @@ using expected_str = tl::expected<T, QString>;
     } \
     do { \
     } while (0)
+
+#define QTC_CHECK_EXPECTED(expected) \
+    if (Q_LIKELY(expected)) { \
+    } else { \
+        ::Utils::writeAssertLocation( \
+            QString("%1:%2: %3").arg(__FILE__).arg(__LINE__).arg(expected.error()).toUtf8().data()); \
+    } \
+    do { \
+    } while (0)
diff --git a/src/libs/utils/filepath.cpp b/src/libs/utils/filepath.cpp
index 1b9b6e943c..b62f222475 100644
--- a/src/libs/utils/filepath.cpp
+++ b/src/libs/utils/filepath.cpp
@@ -19,9 +19,11 @@
 #include <QFileInfo>
 #include <QRegularExpression>
 #include <QStringView>
+#include <QTemporaryFile>
 #include <QUrl>
+
+#include <QtConcurrent>
 #include <QtGlobal>
-#include <QTemporaryFile>
 
 #ifdef Q_OS_WIN
 #ifdef QTCREATOR_PCH_H
@@ -1497,21 +1499,28 @@ FilePath FilePath::relativePathFrom(const FilePath &anchor) const
 
     FilePath absPath;
     QString filename;
-    if (isFile()) {
+
+    const QList<FilePathInfo> infos
+        = QtConcurrent::blockingMapped(QList<FilePath>{*this, anchor}, [](const FilePath &path) {
+              return path.filePathInfo();
+          });
+
+    if (infos.first().fileFlags.testFlag(FilePathInfo::FileFlag::FileType)) {
         absPath = absolutePath();
         filename = fileName();
-    } else if (isDir()) {
+    } else if (infos.first().fileFlags.testFlag(FilePathInfo::FileFlag::DirectoryType)) {
         absPath = absoluteFilePath();
     } else {
         return {};
     }
     FilePath absoluteAnchorPath;
-    if (anchor.isFile())
+    if (infos.last().fileFlags.testFlag(FilePathInfo::FileFlag::FileType))
         absoluteAnchorPath = anchor.absolutePath();
-    else if (anchor.isDir())
+    else if (infos.last().fileFlags.testFlag(FilePathInfo::FileFlag::DirectoryType))
         absoluteAnchorPath = anchor.absoluteFilePath();
     else
         return {};
+
     QString relativeFilePath = calcRelativePath(absPath.pathView(), absoluteAnchorPath.pathView());
     if (!filename.isEmpty()) {
         if (relativeFilePath == ".")
diff --git a/src/libs/utils/fileutils.cpp b/src/libs/utils/fileutils.cpp
index a2998e2f07..b3649a457d 100644
--- a/src/libs/utils/fileutils.cpp
+++ b/src/libs/utils/fileutils.cpp
@@ -197,7 +197,8 @@ FileSaver::FileSaver(const FilePath &filePath, QIODevice::OpenMode mode)
         m_file.reset(tf);
     } else {
         const bool readOnlyOrAppend = mode & (QIODevice::ReadOnly | QIODevice::Append);
-        m_isSafe = !readOnlyOrAppend && !filePath.hasHardLinks();
+        m_isSafe = !readOnlyOrAppend && !filePath.hasHardLinks()
+                   && !qtcEnvironmentVariableIsSet("QTC_DISABLE_ATOMICSAVE");
         if (m_isSafe)
             m_file.reset(new SaveFile(filePath));
         else
diff --git a/src/libs/utils/fsengine/fsengine_impl.h b/src/libs/utils/fsengine/fsengine_impl.h
index 9d11b917ac..1a49f77cd2 100644
--- a/src/libs/utils/fsengine/fsengine_impl.h
+++ b/src/libs/utils/fsengine/fsengine_impl.h
@@ -48,7 +48,8 @@ public:
     uint ownerId(FileOwner) const override;
     QString owner(FileOwner) const override;
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
+    // The FileTime change in QAbstractFileEngine, in qtbase, is in since Qt 6.7.1
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 1)
     using FileTime = QFile::FileTime;
 #endif
     bool setFileTime(const QDateTime &newDate, FileTime time) override;
diff --git a/src/libs/utils/fsengine/fsenginehandler.cpp b/src/libs/utils/fsengine/fsenginehandler.cpp
index 29fe759a86..d6751d8b6a 100644
--- a/src/libs/utils/fsengine/fsenginehandler.cpp
+++ b/src/libs/utils/fsengine/fsenginehandler.cpp
@@ -3,17 +3,42 @@
 
 #include "fsenginehandler.h"
 
+#include "fileiteratordevicesappender.h"
 #include "fixedlistfsengine.h"
-#include "fsengine_impl.h"
-#include "rootinjectfsengine.h"
-
 #include "fsengine.h"
+#include "fsengine_impl.h"
 
 #include "../algorithm.h"
 #include "../hostosinfo.h"
 
+#include <QtCore/private/qfsfileengine_p.h>
+
 namespace Utils::Internal {
 
+class RootInjectFSEngine final : public QFSFileEngine
+{
+public:
+    using QFSFileEngine::QFSFileEngine;
+
+public:
+#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
+    IteratorUniquePtr beginEntryList(const QString &path,
+                                     QDir::Filters filters,
+                                     const QStringList &filterNames) override
+    {
+        return std::make_unique<FileIteratorWrapper>(
+            QFSFileEngine::beginEntryList(path, filters, filterNames));
+    }
+#else
+    Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames) override
+    {
+        std::unique_ptr<QAbstractFileEngineIterator> baseIterator(
+            QFSFileEngine::beginEntryList(filters, filterNames));
+        return new FileIteratorWrapper(std::move(baseIterator));
+    }
+#endif
+};
+
 static FilePath removeDoubleSlash(const QString &fileName)
 {
     // Reduce every two or more slashes to a single slash.
diff --git a/src/libs/utils/fsengine/rootinjectfsengine.h b/src/libs/utils/fsengine/rootinjectfsengine.h
deleted file mode 100644
index 9eb6a8a832..0000000000
--- a/src/libs/utils/fsengine/rootinjectfsengine.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (C) 2022 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#pragma once
-
-#include "fileiteratordevicesappender.h"
-
-#include <QtCore/private/qfsfileengine_p.h>
-
-namespace Utils {
-namespace Internal {
-
-class RootInjectFSEngine : public QFSFileEngine
-{
-public:
-    using QFSFileEngine::QFSFileEngine;
-
-public:
-#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
-    IteratorUniquePtr beginEntryList(const QString &path,
-                                     QDir::Filters filters,
-                                     const QStringList &filterNames) override
-    {
-        return std::make_unique<FileIteratorWrapper>(
-            QFSFileEngine::beginEntryList(path, filters, filterNames));
-    }
-#else
-    Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames) override
-    {
-        std::unique_ptr<QAbstractFileEngineIterator> baseIterator(
-            QFSFileEngine::beginEntryList(filters, filterNames));
-        return new FileIteratorWrapper(std::move(baseIterator));
-    }
-#endif
-};
-
-} // namespace Internal
-} // namespace Utils
diff --git a/src/libs/utils/namevaluesdialog.cpp b/src/libs/utils/namevaluesdialog.cpp
index 35587f8791..0b009c7568 100644
--- a/src/libs/utils/namevaluesdialog.cpp
+++ b/src/libs/utils/namevaluesdialog.cpp
@@ -45,7 +45,11 @@ signals:
     void lostFocus();
 
 private:
-    void focusOutEvent(QFocusEvent *) override { emit lostFocus(); }
+    void focusOutEvent(QFocusEvent *e) override
+    {
+        QPlainTextEdit::focusOutEvent(e);
+        emit lostFocus();
+    }
 };
 
 } // namespace Internal
diff --git a/src/libs/utils/outputformatter.cpp b/src/libs/utils/outputformatter.cpp
index f8b3d8cec7..a318bb1cca 100644
--- a/src/libs/utils/outputformatter.cpp
+++ b/src/libs/utils/outputformatter.cpp
@@ -402,23 +402,32 @@ const QList<FormattedText> OutputFormatter::linkifiedText(
         }
 
         for (int nextLocalTextPos = 0; nextLocalTextPos < t.text.size(); ) {
-
-            // There are no more links in this part, so copy the rest of the text as-is.
-            if (nextLinkSpecIndex >= linkSpecs.size()) {
+            const auto copyRestOfSegmentAsIs = [&] {
                 linkified << FormattedText(t.text.mid(nextLocalTextPos), t.format);
                 totalTextLengthSoFar += t.text.length() - nextLocalTextPos;
+            };
+
+            // We are out of links.
+            if (nextLinkSpecIndex >= linkSpecs.size()) {
+                copyRestOfSegmentAsIs();
                 break;
             }
 
             const OutputLineParser::LinkSpec &linkSpec = linkSpecs.at(nextLinkSpecIndex);
             const int localLinkStartPos = linkSpec.startPos - totalPreviousTextLength;
+
+            // There are more links, but not in this segment.
+            if (localLinkStartPos >= t.text.size()) {
+                copyRestOfSegmentAsIs();
+                break;
+            }
+
             ++nextLinkSpecIndex;
 
             // We ignore links that would cross format boundaries.
             if (localLinkStartPos < nextLocalTextPos
                     || localLinkStartPos + linkSpec.length > t.text.length()) {
-                linkified << FormattedText(t.text.mid(nextLocalTextPos), t.format);
-                totalTextLengthSoFar += t.text.length() - nextLocalTextPos;
+                copyRestOfSegmentAsIs();
                 break;
             }
 
diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp
index b399d86b36..3f06e04fc1 100644
--- a/src/libs/utils/qtcprocess.cpp
+++ b/src/libs/utils/qtcprocess.cpp
@@ -769,6 +769,7 @@ private:
     std::unique_ptr<ProcessInterfaceHandler> m_processHandler;
     mutable QMutex m_mutex;
     QList<ProcessInterfaceSignal *> m_signals;
+    Guard m_guard;
 };
 
 class ProcessPrivate : public QObject
@@ -961,6 +962,10 @@ GeneralProcessBlockingImpl::GeneralProcessBlockingImpl(ProcessPrivate *parent)
 
 bool GeneralProcessBlockingImpl::waitForSignal(ProcessSignalType newSignal, QDeadlineTimer timeout)
 {
+    QTC_ASSERT(!m_guard.isLocked(), qWarning("Process::waitForSignal() called recursively. "
+                                             "The call is being ignored."); return false);
+    GuardLocker locker(m_guard);
+
     m_processHandler->setParent(nullptr);
 
     QThread thread;
diff --git a/src/libs/utils/reloadpromptutils.cpp b/src/libs/utils/reloadpromptutils.cpp
index 5257138245..8a07592d3f 100644
--- a/src/libs/utils/reloadpromptutils.cpp
+++ b/src/libs/utils/reloadpromptutils.cpp
@@ -89,12 +89,10 @@ QTCREATOR_UTILS_EXPORT FileDeletedPromptAnswer
                                "Do you want to save it under a different name, or close "
                                "the editor?").arg(QDir::toNativeSeparators(fileName));
     QMessageBox box(QMessageBox::Question, title, msg, QMessageBox::NoButton, parent);
-    QPushButton *close =
-            box.addButton(Tr::tr("&Close"), QMessageBox::RejectRole);
+    QPushButton *saveas = box.addButton(Tr::tr("Save &as..."), QMessageBox::ActionRole);
+    QPushButton *close = box.addButton(Tr::tr("&Close"), QMessageBox::RejectRole);
     QPushButton *closeAll =
             box.addButton(Tr::tr("C&lose All"), QMessageBox::RejectRole);
-    QPushButton *saveas =
-            box.addButton(Tr::tr("Save &as..."), QMessageBox::ActionRole);
     QPushButton *save =
             box.addButton(Tr::tr("&Save"), QMessageBox::AcceptRole);
     box.setDefaultButton(saveas);
diff --git a/src/libs/utils/smallstring.h b/src/libs/utils/smallstring.h
index c522a6cae9..e8c3d74b92 100644
--- a/src/libs/utils/smallstring.h
+++ b/src/libs/utils/smallstring.h
@@ -93,7 +93,7 @@ public:
                            static_cast<std::size_t>(std::distance(begin, end))}
     {}
 
-    template<typename Type, typename = std::enable_if_t<std::is_pointer<Type>::value>>
+    template<typename Type, typename std::enable_if_t<std::is_pointer<Type>::value, bool> = true>
     BasicSmallString(Type characterPointer) noexcept
         : BasicSmallString(characterPointer, std::char_traits<char>::length(characterPointer))
     {
@@ -118,7 +118,7 @@ public:
 
     template<typename BeginIterator,
              typename EndIterator,
-             typename = std::enable_if_t<std::is_same<BeginIterator, EndIterator>::value>>
+             typename std::enable_if_t<std::is_same<BeginIterator, EndIterator>::value, bool> = true>
     BasicSmallString(BeginIterator begin, EndIterator end) noexcept
         : BasicSmallString(&(*begin), size_type(end - begin))
     {}
@@ -354,6 +354,14 @@ public:
         return false;
     }
 
+    bool startsWith(QStringView subStringToSearch) const noexcept
+    {
+        if (size() >= Utils::usize(subStringToSearch))
+            return subStringToSearch == QLatin1StringView{data(), subStringToSearch.size()};
+
+        return false;
+    }
+
     bool startsWith(char characterToSearch) const noexcept
     {
         return data()[0] == characterToSearch;
@@ -423,13 +431,55 @@ public:
         size_type oldSize = size();
         size_type newSize = oldSize + string.size();
 
-        reserve(optimalCapacity(newSize));
+        if (fitsNotInCapacity(newSize))
+            reserve(optimalCapacity(newSize));
+
         std::char_traits<char>::copy(std::next(data(), static_cast<std::ptrdiff_t>(oldSize)),
                                      string.data(),
                                      string.size());
         setSize(newSize);
     }
 
+    void append(char character) noexcept
+    {
+        size_type oldSize = size();
+        size_type newSize = oldSize + 1;
+
+        if (fitsNotInCapacity(newSize))
+            reserve(optimalCapacity(newSize));
+
+        auto current = std::next(data(), static_cast<std::ptrdiff_t>(oldSize));
+        *current = character;
+        setSize(newSize);
+    }
+
+    template<typename Type, typename std::enable_if_t<std::is_arithmetic_v<Type>, bool> = true>
+    void append(Type number)
+    {
+#if defined(__cpp_lib_to_chars) && (__cpp_lib_to_chars >= 201611L)
+        // 2 bytes for the sign and because digits10 returns the floor
+        char buffer[std::numeric_limits<Type>::digits10 + 2];
+        auto result = std::to_chars(buffer, buffer + sizeof(buffer), number);
+        auto endOfConversionString = result.ptr;
+
+        append({buffer, endOfConversionString});
+#else
+        if constexpr (std::is_floating_point_v<Type>) {
+            QLocale locale{QLocale::Language::C};
+            append(locale.toString(number));
+            return;
+        } else {
+            // 2 bytes for the sign and because digits10 returns the floor
+            char buffer[std::numeric_limits<Type>::digits10 + 2];
+            auto result = std::to_chars(buffer, buffer + sizeof(buffer), number);
+            auto endOfConversionString = result.ptr;
+
+            append({buffer, endOfConversionString});
+        }
+
+#endif
+    }
+
     void append(QStringView string) noexcept
     {
         QStringEncoder encoder{QStringEncoder::Utf8};
@@ -469,6 +519,13 @@ public:
         return *this;
     }
 
+    BasicSmallString &operator+=(char character) noexcept
+    {
+        append(character);
+
+        return *this;
+    }
+
     BasicSmallString &operator+=(QStringView string) noexcept
     {
         append(string);
@@ -476,6 +533,14 @@ public:
         return *this;
     }
 
+    template<typename Type, typename std::enable_if_t<std::is_arithmetic_v<Type>, bool> = true>
+    BasicSmallString &operator+=(Type number) noexcept
+    {
+        append(number);
+
+        return *this;
+    }
+
     BasicSmallString &operator+=(std::initializer_list<SmallStringView> list) noexcept
     {
         appendInitializerList(list, size());
@@ -580,37 +645,12 @@ public:
         return joinedString;
     }
 
-    static
-    BasicSmallString number(int number)
+    template<typename Type, typename std::enable_if_t<std::is_arithmetic_v<Type>, bool> = true>
+    static BasicSmallString number(Type number)
     {
-        // 2 bytes for the sign and because digits10 returns the floor
-        char buffer[std::numeric_limits<int>::digits10 + 2];
-        auto result = std::to_chars(buffer, buffer + sizeof(buffer), number);
-        auto endOfConversionString = result.ptr;
-        return BasicSmallString(buffer, endOfConversionString);
-    }
-
-    static BasicSmallString number(long long int number) noexcept
-    {
-        // 2 bytes for the sign and because digits10 returns the floor
-        char buffer[std::numeric_limits<long long int>::digits10 + 2];
-        auto result = std::to_chars(buffer, buffer + sizeof(buffer), number);
-        auto endOfConversionString = result.ptr;
-        return BasicSmallString(buffer, endOfConversionString);
-    }
-
-    static BasicSmallString number(double number) noexcept
-    {
-#if defined(__cpp_lib_to_chars) && (__cpp_lib_to_chars >= 201611L)
-        // 2 bytes for the sign and because digits10 returns the floor
-        char buffer[std::numeric_limits<double>::digits10 + 2];
-        auto result = std::to_chars(buffer, buffer + sizeof(buffer), number);
-        auto endOfConversionString = result.ptr;
-        return BasicSmallString(buffer, endOfConversionString);
-#else
-        QLocale locale{QLocale::Language::C};
-        return BasicSmallString{locale.toString(number)};
-#endif
+        BasicSmallString string;
+        string.append(number);
+        return string;
     }
 
     char &operator[](std::size_t index) noexcept { return *(data() + index); }
@@ -655,7 +695,6 @@ public:
     friend BasicSmallString operator+(const BasicSmallString &first,
                                       const char (&second)[ArraySize]) noexcept
     {
-
         return operator+(first, SmallStringView(second));
     }
 
@@ -687,8 +726,10 @@ unittest_public:
 
     bool fitsNotInCapacity(size_type capacity) const noexcept
     {
-        return (isShortString() && capacity > shortStringCapacity())
-               || (!isShortString() && capacity > m_data.reference.capacity);
+        if (isShortString())
+            return capacity > shortStringCapacity();
+
+        return capacity > m_data.reference.capacity;
     }
 
     static size_type optimalHeapCapacity(const size_type size) noexcept
diff --git a/src/libs/utils/stringutils.cpp b/src/libs/utils/stringutils.cpp
index d8de512b32..55a2902acc 100644
--- a/src/libs/utils/stringutils.cpp
+++ b/src/libs/utils/stringutils.cpp
@@ -672,4 +672,10 @@ void MarkdownHighlighter::highlightBlock(const QString &text)
     }
 }
 
+QString ansiColoredText(const QString &text, const QColor &color)
+{
+    static const QString formatString("\033[38;2;%1;%2;%3m%4\033[0m");
+    return formatString.arg(color.red()).arg(color.green()).arg(color.blue()).arg(text);
+}
+
 } // namespace Utils
diff --git a/src/libs/utils/stringutils.h b/src/libs/utils/stringutils.h
index 3e729e672c..cab6d774f3 100644
--- a/src/libs/utils/stringutils.h
+++ b/src/libs/utils/stringutils.h
@@ -138,4 +138,6 @@ private:
     QBrush m_codeBgBrush;
 };
 
+QTCREATOR_UTILS_EXPORT QString ansiColoredText(const QString &text, const QColor &color);
+
 } // namespace Utils
diff --git a/src/libs/utils/stylehelper.cpp b/src/libs/utils/stylehelper.cpp
index 69b5e39556..07f526a4af 100644
--- a/src/libs/utils/stylehelper.cpp
+++ b/src/libs/utils/stylehelper.cpp
@@ -1010,7 +1010,13 @@ QFont StyleHelper::uiFont(UiElement element)
     const qreal qrealPointSize = metrics.pixelSize * pixelsToPointSizeFactor;
     font.setPointSizeF(qrealPointSize);
 
-    font.setWeight(metrics.weight);
+    // Intermediate font weights can produce blurry rendering and are harder to read.
+    // For "non-retina" screens, apply the weight only for some fonts.
+    static const bool isHighDpi = qApp->devicePixelRatio() >= 2;
+    const bool setWeight = isHighDpi || element == UiElementCaptionStrong
+                           || element <= UiElementH4;
+    if (setWeight)
+        font.setWeight(metrics.weight);
 
     return font;
 }
diff --git a/src/libs/utils/theme/theme.cpp b/src/libs/utils/theme/theme.cpp
index 9b24078f86..536deafc22 100644
--- a/src/libs/utils/theme/theme.cpp
+++ b/src/libs/utils/theme/theme.cpp
@@ -18,6 +18,7 @@
 namespace Utils {
 
 static Theme *m_creatorTheme = nullptr;
+static std::optional<QPalette> m_initialPalette;
 
 ThemePrivate::ThemePrivate()
 {
@@ -37,9 +38,25 @@ Theme *proxyTheme()
     return new Theme(m_creatorTheme);
 }
 
+static bool paletteIsDark(const QPalette &pal)
+{
+    return pal.color(QPalette::Window).lightnessF() < pal.color(QPalette::WindowText).lightnessF();
+}
+
+static bool isOverridingPalette(const Theme *theme)
+{
+    if (theme->flag(Theme::DerivePaletteFromTheme))
+        return true;
+    if (theme->flag(Theme::DerivePaletteFromThemeIfNeeded)
+        && paletteIsDark(Theme::initialPalette()) != theme->flag(Theme::DarkUserInterface)) {
+        return true;
+    }
+    return false;
+}
+
 void setThemeApplicationPalette()
 {
-    if (m_creatorTheme && m_creatorTheme->flag(Theme::ApplyThemePaletteGlobally))
+    if (m_creatorTheme && isOverridingPalette(m_creatorTheme))
         QApplication::setPalette(m_creatorTheme->palette());
 }
 
@@ -185,7 +202,7 @@ void Theme::setDisplayName(const QString &name)
 
 void Theme::readSettingsInternal(QSettings &settings)
 {
-    const QStringList includes = settings.value("Includes").toString().split(",", Qt::SkipEmptyParts);
+    const QStringList includes = settings.value("Includes").toStringList();
 
     for (const QString &include : includes) {
         FilePath path = FilePath::fromString(d->fileName);
@@ -311,7 +328,13 @@ bool Theme::systemUsesDarkMode()
     if (HostOsInfo::isMacHost())
         return macOSSystemIsDark();
 
-    return false;
+    // Avoid enforcing the initial palette.
+    // The initial palette must be set after setting the macOS appearance in setInitialPalette,
+    // but systemUsesDarkMode is used to determine the default theme, which is in turn required
+    // for the setInitialPalette call
+    if (m_initialPalette)
+        return paletteIsDark(*m_initialPalette);
+    return paletteIsDark(QApplication::palette());
 }
 
 // If you copy QPalette, default values stay at default, even if that default is different
@@ -347,14 +370,17 @@ void Theme::setHelpMenu(QMenu *menu)
 
 QPalette Theme::initialPalette()
 {
-    static QPalette palette = copyPalette(QApplication::palette());
-    return palette;
+    if (!m_initialPalette) {
+        m_initialPalette = copyPalette(QApplication::palette());
+        QApplication::setPalette(*m_initialPalette);
+    }
+    return *m_initialPalette;
 }
 
 QPalette Theme::palette() const
 {
     QPalette pal = initialPalette();
-    if (!flag(DerivePaletteFromTheme))
+    if (!isOverridingPalette(this))
         return pal;
 
     const static struct {
diff --git a/src/libs/utils/theme/theme.h b/src/libs/utils/theme/theme.h
index 6b3bf97d45..cd89c3ae48 100644
--- a/src/libs/utils/theme/theme.h
+++ b/src/libs/utils/theme/theme.h
@@ -527,7 +527,7 @@ public:
         DrawToolBarBorders,
         ComboBoxDrawTextShadow,
         DerivePaletteFromTheme,
-        ApplyThemePaletteGlobally,
+        DerivePaletteFromThemeIfNeeded,
         FlatToolBars,
         FlatSideBarIcons,
         FlatProjectsMode,
diff --git a/src/libs/utils/tooltip/tooltip.cpp b/src/libs/utils/tooltip/tooltip.cpp
index 93f4c1d2ff..da11540c08 100644
--- a/src/libs/utils/tooltip/tooltip.cpp
+++ b/src/libs/utils/tooltip/tooltip.cpp
@@ -288,9 +288,11 @@ void ToolTip::hideTipWithDelay()
 void ToolTip::hideTipImmediately()
 {
     if (m_tip) {
-        m_tip->close();
-        m_tip->deleteLater();
-        m_tip = nullptr;
+        TipLabel *tip = m_tip.data();
+        m_tip.clear();
+
+        tip->close();
+        tip->deleteLater();
     }
     m_showTimer.stop();
     m_hideDelayTimer.stop();
diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs
index 211d184f73..9ef9108a2f 100644
--- a/src/libs/utils/utils.qbs
+++ b/src/libs/utils/utils.qbs
@@ -374,8 +374,7 @@ QtcLibrary {
             "fsenginehandler.cpp",
             "fsenginehandler.h",
             "fsengine_impl.cpp",
-            "fsengine_impl.h",
-            "rootinjectfsengine.h",
+            "fsengine_impl.h"
         ]
     }
 
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
index 04466fed25..605bdc3931 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -2,6 +2,7 @@
 add_subdirectory(coreplugin)
 
 # Level 1: (only depends of Level 0)
+add_subdirectory(lua)
 add_subdirectory(texteditor)
 add_subdirectory(serialterminal)
 add_subdirectory(extensionmanager)
@@ -117,4 +118,7 @@ endif()
 add_subdirectory(qnx)
 add_subdirectory(mcusupport)
 add_subdirectory(qtapplicationmanager)
-
+add_subdirectory(luatests)
+add_subdirectory(tellajoke)
+add_subdirectory(lualsp)
+add_subdirectory(luatemplates)
diff --git a/src/plugins/android/CMakeLists.txt b/src/plugins/android/CMakeLists.txt
index e51a840e63..619484a2b5 100644
--- a/src/plugins/android/CMakeLists.txt
+++ b/src/plugins/android/CMakeLists.txt
@@ -34,7 +34,7 @@ add_qtc_plugin(Android
     androidrunnerworker.cpp androidrunnerworker.h
     androidsdkdownloader.cpp androidsdkdownloader.h
     androidsdkmanager.cpp androidsdkmanager.h
-    androidsdkmanagerwidget.cpp androidsdkmanagerwidget.h
+    androidsdkmanagerdialog.cpp androidsdkmanagerdialog.h
     androidsdkmodel.cpp androidsdkmodel.h
     androidsdkpackage.cpp androidsdkpackage.h
     androidsettingswidget.cpp androidsettingswidget.h
diff --git a/src/plugins/android/android.qbs b/src/plugins/android/android.qbs
index e1bcc9e0ce..f7f558f543 100644
--- a/src/plugins/android/android.qbs
+++ b/src/plugins/android/android.qbs
@@ -73,8 +73,8 @@ QtcPlugin {
         "androidsdkdownloader.h",
         "androidsdkmanager.cpp",
         "androidsdkmanager.h",
-        "androidsdkmanagerwidget.cpp",
-        "androidsdkmanagerwidget.h",
+        "androidsdkmanagerdialog.cpp",
+        "androidsdkmanagerdialog.h",
         "androidsdkmodel.cpp",
         "androidsdkmodel.h",
         "androidsdkpackage.cpp",
diff --git a/src/plugins/android/androidavdmanager.cpp b/src/plugins/android/androidavdmanager.cpp
index c37daf43b8..4670a90462 100644
--- a/src/plugins/android/androidavdmanager.cpp
+++ b/src/plugins/android/androidavdmanager.cpp
@@ -64,16 +64,8 @@ static bool checkForTimeout(const chrono::steady_clock::time_point &start,
 static CreateAvdInfo createAvdCommand(const CreateAvdInfo &info)
 {
     CreateAvdInfo result = info;
-
-    if (!result.isValid()) {
-        qCDebug(avdManagerLog) << "AVD Create failed. Invalid CreateAvdInfo" << result.name
-                               << result.systemImage->displayText() << result.systemImage->apiLevel();
-        result.error = Tr::tr("Cannot create AVD. Invalid input.");
-        return result;
-    }
-
     CommandLine avdManager(androidConfig().avdManagerToolPath(), {"create", "avd", "-n", result.name});
-    avdManager.addArgs({"-k", result.systemImage->sdkStylePath()});
+    avdManager.addArgs({"-k", result.sdkStylePath});
 
     if (result.sdcardSize > 0)
         avdManager.addArgs({"-c", QString("%1M").arg(result.sdcardSize)});
@@ -273,7 +265,7 @@ bool AndroidAvdManager::startAvdAsync(const QString &avdName) const
 
 QString AndroidAvdManager::findAvd(const QString &avdName) const
 {
-    const QVector<AndroidDeviceInfo> devices = androidConfig().connectedDevices();
+    const QList<AndroidDeviceInfo> devices = androidConfig().connectedDevices();
     for (const AndroidDeviceInfo &device : devices) {
         if (device.type != ProjectExplorer::IDevice::Emulator)
             continue;
diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp
index 28edfdf747..f9835e17b0 100644
--- a/src/plugins/android/androidconfigurations.cpp
+++ b/src/plugins/android/androidconfigurations.cpp
@@ -109,6 +109,11 @@ const QLatin1String X86ToolsPrefix("i686-linux-android");
 const QLatin1String AArch64ToolsPrefix("aarch64-linux-android");
 const QLatin1String X86_64ToolsPrefix("x86_64-linux-android");
 
+const QLatin1String ArmToolsDisplayName("arm");
+const QLatin1String X86ToolsDisplayName("i686");
+const QLatin1String AArch64ToolsDisplayName("aarch64");
+const QLatin1String X86_64ToolsDisplayName("x86_64");
+
 const QLatin1String Unknown("unknown");
 const QLatin1String keytoolName("keytool");
 const Key changeTimeStamp("ChangeTimeStamp");
@@ -177,12 +182,12 @@ QLatin1String AndroidConfig::displayName(const Abi &abi)
     switch (abi.architecture()) {
     case Abi::ArmArchitecture:
         if (abi.wordWidth() == 64)
-            return QLatin1String(Constants::AArch64ToolsDisplayName);
-        return QLatin1String(Constants::ArmToolsDisplayName);
+            return AArch64ToolsDisplayName;
+        return ArmToolsDisplayName;
     case Abi::X86Architecture:
         if (abi.wordWidth() == 64)
-            return QLatin1String(Constants::X86_64ToolsDisplayName);
-        return QLatin1String(Constants::X86ToolsDisplayName);
+            return X86_64ToolsDisplayName;
+        return X86ToolsDisplayName;
     default:
         return Unknown;
     }
@@ -602,9 +607,9 @@ FilePath AndroidConfig::keytoolPath() const
     return openJDKBinPath().pathAppended(keytoolName).withExecutableSuffix();
 }
 
-QVector<AndroidDeviceInfo> AndroidConfig::connectedDevices(QString *error) const
+QList<AndroidDeviceInfo> AndroidConfig::connectedDevices(QString *error) const
 {
-    QVector<AndroidDeviceInfo> devices;
+    QList<AndroidDeviceInfo> devices;
     Process adbProc;
     CommandLine cmd{adbToolPath(), {"devices"}};
     adbProc.setCommand(cmd);
@@ -659,7 +664,7 @@ QVector<AndroidDeviceInfo> AndroidConfig::connectedDevices(QString *error) const
 
 bool AndroidConfig::isConnected(const QString &serialNumber) const
 {
-    const QVector<AndroidDeviceInfo> devices = connectedDevices();
+    const QList<AndroidDeviceInfo> devices = connectedDevices();
     for (const AndroidDeviceInfo &device : devices) {
         if (device.serialNumber == serialNumber)
             return true;
@@ -1220,7 +1225,7 @@ void AndroidConfigurations::removeUnusedDebuggers()
         return v->type() == Constants::ANDROID_QT_TYPE;
     });
 
-    QVector<FilePath> uniqueNdks;
+    QList<FilePath> uniqueNdks;
     for (const QtVersion *qt : qtVersions) {
         FilePath ndkLocation = androidConfig().ndkLocation(qt);
         if (!uniqueNdks.contains(ndkLocation))
diff --git a/src/plugins/android/androidconfigurations.h b/src/plugins/android/androidconfigurations.h
index 2aeb343ff8..aa8f1da33a 100644
--- a/src/plugins/android/androidconfigurations.h
+++ b/src/plugins/android/androidconfigurations.h
@@ -9,14 +9,14 @@
 #include "androidsdkpackage.h"
 
 #include <projectexplorer/toolchain.h>
+
 #include <qtsupport/qtversionmanager.h>
 
 #include <utils/filepath.h>
 
-#include <QStringList>
-#include <QVector>
 #include <QHash>
 #include <QMap>
+#include <QStringList>
 #include <QVersionNumber>
 
 namespace ProjectExplorer { class Abi; }
@@ -28,8 +28,8 @@ namespace Internal { class AndroidSdkManager; }
 class CreateAvdInfo
 {
 public:
-    bool isValid() const { return systemImage && systemImage->isValid() && !name.isEmpty(); }
-    const SystemImage *systemImage = nullptr;
+    QString sdkStylePath;
+    int apiLevel = -1;
     QString name;
     QString abi;
     QString deviceDefinition;
@@ -114,7 +114,7 @@ public:
 
     Utils::FilePath keytoolPath() const;
 
-    QVector<AndroidDeviceInfo> connectedDevices(QString *error = nullptr) const;
+    QList<AndroidDeviceInfo> connectedDevices(QString *error = nullptr) const;
 
     QString bestNdkPlatformMatch(int target, const QtSupport::QtVersion *qtVersion) const;
 
diff --git a/src/plugins/android/androidconstants.h b/src/plugins/android/androidconstants.h
index 813b6a924c..379310519a 100644
--- a/src/plugins/android/androidconstants.h
+++ b/src/plugins/android/androidconstants.h
@@ -81,11 +81,4 @@ const char ndkPackageName[] = "ndk";
 const char platformsPackageName[] = "platforms";
 const char buildToolsPackageName[] = "build-tools";
 
-// For AndroidQtVersion
-const char ArmToolsDisplayName[] = "arm";
-const char ArmV7ToolsDisplayName[] = "armv7";
-const char X86ToolsDisplayName[] = "i686";
-const char AArch64ToolsDisplayName[] = "aarch64";
-const char X86_64ToolsDisplayName[] = "x86_64";
-
 } // Android::Constants
diff --git a/src/plugins/android/androiddevice.cpp b/src/plugins/android/androiddevice.cpp
index 56ffbf45b9..0242fdeded 100644
--- a/src/plugins/android/androiddevice.cpp
+++ b/src/plugins/android/androiddevice.cpp
@@ -666,7 +666,7 @@ void AndroidDeviceManager::HandleAvdsListChange()
 {
     DeviceManager *const devMgr = DeviceManager::instance();
 
-    QVector<Id> existingAvds;
+    QList<Id> existingAvds;
     for (int i = 0; i < devMgr->deviceCount(); ++i) {
         const IDevice::ConstPtr dev = devMgr->deviceAt(i);
         const bool isEmulator = dev->machineType() == IDevice::Emulator;
@@ -674,7 +674,7 @@ void AndroidDeviceManager::HandleAvdsListChange()
             existingAvds.append(dev->id());
     }
 
-    QVector<Id> connectedDevs;
+    QList<Id> connectedDevs;
     for (const AndroidDeviceInfo &item : m_avdsFutureWatcher.result()) {
         const Id deviceId = AndroidDevice::idFromDeviceInfo(item);
         const QString displayName = AndroidDevice::displayNameFromInfo(item);
diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp
index 3666762be6..5128f761a0 100644
--- a/src/plugins/android/androidmanager.cpp
+++ b/src/plugins/android/androidmanager.cpp
@@ -532,7 +532,7 @@ QString androidNameForApiLevel(int x)
     case 33:
         return QLatin1String("Android 13.0 (\"Tiramisu\")");
     case 34:
-        return QLatin1String("Android API 34");
+        return QLatin1String("Android 14.0 (\"UpsideDownCake\")");
     default:
         return Tr::tr("Unknown Android version. API Level: %1").arg(x);
     }
diff --git a/src/plugins/android/androidmanifesteditorfactory.cpp b/src/plugins/android/androidmanifesteditorfactory.cpp
index 7a900a687e..41d6af0861 100644
--- a/src/plugins/android/androidmanifesteditorfactory.cpp
+++ b/src/plugins/android/androidmanifesteditorfactory.cpp
@@ -9,7 +9,6 @@
 
 #include <coreplugin/editormanager/ieditorfactory.h>
 
-#include <texteditor/texteditoractionhandler.h>
 #include <texteditor/texteditorsettings.h>
 
 namespace Android::Internal {
@@ -18,10 +17,6 @@ class AndroidManifestEditorFactory final : public Core::IEditorFactory
 {
 public:
     AndroidManifestEditorFactory()
-        : m_actionHandler(Constants::ANDROID_MANIFEST_EDITOR_ID,
-                          Constants::ANDROID_MANIFEST_EDITOR_CONTEXT,
-                          TextEditor::TextEditorActionHandler::UnCommentSelection,
-                          [](Core::IEditor *editor) { return static_cast<AndroidManifestEditor *>(editor)->textEditor(); })
     {
         setId(Constants::ANDROID_MANIFEST_EDITOR_ID);
         setDisplayName(Tr::tr("Android Manifest editor"));
@@ -31,9 +26,6 @@ public:
             return androidManifestEditorWidget->editor();
         });
     }
-
-private:
-    TextEditor::TextEditorActionHandler m_actionHandler;
 };
 
 void setupAndroidManifestEditor()
diff --git a/src/plugins/android/androidmanifesteditoriconcontainerwidget.h b/src/plugins/android/androidmanifesteditoriconcontainerwidget.h
index dc7443e745..28caf07c78 100644
--- a/src/plugins/android/androidmanifesteditoriconcontainerwidget.h
+++ b/src/plugins/android/androidmanifesteditoriconcontainerwidget.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
+#include <QList>
 #include <QString>
-#include <QVector>
 #include <QWidget>
 
 #include <QCoreApplication>
@@ -30,7 +30,7 @@ public:
     void loadIcons();
     bool hasIcons() const;
 private:
-    QVector<AndroidManifestEditorIconWidget *> m_iconButtons;
+    QList<AndroidManifestEditorIconWidget *> m_iconButtons;
     QString m_iconFileName = QLatin1String("icon");
     bool m_hasIcons = false;
 signals:
diff --git a/src/plugins/android/androidmanifesteditorwidget.cpp b/src/plugins/android/androidmanifesteditorwidget.cpp
index c941f3f43f..608f0b5262 100644
--- a/src/plugins/android/androidmanifesteditorwidget.cpp
+++ b/src/plugins/android/androidmanifesteditorwidget.cpp
@@ -25,7 +25,6 @@
 #include <projectexplorer/projectwindow.h>
 #include <projectexplorer/target.h>
 
-#include <texteditor/texteditoractionhandler.h>
 #include <texteditor/texteditor.h>
 
 #include <utils/algorithm.h>
@@ -114,6 +113,7 @@ private:
 AndroidManifestEditorWidget::AndroidManifestEditorWidget()
 {
     m_textEditorWidget = new AndroidManifestTextEditorWidget(this);
+    m_textEditorWidget->setOptionalActions(TextEditor::OptionalActions::UnCommentSelection);
 
     initializePage();
 
@@ -1406,7 +1406,7 @@ AndroidManifestTextEditorWidget::AndroidManifestTextEditorWidget(AndroidManifest
     setupGenericHighlighter();
     setMarksVisible(false);
 
-    // this context is used by the TextEditorActionHandler registered for the text editor in
+    // this context is used by the OptionalActions registered for the text editor in
     // the AndroidManifestEditorFactory
     m_context = new Core::IContext(this);
     m_context->setWidget(this);
diff --git a/src/plugins/android/androidqtversion.cpp b/src/plugins/android/androidqtversion.cpp
index c3b0e3e1f8..eb9f180138 100644
--- a/src/plugins/android/androidqtversion.cpp
+++ b/src/plugins/android/androidqtversion.cpp
@@ -109,24 +109,13 @@ QString AndroidQtVersion::description() const
 
 const QStringList &AndroidQtVersion::androidAbis() const
 {
-    if (m_androidAbis.isEmpty()) {
-        bool sanityCheckNotUsed;
-        const BuiltWith bw = builtWith(&sanityCheckNotUsed);
-        if (!bw.androidAbi.isEmpty()) {
-            m_androidAbis << bw.androidAbi;
-            m_minNdk = bw.apiVersion;
-        } else {
-            ensureMkSpecParsed();
-        }
-    }
-
+    ensureMkSpecParsed();
     return m_androidAbis;
 }
 
 int AndroidQtVersion::minimumNDK() const
 {
-    if (m_minNdk == -1)
-        ensureMkSpecParsed();
+    ensureMkSpecParsed();
     return m_minNdk;
 }
 
@@ -185,25 +174,6 @@ static int versionFromPlatformString(const QString &string, bool *ok = nullptr)
     return match.hasMatch() ? match.captured(1).toInt(ok) : -1;
 }
 
-static QString abiFromCompilerTarget(const QString &string)
-{
-    const QStringList components = string.split("-");
-    if (components.isEmpty())
-        return {};
-
-    QString qtAbi;
-    const QString compilerAbi = components.first();
-    if (compilerAbi == Constants::AArch64ToolsDisplayName)
-        qtAbi = ProjectExplorer::Constants::ANDROID_ABI_ARM64_V8A;
-    else if (compilerAbi == Constants::ArmV7ToolsDisplayName)
-        qtAbi = ProjectExplorer::Constants::ANDROID_ABI_ARMEABI_V7A;
-    else if (compilerAbi == Constants::X86_64ToolsDisplayName)
-        qtAbi = ProjectExplorer::Constants::ANDROID_ABI_X86_64;
-    else if (compilerAbi == Constants::X86ToolsDisplayName)
-        qtAbi = ProjectExplorer::Constants::ANDROID_ABI_X86;
-    return qtAbi;
-}
-
 AndroidQtVersion::BuiltWith AndroidQtVersion::parseBuiltWith(const QByteArray &modulesCoreJsonData,
                                                              bool *ok)
 {
@@ -223,10 +193,6 @@ AndroidQtVersion::BuiltWith AndroidQtVersion::parseBuiltWith(const QByteArray &m
                     result.ndkVersion = QVersionNumber::fromString(version.toString());
             }
         }
-        if (const QJsonValue compilerTarget = builtWith["compiler_target"];
-            !compilerTarget.isUndefined()) {
-            result.androidAbi = abiFromCompilerTarget(compilerTarget.toString());
-        }
     }
 
     if (ok)
diff --git a/src/plugins/android/androidqtversion.h b/src/plugins/android/androidqtversion.h
index cf52b63000..fb592461c8 100644
--- a/src/plugins/android/androidqtversion.h
+++ b/src/plugins/android/androidqtversion.h
@@ -35,7 +35,6 @@ public:
     struct BuiltWith {
         int apiVersion = -1;
         QVersionNumber ndkVersion;
-        QString androidAbi;
     };
     static BuiltWith parseBuiltWith(const QByteArray &modulesCoreJsonData, bool *ok = nullptr);
     BuiltWith builtWith(bool *ok = nullptr) const;
diff --git a/src/plugins/android/androidrunner.cpp b/src/plugins/android/androidrunner.cpp
index 152c5fa4c5..72b786fa73 100644
--- a/src/plugins/android/androidrunner.cpp
+++ b/src/plugins/android/androidrunner.cpp
@@ -11,7 +11,6 @@
 #include "androidtr.h"
 
 #include <coreplugin/messagemanager.h>
-#include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorersettings.h>
 #include <projectexplorer/runconfigurationaspects.h>
 #include <projectexplorer/target.h>
@@ -36,7 +35,7 @@ AndroidRunner::AndroidRunner(RunControl *runControl, const QString &intentName)
 {
     setId("AndroidRunner");
     static const int metaTypes[] = {
-        qRegisterMetaType<QVector<QStringList> >("QVector<QStringList>"),
+        qRegisterMetaType<QList<QStringList>>("QList<QStringList>"),
         qRegisterMetaType<Utils::Port>("Utils::Port"),
         qRegisterMetaType<AndroidDeviceInfo>("Android::AndroidDeviceInfo")
     };
@@ -88,7 +87,7 @@ AndroidRunner::~AndroidRunner()
 
 void AndroidRunner::start()
 {
-    if (!ProjectExplorerPlugin::projectExplorerSettings().deployBeforeRun) {
+    if (!projectExplorerSettings().deployBeforeRun) {
         qCDebug(androidRunnerLog) << "Run without deployment";
        launchAVD();
        if (!m_launchedAVDName.isEmpty()) {
diff --git a/src/plugins/android/androidrunnerworker.cpp b/src/plugins/android/androidrunnerworker.cpp
index a0169c6bfb..34688de9a1 100644
--- a/src/plugins/android/androidrunnerworker.cpp
+++ b/src/plugins/android/androidrunnerworker.cpp
@@ -83,7 +83,7 @@ static qint64 extractPID(const QString &output, const QString &packageName)
 }
 
 static void findProcessPIDAndUser(QPromise<PidUserPair> &promise,
-                                  QStringList selector,
+                                  const QStringList &selector,
                                   const QString &packageName,
                                   bool preNougat)
 {
@@ -821,7 +821,7 @@ void AndroidRunnerWorker::removeForwardPort(const QString &port)
     }
 }
 
-void AndroidRunnerWorker::onProcessIdChanged(PidUserPair pidUser)
+void AndroidRunnerWorker::onProcessIdChanged(const PidUserPair &pidUser)
 {
     // Don't write to m_psProc from a different thread
     QTC_ASSERT(QThread::currentThread() == thread(), return);
diff --git a/src/plugins/android/androidrunnerworker.h b/src/plugins/android/androidrunnerworker.h
index 052fe2812c..ac995fe162 100644
--- a/src/plugins/android/androidrunnerworker.h
+++ b/src/plugins/android/androidrunnerworker.h
@@ -75,7 +75,7 @@ private:
         Waiting,
         Settled
     };
-    void onProcessIdChanged(PidUserPair pidUser);
+    void onProcessIdChanged(const PidUserPair &pidUser);
 
     // Create the processes and timer in the worker thread, for correct thread affinity
     bool m_isPreNougat = false;
diff --git a/src/plugins/android/androidsdkdownloader.cpp b/src/plugins/android/androidsdkdownloader.cpp
index 7246b5b9a3..f3238b8c66 100644
--- a/src/plugins/android/androidsdkdownloader.cpp
+++ b/src/plugins/android/androidsdkdownloader.cpp
@@ -1,20 +1,27 @@
 // Copyright (C) 2020 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
+#include "androidconfigurations.h"
 #include "androidconstants.h"
 #include "androidsdkdownloader.h"
 #include "androidtr.h"
 
+#include <coreplugin/icore.h>
+
+#include <extensionsystem/pluginmanager.h>
+
+#include <solutions/tasking/barrier.h>
 #include <solutions/tasking/networkquery.h>
 
+#include <utils/async.h>
 #include <utils/filepath.h>
+#include <utils/futuresynchronizer.h>
 #include <utils/networkaccessmanager.h>
 #include <utils/unarchiver.h>
 
-#include <coreplugin/icore.h>
-
 #include <QCryptographicHash>
 #include <QLoggingCategory>
+#include <QMessageBox>
 #include <QProgressDialog>
 #include <QStandardPaths>
 
@@ -24,17 +31,13 @@ using namespace Utils;
 namespace { Q_LOGGING_CATEGORY(sdkDownloaderLog, "qtc.android.sdkDownloader", QtWarningMsg) }
 
 namespace Android::Internal {
-/**
- * @class SdkDownloader
- * @brief Download Android SDK tools package from within Qt Creator.
- */
-AndroidSdkDownloader::AndroidSdkDownloader()
+
+static void logError(const QString &error)
 {
-    connect(&m_taskTreeRunner, &TaskTreeRunner::done, this, [this] { m_progressDialog.reset(); });
+    qCDebug(sdkDownloaderLog, "%s", error.toUtf8().data());
+    QMessageBox::warning(Core::ICore::dialogParent(), dialogTitle(), error);
 }
 
-AndroidSdkDownloader::~AndroidSdkDownloader() = default;
-
 static bool isHttpRedirect(QNetworkReply *reply)
 {
     const int statusCode = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
@@ -74,56 +77,62 @@ static std::optional<QString> saveToDisk(const FilePath &filename, QIODevice *da
     return {};
 }
 
-// TODO: Make it a separate async task in a chain?
-static bool verifyFileIntegrity(const FilePath fileName, const QByteArray &sha256)
+static void validateFileIntegrity(QPromise<void> &promise, const FilePath &fileName,
+                                  const QByteArray &sha256)
 {
     QFile file(fileName.toString());
     if (file.open(QFile::ReadOnly)) {
         QCryptographicHash hash(QCryptographicHash::Sha256);
-        if (hash.addData(&file))
-            return hash.result() == sha256;
+        if (hash.addData(&file) && hash.result() == sha256)
+            return;
     }
-    return false;
+    promise.future().cancel();
 }
 
-void AndroidSdkDownloader::downloadAndExtractSdk()
+GroupItem downloadSdkRecipe()
 {
-    if (androidConfig().sdkToolsUrl().isEmpty()) {
-        logError(Tr::tr("The SDK Tools download URL is empty."));
-        return;
-    }
+    struct StorageStruct
+    {
+        StorageStruct() {
+            progressDialog.reset(new QProgressDialog(Tr::tr("Downloading SDK Tools package..."),
+                                 Tr::tr("Cancel"), 0, 100, Core::ICore::dialogParent()));
+            progressDialog->setWindowModality(Qt::ApplicationModal);
+            progressDialog->setWindowTitle(dialogTitle());
+            progressDialog->setFixedSize(progressDialog->sizeHint());
+            progressDialog->setAutoClose(false);
+            progressDialog->show(); // TODO: Should not be needed. Investigate possible QT_BUG
+        }
+        std::unique_ptr<QProgressDialog> progressDialog;
+        std::optional<FilePath> sdkFileName;
+    };
 
-    m_progressDialog.reset(new QProgressDialog(Tr::tr("Downloading SDK Tools package..."),
-                                               Tr::tr("Cancel"), 0, 100, Core::ICore::dialogParent()));
-    m_progressDialog->setWindowModality(Qt::ApplicationModal);
-    m_progressDialog->setWindowTitle(dialogTitle());
-    m_progressDialog->setFixedSize(m_progressDialog->sizeHint());
-    m_progressDialog->setAutoClose(false);
-    connect(m_progressDialog.get(), &QProgressDialog::canceled, this, [this] {
-        m_taskTreeRunner.reset();
-        m_progressDialog.release()->deleteLater();
-    });
+    Storage<StorageStruct> storage;
 
-    Storage<std::optional<FilePath>> storage;
+    const auto onSetup = [] {
+        if (androidConfig().sdkToolsUrl().isEmpty()) {
+            logError(Tr::tr("The SDK Tools download URL is empty."));
+            return SetupResult::StopWithError;
+        }
+        return SetupResult::Continue;
+    };
 
-    const auto onQuerySetup = [this](NetworkQuery &query) {
+    const auto onQuerySetup = [storage](NetworkQuery &query) {
         query.setRequest(QNetworkRequest(androidConfig().sdkToolsUrl()));
         query.setNetworkAccessManager(NetworkAccessManager::instance());
         NetworkQuery *queryPtr = &query;
-        connect(queryPtr, &NetworkQuery::started, this, [this, queryPtr] {
+        QProgressDialog *progressDialog = storage->progressDialog.get();
+        QObject::connect(queryPtr, &NetworkQuery::started, progressDialog, [queryPtr, progressDialog] {
             QNetworkReply *reply = queryPtr->reply();
             if (!reply)
                 return;
-            connect(reply, &QNetworkReply::downloadProgress,
-                    this, [this](qint64 received, qint64 max) {
-                if (!m_progressDialog)
-                    return;
-                m_progressDialog->setRange(0, max);
-                m_progressDialog->setValue(received);
+            QObject::connect(reply, &QNetworkReply::downloadProgress,
+                             progressDialog, [progressDialog](qint64 received, qint64 max) {
+                progressDialog->setRange(0, max);
+                progressDialog->setValue(received);
             });
 #if QT_CONFIG(ssl)
-            connect(reply, &QNetworkReply::sslErrors,
-                    this, [this, reply](const QList<QSslError> &sslErrors) {
+            QObject::connect(reply, &QNetworkReply::sslErrors,
+                    reply, [reply](const QList<QSslError> &sslErrors) {
                 for (const QSslError &error : sslErrors)
                     qCDebug(sdkDownloaderLog, "SSL error: %s\n", qPrintable(error.errorString()));
                 logError(Tr::tr("Encountered SSL errors, download is aborted."));
@@ -132,7 +141,10 @@ void AndroidSdkDownloader::downloadAndExtractSdk()
 #endif
         });
     };
-    const auto onQueryDone = [this, storage](const NetworkQuery &query, DoneWith result) {
+    const auto onQueryDone = [storage](const NetworkQuery &query, DoneWith result) {
+        if (result == DoneWith::Cancel)
+            return;
+
         QNetworkReply *reply = query.reply();
         QTC_ASSERT(reply, return);
         const QUrl url = reply->url();
@@ -151,19 +163,27 @@ void AndroidSdkDownloader::downloadAndExtractSdk()
             logError(*saveResult);
             return;
         }
-        *storage = sdkFileName;
+        storage->sdkFileName = sdkFileName;
     };
-
-    const auto onUnarchiveSetup = [this, storage](Unarchiver &unarchiver) {
-        m_progressDialog->setRange(0, 0);
-        m_progressDialog->setLabelText(Tr::tr("Unarchiving SDK Tools package..."));
-        if (!*storage)
-            return SetupResult::StopWithError;
-        const FilePath sdkFileName = **storage;
-        if (!verifyFileIntegrity(sdkFileName, androidConfig().getSdkToolsSha256())) {
-            logError(Tr::tr("Verifying the integrity of the downloaded file has failed."));
+    const auto onValidationSetup = [storage](Async<void> &async) {
+        if (!storage->sdkFileName)
             return SetupResult::StopWithError;
-        }
+        async.setConcurrentCallData(validateFileIntegrity, *storage->sdkFileName,
+                                    androidConfig().getSdkToolsSha256());
+        async.setFutureSynchronizer(ExtensionSystem::PluginManager::futureSynchronizer());
+        storage->progressDialog->setRange(0, 0);
+        storage->progressDialog->setLabelText(Tr::tr("Verifying package integrity..."));
+        return SetupResult::Continue;
+    };
+    const auto onValidationDone = [](DoneWith result) {
+        if (result != DoneWith::Error)
+            return;
+        logError(Tr::tr("Verifying the integrity of the downloaded file has failed."));
+    };
+    const auto onUnarchiveSetup = [storage](Unarchiver &unarchiver) {
+        storage->progressDialog->setRange(0, 0);
+        storage->progressDialog->setLabelText(Tr::tr("Unarchiving SDK Tools package..."));
+        const FilePath sdkFileName = *storage->sdkFileName;
         const auto sourceAndCommand = Unarchiver::sourceAndCommand(sdkFileName);
         if (!sourceAndCommand) {
             logError(sourceAndCommand.error());
@@ -173,35 +193,31 @@ void AndroidSdkDownloader::downloadAndExtractSdk()
         unarchiver.setDestDir(sdkFileName.parentDir());
         return SetupResult::Continue;
     };
-    const auto onUnarchiverDone = [this, storage](DoneWith result) {
+    const auto onUnarchiverDone = [storage](DoneWith result) {
+        if (result == DoneWith::Cancel)
+            return;
+
         if (result != DoneWith::Success) {
             logError(Tr::tr("Unarchiving error."));
             return;
         }
         androidConfig().setTemporarySdkToolsPath(
-            (*storage)->parentDir().pathAppended(Constants::cmdlineToolsName));
-        QMetaObject::invokeMethod(this, [this] { emit sdkExtracted(); }, Qt::QueuedConnection);
+            storage->sdkFileName->parentDir().pathAppended(Constants::cmdlineToolsName));
     };
+    const auto onCancelSetup = [storage] { return std::make_pair(storage->progressDialog.get(),
+                                                                 &QProgressDialog::canceled); };
 
-    const Group root {
+    return Group {
         storage,
-        NetworkQueryTask(onQuerySetup, onQueryDone),
-        UnarchiverTask(onUnarchiveSetup, onUnarchiverDone)
+        Group {
+            onGroupSetup(onSetup),
+            NetworkQueryTask(onQuerySetup, onQueryDone),
+            AsyncTask<void>(onValidationSetup, onValidationDone),
+            UnarchiverTask(onUnarchiveSetup, onUnarchiverDone)
+        }.withCancel(onCancelSetup)
     };
-
-    m_taskTreeRunner.start(root);
-}
-
-QString AndroidSdkDownloader::dialogTitle()
-{
-    return Tr::tr("Download SDK Tools");
 }
 
-void AndroidSdkDownloader::logError(const QString &error)
-{
-    qCDebug(sdkDownloaderLog, "%s", error.toUtf8().data());
-    QMetaObject::invokeMethod(this, [this, error] { emit sdkDownloaderError(error); },
-        Qt::QueuedConnection);
-}
+QString dialogTitle() { return Tr::tr("Download SDK Tools"); }
 
 } // namespace Android::Internal
diff --git a/src/plugins/android/androidsdkdownloader.h b/src/plugins/android/androidsdkdownloader.h
index 4ea9ebfa37..e156420db7 100644
--- a/src/plugins/android/androidsdkdownloader.h
+++ b/src/plugins/android/androidsdkdownloader.h
@@ -3,36 +3,13 @@
 
 #pragma once
 
-#include "androidconfigurations.h"
+#include <QString>
 
-#include <solutions/tasking/tasktreerunner.h>
-
-QT_BEGIN_NAMESPACE
-class QProgressDialog;
-QT_END_NAMESPACE
+namespace Tasking { class GroupItem; }
 
 namespace Android::Internal {
 
-class AndroidSdkDownloader : public QObject
-{
-    Q_OBJECT
-
-public:
-    AndroidSdkDownloader();
-    ~AndroidSdkDownloader();
-
-    void downloadAndExtractSdk();
-    static QString dialogTitle();
-
-signals:
-    void sdkExtracted();
-    void sdkDownloaderError(const QString &error);
-
-private:
-    void logError(const QString &error);
-
-    std::unique_ptr<QProgressDialog> m_progressDialog;
-    Tasking::TaskTreeRunner m_taskTreeRunner;
-};
+Tasking::GroupItem downloadSdkRecipe();
+QString dialogTitle();
 
 } // namespace Android::Internal
diff --git a/src/plugins/android/androidsdkmanager.cpp b/src/plugins/android/androidsdkmanager.cpp
index 7ae9ce05aa..d62cc9e50e 100644
--- a/src/plugins/android/androidsdkmanager.cpp
+++ b/src/plugins/android/androidsdkmanager.cpp
@@ -4,40 +4,121 @@
 #include "androidconfigurations.h"
 #include "androidsdkmanager.h"
 #include "androidtr.h"
-#include "avdmanageroutputparser.h"
 #include "sdkmanageroutputparser.h"
 
+#include <coreplugin/icore.h>
+
+#include <solutions/tasking/tasktreerunner.h>
+
 #include <utils/algorithm.h>
-#include <utils/async.h>
+#include <utils/layoutbuilder.h>
+#include <utils/outputformatter.h>
 #include <utils/qtcprocess.h>
-#include <utils/qtcassert.h>
-#include <utils/stringutils.h>
 
-#include <QFutureWatcher>
+#include <QDialogButtonBox>
+#include <QLabel>
 #include <QLoggingCategory>
-#include <QReadWriteLock>
+#include <QMessageBox>
+#include <QPlainTextEdit>
+#include <QProgressBar>
 #include <QRegularExpression>
 #include <QTextCodec>
 
 namespace {
 Q_LOGGING_CATEGORY(sdkManagerLog, "qtc.android.sdkManager", QtWarningMsg)
-const char commonArgsKey[] = "Common Arguments:";
 }
 
+using namespace Tasking;
 using namespace Utils;
 
 using namespace std::chrono;
 using namespace std::chrono_literals;
 
-namespace Android {
-namespace Internal {
+namespace Android::Internal {
+
+class QuestionProgressDialog : public QDialog
+{
+    Q_OBJECT
 
-const int sdkManagerCmdTimeoutS = 60;
-const int sdkManagerOperationTimeoutS = 600;
+public:
+    QuestionProgressDialog(QWidget *parent)
+        : QDialog(parent)
+        , m_outputTextEdit(new QPlainTextEdit)
+        , m_questionLabel(new QLabel(Tr::tr("Do you want to accept the Android SDK license?")))
+        , m_answerButtonBox(new QDialogButtonBox)
+        , m_progressBar(new QProgressBar)
+        , m_dialogButtonBox(new QDialogButtonBox)
+        , m_formatter(new OutputFormatter)
+    {
+        setWindowTitle(Tr::tr("Android SDK Manager"));
+        m_outputTextEdit->setReadOnly(true);
+        m_questionLabel->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
+        m_answerButtonBox->setStandardButtons(QDialogButtonBox::No | QDialogButtonBox::Yes);
+        m_dialogButtonBox->setStandardButtons(QDialogButtonBox::Cancel);
+        m_formatter->setPlainTextEdit(m_outputTextEdit);
+        m_formatter->setParent(this);
+
+        using namespace Layouting;
+
+        Column {
+            m_outputTextEdit,
+            Row { m_questionLabel, m_answerButtonBox },
+            m_progressBar,
+            m_dialogButtonBox
+        }.attachTo(this);
+
+        setQuestionVisible(false);
+        setQuestionEnabled(false);
+
+        connect(m_answerButtonBox, &QDialogButtonBox::rejected, this, [this] {
+            emit answerClicked(false);
+        });
+        connect(m_answerButtonBox, &QDialogButtonBox::accepted, this, [this] {
+            emit answerClicked(true);
+        });
+        connect(m_dialogButtonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
+
+        // GUI tuning
+        setModal(true);
+        resize(800, 600);
+        show();
+    }
+
+    void setQuestionEnabled(bool enable)
+    {
+        m_questionLabel->setEnabled(enable);
+        m_answerButtonBox->setEnabled(enable);
+    }
+    void setQuestionVisible(bool visible)
+    {
+        m_questionLabel->setVisible(visible);
+        m_answerButtonBox->setVisible(visible);
+    }
+    void appendMessage(const QString &text, OutputFormat format)
+    {
+        m_formatter->appendMessage(text, format);
+        m_outputTextEdit->ensureCursorVisible();
+    }
+    void setProgress(int value) { m_progressBar->setValue(value); }
 
-using SdkCmdPromise = QPromise<AndroidSdkManager::OperationOutput>;
+signals:
+    void answerClicked(bool accepted);
 
-static const QRegularExpression &assertionRegExp()
+private:
+    QPlainTextEdit *m_outputTextEdit = nullptr;
+    QLabel *m_questionLabel = nullptr;
+    QDialogButtonBox *m_answerButtonBox = nullptr;
+    QProgressBar *m_progressBar = nullptr;
+    QDialogButtonBox *m_dialogButtonBox = nullptr;
+    OutputFormatter *m_formatter = nullptr;
+};
+
+static QString sdkRootArg(const AndroidConfig &config)
+{
+    return "--sdk_root=" + config.sdkLocation().toString();
+}
+
+const QRegularExpression &assertionRegExp()
 {
     static const QRegularExpression theRegExp
         (R"((\(\s*y\s*[\/\\]\s*n\s*\)\s*)(?<mark>[\:\?]))", // (y/N)?
@@ -46,114 +127,201 @@ static const QRegularExpression &assertionRegExp()
     return theRegExp;
 }
 
-int parseProgress(const QString &out, bool &foundAssertion)
+static std::optional<int> parseProgress(const QString &out)
 {
-    int progress = -1;
     if (out.isEmpty())
-        return progress;
+        return {};
+
     static const QRegularExpression reg("(?<progress>\\d*)%");
     static const QRegularExpression regEndOfLine("[\\n\\r]");
     const QStringList lines = out.split(regEndOfLine, Qt::SkipEmptyParts);
+    std::optional<int> progress;
     for (const QString &line : lines) {
         QRegularExpressionMatch match = reg.match(line);
         if (match.hasMatch()) {
-            progress = match.captured("progress").toInt();
-            if (progress < 0 || progress > 100)
-                progress = -1;
+            const int parsedProgress = match.captured("progress").toInt();
+            if (parsedProgress >= 0 && parsedProgress <= 100)
+                progress = parsedProgress;
         }
-        if (!foundAssertion)
-            foundAssertion = assertionRegExp().match(line).hasMatch();
     }
     return progress;
 }
 
-void watcherDeleter(QFutureWatcher<void> *watcher)
+struct DialogStorage
 {
-    if (!watcher->isFinished() && !watcher->isCanceled())
-        watcher->cancel();
+    DialogStorage() { m_dialog.reset(new QuestionProgressDialog(Core::ICore::dialogParent())); };
+    std::unique_ptr<QuestionProgressDialog> m_dialog;
+};
 
-    if (!watcher->isFinished())
-        watcher->waitForFinished();
+static GroupItem licensesRecipe(const Storage<DialogStorage> &dialogStorage)
+{
+    struct OutputData
+    {
+        QString buffer;
+        int current = 0;
+        int total = 0;
+    };
 
-    delete watcher;
+    const Storage<OutputData> outputStorage;
+
+    const auto onLicenseSetup = [dialogStorage, outputStorage](Process &process) {
+        QuestionProgressDialog *dialog = dialogStorage->m_dialog.get();
+        dialog->setProgress(0);
+        dialog->appendMessage(Tr::tr("Checking pending licenses...") + "\n", NormalMessageFormat);
+        dialog->appendMessage(Tr::tr("The installation of Android SDK packages may fail if the "
+                                     "respective licenses are not accepted.") + "\n\n",
+                              LogMessageFormat);
+        process.setProcessMode(ProcessMode::Writer);
+        process.setEnvironment(androidConfig().toolsEnvironment());
+        process.setCommand(CommandLine(androidConfig().sdkManagerToolPath(),
+                                       {"--licenses", sdkRootArg(androidConfig())}));
+        process.setUseCtrlCStub(true);
+
+        Process *processPtr = &process;
+        OutputData *outputPtr = outputStorage.activeStorage();
+        QObject::connect(processPtr, &Process::readyReadStandardOutput, dialog,
+                         [processPtr, outputPtr, dialog] {
+            QTextCodec *codec = QTextCodec::codecForLocale();
+            const QString stdOut = codec->toUnicode(processPtr->readAllRawStandardOutput());
+            outputPtr->buffer += stdOut;
+            dialog->appendMessage(stdOut, StdOutFormat);
+            const auto progress = parseProgress(stdOut);
+            if (progress)
+                dialog->setProgress(*progress);
+            if (assertionRegExp().match(outputPtr->buffer).hasMatch()) {
+                dialog->setQuestionVisible(true);
+                dialog->setQuestionEnabled(true);
+                if (outputPtr->total == 0) {
+                    // Example output to match:
+                    //   5 of 6 SDK package licenses not accepted.
+                    //   Review licenses that have not been accepted (y/N)?
+                    static const QRegularExpression reg(R"(((?<steps>\d+)\sof\s)\d+)");
+                    const QRegularExpressionMatch match = reg.match(outputPtr->buffer);
+                    if (match.hasMatch()) {
+                        outputPtr->total = match.captured("steps").toInt();
+                        const QByteArray reply = "y\n";
+                        dialog->appendMessage(QString::fromUtf8(reply), NormalMessageFormat);
+                        processPtr->writeRaw(reply);
+                        dialog->setProgress(0);
+                    }
+                }
+                outputPtr->buffer.clear();
+            }
+        });
+
+        QObject::connect(dialog, &QuestionProgressDialog::answerClicked, processPtr,
+                         [processPtr, outputPtr, dialog](bool accepted) {
+            dialog->setQuestionEnabled(false);
+            const QByteArray reply = accepted ? "y\n" : "n\n";
+            dialog->appendMessage(QString::fromUtf8(reply), NormalMessageFormat);
+            processPtr->writeRaw(reply);
+            ++outputPtr->current;
+            if (outputPtr->total != 0)
+                dialog->setProgress(outputPtr->current * 100.0 / outputPtr->total);
+        });
+    };
+
+    return Group { outputStorage, ProcessTask(onLicenseSetup) };
 }
 
-static QString sdkRootArg(const AndroidConfig &config)
+static void setupSdkProcess(const QStringList &args, Process *process,
+                            QuestionProgressDialog *dialog, int current, int total)
 {
-    return "--sdk_root=" + config.sdkLocation().toString();
-}
-/*!
-    Runs the \c sdkmanger tool with arguments \a args. Returns \c true if the command is
-    successfully executed. Output is copied into \a output. The function blocks the calling thread.
- */
-static bool sdkManagerCommand(const AndroidConfig &config, const QStringList &args,
-                              QString *output, int timeout = sdkManagerCmdTimeoutS)
+    process->setEnvironment(androidConfig().toolsEnvironment());
+    process->setCommand({androidConfig().sdkManagerToolPath(),
+                         args + androidConfig().sdkManagerToolArgs()});
+    QObject::connect(process, &Process::readyReadStandardOutput, dialog,
+                     [process, dialog, current, total] {
+        QTextCodec *codec = QTextCodec::codecForLocale();
+        const auto progress = parseProgress(codec->toUnicode(process->readAllRawStandardOutput()));
+        if (!progress)
+            return;
+        dialog->setProgress((current * 100.0 + *progress) / total);
+    });
+    QObject::connect(process, &Process::readyReadStandardError, dialog, [process, dialog] {
+        QTextCodec *codec = QTextCodec::codecForLocale();
+        dialog->appendMessage(codec->toUnicode(process->readAllRawStandardError()), StdErrFormat);
+    });
+};
+
+static void handleSdkProcess(QuestionProgressDialog *dialog, DoneWith result)
 {
-    QStringList newArgs = args;
-    newArgs.append(sdkRootArg(config));
-    qCDebug(sdkManagerLog).noquote() << "Running SDK Manager command (sync):"
-                                     << CommandLine(config.sdkManagerToolPath(), newArgs)
-                                        .toUserOutput();
-    Process proc;
-    proc.setEnvironment(config.toolsEnvironment());
-    proc.setTimeOutMessageBoxEnabled(true);
-    proc.setCommand({config.sdkManagerToolPath(), newArgs});
-    proc.runBlocking(seconds(timeout), EventLoopMode::On);
-    if (output)
-        *output = proc.allOutput();
-    return proc.result() == ProcessResult::FinishedWithSuccess;
+    if (result == DoneWith::Success)
+        dialog->appendMessage(Tr::tr("Finished successfully.") + "\n\n", StdOutFormat);
+    else
+        dialog->appendMessage(Tr::tr("Failed.") + "\n\n", StdErrFormat);
 }
 
-/*!
-    Runs the \c sdkmanger tool with arguments \a args. The operation command progress is updated in
-    to the future interface \a fi and \a output is populated with command output. The command listens
-    to cancel signal emmitted by \a sdkManager and kill the commands. The command is also killed
-    after the lapse of \a timeout seconds. The function blocks the calling thread.
- */
-static void sdkManagerCommand(const AndroidConfig &config, const QStringList &args,
-                              AndroidSdkManager &sdkManager, SdkCmdPromise &promise,
-                              AndroidSdkManager::OperationOutput &output, double progressQuota,
-                              bool interruptible = true, int timeout = sdkManagerOperationTimeoutS)
+static GroupItem installationRecipe(const Storage<DialogStorage> &dialogStorage,
+                                    const InstallationChange &change)
 {
-    QStringList newArgs = args;
-    newArgs.append(sdkRootArg(config));
-    qCDebug(sdkManagerLog).noquote() << "Running SDK Manager command (async):"
-                                     << CommandLine(config.sdkManagerToolPath(), newArgs)
-                                        .toUserOutput();
-    int offset = promise.future().progressValue();
-    Process proc;
-    proc.setEnvironment(config.toolsEnvironment());
-    bool assertionFound = false;
-    proc.setStdOutCallback([offset, progressQuota, &proc, &assertionFound, &promise](const QString &out) {
-        int progressPercent = parseProgress(out, assertionFound);
-        if (assertionFound) {
-            proc.stop();
-            proc.waitForFinished();
+    const auto onSetup = [dialogStorage] {
+        dialogStorage->m_dialog->appendMessage(
+            Tr::tr("Installing / Uninstalling selected packages...") + '\n', NormalMessageFormat);
+        const QString optionsMessage = HostOsInfo::isMacHost()
+            ? Tr::tr("Closing the preferences dialog will cancel the running and scheduled SDK "
+                     "operations.")
+            : Tr::tr("Closing the options dialog will cancel the running and scheduled SDK "
+                     "operations.");
+        dialogStorage->m_dialog->appendMessage(optionsMessage + '\n', LogMessageFormat);
+    };
+
+    const int total = change.count();
+    const LoopList uninstallIterator(change.toUninstall);
+    const auto onUninstallSetup = [dialogStorage, uninstallIterator, total](Process &process) {
+        const QStringList args = {"--uninstall", *uninstallIterator, sdkRootArg(androidConfig())};
+        QuestionProgressDialog *dialog = dialogStorage->m_dialog.get();
+        setupSdkProcess(args, &process, dialog, uninstallIterator.iteration(), total);
+        dialog->appendMessage(Tr::tr("Uninstalling %1...").arg(*uninstallIterator) + '\n',
+                              StdOutFormat);
+        dialog->setProgress(uninstallIterator.iteration() * 100.0 / total);
+    };
+
+    const LoopList installIterator(change.toInstall);
+    const int offset = change.toUninstall.count();
+    const auto onInstallSetup = [dialogStorage, installIterator, offset, total](Process &process) {
+        const QStringList args = {*installIterator, sdkRootArg(androidConfig())};
+        QuestionProgressDialog *dialog = dialogStorage->m_dialog.get();
+        setupSdkProcess(args, &process, dialog, offset + installIterator.iteration(), total);
+        dialog->appendMessage(Tr::tr("Installing %1...").arg(*installIterator) + '\n',
+                              StdOutFormat);
+        dialog->setProgress((offset + installIterator.iteration()) * 100.0 / total);
+    };
+
+    const auto onDone = [dialogStorage](DoneWith result) {
+        handleSdkProcess(dialogStorage->m_dialog.get(), result);
+    };
+
+    return Group {
+        onGroupSetup(onSetup),
+        Group {
+            finishAllAndSuccess,
+            uninstallIterator,
+            ProcessTask(onUninstallSetup, onDone)
+        },
+        Group {
+            finishAllAndSuccess,
+            installIterator,
+            ProcessTask(onInstallSetup, onDone)
         }
-        if (progressPercent != -1)
-            promise.setProgressValue(offset + qRound((progressPercent / 100.0) * progressQuota));
-    });
-    proc.setStdErrCallback([&output](const QString &err) {
-        output.stdError = err;
-    });
-    if (interruptible) {
-        QObject::connect(&sdkManager, &AndroidSdkManager::cancelActiveOperations, &proc, [&proc] {
-           proc.stop();
-           proc.waitForFinished();
-        });
-    }
-    proc.setCommand({config.sdkManagerToolPath(), newArgs});
-    proc.runBlocking(seconds(timeout), EventLoopMode::On);
-    if (assertionFound) {
-        output.success = false;
-        output.stdOutput = proc.cleanedStdOut();
-        output.stdError = Tr::tr("The operation requires user interaction. "
-                                 "Use the \"sdkmanager\" command-line tool.");
-    } else {
-        output.success = proc.result() == ProcessResult::FinishedWithSuccess;
-    }
+    };
 }
 
+static GroupItem updateRecipe(const Storage<DialogStorage> &dialogStorage)
+{
+    const auto onUpdateSetup = [dialogStorage](Process &process) {
+        const QStringList args = {"--update", sdkRootArg(androidConfig())};
+        QuestionProgressDialog *dialog = dialogStorage->m_dialog.get();
+        setupSdkProcess(args, &process, dialog, 0, 1);
+        dialog->appendMessage(Tr::tr("Updating installed packages....") + '\n', NormalMessageFormat);
+        dialog->setProgress(0);
+    };
+    const auto onDone = [dialogStorage](DoneWith result) {
+        handleSdkProcess(dialogStorage->m_dialog.get(), result);
+    };
+
+    return ProcessTask(onUpdateSetup, onDone);
+}
 
 class AndroidSdkManagerPrivate
 {
@@ -162,56 +330,35 @@ public:
     ~AndroidSdkManagerPrivate();
 
     AndroidSdkPackageList filteredPackages(AndroidSdkPackage::PackageState state,
-                                           AndroidSdkPackage::PackageType type,
-                                           bool forceUpdate = false);
-    const AndroidSdkPackageList &allPackages(bool forceUpdate = false);
-    void refreshSdkPackages(bool forceReload = false);
-
-    void parseCommonArguments(QPromise<QString> &promise);
-    void updateInstalled(SdkCmdPromise &fi);
-    void update(SdkCmdPromise &fi, const QStringList &install,
-                const QStringList &uninstall);
-    void checkPendingLicense(SdkCmdPromise &fi);
-    void getPendingLicense(SdkCmdPromise &fi);
-
-    void addWatcher(const QFuture<AndroidSdkManager::OperationOutput> &future);
-    void setLicenseInput(bool acceptLicense);
-
-    std::unique_ptr<QFutureWatcher<void>, decltype(&watcherDeleter)> m_activeOperation;
+                                           AndroidSdkPackage::PackageType type)
+    {
+        m_sdkManager.refreshPackages();
+        return Utils::filtered(m_allPackages, [state, type](const AndroidSdkPackage *p) {
+            return p->state() & state && p->type() & type;
+        });
+    }
+    const AndroidSdkPackageList &allPackages();
 
-private:
-    QByteArray getUserInput() const;
-    void clearUserInput();
     void reloadSdkPackages();
-    void clearPackages();
-    bool onLicenseStdOut(const QString &output, bool notify,
-                         AndroidSdkManager::OperationOutput &result, SdkCmdPromise &fi);
+
+    void runDialogRecipe(const Storage<DialogStorage> &dialogStorage,
+                         const GroupItem &licenseRecipe, const GroupItem &continuationRecipe);
 
     AndroidSdkManager &m_sdkManager;
     AndroidSdkPackageList m_allPackages;
     FilePath lastSdkManagerPath;
-    QString m_licenseTextCache;
-    QByteArray m_licenseUserInput;
-    mutable QReadWriteLock m_licenseInputLock;
-
-public:
     bool m_packageListingSuccessful = false;
+    TaskTreeRunner m_taskTreeRunner;
 };
 
-AndroidSdkManager::AndroidSdkManager()
-    : m_d(new AndroidSdkManagerPrivate(*this))
-{
-}
+AndroidSdkManager::AndroidSdkManager() : m_d(new AndroidSdkManagerPrivate(*this)) {}
 
-AndroidSdkManager::~AndroidSdkManager()
-{
-    cancelOperatons();
-}
+AndroidSdkManager::~AndroidSdkManager() = default;
 
 SdkPlatformList AndroidSdkManager::installedSdkPlatforms()
 {
-    AndroidSdkPackageList list = m_d->filteredPackages(AndroidSdkPackage::Installed,
-                                                       AndroidSdkPackage::SdkPlatformPackage);
+    const AndroidSdkPackageList list = m_d->filteredPackages(AndroidSdkPackage::Installed,
+                                                             AndroidSdkPackage::SdkPlatformPackage);
     return Utils::static_container_cast<SdkPlatform *>(list);
 }
 
@@ -220,6 +367,32 @@ const AndroidSdkPackageList &AndroidSdkManager::allSdkPackages()
     return m_d->allPackages();
 }
 
+QStringList AndroidSdkManager::notFoundEssentialSdkPackages()
+{
+    QStringList essentials = androidConfig().allEssentials();
+    const AndroidSdkPackageList &packages = allSdkPackages();
+    for (AndroidSdkPackage *package : packages) {
+        essentials.removeOne(package->sdkStylePath());
+        if (essentials.isEmpty())
+            return {};
+    }
+    return essentials;
+}
+
+QStringList AndroidSdkManager::missingEssentialSdkPackages()
+{
+    const QStringList essentials = androidConfig().allEssentials();
+    const AndroidSdkPackageList &packages = allSdkPackages();
+    QStringList missingPackages;
+    for (AndroidSdkPackage *package : packages) {
+        if (essentials.contains(package->sdkStylePath())
+            && package->state() != AndroidSdkPackage::Installed) {
+            missingPackages.append(package->sdkStylePath());
+        }
+    }
+    return missingPackages;
+}
+
 AndroidSdkPackageList AndroidSdkManager::installedSdkPackages()
 {
     return m_d->filteredPackages(AndroidSdkPackage::Installed, AndroidSdkPackage::AnyValidType);
@@ -227,23 +400,21 @@ AndroidSdkPackageList AndroidSdkManager::installedSdkPackages()
 
 SystemImageList AndroidSdkManager::installedSystemImages()
 {
-    AndroidSdkPackageList list = m_d->filteredPackages(AndroidSdkPackage::AnyValidState,
-                                                       AndroidSdkPackage::SdkPlatformPackage);
-    QList<SdkPlatform *> platforms = Utils::static_container_cast<SdkPlatform *>(list);
-
+    const AndroidSdkPackageList list = m_d->filteredPackages(AndroidSdkPackage::AnyValidState,
+                                                             AndroidSdkPackage::SdkPlatformPackage);
+    const QList<SdkPlatform *> platforms = Utils::static_container_cast<SdkPlatform *>(list);
     SystemImageList result;
     for (SdkPlatform *platform : platforms) {
         if (platform->systemImages().size() > 0)
             result.append(platform->systemImages());
     }
-
     return result;
 }
 
 NdkList AndroidSdkManager::installedNdkPackages()
 {
-    AndroidSdkPackageList list = m_d->filteredPackages(AndroidSdkPackage::Installed,
-                                                       AndroidSdkPackage::NDKPackage);
+    const AndroidSdkPackageList list = m_d->filteredPackages(AndroidSdkPackage::Installed,
+                                                             AndroidSdkPackage::NDKPackage);
     return Utils::static_container_cast<Ndk *>(list);
 }
 
@@ -265,7 +436,6 @@ SdkPlatformList AndroidSdkManager::filteredSdkPlatforms(int minApiLevel,
 {
     const AndroidSdkPackageList list = m_d->filteredPackages(state,
                                                              AndroidSdkPackage::SdkPlatformPackage);
-
     SdkPlatformList result;
     for (AndroidSdkPackage *p : list) {
         auto platform = static_cast<SdkPlatform *>(p);
@@ -289,14 +459,15 @@ BuildToolsList AndroidSdkManager::filteredBuildTools(int minApiLevel,
     return result;
 }
 
-void AndroidSdkManager::reloadPackages(bool forceReload)
+void AndroidSdkManager::refreshPackages()
 {
-    m_d->refreshSdkPackages(forceReload);
+    if (androidConfig().sdkManagerToolPath() != m_d->lastSdkManagerPath)
+        reloadPackages();
 }
 
-bool AndroidSdkManager::isBusy() const
+void AndroidSdkManager::reloadPackages()
 {
-    return m_d->m_activeOperation && !m_d->m_activeOperation->isFinished();
+    m_d->reloadSdkPackages();
 }
 
 bool AndroidSdkManager::packageListingSuccessful() const
@@ -304,90 +475,46 @@ bool AndroidSdkManager::packageListingSuccessful() const
     return m_d->m_packageListingSuccessful;
 }
 
-QFuture<QString> AndroidSdkManager::availableArguments() const
-{
-    return Utils::asyncRun(&AndroidSdkManagerPrivate::parseCommonArguments, m_d.get());
-}
-
-QFuture<AndroidSdkManager::OperationOutput> AndroidSdkManager::updateAll()
-{
-    if (isBusy()) {
-        return QFuture<AndroidSdkManager::OperationOutput>();
-    }
-    auto future = Utils::asyncRun(&AndroidSdkManagerPrivate::updateInstalled, m_d.get());
-    m_d->addWatcher(future);
-    return future;
-}
-
-QFuture<AndroidSdkManager::OperationOutput>
-AndroidSdkManager::update(const QStringList &install, const QStringList &uninstall)
-{
-    if (isBusy())
-        return QFuture<AndroidSdkManager::OperationOutput>();
-    auto future = Utils::asyncRun(&AndroidSdkManagerPrivate::update, m_d.get(), install, uninstall);
-    m_d->addWatcher(future);
-    return future;
-}
-
-QFuture<AndroidSdkManager::OperationOutput> AndroidSdkManager::checkPendingLicenses()
-{
-    if (isBusy())
-        return QFuture<AndroidSdkManager::OperationOutput>();
-    auto future = Utils::asyncRun(&AndroidSdkManagerPrivate::checkPendingLicense, m_d.get());
-    m_d->addWatcher(future);
-    return future;
-}
-
-QFuture<AndroidSdkManager::OperationOutput> AndroidSdkManager::runLicenseCommand()
-{
-    if (isBusy())
-        return QFuture<AndroidSdkManager::OperationOutput>();
-    auto future = Utils::asyncRun(&AndroidSdkManagerPrivate::getPendingLicense, m_d.get());
-    m_d->addWatcher(future);
-    return future;
-}
-
-void AndroidSdkManager::cancelOperatons()
-{
-    emit cancelActiveOperations();
-    m_d->m_activeOperation.reset();
-}
-
-void AndroidSdkManager::acceptSdkLicense(bool accept)
+/*!
+    Runs the \c sdkmanger tool with arguments \a args. Returns \c true if the command is
+    successfully executed. Output is copied into \a output. The function blocks the calling thread.
+ */
+static bool sdkManagerCommand(const AndroidConfig &config, const QStringList &args, QString *output)
 {
-    m_d->setLicenseInput(accept);
+    QStringList newArgs = args;
+    newArgs.append(sdkRootArg(config));
+    Process proc;
+    proc.setEnvironment(config.toolsEnvironment());
+    proc.setTimeOutMessageBoxEnabled(true);
+    proc.setCommand({config.sdkManagerToolPath(), newArgs});
+    qCDebug(sdkManagerLog).noquote() << "Running SDK Manager command (sync):"
+                                     << proc.commandLine().toUserOutput();
+    proc.runBlocking(60s, EventLoopMode::On);
+    if (output)
+        *output = proc.allOutput();
+    return proc.result() == ProcessResult::FinishedWithSuccess;
 }
 
-AndroidSdkManagerPrivate::AndroidSdkManagerPrivate(AndroidSdkManager &sdkManager):
-    m_activeOperation(nullptr, watcherDeleter),
-    m_sdkManager(sdkManager)
+AndroidSdkManagerPrivate::AndroidSdkManagerPrivate(AndroidSdkManager &sdkManager)
+    : m_sdkManager(sdkManager)
 {}
 
 AndroidSdkManagerPrivate::~AndroidSdkManagerPrivate()
 {
-    clearPackages();
-}
-
-AndroidSdkPackageList
-AndroidSdkManagerPrivate::filteredPackages(AndroidSdkPackage::PackageState state,
-                                           AndroidSdkPackage::PackageType type, bool forceUpdate)
-{
-    refreshSdkPackages(forceUpdate);
-    return Utils::filtered(m_allPackages, [state, type](const AndroidSdkPackage *p) {
-       return p->state() & state && p->type() & type;
-    });
+    qDeleteAll(m_allPackages);
 }
 
-const AndroidSdkPackageList &AndroidSdkManagerPrivate::allPackages(bool forceUpdate)
+const AndroidSdkPackageList &AndroidSdkManagerPrivate::allPackages()
 {
-    refreshSdkPackages(forceUpdate);
+    m_sdkManager.refreshPackages();
     return m_allPackages;
 }
 
 void AndroidSdkManagerPrivate::reloadSdkPackages()
 {
     emit m_sdkManager.packageReloadBegin();
-    clearPackages();
+    qDeleteAll(m_allPackages);
+    m_allPackages.clear();
 
     lastSdkManagerPath = androidConfig().sdkManagerToolPath();
     m_packageListingSuccessful = false;
@@ -412,239 +539,67 @@ void AndroidSdkManagerPrivate::reloadSdkPackages()
     emit m_sdkManager.packageReloadFinished();
 }
 
-void AndroidSdkManagerPrivate::refreshSdkPackages(bool forceReload)
+void AndroidSdkManagerPrivate::runDialogRecipe(const Storage<DialogStorage> &dialogStorage,
+                                               const GroupItem &licensesRecipe,
+                                               const GroupItem &continuationRecipe)
 {
-    // Sdk path changed. Updated packages.
-    // QTC updates the package listing only
-    if (androidConfig().sdkManagerToolPath() != lastSdkManagerPath || forceReload)
-        reloadSdkPackages();
-}
-
-void AndroidSdkManagerPrivate::updateInstalled(SdkCmdPromise &promise)
-{
-    promise.setProgressRange(0, 100);
-    promise.setProgressValue(0);
-    AndroidSdkManager::OperationOutput result;
-    result.type = AndroidSdkManager::UpdateAll;
-    result.stdOutput = Tr::tr("Updating installed packages.");
-    promise.addResult(result);
-    QStringList args("--update");
-    args << androidConfig().sdkManagerToolArgs();
-    if (!promise.isCanceled())
-        sdkManagerCommand(androidConfig(), args, m_sdkManager, promise, result, 100);
-    else
-        qCDebug(sdkManagerLog) << "Update: Operation cancelled before start";
-
-    if (result.stdError.isEmpty() && !result.success)
-        result.stdError = Tr::tr("Failed.");
-    result.stdOutput = Tr::tr("Done") + "\n\n";
-    promise.addResult(result);
-    promise.setProgressValue(100);
-}
-
-void AndroidSdkManagerPrivate::update(SdkCmdPromise &fi, const QStringList &install,
-                                      const QStringList &uninstall)
-{
-    fi.setProgressRange(0, 100);
-    fi.setProgressValue(0);
-    double progressQuota = 100.0 / (install.count() + uninstall.count());
-    int currentProgress = 0;
-
-    QString installTag = Tr::tr("Installing");
-    QString uninstallTag = Tr::tr("Uninstalling");
-
-    auto doOperation = [&](const QString& packagePath, const QStringList& args,
-            bool isInstall) {
-        AndroidSdkManager::OperationOutput result;
-        result.type = AndroidSdkManager::UpdatePackage;
-        result.stdOutput = QString("%1 %2").arg(isInstall ? installTag : uninstallTag)
-                .arg(packagePath);
-        fi.addResult(result);
-        if (fi.isCanceled())
-            qCDebug(sdkManagerLog) << args << "Update: Operation cancelled before start";
-        else
-            sdkManagerCommand(androidConfig(), args, m_sdkManager, fi, result, progressQuota, isInstall);
-        currentProgress += progressQuota;
-        fi.setProgressValue(currentProgress);
-        if (result.stdError.isEmpty() && !result.success)
-            result.stdError = Tr::tr("Failed");
-        result.stdOutput = Tr::tr("Done") + "\n\n";
-        fi.addResult(result);
-        return fi.isCanceled();
+    const auto onCancelSetup = [dialogStorage] {
+        return std::make_pair(dialogStorage->m_dialog.get(), &QDialog::rejected);
     };
-
-
-    // Uninstall packages
-    for (const QString &sdkStylePath : uninstall) {
-        // Uninstall operations are not interptible. We don't want to leave half uninstalled.
-        QStringList args;
-        args << "--uninstall" << sdkStylePath << androidConfig().sdkManagerToolArgs();
-        if (doOperation(sdkStylePath, args, false))
-            break;
-    }
-
-    // Install packages
-    for (const QString &sdkStylePath : install) {
-        QStringList args(sdkStylePath);
-        args << androidConfig().sdkManagerToolArgs();
-        if (doOperation(sdkStylePath, args, true))
-            break;
-    }
-    fi.setProgressValue(100);
+    const Group root {
+        dialogStorage,
+        Group {
+            licensesRecipe,
+            Sync([dialogStorage] { dialogStorage->m_dialog->setQuestionVisible(false); }),
+            continuationRecipe
+        }.withCancel(onCancelSetup)
+    };
+    m_taskTreeRunner.start(root, {}, [this](DoneWith) {
+        QMetaObject::invokeMethod(&m_sdkManager, &AndroidSdkManager::reloadPackages,
+                                  Qt::QueuedConnection);
+    });
 }
 
-void AndroidSdkManagerPrivate::checkPendingLicense(SdkCmdPromise &fi)
+void AndroidSdkManager::runInstallationChange(const InstallationChange &change,
+                                              const QString &extraMessage)
 {
-    fi.setProgressRange(0, 100);
-    fi.setProgressValue(0);
-    AndroidSdkManager::OperationOutput result;
-    result.type = AndroidSdkManager::LicenseCheck;
-    const QStringList args = {"--licenses", sdkRootArg(androidConfig())};
-    if (!fi.isCanceled()) {
-        const int timeOutS = 4; // Short timeout as workaround for QTCREATORBUG-25667
-        sdkManagerCommand(androidConfig(), args, m_sdkManager, fi, result, 100.0, true, timeOutS);
-    } else {
-        qCDebug(sdkManagerLog) << "Update: Operation cancelled before start";
-    }
+    QString message = Tr::tr("%n Android SDK packages shall be updated.", "", change.count());
+    if (!extraMessage.isEmpty())
+        message.prepend(extraMessage + "\n\n");
 
-    fi.addResult(result);
-    fi.setProgressValue(100);
-}
-
-void AndroidSdkManagerPrivate::getPendingLicense(SdkCmdPromise &fi)
-{
-    fi.setProgressRange(0, 100);
-    fi.setProgressValue(0);
-
-    AndroidSdkManager::OperationOutput result;
-    result.type = AndroidSdkManager::LicenseWorkflow;
-
-    Process licenseCommand;
-    licenseCommand.setProcessMode(ProcessMode::Writer);
-    licenseCommand.setEnvironment(androidConfig().toolsEnvironment());
-    bool reviewingLicenses = false;
-    licenseCommand.setCommand(CommandLine(androidConfig().sdkManagerToolPath(),
-                                          {"--licenses", sdkRootArg(androidConfig())}));
-    licenseCommand.setUseCtrlCStub(true);
-    licenseCommand.start();
-    QTextCodec *codec = QTextCodec::codecForLocale();
-    int inputCounter = 0, steps = -1;
-    while (!licenseCommand.waitForFinished(200ms)) {
-        QString stdOut = codec->toUnicode(licenseCommand.readAllRawStandardOutput());
-        bool assertionFound = false;
-        if (!stdOut.isEmpty())
-            assertionFound = onLicenseStdOut(stdOut, reviewingLicenses, result, fi);
-
-        if (reviewingLicenses) {
-            // Check user input
-            QByteArray userInput = getUserInput();
-            if (!userInput.isEmpty()) {
-                clearUserInput();
-                licenseCommand.writeRaw(userInput);
-                ++inputCounter;
-                if (steps != -1)
-                    fi.setProgressValue(qRound((inputCounter / (double)steps) * 100));
-            }
-        } else if (assertionFound) {
-            // The first assertion is to start reviewing licenses. Always accept.
-            reviewingLicenses = true;
-            static const QRegularExpression reg(R"((\d+\sof\s)(?<steps>\d+))");
-            QRegularExpressionMatch match = reg.match(stdOut);
-            if (match.hasMatch())
-                steps = match.captured("steps").toInt();
-            licenseCommand.write("Y\n");
-        }
+    QMessageBox messageDlg(QMessageBox::Information, Tr::tr("Android SDK Changes"),
+                           message, QMessageBox::Ok | QMessageBox::Cancel,
+                           Core::ICore::dialogParent());
 
-        if (fi.isCanceled()) {
-            licenseCommand.terminate();
-            if (!licenseCommand.waitForFinished(300ms)) {
-                licenseCommand.kill();
-                licenseCommand.waitForFinished(200ms);
-            }
-        }
-        if (licenseCommand.state() == QProcess::NotRunning)
-            break;
+    QString details;
+    if (!change.toUninstall.isEmpty()) {
+        QStringList toUninstall = {Tr::tr("[Packages to be uninstalled:]")};
+        toUninstall += change.toUninstall;
+        details += toUninstall.join("\n   ");
     }
-
-    m_licenseTextCache.clear();
-    result.success = licenseCommand.exitStatus() == QProcess::NormalExit;
-    if (!result.success)
-        result.stdError = Tr::tr("License command failed.") + "\n\n";
-    fi.addResult(result);
-    fi.setProgressValue(100);
-}
-
-void AndroidSdkManagerPrivate::setLicenseInput(bool acceptLicense)
-{
-    QWriteLocker locker(&m_licenseInputLock);
-    m_licenseUserInput = acceptLicense ? "Y\n" : "n\n";
-}
-
-QByteArray AndroidSdkManagerPrivate::getUserInput() const
-{
-    QReadLocker locker(&m_licenseInputLock);
-    return m_licenseUserInput;
-}
-
-void AndroidSdkManagerPrivate::clearUserInput()
-{
-    QWriteLocker locker(&m_licenseInputLock);
-    m_licenseUserInput.clear();
-}
-
-bool AndroidSdkManagerPrivate::onLicenseStdOut(const QString &output, bool notify,
-                                               AndroidSdkManager::OperationOutput &result,
-                                               SdkCmdPromise &fi)
-{
-    m_licenseTextCache.append(output);
-    const QRegularExpressionMatch assertionMatch = assertionRegExp().match(m_licenseTextCache);
-    if (assertionMatch.hasMatch()) {
-        if (notify) {
-            result.stdOutput = m_licenseTextCache;
-            fi.addResult(result);
-        }
-        // Clear the current contents. The found license text is dispatched. Continue collecting the
-        // next license text.
-        m_licenseTextCache.clear();
-        return true;
+    if (!change.toInstall.isEmpty()) {
+        if (!change.toUninstall.isEmpty())
+            details.append("\n\n");
+        QStringList toInstall = {Tr::tr("[Packages to be installed:]")};
+        toInstall += change.toInstall;
+        details += toInstall.join("\n   ");
     }
-    return false;
-}
-
-void AndroidSdkManagerPrivate::addWatcher(const QFuture<AndroidSdkManager::OperationOutput> &future)
-{
-    if (future.isFinished())
+    messageDlg.setDetailedText(details);
+    if (messageDlg.exec() == QMessageBox::Cancel)
         return;
-    m_activeOperation.reset(new QFutureWatcher<void>());
-    m_activeOperation->setFuture(QFuture<void>(future));
-}
-
-void AndroidSdkManagerPrivate::parseCommonArguments(QPromise<QString> &promise)
-{
-    QString argumentDetails;
-    QString output;
-    sdkManagerCommand(androidConfig(), QStringList("--help"), &output);
-    bool foundTag = false;
-    const auto lines = output.split('\n');
-    for (const QString& line : lines) {
-        if (promise.isCanceled())
-            break;
-        if (foundTag)
-            argumentDetails.append(line + "\n");
-        else if (line.startsWith(commonArgsKey))
-            foundTag = true;
-    }
 
-    if (!promise.isCanceled())
-        promise.addResult(argumentDetails);
+    const Storage<DialogStorage> dialogStorage;
+    m_d->runDialogRecipe(dialogStorage,
+        change.toInstall.count() ? licensesRecipe(dialogStorage) : nullItem,
+        installationRecipe(dialogStorage, change));
 }
 
-void AndroidSdkManagerPrivate::clearPackages()
+void AndroidSdkManager::runUpdate()
 {
-    for (AndroidSdkPackage *p : std::as_const(m_allPackages))
-        delete p;
-    m_allPackages.clear();
+    const Storage<DialogStorage> dialogStorage;
+    m_d->runDialogRecipe(dialogStorage, licensesRecipe(dialogStorage), updateRecipe(dialogStorage));
 }
 
-} // namespace Internal
-} // namespace Android
+} // namespace Android::Internal
+
+#include "androidsdkmanager.moc"
diff --git a/src/plugins/android/androidsdkmanager.h b/src/plugins/android/androidsdkmanager.h
index 4c4d051af3..47611368f4 100644
--- a/src/plugins/android/androidsdkmanager.h
+++ b/src/plugins/android/androidsdkmanager.h
@@ -4,47 +4,39 @@
 
 #include "androidsdkpackage.h"
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 
 #include <QObject>
-#include <QFuture>
 
 #include <memory>
 
-namespace Android {
+QT_BEGIN_NAMESPACE
+class QRegularExpression;
+QT_END_MOC_NAMESPACE
 
-class AndroidConfig;
-
-namespace Internal {
+namespace Android::Internal {
 
 class AndroidSdkManagerPrivate;
 
+struct InstallationChange
+{
+    QStringList toInstall;
+    QStringList toUninstall = {};
+    int count() const { return toInstall.count() + toUninstall.count(); }
+};
+
 class AndroidSdkManager : public QObject
 {
     Q_OBJECT
-public:
-    enum CommandType
-    {
-        None,
-        UpdateAll,
-        UpdatePackage,
-        LicenseCheck,
-        LicenseWorkflow
-    };
-
-    struct OperationOutput
-    {
-        bool success = false;
-        CommandType type = None;
-        QString stdOutput;
-        QString stdError;
-    };
 
+public:
     AndroidSdkManager();
-    ~AndroidSdkManager() override;
+    ~AndroidSdkManager();
 
     SdkPlatformList installedSdkPlatforms();
     const AndroidSdkPackageList &allSdkPackages();
+    QStringList notFoundEssentialSdkPackages();
+    QStringList missingEssentialSdkPackages();
     AndroidSdkPackageList installedSdkPackages();
     SystemImageList installedSystemImages();
     NdkList installedNdkPackages();
@@ -57,31 +49,23 @@ public:
     BuildToolsList filteredBuildTools(int minApiLevel,
                                       AndroidSdkPackage::PackageState state
                                       = AndroidSdkPackage::Installed);
-    void reloadPackages(bool forceReload = false);
-    bool isBusy() const;
+    void refreshPackages();
+    void reloadPackages();
 
     bool packageListingSuccessful() const;
 
-    QFuture<QString> availableArguments() const;
-    QFuture<OperationOutput> updateAll();
-    QFuture<OperationOutput> update(const QStringList &install, const QStringList &uninstall);
-    QFuture<OperationOutput> checkPendingLicenses();
-    QFuture<OperationOutput> runLicenseCommand();
-
-    void cancelOperatons();
-    void acceptSdkLicense(bool accept);
+    void runInstallationChange(const InstallationChange &change, const QString &extraMessage = {});
+    void runUpdate();
 
 signals:
     void packageReloadBegin();
     void packageReloadFinished();
-    void cancelActiveOperations();
 
 private:
     friend class AndroidSdkManagerPrivate;
     std::unique_ptr<AndroidSdkManagerPrivate> m_d;
 };
 
+const QRegularExpression &assertionRegExp();
 
-int parseProgress(const QString &out, bool &foundAssertion);
-} // namespace Internal
-} // namespace Android
+} // namespace Android::Internal
diff --git a/src/plugins/android/androidsdkmanager_test.cpp b/src/plugins/android/androidsdkmanager_test.cpp
index abe6aa229c..f677c9cd34 100644
--- a/src/plugins/android/androidsdkmanager_test.cpp
+++ b/src/plugins/android/androidsdkmanager_test.cpp
@@ -51,6 +51,27 @@ void AndroidSdkManagerTest::testAndroidSdkManagerProgressParser_data()
         << true;
 }
 
+static int parseProgress(const QString &out, bool &foundAssertion)
+{
+    int progress = -1;
+    if (out.isEmpty())
+        return progress;
+    static const QRegularExpression reg("(?<progress>\\d*)%");
+    static const QRegularExpression regEndOfLine("[\\n\\r]");
+    const QStringList lines = out.split(regEndOfLine, Qt::SkipEmptyParts);
+    for (const QString &line : lines) {
+        QRegularExpressionMatch match = reg.match(line);
+        if (match.hasMatch()) {
+            progress = match.captured("progress").toInt();
+            if (progress < 0 || progress > 100)
+                progress = -1;
+        }
+        if (!foundAssertion)
+            foundAssertion = assertionRegExp().match(line).hasMatch();
+    }
+    return progress;
+}
+
 void AndroidSdkManagerTest::testAndroidSdkManagerProgressParser()
 {
     QFETCH(QString, output);
diff --git a/src/plugins/android/androidsdkmanagerdialog.cpp b/src/plugins/android/androidsdkmanagerdialog.cpp
new file mode 100644
index 0000000000..a2297bdac3
--- /dev/null
+++ b/src/plugins/android/androidsdkmanagerdialog.cpp
@@ -0,0 +1,342 @@
+// Copyright (C) 2017 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "androidconfigurations.h"
+#include "androidsdkmanager.h"
+#include "androidsdkmanagerdialog.h"
+#include "androidsdkmodel.h"
+#include "androidtr.h"
+
+#include <utils/layoutbuilder.h>
+#include <utils/qtcassert.h>
+#include <utils/qtcprocess.h>
+
+#include <QCheckBox>
+#include <QDialog>
+#include <QDialogButtonBox>
+#include <QHeaderView>
+#include <QLineEdit>
+#include <QPlainTextEdit>
+#include <QPushButton>
+#include <QRadioButton>
+#include <QSortFilterProxyModel>
+#include <QTreeView>
+
+using namespace Utils;
+using namespace std::placeholders;
+
+namespace Android::Internal {
+
+class OptionsDialog : public QDialog
+{
+public:
+    OptionsDialog(AndroidSdkManager *sdkManager, QWidget *parent)
+        : QDialog(parent)
+    {
+        QTC_CHECK(sdkManager);
+        resize(800, 480);
+        setWindowTitle(Tr::tr("SDK Manager Arguments"));
+
+        m_argumentDetailsEdit = new QPlainTextEdit;
+        m_argumentDetailsEdit->setReadOnly(true);
+
+        m_process.setEnvironment(androidConfig().toolsEnvironment());
+        m_process.setCommand({androidConfig().sdkManagerToolPath(),
+                              {"--help", "--sdk_root=" + androidConfig().sdkLocation().toString()}});
+        connect(&m_process, &Process::done, this, [this] {
+            const QString output = m_process.allOutput();
+            QString argumentDetails;
+            const int tagIndex = output.indexOf("Common Arguments:");
+            if (tagIndex >= 0) {
+                const int detailsIndex = output.indexOf('\n', tagIndex);
+                if (detailsIndex >= 0)
+                    argumentDetails = output.mid(detailsIndex + 1);
+            }
+            if (argumentDetails.isEmpty())
+                argumentDetails = Tr::tr("Cannot load available arguments for \"sdkmanager\" command.");
+            m_argumentDetailsEdit->setPlainText(argumentDetails);
+        });
+        m_process.start();
+
+        auto dialogButtons = new QDialogButtonBox;
+        dialogButtons->setStandardButtons(QDialogButtonBox::Cancel | QDialogButtonBox::Ok);
+        connect(dialogButtons, &QDialogButtonBox::accepted, this, &OptionsDialog::accept);
+        connect(dialogButtons, &QDialogButtonBox::rejected, this, &OptionsDialog::reject);
+
+        m_argumentsEdit = new QLineEdit;
+        m_argumentsEdit->setText(androidConfig().sdkManagerToolArgs().join(" "));
+
+        using namespace Layouting;
+
+        Column {
+            Form { Tr::tr("SDK manager arguments:"), m_argumentsEdit, br },
+            Tr::tr("Available arguments:"),
+            m_argumentDetailsEdit,
+            dialogButtons,
+        }.attachTo(this);
+    }
+
+    QStringList sdkManagerArguments() const
+    {
+        const QString userInput = m_argumentsEdit->text().simplified();
+        return userInput.isEmpty() ? QStringList() : userInput.split(' ');
+    }
+
+private:
+    QPlainTextEdit *m_argumentDetailsEdit = nullptr;
+    QLineEdit *m_argumentsEdit = nullptr;
+    Process m_process;
+};
+
+class PackageFilterModel : public QSortFilterProxyModel
+{
+public:
+    PackageFilterModel(AndroidSdkModel *sdkModel);
+
+    void setAcceptedPackageState(AndroidSdkPackage::PackageState state);
+    void setAcceptedSearchPackage(const QString &text);
+    bool filterAcceptsRow(int source_row, const QModelIndex &sourceParent) const override;
+
+private:
+    AndroidSdkPackage::PackageState m_packageState = AndroidSdkPackage::AnyValidState;
+    QString m_searchText;
+};
+
+class AndroidSdkManagerDialog : public QDialog
+{
+public:
+    AndroidSdkManagerDialog(AndroidSdkManager *sdkManager, QWidget *parent);
+
+private:
+    AndroidSdkManager *m_sdkManager = nullptr;
+    AndroidSdkModel *m_sdkModel = nullptr;
+};
+
+AndroidSdkManagerDialog::AndroidSdkManagerDialog(AndroidSdkManager *sdkManager, QWidget *parent)
+    : QDialog(parent)
+    , m_sdkManager(sdkManager)
+    , m_sdkModel(new AndroidSdkModel(m_sdkManager, this))
+{
+    QTC_CHECK(sdkManager);
+
+    setWindowTitle(Tr::tr("Android SDK Manager"));
+    resize(664, 396);
+    setModal(true);
+
+    auto packagesView = new QTreeView;
+    packagesView->setIndentation(20);
+    packagesView->header()->setCascadingSectionResizes(false);
+
+    auto updateInstalledButton = new QPushButton(Tr::tr("Update Installed"));
+
+    auto channelCheckbox = new QComboBox;
+    channelCheckbox->addItem(Tr::tr("Default"));
+    channelCheckbox->addItem(Tr::tr("Stable"));
+    channelCheckbox->addItem(Tr::tr("Beta"));
+    channelCheckbox->addItem(Tr::tr("Dev"));
+    channelCheckbox->addItem(Tr::tr("Canary"));
+
+    auto obsoleteCheckBox = new QCheckBox(Tr::tr("Include obsolete"));
+
+    auto showAvailableRadio = new QRadioButton(Tr::tr("Available"));
+    auto showInstalledRadio = new QRadioButton(Tr::tr("Installed"));
+    auto showAllRadio = new QRadioButton(Tr::tr("All"));
+    showAllRadio->setChecked(true);
+
+    auto optionsButton = new QPushButton(Tr::tr("Advanced Options..."));
+
+    auto searchField = new FancyLineEdit;
+    searchField->setPlaceholderText("Filter");
+
+    auto expandCheck = new QCheckBox(Tr::tr("Expand All"));
+
+    auto buttonBox = new QDialogButtonBox;
+    buttonBox->setStandardButtons(QDialogButtonBox::Apply | QDialogButtonBox::Cancel);
+    buttonBox->button(QDialogButtonBox::Apply)->setEnabled(false);
+
+    auto proxyModel = new PackageFilterModel(m_sdkModel);
+    packagesView->setModel(proxyModel);
+    packagesView->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
+    packagesView->header()->setSectionResizeMode(AndroidSdkModel::packageNameColumn,
+                                                       QHeaderView::Stretch);
+    packagesView->header()->setStretchLastSection(false);
+
+    using namespace Layouting;
+    Column {
+        Grid {
+            Row {searchField, expandCheck}, br,
+            packagesView,
+            Column {
+                updateInstalledButton,
+                st,
+                Group {
+                    title(Tr::tr("Show Packages")),
+                    Column {
+                        Row { Tr::tr("Channel:"), channelCheckbox },
+                        obsoleteCheckBox,
+                        hr,
+                        showAvailableRadio,
+                        showInstalledRadio,
+                        showAllRadio,
+                    }
+                },
+                optionsButton,
+            }, br,
+        },
+        buttonBox,
+    }.attachTo(this);
+
+    connect(m_sdkModel, &AndroidSdkModel::dataChanged, this, [this, buttonBox] {
+        buttonBox->button(QDialogButtonBox::Apply)
+            ->setEnabled(m_sdkModel->installationChange().count());
+    });
+
+    connect(expandCheck, &QCheckBox::stateChanged, this, [packagesView](int state) {
+        if (state == Qt::Checked)
+            packagesView->expandAll();
+        else
+            packagesView->collapseAll();
+    });
+    connect(updateInstalledButton, &QPushButton::clicked,
+            m_sdkManager, &AndroidSdkManager::runUpdate);
+    connect(showAllRadio, &QRadioButton::toggled, this, [this, proxyModel](bool checked) {
+        if (checked) {
+            proxyModel->setAcceptedPackageState(AndroidSdkPackage::AnyValidState);
+            m_sdkModel->resetSelection();
+        }
+    });
+    connect(showInstalledRadio, &QRadioButton::toggled, this, [this, proxyModel](bool checked) {
+        if (checked) {
+            proxyModel->setAcceptedPackageState(AndroidSdkPackage::Installed);
+            m_sdkModel->resetSelection();
+        }
+    });
+    connect(showAvailableRadio, &QRadioButton::toggled, this, [this, proxyModel](bool checked) {
+        if (checked) {
+            proxyModel->setAcceptedPackageState(AndroidSdkPackage::Available);
+            m_sdkModel->resetSelection();
+        }
+    });
+
+    connect(searchField, &QLineEdit::textChanged,
+            this, [this, proxyModel, expandCheck](const QString &text) {
+        proxyModel->setAcceptedSearchPackage(text);
+        m_sdkModel->resetSelection();
+        // It is more convenient to expand the view with the results
+        expandCheck->setChecked(!text.isEmpty());
+    });
+
+    connect(buttonBox->button(QDialogButtonBox::Apply), &QAbstractButton::clicked, this, [this] {
+        m_sdkManager->runInstallationChange(m_sdkModel->installationChange());
+    });
+    connect(buttonBox, &QDialogButtonBox::rejected, this, &AndroidSdkManagerDialog::reject);
+
+    connect(optionsButton, &QPushButton::clicked, this, [this] {
+        OptionsDialog dlg(m_sdkManager, this);
+        if (dlg.exec() == QDialog::Accepted) {
+            QStringList arguments = dlg.sdkManagerArguments();
+            if (arguments != androidConfig().sdkManagerToolArgs()) {
+                androidConfig().setSdkManagerToolArgs(arguments);
+                m_sdkManager->reloadPackages();
+            }
+        }
+    });
+
+    connect(obsoleteCheckBox, &QCheckBox::stateChanged, this, [this](int state) {
+        const QString obsoleteArg = "--include_obsolete";
+        QStringList args = androidConfig().sdkManagerToolArgs();
+        if (state == Qt::Checked && !args.contains(obsoleteArg)) {
+            args.append(obsoleteArg);
+            androidConfig().setSdkManagerToolArgs(args);
+       } else if (state == Qt::Unchecked && args.contains(obsoleteArg)) {
+            args.removeAll(obsoleteArg);
+            androidConfig().setSdkManagerToolArgs(args);
+       }
+        m_sdkManager->reloadPackages();
+    });
+
+    connect(channelCheckbox, &QComboBox::currentIndexChanged, this, [this](int index) {
+        QStringList args = androidConfig().sdkManagerToolArgs();
+        QString existingArg;
+        for (int i = 0; i < 4; ++i) {
+            const QString arg = "--channel=" + QString::number(i);
+            if (args.contains(arg)) {
+                existingArg = arg;
+                break;
+            }
+        }
+
+        if (index == 0 && !existingArg.isEmpty()) {
+            args.removeAll(existingArg);
+            androidConfig().setSdkManagerToolArgs(args);
+        } else if (index > 0) {
+            // Add 1 to account for Stable (second item) being channel 0
+            const QString channelArg = "--channel=" + QString::number(index - 1);
+            if (existingArg != channelArg) {
+                if (!existingArg.isEmpty()) {
+                    args.removeAll(existingArg);
+                    androidConfig().setSdkManagerToolArgs(args);
+                }
+                args.append(channelArg);
+                androidConfig().setSdkManagerToolArgs(args);
+            }
+       }
+        m_sdkManager->reloadPackages();
+    });
+}
+
+PackageFilterModel::PackageFilterModel(AndroidSdkModel *sdkModel) :
+    QSortFilterProxyModel(sdkModel)
+{
+    setSourceModel(sdkModel);
+}
+
+void PackageFilterModel::setAcceptedPackageState(AndroidSdkPackage::PackageState state)
+{
+    m_packageState = state;
+    invalidateFilter();
+}
+
+void PackageFilterModel::setAcceptedSearchPackage(const QString &name)
+{
+    m_searchText = name;
+    invalidateFilter();
+}
+
+bool PackageFilterModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
+{
+    QModelIndex srcIndex = sourceModel()->index(sourceRow, 0, sourceParent);
+    if (!srcIndex.isValid())
+        return false;
+
+    auto packageState = [](const QModelIndex& i) {
+      return (AndroidSdkPackage::PackageState)i.data(AndroidSdkModel::PackageStateRole).toInt();
+    };
+
+    auto packageFound = [this](const QModelIndex& i) {
+        return i.data(AndroidSdkModel::packageNameColumn).toString()
+                .contains(m_searchText, Qt::CaseInsensitive);
+    };
+
+    bool showTopLevel = false;
+    if (!sourceParent.isValid()) {
+        // Top Level items
+        for (int row = 0; row < sourceModel()->rowCount(srcIndex); ++row) {
+            QModelIndex childIndex = sourceModel()->index(row, 0, srcIndex);
+            if ((m_packageState & packageState(childIndex) && packageFound(childIndex))) {
+                showTopLevel = true;
+                break;
+            }
+        }
+    }
+
+    return showTopLevel || ((packageState(srcIndex) & m_packageState) && packageFound(srcIndex));
+}
+
+void executeAndroidSdkManagerDialog(AndroidSdkManager *sdkManager, QWidget *parent)
+{
+    AndroidSdkManagerDialog dialog(sdkManager, parent);
+    dialog.exec();
+}
+
+} // Android::Internal
diff --git a/src/plugins/android/androidsdkmanagerdialog.h b/src/plugins/android/androidsdkmanagerdialog.h
new file mode 100644
index 0000000000..e5e10c6783
--- /dev/null
+++ b/src/plugins/android/androidsdkmanagerdialog.h
@@ -0,0 +1,13 @@
+// Copyright (C) 2017 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+#pragma once
+
+#include <QWidget>
+
+namespace Android::Internal {
+
+class AndroidSdkManager;
+
+void executeAndroidSdkManagerDialog(AndroidSdkManager *sdkManager, QWidget *parent);
+
+} // Android::Internal
diff --git a/src/plugins/android/androidsdkmanagerwidget.cpp b/src/plugins/android/androidsdkmanagerwidget.cpp
deleted file mode 100644
index 7b1ca4e88f..0000000000
--- a/src/plugins/android/androidsdkmanagerwidget.cpp
+++ /dev/null
@@ -1,682 +0,0 @@
-// Copyright (C) 2017 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#include "androidconfigurations.h"
-#include "androidsdkmanager.h"
-#include "androidsdkmanagerwidget.h"
-#include "androidsdkmodel.h"
-#include "androidtr.h"
-
-#include <coreplugin/icore.h>
-
-#include <utils/async.h>
-#include <utils/layoutbuilder.h>
-#include <utils/outputformatter.h>
-#include <utils/qtcassert.h>
-#include <utils/utilsicons.h>
-
-#include <QAbstractButton>
-#include <QDialogButtonBox>
-#include <QGridLayout>
-#include <QGuiApplication>
-#include <QLabel>
-#include <QLineEdit>
-#include <QLoggingCategory>
-#include <QMessageBox>
-#include <QSortFilterProxyModel>
-
-using namespace Utils;
-using namespace std::placeholders;
-
-namespace Android::Internal {
-
-static Q_LOGGING_CATEGORY(androidSdkMgrUiLog, "qtc.android.sdkManagerUi", QtWarningMsg)
-
-class PackageFilterModel : public QSortFilterProxyModel
-{
-public:
-    PackageFilterModel(AndroidSdkModel *sdkModel);
-
-    void setAcceptedPackageState(AndroidSdkPackage::PackageState state);
-    void setAcceptedSearchPackage(const QString &text);
-    bool filterAcceptsRow(int source_row, const QModelIndex &sourceParent) const override;
-
-private:
-    AndroidSdkPackage::PackageState m_packageState = AndroidSdkPackage::AnyValidState;
-    QString m_searchText;
-};
-
-AndroidSdkManagerWidget::AndroidSdkManagerWidget(AndroidSdkManager *sdkManager, QWidget *parent) :
-    QDialog(parent),
-    m_sdkManager(sdkManager),
-    m_sdkModel(new AndroidSdkModel(m_sdkManager, this))
-{
-    QTC_CHECK(sdkManager);
-
-    setWindowTitle(Tr::tr("Android SDK Manager"));
-    resize(664, 396);
-    setModal(true);
-
-    m_packagesStack = new QWidget;
-
-    auto packagesView = new QTreeView(m_packagesStack);
-    packagesView->setIndentation(20);
-    packagesView->header()->setCascadingSectionResizes(false);
-
-    auto updateInstalledButton = new QPushButton(Tr::tr("Update Installed"));
-
-    auto channelCheckbox = new QComboBox;
-    channelCheckbox->addItem(Tr::tr("Default"));
-    channelCheckbox->addItem(Tr::tr("Stable"));
-    channelCheckbox->addItem(Tr::tr("Beta"));
-    channelCheckbox->addItem(Tr::tr("Dev"));
-    channelCheckbox->addItem(Tr::tr("Canary"));
-
-    auto obsoleteCheckBox = new QCheckBox(Tr::tr("Include obsolete"));
-
-    auto showAvailableRadio = new QRadioButton(Tr::tr("Available"));
-    auto showInstalledRadio = new QRadioButton(Tr::tr("Installed"));
-    auto showAllRadio = new QRadioButton(Tr::tr("All"));
-    showAllRadio->setChecked(true);
-
-    auto optionsButton = new QPushButton(Tr::tr("Advanced Options..."));
-
-    auto searchField = new FancyLineEdit(m_packagesStack);
-    searchField->setPlaceholderText("Filter");
-
-    auto expandCheck = new QCheckBox(Tr::tr("Expand All"));
-
-    m_outputStack = new QWidget;
-    m_operationProgress = new QProgressBar(m_outputStack);
-
-    m_outputEdit = new QPlainTextEdit(m_outputStack);
-    m_outputEdit->setReadOnly(true);
-
-    m_sdkLicenseLabel = new QLabel(Tr::tr("Do you want to accept the Android SDK license?"));
-    m_sdkLicenseLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
-    m_sdkLicenseLabel->hide();
-
-    m_sdkLicenseButtonBox = new QDialogButtonBox(m_outputStack);
-    m_sdkLicenseButtonBox->setEnabled(false);
-    m_sdkLicenseButtonBox->setStandardButtons(QDialogButtonBox::No|QDialogButtonBox::Yes);
-    m_sdkLicenseButtonBox->hide();
-
-    m_buttonBox = new QDialogButtonBox(this);
-    m_buttonBox->setStandardButtons(QDialogButtonBox::Apply | QDialogButtonBox::Cancel);
-    m_buttonBox->button(QDialogButtonBox::Apply)->setEnabled(false);
-
-    m_viewStack = new QStackedWidget(this);
-    m_viewStack->addWidget(m_packagesStack);
-    m_viewStack->addWidget(m_outputStack);
-    m_viewStack->setCurrentWidget(m_packagesStack);
-
-    m_formatter = new OutputFormatter;
-    m_formatter->setPlainTextEdit(m_outputEdit);
-
-    auto proxyModel = new PackageFilterModel(m_sdkModel);
-    packagesView->setModel(proxyModel);
-    packagesView->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
-    packagesView->header()->setSectionResizeMode(AndroidSdkModel::packageNameColumn,
-                                                       QHeaderView::Stretch);
-    packagesView->header()->setStretchLastSection(false);
-
-    using namespace Layouting;
-    Grid {
-        searchField, expandCheck, br,
-
-        Span(2, packagesView),
-        Column {
-            updateInstalledButton,
-            st,
-            Group {
-                title(Tr::tr("Show Packages")),
-                Column {
-                    Row { Tr::tr("Channel:"), channelCheckbox },
-                    obsoleteCheckBox,
-                    hr,
-                    showAvailableRadio,
-                    showInstalledRadio,
-                    showAllRadio,
-                }
-            },
-            optionsButton
-        },
-        noMargin
-    }.attachTo(m_packagesStack);
-
-    Column {
-        m_outputEdit,
-        Row { m_sdkLicenseLabel, m_sdkLicenseButtonBox },
-        m_operationProgress,
-        noMargin
-    }.attachTo(m_outputStack);
-
-    Column {
-        m_viewStack,
-        m_buttonBox
-    }.attachTo(this);
-
-    connect(m_sdkModel, &AndroidSdkModel::dataChanged, this, [this] {
-        if (m_viewStack->currentWidget() == m_packagesStack)
-            m_buttonBox->button(QDialogButtonBox::Apply)
-                ->setEnabled(!m_sdkModel->userSelection().isEmpty());
-    });
-
-    connect(m_sdkModel, &AndroidSdkModel::modelAboutToBeReset, this,
-            [this, expandCheck] {
-        m_buttonBox->button(QDialogButtonBox::Apply)->setEnabled(false);
-        expandCheck->setChecked(false);
-        cancelPendingOperations();
-        switchView(PackageListing);
-    });
-
-    connect(expandCheck, &QCheckBox::stateChanged, this, [packagesView](int state) {
-        if (state == Qt::Checked)
-            packagesView->expandAll();
-        else
-            packagesView->collapseAll();
-    });
-    connect(updateInstalledButton, &QPushButton::clicked,
-            this, &AndroidSdkManagerWidget::onUpdatePackages);
-    connect(showAllRadio, &QRadioButton::toggled, this, [this, proxyModel](bool checked) {
-        if (checked) {
-            proxyModel->setAcceptedPackageState(AndroidSdkPackage::AnyValidState);
-            m_sdkModel->resetSelection();
-        }
-    });
-    connect(showInstalledRadio, &QRadioButton::toggled,
-            this, [this, proxyModel](bool checked) {
-        if (checked) {
-            proxyModel->setAcceptedPackageState(AndroidSdkPackage::Installed);
-            m_sdkModel->resetSelection();
-        }
-    });
-    connect(showAvailableRadio, &QRadioButton::toggled, this, [this, proxyModel](bool checked) {
-        if (checked) {
-            proxyModel->setAcceptedPackageState(AndroidSdkPackage::Available);
-            m_sdkModel->resetSelection();
-        }
-    });
-
-    connect(searchField, &QLineEdit::textChanged,
-            this, [this, proxyModel, expandCheck](const QString &text) {
-        proxyModel->setAcceptedSearchPackage(text);
-        m_sdkModel->resetSelection();
-        // It is more convenient to expand the view with the results
-        expandCheck->setChecked(!text.isEmpty());
-    });
-
-    connect(m_buttonBox->button(QDialogButtonBox::Apply), &QAbstractButton::clicked, this, [this] {
-        onApplyButton();
-    });
-    connect(m_buttonBox, &QDialogButtonBox::rejected, this, &AndroidSdkManagerWidget::onCancel);
-
-    connect(optionsButton, &QPushButton::clicked,
-            this, &AndroidSdkManagerWidget::onSdkManagerOptions);
-    connect(m_sdkLicenseButtonBox, &QDialogButtonBox::accepted, this, [this] {
-        m_sdkManager->acceptSdkLicense(true);
-        m_sdkLicenseButtonBox->setEnabled(false); // Wait for next license to enable controls
-    });
-    connect(m_sdkLicenseButtonBox, &QDialogButtonBox::rejected, this, [this] {
-        m_sdkManager->acceptSdkLicense(false);
-        m_sdkLicenseButtonBox->setEnabled(false); // Wait for next license to enable controls
-    });
-
-    connect(obsoleteCheckBox, &QCheckBox::stateChanged, this, [this](int state) {
-        const QString obsoleteArg = "--include_obsolete";
-        QStringList args = androidConfig().sdkManagerToolArgs();
-        if (state == Qt::Checked && !args.contains(obsoleteArg)) {
-            args.append(obsoleteArg);
-            androidConfig().setSdkManagerToolArgs(args);
-       } else if (state == Qt::Unchecked && args.contains(obsoleteArg)) {
-            args.removeAll(obsoleteArg);
-            androidConfig().setSdkManagerToolArgs(args);
-       }
-        m_sdkManager->reloadPackages(true);
-    });
-
-    connect(channelCheckbox, &QComboBox::currentIndexChanged, this, [this](int index) {
-        QStringList args = androidConfig().sdkManagerToolArgs();
-        QString existingArg;
-        for (int i = 0; i < 4; ++i) {
-            const QString arg = "--channel=" + QString::number(i);
-            if (args.contains(arg)) {
-                existingArg = arg;
-                break;
-            }
-        }
-
-        if (index == 0 && !existingArg.isEmpty()) {
-            args.removeAll(existingArg);
-            androidConfig().setSdkManagerToolArgs(args);
-        } else if (index > 0) {
-            // Add 1 to account for Stable (second item) being channel 0
-            const QString channelArg = "--channel=" + QString::number(index - 1);
-            if (existingArg != channelArg) {
-                if (!existingArg.isEmpty()) {
-                    args.removeAll(existingArg);
-                    androidConfig().setSdkManagerToolArgs(args);
-                }
-                args.append(channelArg);
-                androidConfig().setSdkManagerToolArgs(args);
-            }
-       }
-        m_sdkManager->reloadPackages(true);
-    });
-}
-
-AndroidSdkManagerWidget::~AndroidSdkManagerWidget()
-{
-    if (m_currentOperation)
-        delete m_currentOperation;
-    cancelPendingOperations();
-    delete m_formatter;
-}
-
-void AndroidSdkManagerWidget::installEssentials()
-{
-    m_sdkModel->selectMissingEssentials();
-    if (!m_sdkModel->missingEssentials().isEmpty()) {
-        QMessageBox::warning(Core::ICore::dialogParent(),
-                             Tr::tr("Android SDK Changes"),
-                             Tr::tr("%1 cannot find the following essential packages: \"%2\".\n"
-                                    "Install them manually after the current operation is done.\n")
-                                 .arg(QGuiApplication::applicationDisplayName(),
-                                      m_sdkModel->missingEssentials().join("\", \"")));
-    }
-    onApplyButton(Tr::tr("Android SDK installation is missing necessary packages. "
-                     "Do you want to install the missing packages?"));
-}
-
-void AndroidSdkManagerWidget::beginLicenseCheck()
-{
-    m_formatter->appendMessage(Tr::tr("Checking pending licenses...") + "\n", NormalMessageFormat);
-    m_formatter->appendMessage(Tr::tr("The installation of Android SDK packages may fail if the "
-                                      "respective licenses are not accepted.")
-                                   + "\n",
-                               LogMessageFormat);
-    addPackageFuture(m_sdkManager->checkPendingLicenses());
-}
-
-void AndroidSdkManagerWidget::onApplyButton(const QString &extraMessage)
-{
-    QTC_ASSERT(m_currentView == PackageListing, return);
-
-    if (m_sdkManager->isBusy()) {
-        m_formatter->appendMessage("\n" + Tr::tr("SDK Manager is busy."), StdErrFormat);
-        return;
-    }
-
-    const QList<const AndroidSdkPackage *> packagesToUpdate = m_sdkModel->userSelection();
-    if (packagesToUpdate.isEmpty())
-        return;
-
-    QStringList installPackages, uninstallPackages;
-    for (auto package : packagesToUpdate) {
-        QString str = QString("   %1").arg(package->descriptionText());
-        if (package->state() == AndroidSdkPackage::Installed)
-            uninstallPackages << str;
-        else
-            installPackages << str;
-    }
-
-    QString message = Tr::tr("%n Android SDK packages shall be updated.", "", packagesToUpdate.count());
-    if (!extraMessage.isEmpty())
-        message.prepend(extraMessage + "\n\n");
-    QMessageBox messageDlg(QMessageBox::Information,
-                           Tr::tr("Android SDK Changes"),
-                           message,
-                           QMessageBox::Ok | QMessageBox::Cancel,
-                           Core::ICore::dialogParent());
-
-    QString details;
-    if (!uninstallPackages.isEmpty())
-        details = Tr::tr("[Packages to be uninstalled:]\n").append(uninstallPackages.join("\n"));
-
-    if (!installPackages.isEmpty()) {
-        if (!uninstallPackages.isEmpty())
-            details.append("\n\n");
-        details.append("[Packages to be installed:]\n").append(installPackages.join("\n"));
-    }
-    messageDlg.setDetailedText(details);
-    if (messageDlg.exec() == QMessageBox::Cancel)
-        return;
-
-    // Open the SDK Manager dialog after accepting to continue with the installation
-    show();
-
-    switchView(Operations);
-    m_pendingCommand = AndroidSdkManager::UpdatePackage;
-    // User agreed with the selection. Check for licenses.
-    if (!installPackages.isEmpty()) {
-        // Pending license affects installtion only.
-        beginLicenseCheck();
-    } else {
-        // Uninstall only. Go Ahead.
-        beginExecution();
-    }
-}
-
-void AndroidSdkManagerWidget::onUpdatePackages()
-{
-    if (m_sdkManager->isBusy()) {
-        m_formatter->appendMessage("\n" + Tr::tr("SDK Manager is busy."), StdErrFormat);
-        return;
-    }
-    switchView(Operations);
-    m_pendingCommand = AndroidSdkManager::UpdateAll;
-    beginLicenseCheck();
-}
-
-void AndroidSdkManagerWidget::onCancel()
-{
-    cancelPendingOperations();
-    close();
-}
-
-void AndroidSdkManagerWidget::onOperationResult(int index)
-{
-    QTC_ASSERT(m_currentOperation, return);
-    AndroidSdkManager::OperationOutput result = m_currentOperation->resultAt(index);
-    if (result.type == AndroidSdkManager::LicenseWorkflow) {
-        // Show license controls and enable to user input.
-        m_sdkLicenseLabel->setVisible(true);
-        m_sdkLicenseButtonBox->setVisible(true);
-        m_sdkLicenseButtonBox->setEnabled(true);
-        m_sdkLicenseButtonBox->button(QDialogButtonBox::No)->setDefault(true);
-    }
-    auto breakLine = [](const QString &line) { return line.endsWith("\n") ? line : line + "\n";};
-    if (!result.stdError.isEmpty() && result.type != AndroidSdkManager::LicenseCheck)
-        m_formatter->appendMessage(breakLine(result.stdError), StdErrFormat);
-    if (!result.stdOutput.isEmpty() && result.type != AndroidSdkManager::LicenseCheck)
-        m_formatter->appendMessage(breakLine(result.stdOutput), StdOutFormat);
-    m_outputEdit->ensureCursorVisible();
-}
-
-void AndroidSdkManagerWidget::onLicenseCheckResult(const AndroidSdkManager::OperationOutput& output)
-{
-    if (output.success) {
-        // No assertion was found. Looks like all license are accepted. Go Ahead.
-        runPendingCommand();
-    } else {
-        // Run license workflow.
-        beginLicenseWorkflow();
-    }
-}
-
-void AndroidSdkManagerWidget::addPackageFuture(const QFuture<AndroidSdkManager::OperationOutput>
-                                               &future)
-{
-    QTC_ASSERT(!m_currentOperation, return);
-    if (!future.isFinished() || !future.isCanceled()) {
-        m_currentOperation = new QFutureWatcher<AndroidSdkManager::OperationOutput>;
-        connect(m_currentOperation, &QFutureWatcherBase::resultReadyAt,
-                this, &AndroidSdkManagerWidget::onOperationResult);
-        connect(m_currentOperation, &QFutureWatcherBase::finished,
-                this, &AndroidSdkManagerWidget::packageFutureFinished);
-        connect(m_currentOperation, &QFutureWatcherBase::progressValueChanged,
-                this, [this](int value) {
-            m_operationProgress->setValue(value);
-        });
-        m_currentOperation->setFuture(future);
-    } else {
-        qCDebug(androidSdkMgrUiLog) << "Operation canceled/finished before adding to the queue";
-        if (m_sdkManager->isBusy()) {
-            m_formatter->appendMessage(Tr::tr("SDK Manager is busy. Operation cancelled."),
-                                       StdErrFormat);
-        }
-        notifyOperationFinished();
-        switchView(PackageListing);
-    }
-}
-
-void AndroidSdkManagerWidget::beginExecution()
-{
-    const QList<const AndroidSdkPackage *> packagesToUpdate = m_sdkModel->userSelection();
-    if (packagesToUpdate.isEmpty()) {
-        switchView(PackageListing);
-        return;
-    }
-
-    QStringList installSdkPaths, uninstallSdkPaths;
-    for (auto package : packagesToUpdate) {
-        if (package->state() == AndroidSdkPackage::Installed)
-            uninstallSdkPaths << package->sdkStylePath();
-        else
-            installSdkPaths << package->sdkStylePath();
-    }
-    m_formatter->appendMessage(Tr::tr("Installing/Uninstalling selected packages...\n"),
-                               NormalMessageFormat);
-    m_formatter->appendMessage(Tr::tr("Closing the %1 dialog will cancel the running and scheduled SDK "
-                                  "operations.\n").arg(HostOsInfo::isMacHost() ?
-                                                           Tr::tr("preferences") : Tr::tr("options")),
-                               LogMessageFormat);
-
-    addPackageFuture(m_sdkManager->update(installSdkPaths, uninstallSdkPaths));
-}
-
-void AndroidSdkManagerWidget::beginUpdate()
-{
-    m_formatter->appendMessage(Tr::tr("Updating installed packages...\n"), NormalMessageFormat);
-    m_formatter->appendMessage(Tr::tr("Closing the %1 dialog will cancel the running and scheduled SDK "
-                                  "operations.\n").arg(HostOsInfo::isMacHost() ?
-                                                           Tr::tr("preferences") : Tr::tr("options")),
-                               LogMessageFormat);
-    addPackageFuture(m_sdkManager->updateAll());
-}
-
-void AndroidSdkManagerWidget::beginLicenseWorkflow()
-{
-    switchView(LicenseWorkflow);
-    addPackageFuture(m_sdkManager->runLicenseCommand());
-}
-
-void AndroidSdkManagerWidget::notifyOperationFinished()
-{
-    if (!m_currentOperation || m_currentOperation->isFinished()) {
-        QMessageBox::information(this, Tr::tr("Android SDK Changes"),
-                                 Tr::tr("Android SDK operations finished."), QMessageBox::Ok);
-        m_operationProgress->setValue(0);
-        // Once the update/install is done, let's hide the dialog.
-        hide();
-    }
-}
-
-void AndroidSdkManagerWidget::packageFutureFinished()
-{
-    QTC_ASSERT (m_currentOperation, return);
-
-    bool continueWorkflow = true;
-    if (m_currentOperation->isCanceled()) {
-        m_formatter->appendMessage(Tr::tr("Operation cancelled.\n"), StdErrFormat);
-        continueWorkflow = false;
-    }
-    m_operationProgress->setValue(100);
-    int resultCount = m_currentOperation->future().resultCount();
-    if (continueWorkflow && resultCount > 0) {
-        AndroidSdkManager::OperationOutput output = m_currentOperation->resultAt(resultCount -1);
-        AndroidSdkManager::CommandType type = output.type;
-        m_currentOperation->deleteLater();
-        m_currentOperation = nullptr;
-        switch (type) {
-        case AndroidSdkManager::LicenseCheck:
-            onLicenseCheckResult(output);
-            break;
-        case AndroidSdkManager::LicenseWorkflow:
-            m_sdkLicenseButtonBox->hide();
-            m_sdkLicenseLabel->hide();
-            runPendingCommand();
-            break;
-        case AndroidSdkManager::UpdateAll:
-        case AndroidSdkManager::UpdatePackage:
-            notifyOperationFinished();
-            switchView(PackageListing);
-            m_sdkManager->reloadPackages(true);
-            break;
-        default:
-            break;
-        }
-    } else {
-        m_currentOperation->deleteLater();
-        m_currentOperation = nullptr;
-        switchView(PackageListing);
-        m_sdkManager->reloadPackages(true);
-    }
-}
-
-void AndroidSdkManagerWidget::cancelPendingOperations()
-{
-    if (!m_sdkManager->isBusy()) {
-        m_formatter->appendMessage(Tr::tr("\nNo pending operations to cancel...\n"),
-                                   NormalMessageFormat);
-        switchView(PackageListing);
-        return;
-    }
-    m_formatter->appendMessage(Tr::tr("\nCancelling pending operations...\n"),
-                               NormalMessageFormat);
-    m_sdkManager->cancelOperatons();
-}
-
-void AndroidSdkManagerWidget::switchView(AndroidSdkManagerWidget::View view)
-{
-    if (m_currentView == PackageListing)
-        m_formatter->clear();
-    m_currentView = view;
-    if (m_currentView == PackageListing) {
-        // We need the buttonBox only in the main listing view, as the license and update
-        // views already have a cancel button.
-        m_buttonBox->button(QDialogButtonBox::Apply)->setVisible(true);
-        emit updatingSdkFinished();
-    } else {
-        m_buttonBox->button(QDialogButtonBox::Apply)->setVisible(false);
-        emit updatingSdk();
-    }
-
-    if (m_currentView == LicenseWorkflow)
-        emit licenseWorkflowStarted();
-
-    m_operationProgress->setValue(0);
-    m_viewStack->setCurrentWidget(m_currentView == PackageListing ?
-                                          m_packagesStack : m_outputStack);
-}
-
-void AndroidSdkManagerWidget::runPendingCommand()
-{
-    if (m_pendingCommand == AndroidSdkManager::UpdatePackage)
-        beginExecution(); // License workflow can only start when updating packages.
-    else if (m_pendingCommand == AndroidSdkManager::UpdateAll)
-        beginUpdate();
-    else
-        QTC_ASSERT(false, qCDebug(androidSdkMgrUiLog) << "Unexpected state: No pending command.");
-}
-
-void AndroidSdkManagerWidget::onSdkManagerOptions()
-{
-    OptionsDialog dlg(m_sdkManager, androidConfig().sdkManagerToolArgs(), this);
-    if (dlg.exec() == QDialog::Accepted) {
-        QStringList arguments = dlg.sdkManagerArguments();
-        if (arguments != androidConfig().sdkManagerToolArgs()) {
-            androidConfig().setSdkManagerToolArgs(arguments);
-            m_sdkManager->reloadPackages(true);
-        }
-    }
-}
-
-PackageFilterModel::PackageFilterModel(AndroidSdkModel *sdkModel) :
-    QSortFilterProxyModel(sdkModel)
-{
-    setSourceModel(sdkModel);
-}
-
-void PackageFilterModel::setAcceptedPackageState(AndroidSdkPackage::PackageState state)
-{
-    m_packageState = state;
-    invalidateFilter();
-}
-
-void PackageFilterModel::setAcceptedSearchPackage(const QString &name)
-{
-    m_searchText = name;
-    invalidateFilter();
-}
-
-bool PackageFilterModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
-{
-    QModelIndex srcIndex = sourceModel()->index(sourceRow, 0, sourceParent);
-    if (!srcIndex.isValid())
-        return false;
-
-    auto packageState = [](const QModelIndex& i) {
-      return (AndroidSdkPackage::PackageState)i.data(AndroidSdkModel::PackageStateRole).toInt();
-    };
-
-    auto packageFound = [this](const QModelIndex& i) {
-        return i.data(AndroidSdkModel::packageNameColumn).toString()
-                .contains(m_searchText, Qt::CaseInsensitive);
-    };
-
-    bool showTopLevel = false;
-    if (!sourceParent.isValid()) {
-        // Top Level items
-        for (int row = 0; row < sourceModel()->rowCount(srcIndex); ++row) {
-            QModelIndex childIndex = sourceModel()->index(row, 0, srcIndex);
-            if ((m_packageState & packageState(childIndex) && packageFound(childIndex))) {
-                showTopLevel = true;
-                break;
-            }
-        }
-    }
-
-    return showTopLevel || ((packageState(srcIndex) & m_packageState) && packageFound(srcIndex));
-}
-
-OptionsDialog::OptionsDialog(AndroidSdkManager *sdkManager, const QStringList &args,
-                             QWidget *parent) : QDialog(parent)
-{
-    QTC_CHECK(sdkManager);
-    resize(800, 480);
-    setWindowTitle(Tr::tr("SDK Manager Arguments"));
-
-    m_argumentDetailsEdit = new QPlainTextEdit(this);
-    m_argumentDetailsEdit->setReadOnly(true);
-
-    auto populateOptions = [this](const QString& options) {
-        if (options.isEmpty()) {
-            m_argumentDetailsEdit->setPlainText(Tr::tr("Cannot load available arguments for "
-                                                       "\"sdkmanager\" command."));
-        } else {
-            m_argumentDetailsEdit->setPlainText(options);
-        }
-    };
-    m_optionsFuture = sdkManager->availableArguments();
-    Utils::onResultReady(m_optionsFuture, this, populateOptions);
-
-    auto dialogButtons = new QDialogButtonBox(this);
-    dialogButtons->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
-    connect(dialogButtons, &QDialogButtonBox::accepted, this, &OptionsDialog::accept);
-    connect(dialogButtons, &QDialogButtonBox::rejected, this, &OptionsDialog::reject);
-
-    m_argumentsEdit = new QLineEdit(this);
-    m_argumentsEdit->setText(args.join(" "));
-
-    auto gridLayout = new QGridLayout(this);
-    gridLayout->addWidget(new QLabel(Tr::tr("SDK manager arguments:"), this), 0, 0, 1, 1);
-    gridLayout->addWidget(m_argumentsEdit, 0, 1, 1, 1);
-    gridLayout->addWidget(new QLabel(Tr::tr("Available arguments:"), this), 1, 0, 1, 2);
-    gridLayout->addWidget(m_argumentDetailsEdit, 2, 0, 1, 2);
-    gridLayout->addWidget(dialogButtons, 3, 0, 1, 2);
-}
-
-OptionsDialog::~OptionsDialog()
-{
-    m_optionsFuture.cancel();
-    m_optionsFuture.waitForFinished();
-}
-
-QStringList OptionsDialog::sdkManagerArguments() const
-{
-    QString userInput = m_argumentsEdit->text().simplified();
-    return userInput.isEmpty() ? QStringList() : userInput.split(' ');
-}
-
-} // Android::Internal
diff --git a/src/plugins/android/androidsdkmanagerwidget.h b/src/plugins/android/androidsdkmanagerwidget.h
deleted file mode 100644
index ab915dc615..0000000000
--- a/src/plugins/android/androidsdkmanagerwidget.h
+++ /dev/null
@@ -1,115 +0,0 @@
-// Copyright (C) 2017 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-#pragma once
-
-#include "androidconfigurations.h"
-#include "androidsdkmanager.h"
-
-#include <QDialog>
-#include <QFutureWatcher>
-#include <QWidget>
-
-QT_BEGIN_NAMESPACE
-class QLineEdit;
-class QPlainTextEdit;
-QT_END_NAMESPACE
-
-#include <QtCore/QVariant>
-#include <QtWidgets/QAbstractButton>
-#include <QtWidgets/QApplication>
-#include <QtWidgets/QCheckBox>
-#include <QtWidgets/QComboBox>
-#include <QtWidgets/QDialogButtonBox>
-#include <QtWidgets/QFrame>
-#include <QtWidgets/QGroupBox>
-#include <QtWidgets/QHeaderView>
-#include <QtWidgets/QLabel>
-#include <QtWidgets/QPlainTextEdit>
-#include <QtWidgets/QProgressBar>
-#include <QtWidgets/QPushButton>
-#include <QtWidgets/QRadioButton>
-#include <QtWidgets/QSpacerItem>
-#include <QtWidgets/QStackedWidget>
-#include <QtWidgets/QTreeView>
-#include <QtWidgets/QWidget>
-#include <utils/fancylineedit.h>
-
-namespace Utils { class OutputFormatter; }
-
-namespace Android::Internal {
-
-class AndroidSdkManager;
-class AndroidSdkModel;
-
-class OptionsDialog : public QDialog
-{
-public:
-    OptionsDialog(AndroidSdkManager *sdkManager, const QStringList &args,
-                  QWidget *parent = nullptr);
-    ~OptionsDialog() override;
-
-    QStringList sdkManagerArguments() const;
-
-private:
-    QPlainTextEdit *m_argumentDetailsEdit;
-    QLineEdit *m_argumentsEdit;
-    QFuture<QString> m_optionsFuture;
-};
-
-class AndroidSdkManagerWidget : public QDialog
-{
-    Q_OBJECT
-
-    enum View {
-        PackageListing,
-        Operations,
-        LicenseWorkflow
-    };
-
-public:
-    AndroidSdkManagerWidget(AndroidSdkManager *sdkManager, QWidget *parent = nullptr);
-    ~AndroidSdkManagerWidget() override;
-
-    void installEssentials();
-
-signals:
-    void updatingSdk();
-    void updatingSdkFinished();
-    void licenseWorkflowStarted();
-
-private:
-    void onApplyButton(const QString &extraMessage = {});
-    void onUpdatePackages();
-    void onCancel();
-    void onOperationResult(int index);
-    void onLicenseCheckResult(const AndroidSdkManager::OperationOutput &output);
-    void onSdkManagerOptions();
-    void addPackageFuture(const QFuture<AndroidSdkManager::OperationOutput> &future);
-    void beginLicenseCheck();
-    void beginExecution();
-    void beginUpdate();
-    void beginLicenseWorkflow();
-    void notifyOperationFinished();
-    void packageFutureFinished();
-    void cancelPendingOperations();
-    void switchView(View view);
-    void runPendingCommand();
-
-    AndroidSdkManager::CommandType m_pendingCommand = AndroidSdkManager::None;
-    View m_currentView = PackageListing;
-    AndroidSdkManager *m_sdkManager = nullptr;
-    AndroidSdkModel *m_sdkModel = nullptr;
-    Utils::OutputFormatter *m_formatter = nullptr;
-    QFutureWatcher<AndroidSdkManager::OperationOutput> *m_currentOperation = nullptr;
-
-    QStackedWidget *m_viewStack;
-    QWidget *m_packagesStack;
-    QWidget *m_outputStack;
-    QProgressBar *m_operationProgress;
-    QPlainTextEdit *m_outputEdit;
-    QLabel *m_sdkLicenseLabel;
-    QDialogButtonBox *m_sdkLicenseButtonBox;
-    QDialogButtonBox *m_buttonBox;
-};
-
-} // Android::Internal
diff --git a/src/plugins/android/androidsdkmodel.cpp b/src/plugins/android/androidsdkmodel.cpp
index 9643b3a20a..c2b3ffdba3 100644
--- a/src/plugins/android/androidsdkmodel.cpp
+++ b/src/plugins/android/androidsdkmodel.cpp
@@ -11,11 +11,6 @@
 #include <utils/utilsicons.h>
 
 #include <QIcon>
-#include <QLoggingCategory>
-
-namespace {
-static Q_LOGGING_CATEGORY(androidSdkModelLog, "qtc.android.sdkmodel", QtWarningMsg)
-}
 
 namespace Android {
 namespace Internal {
@@ -35,6 +30,9 @@ AndroidSdkModel::AndroidSdkModel(AndroidSdkManager *sdkManager, QObject *parent)
         refreshData();
         endResetModel();
     });
+    beginResetModel();
+    refreshData();
+    endResetModel();
 }
 
 QVariant AndroidSdkModel::headerData(int section, Qt::Orientation orientation, int role) const
@@ -258,51 +256,19 @@ bool AndroidSdkModel::setData(const QModelIndex &index, const QVariant &value, i
     return false;
 }
 
-void AndroidSdkModel::selectMissingEssentials()
+InstallationChange AndroidSdkModel::installationChange() const
 {
-    resetSelection();
-    QStringList pendingPkgs(androidConfig().allEssentials());
-    auto addTool = [this](QList<const AndroidSdkPackage *>::const_iterator itr) {
-        if ((*itr)->installedLocation().isEmpty()) {
-            m_changeState << *itr;
-            auto i = index(std::distance(m_tools.cbegin(), itr), 0, index(0, 0));
-            emit dataChanged(i, i, {Qt::CheckStateRole});
-        }
-    };
-    for (auto tool = m_tools.cbegin(); tool != m_tools.cend(); ++tool) {
-        if (!pendingPkgs.contains((*tool)->sdkStylePath()))
-            continue;
-
-        addTool(tool);
-        pendingPkgs.removeOne((*tool)->sdkStylePath());
-
-        if (pendingPkgs.isEmpty())
-            break;
-    }
+    if (m_changeState.isEmpty())
+        return {};
 
-    // Select SDK platform
-    for (const SdkPlatform *platform : std::as_const(m_sdkPlatforms)) {
-        if (!platform->installedLocation().isEmpty()) {
-            pendingPkgs.removeOne(platform->sdkStylePath());
-        } else if (pendingPkgs.contains(platform->sdkStylePath()) &&
-            platform->installedLocation().isEmpty()) {
-            auto i = index(0, 0, index(1, 0));
-            m_changeState << platform;
-            emit dataChanged(i, i, {Qt::CheckStateRole});
-            pendingPkgs.removeOne(platform->sdkStylePath());
-        }
-        if (pendingPkgs.isEmpty())
-            break;
+    InstallationChange change;
+    for (const AndroidSdkPackage *package : m_changeState) {
+        if (package->state() == AndroidSdkPackage::Installed)
+            change.toUninstall << package->sdkStylePath();
+        else
+            change.toInstall << package->sdkStylePath();
     }
-
-    m_missingEssentials = pendingPkgs;
-    if (!m_missingEssentials.isEmpty())
-        qCDebug(androidSdkModelLog) << "Couldn't find some essential packages:" << m_missingEssentials;
-}
-
-QList<const AndroidSdkPackage *> AndroidSdkModel::userSelection() const
-{
-    return Utils::toList(m_changeState);
+    return change;
 }
 
 void AndroidSdkModel::resetSelection()
@@ -329,18 +295,14 @@ void AndroidSdkModel::refreshData()
             m_tools << p;
     }
     Utils::sort(m_sdkPlatforms, [](const SdkPlatform *p1, const SdkPlatform *p2) {
-       return p1->apiLevel() > p2->apiLevel();
+        return p1->apiLevel() > p2->apiLevel();
     });
 
     Utils::sort(m_tools, [](const AndroidSdkPackage *p1, const AndroidSdkPackage *p2) {
-       if (p1->state() == p2->state()) {
-           if (p1->type() ==  p2->type())
-               return p1->revision() > p2->revision();
-           else
-               return p1->type() > p2->type();
-       } else {
-           return p1->state() < p2->state();
-       }
+        if (p1->state() == p2->state())
+            return p1->type() == p2->type() ? p1->revision() > p2->revision() : p1->type() > p2->type();
+        else
+            return p1->state() < p2->state();
     });
 }
 
diff --git a/src/plugins/android/androidsdkmodel.h b/src/plugins/android/androidsdkmodel.h
index 2033f5fa9b..fdb148915a 100644
--- a/src/plugins/android/androidsdkmodel.h
+++ b/src/plugins/android/androidsdkmodel.h
@@ -41,11 +41,8 @@ public:
     Qt::ItemFlags flags(const QModelIndex &index) const override;
     bool setData(const QModelIndex &index, const QVariant &value, int role) override;
 
-    void selectMissingEssentials();
-    QList<const AndroidSdkPackage *> userSelection() const;
     void resetSelection();
-
-    QStringList missingEssentials() const { return m_missingEssentials; }
+    InstallationChange installationChange() const;
 
 private:
     void clearContainers();
@@ -55,7 +52,6 @@ private:
     QList<const SdkPlatform *> m_sdkPlatforms;
     QList<const AndroidSdkPackage *> m_tools;
     QSet<const AndroidSdkPackage *> m_changeState;
-    QStringList m_missingEssentials;
 };
 
 } // namespace Internal
diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp
index 2ae7af3721..785d0c5ac9 100644
--- a/src/plugins/android/androidsettingswidget.cpp
+++ b/src/plugins/android/androidsettingswidget.cpp
@@ -5,15 +5,18 @@
 #include "androidconstants.h"
 #include "androidsdkdownloader.h"
 #include "androidsdkmanager.h"
-#include "androidsdkmanagerwidget.h"
+#include "androidsdkmanagerdialog.h"
 #include "androidsettingswidget.h"
 #include "androidtr.h"
 
 #include <coreplugin/dialogs/ioptionspage.h>
+#include <coreplugin/icore.h>
 #include <coreplugin/messagemanager.h>
 
 #include <projectexplorer/projectexplorerconstants.h>
 
+#include <solutions/tasking/tasktreerunner.h>
+
 #include <utils/async.h>
 #include <utils/detailswidget.h>
 #include <utils/hostosinfo.h>
@@ -31,6 +34,7 @@
 #include <QDir>
 #include <QFileDialog>
 #include <QGroupBox>
+#include <QGuiApplication>
 #include <QList>
 #include <QListWidget>
 #include <QLoggingCategory>
@@ -158,7 +162,6 @@ class AndroidSettingsWidget final : public Core::IOptionsPageWidget
 public:
     // Todo: This would be so much simpler if it just used Utils::PathChooser!!!
     AndroidSettingsWidget();
-    ~AndroidSettingsWidget() final;
 
 private:
     void showEvent(QShowEvent *event) override;
@@ -180,10 +183,8 @@ private:
     bool isDefaultNdkSelected() const;
     void validateOpenSsl();
 
-    AndroidSdkManagerWidget *m_sdkManagerWidget = nullptr;
-
     AndroidSdkManager m_sdkManager;
-    AndroidSdkDownloader m_sdkDownloader;
+    Tasking::TaskTreeRunner m_sdkDownloader;
     bool m_isInitialReloadDone = false;
 
     SummaryWidget *m_androidSummary = nullptr;
@@ -255,7 +256,7 @@ static expected_str<void> testJavaC(const FilePath &jdkPath)
 
     jdkVersion = QVersionNumber::fromString(stdOut.mid(outputPrefix.length()).split('\n').first());
 
-    if (jdkVersion.isNull() || jdkVersion.majorVersion() != requiredJavaMajorVersion) {
+    if (jdkVersion.isNull() /* || jdkVersion.majorVersion() != requiredJavaMajorVersion */ ) {
         return make_unexpected(Tr::tr("Unsupported JDK version (needs to be %1): %2 (parsed: %3)")
                                    .arg(requiredJavaMajorVersion)
                                    .arg(stdOut)
@@ -337,9 +338,6 @@ AndroidSettingsWidget::AndroidSettingsWidget()
                        "If the automatic download fails, Qt Creator proposes to open the download URL\n"
                        "in the system's browser for manual download."));
 
-
-    m_sdkManagerWidget = new AndroidSdkManagerWidget(&m_sdkManager, this);
-
     const QMap<int, QString> androidValidationPoints = {
         { JavaPathExistsAndWritableRow, Tr::tr("JDK path exists and is writable.") },
         { SdkPathExistsAndWritableRow, Tr::tr("Android SDK path exists and is writable.") },
@@ -496,43 +494,33 @@ AndroidSettingsWidget::AndroidSettingsWidget()
         m_androidSummary->setInProgressText("Retrieving packages information");
         m_androidProgress->show();
     });
-    connect(sdkManagerToolButton, &QAbstractButton::clicked,
-            this, [this] { m_sdkManagerWidget->exec(); });
+    connect(sdkManagerToolButton, &QAbstractButton::clicked, this, [this] {
+        executeAndroidSdkManagerDialog(&m_sdkManager, this);
+    });
     connect(sdkToolsAutoDownloadButton, &QAbstractButton::clicked,
             this, &AndroidSettingsWidget::downloadSdk);
-    connect(&m_sdkDownloader, &AndroidSdkDownloader::sdkDownloaderError, this, [this](const QString &error) {
-        QMessageBox::warning(this, AndroidSdkDownloader::dialogTitle(), error);
-    });
-    connect(&m_sdkDownloader, &AndroidSdkDownloader::sdkExtracted, this, [this] {
+    connect(&m_sdkDownloader, &Tasking::TaskTreeRunner::done, this, [this](Tasking::DoneWith result) {
+        if (result != Tasking::DoneWith::Success)
+            return;
         // Make sure the sdk path is created before installing packages
         const FilePath sdkPath = androidConfig().sdkLocation();
         if (!sdkPath.createDir()) {
-            QMessageBox::warning(this, AndroidSdkDownloader::dialogTitle(),
+            QMessageBox::warning(this, Android::Internal::dialogTitle(),
                                  Tr::tr("Failed to create the SDK Tools path %1.")
                                  .arg("\n\"" + sdkPath.toUserOutput() + "\""));
         }
-        m_sdkManager.reloadPackages(true);
+        m_sdkManager.reloadPackages();
         updateUI();
         apply();
 
-        QMetaObject::Connection *const openSslOneShot = new QMetaObject::Connection;
-        *openSslOneShot = connect(&m_sdkManager, &AndroidSdkManager::packageReloadFinished,
-                                  this, [this, openSslOneShot] {
-                                      QObject::disconnect(*openSslOneShot);
-                                      downloadOpenSslRepo(true);
-                                      delete openSslOneShot;
-        });
+        connect(&m_sdkManager, &AndroidSdkManager::packageReloadFinished, this, [this] {
+            downloadOpenSslRepo(true);
+        }, Qt::SingleShotConnection);
     });
 
     setOnApply([] { AndroidConfigurations::setConfig(androidConfig()); });
 }
 
-AndroidSettingsWidget::~AndroidSettingsWidget()
-{
-    // Deleting m_sdkManagerWidget will cancel all ongoing and pending sdkmanager operations.
-    delete m_sdkManagerWidget;
-}
-
 void AndroidSettingsWidget::showEvent(QShowEvent *event)
 {
     Q_UNUSED(event)
@@ -540,8 +528,7 @@ void AndroidSettingsWidget::showEvent(QShowEvent *event)
         validateJdk();
         // Reloading SDK packages (force) is still synchronous. Use zero timer
         // to let settings dialog open first.
-        QTimer::singleShot(0, &m_sdkManager, std::bind(&AndroidSdkManager::reloadPackages,
-                                                       &m_sdkManager, false));
+        QTimer::singleShot(0, &m_sdkManager, &AndroidSdkManager::refreshPackages);
         validateOpenSsl();
         m_isInitialReloadDone = true;
     }
@@ -613,7 +600,7 @@ void AndroidSettingsWidget::validateJdk()
     updateUI();
 
     if (m_isInitialReloadDone)
-        m_sdkManager.reloadPackages(true);
+        m_sdkManager.reloadPackages();
 }
 
 void AndroidSettingsWidget::validateOpenSsl()
@@ -640,7 +627,7 @@ void AndroidSettingsWidget::onSdkPathChanged()
         currentOpenSslPath = sdkPath.pathAppended("android_openssl");
     m_openSslPathChooser->setFilePath(currentOpenSslPath);
     // Package reload will trigger validateSdk.
-    m_sdkManager.reloadPackages();
+    m_sdkManager.refreshPackages();
 }
 
 void AndroidSettingsWidget::validateSdk()
@@ -673,8 +660,20 @@ void AndroidSettingsWidget::validateSdk()
                                                         PlatformSdkInstalledRow,
                                                         AllEssentialsInstalledRow});
     androidConfig().setSdkFullyConfigured(sdkToolsOk && componentsOk);
-    if (sdkToolsOk && !componentsOk)
-        m_sdkManagerWidget->installEssentials();
+    if (sdkToolsOk && !componentsOk) {
+        const QStringList notFoundEssentials = m_sdkManager.notFoundEssentialSdkPackages();
+        if (!notFoundEssentials.isEmpty()) {
+            QMessageBox::warning(Core::ICore::dialogParent(),
+                Tr::tr("Android SDK Changes"),
+                Tr::tr("%1 cannot find the following essential packages: \"%2\".\n"
+                       "Install them manually after the current operation is done.\n")
+                    .arg(QGuiApplication::applicationDisplayName(),
+                         notFoundEssentials.join("\", \"")));
+        }
+        m_sdkManager.runInstallationChange({m_sdkManager.missingEssentialSdkPackages()},
+            Tr::tr("Android SDK installation is missing necessary packages. "
+                   "Do you want to install the missing packages?"));
+    }
 
     updateNdkList();
     updateUI();
@@ -814,6 +813,7 @@ void AndroidSettingsWidget::updateUI()
         }
     }
 
+    m_makeDefaultNdkButton->setEnabled(m_ndkListWidget->count() > 0);
     m_makeDefaultNdkButton->setText(isDefaultNdkSelected() ? Tr::tr("Unset Default")
                                                            : Tr::tr("Make Default"));
 }
@@ -821,7 +821,7 @@ void AndroidSettingsWidget::updateUI()
 void AndroidSettingsWidget::downloadSdk()
 {
     if (androidConfig().sdkToolsOk()) {
-        QMessageBox::warning(this, AndroidSdkDownloader::dialogTitle(),
+        QMessageBox::warning(this, Android::Internal::dialogTitle(),
                              Tr::tr("The selected path already has a valid SDK Tools package."));
         validateSdk();
         return;
@@ -830,10 +830,10 @@ void AndroidSettingsWidget::downloadSdk()
     const QString message = Tr::tr("Download and install Android SDK Tools to %1?")
             .arg("\n\"" + m_sdkLocationPathChooser->filePath().cleanPath().toUserOutput()
                  + "\"");
-    auto userInput = QMessageBox::information(this, AndroidSdkDownloader::dialogTitle(),
+    auto userInput = QMessageBox::information(this, Android::Internal::dialogTitle(),
                                               message, QMessageBox::Yes | QMessageBox::No);
     if (userInput == QMessageBox::Yes)
-        m_sdkDownloader.downloadAndExtractSdk();
+        m_sdkDownloader.start({Android::Internal::downloadSdkRecipe()});
 }
 
 // AndroidSettingsPage
diff --git a/src/plugins/android/avddialog.cpp b/src/plugins/android/avddialog.cpp
index 81a5442716..1d61385534 100644
--- a/src/plugins/android/avddialog.cpp
+++ b/src/plugins/android/avddialog.cpp
@@ -8,6 +8,8 @@
 #include "androiddevice.h"
 #include "androidsdkmanager.h"
 
+#include <coreplugin/icore.h>
+
 #include <projectexplorer/projectexplorerconstants.h>
 
 #include <utils/algorithm.h>
@@ -24,10 +26,12 @@
 #include <QKeyEvent>
 #include <QLineEdit>
 #include <QLoggingCategory>
+#include <QMessageBox>
 #include <QPushButton>
 #include <QSpinBox>
 #include <QToolTip>
 
+using namespace ProjectExplorer;
 using namespace Utils;
 
 namespace Android::Internal {
@@ -118,8 +122,16 @@ int AvdDialog::exec()
 {
     const int execResult = QDialog::exec();
     if (execResult == QDialog::Accepted) {
+        const SystemImage *si = systemImage();
+        if (!si || !si->isValid() || name().isEmpty()) {
+            QMessageBox::warning(Core::ICore::dialogParent(),
+                Tr::tr("Create new AVD"), Tr::tr("Cannot create AVD. Invalid input."));
+            return QDialog::Rejected;
+        }
+
         CreateAvdInfo result;
-        result.systemImage = systemImage();
+        result.sdkStylePath = si->sdkStylePath();
+        result.apiLevel = si->apiLevel();
         result.name = name();
         result.abi = abi();
         result.deviceDefinition = deviceDefinition();
@@ -139,7 +151,13 @@ int AvdDialog::exec()
 
         const QFuture<CreateAvdInfo> future = createAvdFutureWatcher.future();
         if (future.isResultReadyAt(0)) {
-            m_createdAvdInfo = future.result();
+            const CreateAvdInfo &info = future.result();
+            if (!info.error.isEmpty()) {
+                QMessageBox::warning(Core::ICore::dialogParent(),
+                    Tr::tr("Create new AVD"), info.error);
+                return QDialog::Rejected;
+            }
+            m_createdAvdInfo = info;
             AndroidDeviceManager::instance()->updateAvdsList();
         }
     }
@@ -152,22 +170,21 @@ bool AvdDialog::isValid() const
     return !name().isEmpty() && systemImage() && systemImage()->isValid() && !abi().isEmpty();
 }
 
-ProjectExplorer::IDevice::Ptr AvdDialog::device() const
+IDevice::Ptr AvdDialog::device() const
 {
-    if (!m_createdAvdInfo.systemImage) {
+    if (m_createdAvdInfo.apiLevel < 0) {
         qCWarning(avdDialogLog) << "System image of the created AVD is nullptr";
         return IDevice::Ptr();
     }
-    AndroidDevice *dev = new AndroidDevice();
+    AndroidDevice *dev = new AndroidDevice;
     const Utils::Id deviceId = AndroidDevice::idFromAvdInfo(m_createdAvdInfo);
-    using namespace ProjectExplorer;
     dev->setupId(IDevice::AutoDetected, deviceId);
     dev->setMachineType(IDevice::Emulator);
     dev->settings()->displayName.setValue(m_createdAvdInfo.name);
     dev->setDeviceState(IDevice::DeviceConnected);
     dev->setExtraData(Constants::AndroidAvdName, m_createdAvdInfo.name);
     dev->setExtraData(Constants::AndroidCpuAbi, {m_createdAvdInfo.abi});
-    dev->setExtraData(Constants::AndroidSdk, m_createdAvdInfo.systemImage->apiLevel());
+    dev->setExtraData(Constants::AndroidSdk, m_createdAvdInfo.apiLevel);
     return IDevice::Ptr(dev);
 }
 
diff --git a/src/plugins/android/avdmanageroutputparser.cpp b/src/plugins/android/avdmanageroutputparser.cpp
index eb252a2db7..2727680d08 100644
--- a/src/plugins/android/avdmanageroutputparser.cpp
+++ b/src/plugins/android/avdmanageroutputparser.cpp
@@ -156,8 +156,10 @@ int platformNameToApiLevel(const QString &platformName)
 
 QString convertNameToExtension(const QString &name)
 {
-    if (name.endsWith("ext4"))
-        return " Extension 4";
+    static const QRegularExpression rexEx(R"(-ext(\d+)$)");
+    const QRegularExpressionMatch match = rexEx.match(name);
+    if (match.hasMatch())
+        return " Extension " + match.captured(1);
 
     return {};
 }
diff --git a/src/plugins/android/certificatesmodel.h b/src/plugins/android/certificatesmodel.h
index b91b653f81..acb371205d 100644
--- a/src/plugins/android/certificatesmodel.h
+++ b/src/plugins/android/certificatesmodel.h
@@ -5,7 +5,7 @@
 #pragma once
 
 #include <QAbstractListModel>
-#include <QVector>
+#include <QList>
 #include <QPair>
 
 namespace Android {
@@ -17,12 +17,12 @@ public:
     CertificatesModel(const QString &rowCertificates, QObject *parent);
 
 protected:
-    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    int rowCount(const QModelIndex &parent = {}) const override;
 
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
 
 private:
-    QVector<QPair<QString, QString> > m_certs;
+    QList<QPair<QString, QString>> m_certs;
 };
 
 }
diff --git a/src/plugins/android/javaeditor.cpp b/src/plugins/android/javaeditor.cpp
index 27ced1b025..8fa69e6e8b 100644
--- a/src/plugins/android/javaeditor.cpp
+++ b/src/plugins/android/javaeditor.cpp
@@ -10,7 +10,6 @@
 
 #include <texteditor/codeassist/keywordscompletionassist.h>
 #include <texteditor/textdocument.h>
-#include <texteditor/texteditoractionhandler.h>
 #include <texteditor/texteditorconstants.h>
 #include <texteditor/texteditor.h>
 
@@ -48,7 +47,7 @@ public:
         setDocumentCreator(createJavaDocument);
         setUseGenericHighlighter(true);
         setCommentDefinition(Utils::CommentDefinition::CppStyle);
-        setEditorActionHandlers(TextEditor::TextEditorActionHandler::UnCommentSelection);
+        setOptionalActionMask(TextEditor::OptionalActions::UnCommentSelection);
         setCompletionAssistProvider(new TextEditor::KeywordsCompletionAssistProvider(keywords));
     }
 };
diff --git a/src/plugins/android/javalanguageserver.cpp b/src/plugins/android/javalanguageserver.cpp
index 97c3cd5027..671786756e 100644
--- a/src/plugins/android/javalanguageserver.cpp
+++ b/src/plugins/android/javalanguageserver.cpp
@@ -19,12 +19,12 @@
 #include <qtsupport/qtkitaspect.h>
 
 #include <utils/environment.h>
+#include <utils/layoutbuilder.h>
 #include <utils/mimeconstants.h>
 #include <utils/pathchooser.h>
 #include <utils/temporarydirectory.h>
 #include <utils/variablechooser.h>
 
-#include <QGridLayout>
 #include <QLineEdit>
 #include <QXmlStreamWriter>
 
@@ -57,26 +57,23 @@ JLSSettingsWidget::JLSSettingsWidget(const JLSSettings *settings, QWidget *paren
     , m_java(new PathChooser(this))
     , m_ls(new PathChooser(this))
 {
-    int row = 0;
-    auto *mainLayout = new QGridLayout;
-    mainLayout->addWidget(new QLabel(Tr::tr("Name:")), row, 0);
-    mainLayout->addWidget(m_name, row, 1);
     auto chooser = new VariableChooser(this);
     chooser->addSupportedWidget(m_name);
 
-    mainLayout->addWidget(new QLabel(Tr::tr("Java:")), ++row, 0);
     m_java->setExpectedKind(PathChooser::ExistingCommand);
     m_java->setFilePath(settings->m_executable);
-    mainLayout->addWidget(m_java, row, 1);
 
-    mainLayout->addWidget(new QLabel(Tr::tr("Java Language Server:")), ++row, 0);
     m_ls->setExpectedKind(PathChooser::File);
     m_ls->lineEdit()->setPlaceholderText(Tr::tr("Path to equinox launcher jar"));
     m_ls->setPromptDialogFilter("org.eclipse.equinox.launcher_*.jar");
     m_ls->setFilePath(settings->m_languageServer);
-    mainLayout->addWidget(m_ls, row, 1);
 
-    setLayout(mainLayout);
+    using namespace Layouting;
+    Form {
+        Tr::tr("Name:"), m_name, br,
+        Tr::tr("Java:"), m_java, br,
+        Tr::tr("Java Language Server:"), m_ls, br,
+    }.attachTo(this);
 }
 
 JLSSettings::JLSSettings()
diff --git a/src/plugins/android/splashscreencontainerwidget.cpp b/src/plugins/android/splashscreencontainerwidget.cpp
index e0e203121d..253dce0dd4 100644
--- a/src/plugins/android/splashscreencontainerwidget.cpp
+++ b/src/plugins/android/splashscreencontainerwidget.cpp
@@ -73,7 +73,7 @@ static SplashScreenWidget *addWidgetToPage(QWidget *page,
                                            const QString &splashScreenPath,
                                            int scalingRatio, int maxScalingRatio,
                                            QHBoxLayout *pageLayout,
-                                           QVector<SplashScreenWidget *> &widgetContainer)
+                                           QList<SplashScreenWidget *> &widgetContainer)
 {
     auto splashScreenWidget = new SplashScreenWidget(page,
                                                      size,
@@ -90,9 +90,9 @@ static SplashScreenWidget *addWidgetToPage(QWidget *page,
 }
 
 static QWidget *createPage(TextEditor::TextEditorWidget *textEditorWidget,
-                           QVector<SplashScreenWidget *> &widgetContainer,
-                           QVector<SplashScreenWidget *> &portraitWidgetContainer,
-                           QVector<SplashScreenWidget *> &landscapeWidgetContainer,
+                           QList<SplashScreenWidget *> &widgetContainer,
+                           QList<SplashScreenWidget *> &portraitWidgetContainer,
+                           QList<SplashScreenWidget *> &landscapeWidgetContainer,
                            int scalingRatio,
                            const QSize &size,
                            const QSize &portraitSize,
diff --git a/src/plugins/android/splashscreencontainerwidget.h b/src/plugins/android/splashscreencontainerwidget.h
index deec77faad..ef8f2f5b0a 100644
--- a/src/plugins/android/splashscreencontainerwidget.h
+++ b/src/plugins/android/splashscreencontainerwidget.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QVector>
+#include <QList>
 #include <QStackedWidget>
 
 QT_BEGIN_NAMESPACE
@@ -48,9 +48,9 @@ private:
     void clearAll();
 
     TextEditor::TextEditorWidget *m_textEditorWidget = nullptr;
-    QVector<SplashScreenWidget *> m_imageWidgets;
-    QVector<SplashScreenWidget *> m_portraitImageWidgets;
-    QVector<SplashScreenWidget *> m_landscapeImageWidgets;
+    QList<SplashScreenWidget *> m_imageWidgets;
+    QList<SplashScreenWidget *> m_portraitImageWidgets;
+    QList<SplashScreenWidget *> m_landscapeImageWidgets;
     bool m_splashScreenSticky = false;
     QColor m_splashScreenBackgroundColor;
     QCheckBox *m_stickyCheck = nullptr;
diff --git a/src/plugins/autotest/autotestplugin.cpp b/src/plugins/autotest/autotestplugin.cpp
index 2502b64146..c74ad31d27 100644
--- a/src/plugins/autotest/autotestplugin.cpp
+++ b/src/plugins/autotest/autotestplugin.cpp
@@ -472,6 +472,21 @@ void popupResultsPane()
         dd->m_resultsPane->popup(Core::IOutputPane::NoModeSwitch);
 }
 
+QString wildcardPatternFromString(const QString &original)
+{
+    QString pattern = original;
+    pattern.replace('\\', "\\\\");
+    pattern.replace('.', "\\.");
+    pattern.replace('^', "\\^").replace('$', "\\$");
+    pattern.replace('(', "\\(").replace(')', "\\)");
+    pattern.replace('[', "\\[").replace(']', "\\]");
+    pattern.replace('{', "\\{").replace('}', "\\}");
+    pattern.replace('+', "\\+");
+    pattern.replace('*', ".*");
+    pattern.replace('?', '.');
+    return pattern;
+}
+
 bool ChoicePair::matches(const ProjectExplorer::RunConfiguration *rc) const
 {
     return rc && rc->displayName() == displayName && rc->runnable().command.executable() == executable;
diff --git a/src/plugins/autotest/autotestplugin.h b/src/plugins/autotest/autotestplugin.h
index a70066813d..a97c04c274 100644
--- a/src/plugins/autotest/autotestplugin.h
+++ b/src/plugins/autotest/autotestplugin.h
@@ -33,6 +33,6 @@ void cacheRunConfigChoice(const QString &buildTargetKey, const ChoicePair &choic
 ChoicePair cachedChoiceFor(const QString &buildTargetKey);
 void clearChoiceCache();
 void popupResultsPane();
-
+QString wildcardPatternFromString(const QString &original);
 
 } // Autotest::Internal
diff --git a/src/plugins/autotest/ctest/ctesttreeitem.cpp b/src/plugins/autotest/ctest/ctesttreeitem.cpp
index ad744bb5c8..a9f68d6895 100644
--- a/src/plugins/autotest/ctest/ctesttreeitem.cpp
+++ b/src/plugins/autotest/ctest/ctesttreeitem.cpp
@@ -87,7 +87,11 @@ QList<ITestConfiguration *> CTestTreeItem::testConfigurationsFor(const QStringLi
         return {};
 
     const ProjectExplorer::BuildSystem *buildSystem = target->buildSystem();
-    QStringList options{"--timeout", QString::number(testSettings().timeout() / 1000)};
+    QStringList options;
+    if (testSettings().useTimeout()) {
+        options << "--timeout"
+                << QString::number(testSettings().timeout() / 1000);
+    }
     options << theCTestTool().activeSettingsAsOptions();
     CommandLine command = buildSystem->commandLineForTests(selected, options);
     if (command.executable().isEmpty())
diff --git a/src/plugins/autotest/gtest/gtesttreeitem.cpp b/src/plugins/autotest/gtest/gtesttreeitem.cpp
index 8ece0e618a..42b1002005 100644
--- a/src/plugins/autotest/gtest/gtesttreeitem.cpp
+++ b/src/plugins/autotest/gtest/gtesttreeitem.cpp
@@ -8,6 +8,7 @@
 #include "gtestframework.h"
 #include "gtestparser.h"
 #include "../autotesttr.h"
+#include "../autotestplugin.h"
 
 #include <cppeditor/cppmodelmanager.h>
 
@@ -56,20 +57,6 @@ TestTreeItem *GTestTreeItem::copyWithoutChildren()
     return copied;
 }
 
-static QString wildCardPattern(const QString &original)
-{
-    QString pattern = original;
-    pattern.replace('.', "\\.");
-    pattern.replace('$', "\\$");
-    pattern.replace('(', "\\(").replace(')', "\\)");
-    pattern.replace('[', "\\[").replace(']', "\\]");
-    pattern.replace('{', "\\{").replace('}', "\\}");
-    pattern.replace('+', "\\+");
-    pattern.replace('*', ".*");
-    pattern.replace('?', '.');
-    return pattern;
-}
-
 static bool matchesFilter(const QString &filter, const QString &fullTestName)
 {
     QStringList positive;
@@ -87,12 +74,12 @@ static bool matchesFilter(const QString &filter, const QString &fullTestName)
         testName.append('.');
 
     for (const QString &curr : negative) {
-        QRegularExpression regex(wildCardPattern(curr));
+        QRegularExpression regex(wildcardPatternFromString(curr));
         if (regex.match(testName).hasMatch())
             return false;
     }
     for (const QString &curr : positive) {
-        QRegularExpression regex(wildCardPattern(curr));
+        QRegularExpression regex(wildcardPatternFromString(curr));
         if (regex.match(testName).hasMatch())
             return true;
     }
diff --git a/src/plugins/autotest/projectsettingswidget.cpp b/src/plugins/autotest/projectsettingswidget.cpp
index c5a8b41059..01b6c06d00 100644
--- a/src/plugins/autotest/projectsettingswidget.cpp
+++ b/src/plugins/autotest/projectsettingswidget.cpp
@@ -6,6 +6,7 @@
 #include "autotestconstants.h"
 #include "autotestplugin.h"
 #include "autotesttr.h"
+#include "testcodeparser.h"
 #include "testprojectsettings.h"
 #include "testtreemodel.h"
 
@@ -13,10 +14,12 @@
 #include <projectexplorer/projectsettingswidget.h>
 
 #include <utils/algorithm.h>
+#include <utils/aspects.h>
 #include <utils/layoutbuilder.h>
 #include <utils/qtcassert.h>
 
 #include <QComboBox>
+#include <QPushButton>
 #include <QTimer>
 #include <QTreeWidget>
 
@@ -37,10 +40,13 @@ public:
 private:
     void populateFrameworks(const QHash<Autotest::ITestFramework *, bool> &frameworks,
                             const QHash<Autotest::ITestTool *, bool> &testTools);
+    void populatePathFilters(const QStringList &filters);
     void onActiveFrameworkChanged(QTreeWidgetItem *item, int column);
     TestProjectSettings *m_projectSettings;
     QTreeWidget *m_activeFrameworks = nullptr;
     QComboBox *m_runAfterBuild = nullptr;
+    Utils::BoolAspect m_applyFilter;
+    QTreeWidget *m_pathFilters = nullptr;
     QTimer m_syncTimer;
     int m_syncType = 0;
 };
@@ -59,6 +65,14 @@ ProjectTestSettingsWidget::ProjectTestSettingsWidget(Project *project)
     m_runAfterBuild->addItem(Tr::tr("All"));
     m_runAfterBuild->addItem(Tr::tr("Selected"));
     m_runAfterBuild->setCurrentIndex(int(m_projectSettings->runAfterBuild()));
+    m_applyFilter.setToolTip(Tr::tr("Apply path filters before scanning for tests."));
+    m_pathFilters = new QTreeWidget;
+    m_pathFilters->setHeaderHidden(true);
+    m_pathFilters->setRootIsDecorated(false);
+    QLabel *filterLabel = new QLabel(Tr::tr("Wildcard expressions for filtering"), this);
+    QPushButton *addFilter = new QPushButton(Tr::tr("Add"), this);
+    QPushButton *removeFilter = new QPushButton(Tr::tr("Remove"), this);
+    removeFilter->setEnabled(false);
 
     using namespace Layouting;
     Column {
@@ -80,6 +94,19 @@ ProjectTestSettingsWidget::ProjectTestSettingsWidget(Project *project)
                 noMargin(),
             },
         },
+        Row { // explicitly outside of the global settings
+            Group {
+                title(Tr::tr("Limit files to path patterns")),
+                m_applyFilter.groupChecker(),
+                Column {
+                    filterLabel,
+                    Row {
+                        Column { m_pathFilters },
+                        Column { addFilter, removeFilter, st },
+                    },
+                },
+            },
+        },
         noMargin(),
     }.attachTo(this);
 
@@ -88,7 +115,9 @@ ProjectTestSettingsWidget::ProjectTestSettingsWidget(Project *project)
     populateFrameworks(m_projectSettings->activeFrameworks(),
                        m_projectSettings->activeTestTools());
 
+    populatePathFilters(m_projectSettings->pathFilters());
     setUseGlobalSettings(m_projectSettings->useGlobalSettings());
+    m_applyFilter.setValue(m_projectSettings->limitToFilters());
     connect(this, &ProjectSettingsWidget::useGlobalSettingsChanged,
             this, [this, generalWidget](bool useGlobalSettings) {
                 generalWidget->setEnabled(!useGlobalSettings);
@@ -102,6 +131,56 @@ ProjectTestSettingsWidget::ProjectTestSettingsWidget(Project *project)
     connect(m_runAfterBuild, &QComboBox::currentIndexChanged, this, [this](int index) {
         m_projectSettings->setRunAfterBuild(RunAfterBuildMode(index));
     });
+
+    auto itemsToStringList = [this] {
+        QStringList items;
+        const QTreeWidgetItem *rootItem = m_pathFilters->invisibleRootItem();
+        for (int i = 0, count = rootItem->childCount(); i < count; ++i) {
+            auto expr = rootItem->child(i)->data(0, Qt::DisplayRole).toString();
+            items.append(expr);
+        }
+        return items;
+    };
+    auto triggerRescan = [] {
+        TestCodeParser *parser = TestTreeModel::instance()->parser();
+        parser->emitUpdateTestTree();
+    };
+
+    connect(&m_applyFilter, &Utils::BoolAspect::changed,
+            this, [this, triggerRescan] {
+        m_projectSettings->setLimitToFilter(m_applyFilter.value());
+        triggerRescan();
+    });
+    connect(m_pathFilters, &QTreeWidget::itemSelectionChanged,
+            this, [this, removeFilter] {
+        removeFilter->setEnabled(!m_pathFilters->selectedItems().isEmpty());
+    });
+    connect(m_pathFilters->model(), &QAbstractItemModel::dataChanged,
+            this, [this, itemsToStringList, triggerRescan]
+            (const QModelIndex &tl, const QModelIndex &br, const QList<int> &roles) {
+        if (!roles.contains(Qt::DisplayRole))
+            return;
+        if (tl != br)
+            return;
+        m_projectSettings->setPathFilters(itemsToStringList());
+        triggerRescan();
+    });
+    connect(addFilter, &QPushButton::clicked, this, [this] {
+        m_projectSettings->addPathFilter("*");
+        populatePathFilters(m_projectSettings->pathFilters());
+        const QTreeWidgetItem *root = m_pathFilters->invisibleRootItem();
+        QTreeWidgetItem *lastChild =  root->child(root->childCount() - 1);
+        const QModelIndex index = m_pathFilters->indexFromItem(lastChild, 0);
+        m_pathFilters->edit(index);
+    });
+    connect(removeFilter, &QPushButton::clicked, this, [this, itemsToStringList, triggerRescan] {
+        const QList<QTreeWidgetItem *> selected = m_pathFilters->selectedItems();
+        QTC_ASSERT(selected.size() == 1, return);
+        m_pathFilters->invisibleRootItem()->removeChild(selected.first());
+        delete selected.first();
+        m_projectSettings->setPathFilters(itemsToStringList());
+        triggerRescan();
+    });
     m_syncTimer.setSingleShot(true);
     connect(&m_syncTimer, &QTimer::timeout, this, [this] {
         auto testTreeModel = TestTreeModel::instance();
@@ -136,6 +215,16 @@ void ProjectTestSettingsWidget::populateFrameworks(const QHash<ITestFramework *,
         generateItem(it.key(), it.value());
 }
 
+void ProjectTestSettingsWidget::populatePathFilters(const QStringList &filters)
+{
+    m_pathFilters->clear();
+    for (const QString &filter : filters) {
+        auto item = new QTreeWidgetItem(m_pathFilters, {filter});
+        item->setData(0, Qt::ToolTipRole, filter);
+        item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable);
+    }
+}
+
 void ProjectTestSettingsWidget::onActiveFrameworkChanged(QTreeWidgetItem *item, int column)
 {
     auto id = Utils::Id::fromSetting(item->data(column, BaseIdRole));
diff --git a/src/plugins/autotest/qtest/qttest_utils.cpp b/src/plugins/autotest/qtest/qttest_utils.cpp
index 3717a56386..c052e583fd 100644
--- a/src/plugins/autotest/qtest/qttest_utils.cpp
+++ b/src/plugins/autotest/qtest/qttest_utils.cpp
@@ -137,9 +137,11 @@ Environment prepareBasicEnvironment(const Environment &env)
         result.set("QT_FORCE_STDERR_LOGGING", "1");
         result.set("QT_LOGGING_TO_CONSOLE", "1");
     }
-    const int timeout = testSettings().timeout();
-    if (timeout > 5 * 60 * 1000) // Qt5.5 introduced hard limit, Qt5.6.1 added env var to raise this
-        result.set("QTEST_FUNCTION_TIMEOUT", QString::number(timeout));
+    if (testSettings().useTimeout()) {
+        const int timeout = testSettings().timeout();
+        if (timeout > 5 * 60 * 1000) // Qt5.5 introduced hard limit, Qt5.6.1 added env var to raise this
+            result.set("QTEST_FUNCTION_TIMEOUT", QString::number(timeout));
+    }
     return result;
 }
 
diff --git a/src/plugins/autotest/qtest/qttesttreeitem.cpp b/src/plugins/autotest/qtest/qttesttreeitem.cpp
index 68b50be907..00f8a0665e 100644
--- a/src/plugins/autotest/qtest/qttesttreeitem.cpp
+++ b/src/plugins/autotest/qtest/qttesttreeitem.cpp
@@ -170,6 +170,34 @@ ITestConfiguration *QtTestTreeItem::testConfiguration() const
     return config;
 }
 
+struct FunctionLocation {
+    FunctionLocation(const QString &n, const Link &l, std::optional<Link> r = std::nullopt)
+        : name(n), declaration(l), registration(r) {}
+    QString name;
+    Link declaration;
+    std::optional<Link> registration;
+};
+
+static QStringList orderedTestCases(const QList<FunctionLocation> &original)
+{
+    auto compare = [](const Link &lhs, const Link &rhs) {
+        if (lhs.targetLine == rhs.targetLine)
+            return lhs.targetColumn - rhs.targetColumn;
+        return lhs.targetLine - rhs.targetLine;
+    };
+
+    QList<FunctionLocation> locations = original;
+    Utils::sort(locations, [compare](const FunctionLocation &lhs, const FunctionLocation &rhs) {
+        if (lhs.declaration.targetFilePath != rhs.declaration.targetFilePath)
+            return lhs.declaration.targetFilePath < rhs.declaration.targetFilePath;
+        if (auto diff = compare(lhs.declaration, rhs.declaration))
+            return diff < 0;
+        return compare(lhs.registration.value_or(Link{{}, INT_MAX, INT_MAX}),
+                       rhs.registration.value_or(Link{{}, INT_MAX, INT_MAX})) < 0;
+    });
+    return Utils::transform(locations, [](const FunctionLocation &loc) { return loc.name; });
+}
+
 static void fillTestConfigurationsFromCheckState(const TestTreeItem *item,
                                                  QList<ITestConfiguration *> &testConfigurations)
 {
@@ -190,21 +218,30 @@ static void fillTestConfigurationsFromCheckState(const TestTreeItem *item,
         testConfigurations << testConfig;
         return;
     case Qt::PartiallyChecked:
-        QStringList testCases;
+        // we need the location for keeping the order while running
+        // normal test function: declaration, data tag: location of registration
+        QList<FunctionLocation> testCases;
         item->forFirstLevelChildren([&testCases](ITestTreeItem *grandChild) {
             if (grandChild->checked() == Qt::Checked) {
-                testCases << grandChild->name();
+                TestTreeItem *funcItem = static_cast<TestTreeItem *>(grandChild);
+                const Link link(funcItem->filePath(), funcItem->line(), funcItem->column());
+                testCases << FunctionLocation(funcItem->name(), link);
             } else if (grandChild->checked() == Qt::PartiallyChecked) {
-                const QString funcName = grandChild->name();
-                grandChild->forFirstLevelChildren([&testCases, &funcName](ITestTreeItem *dataTag) {
-                    if (dataTag->checked() == Qt::Checked)
-                        testCases << funcName + ':' + dataTag->name();
+                TestTreeItem *funcItem = static_cast<TestTreeItem *>(grandChild);
+                grandChild->forFirstLevelChildren([&testCases, funcItem](ITestTreeItem *dataTag) {
+                    if (dataTag->checked() == Qt::Checked) {
+                        TestTreeItem *tagItem = static_cast<TestTreeItem *>(dataTag);
+                        const Link decl(funcItem->filePath(), funcItem->line(), funcItem->column());
+                        const Link reg(tagItem->filePath(), tagItem->line(), tagItem->column());
+                        testCases << FunctionLocation(funcItem->name() + ':' + tagItem->name(),
+                                                      decl, reg);
+                    }
                 });
             }
         });
 
         testConfig = new QtTestConfiguration(item->framework());
-        testConfig->setTestCases(testCases);
+        testConfig->setTestCases(orderedTestCases(testCases));
         testConfig->setProjectFile(item->proFile());
         testConfig->setProject(ProjectExplorer::ProjectManager::startupProject());
         testConfig->setInternalTargets(
@@ -222,14 +259,24 @@ static void collectFailedTestInfo(TestTreeItem *item, QList<ITestConfiguration *
         return;
     }
     QTC_ASSERT(item->type() == TestTreeItem::TestCase, return);
-    QStringList testCases;
+    // we need the location for keeping the order while running
+    // normal test function: declaration, data tag: location of registration
+    QList<FunctionLocation> testCases;
     item->forFirstLevelChildren([&testCases](ITestTreeItem *func) {
         if (func->type() == TestTreeItem::TestFunction && func->data(0, FailedRole).toBool()) {
-            testCases << func->name();
+            TestTreeItem *funcItem = static_cast<TestTreeItem *>(func);
+            const Link link(funcItem->filePath(), funcItem->line(), funcItem->column());
+            testCases << FunctionLocation(func->name(), link);
         } else {
-            func->forFirstLevelChildren([&testCases, func](ITestTreeItem *dataTag) {
-                if (dataTag->data(0, FailedRole).toBool())
-                    testCases << func->name() + ':' + dataTag->name();
+            TestTreeItem *funcItem = static_cast<TestTreeItem *>(func);
+            func->forFirstLevelChildren([&testCases, funcItem](ITestTreeItem *dataTag) {
+                if (dataTag->data(0, FailedRole).toBool()) {
+                    TestTreeItem *tagItem = static_cast<TestTreeItem *>(dataTag);
+                    const Link decl(funcItem->filePath(), funcItem->line(), funcItem->column());
+                    const Link reg(tagItem->filePath(), tagItem->line(), tagItem->column());
+                    testCases << FunctionLocation(funcItem->name() + ':' + dataTag->name(),
+                                                  decl, reg);
+                }
             });
         }
     });
@@ -237,7 +284,7 @@ static void collectFailedTestInfo(TestTreeItem *item, QList<ITestConfiguration *
         return;
 
     QtTestConfiguration *testConfig = new QtTestConfiguration(item->framework());
-    testConfig->setTestCases(testCases);
+    testConfig->setTestCases(orderedTestCases(testCases));
     testConfig->setProjectFile(item->proFile());
     testConfig->setProject(ProjectExplorer::ProjectManager::startupProject());
     testConfig->setInternalTargets(
@@ -307,20 +354,23 @@ QList<ITestConfiguration *> QtTestTreeItem::getTestConfigurationsForFile(const F
     if (!project || type() != Root)
         return result;
 
-    QHash<TestTreeItem *, QStringList> testFunctions;
+    QHash<TestTreeItem *, QList<FunctionLocation>> testFunctions;
     forAllChildItems([&testFunctions, &fileName](TestTreeItem *node) {
         if (node->type() == Type::TestFunction && node->filePath() == fileName) {
             QTC_ASSERT(node->parentItem(), return);
             TestTreeItem *testCase = node->parentItem();
             QTC_ASSERT(testCase->type() == Type::TestCase, return);
-            testFunctions[testCase] << node->name();
+
+            // we need the declaration location for keeping the order while running
+            const Link link(node->filePath(), node->line(), node->column());
+            testFunctions[testCase] << FunctionLocation(node->name(), link);
         }
     });
 
     for (auto it = testFunctions.cbegin(), end = testFunctions.cend(); it != end; ++it) {
         TestConfiguration *tc = static_cast<TestConfiguration *>(it.key()->testConfiguration());
         QTC_ASSERT(tc, continue);
-        tc->setTestCases(it.value());
+        tc->setTestCases(orderedTestCases(it.value()));
         result << tc;
     }
 
diff --git a/src/plugins/autotest/testcodeparser.cpp b/src/plugins/autotest/testcodeparser.cpp
index 9962a08c62..817768e176 100644
--- a/src/plugins/autotest/testcodeparser.cpp
+++ b/src/plugins/autotest/testcodeparser.cpp
@@ -4,7 +4,9 @@
 #include "testcodeparser.h"
 
 #include "autotestconstants.h"
+#include "autotestplugin.h"
 #include "autotesttr.h"
+#include "testprojectsettings.h"
 #include "testsettings.h"
 #include "testtreemodel.h"
 
@@ -336,6 +338,38 @@ void TestCodeParser::scanForTests(const QSet<FilePath> &filePaths,
         emit requestRemoval(files);
     }
 
+    const TestProjectSettings *settings = projectSettings(project);
+    if (settings->limitToFilters()) {
+        qCDebug(LOG) << "Applying project path filters - currently" << files.size() << "files";
+        const QStringList filters = settings->pathFilters();
+        if (!filters.isEmpty()) {
+            // we cannot rely on QRegularExpression::fromWildcard() as we want handle paths
+            const QList<QRegularExpression> regexes
+                    = Utils::transform(filters, [] (const QString &filter) {
+                return QRegularExpression(wildcardPatternFromString(filter));
+            });
+
+            files = Utils::filtered(files, [&regexes](const FilePath &fn) {
+                for (const QRegularExpression &regex : regexes) {
+                    if (!regex.isValid()) {
+                        qCDebug(LOG) << "Skipping invalid pattern? Pattern:" << regex.pattern();
+                        continue;
+                    }
+                    if (regex.match(fn.path()).hasMatch())
+                        return true;
+                }
+                return false;
+            });
+        }
+        qCDebug(LOG) << "After applying filters" << files.size() << "files";
+
+        if (files.isEmpty()) {
+            qCDebug(LOG) << "No filter matched a file - canceling scan immediately";
+            onFinished(true);
+            return;
+        }
+    }
+
     QTC_ASSERT(!(isFullParse && files.isEmpty()), onFinished(true); return);
 
     // use only a single parser or all current active?
diff --git a/src/plugins/autotest/testprojectsettings.cpp b/src/plugins/autotest/testprojectsettings.cpp
index 0b75dd9804..a8ae11f6d5 100644
--- a/src/plugins/autotest/testprojectsettings.cpp
+++ b/src/plugins/autotest/testprojectsettings.cpp
@@ -22,6 +22,8 @@ namespace Internal {
 static const char SK_ACTIVE_FRAMEWORKS[]        = "AutoTest.ActiveFrameworks";
 static const char SK_RUN_AFTER_BUILD[]          = "AutoTest.RunAfterBuild";
 static const char SK_CHECK_STATES[]             = "AutoTest.CheckStates";
+static const char SK_APPLY_FILTER[]             = "AutoTest.ApplyFilter";
+static const char SK_PATH_FILTERS[]             = "AutoTest.PathFilters";
 
 static Q_LOGGING_CATEGORY(LOG, "qtc.autotest.projectsettings", QtWarningMsg)
 
@@ -100,6 +102,8 @@ void TestProjectSettings::load()
     m_runAfterBuild = runAfterBuild.isValid() ? RunAfterBuildMode(runAfterBuild.toInt())
                                               : RunAfterBuildMode::None;
     m_checkStateCache.fromSettings(m_project->namedSettings(SK_CHECK_STATES).toMap());
+    m_limitToFilter = m_project->namedSettings(SK_APPLY_FILTER).toBool();
+    m_pathFilters = m_project->namedSettings(SK_PATH_FILTERS).toStringList();
 }
 
 void TestProjectSettings::save()
@@ -115,6 +119,8 @@ void TestProjectSettings::save()
     m_project->setNamedSettings(SK_ACTIVE_FRAMEWORKS, activeFrameworks);
     m_project->setNamedSettings(SK_RUN_AFTER_BUILD, int(m_runAfterBuild));
     m_project->setNamedSettings(SK_CHECK_STATES, m_checkStateCache.toSettings(Qt::Checked));
+    m_project->setNamedSettings(SK_APPLY_FILTER, m_limitToFilter);
+    m_project->setNamedSettings(SK_PATH_FILTERS, m_pathFilters);
 }
 
 } // namespace Internal
diff --git a/src/plugins/autotest/testprojectsettings.h b/src/plugins/autotest/testprojectsettings.h
index 09528e5aee..29d126e38b 100644
--- a/src/plugins/autotest/testprojectsettings.h
+++ b/src/plugins/autotest/testprojectsettings.h
@@ -31,15 +31,22 @@ public:
     QHash<ITestTool *, bool> activeTestTools() const { return m_activeTestTools; }
     void activateTestTool(const Utils::Id &id, bool activate);
     Internal::ItemDataCache<Qt::CheckState> *checkStateCache() { return &m_checkStateCache; }
+    bool limitToFilters() const { return m_limitToFilter; }
+    void setLimitToFilter(bool enable) { m_limitToFilter = enable; }
+    const QStringList pathFilters() const { return m_pathFilters; }
+    void setPathFilters(const QStringList &filters) { m_pathFilters = filters; }
+    void addPathFilter(const QString &filter) { m_pathFilters.append(filter); }
 private:
     void load();
     void save();
 
     ProjectExplorer::Project *m_project;
     bool m_useGlobalSettings = true;
+    bool m_limitToFilter = false;
     RunAfterBuildMode m_runAfterBuild = RunAfterBuildMode::None;
     QHash<ITestFramework *, bool> m_activeTestFrameworks;
     QHash<ITestTool *, bool> m_activeTestTools;
+    QStringList m_pathFilters;
     Internal::ItemDataCache<Qt::CheckState> m_checkStateCache;
 };
 
diff --git a/src/plugins/autotest/testrunner.cpp b/src/plugins/autotest/testrunner.cpp
index 29b7898835..fe3fe22fdd 100644
--- a/src/plugins/autotest/testrunner.cpp
+++ b/src/plugins/autotest/testrunner.cpp
@@ -23,7 +23,6 @@
 #include <projectexplorer/buildmanager.h>
 #include <projectexplorer/buildsystem.h>
 #include <projectexplorer/project.h>
-#include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorersettings.h>
 #include <projectexplorer/projectmanager.h>
 #include <projectexplorer/runconfiguration.h>
@@ -169,11 +168,9 @@ void TestRunner::runTests(TestRunMode mode, const QList<ITestConfiguration *> &s
 
     m_skipTargetsCheck = false;
     m_runMode = mode;
-    const ProjectExplorerSettings projectExplorerSettings
-            = ProjectExplorerPlugin::projectExplorerSettings();
     if (mode != TestRunMode::RunAfterBuild
-            && projectExplorerSettings.buildBeforeDeploy != BuildBeforeRunMode::Off
-            && !projectExplorerSettings.saveBeforeBuild) {
+            && projectExplorerSettings().buildBeforeDeploy != BuildBeforeRunMode::Off
+            && !projectExplorerSettings().saveBeforeBuild) {
         if (!ProjectExplorerPlugin::saveModifiedFiles())
             return;
     }
@@ -203,7 +200,7 @@ void TestRunner::runTests(TestRunMode mode, const QList<ITestConfiguration *> &s
     m_targetConnect = connect(project, &Project::activeTargetChanged,
                               this, [this] { cancelCurrent(KitChanged); });
 
-    if (projectExplorerSettings.buildBeforeDeploy == BuildBeforeRunMode::Off
+    if (projectExplorerSettings().buildBeforeDeploy == BuildBeforeRunMode::Off
             || mode == TestRunMode::DebugWithoutDeploy
             || mode == TestRunMode::RunWithoutDeploy || mode == TestRunMode::RunAfterBuild) {
         runOrDebugTests();
@@ -415,8 +412,10 @@ void TestRunner::runTestsHelper()
         }
         process.setEnvironment(environment);
 
-        m_cancelTimer.setInterval(testSettings().timeout());
-        m_cancelTimer.start();
+        if (testSettings().useTimeout()) {
+            m_cancelTimer.setInterval(testSettings().timeout());
+            m_cancelTimer.start();
+        }
 
         qCInfo(runnerLog) << "Command:" << process.commandLine().executable();
         qCInfo(runnerLog) << "Arguments:" << process.commandLine().arguments();
diff --git a/src/plugins/autotest/testsettings.cpp b/src/plugins/autotest/testsettings.cpp
index 174773b757..42407ab903 100644
--- a/src/plugins/autotest/testsettings.cpp
+++ b/src/plugins/autotest/testsettings.cpp
@@ -33,13 +33,19 @@ TestSettings::TestSettings()
     scanThreadLimit.setSpecialValueText("Automatic");
     scanThreadLimit.setToolTip(Tr::tr("Number of worker threads used when scanning for tests."));
 
+    useTimeout.setSettingsKey("UseTimeout");
+    useTimeout.setDefaultValue(false);
+    useTimeout.setLabelText(Tr::tr("Timeout"));
+    useTimeout.setToolTip(Tr::tr("Use a timeout while executing test cases."));
+
     timeout.setSettingsKey("Timeout");
     timeout.setDefaultValue(defaultTimeout);
     timeout.setRange(5000, 36'000'000); // 36 Mio ms = 36'000 s = 10 h
     timeout.setSuffix(Tr::tr(" s")); // we show seconds, but store milliseconds
     timeout.setDisplayScaleFactor(1000);
     timeout.setToolTip(Tr::tr("Timeout used when executing test cases. This will apply "
-                              "for each test case on its own, not the whole project."));
+                              "for each test case on its own, not the whole project. "
+                              "Overrides test framework or build system defaults."));
 
     omitInternalMsg.setSettingsKey("OmitInternal");
     omitInternalMsg.setDefaultValue(true);
@@ -106,6 +112,7 @@ TestSettings::TestSettings()
 
     fromSettings();
 
+    timeout.setEnabler(&useTimeout);
     resultDescriptionMaxSize.setEnabler(&limitResultDescription);
     popupOnFail.setEnabler(&popupOnFinish);
 }
diff --git a/src/plugins/autotest/testsettings.h b/src/plugins/autotest/testsettings.h
index d73f3d3454..50df720462 100644
--- a/src/plugins/autotest/testsettings.h
+++ b/src/plugins/autotest/testsettings.h
@@ -31,6 +31,7 @@ public:
     void fromSettings();
 
     Utils::IntegerAspect scanThreadLimit{this};
+    Utils::BoolAspect useTimeout{this};
     Utils::IntegerAspect timeout{this};
     Utils::BoolAspect omitInternalMsg{this};
     Utils::BoolAspect omitRunConfigWarn{this};
diff --git a/src/plugins/autotest/testsettingspage.cpp b/src/plugins/autotest/testsettingspage.cpp
index 4bde0e98cb..f74716b8e2 100644
--- a/src/plugins/autotest/testsettingspage.cpp
+++ b/src/plugins/autotest/testsettingspage.cpp
@@ -50,8 +50,6 @@ private:
 
 TestSettingsWidget::TestSettingsWidget()
 {
-    auto timeoutLabel = new QLabel(Tr::tr("Timeout:"));
-    timeoutLabel->setToolTip(Tr::tr("Timeout used when executing each test case."));
     auto scanThreadLabel = new QLabel(Tr::tr("Scan threads:"));
     scanThreadLabel->setToolTip("Number of worker threads used when scanning for tests.");
 
@@ -98,7 +96,7 @@ TestSettingsWidget::TestSettingsWidget()
             s.displayApplication,
             s.processArgs,
             Row { Tr::tr("Automatically run"), s.runAfterBuild, st },
-            Row { timeoutLabel, s.timeout, st },
+            Row { s.useTimeout, s.timeout, st },
             Row { resetChoicesButton, st }
          }
     };
diff --git a/src/plugins/axivion/axivion.qrc b/src/plugins/axivion/axivion.qrc
index d1e41e3cdb..96fafb01dd 100644
--- a/src/plugins/axivion/axivion.qrc
+++ b/src/plugins/axivion/axivion.qrc
@@ -14,6 +14,8 @@
         <file>images/button-MV@2x.png</file>
         <file>images/button-SV.png</file>
         <file>images/button-SV@2x.png</file>
+        <file>images/nodata.png</file>
+        <file>images/nodata@2x.png</file>
         <file>images/sortAsc.png</file>
         <file>images/sortAsc@2x.png</file>
         <file>images/sortDesc.png</file>
diff --git a/src/plugins/axivion/axivionoutputpane.cpp b/src/plugins/axivion/axivionoutputpane.cpp
index d1c896205f..fd35ed61ff 100644
--- a/src/plugins/axivion/axivionoutputpane.cpp
+++ b/src/plugins/axivion/axivionoutputpane.cpp
@@ -23,6 +23,7 @@
 #include <utils/qtcassert.h>
 #include <utils/basetreeview.h>
 #include <utils/utilsicons.h>
+#include <utils/overlaywidget.h>
 
 #include <QButtonGroup>
 #include <QClipboard>
@@ -34,6 +35,7 @@
 #include <QHeaderView>
 #include <QLabel>
 #include <QMenu>
+#include <QPainter>
 #include <QPushButton>
 #include <QScrollArea>
 #include <QStackedWidget>
@@ -235,14 +237,14 @@ public:
                 }).link;
                 Project *project = ProjectManager::startupProject();
                 FilePath baseDir = project ? project->projectDirectory() : FilePath{};
-                link.targetFilePath = baseDir.resolvePath(link.targetFilePath);
+                link.targetFilePath = findFileForIssuePath(link.targetFilePath);
                 if (link.targetFilePath.exists())
                     EditorManager::openEditorAt(link);
             }
             if (!m_id.isEmpty())
                 fetchIssueInfo(m_id);
             return true;
-        } else if (role == BaseTreeView::ItemViewEventRole) {
+        } else if (role == BaseTreeView::ItemViewEventRole && !m_id.isEmpty()) {
             ItemViewEvent ev = value.value<ItemViewEvent>();
             if (ev.as<QContextMenuEvent>())
                 return issueListContextMenuEvent(ev);
@@ -252,8 +254,8 @@ public:
 
 private:
     const QString m_id;
-    QStringList m_data;
-    QStringList m_toolTips;
+    const QStringList m_data;
+    const QStringList m_toolTips;
     QList<LinkWithColumns> m_links;
 };
 
@@ -274,6 +276,8 @@ private:
     void fetchTable();
     void fetchIssues(const IssueListSearch &search);
     void onFetchRequested(int startRow, int limit);
+    void showNoDataOverlay();
+    void hideNoDataOverlay();
 
     QString m_currentPrefix;
     QString m_currentProject;
@@ -294,6 +298,7 @@ private:
     QStringList m_userNames;
     QStringList m_versionDates;
     TaskTreeRunner m_taskTreeRunner;
+    OverlayWidget *m_noDataOverlay = nullptr;
 };
 
 IssuesWidget::IssuesWidget(QWidget *parent)
@@ -520,6 +525,8 @@ void IssuesWidget::addIssues(const Dto::IssueTableDto &dto, int startRow)
         items.append(it);
     }
     m_issuesModel->setItems(items);
+    if (items.isEmpty() && m_totalRowCount == 0)
+        showNoDataOverlay();
 }
 
 void IssuesWidget::onSearchParameterChanged()
@@ -677,6 +684,7 @@ void IssuesWidget::fetchTable()
 
 void IssuesWidget::fetchIssues(const IssueListSearch &search)
 {
+    hideNoDataOverlay();
     const auto issuesHandler = [this, startRow = search.offset](const Dto::IssueTableDto &dto) {
         addIssues(dto, startRow);
     };
@@ -696,6 +704,35 @@ void IssuesWidget::onFetchRequested(int startRow, int limit)
     fetchIssues(search);
 }
 
+void IssuesWidget::showNoDataOverlay()
+{
+    if (!m_noDataOverlay) {
+        QTC_ASSERT(m_issuesView, return);
+        m_noDataOverlay = new OverlayWidget(this);
+        m_noDataOverlay->setPaintFunction([](QWidget *that, QPainter &p, QPaintEvent *) {
+                static const QIcon icon = Icon({{":/axivion/images/nodata.png",
+                                                 Theme::IconsDisabledColor}},
+                                               Utils::Icon::Tint).icon();
+                QRect iconRect(0, 0, 32, 32);
+                iconRect.moveCenter(that->rect().center());
+                icon.paint(&p, iconRect);
+                p.save();
+                p.setPen(Utils::creatorTheme()->color(Theme::TextColorDisabled));
+                p.drawText(iconRect.bottomRight() + QPoint{10, p.fontMetrics().height() / 2 - 16},
+                           Tr::tr("No Data"));
+                p.restore();
+            });
+        m_noDataOverlay->attachToWidget(m_issuesView);
+    }
+    m_noDataOverlay->show();
+}
+
+void IssuesWidget::hideNoDataOverlay()
+{
+    if (m_noDataOverlay)
+        m_noDataOverlay->hide();
+}
+
 class AxivionOutputPane final : public IOutputPane
 {
 public:
@@ -736,6 +773,10 @@ public:
             if (auto issues = static_cast<IssuesWidget *>(m_outputWidget->widget(1)))
                 issues->updateUi();
         });
+        auto *butonGroup = new QButtonGroup(this);
+        butonGroup->addButton(m_showDashboard);
+        butonGroup->addButton(m_showIssues);
+        butonGroup->setExclusive(true);
 
         connect(m_outputWidget, &QStackedWidget::currentChanged, this, [this](int idx) {
             m_showDashboard->setChecked(idx == 0);
@@ -799,35 +840,22 @@ public:
 
         QUrl issueBaseUrl = info->source.resolved(baseUri).resolved(issue);
         QUrl dashboardUrl = info->source.resolved(baseUri);
-        QUrlQuery baseQuery;
-        IssueListSearch search = issues->searchFromUi();
-        baseQuery.addQueryItem("kind", search.kind);
-        if (!search.versionStart.isEmpty())
-            baseQuery.addQueryItem("start", search.versionStart);
-        if (!search.versionEnd.isEmpty())
-            baseQuery.addQueryItem("end", search.versionEnd);
-        issueBaseUrl.setQuery(baseQuery);
-        if (!search.owner.isEmpty())
-            baseQuery.addQueryItem("user", search.owner);
-        if (!search.filter_path.isEmpty())
-            baseQuery.addQueryItem("filter_any path", search.filter_path);
-        if (!search.state.isEmpty())
-            baseQuery.addQueryItem("state", search.state);
-        dashboardUrl.setQuery(baseQuery);
+        const IssueListSearch search = issues->searchFromUi();
+        issueBaseUrl.setQuery(search.toUrlQuery(QueryMode::SimpleQuery));
+        dashboardUrl.setQuery(search.toUrlQuery(QueryMode::FilterQuery));
 
         QMenu *menu = new QMenu;
-        // FIXME Tr::tr() in before QC14
-        auto action = new QAction("Open issue in Dashboard", menu);
+        auto action = new QAction(Tr::tr("Open issue in Dashboard"), menu);
         menu->addAction(action);
         QObject::connect(action, &QAction::triggered, menu, [issueBaseUrl] {
             QDesktopServices::openUrl(issueBaseUrl);
         });
-        action = new QAction("Open table in Dashboard", menu);
+        action = new QAction(Tr::tr("Open table in Dashboard"), menu);
         QObject::connect(action, &QAction::triggered, menu, [dashboardUrl] {
             QDesktopServices::openUrl(dashboardUrl);
         });
         menu->addAction(action);
-        action = new QAction("Copy Dashboard link to clipboard", menu);
+        action = new QAction(Tr::tr("Copy Dashboard link to clipboard"), menu);
         QObject::connect(action, &QAction::triggered, menu, [dashboardUrl] {
             if (auto clipboard = QGuiApplication::clipboard())
                 clipboard->setText(dashboardUrl.toString());
diff --git a/src/plugins/axivion/axivionplugin.cpp b/src/plugins/axivion/axivionplugin.cpp
index fa455c07eb..062da02feb 100644
--- a/src/plugins/axivion/axivionplugin.cpp
+++ b/src/plugins/axivion/axivionplugin.cpp
@@ -36,6 +36,7 @@
 #include <utils/async.h>
 #include <utils/checkablemessagebox.h>
 #include <utils/environment.h>
+#include <utils/fileinprojectfinder.h>
 #include <utils/networkaccessmanager.h>
 #include <utils/qtcassert.h>
 #include <utils/utilsicons.h>
@@ -166,39 +167,36 @@ static DashboardInfo toDashboardInfo(const GetDtoStorage<Dto::DashboardInfoDto>
     return {dashboardStorage.url, versionNumber, projects, projectUrls, infoDto.checkCredentialsUrl};
 }
 
-QString IssueListSearch::toQuery() const
+QUrlQuery IssueListSearch::toUrlQuery(QueryMode mode) const
 {
-    if (kind.isEmpty())
-        return {};
-    QString result;
-    result.append(QString("?kind=%1&offset=%2").arg(kind).arg(offset));
-    if (limit)
-        result.append(QString("&limit=%1").arg(limit));
-    // TODO other params
-    if (!versionStart.isEmpty()) {
-        result.append(QString("&start=%1").arg(
-            QString::fromUtf8(QUrl::toPercentEncoding(versionStart))));
-    }
-    if (!versionEnd.isEmpty()) {
-        result.append(QString("&end=%1").arg(
-            QString::fromUtf8(QUrl::toPercentEncoding(versionEnd))));
-    }
-    if (!owner.isEmpty()) {
-        result.append(QString("&user=%1").arg(
-            QString::fromUtf8((QUrl::toPercentEncoding(owner)))));
-    }
-    if (!filter_path.isEmpty()) {
-        result.append(QString("&filter_any path=%1").arg(
-            QString::fromUtf8(QUrl::toPercentEncoding(filter_path))));
-    }
+    QUrlQuery query;
+    QTC_ASSERT(!kind.isEmpty(), return query);
+    query.addQueryItem("kind", kind);
+    if (!versionStart.isEmpty())
+        query.addQueryItem("start", versionStart);
+    if (!versionEnd.isEmpty())
+        query.addQueryItem("end", versionEnd);
+    if (mode == QueryMode::SimpleQuery)
+        return query;
+
+    if (!owner.isEmpty())
+        query.addQueryItem("user", owner);
+    if (!filter_path.isEmpty())
+        query.addQueryItem("filter_any path", filter_path);
     if (!state.isEmpty())
-        result.append(QString("&state=%1").arg(state));
+        query.addQueryItem("state", state);
+    if (mode == QueryMode::FilterQuery)
+        return query;
+
+    QTC_CHECK(mode == QueryMode::FullQuery);
+    query.addQueryItem("offset", QString::number(offset));
+    if (limit)
+        query.addQueryItem("limit", QString::number(limit));
     if (computeTotalRowCount)
-        result.append("&computeTotalRowCount=true");
+        query.addQueryItem("computeTotalRowCount", "true");
     if (!sort.isEmpty())
-        result.append(QString("&sort=%1").arg(
-            QString::fromUtf8(QUrl::toPercentEncoding(sort))));
-    return result;
+        query.addQueryItem("sort", sort);
+    return query;
 }
 
 enum class ServerAccess { Unknown, NoAuthorization, WithAuthorization };
@@ -236,6 +234,8 @@ public:
     TaskTreeRunner m_taskTreeRunner;
     std::unordered_map<IDocument *, std::unique_ptr<TaskTree>> m_docMarksTrees;
     TaskTreeRunner m_issueInfoRunner;
+    FileInProjectFinder m_fileFinder; // FIXME maybe obsolete when path mapping is implemented
+    QMetaObject::Connection m_fileFinderConnection;
 };
 
 static AxivionPluginPrivate *dd = nullptr;
@@ -330,26 +330,38 @@ void AxivionPluginPrivate::onStartupProjectChanged(Project *project)
         return;
 
     if (m_project)
-        disconnect(m_project, &Project::fileListChanged, this, &AxivionPluginPrivate::handleOpenedDocs);
+        disconnect(m_fileFinderConnection);
 
     m_project = project;
     clearAllMarks();
     m_currentProjectInfo = {};
     updateDashboard();
 
-    if (!m_project)
+    if (!m_project) {
+        m_fileFinder.setProjectDirectory({});
+        m_fileFinder.setProjectFiles({});
         return;
+    }
 
-    connect(m_project, &Project::fileListChanged, this, &AxivionPluginPrivate::handleOpenedDocs);
+    m_fileFinder.setProjectDirectory(m_project->projectDirectory());
+    m_fileFinderConnection = connect(m_project, &Project::fileListChanged, this, [this] {
+        m_fileFinder.setProjectFiles(m_project->files(Project::AllFiles));
+        handleOpenedDocs();
+    });
     const AxivionProjectSettings *projSettings = AxivionProjectSettings::projectSettings(m_project);
     fetchProjectInfo(projSettings->dashboardProjectName());
 }
 
-static QUrl urlForProject(const QString &projectName)
+static QUrl constructUrl(const QString &projectName, const QString &subPath, const QUrlQuery &query)
 {
     if (!dd->m_dashboardInfo)
         return {};
-    return dd->m_dashboardInfo->source.resolved(QString("api/projects/")).resolved(projectName);
+    QUrl url = dd->m_dashboardInfo->source.resolved(QString("api/projects/" + projectName + '/'));
+    if (!subPath.isEmpty() && QTC_GUARD(!subPath.startsWith('/')))
+        url = url.resolved(subPath);
+    if (!query.isEmpty())
+        url.setQuery(query);
+    return url;
 }
 
 static constexpr int httpStatusCodeOk = 200;
@@ -755,12 +767,11 @@ Group issueTableRecipe(const IssueListSearch &search, const IssueTableHandler &h
 {
     QTC_ASSERT(dd->m_currentProjectInfo, return {}); // TODO: Call handler with unexpected?
 
-    const QString query = search.toQuery();
+    const QUrlQuery query = search.toUrlQuery(QueryMode::FullQuery);
     if (query.isEmpty())
         return {}; // TODO: Call handler with unexpected?
 
-    const QUrl url = urlForProject(dd->m_currentProjectInfo.value().name + '/')
-                         .resolved(QString("issues" + query));
+    const QUrl url = constructUrl(dd->m_currentProjectInfo.value().name, "issues", query);
     return fetchDataRecipe<Dto::IssueTableDto>(url, handler);
 }
 
@@ -770,8 +781,8 @@ Group lineMarkerRecipe(const FilePath &filePath, const LineMarkerHandler &handle
     QTC_ASSERT(!filePath.isEmpty(), return {}); // TODO: Call handler with unexpected?
 
     const QString fileName = QString::fromUtf8(QUrl::toPercentEncoding(filePath.path()));
-    const QUrl url = urlForProject(dd->m_currentProjectInfo.value().name + '/')
-                         .resolved(QString("files?filename=" + fileName));
+    const QUrlQuery query({{"filename", fileName}});
+    const QUrl url = constructUrl(dd->m_currentProjectInfo.value().name, "files", query);
     return fetchDataRecipe<Dto::FileViewDto>(url, handler);
 }
 
@@ -779,11 +790,9 @@ Group issueHtmlRecipe(const QString &issueId, const HtmlHandler &handler)
 {
     QTC_ASSERT(dd->m_currentProjectInfo, return {}); // TODO: Call handler with unexpected?
 
-    const QUrl url = urlForProject(dd->m_currentProjectInfo.value().name + '/')
-                         .resolved(QString("issues/"))
-                         .resolved(QString(issueId + '/'))
-                         .resolved(QString("properties"));
-
+    const QUrl url = constructUrl(dd->m_currentProjectInfo.value().name,
+                                  QString("issues/" + issueId + "/properties/"),
+                                  {});
     return fetchHtmlRecipe(url, handler);
 }
 
@@ -833,8 +842,8 @@ void AxivionPluginPrivate::fetchProjectInfo(const QString &projectName)
 
 Group tableInfoRecipe(const QString &prefix, const TableInfoHandler &handler)
 {
-    const QUrl url = urlForProject(dd->m_currentProjectInfo.value().name + '/')
-                         .resolved(QString("issues_meta?kind=" + prefix));
+    const QUrlQuery query({{"kind", prefix}});
+    const QUrl url = constructUrl(dd->m_currentProjectInfo.value().name, "issues_meta", query);
     return fetchDataRecipe<Dto::TableInfoDto>(url, handler);
 }
 
@@ -961,7 +970,7 @@ void AxivionPluginPrivate::handleAnchorClicked(const QUrl &url)
         return;
     Link link;
     if (const QString path = query.queryItemValue("filename", QUrl::FullyDecoded); !path.isEmpty())
-        link.targetFilePath = m_project->projectDirectory().pathAppended(path);
+        link.targetFilePath = findFileForIssuePath(FilePath::fromUserInput(path));
     if (const QString line = query.queryItemValue("line"); !line.isEmpty())
         link.targetLine = line.toInt();
     // column entry is wrong - so, ignore it
@@ -983,6 +992,10 @@ public:
     {
         QTC_ASSERT(dd, return {});
         QTextBrowser *browser = new QTextBrowser;
+        const QString text = Tr::tr(
+                    "Search for issues inside the Axivion dashboard or request issue details for "
+                    "Axivion inline annotations to see them here.");
+        browser->setText("<p style='text-align:center'>" + text + "</p>");
         browser->setOpenLinks(false);
         NavigationView view;
         view.widget = browser;
@@ -1040,6 +1053,15 @@ const std::optional<DashboardInfo> currentDashboardInfo()
     return dd->m_dashboardInfo;
 }
 
+Utils::FilePath findFileForIssuePath(const Utils::FilePath &issuePath)
+{
+    QTC_ASSERT(dd, return {});
+    const FilePaths result = dd->m_fileFinder.findFile(QUrl::fromLocalFile(issuePath.toString()));
+    if (result.size() == 1)
+        return dd->m_project->projectDirectory().resolvePath(result.first());
+    return {};
+}
+
 } // Axivion::Internal
 
 #include "axivionplugin.moc"
diff --git a/src/plugins/axivion/axivionplugin.h b/src/plugins/axivion/axivionplugin.h
index db2f8494cb..1a69c4ff37 100644
--- a/src/plugins/axivion/axivionplugin.h
+++ b/src/plugins/axivion/axivionplugin.h
@@ -25,6 +25,12 @@ namespace Axivion::Internal {
 
 constexpr int DefaultSearchLimit = 2048;
 
+enum class QueryMode {
+    SimpleQuery,            // just kind and version start and end
+    FilterQuery,            // + all filters if available
+    FullQuery               // + offset, limit, computeTotalRowCount
+};
+
 struct IssueListSearch
 {
     QString kind;
@@ -38,7 +44,7 @@ struct IssueListSearch
     int limit = DefaultSearchLimit;
     bool computeTotalRowCount = false;
 
-    QString toQuery() const;
+    QUrlQuery toUrlQuery(QueryMode mode) const;
 };
 
 class DashboardInfo
@@ -79,5 +85,7 @@ void fetchIssueInfo(const QString &id);
 
 const std::optional<DashboardInfo> currentDashboardInfo();
 
+Utils::FilePath findFileForIssuePath(const Utils::FilePath &issuePath);
+
 } // Axivion::Internal
 
diff --git a/src/plugins/axivion/axivionprojectsettings.cpp b/src/plugins/axivion/axivionprojectsettings.cpp
index 8cd63ba7ac..023c251ea4 100644
--- a/src/plugins/axivion/axivionprojectsettings.cpp
+++ b/src/plugins/axivion/axivionprojectsettings.cpp
@@ -7,6 +7,8 @@
 #include "axivionsettings.h"
 #include "axiviontr.h"
 
+#include <coreplugin/find/itemviewfind.h>
+
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectpanelfactory.h>
 #include <projectexplorer/projectsettingswidget.h>
@@ -141,7 +143,7 @@ AxivionProjectSettingsWidget::AxivionProjectSettingsWidget(Project *project)
         noMargin,
         m_linkedProject,
         Tr::tr("Dashboard projects:"),
-        m_dashboardProjects,
+        Core::ItemViewFind::createSearchableWrapper(m_dashboardProjects),
         m_infoLabel,
         Row { m_fetchProjects, m_link, m_unlink, st }
     }.attachTo(this);
diff --git a/src/plugins/axivion/images/nodata.png b/src/plugins/axivion/images/nodata.png
new file mode 100644
index 0000000000..23ebb5c416
--- /dev/null
+++ b/src/plugins/axivion/images/nodata.png
diff --git a/src/plugins/axivion/images/nodata@2x.png b/src/plugins/axivion/images/nodata@2x.png
new file mode 100644
index 0000000000..102e67b34a
--- /dev/null
+++ b/src/plugins/axivion/images/nodata@2x.png
diff --git a/src/plugins/clangcodemodel/clangactivationsequencecontextprocessor.cpp b/src/plugins/clangcodemodel/clangactivationsequencecontextprocessor.cpp
index 99c40c99b6..7141903224 100644
--- a/src/plugins/clangcodemodel/clangactivationsequencecontextprocessor.cpp
+++ b/src/plugins/clangcodemodel/clangactivationsequencecontextprocessor.cpp
@@ -132,7 +132,7 @@ void ActivationSequenceContextProcessor::processComment()
 
 void ActivationSequenceContextProcessor::processInclude()
 {
-    if (m_token.isLiteral() && !isCompletionKindStringLiteralOrSlash())
+    if (m_token.isStringLiteral() && !isCompletionKindStringLiteralOrSlash())
         m_completionKind = CPlusPlus::T_EOF_SYMBOL;
 }
 
diff --git a/src/plugins/clangcodemodel/clangdclient.cpp b/src/plugins/clangcodemodel/clangdclient.cpp
index bf04848652..d3ede30b10 100644
--- a/src/plugins/clangcodemodel/clangdclient.cpp
+++ b/src/plugins/clangcodemodel/clangdclient.cpp
@@ -57,6 +57,7 @@
 #include <texteditor/texteditor.h>
 #include <utils/algorithm.h>
 #include <utils/async.h>
+#include <utils/clangutils.h>
 #include <utils/environment.h>
 #include <utils/fileutils.h>
 #include <utils/mimeconstants.h>
@@ -355,7 +356,6 @@ public:
 
     QHash<TextDocument *, HighlightingData> highlightingData;
     QHash<Utils::FilePath, CppEditor::BaseEditorDocumentParser::Configuration> parserConfigs;
-    QHash<Utils::FilePath, Tasks> issuePaneEntries;
     QHash<Utils::FilePath, int> openedExtraFiles;
 
     VersionedDataCache<const TextDocument *, ClangdAstNode> astCache;
@@ -689,30 +689,14 @@ const LanguageClient::Client::CustomInspectorTabs ClangdClient::createCustomInsp
 
 class ClangdDiagnosticManager : public LanguageClient::DiagnosticManager
 {
-    using LanguageClient::DiagnosticManager::DiagnosticManager;
-
-    ClangdClient *getClient() const { return qobject_cast<ClangdClient *>(client()); }
-
-    bool isCurrentDocument(const Utils::FilePath &filePath) const
-    {
-        const IDocument * const doc = EditorManager::currentDocument();
-        return doc && doc->filePath() == filePath;
-    }
-
-    void showDiagnostics(const Utils::FilePath &filePath, int version) override
-    {
-        getClient()->clearTasks(filePath);
-        DiagnosticManager::showDiagnostics(filePath, version);
-        if (isCurrentDocument(filePath))
-            getClient()->switchIssuePaneEntries(filePath);
-    }
-
-    void hideDiagnostics(const Utils::FilePath &filePath) override
+public:
+    ClangdDiagnosticManager(LanguageClient::Client *client)
+        : LanguageClient::DiagnosticManager(client)
     {
-        DiagnosticManager::hideDiagnostics(filePath);
-        if (isCurrentDocument(filePath))
-            TaskHub::clearTasks(Constants::TASK_CATEGORY_DIAGNOSTICS);
+        setTaskCategory(Constants::TASK_CATEGORY_DIAGNOSTICS);
+        setForceCreateTasks(false);
     }
+private:
 
     QList<Diagnostic> filteredDiagnostics(const QList<Diagnostic> &diagnostics) const override
     {
@@ -728,7 +712,18 @@ class ClangdDiagnosticManager : public LanguageClient::DiagnosticManager
                              const Diagnostic &diagnostic,
                              bool isProjectFile) const override
     {
-        return new ClangdTextMark(doc, diagnostic, isProjectFile, getClient());
+        return new ClangdTextMark(
+                    doc, diagnostic, isProjectFile, qobject_cast<ClangdClient *>(client()));
+    }
+
+    QString taskText(const Diagnostic &diagnostic) const override
+    {
+        QString text = diagnostic.message();
+        auto splitIndex = text.indexOf("\n\n");
+        if (splitIndex >= 0)
+            text.truncate(splitIndex);
+
+        return diagnosticCategoryPrefixRemoved(text);
     }
 };
 
@@ -937,24 +932,6 @@ void ClangdClient::updateParserConfig(const Utils::FilePath &filePath,
     emit configChanged();
 }
 
-void ClangdClient::switchIssuePaneEntries(const FilePath &filePath)
-{
-    TaskHub::clearTasks(Constants::TASK_CATEGORY_DIAGNOSTICS);
-    const Tasks tasks = d->issuePaneEntries.value(filePath);
-    for (const Task &t : tasks)
-        TaskHub::addTask(t);
-}
-
-void ClangdClient::addTask(const ProjectExplorer::Task &task)
-{
-    d->issuePaneEntries[task.file] << task;
-}
-
-void ClangdClient::clearTasks(const Utils::FilePath &filePath)
-{
-    d->issuePaneEntries[filePath].clear();
-}
-
 std::optional<bool> ClangdClient::hasVirtualFunctionAt(TextDocument *doc, int revision,
                                                          const Range &range)
 {
diff --git a/src/plugins/clangcodemodel/clangdclient.h b/src/plugins/clangcodemodel/clangdclient.h
index fbe2a31bbc..c0f687ea1f 100644
--- a/src/plugins/clangcodemodel/clangdclient.h
+++ b/src/plugins/clangcodemodel/clangdclient.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #include <cppeditor/baseeditordocumentparser.h>
-#include <cppeditor/cppcodemodelsettings.h>
+#include <cppeditor/clangdsettings.h>
 #include <cppeditor/cursorineditor.h>
 #include <languageclient/client.h>
 #include <utils/link.h>
@@ -97,9 +97,6 @@ public:
 
     void updateParserConfig(const Utils::FilePath &filePath,
                             const CppEditor::BaseEditorDocumentParser::Configuration &config);
-    void switchIssuePaneEntries(const Utils::FilePath &filePath);
-    void addTask(const ProjectExplorer::Task &task);
-    void clearTasks(const Utils::FilePath &filePath);
     std::optional<bool> hasVirtualFunctionAt(TextEditor::TextDocument *doc, int revision,
                                                const LanguageServerProtocol::Range &range);
 
diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
index 83667dde05..71ed49549d 100644
--- a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
+++ b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
@@ -18,6 +18,8 @@
 
 #include <languageclient/languageclientmanager.h>
 
+#include <projectexplorer/projectmanager.h>
+
 #include <texteditor/fontsettings.h>
 #include <texteditor/texteditor.h>
 #include <texteditor/texteditorconstants.h>
@@ -84,7 +86,12 @@ void ClangEditorDocumentProcessor::forceUpdate(TextEditor::TextDocument *doc)
 {
     if (const auto client = qobject_cast<ClangdClient *>(
             LanguageClient::LanguageClientManager::clientForDocument(doc))) {
-        client->documentContentsChanged(doc, 0, 0, 0);
+        const CppEditor::ClangdSettings settings(
+            CppEditor::ClangdProjectSettings(
+                ProjectExplorer::ProjectManager::projectForFile(doc->filePath()))
+                .settings());
+        if (settings.updateDependentSources())
+            client->documentContentsChanged(doc, 0, 0, 0);
     }
 }
 
diff --git a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
index 3d8965248f..a68f566309 100644
--- a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
+++ b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
@@ -19,7 +19,7 @@
 #include <coreplugin/session.h>
 #include <coreplugin/vcsmanager.h>
 
-#include <cppeditor/cppcodemodelsettings.h>
+#include <cppeditor/clangdsettings.h>
 #include <cppeditor/cppeditorconstants.h>
 #include <cppeditor/cppeditorwidget.h>
 #include <cppeditor/cppfollowsymbolundercursor.h>
@@ -457,10 +457,8 @@ void ClangModelManagerSupport::onCurrentEditorChanged(IEditor *editor)
     const FilePath filePath = editor->document()->filePath();
     if (auto processor = ClangEditorDocumentProcessor::get(filePath)) {
         processor->semanticRehighlight();
-        if (const auto client = clientForFile(filePath)) {
+        if (const auto client = clientForFile(filePath))
             client->updateParserConfig(filePath, processor->parserConfig());
-            client->switchIssuePaneEntries(filePath);
-        }
     }
 }
 
diff --git a/src/plugins/clangcodemodel/clangtextmark.cpp b/src/plugins/clangcodemodel/clangtextmark.cpp
index 80e2956021..c2c8c88801 100644
--- a/src/plugins/clangcodemodel/clangtextmark.cpp
+++ b/src/plugins/clangcodemodel/clangtextmark.cpp
@@ -12,11 +12,9 @@
 #include <coreplugin/icore.h>
 
 #include <cppeditor/clangdiagnosticconfigsmodel.h>
+#include <cppeditor/clangdsettings.h>
 #include <cppeditor/cppeditorconstants.h>
 #include <cppeditor/cpptoolsreuse.h>
-#include <cppeditor/cppcodemodelsettings.h>
-
-#include <projectexplorer/task.h>
 
 #include <utils/fadingindicator.h>
 #include <utils/qtcassert.h>
@@ -204,34 +202,6 @@ ClangDiagnostic convertDiagnostic(const ClangdDiagnostic &src,
     return target;
 }
 
-Task createTask(const ClangDiagnostic &diagnostic)
-{
-    Task::TaskType taskType = Task::TaskType::Unknown;
-    QIcon icon;
-
-    switch (diagnostic.severity) {
-    case ClangDiagnostic::Severity::Fatal:
-    case ClangDiagnostic::Severity::Error:
-        taskType = Task::TaskType::Error;
-        icon = ::Utils::Icons::CODEMODEL_ERROR.icon();
-        break;
-    case ClangDiagnostic::Severity::Warning:
-        taskType = Task::TaskType::Warning;
-        icon = ::Utils::Icons::CODEMODEL_WARNING.icon();
-        break;
-    default:
-        break;
-    }
-
-    return Task(taskType,
-                diagnosticCategoryPrefixRemoved(diagnostic.text),
-                diagnostic.location.targetFilePath,
-                diagnostic.location.targetLine,
-                Constants::TASK_CATEGORY_DIAGNOSTICS,
-                icon,
-                Task::NoOptions);
-}
-
 } // anonymous namespace
 
 ClangdTextMark::ClangdTextMark(TextEditor::TextDocument *doc,
@@ -258,7 +228,6 @@ ClangdTextMark::ClangdTextMark(TextEditor::TextDocument *doc,
         setLineAnnotation(diagnostic.message());
         setColor(isError ? Theme::CodeModel_Error_TextMarkColor
                          : Theme::CodeModel_Warning_TextMarkColor);
-        client->addTask(createTask(m_diagnostic));
     }
 
     setActionsProvider([diag = m_diagnostic] {
diff --git a/src/plugins/clangcodemodel/clangutils.cpp b/src/plugins/clangcodemodel/clangutils.cpp
index 5e7f454d5e..1b2550cbd3 100644
--- a/src/plugins/clangcodemodel/clangutils.cpp
+++ b/src/plugins/clangcodemodel/clangutils.cpp
@@ -9,8 +9,8 @@
 #include <coreplugin/idocument.h>
 #include <cppeditor/baseeditordocumentparser.h>
 #include <cppeditor/clangdiagnosticconfigsmodel.h>
+#include <cppeditor/clangdsettings.h>
 #include <cppeditor/compileroptionsbuilder.h>
-#include <cppeditor/cppcodemodelsettings.h>
 #include <cppeditor/cppmodelmanager.h>
 #include <cppeditor/cpptoolsreuse.h>
 #include <cppeditor/editordocumenthandle.h>
diff --git a/src/plugins/clangcodemodel/test/clangdtests.cpp b/src/plugins/clangcodemodel/test/clangdtests.cpp
index ae92afb45f..f18c164155 100644
--- a/src/plugins/clangcodemodel/test/clangdtests.cpp
+++ b/src/plugins/clangcodemodel/test/clangdtests.cpp
@@ -2240,6 +2240,8 @@ public:
     ClangdTestIndirectChanges();
 
 private slots:
+    void initTestCase() override;
+    void cleanupTestCase();
     void test();
 };
 
@@ -2249,6 +2251,20 @@ ClangdTestIndirectChanges::ClangdTestIndirectChanges()
     setSourceFileNames({"main.cpp", "directheader.h", "indirectheader.h", "unrelatedheader.h"});
 }
 
+void ClangdTestIndirectChanges::initTestCase()
+{
+    CppEditor::ClangdSettings &settings = CppEditor::ClangdSettings::instance();
+    CppEditor::ClangdSettings::Data settingsData = settings.data();
+    settingsData.updateDependentSources = true;
+    settings.setData(settingsData, false);
+    ClangdTest::initTestCase();
+}
+
+void ClangdTestIndirectChanges::cleanupTestCase()
+{
+    CppEditor::ClangdSettings::instance().setData({}, false);
+}
+
 void ClangdTestIndirectChanges::test()
 {
     // Initially, everything is fine.
diff --git a/src/plugins/clangformat/clangformatbaseindenter.cpp b/src/plugins/clangformat/clangformatbaseindenter.cpp
index 1d5dc2730c..b491bd293f 100644
--- a/src/plugins/clangformat/clangformatbaseindenter.cpp
+++ b/src/plugins/clangformat/clangformatbaseindenter.cpp
@@ -65,7 +65,11 @@ static void adjustFormatStyleForLineBreak(clang::format::FormatStyle &style,
 
 static llvm::StringRef clearExtraNewline(llvm::StringRef text)
 {
+#if LLVM_VERSION_MAJOR >= 16
+    while (text.starts_with("\n\n"))
+#else
     while (text.startswith("\n\n"))
+#endif
         text = text.drop_front();
     return text;
 }
diff --git a/src/plugins/clangformat/clangformatconfigwidget.cpp b/src/plugins/clangformat/clangformatconfigwidget.cpp
index e9f49a5eee..ec1afdcfc1 100644
--- a/src/plugins/clangformat/clangformatconfigwidget.cpp
+++ b/src/plugins/clangformat/clangformatconfigwidget.cpp
@@ -214,7 +214,7 @@ void ClangFormatConfigWidget::initEditor(TextEditor::ICodeStylePreferences *code
             return;
         }
         m_clangFileIsCorrectText->show();
-        m_clangFileIsCorrectText->setText(Tr::tr("Warning: ") + success.error());
+        m_clangFileIsCorrectText->setText(Tr::tr("Warning:") + " " + success.error());
         m_clangFileIsCorrectText->setType(Utils::InfoLabel::Warning);
     });
 
diff --git a/src/plugins/clangformat/llvmfilesystem.h b/src/plugins/clangformat/llvmfilesystem.h
index fface01fc0..b2d1c5de7e 100644
--- a/src/plugins/clangformat/llvmfilesystem.h
+++ b/src/plugins/clangformat/llvmfilesystem.h
@@ -127,7 +127,11 @@ public:
     /// Gets real path of \p Path e.g. collapse all . and .. patterns, resolve
     /// symlinks. For real file system, this uses `llvm::sys::fs::real_path`.
     /// This returns errc::operation_not_permitted if not implemented by subclass.
-    std::error_code getRealPath(const Twine &Path, SmallVectorImpl<char> &Output) const override
+    std::error_code getRealPath(const Twine &Path, SmallVectorImpl<char> &Output)
+#if LLVM_VERSION_MAJOR < 19
+        const
+#endif
+        override
     {
         Q_UNUSED(Path);
         Q_UNUSED(Output);
diff --git a/src/plugins/clangtools/CMakeLists.txt b/src/plugins/clangtools/CMakeLists.txt
index c74b470268..72b4dedd7c 100644
--- a/src/plugins/clangtools/CMakeLists.txt
+++ b/src/plugins/clangtools/CMakeLists.txt
@@ -38,6 +38,7 @@ add_qtc_plugin(ClangTools
     documentquickfixfactory.cpp documentquickfixfactory.h
     executableinfo.cpp executableinfo.h
     filterdialog.cpp filterdialog.h
+    inlinesuppresseddiagnostics.cpp inlinesuppresseddiagnostics.h
     runsettingswidget.cpp runsettingswidget.h
     settingswidget.cpp settingswidget.h
     virtualfilesystemoverlay.cpp virtualfilesystemoverlay.h
diff --git a/src/plugins/clangtools/clangfileinfo.h b/src/plugins/clangtools/clangfileinfo.h
index deb53f6058..bc54de3dc2 100644
--- a/src/plugins/clangtools/clangfileinfo.h
+++ b/src/plugins/clangtools/clangfileinfo.h
@@ -24,7 +24,7 @@ public:
              CppEditor::ProjectPart::ConstPtr projectPart)
         : file(std::move(file))
         , kind(kind)
-        , settings(settings.data())
+        , settings(settings)
         , projectPart(projectPart)
     {}
 
@@ -34,7 +34,7 @@ public:
 
     Utils::FilePath file;
     CppEditor::ProjectFile::Kind kind;
-    CppEditor::CppCodeModelSettings::Data settings;
+    CppEditor::CppCodeModelSettings settings;
     CppEditor::ProjectPart::ConstPtr projectPart;
 };
 using FileInfos = std::vector<FileInfo>;
diff --git a/src/plugins/clangtools/clangtool.cpp b/src/plugins/clangtools/clangtool.cpp
index b7108a4389..dd4c7612bd 100644
--- a/src/plugins/clangtools/clangtool.cpp
+++ b/src/plugins/clangtools/clangtool.cpp
@@ -277,7 +277,7 @@ public:
         diagnosticItem->setFixitOperations(replacements);
     }
 
-    void apply(ClangToolsDiagnosticModel *model)
+    void apply()
     {
         for (auto it = m_refactoringFileInfos.begin(); it != m_refactoringFileInfos.end(); ++it) {
             RefactoringFileInfo &fileInfo = it.value();
@@ -318,14 +318,12 @@ public:
             QVector<DiagnosticItem *> itemsInvalidated;
 
             fileInfo.file.setReplacements(ops);
-            model->removeWatchedPath(ops.first()->filePath);
             if (fileInfo.file.apply()) {
                 itemsApplied = itemsScheduled;
             } else {
                 itemsFailedToApply = itemsScheduled;
                 itemsInvalidated = itemsSchedulable;
             }
-            model->addWatchedPath(ops.first()->filePath);
 
             // Update DiagnosticItem state
             for (DiagnosticItem *diagnosticItem : std::as_const(itemsScheduled))
@@ -394,7 +392,7 @@ ClangTool::ClangTool(const QString &name, Id id, ClangToolType type)
     : m_name(name), m_perspective{id.toString(), name}, m_type(type)
 {
     setObjectName(name);
-    m_diagnosticModel = new ClangToolsDiagnosticModel(this);
+    m_diagnosticModel = new ClangToolsDiagnosticModel(type, this);
 
     auto action = new QAction(Tr::tr("Analyze Project with %1...").arg(name), this);
     action->setIcon(Utils::Icons::RUN_SELECTED_TOOLBAR.icon());
@@ -535,7 +533,7 @@ ClangTool::ClangTool(const QString &name, Id id, ClangToolType type)
             diagnosticItems += item;
         });
 
-        ApplyFixIts(diagnosticItems).apply(m_diagnosticModel);
+        ApplyFixIts(diagnosticItems).apply();
     });
 
     // Open Project Settings
diff --git a/src/plugins/clangtools/clangtools.qbs b/src/plugins/clangtools/clangtools.qbs
index 6afa5d026b..bfbdaa177c 100644
--- a/src/plugins/clangtools/clangtools.qbs
+++ b/src/plugins/clangtools/clangtools.qbs
@@ -32,7 +32,8 @@ QtcPlugin {
         "clangtool.h",
         "clangtoolrunner.cpp",
         "clangtoolrunner.h",
-        "clangtools_global.h", "clangtoolstr.h",
+        "clangtools_global.h",
+        "clangtoolstr.h",
         "clangtoolsconstants.h",
         "clangtoolsdiagnostic.cpp",
         "clangtoolsdiagnostic.h",
@@ -64,6 +65,8 @@ QtcPlugin {
         "executableinfo.h",
         "filterdialog.cpp",
         "filterdialog.h",
+        "inlinesuppresseddiagnostics.cpp",
+        "inlinesuppresseddiagnostics.h",
         "runsettingswidget.cpp",
         "runsettingswidget.h",
         "settingswidget.cpp",
diff --git a/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp b/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp
index 5445ce5491..f4d03bed48 100644
--- a/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp
+++ b/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp
@@ -8,6 +8,7 @@
 #include "clangtoolstr.h"
 #include "clangtoolsutils.h"
 #include "diagnosticmark.h"
+#include "inlinesuppresseddiagnostics.h"
 
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectmanager.h>
@@ -62,9 +63,10 @@ private:
     const int m_index = 0;
 };
 
-ClangToolsDiagnosticModel::ClangToolsDiagnosticModel(QObject *parent)
+ClangToolsDiagnosticModel::ClangToolsDiagnosticModel(CppEditor::ClangToolType type, QObject *parent)
     : ClangToolsDiagnosticModelBase(parent)
     , m_filesWatcher(std::make_unique<Utils::FileSystemWatcher>())
+    , m_type(type)
 {
     setRootItem(new Utils::StaticTreeItem(QString()));
     connectFileWatcher();
@@ -180,6 +182,17 @@ void ClangToolsDiagnosticModel::addWatchedPath(const Utils::FilePath &path)
     m_filesWatcher->addFile(path, Utils::FileSystemWatcher::WatchAllChanges);
 }
 
+std::unique_ptr<InlineSuppressedDiagnostics> ClangToolsDiagnosticModel::createInlineSuppressedDiagnostics()
+{
+    switch (m_type) {
+    case CppEditor::ClangToolType::Tidy:
+        return std::make_unique<InlineSuppressedClangTidyDiagnostics>();
+    case CppEditor::ClangToolType::Clazy:
+        return std::make_unique<InlineSuppressedClazyDiagnostics>();
+    }
+    QTC_ASSERT(false, return {});
+}
+
 static QString lineColumnString(const Debugger::DiagnosticLocation &location)
 {
     return QString("%1:%2").arg(QString::number(location.line), QString::number(location.column));
@@ -336,6 +349,18 @@ QVariant DiagnosticItem::data(int column, int role) const
                 return true;
             }
             break;
+        case ClangToolsDiagnosticModel::InlineSuppressableRole:
+            switch (m_fixitStatus) {
+            case FixitStatus::Applied:
+            case FixitStatus::FailedToApply:
+            case FixitStatus::Invalidated:
+                return false;
+            case FixitStatus::Scheduled:
+            case FixitStatus::NotAvailable:
+            case FixitStatus::NotScheduled:
+                return true;
+            }
+            break;
         case Qt::CheckStateRole: {
             switch (m_fixitStatus) {
             case FixitStatus::NotAvailable:
diff --git a/src/plugins/clangtools/clangtoolsdiagnosticmodel.h b/src/plugins/clangtools/clangtoolsdiagnosticmodel.h
index cf1a08aab1..e9a8998957 100644
--- a/src/plugins/clangtools/clangtoolsdiagnosticmodel.h
+++ b/src/plugins/clangtools/clangtoolsdiagnosticmodel.h
@@ -29,6 +29,7 @@ namespace ClangTools {
 namespace Internal {
 
 class ClangToolsDiagnosticModel;
+class InlineSuppressedDiagnostics;
 
 class FilePathItem : public Utils::TreeItem
 {
@@ -90,7 +91,7 @@ class ClangToolsDiagnosticModel : public ClangToolsDiagnosticModelBase
     friend class DiagnosticItem;
 
 public:
-    ClangToolsDiagnosticModel(QObject *parent = nullptr);
+    ClangToolsDiagnosticModel(CppEditor::ClangToolType type, QObject *parent = nullptr);
 
     void addDiagnostics(const Diagnostics &diagnostics, bool generateMarks);
     QSet<Diagnostic> diagnostics() const;
@@ -100,6 +101,7 @@ public:
         TextRole,
         CheckBoxEnabledRole,
         DocumentationUrlRole,
+        InlineSuppressableRole,
     };
 
     QSet<QString> allChecks() const;
@@ -108,6 +110,8 @@ public:
     void removeWatchedPath(const Utils::FilePath &path);
     void addWatchedPath(const Utils::FilePath &path);
 
+    std::unique_ptr<InlineSuppressedDiagnostics> createInlineSuppressedDiagnostics();
+
 signals:
     void fixitStatusChanged(const QModelIndex &index, FixitStatus oldStatus, FixitStatus newStatus);
 
@@ -122,6 +126,7 @@ private:
     QSet<Diagnostic> m_diagnostics;
     std::map<QVector<ExplainingStep>, QVector<DiagnosticItem *>> stepsToItemsCache;
     std::unique_ptr<Utils::FileSystemWatcher> m_filesWatcher;
+    const CppEditor::ClangToolType m_type;
 };
 
 class FilterOptions {
diff --git a/src/plugins/clangtools/clangtoolsdiagnosticview.cpp b/src/plugins/clangtools/clangtoolsdiagnosticview.cpp
index ed264b603d..e3d63e1ec9 100644
--- a/src/plugins/clangtools/clangtoolsdiagnosticview.cpp
+++ b/src/plugins/clangtools/clangtoolsdiagnosticview.cpp
@@ -9,10 +9,16 @@
 #include "clangtoolstr.h"
 #include "clangtoolsutils.h"
 #include "diagnosticconfigswidget.h"
+#include "inlinesuppresseddiagnostics.h"
 
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/manhattanstyle.h>
 
+#include <cppeditor/cppeditorwidget.h>
+#include <cppeditor/cppmodelmanager.h>
+#include <cppeditor/cpprefactoringchanges.h>
+#include <cppeditor/cppsemanticinfo.h>
+
 #include <debugger/analyzer/diagnosticlocation.h>
 
 #include <utils/algorithm.h>
@@ -24,6 +30,7 @@
 #include <QAction>
 #include <QApplication>
 #include <QDebug>
+#include <QHash>
 #include <QHeaderView>
 #include <QPainter>
 #include <QSet>
@@ -151,6 +158,10 @@ DiagnosticView::DiagnosticView(QWidget *parent)
     connect(m_suppressAction, &QAction::triggered,
             this, &DiagnosticView::suppressCurrentDiagnostic);
 
+    m_suppressInlineAction = new QAction(this);
+    connect(m_suppressInlineAction, &QAction::triggered,
+            this, &DiagnosticView::suppressCurrentDiagnosticInline);
+
     m_disableChecksAction = new QAction(this);
     connect(m_disableChecksAction, &QAction::triggered,
             this, &DiagnosticView::disableCheckForCurrentDiagnostic);
@@ -217,6 +228,113 @@ void DiagnosticView::suppressCurrentDiagnostic()
         filterModel->addSuppressedDiagnostics(diags);
 }
 
+void DiagnosticView::suppressCurrentDiagnosticInline()
+{
+    const QModelIndexList indexes = selectionModel()->selectedRows();
+
+    QHash<Utils::FilePath, QHash<int, QStringList>> diagnosticsPerFileAndLine;
+    SuppressedDiagnosticsList diags;
+    for (const QModelIndex &index : indexes) {
+        const Diagnostic diag = model()->data(index, ClangToolsDiagnosticModel::DiagnosticRole)
+                                    .value<Diagnostic>();
+        if (!diag.isValid())
+            continue;
+        const bool isApplicable
+            = model()->data(index, ClangToolsDiagnosticModel::InlineSuppressableRole).value<bool>();
+        if (!isApplicable)
+            continue;
+
+        diagnosticsPerFileAndLine[diag.location.filePath][diag.location.line] << diag.name;
+        diags << diag;
+    }
+
+    if (diags.isEmpty())
+        return;
+
+    const auto filterModel = static_cast<DiagnosticFilterModel *>(model());
+    const auto sourceModel = static_cast<ClangToolsDiagnosticModel *>(filterModel->sourceModel());
+    CppRefactoringChanges changes(CppModelManager::snapshot());
+
+    for (auto it = diagnosticsPerFileAndLine.cbegin(); it != diagnosticsPerFileAndLine.cend(); ++it) {
+        const Utils::FilePath filePath = it.key();
+        CppEditorWidget *editorWidget = nullptr;
+        const QList<Core::IEditor *> editors = Core::DocumentModel::editorsForFilePath(filePath);
+        for (Core::IEditor *editor : editors) {
+            const auto textEditor = qobject_cast<TextEditor::BaseTextEditor *>(editor);
+            if (textEditor)
+                editorWidget = qobject_cast<CppEditorWidget *>(textEditor->editorWidget());
+            if (editorWidget)
+                break;
+        }
+        CppRefactoringFilePtr refactoringFile
+            = editorWidget ? changes.file(editorWidget, editorWidget->semanticInfo().doc)
+                           : changes.cppFile(filePath);
+        Utils::ChangeSet changeSet;
+
+        for (auto it2 = it.value().cbegin(); it2 != it.value().cend(); ++it2) {
+            const int line = it2.key();
+            const QStringList diagNames = it2.value();
+            const auto suppressedDiags = sourceModel->createInlineSuppressedDiagnostics();
+            const QList<CPlusPlus::Token> tokensForLine = refactoringFile->tokensForLine(line);
+            int replaceStart = -1;
+            int replaceEnd = -1;
+            int insertStart = -1;
+            QString prefix;
+            QString suffix;
+            const QTextDocument * const doc = refactoringFile->document();
+            if (!tokensForLine.isEmpty() && tokensForLine.last().isComment()) {
+                CPlusPlus::Token trailingComment = tokensForLine.last();
+                CPlusPlus::TranslationUnit * const tu
+                    = refactoringFile->cppDocument()->translationUnit();
+                const int tokenStart = tu->getTokenPositionInDocument(trailingComment, doc);
+                const int tokenEnd = tu->getTokenEndPositionInDocument(trailingComment, doc);
+                suppressedDiags->fromString(refactoringFile->textOf(tokenStart, tokenEnd));
+                if (suppressedDiags->hasError())
+                    continue;
+                if (suppressedDiags->parsedStartOffset() != -1) {
+                    // There was a comment, and it already contained a suppression list.
+                    replaceStart = tokenStart + suppressedDiags->parsedStartOffset();
+                    replaceEnd = tokenStart + suppressedDiags->parsedEndOffset();
+                } else {
+                    // There was a comment without a suppression list.
+                    prefix = " ";
+                    switch (trailingComment.kind()) {
+                    case CPlusPlus::T_CPP_COMMENT:
+                    case CPlusPlus::T_CPP_DOXY_COMMENT:
+                        insertStart = tokenEnd;
+                        break;
+                    case CPlusPlus::T_COMMENT:
+                    case CPlusPlus::T_DOXY_COMMENT:
+                        insertStart = tokenEnd - 2;
+                        suffix = " ";
+                        break;
+                    default:
+                        QTC_CHECK(false);
+                    }
+                }
+            } else {
+                // There was no comment.
+                const QTextBlock b = doc->findBlockByNumber(line - 1);
+                insertStart = b.position() + b.length() - 1;
+                prefix = " // ";
+            }
+            for (const QString &diagName : diagNames)
+                suppressedDiags->addDiagnostic(diagName);
+            const QString newText = prefix + suppressedDiags->toString() + suffix;
+            if (replaceStart != -1) {
+                changeSet.replace(replaceStart, replaceEnd, newText);
+            } else {
+                QTC_CHECK(insertStart != -1);
+                changeSet.insert(insertStart, newText);
+            }
+        }
+        refactoringFile->setChangeSet(changeSet);
+        refactoringFile->apply();
+    }
+
+    filterModel->addSuppressedDiagnostics(diags);
+}
+
 void DiagnosticView::disableCheckForCurrentDiagnostic()
 {
     std::set<QString> handledNames;
@@ -335,6 +453,9 @@ QList<QAction *> DiagnosticView::customActions() const
     m_suppressAction->setEnabled(isDiagnosticItem || hasMultiSelection);
     m_suppressAction->setText(hasMultiSelection ? Tr::tr("Suppress Selected Diagnostics")
                                                 : Tr::tr("Suppress This Diagnostic"));
+    m_suppressInlineAction->setEnabled(isDiagnosticItem || hasMultiSelection);
+    m_suppressInlineAction->setText(hasMultiSelection ? Tr::tr("Suppress Selected Diagnostics Inline")
+                                                      : Tr::tr("Suppress This Diagnostic Inline"));
     m_disableChecksAction->setEnabled(disableChecksEnabled());
     m_disableChecksAction->setText(hasMultiSelection ? Tr::tr("Disable These Checks")
                                                      : Tr::tr("Disable This Check"));
@@ -348,6 +469,7 @@ QList<QAction *> DiagnosticView::customActions() const
         m_filterOutCurrentKind,
         m_separator2,
         m_suppressAction,
+        m_suppressInlineAction,
         m_disableChecksAction
     };
 }
diff --git a/src/plugins/clangtools/clangtoolsdiagnosticview.h b/src/plugins/clangtools/clangtoolsdiagnosticview.h
index e0cdba9548..8bebd0cf5f 100644
--- a/src/plugins/clangtools/clangtoolsdiagnosticview.h
+++ b/src/plugins/clangtools/clangtoolsdiagnosticview.h
@@ -39,6 +39,7 @@ private:
 
     void openEditorForCurrentIndex();
     void suppressCurrentDiagnostic();
+    void suppressCurrentDiagnosticInline();
     void disableCheckForCurrentDiagnostic();
     enum Direction { Next = 1, Previous = -1 };
     QModelIndex getIndex(const QModelIndex &index, Direction direction) const;
@@ -54,6 +55,7 @@ private:
     QAction *m_filterOutCurrentKind = nullptr;
 
     QAction *m_suppressAction = nullptr;
+    QAction *m_suppressInlineAction = nullptr;
     QAction *m_disableChecksAction = nullptr;
 
     QAction *m_separator = nullptr;
diff --git a/src/plugins/clangtools/clangtoolsplugin.cpp b/src/plugins/clangtools/clangtoolsplugin.cpp
index 26e6539e1f..d0cea985b5 100644
--- a/src/plugins/clangtools/clangtoolsplugin.cpp
+++ b/src/plugins/clangtools/clangtoolsplugin.cpp
@@ -12,9 +12,10 @@
 #include "settingswidget.h"
 
 #ifdef WITH_TESTS
-#include "readexporteddiagnosticstest.h"
 #include "clangtoolspreconfiguredsessiontests.h"
 #include "clangtoolsunittests.h"
+#include "inlinesuppresseddiagnostics.h"
+#include "readexporteddiagnosticstest.h"
 #endif
 
 #include <utils/icon.h>
@@ -102,6 +103,7 @@ void ClangToolsPlugin::initialize()
             &ClangToolsPlugin::onCurrentEditorChanged);
 
 #ifdef WITH_TESTS
+    addTestCreator(createInlineSuppressedDiagnosticsTest);
     addTest<PreconfiguredSessionTests>();
     addTest<ClangToolsUnitTests>();
     addTest<ReadExportedDiagnosticsTest>();
diff --git a/src/plugins/clangtools/clangtoolssettings.cpp b/src/plugins/clangtools/clangtoolssettings.cpp
index f66f35ff6f..0441e93d6c 100644
--- a/src/plugins/clangtools/clangtoolssettings.cpp
+++ b/src/plugins/clangtools/clangtoolssettings.cpp
@@ -28,7 +28,6 @@ const char parallelJobsKey[] = "ParallelJobs";
 const char preferConfigFileKey[] = "PreferConfigFile";
 const char buildBeforeAnalysisKey[] = "BuildBeforeAnalysis";
 const char analyzeOpenFilesKey[] = "AnalyzeOpenFiles";
-const char oldDiagnosticConfigIdKey[] = "diagnosticConfigId";
 
 static Id defaultDiagnosticId()
 {
diff --git a/src/plugins/clangtools/clangtoolsutils.cpp b/src/plugins/clangtools/clangtoolsutils.cpp
index 6a650e9c55..746e32754d 100644
--- a/src/plugins/clangtools/clangtoolsutils.cpp
+++ b/src/plugins/clangtools/clangtoolsutils.cpp
@@ -310,7 +310,10 @@ QStringList extraClangToolsAppendOptions()
 static QVersionNumber fixupVersion(const VersionAndSuffix &versionAndSuffix)
 {
     // llvm.org only does document releases for the first released version
-    QVersionNumber version = QVersionNumber(versionAndSuffix.first.majorVersion(), 0, 0);
+    // Since LLVM 18, the releases start at minor version 1.
+    const int major = versionAndSuffix.first.majorVersion();
+    const int minor = major >= 18 ? 1 : 0;
+    QVersionNumber version = QVersionNumber(major, minor, 0);
 
     if (version == QVersionNumber(0))
         version = QVersionNumber(12);
diff --git a/src/plugins/clangtools/inlinesuppresseddiagnostics.cpp b/src/plugins/clangtools/inlinesuppresseddiagnostics.cpp
new file mode 100644
index 0000000000..312e9213e5
--- /dev/null
+++ b/src/plugins/clangtools/inlinesuppresseddiagnostics.cpp
@@ -0,0 +1,294 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "inlinesuppresseddiagnostics.h"
+
+#include <utils/algorithm.h>
+#include <utils/qtcassert.h>
+
+#ifdef WITH_TESTS
+#include <QObject>
+#include <QtTest>
+#endif // WITH_TESTS
+
+namespace ClangTools::Internal {
+
+InlineSuppressedDiagnostics::~InlineSuppressedDiagnostics() = default;
+
+void InlineSuppressedDiagnostics::addDiagnostic(const QString &diag)
+{
+    if (!m_diagnostics.contains(diag)) {
+        m_diagnostics << diag;
+        m_diagnostics.sort();
+    }
+}
+
+void InlineSuppressedDiagnostics::fromString(const QString &input)
+{
+    try {
+        int tokenOffset = -1;
+        for (int i = 0; i < input.size(); ++i) {
+            const QChar c = input.at(i);
+            if (c.isSpace()) {
+                tokenOffset = -1;
+                continue;
+            }
+            if (tokenOffset == -1)
+                tokenOffset = i;
+            const int tokenPos = i - tokenOffset;
+            if (tokenPos >= m_startString.size() || m_startString.at(tokenPos) != input.at(i)) {
+                tokenOffset = -1;
+                continue;
+            }
+            if (tokenPos == m_startString.size() - 1) {
+                m_parsedStartOffset = tokenOffset;
+                fromStringImpl(QStringView(input).mid(m_parsedStartOffset + m_startString.size()));
+                break;
+            }
+        }
+    } catch (const ParseError &) {
+        m_parsedStartOffset = -1;
+        m_parsedEndOffset = -1;
+        m_parseError = true;
+    }
+}
+
+QString InlineSuppressedDiagnostics::toString() const
+{
+    QTC_ASSERT(!m_diagnostics.isEmpty(), return {});
+    if (m_parseError)
+        return {};
+    return toStringImpl();
+}
+
+void InlineSuppressedDiagnostics::parseDiagnostic(QStringView input, int &offset, const QString &prefix)
+{
+    QString diag;
+    while (offset < input.size()) {
+        const QChar c = input.at(offset);
+        if (!c.isLetterOrNumber() && c != '-')
+            break;
+        diag.append(c);
+        ++offset;
+    }
+    if (diag.isEmpty())
+        throw ParseError();
+    m_diagnostics << prefix + diag;
+}
+
+void InlineSuppressedClangTidyDiagnostics::fromStringImpl(QStringView input)
+{
+    int offset = 0;
+    const auto skipWhiteSpace = [&] {
+        for (; offset < input.size() && input.at(offset).isSpace(); ++offset)
+            ;
+    };
+    while (true) {
+        skipWhiteSpace();
+        parseDiagnostic(input, offset, {});
+        skipWhiteSpace();
+        if (offset == input.size())
+            throw ParseError();
+        const QChar c = input.at(offset);
+        if (c == ')') {
+            setEndOffset(parsedStartOffset() + startString().size() + offset + 1);
+            return;
+        }
+        if (c == ',') {
+            ++offset;
+            continue;
+        }
+        throw ParseError();
+    }
+}
+
+QString InlineSuppressedClangTidyDiagnostics::toStringImpl() const
+{
+    return "NOLINT(" + diagnostics().join(',') + ')';
+}
+
+void InlineSuppressedClazyDiagnostics::fromStringImpl(QStringView input)
+{
+    int offset = 0;
+    while (true) {
+        parseDiagnostic(input, offset, "clazy-");
+        if (offset == input.size())
+            break;
+        const QChar c = input.at(offset);
+        if (c == ',') {
+            ++offset;
+            continue;
+        }
+        if (c.isSpace())
+            break;
+        throw ParseError();
+    }
+    setEndOffset(parsedStartOffset() + startString().size() + offset);
+}
+
+QString InlineSuppressedClazyDiagnostics::toStringImpl() const
+{
+    return "clazy:exclude=" + Utils::transform(diagnostics(), [](const QString &diag) {
+                                  return diag.mid(6); // Remove "clazy-" prefix
+                              }).join(',');
+}
+
+#ifdef WITH_TESTS
+class InlineSuppressedDiagnosticsTest : public QObject
+{
+    Q_OBJECT
+private:
+    template<typename Diags> void testExcludedDiagnostics()
+    {
+        QFETCH(QString, input);
+        QFETCH(QStringList, additionalDiagnostics);
+        QFETCH(int, startOffset);
+        QFETCH(int, endOffset);
+        QFETCH(QString, output);
+        QFETCH(bool, error);
+
+        Diags diags;
+        diags.fromString(input);
+        for (const QString &diag : std::as_const(additionalDiagnostics))
+            diags.addDiagnostic(diag);
+        QCOMPARE(diags.parsedStartOffset(), startOffset);
+        QCOMPARE(diags.parsedEndOffset(), endOffset);
+        QCOMPARE(diags.toString(), output);
+        QCOMPARE(diags.hasError(), error);
+    }
+
+private slots:
+    void testClangTidyExcludedDiagnostics_data()
+    {
+        QTest::addColumn<QString>("input");
+        QTest::addColumn<QStringList>("additionalDiagnostics");
+        QTest::addColumn<int>("startOffset");
+        QTest::addColumn<int>("endOffset");
+        QTest::addColumn<QString>("output");
+        QTest::addColumn<bool>("error");
+
+        QTest::newRow("no offset, round-trip")
+            << QString("NOLINT(google-explicit-constructor, google-runtime-int)")
+            << QStringList() << 0 << 55
+            << QString("NOLINT(google-explicit-constructor,google-runtime-int)")
+            << false;
+        QTest::newRow("random other content, add some diags")
+            << QString("some prefix NOLINT(google-runtime-int) some suffix")
+            << QStringList{"modernize-concat-nested-namespaces", "misc-include-cleaner"} << 12 << 38
+            << QString("NOLINT(google-runtime-int,misc-include-cleaner,modernize-concat-nested-namespaces)")
+            << false;
+        QTest::newRow("create from empty input")
+            << QString()
+            << QStringList{"misc-include-cleaner"} << -1 << -1
+            << QString("NOLINT(misc-include-cleaner)")
+            << false;
+        QTest::newRow("create from irrelevant input")
+            << QString(" random content ")
+            << QStringList{"misc-include-cleaner"} << -1 << -1
+            << QString("NOLINT(misc-include-cleaner)")
+            << false;
+        QTest::newRow("missing closing parenthesis")
+            << QString("NOLINT(google-explicit-constructor, google-runtime-int")
+            << QStringList() << -1 << -1
+            << QString()
+            << true;
+        QTest::newRow("missing comma")
+            << QString("NOLINT(google-explicit-constructor google-runtime-int)")
+            << QStringList() << -1 << -1
+            << QString()
+            << true;
+        QTest::newRow("no diagnostics")
+            << QString("NOLINT()")
+            << QStringList() << -1 << -1
+            << QString()
+            << true;
+        QTest::newRow("empty diagnostic (start)")
+            << QString("NOLINT(,google-explicit-constructor,google-runtime-int)")
+            << QStringList() << -1 << -1
+            << QString()
+            << true;
+        QTest::newRow("empty diagnostic (middle)")
+            << QString("NOLINT(google-explicit-constructor,,google-runtime-int)")
+            << QStringList() << -1 << -1
+            << QString()
+            << true;
+        QTest::newRow("empty diagnostic (end)")
+            << QString("NOLINT(google-explicit-constructor,)")
+            << QStringList() << -1 << -1
+            << QString()
+            << true;
+    }
+
+    void testClangTidyExcludedDiagnostics()
+    {
+        testExcludedDiagnostics<InlineSuppressedClangTidyDiagnostics>();
+    }
+
+    void testClazyExcludedDiagnostics_data()
+    {
+        QTest::addColumn<QString>("input");
+        QTest::addColumn<QStringList>("additionalDiagnostics");
+        QTest::addColumn<int>("startOffset");
+        QTest::addColumn<int>("endOffset");
+        QTest::addColumn<QString>("output");
+        QTest::addColumn<bool>("error");
+
+        QTest::newRow("no offset, round-trip")
+            << QString("clazy:exclude=qstring-allocations,qenums")
+            << QStringList() << 0 << 40
+            << QString("clazy:exclude=qstring-allocations,qenums")
+            << false;
+        QTest::newRow("random other content, add some diags")
+            << QString("some prefix clazy:exclude=qstring-allocations some suffix")
+            << QStringList{"clazy-qgetenv", "clazy-qtmacros"} << 12 << 45
+            << QString("clazy:exclude=qgetenv,qstring-allocations,qtmacros")
+            << false;
+        QTest::newRow("create from empty input")
+            << QString()
+            << QStringList{"clazy-qgetenv"} << -1 << -1
+            << QString("clazy:exclude=qgetenv")
+            << false;
+        QTest::newRow("create from irrelevant input")
+            << QString(" random content ")
+            << QStringList{"clazy-qgetenv"} << -1 << -1
+            << QString("clazy:exclude=qgetenv")
+            << false;
+        QTest::newRow("missing comma")
+            << QString("clazy:exclude=qstring-allocations qenums")
+            << QStringList() << 0 << 33
+            << QString("clazy:exclude=qstring-allocations")
+            << false;
+        QTest::newRow("empty diagnostic (start)")
+            << QString("clazy:exclude=,qenums")
+            << QStringList() << -1 << -1
+            << QString()
+            << true;
+        QTest::newRow("empty diagnostic (middle)")
+            << QString("clazy:exclude=qstring-allocations,,qenums")
+            << QStringList() << -1 << -1
+            << QString()
+            << true;
+        QTest::newRow("empty diagnostic (end)")
+            << QString("clazy:exclude=qstring-allocations,qenums,")
+            << QStringList() << -1 << -1
+            << QString()
+            << true;
+    }
+
+    void testClazyExcludedDiagnostics()
+    {
+        testExcludedDiagnostics<InlineSuppressedClazyDiagnostics>();
+    }
+};
+
+QObject *createInlineSuppressedDiagnosticsTest()
+{
+    return new InlineSuppressedDiagnosticsTest;
+}
+#endif // WITH_TESTS
+
+} // namespace ClangTools::Internal
+
+#ifdef WITH_TESTS
+#include <inlinesuppresseddiagnostics.moc>
+#endif
diff --git a/src/plugins/clangtools/inlinesuppresseddiagnostics.h b/src/plugins/clangtools/inlinesuppresseddiagnostics.h
new file mode 100644
index 0000000000..e20f8a56d8
--- /dev/null
+++ b/src/plugins/clangtools/inlinesuppresseddiagnostics.h
@@ -0,0 +1,73 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include <QStringList>
+
+QT_BEGIN_NAMESPACE
+class QObject;
+QT_END_NAMESPACE
+
+namespace ClangTools::Internal {
+
+class InlineSuppressedDiagnostics
+{
+public:
+    virtual ~InlineSuppressedDiagnostics();
+    void addDiagnostic(const QString &diag);
+
+    int parsedStartOffset() const { return m_parsedStartOffset; }
+    int parsedEndOffset() const { return m_parsedEndOffset; }
+
+    void fromString(const QString &input);
+    QString toString() const;
+
+    bool hasError() const { return m_parseError; }
+
+protected:
+    class ParseError {};
+
+    InlineSuppressedDiagnostics(const QString &startString) : m_startString(startString) {};
+
+    const QString &startString() const { return m_startString; }
+    const QStringList &diagnostics() const { return m_diagnostics; }
+    void setEndOffset(int offset) { m_parsedEndOffset = offset; }
+    void parseDiagnostic(QStringView input, int &offset, const QString &prefix);
+
+private:
+    virtual void fromStringImpl(QStringView input) = 0;
+    virtual QString toStringImpl() const = 0;
+
+    const QString m_startString;
+    QStringList m_diagnostics;
+    int m_parsedStartOffset = -1;
+    int m_parsedEndOffset = -1;
+    bool m_parseError = false;
+};
+
+class InlineSuppressedClangTidyDiagnostics : public InlineSuppressedDiagnostics
+{
+public:
+    InlineSuppressedClangTidyDiagnostics() : InlineSuppressedDiagnostics("NOLINT(") {}
+
+private:
+    void fromStringImpl(QStringView input) override;
+    QString toStringImpl() const override;
+};
+
+class InlineSuppressedClazyDiagnostics : public InlineSuppressedDiagnostics
+{
+public:
+    InlineSuppressedClazyDiagnostics() : InlineSuppressedDiagnostics("clazy:exclude=") {}
+
+private:
+    void fromStringImpl(QStringView input) override;
+    QString toStringImpl() const override;
+};
+
+#ifdef WITH_TESTS
+QObject *createInlineSuppressedDiagnosticsTest();
+#endif
+
+} // namespace ClangTools::Internal
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
index 762499aaf7..0106ec5896 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
@@ -94,6 +94,7 @@ const char CMAKE_BUILD_TYPE[] = "CMake.Build.Type";
 const char CLEAR_SYSTEM_ENVIRONMENT_KEY[] = "CMake.Configure.ClearSystemEnvironment";
 const char USER_ENVIRONMENT_CHANGES_KEY[] = "CMake.Configure.UserEnvironmentChanges";
 const char BASE_ENVIRONMENT_KEY[] = "CMake.Configure.BaseEnvironment";
+const char GENERATE_QMLLS_INI_SETTING[] = "J.QtQuick/QmlJSEditor.GenerateQmllsIniFiles";
 
 namespace Internal {
 
@@ -606,6 +607,18 @@ void CMakeBuildSettingsWidget::updateInitialCMakeArguments()
 {
     CMakeConfig initialList = m_buildConfig->initialCMakeArguments.cmakeConfiguration();
 
+    // set QT_QML_GENERATE_QMLLS_INI if it is enabled via the settings checkbox and if its not part
+    // of the initial CMake arguments yet
+    if (Core::ICore::settings()->value(GENERATE_QMLLS_INI_SETTING).toBool()) {
+        if (std::none_of(
+                initialList.constBegin(), initialList.constEnd(), [](const CMakeConfigItem &item) {
+                    return item.key == "QT_QML_GENERATE_QMLLS_INI";
+                })) {
+            initialList.append(
+                CMakeConfigItem("QT_QML_GENERATE_QMLLS_INI", CMakeConfigItem::BOOL, "ON"));
+        }
+    }
+
     for (const CMakeConfigItem &ci : m_buildConfig->cmakeBuildSystem()->configurationChanges()) {
         if (!ci.isInitial)
             continue;
@@ -1544,6 +1557,11 @@ CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Id id)
         if (qt && qt->isQmlDebuggingSupported())
             cmd.addArg("-DCMAKE_CXX_FLAGS_INIT:STRING=%{" + QLatin1String(QT_QML_DEBUG_FLAG) + "}");
 
+        // QT_QML_GENERATE_QMLLS_INI, if enabled via the settings checkbox:
+        if (Core::ICore::settings()->value(GENERATE_QMLLS_INI_SETTING).toBool()) {
+            cmd.addArg("-DQT_QML_GENERATE_QMLLS_INI:BOOL=ON");
+        }
+
         CMakeProject *cmakeProject = static_cast<CMakeProject *>(target->project());
         configureEnv.setUserEnvironmentChanges(
             getEnvironmentItemsFromCMakeConfigurePreset(cmakeProject, k));
@@ -1575,9 +1593,8 @@ FilePath CMakeBuildConfiguration::shadowBuildDirectory(const FilePath &projectFi
         return {};
 
     const QString projectName = projectFilePath.parentDir().fileName();
-    const FilePath projectDir = Project::projectDirectory(projectFilePath);
-    FilePath buildPath = buildDirectoryFromTemplate(projectDir, projectFilePath, projectName, k,
-                                                    bcName, buildType, "cmake");
+    FilePath buildPath = buildDirectoryFromTemplate(
+        projectFilePath.absolutePath(), projectFilePath, projectName, k, bcName, buildType, "cmake");
 
     if (CMakeGeneratorKitAspect::isMultiConfigGenerator(k)) {
         const QString path = buildPath.path();
@@ -1888,8 +1905,6 @@ CMakeBuildConfigurationFactory::CMakeBuildConfigurationFactory()
     setBuildGenerator([](const Kit *k, const FilePath &projectPath, bool forSetup) {
         QList<BuildInfo> result;
 
-        FilePath path = forSetup ? Project::projectDirectory(projectPath) : projectPath;
-
         // Skip the default shadow build directories for build types if we have presets
         const CMakeConfigItem presetItem = CMakeConfigurationKitAspect::cmakePresetConfigItem(k);
         if (!presetItem.isNull())
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
index 0ba54b60a8..219000f284 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
@@ -749,14 +749,17 @@ CMakeBuildSystem::projectFileArgumentPosition(const QString &targetName, const Q
                && func.Arguments().size() > 1 && func.Arguments().front().Value == target_name;
     });
 
-    for (const auto &func : {function, targetSourcesFunc, addQmlModuleFunc}) {
+    auto setSourceFilePropFunc = findFunction(*cmakeListFile, [](const auto &func) {
+        return func.LowerCaseName() == "set_source_files_properties";
+    });
+
+    for (const auto &func : {function, targetSourcesFunc, addQmlModuleFunc, setSourceFilePropFunc}) {
         if (!func.has_value())
             continue;
-        auto filePathArgument = Utils::findOrDefault(func->Arguments(),
-                                                     [file_name = fileName.toStdString()](
-                                                         const auto &arg) {
-                                                         return arg.Value == file_name;
-                                                     });
+        auto filePathArgument = Utils::findOrDefault(
+            func->Arguments(), [file_name = fileName.toStdString()](const auto &arg) {
+                return arg.Value == file_name;
+            });
 
         if (!filePathArgument.Value.empty()) {
             return ProjectFileArgumentPosition{filePathArgument, targetCMakeFile, fileName};
@@ -925,48 +928,59 @@ bool CMakeBuildSystem::renameFile(Node *context,
 {
     if (auto n = dynamic_cast<CMakeTargetNode *>(context)) {
         const FilePath projDir = n->filePath().canonicalPath();
-        const QString newRelPathName
-            = newFilePath.canonicalPath().relativePathFrom(projDir).cleanPath().toString();
+        const FilePath newRelPath = newFilePath.canonicalPath().relativePathFrom(projDir).cleanPath();
+        const QString newRelPathName = newRelPath.toString();
+
+        // FilePath needs the file to exist on disk, the old file has already been renamed
+        const QString oldRelPathName
+            = newRelPath.parentDir().pathAppended(oldFilePath.fileName()).cleanPath().toString();
 
         const QString targetName = n->buildKey();
         const QString key
             = QStringList{projDir.path(), targetName, oldFilePath.path(), newFilePath.path()}.join(
                 ";");
 
-        auto fileToRename = m_filesToBeRenamed.take(key);
-        if (!fileToRename.cmakeFile.exists()) {
+        std::optional<CMakeBuildSystem::ProjectFileArgumentPosition> fileToRename
+            = m_filesToBeRenamed.take(key);
+        if (!fileToRename->cmakeFile.exists()) {
             qCCritical(cmakeBuildSystemLog).noquote()
-                << "File" << fileToRename.cmakeFile.path() << "does not exist.";
+                << "File" << fileToRename->cmakeFile.path() << "does not exist.";
             return false;
         }
 
-        BaseTextEditor *editor = qobject_cast<BaseTextEditor *>(
-            Core::EditorManager::openEditorAt({fileToRename.cmakeFile,
-                                               static_cast<int>(fileToRename.argumentPosition.Line),
-                                               static_cast<int>(fileToRename.argumentPosition.Column
-                                                                - 1)},
-                                              Constants::CMAKE_EDITOR_ID,
-                                              Core::EditorManager::DoNotMakeVisible));
-        if (!editor) {
-            qCCritical(cmakeBuildSystemLog).noquote()
-                << "BaseTextEditor cannot be obtained for" << fileToRename.cmakeFile.path()
-                << fileToRename.argumentPosition.Line << int(fileToRename.argumentPosition.Column);
-            return false;
-        }
+        do {
+            BaseTextEditor *editor = qobject_cast<BaseTextEditor *>(
+                Core::EditorManager::openEditorAt(
+                    {fileToRename->cmakeFile,
+                     static_cast<int>(fileToRename->argumentPosition.Line),
+                     static_cast<int>(fileToRename->argumentPosition.Column - 1)},
+                    Constants::CMAKE_EDITOR_ID,
+                    Core::EditorManager::DoNotMakeVisible));
+            if (!editor) {
+                qCCritical(cmakeBuildSystemLog).noquote()
+                    << "BaseTextEditor cannot be obtained for" << fileToRename->cmakeFile.path()
+                    << fileToRename->argumentPosition.Line
+                    << int(fileToRename->argumentPosition.Column);
+                return false;
+            }
 
-        // If quotes were used for the source file, skip the starting quote
-        if (fileToRename.argumentPosition.Delim == cmListFileArgument::Quoted)
-            editor->setCursorPosition(editor->position() + 1);
+            // If quotes were used for the source file, skip the starting quote
+            if (fileToRename->argumentPosition.Delim == cmListFileArgument::Quoted)
+                editor->setCursorPosition(editor->position() + 1);
 
-        if (!fileToRename.fromGlobbing)
-            editor->replace(fileToRename.relativeFileName.length(), newRelPathName);
+            if (!fileToRename->fromGlobbing)
+                editor->replace(fileToRename->relativeFileName.length(), newRelPathName);
 
-        editor->editorWidget()->autoIndent();
-        if (!Core::DocumentManager::saveDocument(editor->document())) {
-            qCCritical(cmakeBuildSystemLog).noquote()
-                << "Changes to" << fileToRename.cmakeFile.path() << "could not be saved.";
-            return false;
-        }
+            editor->editorWidget()->autoIndent();
+            if (!Core::DocumentManager::saveDocument(editor->document())) {
+                qCCritical(cmakeBuildSystemLog).noquote()
+                    << "Changes to" << fileToRename->cmakeFile.path() << "could not be saved.";
+                return false;
+            }
+
+            // Try the next occurrence. This can happen if set_source_file_properties is used
+            fileToRename = projectFileArgumentPosition(targetName, oldRelPathName);
+        } while (fileToRename);
 
         return true;
     }
@@ -1190,7 +1204,9 @@ void CMakeBuildSystem::clearCMakeCache()
         m_parameters.buildDirectory / "CMakeFiles",
         m_parameters.buildDirectory / ".cmake/api/v1/reply",
         m_parameters.buildDirectory / ".cmake/api/v1/reply.prev",
-        m_parameters.buildDirectory / Constants::PACKAGE_MANAGER_DIR
+        m_parameters.buildDirectory / Constants::PACKAGE_MANAGER_DIR,
+        m_parameters.buildDirectory / "conan-dependencies",
+        m_parameters.buildDirectory / "vcpkg-dependencies"
     };
 
     for (const FilePath &path : pathsToDelete)
@@ -1340,12 +1356,10 @@ void CMakeBuildSystem::updateProjectData()
         return QtMajorVersion::None;
     };
 
-    QtMajorVersion qtVersion = kitInfo.projectPartQtVersion;
-    if (qtVersion == QtMajorVersion::None)
-        qtVersion = qtVersionFromCMake({{QtMajorVersion::Qt6, {"Qt6", "Qt6Core"}},
-                                        {QtMajorVersion::Qt5, {"Qt5", "Qt5Core"}},
-                                        {QtMajorVersion::Qt4, {"Qt4", "Qt4Core"}}
-                                       });
+    QtMajorVersion qtVersion = qtVersionFromCMake(
+        {{QtMajorVersion::Qt6, {"Qt6", "Qt6Core"}},
+         {QtMajorVersion::Qt5, {"Qt5", "Qt5Core"}},
+         {QtMajorVersion::Qt4, {"Qt4", "Qt4Core"}}});
 
     QString errorMessage;
     RawProjectParts rpps = m_reader.createRawProjectParts(errorMessage);
@@ -1354,7 +1368,7 @@ void CMakeBuildSystem::updateProjectData()
     qCDebug(cmakeBuildSystemLog) << "Raw project parts created." << errorMessage;
 
     for (RawProjectPart &rpp : rpps) {
-        rpp.setQtVersion(qtVersion); // TODO: Check if project actually uses Qt.
+        rpp.setQtVersion(qtVersion);
         const FilePath includeFileBaseDir = buildConfiguration()->buildDirectory();
         QStringList cxxFlags = rpp.flagsForCxx.commandLineFlags;
         QStringList cFlags = rpp.flagsForC.commandLineFlags;
diff --git a/src/plugins/cmakeprojectmanager/cmakeeditor.cpp b/src/plugins/cmakeprojectmanager/cmakeeditor.cpp
index 968d6260e7..27db33e14d 100644
--- a/src/plugins/cmakeprojectmanager/cmakeeditor.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeeditor.cpp
@@ -26,7 +26,6 @@
 #include <texteditor/basehoverhandler.h>
 #include <texteditor/textdocument.h>
 #include <texteditor/texteditor.h>
-#include <texteditor/texteditoractionhandler.h>
 
 #include <utils/mimeconstants.h>
 #include <utils/textutils.h>
@@ -533,9 +532,9 @@ public:
         setCompletionAssistProvider(new CMakeFileCompletionAssistProvider);
         setAutoCompleterCreator([] { return new CMakeAutoCompleter; });
 
-        setEditorActionHandlers(TextEditorActionHandler::UnCommentSelection
-                                | TextEditorActionHandler::FollowSymbolUnderCursor
-                                | TextEditorActionHandler::Format);
+        setOptionalActionMask(OptionalActions::UnCommentSelection
+                                | OptionalActions::FollowSymbolUnderCursor
+                                | OptionalActions::Format);
 
         addHoverHandler(new CMakeHoverHandler);
 
diff --git a/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp b/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp
index 00750f4d3c..3d8aa65475 100644
--- a/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp
@@ -695,7 +695,7 @@ QVariant CMakeGeneratorKitAspectFactory::defaultValue(const Kit *k) const
                                   return g.matches("NMake Makefiles")
                                          || g.matches("NMake Makefiles JOM");
                               });
-            if (ProjectExplorerPlugin::projectExplorerSettings().useJom) {
+            if (projectExplorerSettings().useJom) {
                 it = std::find_if(known.constBegin(),
                                   known.constEnd(),
                                   [](const CMakeTool::Generator &g) {
diff --git a/src/plugins/cmakeprojectmanager/cmakelocatorfilter.cpp b/src/plugins/cmakeprojectmanager/cmakelocatorfilter.cpp
index 0964aae46c..2445cf58b6 100644
--- a/src/plugins/cmakeprojectmanager/cmakelocatorfilter.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakelocatorfilter.cpp
@@ -35,8 +35,13 @@ static LocatorMatcherTasks cmakeMatchers(const BuildAcceptor &acceptor)
 
     const auto onSetup = [storage, acceptor] {
         const QString input = storage->input();
+        const QRegularExpression regexp
+            = ILocatorFilter::createRegExp(input, ILocatorFilter::caseSensitivity(input));
+        if (!regexp.isValid())
+            return;
+        LocatorFilterEntries entries[int(ILocatorFilter::MatchLevel::Count)];
+
         const QList<Project *> projects = ProjectManager::projects();
-        LocatorFilterEntries entries;
         for (Project *project : projects) {
             const auto cmakeProject = qobject_cast<const CMakeProject *>(project);
             if (!cmakeProject || !cmakeProject->activeTarget())
@@ -50,8 +55,8 @@ static LocatorMatcherTasks cmakeMatchers(const BuildAcceptor &acceptor)
             for (const CMakeBuildTarget &target : buildTargets) {
                 if (CMakeBuildSystem::filteredOutTarget(target))
                     continue;
-                const int index = target.title.indexOf(input, 0, Qt::CaseInsensitive);
-                if (index >= 0) {
+                const QRegularExpressionMatch match = regexp.match(target.title);
+                if (match.hasMatch()) {
                     const FilePath projectPath = cmakeProject->projectFilePath();
                     const QString displayName = target.title;
                     LocatorFilterEntry entry;
@@ -72,14 +77,21 @@ static LocatorMatcherTasks cmakeMatchers(const BuildAcceptor &acceptor)
                     } else {
                         entry.extraInfo = projectPath.shortNativePath();
                     }
-                    entry.highlightInfo = {index, int(input.length())};
+                    entry.highlightInfo = ILocatorFilter::highlightInfo(match);
                     entry.filePath = cmakeProject->projectFilePath();
-                    if (acceptor || realTarget)
-                        entries.append(entry);
+                    if (acceptor || realTarget) {
+                        if (match.capturedStart() == 0)
+                            entries[int(ILocatorFilter::MatchLevel::Best)].append(entry);
+                        else if (match.lastCapturedIndex() == 1)
+                            entries[int(ILocatorFilter::MatchLevel::Better)].append(entry);
+                        else
+                            entries[int(ILocatorFilter::MatchLevel::Good)].append(entry);
+                    }
                 }
             }
         }
-        storage->reportOutput(entries);
+        storage->reportOutput(
+            std::accumulate(std::begin(entries), std::end(entries), LocatorFilterEntries()));
     };
     return {{Sync(onSetup), storage}};
 }
diff --git a/src/plugins/cmakeprojectmanager/cmakeprocess.cpp b/src/plugins/cmakeprojectmanager/cmakeprocess.cpp
index 40cc41d64a..9b4f5cd2ec 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprocess.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprocess.cpp
@@ -58,11 +58,15 @@ void CMakeProcess::run(const BuildDirParameters &parameters, const QStringList &
 
     const FilePath cmakeExecutable = cmake->cmakeExecutable();
 
+    const QString mountHint = ::CMakeProjectManager::Tr::tr(
+        "You may need to add the project directory to the list of directories that are mounted by "
+        "the build device.");
+
     if (!cmakeExecutable.ensureReachable(parameters.sourceDirectory)) {
         const QString msg = ::CMakeProjectManager::Tr::tr(
                 "The source directory %1 is not reachable by the CMake executable %2.")
             .arg(parameters.sourceDirectory.displayName()).arg(cmakeExecutable.displayName());
-        BuildSystem::appendBuildSystemOutput(addCMakePrefix({QString(), msg}).join('\n'));
+        BuildSystem::appendBuildSystemOutput(addCMakePrefix({QString(), msg, mountHint}).join('\n'));
         emit finished(failedToStartExitCode);
         return;
     }
@@ -71,7 +75,7 @@ void CMakeProcess::run(const BuildDirParameters &parameters, const QStringList &
         const QString msg = ::CMakeProjectManager::Tr::tr(
                 "The build directory %1 is not reachable by the CMake executable %2.")
             .arg(parameters.buildDirectory.displayName()).arg(cmakeExecutable.displayName());
-        BuildSystem::appendBuildSystemOutput(addCMakePrefix({QString(), msg}).join('\n'));
+        BuildSystem::appendBuildSystemOutput(addCMakePrefix({QString(), msg, mountHint}).join('\n'));
         emit finished(failedToStartExitCode);
         return;
     }
@@ -173,16 +177,9 @@ void CMakeProcess::stop()
 
 QString addCMakePrefix(const QString &str)
 {
-    auto qColorToAnsiCode = [] (const QColor &color) {
-        return QString::fromLatin1("\033[38;2;%1;%2;%3m")
-            .arg(color.red()).arg(color.green()).arg(color.blue());
-    };
-    static const QColor bgColor = creatorTheme()->color(Theme::BackgroundColorNormal);
-    static const QColor fgColor = creatorTheme()->color(Theme::TextColorNormal);
-    static const QColor grey = StyleHelper::mergedColors(fgColor, bgColor, 80);
-    static const QString prefixString = qColorToAnsiCode(grey) + Constants::OUTPUT_PREFIX
-                                        + qColorToAnsiCode(fgColor);
-    return QString("%1%2").arg(prefixString, str);
+    static const QString prefix
+        = ansiColoredText(Constants::OUTPUT_PREFIX, creatorTheme()->color(Theme::Token_Text_Muted));
+    return prefix + str;
 }
 
 QStringList addCMakePrefix(const QStringList &list)
diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
index 23c68a6e64..9e119bba88 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
@@ -136,6 +136,8 @@ Internal::PresetsData CMakeProject::combinePresets(Internal::PresetsData &cmakeP
                                                && left.inherits.value().contains(right.name);
 
                 const bool inheritsGreater = left.inherits && right.inherits
+                                             && !left.inherits.value().isEmpty()
+                                             && !right.inherits.value().isEmpty()
                                              && left.inherits.value().first()
                                                     > right.inherits.value().first();
 
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectconstants.h b/src/plugins/cmakeprojectmanager/cmakeprojectconstants.h
index 45c90a0b62..ea9461ba32 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectconstants.h
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectconstants.h
@@ -11,6 +11,7 @@ const char RUN_CMAKE[] = "CMakeProject.RunCMake";
 const char RUN_CMAKE_PROFILER[] = "CMakeProject.RunCMakeProfiler";
 const char RUN_CMAKE_DEBUGGER[] = "CMakeProject.RunCMakeDebugger";
 const char CLEAR_CMAKE_CACHE[] = "CMakeProject.ClearCache";
+const char CLEAR_CMAKE_CACHE_CONTEXT_MENU[] = "CMakeProject.ClearCacheContextMenu";
 const char RESCAN_PROJECT[] = "CMakeProject.RescanProject";
 const char RUN_CMAKE_CONTEXT_MENU[] = "CMakeProject.RunCMakeContextMenu";
 const char BUILD_FILE_CONTEXT_MENU[] = "CMakeProject.BuildFileContextMenu";
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
index ba13edbb32..9730c957fb 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
@@ -110,6 +110,14 @@ CMakeManager::CMakeManager()
         .addToContainer(PEC::M_PROJECTCONTEXT, PEC::G_PROJECT_BUILD)
         .addOnTriggered(this, [this] { runCMake(ProjectTree::currentBuildSystem()); });
 
+    ActionBuilder(this, Constants::CLEAR_CMAKE_CACHE_CONTEXT_MENU)
+        .setText(Tr::tr("Clear CMake Configuration"))
+        .setContext(projectContext)
+        .bindContextAction(&m_clearCMakeCacheAction)
+        .setCommandAttribute(Command::CA_Hide)
+        .addToContainer(PEC::M_PROJECTCONTEXT, PEC::G_PROJECT_REBUILD)
+        .addOnTriggered(this, [this] { clearCMakeCache(ProjectManager::startupBuildSystem()); });
+
     ActionBuilder(this, Constants::BUILD_FILE_CONTEXT_MENU)
         .setText(Tr::tr("Build"))
         .bindContextAction(&m_buildFileContextMenu)
diff --git a/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp b/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp
index a0bd4d426e..4134da09e7 100644
--- a/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp
+++ b/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp
@@ -209,7 +209,8 @@ static bool isChildOf(const FilePath &path, const FilePaths &prefixes)
 static CMakeBuildTarget toBuildTarget(const TargetDetails &t,
                                       const FilePath &sourceDirectory,
                                       const FilePath &buildDirectory,
-                                      bool relativeLibs)
+                                      bool relativeLibs,
+                                      const QSet<FilePath> &artifacts)
 {
     const FilePath currentBuildDir = buildDirectory.resolvePath(t.buildDir);
 
@@ -341,14 +342,17 @@ static CMakeBuildTarget toBuildTarget(const TargetDetails &t,
                         librarySeachPaths.append(tmp);
 
                     if (buildDir.osType() == OsTypeWindows && dllName) {
-                        if (tmp.pathAppended(*dllName).exists())
+                        const auto validPath = [&artifacts](const FilePath& path) {
+                            return path.exists() || artifacts.contains(path);
+                        };
+                        if (validPath(tmp.pathAppended(*dllName)))
                             librarySeachPaths.append(tmp);
 
                         // Libraries often have their import libs in ../lib and the
                         // actual dll files in ../bin on windows. Qt is one example of that.
-                        if (tmp.fileName() == "lib" && buildDir.osType() == OsTypeWindows) {
+                        if (tmp.fileName() == "lib") {
                             const FilePath path = tmp.parentDir().pathAppended("bin");
-                            if (path.isDir() && path.pathAppended(*dllName).exists())
+                            if (path.isDir() && validPath(path.pathAppended(*dllName)))
                                 librarySeachPaths.append(path);
                         }
                     }
@@ -367,12 +371,17 @@ static QList<CMakeBuildTarget> generateBuildTargets(const QFuture<void> &cancelF
                                                     const FilePath &buildDirectory,
                                                     bool relativeLibs)
 {
+    QSet<FilePath> artifacts;
+    for (const TargetDetails &t : input.targetDetails)
+        for (const FilePath &p: t.artifacts)
+            artifacts.insert(buildDirectory.resolvePath(p));
+
     QList<CMakeBuildTarget> result;
     result.reserve(input.targetDetails.size());
     for (const TargetDetails &t : input.targetDetails) {
         if (cancelFuture.isCanceled())
             return {};
-        result.append(toBuildTarget(t, sourceDirectory, buildDirectory, relativeLibs));
+        result.append(toBuildTarget(t, sourceDirectory, buildDirectory, relativeLibs, artifacts));
     }
     return result;
 }
@@ -624,7 +633,7 @@ static FolderNode *createSourceGroupNode(const QString &sourceGroupName,
             FolderNode *existingNode = currentNode->findChildFolderNode(
                 [&p](const FolderNode *fn) { return fn->displayName() == p; });
             if (!existingNode) {
-                auto node = createCMakeVFolder(sourceDirectory, Node::DefaultFolderPriority + 5, p, true);
+                auto node = createCMakeVFolder(sourceDirectory, Node::DefaultFolderPriority + 5, p);
                 node->setListInProject(false);
                 node->setIcon([] { return Icon::fromTheme("edit-copy"); });
 
@@ -645,7 +654,6 @@ static void addCompileGroups(ProjectNode *targetRoot,
                              const FilePath &buildDirectory,
                              const TargetDetails &td)
 {
-    const bool showSourceFolders = settings().showSourceSubFolders();
     const bool inSourceBuild = (sourceDirectory == buildDirectory);
 
     QSet<FilePath> alreadyListed;
@@ -676,6 +684,25 @@ static void addCompileGroups(ProjectNode *targetRoot,
         if (isPchFile(buildDirectory, sourcePath) || isUnityFile(buildDirectory, sourcePath))
             node->setIsGenerated(true);
 
+        // Hide some of the QML files that we not marked as generated by the Qt QML CMake code
+        const bool buildDirQmldirOrRcc = sourcePath.isChildOf(buildDirectory)
+                                         && (sourcePath.parentDir().fileName() == ".rcc"
+                                             || sourcePath.fileName() == "qmldir");
+        const bool otherDirQmldirOrMetatypes = !sourcePath.isChildOf(buildDirectory)
+                                               && !sourcePath.isChildOf(sourceDirectory)
+                                               && (sourcePath.parentDir().fileName() == "metatypes"
+                                                   || sourcePath.fileName() == "qmldir");
+        const bool buildDirPluginCpp = sourcePath.isChildOf(buildDirectory)
+                                       && td.type.endsWith("_LIBRARY")
+                                       && sourcePath.fileName().startsWith(td.name)
+                                       && sourcePath.fileName().endsWith("Plugin.cpp");
+
+        if (buildDirQmldirOrRcc || otherDirQmldirOrMetatypes || buildDirPluginCpp)
+            node->setIsGenerated(true);
+
+        const bool showSourceFolders = settings().showSourceSubFolders()
+                                       && defaultCMakeSourceGroupFolder(td.sourceGroups[si.sourceGroup]);
+
         // Where does the file node need to go?
         if (showSourceFolders && sourcePath.isChildOf(buildDirectory) && !inSourceBuild) {
             buildFileNodes.emplace_back(std::move(node));
@@ -687,6 +714,9 @@ static void addCompileGroups(ProjectNode *targetRoot,
     }
 
     for (size_t i = 0; i < sourceGroupFileNodes.size(); ++i) {
+        const bool showSourceFolders = settings().showSourceSubFolders()
+                                       && defaultCMakeSourceGroupFolder(td.sourceGroups[i]);
+
         std::vector<std::unique_ptr<FileNode>> &current = sourceGroupFileNodes[i];
         FolderNode *insertNode = td.sourceGroups[i] == "TREE"
                                      ? targetRoot
diff --git a/src/plugins/cmakeprojectmanager/fileapiparser.cpp b/src/plugins/cmakeprojectmanager/fileapiparser.cpp
index 560b43617d..f72bcd5a68 100644
--- a/src/plugins/cmakeprojectmanager/fileapiparser.cpp
+++ b/src/plugins/cmakeprojectmanager/fileapiparser.cpp
@@ -877,6 +877,7 @@ FileApiData FileApiParser::parseData(QPromise<std::shared_ptr<FileApiQtcData>> &
         errorMessage = Tr::tr("CMake project configuration failed. No CMake configuration for "
                               "build type \"%1\" found.")
                            .arg(cmakeBuildType);
+        errorMessage += Tr::tr(" Check General messages for more information.");
         return result;
     }
 
diff --git a/src/plugins/cmakeprojectmanager/fileapireader.cpp b/src/plugins/cmakeprojectmanager/fileapireader.cpp
index d7dae6c8fc..cb76705cdc 100644
--- a/src/plugins/cmakeprojectmanager/fileapireader.cpp
+++ b/src/plugins/cmakeprojectmanager/fileapireader.cpp
@@ -332,7 +332,7 @@ void FileApiReader::makeBackupConfiguration(bool store)
 void FileApiReader::writeConfigurationIntoBuildDirectory(const QStringList &configurationArguments)
 {
     const FilePath buildDir = m_parameters.buildDirectory;
-    QTC_CHECK(buildDir.ensureWritableDir());
+    QTC_ASSERT_EXPECTED(buildDir.ensureWritableDir(), return);
 
     QByteArray contents;
     QStringList unknownOptions;
@@ -344,7 +344,7 @@ void FileApiReader::writeConfigurationIntoBuildDirectory(const QStringList &conf
             .toUtf8());
 
     const FilePath settingsFile = buildDir / "qtcsettings.cmake";
-    QTC_CHECK(settingsFile.writeFileContents(contents));
+    QTC_ASSERT_EXPECTED(settingsFile.writeFileContents(contents), return);
 }
 
 std::unique_ptr<CMakeProjectNode> FileApiReader::rootProjectNode()
diff --git a/src/plugins/cmakeprojectmanager/projecttreehelper.cpp b/src/plugins/cmakeprojectmanager/projecttreehelper.cpp
index e17505095a..c25cc69378 100644
--- a/src/plugins/cmakeprojectmanager/projecttreehelper.cpp
+++ b/src/plugins/cmakeprojectmanager/projecttreehelper.cpp
@@ -18,15 +18,22 @@ using namespace ProjectExplorer;
 
 namespace CMakeProjectManager::Internal {
 
+bool defaultCMakeSourceGroupFolder(const QString &displayName)
+{
+    return displayName == "Source Files" || displayName == "Header Files"
+           || displayName == "Resources" || displayName == ""
+           || displayName == "Precompile Header File" || displayName == "CMake Rules"
+           || displayName == "Object Files";
+}
+
 std::unique_ptr<FolderNode> createCMakeVFolder(const Utils::FilePath &basePath,
                                                int priority,
-                                               const QString &displayName,
-                                               bool sourcesOrHeaders)
+                                               const QString &displayName)
 {
     auto newFolder = std::make_unique<VirtualFolderNode>(basePath);
     newFolder->setPriority(priority);
     newFolder->setDisplayName(displayName);
-    newFolder->setIsSourcesOrHeaders(sourcesOrHeaders);
+    newFolder->setIsSourcesOrHeaders(defaultCMakeSourceGroupFolder(displayName));
     return newFolder;
 }
 
@@ -35,14 +42,13 @@ void addCMakeVFolder(FolderNode *base,
                      int priority,
                      const QString &displayName,
                      std::vector<std::unique_ptr<FileNode>> &&files,
-                     bool sourcesOrHeaders,
                      bool listInProject)
 {
     if (files.size() == 0)
         return;
     FolderNode *folder = base;
     if (!displayName.isEmpty()) {
-        auto newFolder = createCMakeVFolder(basePath, priority, displayName, sourcesOrHeaders);
+        auto newFolder = createCMakeVFolder(basePath, priority, displayName);
         folder = newFolder.get();
         base->addNode(std::move(newFolder));
     }
@@ -90,7 +96,6 @@ void addCMakeInputs(FolderNode *root,
                     10,
                     Tr::tr("<Other Locations>"),
                     removeKnownNodes(knownFiles, std::move(rootInputs)),
-                    /*sourcesOrHeaders=*/false,
                     /*listInProject=*/false);
 
     root->addNode(std::move(cmakeVFolder));
diff --git a/src/plugins/cmakeprojectmanager/projecttreehelper.h b/src/plugins/cmakeprojectmanager/projecttreehelper.h
index bcd5500db9..35f7cf16a4 100644
--- a/src/plugins/cmakeprojectmanager/projecttreehelper.h
+++ b/src/plugins/cmakeprojectmanager/projecttreehelper.h
@@ -11,17 +11,17 @@
 
 namespace CMakeProjectManager::Internal {
 
+bool defaultCMakeSourceGroupFolder(const QString &displayName);
+
 std::unique_ptr<ProjectExplorer::FolderNode> createCMakeVFolder(const Utils::FilePath &basePath,
                                                                 int priority,
-                                                                const QString &displayName,
-                                                                bool sourcesOrHeaders);
+                                                                const QString &displayName);
 
 void addCMakeVFolder(ProjectExplorer::FolderNode *base,
                      const Utils::FilePath &basePath,
                      int priority,
                      const QString &displayName,
                      std::vector<std::unique_ptr<ProjectExplorer::FileNode>> &&files,
-                     bool sourcesOrHeaders = false,
                      bool listInProject = true);
 
 std::vector<std::unique_ptr<ProjectExplorer::FileNode>> &&removeKnownNodes(
diff --git a/src/plugins/compilerexplorer/CompilerExplorer.json.in b/src/plugins/compilerexplorer/CompilerExplorer.json.in
index 108bd6a5df..db771bd9f9 100644
--- a/src/plugins/compilerexplorer/CompilerExplorer.json.in
+++ b/src/plugins/compilerexplorer/CompilerExplorer.json.in
@@ -26,5 +26,6 @@
         "        <glob pattern='*.qtce'/>",
         "    </mime-type>",
         "</mime-info>"
-    ]
+    ],
+    "JsonWizardPaths" : [":/compilerexplorer/wizard/"]
 }
diff --git a/src/plugins/compilerexplorer/compilerexplorereditor.cpp b/src/plugins/compilerexplorer/compilerexplorereditor.cpp
index 651ee59620..e1e564c733 100644
--- a/src/plugins/compilerexplorer/compilerexplorereditor.cpp
+++ b/src/plugins/compilerexplorer/compilerexplorereditor.cpp
@@ -18,7 +18,6 @@
 #include <texteditor/fontsettings.h>
 #include <texteditor/textdocument.h>
 #include <texteditor/texteditor.h>
-#include <texteditor/texteditoractionhandler.h>
 #include <texteditor/texteditorsettings.h>
 #include <texteditor/textmark.h>
 
@@ -53,6 +52,7 @@ using namespace std::chrono_literals;
 using namespace Aggregation;
 using namespace TextEditor;
 using namespace Utils;
+using namespace Core;
 
 namespace CompilerExplorer {
 
@@ -66,7 +66,11 @@ constexpr char SourceEditorHoverLine[] = "SourceEditor.HoveredLine";
 CodeEditorWidget::CodeEditorWidget(const std::shared_ptr<SourceSettings> &settings,
                                    QUndoStack *undoStack)
     : m_settings(settings)
-    , m_undoStack(undoStack){};
+    , m_undoStack(undoStack)
+{
+    connect(undoStack, &QUndoStack::canUndoChanged, this, [this]() { updateUndoRedoActions(); });
+    connect(undoStack, &QUndoStack::canRedoChanged, this, [this]() { updateUndoRedoActions(); });
+};
 
 void CodeEditorWidget::updateHighlighter()
 {
@@ -418,9 +422,9 @@ CompilerWidget::CompilerWidget(const std::shared_ptr<SourceSettings> &sourceSett
     m_spinner = new SpinnerSolution::Spinner(SpinnerSolution::SpinnerSize::Large, this);
 }
 
-Core::SearchableTerminal *CompilerWidget::createTerminal()
+SearchableTerminal *CompilerWidget::createTerminal()
 {
-    m_resultTerminal = new Core::SearchableTerminal();
+    m_resultTerminal = new SearchableTerminal();
     m_resultTerminal->setAllowBlinkingCursor(false);
     std::array<QColor, 20> colors{Utils::creatorTheme()->color(Utils::Theme::TerminalAnsi0),
                                   Utils::creatorTheme()->color(Utils::Theme::TerminalAnsi1),
@@ -554,7 +558,7 @@ void CompilerWidget::doCompile()
             const QList<QTextEdit::ExtraSelection> links = m_asmDocument->setCompileResult(r);
             m_asmEditor->setExtraSelections(AsmEditorLinks, links);
         } catch (const std::exception &e) {
-            Core::MessageManager::writeDisrupting(
+            MessageManager::writeDisrupting(
                 Tr::tr("Failed to compile: \"%1\".").arg(QString::fromUtf8(e.what())));
         }
     });
@@ -564,12 +568,10 @@ void CompilerWidget::doCompile()
 
 EditorWidget::EditorWidget(const std::shared_ptr<JsonSettingsDocument> &document,
                            QUndoStack *undoStack,
-                           TextEditorActionHandler &actionHandler,
                            QWidget *parent)
     : Utils::FancyMainWindow(parent)
     , m_document(document)
     , m_undoStack(undoStack)
-    , m_actionHandler(actionHandler)
 {
     setContextMenuPolicy(Qt::NoContextMenu);
     setDockNestingEnabled(true);
@@ -589,10 +591,6 @@ EditorWidget::EditorWidget(const std::shared_ptr<JsonSettingsDocument> &document
             this,
             &EditorWidget::recreateEditors);
 
-    connect(this, &EditorWidget::gotFocus, this, [&actionHandler] {
-        actionHandler.updateCurrentEditor();
-    });
-
     setupHelpWidget();
 }
 
@@ -627,10 +625,6 @@ CompilerWidget *EditorWidget::addCompiler(const std::shared_ptr<SourceSettings>
                 sourceSettings->compilers.removeItem(compilerSettings->shared_from_this());
             });
 
-    connect(compiler, &CompilerWidget::gotFocus, this, [this] {
-        m_actionHandler.updateCurrentEditor();
-    });
-
     return compiler;
 }
 
@@ -669,10 +663,6 @@ void EditorWidget::addSourceEditor(const std::shared_ptr<SourceSettings> &source
         setupHelpWidget();
     });
 
-    connect(sourceEditor, &SourceEditorWidget::gotFocus, this, [this] {
-        m_actionHandler.updateCurrentEditor();
-    });
-
     dockWidget->setFeatures(QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetMovable);
     addDockWidget(Qt::LeftDockWidgetArea, dockWidget);
 
@@ -842,18 +832,25 @@ TextEditor::TextEditorWidget *EditorWidget::focusedEditorWidget() const
     return nullptr;
 }
 
-Editor::Editor(TextEditorActionHandler &actionHandler)
+Editor::Editor()
     : m_document(new JsonSettingsDocument(&m_undoStack))
 {
-    setContext(Core::Context(Constants::CE_EDITOR_ID));
-    setWidget(new EditorWidget(m_document, &m_undoStack, actionHandler));
-
-    connect(&m_undoStack, &QUndoStack::canUndoChanged, this, [&actionHandler] {
-        actionHandler.updateActions();
-    });
-    connect(&m_undoStack, &QUndoStack::canRedoChanged, this, [&actionHandler] {
-        actionHandler.updateActions();
-    });
+    setContext(Context(Constants::CE_EDITOR_ID));
+    setWidget(new EditorWidget(m_document, &m_undoStack));
+
+    m_undoAction = ActionBuilder(this, Core::Constants::UNDO)
+                       .setContext(m_context)
+                       .addOnTriggered([this] { m_undoStack.undo(); })
+                       .setScriptable(true)
+                       .contextAction();
+    m_redoAction = ActionBuilder(this, Core::Constants::REDO)
+                       .setContext(m_context)
+                       .addOnTriggered([this] { m_undoStack.redo(); })
+                       .setScriptable(true)
+                       .contextAction();
+
+    connect(&m_undoStack, &QUndoStack::canUndoChanged, m_undoAction, &QAction::setEnabled);
+    connect(&m_undoStack, &QUndoStack::canRedoChanged, m_redoAction, &QAction::setEnabled);
 }
 
 Editor::~Editor()
@@ -861,18 +858,6 @@ Editor::~Editor()
     delete widget();
 }
 
-static bool childHasFocus(QWidget *parent)
-{
-    if (parent->hasFocus())
-        return true;
-
-    for (QWidget *child : parent->findChildren<QWidget *>())
-        if (childHasFocus(child))
-            return true;
-
-    return false;
-}
-
 QWidget *Editor::toolBar()
 {
     if (!m_toolBar) {
@@ -909,65 +894,11 @@ QWidget *Editor::toolBar()
 }
 
 EditorFactory::EditorFactory()
-    : m_actionHandler(Constants::CE_EDITOR_ID,
-                      Constants::CE_EDITOR_ID,
-                      TextEditor::TextEditorActionHandler::None,
-                      [](Core::IEditor *editor) -> TextEditorWidget * {
-                          return static_cast<EditorWidget *>(editor->widget())->focusedEditorWidget();
-                      })
 {
     setId(Constants::CE_EDITOR_ID);
     setDisplayName(Tr::tr("Compiler Explorer Editor"));
     setMimeTypes({"application/compiler-explorer"});
-
-    auto undoStackFromEditor = [](Core::IEditor *editor) -> QUndoStack * {
-        if (!editor)
-            return nullptr;
-        return &static_cast<Editor *>(editor)->m_undoStack;
-    };
-
-    m_actionHandler.setCanUndoCallback([undoStackFromEditor](Core::IEditor *editor) {
-        if (auto undoStack = undoStackFromEditor(editor))
-            return undoStack->canUndo();
-        return false;
-    });
-
-    m_actionHandler.setCanRedoCallback([undoStackFromEditor](Core::IEditor *editor) {
-        if (auto undoStack = undoStackFromEditor(editor))
-            return undoStack->canRedo();
-        return false;
-    });
-
-    m_actionHandler.setUnhandledCallback(
-        [undoStackFromEditor](Utils::Id cmdId, Core::IEditor *editor) {
-            if (cmdId == TextEditor::Constants::INCREASE_FONT_SIZE) {
-                TextEditor::TextEditorSettings::instance()->increaseFontZoom();
-                return true;
-            } else if (cmdId == TextEditor::Constants::DECREASE_FONT_SIZE) {
-                TextEditor::TextEditorSettings::instance()->decreaseFontZoom();
-                return true;
-            }
-
-            if (cmdId != Core::Constants::UNDO && cmdId != Core::Constants::REDO)
-                return false;
-
-            if (!childHasFocus(editor->widget()))
-                return false;
-
-            QUndoStack *undoStack = undoStackFromEditor(editor);
-
-            if (!undoStack)
-                return false;
-
-            if (cmdId == Core::Constants::UNDO)
-                undoStack->undo();
-            else
-                undoStack->redo();
-
-            return true;
-        });
-
-    setEditorCreator([this]() { return new Editor(m_actionHandler); });
+    setEditorCreator([] { return new Editor; });
 }
 
 QList<QTextEdit::ExtraSelection> AsmDocument::setCompileResult(
diff --git a/src/plugins/compilerexplorer/compilerexplorereditor.h b/src/plugins/compilerexplorer/compilerexplorereditor.h
index c9c02e5215..7aa7b185ef 100644
--- a/src/plugins/compilerexplorer/compilerexplorereditor.h
+++ b/src/plugins/compilerexplorer/compilerexplorereditor.h
@@ -11,7 +11,6 @@
 #include <solutions/spinner/spinner.h>
 
 #include <texteditor/texteditor.h>
-#include <texteditor/texteditoractionhandler.h>
 
 #include <utils/fancymainwindow.h>
 
@@ -39,6 +38,9 @@ public:
     void undo() override { m_undoStack->undo(); }
     void redo() override { m_undoStack->redo(); }
 
+    bool isUndoAvailable() const override { return m_undoStack->canUndo(); }
+    bool isRedoAvailable() const override { return m_undoStack->canRedo(); }
+
     void focusInEvent(QFocusEvent *event) override
     {
         TextEditorWidget::focusInEvent(event);
@@ -77,6 +79,7 @@ public:
     {
         TextEditorWidget::focusInEvent(event);
         emit gotFocus();
+        updateUndoRedoActions();
     }
 
     void findLinkAt(const QTextCursor &,
@@ -87,6 +90,9 @@ public:
     void undo() override { m_undoStack->undo(); }
     void redo() override { m_undoStack->redo(); }
 
+    bool isUndoAvailable() const override { return m_undoStack->canUndo(); }
+    bool isRedoAvailable() const override { return m_undoStack->canRedo(); }
+
 protected:
     void mouseMoveEvent(QMouseEvent *event) override;
     void leaveEvent(QEvent *event) override;
@@ -223,7 +229,6 @@ class EditorWidget : public Utils::FancyMainWindow
 public:
     EditorWidget(const std::shared_ptr<JsonSettingsDocument> &document,
                  QUndoStack *undoStack,
-                 TextEditor::TextEditorActionHandler &actionHandler,
                  QWidget *parent = nullptr);
     ~EditorWidget() override;
 
@@ -253,7 +258,6 @@ protected:
 private:
     std::shared_ptr<JsonSettingsDocument> m_document;
     QUndoStack *m_undoStack;
-    TextEditor::TextEditorActionHandler &m_actionHandler;
 
     QList<QDockWidget *> m_compilerWidgets;
     QList<QDockWidget *> m_sourceWidgets;
@@ -262,7 +266,7 @@ private:
 class Editor : public Core::IEditor
 {
 public:
-    Editor(TextEditor::TextEditorActionHandler &actionHandler);
+    Editor();
     ~Editor();
 
     Core::IDocument *document() const override { return m_document.get(); }
@@ -271,6 +275,8 @@ public:
     std::shared_ptr<JsonSettingsDocument> m_document;
     QUndoStack m_undoStack;
     std::unique_ptr<QToolBar> m_toolBar;
+    QAction *m_undoAction = nullptr;
+    QAction *m_redoAction = nullptr;
 };
 
 class EditorFactory : public Core::IEditorFactory
@@ -279,8 +285,6 @@ public:
     EditorFactory();
 
 private:
-    TextEditor::TextEditorActionHandler m_actionHandler;
-
     QAction m_undoAction;
     QAction m_redoAction;
 };
diff --git a/src/plugins/compilerexplorer/compilerexplorerplugin.cpp b/src/plugins/compilerexplorer/compilerexplorerplugin.cpp
index c54c26a600..48920561b4 100644
--- a/src/plugins/compilerexplorer/compilerexplorerplugin.cpp
+++ b/src/plugins/compilerexplorer/compilerexplorerplugin.cpp
@@ -6,7 +6,6 @@
 #include "compilerexplorersettings.h"
 #include "compilerexplorertr.h"
 
-#include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/editormanager/editormanager.h>
@@ -20,44 +19,38 @@
 
 #include <utils/fsengine/fileiconprovider.h>
 
-#include <QMenu>
-
 using namespace Core;
 using namespace Utils;
 
 namespace CompilerExplorer::Internal {
 
-class CompilerExplorerPlugin : public ExtensionSystem::IPlugin
+class CompilerExplorerPlugin final : public ExtensionSystem::IPlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "CompilerExplorer.json")
 
 public:
-    void initialize() override
+    void initialize() final
     {
         static CompilerExplorer::EditorFactory ceEditorFactory;
 
         FileIconProvider::registerIconForMimeType(QIcon(":/compilerexplorer/logos/ce.ico"),
                                                   "application/compiler-explorer");
 
-        ProjectExplorer::JsonWizardFactory::addWizardPath(":/compilerexplorer/wizard/");
-
         const Id menuId = "Tools.CompilerExplorer";
-        ActionContainer *mtools = ActionManager::actionContainer(Core::Constants::M_TOOLS);
-        ActionContainer *mCompilerExplorer = ActionManager::createMenu(menuId);
-        QMenu *menu = mCompilerExplorer->menu();
-        menu->setTitle(Tr::tr("Compiler Explorer"));
-        mtools->addMenu(mCompilerExplorer);
-
-        ActionBuilder openAction(this, "CompilerExplorer.CompilerExplorerAction");
-        openAction.setText(Tr::tr("Open Compiler Explorer"));
-        openAction.addToContainer(menuId);
-        openAction.addOnTriggered(this, [] {
-            QString name = "Compiler Explorer $";
-            Core::EditorManager::openEditorWithContents(Constants::CE_EDITOR_ID,
-                                                        &name,
-                                                        settings().defaultDocument().toUtf8());
-        });
+        MenuBuilder(menuId)
+            .setTitle(Tr::tr("Compiler Explorer"))
+            .addToContainer(Core::Constants::M_TOOLS);
+
+        ActionBuilder(this, "CompilerExplorer.CompilerExplorerAction")
+            .setText(Tr::tr("Open Compiler Explorer"))
+            .addToContainer(menuId)
+            .addOnTriggered(this, [] {
+                QString name = "Compiler Explorer $";
+                EditorManager::openEditorWithContents(Constants::CE_EDITOR_ID,
+                                                      &name,
+                                                      settings().defaultDocument().toUtf8());
+            });
     }
 };
 
diff --git a/src/plugins/coreplugin/editormanager/editorarea.cpp b/src/plugins/coreplugin/editormanager/editorarea.cpp
index 2b47988c3b..cb311320cd 100644
--- a/src/plugins/coreplugin/editormanager/editorarea.cpp
+++ b/src/plugins/coreplugin/editormanager/editorarea.cpp
@@ -48,6 +48,11 @@ IDocument *EditorArea::currentDocument() const
     return m_currentDocument;
 }
 
+EditorView *EditorArea::currentView() const
+{
+    return m_currentView;
+}
+
 void EditorArea::focusChanged(QWidget *old, QWidget *now)
 {
     Q_UNUSED(old)
@@ -104,5 +109,10 @@ void EditorArea::updateCloseSplitButton()
         v->setCloseSplitEnabled(false);
 }
 
+void EditorArea::hideEvent(QHideEvent *)
+{
+    emit hidden();
+}
+
 } // Internal
 } // Core
diff --git a/src/plugins/coreplugin/editormanager/editorarea.h b/src/plugins/coreplugin/editormanager/editorarea.h
index 30cf25ba77..f4cc6e62c2 100644
--- a/src/plugins/coreplugin/editormanager/editorarea.h
+++ b/src/plugins/coreplugin/editormanager/editorarea.h
@@ -22,15 +22,18 @@ public:
     ~EditorArea() override;
 
     IDocument *currentDocument() const;
+    EditorView *currentView() const;
 
 signals:
     void windowTitleNeedsUpdate();
+    void hidden();
 
 private:
     void focusChanged(QWidget *old, QWidget *now);
     void setCurrentView(EditorView *view);
     void updateCurrentEditor(IEditor *editor);
     void updateCloseSplitButton();
+    void hideEvent(QHideEvent *) override;
 
     IContext *m_context;
     QPointer<EditorView> m_currentView;
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index 6ec37a6cb8..9041d2bd4a 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -687,9 +687,8 @@ void EditorManagerPrivate::init()
     mainEditorArea->hide();
     connect(mainEditorArea, &EditorArea::windowTitleNeedsUpdate,
             this, &EditorManagerPrivate::updateWindowTitle);
-    connect(mainEditorArea, &QObject::destroyed, this, &EditorManagerPrivate::editorAreaDestroyed);
-    m_editorAreas.append(mainEditorArea);
-    m_currentView = mainEditorArea->view();
+    addEditorArea(mainEditorArea);
+    setCurrentView(mainEditorArea->view());
 
     updateActions();
 
@@ -723,6 +722,14 @@ void EditorManagerPrivate::init()
             IEditor *editor = EditorManager::currentEditor();
             return editor ? editor->widget()->mapToGlobal(QPoint(0, 0)).y() : 0;
                                                });
+
+    connect(
+        DocumentManager::instance(),
+        &DocumentManager::allDocumentsRenamed,
+        d,
+        [](const FilePath &from, const FilePath &to) {
+            EditorManagerPrivate::handleFileRenamed(from, to);
+        });
 }
 
 void EditorManagerPrivate::extensionsInitialized()
@@ -999,7 +1006,7 @@ IEditor *EditorManagerPrivate::openEditorWith(const FilePath &filePath, Id edito
 IEditor *EditorManagerPrivate::activateEditorForDocument(EditorView *view, IDocument *document,
                                                          EditorManager::OpenEditorFlags flags)
 {
-    Q_ASSERT(view);
+    QTC_ASSERT(view, return nullptr);
     IEditor *editor = view->editorForDocument(document);
     if (!editor) {
         const QList<IEditor*> editors = DocumentModel::editorsForDocument(document);
@@ -1073,8 +1080,9 @@ void EditorManagerPrivate::doEscapeKeyFocusMoveMagic()
         return;
     QWidget *focus = QApplication::focusWidget();
     EditorView *editorView = currentEditorView();
-    bool editorViewActive = (focus && focus == editorView->focusWidget());
-    bool editorViewVisible = editorView->isVisible();
+    QTC_CHECK(editorView);
+    bool editorViewActive = (editorView && focus && focus == editorView->focusWidget());
+    bool editorViewVisible = editorView && editorView->isVisible();
 
     bool stuffHidden = false;
     FindToolBarPlaceHolder *findPane = FindToolBarPlaceHolder::getCurrent();
@@ -1414,7 +1422,7 @@ IEditor *EditorManagerPrivate::duplicateEditor(IEditor *editor)
 IEditor *EditorManagerPrivate::activateEditor(EditorView *view, IEditor *editor,
                                               EditorManager::OpenEditorFlags flags)
 {
-    Q_ASSERT(view);
+    QTC_ASSERT(view, return nullptr);
 
     if (!editor)
         return nullptr;
@@ -1454,7 +1462,6 @@ bool EditorManagerPrivate::activateEditorForEntry(EditorView *view, DocumentMode
     if (!entry) { // no document
         view->setCurrentEditor(nullptr);
         setCurrentView(view);
-        setCurrentEditor(nullptr);
         return false;
     }
     IDocument *document = entry->document;
@@ -1629,11 +1636,6 @@ bool EditorManagerPrivate::closeEditors(const QList<IEditor*> &editors, CloseFla
                                     flags = EditorManager::DoNotSwitchToDesignMode;
                                 activateEditorForDocument(view, document, flags);
                             }
-                        } else {
-                            // no documents left - set current view since view->removeEditor can
-                            // trigger a focus change, context change, and updateActions, which
-                            // requests the current EditorView
-                            setCurrentView(currentView);
                         }
                     }
                 }
@@ -1644,12 +1646,10 @@ bool EditorManagerPrivate::closeEditors(const QList<IEditor*> &editors, CloseFla
 
     emit m_instance->editorsClosed(Utils::toList(acceptedEditors));
 
-    if (focusView) {
+    if (focusView)
         activateView(focusView);
-    } else {
+    else
         setCurrentView(currentView);
-        setCurrentEditor(currentView->currentEditor());
-    }
 
     qDeleteAll(acceptedEditors);
 
@@ -1664,14 +1664,8 @@ bool EditorManagerPrivate::closeEditors(const QList<IEditor*> &editors, CloseFla
 void EditorManagerPrivate::activateView(EditorView *view)
 {
     QTC_ASSERT(view, return);
-    QWidget *focusWidget;
-    if (IEditor *editor = view->currentEditor()) {
-        setCurrentEditor(editor, true);
-        focusWidget = editor->widget();
-    } else {
-        setCurrentView(view);
-        focusWidget = view;
-    }
+    setCurrentView(view);
+    QWidget *focusWidget = view->currentEditor() ? view->currentEditor()->widget() : view;
     focusWidget->setFocus();
     ICore::raiseWindow(focusWidget);
 }
@@ -1698,46 +1692,65 @@ int EditorManagerPrivate::visibleDocumentsCount()
     return visibleDocuments.count();
 }
 
-void EditorManagerPrivate::setCurrentEditor(IEditor *editor, bool ignoreNavigationHistory)
+static void setView(QList<QPointer<EditorView>> &list, EditorView *view)
 {
-    if (editor)
-        setCurrentView(nullptr);
+    // remove view from the list, as well as any deleted views
+    Utils::erase(list, [view](QPointer<EditorView> v) { return !v || v == view; });
+    list.prepend(view);
+}
 
-    if (d->m_currentEditor == editor)
-        return;
+void EditorManagerPrivate::setCurrentEditor(IEditor *editor, bool ignoreNavigationHistory)
+{
+    IEditor *previousEditor = d->m_currentEditor;
+    EditorView *previousView = d->m_currentView.isEmpty() ? nullptr : d->m_currentView.constFirst();
+    EditorView *view = editor ? viewForEditor(editor) : previousView;
 
-    emit m_instance->currentEditorAboutToChange(d->m_currentEditor);
+    if (editor != previousEditor) {
+        emit m_instance->currentEditorAboutToChange(d->m_currentEditor);
 
-    if (d->m_currentEditor && !ignoreNavigationHistory)
-        EditorManager::addCurrentPositionToNavigationHistory();
+        if (d->m_currentEditor && !ignoreNavigationHistory)
+            EditorManager::addCurrentPositionToNavigationHistory();
 
-    d->m_currentEditor = editor;
-    if (editor) {
-        if (EditorView *view = viewForEditor(editor))
-            view->setCurrentEditor(editor);
+        d->m_currentEditor = editor;
         // update global history
-        EditorView::updateEditorHistory(editor, d->m_globalHistory);
+        if (editor)
+            EditorView::updateEditorHistory(editor, d->m_globalHistory);
     }
+
+    if (QTC_GUARD(view)) { // we should always have a view
+        setView(d->m_currentView, view);
+        view->setCurrentEditor(editor);
+    }
+
     updateActions();
-    emit m_instance->currentEditorChanged(editor);
+
+    if (d->m_currentEditor != previousEditor)
+        emit m_instance->currentEditorChanged(d->m_currentEditor);
 }
 
 void EditorManagerPrivate::setCurrentView(EditorView *view)
 {
-    if (view == d->m_currentView)
-        return;
+    QTC_ASSERT(view, return); // we should always have a view
+    // currentView can empty if and only if we are currently initializing and setting
+    // the main editor area's view as the current one
+    if (d->m_currentView.isEmpty() || view != d->m_currentView.constFirst()) {
+        EditorView *previousView = d->m_currentView.isEmpty() ? nullptr
+                                                              : d->m_currentView.constFirst();
+        setView(d->m_currentView, view);
 
-    EditorView *old = d->m_currentView;
-    d->m_currentView = view;
+        if (previousView)
+            previousView->update();
+        if (d->m_currentView.constFirst())
+            view->update();
+    }
 
-    if (old)
-        old->update();
-    if (view)
-        view->update();
+    setCurrentEditor(view->currentEditor());
 }
 
 EditorArea *EditorManagerPrivate::findEditorArea(const EditorView *view, int *areaIndex)
 {
+    if (!view)
+        return nullptr;
     SplitterOrView *current = view->parentSplitterOrView();
     while (current) {
         if (auto area = qobject_cast<EditorArea *>(current)) {
@@ -1824,14 +1837,43 @@ void EditorManagerPrivate::deleteEditors(const QList<IEditor *> &editors)
 EditorWindow *EditorManagerPrivate::createEditorWindow()
 {
     auto win = new EditorWindow;
-    EditorArea *area = win->editorArea();
+    addEditorArea(win->editorArea());
+    return win;
+}
+
+void EditorManagerPrivate::addEditorArea(EditorArea *area)
+{
     d->m_editorAreas.append(area);
     connect(area, &QObject::destroyed, d, &EditorManagerPrivate::editorAreaDestroyed);
-    return win;
+    connect(
+        area,
+        &EditorArea::hidden,
+        d,
+        [area = QPointer<EditorArea>(area)] {
+            // The connection is queued, because the hiding might be very short term, e.g.
+            // when switching between Edit and Debug modes. Check if it is still hidden.
+            const auto isReallyVisibile = [](QWidget *w) {
+                return w && w->isVisible() && !w->window()->isMinimized();
+            };
+            if (isReallyVisibile(area))
+                return;
+            // In case the hidden editor area has the current view, look for a view
+            // that is not hidden, iterating through the history of current views.
+            // This could be the first==current view (which results in a no-op).
+            for (const QPointer<EditorView> &view : d->m_currentView) {
+                if (isReallyVisibile(view)) {
+                    setCurrentView(view);
+                    return;
+                }
+            }
+            // If we didn't find a better view, so be it
+        },
+        Qt::QueuedConnection);
 }
 
 void EditorManagerPrivate::splitNewWindow(EditorView *view)
 {
+    QTC_ASSERT(view, return);
     IEditor *editor = view->currentEditor();
     IEditor *newEditor = nullptr;
     const QByteArray state = editor ? editor->saveState() : QByteArray();
@@ -1886,6 +1928,52 @@ void EditorManagerPrivate::updateAutoSave()
         d->m_autoSaveTimer->stop();
 }
 
+void EditorManagerPrivate::handleFileRenamed(
+    const Utils::FilePath &originalFilePath, const Utils::FilePath &newFilePath, Id originalType)
+{
+    if (!originalType.isValid()) {
+        // check if the file is open in an editor, if not, nothing to do
+        const QList<IEditor *> editorsOpenForFile = DocumentModel::editorsForFilePath(newFilePath);
+        if (editorsOpenForFile.isEmpty())
+            return;
+        originalType = editorsOpenForFile.first()->document()->id();
+    }
+
+    // If the MIME type changed, it might make more sense to re-open the file
+    // in a different editor type. (Things like undo history are not transferred then though.)
+    // If the original editor was not the default editor, try to stay with that, though.
+    // E.g. if a .md file is open in the base text editor, and then renamed to .cpp,
+    // just stay with the base text editor, because that was not the default editor and is
+    // still a valid editor for the new MIME type.
+    const MimeType originalMt = Utils::mimeTypeForFile(originalFilePath);
+    const MimeType newMt = Utils::mimeTypeForFile(newFilePath);
+    if (newMt != originalMt) {
+        const EditorFactories originalFactories = Utils::filtered(
+            IEditorFactory::preferredEditorTypes(originalFilePath),
+            &IEditorFactory::isInternalEditor);
+        const bool originalIsDefault = originalFactories.isEmpty()
+                                           ? true
+                                           : originalFactories.first()->id() == originalType;
+
+        const EditorFactories newFactories = Utils::filtered(
+            IEditorFactory::preferredEditorTypes(newFilePath), &IEditorFactory::isInternalEditor);
+        const Id newDefault = newFactories.isEmpty() ? Id() : newFactories.first()->id();
+        const bool defaultIsDifferent = newDefault != originalType;
+        const auto newContainsOriginal = [originalType, newFactories] {
+            return Utils::contains(newFactories, [originalType](IEditorFactory *f) {
+                return f->id() == originalType;
+            });
+        };
+
+        if ((originalIsDefault && defaultIsDifferent)
+            || (!originalIsDefault && !newContainsOriginal())) {
+            QMetaObject::invokeMethod(m_instance, [newFilePath] {
+                EditorManagerPrivate::openEditorWith(newFilePath, {});
+            });
+        }
+    }
+}
+
 void EditorManagerPrivate::updateMakeWritableWarning()
 {
     IDocument *document = EditorManager::currentDocument();
@@ -2060,6 +2148,7 @@ void EditorManagerPrivate::gotoNextDocHistory()
         dialog->selectNextEditor();
     } else {
         EditorView *view = currentEditorView();
+        QTC_ASSERT(view, return);
         dialog->setEditors(d->m_globalHistory, view);
         dialog->selectNextEditor();
         showPopupOrSelectDocument();
@@ -2073,6 +2162,7 @@ void EditorManagerPrivate::gotoPreviousDocHistory()
         dialog->selectPreviousEditor();
     } else {
         EditorView *view = currentEditorView();
+        QTC_ASSERT(view, return);
         dialog->setEditors(d->m_globalHistory, view);
         dialog->selectPreviousEditor();
         showPopupOrSelectDocument();
@@ -2081,14 +2171,15 @@ void EditorManagerPrivate::gotoPreviousDocHistory()
 
 void EditorManagerPrivate::gotoLastEditLocation()
 {
-    currentEditorView()->goToEditLocation(d->m_globalLastEditLocation);
+    EditorView *view = currentEditorView();
+    QTC_ASSERT(view, return);
+    view->goToEditLocation(d->m_globalLastEditLocation);
 }
 
 void EditorManagerPrivate::gotoNextSplit()
 {
     EditorView *view = currentEditorView();
-    if (!view)
-        return;
+    QTC_ASSERT(view, return);
     EditorView *nextView = view->findNextView();
     if (!nextView) {
         // we are in the "last" view in this editor area
@@ -2110,8 +2201,7 @@ void EditorManagerPrivate::gotoNextSplit()
 void EditorManagerPrivate::gotoPreviousSplit()
 {
     EditorView *view = currentEditorView();
-    if (!view)
-        return;
+    QTC_ASSERT(view, return);
     EditorView *prevView = view->findPreviousView();
     if (!prevView) {
         // we are in the "first" view in this editor area
@@ -2190,7 +2280,7 @@ void EditorManagerPrivate::editorAreaDestroyed(QObject *area)
         }
     }
     // check if the destroyed editor area had the current view or current editor
-    if (d->m_currentEditor || (d->m_currentView && d->m_currentView->parentSplitterOrView() != area))
+    if (currentEditorView())
         return;
     // we need to set a new current editor or view
     if (!newActiveArea) {
@@ -2379,8 +2469,9 @@ bool EditorManagerPrivate::saveDocumentAs(IDocument *document)
     if (!document)
         return false;
 
-    const FilePath absoluteFilePath = DocumentManager::getSaveAsFileName(document);
+    const FilePath originalFilePath = document->filePath();
 
+    const FilePath absoluteFilePath = DocumentManager::getSaveAsFileName(document);
     if (absoluteFilePath.isEmpty())
         return false;
 
@@ -2396,12 +2487,6 @@ bool EditorManagerPrivate::saveDocumentAs(IDocument *document)
     const bool success = DocumentManager::saveDocument(document, absoluteFilePath);
     document->checkPermissions();
 
-    // TODO: There is an issue to be treated here. The new file might be of a different mime
-    // type than the original and thus require a different editor. An alternative strategy
-    // would be to close the current editor and open a new appropriate one, but this is not
-    // a good way out either (also the undo stack would be lost). Perhaps the best is to
-    // re-think part of the editors design.
-
     if (success) {
         // if document had been temporary before (scratch buffer) - remove the temporary flag
         document->setTemporary(false);
@@ -2411,6 +2496,8 @@ bool EditorManagerPrivate::saveDocumentAs(IDocument *document)
     }
 
     updateActions();
+
+    handleFileRenamed(originalFilePath, document->filePath(), document->id());
     return success;
 }
 
@@ -2556,24 +2643,8 @@ void EditorManagerPrivate::setCurrentEditorFromContextChange()
 
 EditorView *EditorManagerPrivate::currentEditorView()
 {
-    EditorView *view = d->m_currentView;
-    if (!view) {
-        if (d->m_currentEditor) {
-            view = EditorManagerPrivate::viewForEditor(d->m_currentEditor);
-            QTC_ASSERT(view, view = d->m_editorAreas.first()->findFirstView());
-        }
-        QTC_CHECK(view);
-        if (!view) { // should not happen, we should always have either currentview or currentdocument
-            for (const EditorArea *area : std::as_const(d->m_editorAreas)) {
-                if (area->window()->isActiveWindow()) {
-                    view = area->findFirstView();
-                    break;
-                }
-            }
-            QTC_ASSERT(view, view = d->m_editorAreas.first()->findFirstView());
-        }
-    }
-    return view;
+    QTC_ASSERT(d->m_currentView.size() > 0, return nullptr);
+    return d->m_currentView.constFirst();
 }
 
 QList<EditorView *> EditorManagerPrivate::allEditorViews()
@@ -3345,7 +3416,9 @@ bool EditorManager::closeDocuments(const QList<IDocument *> &documents, bool ask
 */
 void EditorManager::addCurrentPositionToNavigationHistory(const QByteArray &saveState)
 {
-    EditorManagerPrivate::currentEditorView()->addCurrentPositionToNavigationHistory(saveState);
+    EditorView *view = EditorManagerPrivate::currentEditorView();
+    QTC_ASSERT(view, return);
+    view->addCurrentPositionToNavigationHistory(saveState);
     EditorManagerPrivate::updateActions();
 }
 
@@ -3378,7 +3451,9 @@ void EditorManager::setLastEditLocation(const IEditor* editor)
 */
 void EditorManager::cutForwardNavigationHistory()
 {
-    EditorManagerPrivate::currentEditorView()->cutForwardNavigationHistory();
+    EditorView *view = EditorManagerPrivate::currentEditorView();
+    QTC_ASSERT(view, return);
+    view->cutForwardNavigationHistory();
     EditorManagerPrivate::updateActions();
 }
 
@@ -3390,9 +3465,10 @@ void EditorManager::cutForwardNavigationHistory()
 */
 void EditorManager::goBackInNavigationHistory()
 {
-    EditorManagerPrivate::currentEditorView()->goBackInNavigationHistory();
+    EditorView *view = EditorManagerPrivate::currentEditorView();
+    QTC_ASSERT(view, return);
+    view->goBackInNavigationHistory();
     EditorManagerPrivate::updateActions();
-    return;
 }
 
 /*!
@@ -3403,7 +3479,9 @@ void EditorManager::goBackInNavigationHistory()
 */
 void EditorManager::goForwardInNavigationHistory()
 {
-    EditorManagerPrivate::currentEditorView()->goForwardInNavigationHistory();
+    EditorView *view = EditorManagerPrivate::currentEditorView();
+    QTC_ASSERT(view, return);
+    view->goForwardInNavigationHistory();
     EditorManagerPrivate::updateActions();
 }
 
@@ -3573,9 +3651,9 @@ void EditorManager::showEditorStatusBar(const QString &id,
                                         QObject *object,
                                         const std::function<void()> &function)
 {
-
-    EditorManagerPrivate::currentEditorView()->showEditorStatusBar(
-                id, infoText, buttonText, object, function);
+    EditorView *view = EditorManagerPrivate::currentEditorView();
+    QTC_ASSERT(view, return);
+    view->showEditorStatusBar(id, infoText, buttonText, object, function);
 }
 
 /*!
@@ -3584,6 +3662,8 @@ void EditorManager::showEditorStatusBar(const QString &id,
 void EditorManager::hideEditorStatusBar(const QString &id)
 {
     // TODO: what if the current editor view betwenn show and hideEditorStatusBar changed?
+    EditorView *view = EditorManagerPrivate::currentEditorView();
+    QTC_ASSERT(view, return);
     EditorManagerPrivate::currentEditorView()->hideEditorStatusBar(id);
 }
 
@@ -3637,8 +3717,7 @@ void EditorManager::splitSideBySide()
 void EditorManager::gotoOtherSplit()
 {
     EditorView *view = EditorManagerPrivate::currentEditorView();
-    if (!view)
-        return;
+    QTC_ASSERT(view, return);
     EditorView *nextView = view->findNextView();
     if (!nextView) {
         // we are in the "last" view in this editor area
diff --git a/src/plugins/coreplugin/editormanager/editormanager_p.h b/src/plugins/coreplugin/editormanager/editormanager_p.h
index dba3903583..789acd16e1 100644
--- a/src/plugins/coreplugin/editormanager/editormanager_p.h
+++ b/src/plugins/coreplugin/editormanager/editormanager_p.h
@@ -100,6 +100,7 @@ public:
                                            Qt::CaseSensitivity sensitivity);
 
     static EditorWindow *createEditorWindow();
+    static void addEditorArea(EditorArea *area);
     static void splitNewWindow(Internal::EditorView *view);
     static void closeView(Internal::EditorView *view);
     static const QList<IEditor *> emptyView(Internal::EditorView *view);
@@ -117,6 +118,11 @@ public:
 
     static void updateAutoSave();
 
+    static void handleFileRenamed(
+        const Utils::FilePath &originalFilePath,
+        const Utils::FilePath &newFilePath,
+        Utils::Id originalType = {});
+
 public slots:
     static bool saveDocument(Core::IDocument *document);
     static bool saveDocumentAs(Core::IDocument *document);
@@ -192,7 +198,7 @@ private:
     QList<EditorArea *> m_editorAreas;
     QPointer<IEditor> m_currentEditor;
     QPointer<IEditor> m_scheduledCurrentEditor;
-    QPointer<EditorView> m_currentView;
+    QList<QPointer<EditorView>> m_currentView;
     QTimer *m_autoSaveTimer = nullptr;
 
     // actions
diff --git a/src/plugins/coreplugin/fancytabwidget.cpp b/src/plugins/coreplugin/fancytabwidget.cpp
index 39b0eaccb7..05fb7e3e13 100644
--- a/src/plugins/coreplugin/fancytabwidget.cpp
+++ b/src/plugins/coreplugin/fancytabwidget.cpp
@@ -196,10 +196,7 @@ void FancyTabBar::mousePressEvent(QMouseEvent *event)
                         emit currentAboutToChange(index);
                         m_currentIndex = index;
                         update();
-                        // update tab bar before showing widget
-                        QMetaObject::invokeMethod(this, [this] {
-                            emit currentChanged(m_currentIndex);
-                        }, Qt::QueuedConnection);
+                        emit currentChanged(m_currentIndex);
                     }
                 }
             }
diff --git a/src/plugins/coreplugin/fileutils.cpp b/src/plugins/coreplugin/fileutils.cpp
index 5712c9c8b5..f7c7d4a759 100644
--- a/src/plugins/coreplugin/fileutils.cpp
+++ b/src/plugins/coreplugin/fileutils.cpp
@@ -32,10 +32,28 @@
 #include <QTextStream>
 #include <QTextCodec>
 
+#ifdef Q_OS_WIN
+#ifdef QTCREATOR_PCH_H
+#define CALLBACK WINAPI
+#endif
+#include <qt_windows.h>
+#include <shlobj.h>
+#endif
+
 using namespace Utils;
 
 namespace Core {
 
+static FilePath windowsDirectory()
+{
+#ifdef Q_OS_WIN
+    wchar_t str[UNICODE_STRING_MAX_CHARS] = {};
+    if (SUCCEEDED(SHGetFolderPath(nullptr, CSIDL_WINDOWS, nullptr, 0, str)))
+        return FilePath::fromUserInput(QString::fromUtf16(reinterpret_cast<char16_t *>(str)));
+#endif
+    return {};
+}
+
 // Show error with option to open settings.
 static void showGraphicalShellError(QWidget *parent, const QString &app, const QString &error)
 {
@@ -56,13 +74,7 @@ void FileUtils::showInGraphicalShell(QWidget *parent, const FilePath &pathIn)
     const QFileInfo fileInfo = pathIn.toFileInfo();
     // Mac, Windows support folder or file.
     if (HostOsInfo::isWindowsHost()) {
-        const FilePath explorer = FilePath("explorer.exe").searchInPath();
-        if (explorer.isEmpty()) {
-            QMessageBox::warning(parent,
-                                 Tr::tr("Launching Windows Explorer Failed"),
-                                 Tr::tr("Could not find explorer.exe in path to launch Windows Explorer."));
-            return;
-        }
+        const FilePath explorer = windowsDirectory().pathAppended("explorer.exe");
         QStringList param;
         if (!pathIn.isDir())
             param += QLatin1String("/select,");
diff --git a/src/plugins/coreplugin/icore.cpp b/src/plugins/coreplugin/icore.cpp
index 1ed0987e5a..a625895b68 100644
--- a/src/plugins/coreplugin/icore.cpp
+++ b/src/plugins/coreplugin/icore.cpp
@@ -314,7 +314,7 @@ public:
 
     QList<IContext *> m_activeContext;
 
-    std::unordered_map<QWidget *, IContext *> m_contextWidgets;
+    std::unordered_map<QWidget *, QList<IContext *>> m_contextWidgets;
 
     ShortcutSettings *m_shortcutSettings = nullptr;
     ToolSettings *m_toolSettings = nullptr;
@@ -836,16 +836,18 @@ QString ICore::versionString()
 }
 
 /*!
-    Returns the top level IContext of the current context, or \c nullptr if
+    Returns a list IContexts for the current top level context widget, or an empty list if
     there is none.
 
     \sa updateAdditionalContexts()
     \sa addContextObject()
     \sa {The Action Manager and Commands}
 */
-IContext *ICore::currentContextObject()
+QList<IContext *> ICore::currentContextObjects()
 {
-    return d->m_activeContext.isEmpty() ? nullptr : d->m_activeContext.first();
+    if (d->m_activeContext.isEmpty())
+        return {};
+    return d->m_contextWidgets[d->m_activeContext.first()->widget()];
 }
 
 /*!
@@ -856,8 +858,7 @@ IContext *ICore::currentContextObject()
 */
 QWidget *ICore::currentContextWidget()
 {
-    IContext *context = currentContextObject();
-    return context ? context->widget() : nullptr;
+    return d->m_activeContext.isEmpty() ? nullptr : d->m_activeContext.first()->widget();
 }
 
 /*!
@@ -1035,12 +1036,57 @@ void ICore::addPreCloseListener(const std::function<bool ()> &listener)
     d->m_preCloseListeners.append(listener);
 }
 
+QString uiConfigInformation()
+{
+    QString info("UI configuration:\n\n");
+    info.append(QString("Color: %1\n").arg(StyleHelper::requestedBaseColor().name()));
+    info.append(QString("Theme: %1 \"%2\"\n").arg(creatorTheme()->id())
+                           .arg(creatorTheme()->displayName()));
+    const QString toolbarStyle =
+        StyleHelper::toolbarStyle() == StyleHelper::ToolbarStyleCompact ? "Compact" : "Relaxed";
+    info.append(QString("Toolbar style: Utils::StyleHelper::ToolbarStyle%1\n").arg(toolbarStyle));
+    const QString policy =
+        QVariant::fromValue(QApplication::highDpiScaleFactorRoundingPolicy()).toString();
+    QString userInterfaceLanguage = ICore::userInterfaceLanguage();
+    if (userInterfaceLanguage.isEmpty())
+        userInterfaceLanguage = QLocale::system().name() + " (System Language)";
+    info.append(QString("Language: %1\n").arg(userInterfaceLanguage));
+    info.append(QString("Device pixel ratio: %1, Qt::HighDpiScaleFactorRoundingPolicy::%2\n")
+                    .arg(qApp->devicePixelRatio()).arg(policy));
+    info.append(QString("Font DPI: %1\n").arg(qApp->fontMetrics().fontDpi()));
+
+    info.append(QString("Utils::StyleHelper::UiElement:\n"));
+#define QTC_ADD_UIELEMENT_FONT(uiElement) (                                              \
+        info.append(QString("  %1: %2\n").arg(#uiElement)                                \
+                .arg(StyleHelper::uiFont(StyleHelper::UiElement##uiElement).toString())) \
+    );
+    QTC_ADD_UIELEMENT_FONT(H1);
+    QTC_ADD_UIELEMENT_FONT(H2);
+    QTC_ADD_UIELEMENT_FONT(H3);
+    QTC_ADD_UIELEMENT_FONT(H4);
+    QTC_ADD_UIELEMENT_FONT(H5);
+    QTC_ADD_UIELEMENT_FONT(H6);
+    QTC_ADD_UIELEMENT_FONT(H6Capital);
+    QTC_ADD_UIELEMENT_FONT(Body1);
+    QTC_ADD_UIELEMENT_FONT(Body2);
+    QTC_ADD_UIELEMENT_FONT(ButtonMedium);
+    QTC_ADD_UIELEMENT_FONT(ButtonSmall);
+    QTC_ADD_UIELEMENT_FONT(CaptionStrong);
+    QTC_ADD_UIELEMENT_FONT(Caption);
+    QTC_ADD_UIELEMENT_FONT(IconStandard);
+    QTC_ADD_UIELEMENT_FONT(IconActive);
+#undef QTC_ADD_UIELEMENT_FONT
+
+    return info;
+}
+
 /*!
     \internal
 */
 QString ICore::systemInformation()
 {
-    return PluginManager::systemInformation() + '\n' + aboutInformationCompact() + '\n';
+    return PluginManager::systemInformation() + '\n' + uiConfigInformation() + '\n'
+           + aboutInformationCompact() + '\n';
 }
 
 static const QString &screenShotsPath()
@@ -1480,8 +1526,10 @@ void ICore::extensionsInitialized()
 void ICore::aboutToShutdown()
 {
     disconnect(qApp, &QApplication::focusChanged, d, &ICorePrivate::updateFocusWidget);
-    for (auto contextPair : d->m_contextWidgets)
-        disconnect(contextPair.second, &QObject::destroyed, d->m_mainwindow, nullptr);
+    for (auto contextsPair : d->m_contextWidgets) {
+        for (auto context : contextsPair.second)
+            disconnect(context, &QObject::destroyed, d->m_mainwindow, nullptr);
+    }
     d->m_activeContext.clear();
     d->m_mainwindow->hide();
 }
@@ -2236,13 +2284,14 @@ void ICore::openFileWith()
 }
 
 /*!
-    Returns the registered IContext instance for the specified \a widget,
+    Returns all registered IContext instance for the specified \a widget,
     if any.
 */
-IContext *ICore::contextObject(QWidget *widget)
+QList<IContext *> ICore::contextObjects(QWidget *widget)
 {
-    const auto it = d->m_contextWidgets.find(widget);
-    return it == d->m_contextWidgets.end() ? nullptr : it->second;
+    if (auto it = d->m_contextWidgets.find(widget); it != d->m_contextWidgets.end())
+        return it->second;
+    return {};
 }
 
 /*!
@@ -2261,11 +2310,7 @@ void ICore::addContextObject(IContext *context)
 {
     if (!context)
         return;
-    QWidget *widget = context->widget();
-    if (d->m_contextWidgets.find(widget) != d->m_contextWidgets.end())
-        return;
-
-    d->m_contextWidgets.insert({widget, context});
+    d->m_contextWidgets[context->widget()].append(context);
     connect(context, &QObject::destroyed, m_core, [context] { removeContextObject(context); });
 }
 
@@ -2286,15 +2331,19 @@ void ICore::removeContextObject(IContext *context)
 
     disconnect(context, &QObject::destroyed, m_core, nullptr);
 
-    const auto it = std::find_if(d->m_contextWidgets.cbegin(),
-                                 d->m_contextWidgets.cend(),
-                                 [context](const std::pair<QWidget *, IContext *> &v) {
-                                     return v.second == context;
-                                 });
-    if (it == d->m_contextWidgets.cend())
+    auto it = std::find_if(
+        d->m_contextWidgets.begin(),
+        d->m_contextWidgets.end(),
+        [context](const std::pair<QWidget *, QList<IContext *>> &v) {
+            return v.second.contains(context);
+        });
+    if (it == d->m_contextWidgets.end())
         return;
 
-    d->m_contextWidgets.erase(it);
+    it->second.removeAll(context);
+    if (it->second.isEmpty())
+        d->m_contextWidgets.erase(it);
+
     if (d->m_activeContext.removeAll(context) > 0)
         d->updateContextObject(d->m_activeContext);
 }
@@ -2310,15 +2359,8 @@ void ICorePrivate::updateFocusWidget(QWidget *old, QWidget *now)
         return;
 
     QList<IContext *> newContext;
-    if (QWidget *p = QApplication::focusWidget()) {
-        IContext *context = nullptr;
-        while (p) {
-            context = ICore::contextObject(p);
-            if (context)
-                newContext.append(context);
-            p = p->parentWidget();
-        }
-    }
+    for (QWidget *p = QApplication::focusWidget(); p; p = p->parentWidget())
+        newContext.append(ICore::contextObjects(p));
 
     // ignore toplevels that define no context, like popups without parent
     if (!newContext.isEmpty() || QApplication::focusWidget() == m_mainwindow->focusWidget())
@@ -2533,6 +2575,7 @@ void ICorePrivate::changeLog()
     });
 
     auto versionCombo = new QComboBox;
+    versionCombo->setMinimumWidth(80);
     for (const VersionFilePair &f : versionedFiles)
         versionCombo->addItem(f.first.toString());
     dialog = new LogDialog(ICore::dialogParent());
diff --git a/src/plugins/coreplugin/icore.h b/src/plugins/coreplugin/icore.h
index 8c713e156f..2c2dbc3c57 100644
--- a/src/plugins/coreplugin/icore.h
+++ b/src/plugins/coreplugin/icore.h
@@ -87,9 +87,9 @@ public:
     static void raiseWindow(QWidget *widget);
     static void raiseMainWindow();
 
-    static IContext *currentContextObject();
+    static QList<IContext *> currentContextObjects();
     static QWidget *currentContextWidget();
-    static IContext *contextObject(QWidget *widget);
+    static QList<IContext *> contextObjects(QWidget *widget);
     static void updateAdditionalContexts(const Context &remove, const Context &add,
                                          ContextPriority priority = ContextPriority::Low);
     static void addAdditionalContext(const Context &context,
diff --git a/src/plugins/coreplugin/iwizardfactory.cpp b/src/plugins/coreplugin/iwizardfactory.cpp
index 09e551b215..dc7a6da3e5 100644
--- a/src/plugins/coreplugin/iwizardfactory.cpp
+++ b/src/plugins/coreplugin/iwizardfactory.cpp
@@ -127,6 +127,7 @@ QAction *s_inspectWizardAction = nullptr;
 bool s_areFactoriesLoaded = false;
 bool s_isWizardRunning = false;
 QWidget *s_currentWizard = nullptr;
+static QSet<Id> s_plugins;
 
 // NewItemDialog reopening data:
 class NewItemDialogData
@@ -385,8 +386,7 @@ void IWizardFactory::destroyFeatureProvider()
 
 void IWizardFactory::clearWizardFactories()
 {
-    if (!s_areFactoriesLoaded)
-        return;
+    s_plugins.clear();
 
     for (IWizardFactory *factory : std::as_const(s_allFactories))
         ActionManager::unregisterAction(factory->m_action, actionId(factory));
@@ -399,16 +399,15 @@ void IWizardFactory::clearWizardFactories()
 
 QSet<Id> IWizardFactory::pluginFeatures()
 {
-    static QSet<Id> plugins;
-    if (plugins.isEmpty()) {
+    if (s_plugins.isEmpty()) {
         // Implicitly create a feature for each plugin loaded:
         const QVector<ExtensionSystem::PluginSpec *> pluginVector = ExtensionSystem::PluginManager::plugins();
         for (const ExtensionSystem::PluginSpec *s : pluginVector) {
             if (s->state() == ExtensionSystem::PluginSpec::Running)
-                plugins.insert(Id::fromString(s->name()));
+                s_plugins.insert(Id::fromString(s->name()));
         }
     }
-    return plugins;
+    return s_plugins;
 }
 
 QSet<Id> IWizardFactory::availableFeatures(Id platformId)
diff --git a/src/plugins/coreplugin/locator/directoryfilter.cpp b/src/plugins/coreplugin/locator/directoryfilter.cpp
index 8d0c3c85fd..871e89753e 100644
--- a/src/plugins/coreplugin/locator/directoryfilter.cpp
+++ b/src/plugins/coreplugin/locator/directoryfilter.cpp
@@ -41,7 +41,7 @@ const char kFilesKey[] = "files";
 const char kExclusionFiltersKey[] = "exclusionFilters";
 
 const QStringList kFiltersDefault = {"*.h", "*.cpp", "*.ui", "*.qrc"};
-const QStringList kExclusionFiltersDefault = {"*/.git/*", "*/.cvs/*", "*/.svn/*"};
+const QStringList kExclusionFiltersDefault = {"*/.git/*", "*/.cvs/*", "*/.svn/*", "*/build/*"};
 
 static QString defaultDisplayName()
 {
diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp
index 20df27bea5..c4cba4845b 100644
--- a/src/plugins/coreplugin/manhattanstyle.cpp
+++ b/src/plugins/coreplugin/manhattanstyle.cpp
@@ -22,6 +22,7 @@
 #include <QFormLayout>
 #include <QGroupBox>
 #include <QLabel>
+#include <QLibraryInfo>
 #include <QLineEdit>
 #include <QMenuBar>
 #include <QPainter>
@@ -480,21 +481,36 @@ static void drawPrimitiveTweakedForDarkTheme(QStyle::PrimitiveElement element,
         break;
     }
     case QStyle::PE_FrameGroupBox: {
-        // Snippet from QFusionStyle::drawPrimitive - BEGIN
-        static const int groupBoxTopMargin =  3;
+        QRect groupBoxFrame = option->rect;
         int topMargin = 0;
-        auto control = dynamic_cast<const QGroupBox *>(widget);
-        if (control && !control->isCheckable() && control->title().isEmpty()) {
-            // Shrinking the topMargin if Not checkable AND title is empty
-            topMargin = groupBoxTopMargin;
-        } else {
-            const int exclusiveIndicatorHeight = widget ? widget->style()->pixelMetric(QStyle::PM_ExclusiveIndicatorHeight) : 0;
-            topMargin = qMax(exclusiveIndicatorHeight,
-                             option->fontMetrics.height()) + groupBoxTopMargin;
+        if (widget) {
+            // Before Qt 6.6.3, QStyle::subControlRect() returned wrong QRect for SC_GroupBoxFrame
+            static const bool validSCRect = QLibraryInfo::version() >= QVersionNumber(6, 6, 3);
+            if (validSCRect) {
+                QStyleOptionGroupBox opt;
+                opt.initFrom(widget);
+                const QStyle *style = widget->style();
+                groupBoxFrame = style->subControlRect(QStyle::CC_GroupBox, &opt,
+                                                      QStyle::SC_GroupBoxFrame, widget);
+                topMargin = 1; // Tweak to resemble the pre-6.6.3 frame
+            } else {
+                // Snippet from pre-6.6.3 FusionStyle::drawPrimitive - BEGIN
+                static const int groupBoxTopMargin =  3;
+                auto control = dynamic_cast<const QGroupBox *>(widget);
+                if (!control->isCheckable() && control->title().isEmpty()) {
+                    // Shrinking the topMargin if Not checkable AND title is empty
+                    topMargin = groupBoxTopMargin;
+                } else {
+                    const int exclusiveIndicatorHeight =
+                        widget->style()->pixelMetric(QStyle::PM_ExclusiveIndicatorHeight);
+                    topMargin = qMax(exclusiveIndicatorHeight,
+                                     option->fontMetrics.height()) + groupBoxTopMargin;
+                }
+                // Snippet from pre-6.6.3 QFusionStyle::drawPrimitive - END
+            }
         }
-        // Snippet from QFusionStyle::drawPrimitive - END
 
-        const QRectF frameRectF = QRectF(option->rect).adjusted(0.5, topMargin + 0.5, -0.5, -0.5);
+        const QRectF frameRectF = QRectF(groupBoxFrame).adjusted(0.5, topMargin + 0.5, -0.5, -0.5);
         painter->setPen(framePen);
         if (isEnabled)
             painter->setOpacity(0.5);
diff --git a/src/plugins/coreplugin/outputwindow.cpp b/src/plugins/coreplugin/outputwindow.cpp
index dbbcdde585..d5fe920560 100644
--- a/src/plugins/coreplugin/outputwindow.cpp
+++ b/src/plugins/coreplugin/outputwindow.cpp
@@ -398,16 +398,12 @@ void OutputWindow::filterNewContent()
             lastBlock.setVisible(d->filterText.isEmpty()
                                  || regExp.match(lastBlock.text()).hasMatch() != invert);
     } else {
-        if (d->filterMode.testFlag(OutputWindow::FilterModeFlag::CaseSensitive)) {
-            for (; lastBlock != document()->end(); lastBlock = lastBlock.next())
-                lastBlock.setVisible(d->filterText.isEmpty()
-                                     || lastBlock.text().contains(d->filterText) != invert);
-        } else {
-            for (; lastBlock != document()->end(); lastBlock = lastBlock.next()) {
-                lastBlock.setVisible(d->filterText.isEmpty() || lastBlock.text().toLower()
-                                     .contains(d->filterText.toLower()) != invert);
-            }
-        }
+        const auto cs = d->filterMode.testFlag(OutputWindow::FilterModeFlag::CaseSensitive)
+                            ? Qt::CaseSensitive : Qt::CaseInsensitive;
+
+        for (; lastBlock != document()->end(); lastBlock = lastBlock.next())
+            lastBlock.setVisible(d->filterText.isEmpty()
+                                 || lastBlock.text().contains(d->filterText, cs) != invert);
     }
 
     d->lastFilteredBlockNumber = document()->lastBlock().blockNumber();
diff --git a/src/plugins/coreplugin/plugininstallwizard.cpp b/src/plugins/coreplugin/plugininstallwizard.cpp
index df47cfb070..4d4ba69de9 100644
--- a/src/plugins/coreplugin/plugininstallwizard.cpp
+++ b/src/plugins/coreplugin/plugininstallwizard.cpp
@@ -154,7 +154,7 @@ void checkContents(QPromise<ArchiveIssue> &promise, const FilePath &tempDir)
         if (promise.isCanceled())
             return;
         it.next();
-        expected_str<PluginSpec *> spec = PluginSpecImpl::read(it.filePath());
+        expected_str<PluginSpec *> spec = readCppPluginSpec(FilePath::fromUserInput(it.filePath()));
         if (spec) {
             // Is a Qt Creator plugin. Let's see if we find a Core dependency and check the
             // version
diff --git a/src/plugins/coreplugin/statusbarmanager.cpp b/src/plugins/coreplugin/statusbarmanager.cpp
index c590b3f29e..e85996b053 100644
--- a/src/plugins/coreplugin/statusbarmanager.cpp
+++ b/src/plugins/coreplugin/statusbarmanager.cpp
@@ -156,13 +156,9 @@ StatusBarContext::StatusBarContext(QObject *parent)
 
 Context StatusBarContext::context() const
 {
-    IMode *currentMode = ModeManager::currentMode();
-    QWidget *modeWidget = currentMode ? currentMode->widget() : nullptr;
-    if (modeWidget) {
-        if (IContext *context = ICore::contextObject(modeWidget))
-            return context->context();
-    }
-    return Context();
+    if (IMode *currentMode = ModeManager::currentMode())
+        return currentMode->context();
+    return {};
 }
 
 } // Core
diff --git a/src/plugins/coreplugin/welcomepagehelper.cpp b/src/plugins/coreplugin/welcomepagehelper.cpp
index fe01944a6f..c2b28c1f83 100644
--- a/src/plugins/coreplugin/welcomepagehelper.cpp
+++ b/src/plugins/coreplugin/welcomepagehelper.cpp
@@ -287,7 +287,7 @@ static const QPixmap &searchBoxIcon()
 }
 
 SearchBox::SearchBox(QWidget *parent)
-    : QLineEdit(parent)
+    : Utils::FancyLineEdit(parent)
 {
     setAttribute(Qt::WA_MacShowFocusRect, false);
     setAutoFillBackground(false);
@@ -301,10 +301,9 @@ SearchBox::SearchBox(QWidget *parent)
     pal.setColor(QPalette::Text, searchBoxTextTF.color());
     setPalette(pal);
 
-    const QSize iconSize = searchBoxIcon().deviceIndependentSize().toSize();
-    setContentsMargins({HPaddingXs, ExPaddingGapM,
-                        HPaddingXs + iconSize.width() + HPaddingXs, ExPaddingGapM});
+    setContentsMargins({HPaddingXs, ExPaddingGapM, 0, ExPaddingGapM});
     setFixedHeight(ExPaddingGapM + searchBoxTextTF.lineHeight() + ExPaddingGapM);
+    setFiltering(true);
 }
 
 QSize SearchBox::minimumSizeHint() const
@@ -351,10 +350,12 @@ void SearchBox::paintEvent(QPaintEvent *event)
     QPainter p(this);
 
     paintCommonBackground(&p, rect(), this);
-    const QPixmap icon = searchBoxIcon();
-    const QSize iconS = icon.deviceIndependentSize().toSize();
-    const QPoint iconPos(width() - HPaddingXs - iconS.width(), (height() - iconS.height()) / 2);
-    p.drawPixmap(iconPos, icon);
+    if (text().isEmpty()) {
+        const QPixmap icon = searchBoxIcon();
+        const QSize iconS = icon.deviceIndependentSize().toSize();
+        const QPoint iconPos(width() - HPaddingXs - iconS.width(), (height() - iconS.height()) / 2);
+        p.drawPixmap(iconPos, icon);
+    }
 
     QLineEdit::paintEvent(event);
 }
diff --git a/src/plugins/coreplugin/welcomepagehelper.h b/src/plugins/coreplugin/welcomepagehelper.h
index cce3b81252..c32e803029 100644
--- a/src/plugins/coreplugin/welcomepagehelper.h
+++ b/src/plugins/coreplugin/welcomepagehelper.h
@@ -25,8 +25,6 @@
 #include <functional>
 #include <optional>
 
-namespace Utils { class FancyLineEdit; }
-
 namespace Core {
 
 namespace WelcomePageHelpers {
@@ -113,7 +111,7 @@ private:
     const Role m_role = Primary;
 };
 
-class CORE_EXPORT SearchBox : public QLineEdit
+class CORE_EXPORT SearchBox : public Utils::FancyLineEdit
 {
 public:
     explicit SearchBox(QWidget *parent = nullptr);
diff --git a/src/plugins/cppeditor/CMakeLists.txt b/src/plugins/cppeditor/CMakeLists.txt
index ec5ad89cea..3a137a4d64 100644
--- a/src/plugins/cppeditor/CMakeLists.txt
+++ b/src/plugins/cppeditor/CMakeLists.txt
@@ -23,7 +23,6 @@ add_qtc_plugin(CppEditor
     cppcodemodelinspectordialog.cpp cppcodemodelinspectordialog.h
     cppcodemodelinspectordumper.cpp cppcodemodelinspectordumper.h
     cppcodemodelsettings.cpp cppcodemodelsettings.h
-    cppcodemodelsettingspage.cpp cppcodemodelsettingspage.h
     cppcodestylepreferences.cpp cppcodestylepreferences.h
     cppcodestylepreferencesfactory.cpp cppcodestylepreferencesfactory.h
     cppcodestylesettings.cpp cppcodestylesettings.h
@@ -93,6 +92,7 @@ add_qtc_plugin(CppEditor
     cppvirtualfunctionassistprovider.cpp cppvirtualfunctionassistprovider.h
     cppvirtualfunctionproposalitem.cpp cppvirtualfunctionproposalitem.h
     cppworkingcopy.cpp cppworkingcopy.h
+    clangdsettings.cpp clangdsettings.h
     cursorineditor.h
     doxygengenerator.cpp doxygengenerator.h
     editordocumenthandle.cpp editordocumenthandle.h
diff --git a/src/plugins/cppeditor/baseeditordocumentprocessor.cpp b/src/plugins/cppeditor/baseeditordocumentprocessor.cpp
index 786999223e..e2c600681d 100644
--- a/src/plugins/cppeditor/baseeditordocumentprocessor.cpp
+++ b/src/plugins/cppeditor/baseeditordocumentprocessor.cpp
@@ -37,10 +37,10 @@ BaseEditorDocumentProcessor::~BaseEditorDocumentProcessor() = default;
 void BaseEditorDocumentProcessor::run(bool projectsUpdated)
 {
     if (projectsUpdated)
-        m_settings.setData(CppCodeModelSettings::settingsForFile(m_filePath).data());
+        m_settings = CppCodeModelSettings::settingsForFile(m_filePath);
 
     const Utils::Language languagePreference
-        = m_settings.interpretAmbigiousHeadersAsC() ? Utils::Language::C : Utils::Language::Cxx;
+        = m_settings.interpretAmbigiousHeadersAsC ? Utils::Language::C : Utils::Language::Cxx;
 
     runImpl({CppModelManager::workingCopy(),
              ProjectExplorer::ProjectManager::startupProject(),
diff --git a/src/plugins/cppeditor/builtineditordocumentprocessor.cpp b/src/plugins/cppeditor/builtineditordocumentprocessor.cpp
index 5f827c74ce..33f415fe6b 100644
--- a/src/plugins/cppeditor/builtineditordocumentprocessor.cpp
+++ b/src/plugins/cppeditor/builtineditordocumentprocessor.cpp
@@ -151,7 +151,7 @@ BuiltinEditorDocumentProcessor::BuiltinEditorDocumentProcessor(TextEditor::TextD
     using namespace Internal;
 
     BaseEditorDocumentParser::Configuration config = m_parser->configuration();
-    config.usePrecompiledHeaders = settings().pchUsage() != CppCodeModelSettings::PchUse_None;
+    config.usePrecompiledHeaders = settings().pchUsage != CppCodeModelSettings::PchUse_None;
     m_parser->setConfiguration(config);
 
     m_semanticHighlighter->setHighlightingRunner(
diff --git a/src/plugins/cppeditor/cppcodemodelsettingspage.cpp b/src/plugins/cppeditor/clangdsettings.cpp
index 616bb34f61..fe3bc84b23 100644
--- a/src/plugins/cppeditor/cppcodemodelsettingspage.cpp
+++ b/src/plugins/cppeditor/clangdsettings.cpp
@@ -1,11 +1,11 @@
-// Copyright (C) 2016 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#include "cppcodemodelsettingspage.h"
+#include "clangdsettings.h"
 
+#include "clangdiagnosticconfigsmodel.h"
 #include "clangdiagnosticconfigsselectionwidget.h"
 #include "clangdiagnosticconfigswidget.h"
-#include "cppcodemodelsettings.h"
 #include "cppeditorconstants.h"
 #include "cppeditortr.h"
 #include "cpptoolsreuse.h"
@@ -13,21 +13,16 @@
 #include <coreplugin/dialogs/ioptionspage.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/session.h>
-
+#include <projectexplorer/project.h>
 #include <projectexplorer/projectpanelfactory.h>
 #include <projectexplorer/projectsettingswidget.h>
-
-#include <utils/algorithm.h>
-#include <utils/fancylineedit.h>
-#include <utils/infolabel.h>
+#include <utils/clangutils.h>
 #include <utils/itemviews.h>
 #include <utils/layoutbuilder.h>
-#include <utils/pathchooser.h>
-#include <utils/qtcassert.h>
+#include <utils/qtcprocess.h>
 #include <utils/variablechooser.h>
 
 #include <QCheckBox>
-#include <QComboBox>
 #include <QDesktopServices>
 #include <QFormLayout>
 #include <QGroupBox>
@@ -35,9 +30,8 @@
 #include <QInputDialog>
 #include <QPushButton>
 #include <QSpinBox>
+#include <QStandardPaths>
 #include <QStringListModel>
-#include <QTextBlock>
-#include <QTextStream>
 #include <QTimer>
 #include <QVBoxLayout>
 #include <QVersionNumber>
@@ -45,191 +39,483 @@
 #include <limits>
 
 using namespace ProjectExplorer;
+using namespace Utils;
 
-namespace CppEditor::Internal {
+namespace CppEditor {
 
-class CppCodeModelSettingsWidget final : public Core::IOptionsPageWidget
+static FilePath g_defaultClangdFilePath;
+static FilePath fallbackClangdFilePath()
 {
-    Q_OBJECT
-public:
-    CppCodeModelSettingsWidget(const CppCodeModelSettings::Data &data);
+    if (g_defaultClangdFilePath.exists())
+        return g_defaultClangdFilePath;
+    return Environment::systemEnvironment().searchInPath("clangd");
+}
 
-    CppCodeModelSettings::Data data() const;
+static Id initialClangDiagnosticConfigId() { return Constants::CPP_CLANG_DIAG_CONFIG_BUILDSYSTEM; }
+
+static Key clangdSettingsKey() { return "ClangdSettings"; }
+static Key useClangdKey() { return "UseClangdV7"; }
+static Key clangdPathKey() { return "ClangdPath"; }
+static Key clangdIndexingKey() { return "ClangdIndexing"; }
+static Key clangdProjectIndexPathKey() { return "ClangdProjectIndexPath"; }
+static Key clangdSessionIndexPathKey() { return "ClangdSessionIndexPath"; }
+static Key clangdIndexingPriorityKey() { return "ClangdIndexingPriority"; }
+static Key clangdHeaderSourceSwitchModeKey() { return "ClangdHeaderSourceSwitchMode"; }
+static Key clangdCompletionRankingModelKey() { return "ClangdCompletionRankingModel"; }
+static Key clangdHeaderInsertionKey() { return "ClangdHeaderInsertion"; }
+static Key clangdThreadLimitKey() { return "ClangdThreadLimit"; }
+static Key clangdDocumentThresholdKey() { return "ClangdDocumentThreshold"; }
+static Key clangdSizeThresholdEnabledKey() { return "ClangdSizeThresholdEnabled"; }
+static Key clangdSizeThresholdKey() { return "ClangdSizeThreshold"; }
+static Key useGlobalSettingsKey() { return "useGlobalSettings"; }
+static Key clangdblockIndexingSettingsKey() { return "blockIndexing"; }
+static Key sessionsWithOneClangdKey() { return "SessionsWithOneClangd"; }
+static Key diagnosticConfigIdKey() { return "diagnosticConfigId"; }
+static Key checkedHardwareKey() { return "checkedHardware"; }
+static Key completionResultsKey() { return "completionResults"; }
+static Key updateDependentSourcesKey() { return "updateDependentSources"; }
+
+QString ClangdSettings::priorityToString(const IndexingPriority &priority)
+{
+    switch (priority) {
+    case IndexingPriority::Background: return "background";
+    case IndexingPriority::Normal: return "normal";
+    case IndexingPriority::Low: return "low";
+    case IndexingPriority::Off: return {};
+    }
+    return {};
+}
 
-signals:
-    void settingsDataChanged();
+QString ClangdSettings::priorityToDisplayString(const IndexingPriority &priority)
+{
+    switch (priority) {
+    case IndexingPriority::Background: return Tr::tr("Background Priority");
+    case IndexingPriority::Normal: return Tr::tr("Normal Priority");
+    case IndexingPriority::Low: return Tr::tr("Low Priority");
+    case IndexingPriority::Off: return Tr::tr("Off");
+    }
+    return {};
+}
 
-private:
-    void apply() final { CppCodeModelSettings::globalInstance().setGlobalData(data()); }
-
-    QCheckBox *m_interpretAmbiguousHeadersAsCHeaders;
-    QCheckBox *m_ignorePchCheckBox;
-    QCheckBox *m_useBuiltinPreprocessorCheckBox;
-    QCheckBox *m_skipIndexingBigFilesCheckBox;
-    QSpinBox *m_bigFilesLimitSpinBox;
-    QCheckBox *m_ignoreFilesCheckBox;
-    QPlainTextEdit *m_ignorePatternTextEdit;
-};
+QString ClangdSettings::headerSourceSwitchModeToDisplayString(HeaderSourceSwitchMode mode)
+{
+    switch (mode) {
+    case HeaderSourceSwitchMode::BuiltinOnly: return Tr::tr("Use Built-in Only");
+    case HeaderSourceSwitchMode::ClangdOnly: return Tr::tr("Use Clangd Only");
+    case HeaderSourceSwitchMode::Both: return Tr::tr("Try Both");
+    }
+    return {};
+}
 
-CppCodeModelSettingsWidget::CppCodeModelSettingsWidget(const CppCodeModelSettings::Data &data)
+QString ClangdSettings::rankingModelToCmdLineString(CompletionRankingModel model)
 {
-    m_interpretAmbiguousHeadersAsCHeaders
-        = new QCheckBox(Tr::tr("Interpret ambiguous headers as C headers"));
+    switch (model) {
+    case CompletionRankingModel::Default: break;
+    case CompletionRankingModel::DecisionForest: return "decision_forest";
+    case CompletionRankingModel::Heuristics: return "heuristics";
+    }
+    QTC_ASSERT(false, return {});
+}
 
-    m_skipIndexingBigFilesCheckBox = new QCheckBox(Tr::tr("Do not index files greater than"));
-    m_skipIndexingBigFilesCheckBox->setChecked(data.skipIndexingBigFiles);
+QString ClangdSettings::rankingModelToDisplayString(CompletionRankingModel model)
+{
+    switch (model) {
+    case CompletionRankingModel::Default: return Tr::tr("Default");
+    case CompletionRankingModel::DecisionForest: return Tr::tr("Decision Forest");
+    case CompletionRankingModel::Heuristics: return Tr::tr("Heuristics");
+    }
+    QTC_ASSERT(false, return {});
+}
 
-    m_bigFilesLimitSpinBox = new QSpinBox;
-    m_bigFilesLimitSpinBox->setSuffix(Tr::tr("MB"));
-    m_bigFilesLimitSpinBox->setRange(1, 500);
-    m_bigFilesLimitSpinBox->setValue(data.indexerFileSizeLimitInMb);
+QString ClangdSettings::defaultProjectIndexPathTemplate()
+{
+    return QDir::toNativeSeparators("%{BuildConfig:BuildDirectory:FilePath}/.qtc_clangd");
+}
 
-    m_ignoreFilesCheckBox = new QCheckBox(Tr::tr("Ignore files"));
-    m_ignoreFilesCheckBox->setToolTip(
-        "<html><head/><body><p>"
-        + Tr::tr("Ignore files that match these wildcard patterns, one wildcard per line.")
-        + "</p></body></html>");
+QString ClangdSettings::defaultSessionIndexPathTemplate()
+{
+    return QDir::toNativeSeparators("%{IDE:UserResourcePath}/.qtc_clangd/%{Session:FileBaseName}");
+}
 
-    m_ignoreFilesCheckBox->setChecked(data.ignoreFiles);
-    m_ignorePatternTextEdit = new QPlainTextEdit(data.ignorePattern);
-    m_ignorePatternTextEdit->setToolTip(m_ignoreFilesCheckBox->toolTip());
-    m_ignorePatternTextEdit->setEnabled(m_ignoreFilesCheckBox->isChecked());
+ClangdSettings &ClangdSettings::instance()
+{
+    static ClangdSettings settings;
+    return settings;
+}
 
-    connect(m_ignoreFilesCheckBox, &QCheckBox::stateChanged, this, [this] {
-       m_ignorePatternTextEdit->setEnabled(m_ignoreFilesCheckBox->isChecked());
+ClangdSettings::ClangdSettings()
+{
+    loadSettings();
+    const auto sessionMgr = Core::SessionManager::instance();
+    connect(sessionMgr, &Core::SessionManager::sessionRemoved, this, [this](const QString &name) {
+        m_data.sessionsWithOneClangd.removeOne(name);
     });
+    connect(sessionMgr,
+            &Core::SessionManager::sessionRenamed,
+            this,
+            [this](const QString &oldName, const QString &newName) {
+                const auto index = m_data.sessionsWithOneClangd.indexOf(oldName);
+                if (index != -1)
+                    m_data.sessionsWithOneClangd[index] = newName;
+            });
+}
 
-    m_ignorePchCheckBox = new QCheckBox(Tr::tr("Ignore precompiled headers"));
-    m_ignorePchCheckBox->setToolTip(Tr::tr(
-        "<html><head/><body><p>When precompiled headers are not ignored, the parsing for code "
-        "completion and semantic highlighting will process the precompiled header before "
-        "processing any file.</p></body></html>"));
-
-    m_useBuiltinPreprocessorCheckBox = new QCheckBox(Tr::tr("Use built-in preprocessor to show "
-                                                            "pre-processed files"));
-    m_useBuiltinPreprocessorCheckBox->setToolTip
-            (Tr::tr("Uncheck this to invoke the actual compiler "
-                    "to show a pre-processed source file in the editor."));
-
-    m_interpretAmbiguousHeadersAsCHeaders->setChecked(data.interpretAmbigiousHeadersAsC);
-    m_ignorePchCheckBox->setChecked(data.pchUsage == CppCodeModelSettings::PchUse_None);
-    m_useBuiltinPreprocessorCheckBox->setChecked(data.useBuiltinPreprocessor);
-
-    using namespace Layouting;
-
-    Column {
-        Group {
-            title(Tr::tr("General")),
-            Column {
-                m_interpretAmbiguousHeadersAsCHeaders,
-                m_ignorePchCheckBox,
-                m_useBuiltinPreprocessorCheckBox,
-                Row { m_skipIndexingBigFilesCheckBox, m_bigFilesLimitSpinBox, st },
-                Row { Column { m_ignoreFilesCheckBox, st }, m_ignorePatternTextEdit },
-            }
-        },
-        st
-    }.attachTo(this);
-
-    for (const QCheckBox *const b : {m_interpretAmbiguousHeadersAsCHeaders,
-                                     m_ignorePchCheckBox,
-                                     m_useBuiltinPreprocessorCheckBox,
-                                     m_skipIndexingBigFilesCheckBox,
-                                     m_ignoreFilesCheckBox}) {
-        connect(b, &QCheckBox::toggled, this, &CppCodeModelSettingsWidget::settingsDataChanged);
+bool ClangdSettings::useClangd() const
+{
+    return m_data.useClangd && clangdVersion(clangdFilePath()) >= minimumClangdVersion();
+}
+
+void ClangdSettings::setUseClangd(bool use) { instance().m_data.useClangd = use; }
+
+void ClangdSettings::setUseClangdAndSave(bool use)
+{
+    setUseClangd(use);
+    instance().saveSettings();
+}
+
+bool ClangdSettings::hardwareFulfillsRequirements()
+{
+    instance().m_data.haveCheckedHardwareReqirements = true;
+    instance().saveSettings();
+    const quint64 minRam = quint64(12) * 1024 * 1024 * 1024;
+    const std::optional<quint64> totalRam = Utils::HostOsInfo::totalMemoryInstalledInBytes();
+    return !totalRam || *totalRam >= minRam;
+}
+
+bool ClangdSettings::haveCheckedHardwareRequirements()
+{
+    return instance().data().haveCheckedHardwareReqirements;
+}
+
+void ClangdSettings::setDefaultClangdPath(const FilePath &filePath)
+{
+    g_defaultClangdFilePath = filePath;
+}
+
+void ClangdSettings::setCustomDiagnosticConfigs(const ClangDiagnosticConfigs &configs)
+{
+    if (instance().customDiagnosticConfigs() == configs)
+        return;
+    instance().m_data.customDiagnosticConfigs = configs;
+    instance().saveSettings();
+}
+
+FilePath ClangdSettings::clangdFilePath() const
+{
+    if (!m_data.executableFilePath.isEmpty())
+        return m_data.executableFilePath;
+    return fallbackClangdFilePath();
+}
+
+FilePath ClangdSettings::projectIndexPath(const Utils::MacroExpander &expander) const
+{
+    return FilePath::fromUserInput(expander.expand(m_data.projectIndexPathTemplate));
+}
+
+FilePath ClangdSettings::sessionIndexPath(const Utils::MacroExpander &expander) const
+{
+    return FilePath::fromUserInput(expander.expand(m_data.sessionIndexPathTemplate));
+}
+
+bool ClangdSettings::sizeIsOkay(const Utils::FilePath &fp) const
+{
+    return !sizeThresholdEnabled() || sizeThresholdInKb() * 1024 >= fp.fileSize();
+}
+
+ClangDiagnosticConfigs ClangdSettings::customDiagnosticConfigs() const
+{
+    return m_data.customDiagnosticConfigs;
+}
+
+Id ClangdSettings::diagnosticConfigId() const
+{
+    if (!diagnosticConfigsModel().hasConfigWithId(m_data.diagnosticConfigId))
+        return initialClangDiagnosticConfigId();
+    return m_data.diagnosticConfigId;
+}
+
+ClangDiagnosticConfig ClangdSettings::diagnosticConfig() const
+{
+    return diagnosticConfigsModel(customDiagnosticConfigs()).configWithId(diagnosticConfigId());
+}
+
+ClangdSettings::Granularity ClangdSettings::granularity() const
+{
+    if (m_data.sessionsWithOneClangd.contains(Core::SessionManager::activeSession()))
+        return Granularity::Session;
+    return Granularity::Project;
+}
+
+void ClangdSettings::setData(const Data &data, bool saveAndEmitSignal)
+{
+    if (this == &instance() && data != m_data) {
+        m_data = data;
+        if (saveAndEmitSignal) {
+            saveSettings();
+            emit changed();
+        }
     }
-    connect(m_bigFilesLimitSpinBox, &QSpinBox::valueChanged,
-            this, &CppCodeModelSettingsWidget::settingsDataChanged);
-
-    const auto timer = new QTimer(this);
-    timer->setSingleShot(true);
-    timer->setInterval(1000);
-    connect(timer, &QTimer::timeout, this, &CppCodeModelSettingsWidget::settingsDataChanged);
-    connect(m_ignorePatternTextEdit, &QPlainTextEdit::textChanged,
-            timer, qOverload<>(&QTimer::start));
-}
-
-CppCodeModelSettings::Data CppCodeModelSettingsWidget::data() const
-{
-    CppCodeModelSettings::Data data;
-    data.interpretAmbigiousHeadersAsC = m_interpretAmbiguousHeadersAsCHeaders->isChecked();
-    data.skipIndexingBigFiles = m_skipIndexingBigFilesCheckBox->isChecked();
-    data.useBuiltinPreprocessor = m_useBuiltinPreprocessorCheckBox->isChecked();
-    data.ignoreFiles = m_ignoreFilesCheckBox->isChecked();
-    data.ignorePattern = m_ignorePatternTextEdit->toPlainText();
-    data.indexerFileSizeLimitInMb = m_bigFilesLimitSpinBox->value();
-    data.pchUsage = m_ignorePchCheckBox->isChecked() ? CppCodeModelSettings::PchUse_None
-                                                     : CppCodeModelSettings::PchUse_BuildSystem;
-    return data;
 }
 
-class CppCodeModelSettingsPage final : public Core::IOptionsPage
+static FilePath getClangHeadersPathFromClang(const FilePath &clangdFilePath)
 {
-public:
-    CppCodeModelSettingsPage()
-    {
-        setId(Constants::CPP_CODE_MODEL_SETTINGS_ID);
-        setDisplayName(Tr::tr("Code Model"));
-        setCategory(Constants::CPP_SETTINGS_CATEGORY);
-        setDisplayCategory(Tr::tr("C++"));
-        setCategoryIconPath(":/projectexplorer/images/settingscategory_cpp.png");
-        setWidgetCreator(
-            [] { return new CppCodeModelSettingsWidget(CppCodeModelSettings::globalInstance().data()); });
+    const FilePath clangFilePath = clangdFilePath.absolutePath().pathAppended("clang")
+                                       .withExecutableSuffix();
+    if (!clangFilePath.exists())
+        return {};
+    Process clang;
+    clang.setCommand({clangFilePath, {"-print-resource-dir"}});
+    clang.start();
+    if (!clang.waitForFinished())
+        return {};
+    const FilePath resourceDir = FilePath::fromUserInput(QString::fromLocal8Bit(
+        clang.rawStdOut().trimmed()));
+    if (resourceDir.isEmpty() || !resourceDir.exists())
+        return {};
+    const FilePath includeDir = resourceDir.pathAppended("include");
+    if (!includeDir.exists())
+        return {};
+    return includeDir;
+}
+
+static FilePath getClangHeadersPath(const FilePath &clangdFilePath)
+{
+    const FilePath headersPath = getClangHeadersPathFromClang(clangdFilePath);
+    if (!headersPath.isEmpty())
+        return headersPath;
+
+    const QVersionNumber version = Utils::clangdVersion(clangdFilePath);
+    QTC_ASSERT(!version.isNull(), return {});
+    static const QStringList libDirs{"lib", "lib64"};
+    const QStringList versionStrings{QString::number(version.majorVersion()), version.toString()};
+    for (const QString &libDir : libDirs) {
+        for (const QString &versionString : versionStrings) {
+            const FilePath includePath = clangdFilePath.absolutePath().parentDir()
+                                             .pathAppended(libDir).pathAppended("clang")
+                                             .pathAppended(versionString).pathAppended("include");
+            if (includePath.exists())
+                return includePath;
+        }
     }
-};
+    QTC_CHECK(false);
+    return {};
+}
 
-void setupCppCodeModelSettingsPage()
+FilePath ClangdSettings::clangdIncludePath() const
 {
-    static CppCodeModelSettingsPage theCppCodeModelSettingsPage;
+    QTC_ASSERT(useClangd(), return {});
+    FilePath clangdPath = clangdFilePath();
+    QTC_ASSERT(!clangdPath.isEmpty() && clangdPath.exists(), return {});
+    static QHash<FilePath, FilePath> headersPathCache;
+    const auto it = headersPathCache.constFind(clangdPath);
+    if (it != headersPathCache.constEnd())
+        return *it;
+    const FilePath headersPath = getClangHeadersPath(clangdPath);
+    if (!headersPath.isEmpty())
+        headersPathCache.insert(clangdPath, headersPath);
+    return headersPath;
 }
 
-class CppCodeModelProjectSettingsWidget : public ProjectSettingsWidget
+FilePath ClangdSettings::clangdUserConfigFilePath()
 {
-public:
-    CppCodeModelProjectSettingsWidget(const CppCodeModelProjectSettings &settings)
-        : m_settings(settings), m_widget(settings.data())
-    {
-        setGlobalSettingsId(Constants::CPP_CODE_MODEL_SETTINGS_ID);
-        const auto layout = new QVBoxLayout(this);
-        layout->setContentsMargins(0, 0, 0, 0);
-        layout->addWidget(&m_widget);
+    return FilePath::fromString(
+               QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation))
+           / "clangd/config.yaml";
+}
 
-        setUseGlobalSettings(m_settings.useGlobalSettings());
-        m_widget.setEnabled(!useGlobalSettings());
-        connect(this, &ProjectSettingsWidget::useGlobalSettingsChanged, this,
-                [this](bool checked) {
-                    m_widget.setEnabled(!checked);
-                    m_settings.setUseGlobalSettings(checked);
-                    if (!checked)
-                        m_settings.setData(m_widget.data());
-                });
+void ClangdSettings::loadSettings()
+{
+    const auto settings = Core::ICore::settings();
+
+    m_data.fromMap(Utils::storeFromSettings(clangdSettingsKey(), settings));
 
-        connect(&m_widget, &CppCodeModelSettingsWidget::settingsDataChanged,
-                this, [this] { m_settings.setData(m_widget.data()); });
+    settings->beginGroup(Constants::CPPEDITOR_SETTINGSGROUP);
+    m_data.customDiagnosticConfigs = diagnosticConfigsFromSettings(settings);
+
+    // Pre-8.0 compat
+    static const Key oldKey("ClangDiagnosticConfig");
+    const QVariant configId = settings->value(oldKey);
+    if (configId.isValid()) {
+        m_data.diagnosticConfigId = Id::fromSetting(configId);
+        settings->setValue(oldKey, {});
     }
 
-private:
-    CppCodeModelProjectSettings m_settings;
-    CppCodeModelSettingsWidget m_widget;
-};
+    settings->endGroup();
+}
 
-class CppCodeModelProjectSettingsPanelFactory final : public ProjectPanelFactory
+void ClangdSettings::saveSettings()
 {
-public:
-    CppCodeModelProjectSettingsPanelFactory()
-    {
-        setPriority(100);
-        setDisplayName(Tr::tr("C++ Code Model"));
-        setCreateWidgetFunction([](Project *project) {
-            return new CppCodeModelProjectSettingsWidget(project);
-        });
+    const auto settings = Core::ICore::settings();
+    const ClangdSettings::Data defaultData;
+    Utils::storeToSettingsWithDefault(clangdSettingsKey(),
+                                      settings,
+                                      m_data.toMap(),
+                                      defaultData.toMap());
+    settings->beginGroup(Constants::CPPEDITOR_SETTINGSGROUP);
+    diagnosticConfigsToSettings(settings, m_data.customDiagnosticConfigs);
+    settings->endGroup();
+}
+
+#ifdef WITH_TESTS
+void ClangdSettings::setClangdFilePath(const FilePath &filePath)
+{
+    instance().m_data.executableFilePath = filePath;
+}
+#endif
+
+ClangdProjectSettings::ClangdProjectSettings(Project *project) : m_project(project)
+{
+    loadSettings();
+}
+
+ClangdSettings::Data ClangdProjectSettings::settings() const
+{
+    const ClangdSettings::Data globalData = ClangdSettings::instance().data();
+    ClangdSettings::Data data = globalData;
+    if (!m_useGlobalSettings) {
+        data = m_customSettings;
+        // This property is global by definition.
+        data.sessionsWithOneClangd = ClangdSettings::instance().data().sessionsWithOneClangd;
+
+        // This list exists only once.
+        data.customDiagnosticConfigs = ClangdSettings::instance().data().customDiagnosticConfigs;
     }
-};
-void setupCppCodeModelProjectSettingsPanel()
+    if (m_blockIndexing)
+        data.indexingPriority = ClangdSettings::IndexingPriority::Off;
+    return data;
+}
+
+void ClangdProjectSettings::setSettings(const ClangdSettings::Data &data)
+{
+    m_customSettings = data;
+    saveSettings();
+    ClangdSettings::setCustomDiagnosticConfigs(data.customDiagnosticConfigs);
+    emit ClangdSettings::instance().changed();
+}
+
+void ClangdProjectSettings::setUseGlobalSettings(bool useGlobal)
+{
+    m_useGlobalSettings = useGlobal;
+    saveSettings();
+    emit ClangdSettings::instance().changed();
+}
+
+void ClangdProjectSettings::setDiagnosticConfigId(Utils::Id configId)
+{
+    m_customSettings.diagnosticConfigId = configId;
+    saveSettings();
+    emit ClangdSettings::instance().changed();
+}
+
+void ClangdProjectSettings::blockIndexing()
+{
+    if (m_blockIndexing)
+        return;
+    m_blockIndexing = true;
+    saveSettings();
+    emit ClangdSettings::instance().changed();
+}
+
+void ClangdProjectSettings::unblockIndexing()
+{
+    if (!m_blockIndexing)
+        return;
+    m_blockIndexing = false;
+    saveSettings();
+    // Do not emit changed here since that would restart clients with blocked indexing
+}
+
+void ClangdProjectSettings::loadSettings()
+{
+    if (!m_project)
+        return;
+    const Store data = storeFromVariant(m_project->namedSettings(clangdSettingsKey()));
+    m_useGlobalSettings = data.value(useGlobalSettingsKey(), true).toBool();
+    m_blockIndexing = data.value(clangdblockIndexingSettingsKey(), false).toBool();
+    if (!m_useGlobalSettings)
+        m_customSettings.fromMap(data);
+}
+
+void ClangdProjectSettings::saveSettings()
+{
+    if (!m_project)
+        return;
+    Store data;
+    if (!m_useGlobalSettings)
+        data = m_customSettings.toMap();
+    data.insert(useGlobalSettingsKey(), m_useGlobalSettings);
+    data.insert(clangdblockIndexingSettingsKey(), m_blockIndexing);
+    m_project->setNamedSettings(clangdSettingsKey(), variantFromStore(data));
+}
+
+Store ClangdSettings::Data::toMap() const
 {
-    static CppCodeModelProjectSettingsPanelFactory factory;
+    Store map;
+
+    map.insert(useClangdKey(), useClangd);
+
+    map.insert(clangdPathKey(),
+               executableFilePath != fallbackClangdFilePath() ? executableFilePath.toString()
+                                                              : QString());
+
+    map.insert(clangdIndexingKey(), indexingPriority != IndexingPriority::Off);
+    map.insert(clangdIndexingPriorityKey(), int(indexingPriority));
+    map.insert(clangdProjectIndexPathKey(), projectIndexPathTemplate);
+    map.insert(clangdSessionIndexPathKey(), sessionIndexPathTemplate);
+    map.insert(clangdHeaderSourceSwitchModeKey(), int(headerSourceSwitchMode));
+    map.insert(clangdCompletionRankingModelKey(), int(completionRankingModel));
+    map.insert(clangdHeaderInsertionKey(), autoIncludeHeaders);
+    map.insert(clangdThreadLimitKey(), workerThreadLimit);
+    map.insert(clangdDocumentThresholdKey(), documentUpdateThreshold);
+    map.insert(clangdSizeThresholdEnabledKey(), sizeThresholdEnabled);
+    map.insert(clangdSizeThresholdKey(), sizeThresholdInKb);
+    map.insert(sessionsWithOneClangdKey(), sessionsWithOneClangd);
+    map.insert(diagnosticConfigIdKey(), diagnosticConfigId.toSetting());
+    map.insert(checkedHardwareKey(), haveCheckedHardwareReqirements);
+    map.insert(completionResultsKey(), completionResults);
+    map.insert(updateDependentSourcesKey(), updateDependentSources);
+    return map;
 }
 
+void ClangdSettings::Data::fromMap(const Store &map)
+{
+    useClangd = map.value(useClangdKey(), true).toBool();
+    executableFilePath = FilePath::fromString(map.value(clangdPathKey()).toString());
+    indexingPriority = IndexingPriority(
+        map.value(clangdIndexingPriorityKey(), int(this->indexingPriority)).toInt());
+    const auto it = map.find(clangdIndexingKey());
+    if (it != map.end() && !it->toBool())
+        indexingPriority = IndexingPriority::Off;
+    projectIndexPathTemplate
+        = map.value(clangdProjectIndexPathKey(), defaultProjectIndexPathTemplate()).toString();
+    sessionIndexPathTemplate
+        = map.value(clangdSessionIndexPathKey(), defaultSessionIndexPathTemplate()).toString();
+    headerSourceSwitchMode = HeaderSourceSwitchMode(map.value(clangdHeaderSourceSwitchModeKey(),
+                                                              int(headerSourceSwitchMode)).toInt());
+    completionRankingModel = CompletionRankingModel(map.value(clangdCompletionRankingModelKey(),
+                                                              int(completionRankingModel)).toInt());
+    autoIncludeHeaders = map.value(clangdHeaderInsertionKey(), false).toBool();
+    workerThreadLimit = map.value(clangdThreadLimitKey(), 0).toInt();
+    documentUpdateThreshold = map.value(clangdDocumentThresholdKey(), 500).toInt();
+    sizeThresholdEnabled = map.value(clangdSizeThresholdEnabledKey(), false).toBool();
+    sizeThresholdInKb = map.value(clangdSizeThresholdKey(), 1024).toLongLong();
+    sessionsWithOneClangd = map.value(sessionsWithOneClangdKey()).toStringList();
+    diagnosticConfigId = Id::fromSetting(map.value(diagnosticConfigIdKey(),
+                                                   initialClangDiagnosticConfigId().toSetting()));
+    haveCheckedHardwareReqirements = map.value(checkedHardwareKey(), false).toBool();
+    updateDependentSources = map.value(updateDependentSourcesKey(), false).toBool();
+    completionResults = map.value(completionResultsKey(), defaultCompletionResults()).toInt();
+}
+
+int ClangdSettings::Data::defaultCompletionResults()
+{
+    // Default clangd --limit-results value is 100
+    bool ok = false;
+    const int userValue = qtcEnvironmentVariableIntValue("QTC_CLANGD_COMPLETION_RESULTS", &ok);
+    return ok ? userValue : 100;
+}
+
+namespace Internal {
 class ClangdSettingsWidget final : public QWidget
 {
     Q_OBJECT
@@ -250,6 +536,7 @@ private:
     QComboBox m_headerSourceSwitchComboBox;
     QComboBox m_completionRankingModelComboBox;
     QCheckBox m_autoIncludeHeadersCheckBox;
+    QCheckBox m_updateDependentSourcesCheckBox;
     QCheckBox m_sizeThresholdCheckBox;
     QSpinBox m_threadLimitSpinBox;
     QSpinBox m_documentUpdateThreshold;
@@ -290,19 +577,26 @@ ClangdSettingsWidget::ClangdSettingsWidget(const ClangdSettings::Data &settingsD
         "does not find anything.</p>");
     using RankingModel = ClangdSettings::CompletionRankingModel;
     const QString completionRankingModelToolTip = Tr::tr(
-        "<p>Which model clangd should use to rank possible completions.</p>"
-        "<p>This determines the order of candidates in the combo box when doing code completion.</p>"
-        "<p>The \"%1\" model used by default results from (pre-trained) machine learning and "
-        "provides superior results on average.</p>"
-        "<p>If you feel that its suggestions stray too much from your expectations for your "
-        "code base, you can try switching to the hand-crafted \"%2\" model.</p>").arg(
-            ClangdSettings::rankingModelToDisplayString(RankingModel::DecisionForest),
-            ClangdSettings::rankingModelToDisplayString(RankingModel::Heuristics));
+                                                      "<p>Which model clangd should use to rank possible completions.</p>"
+                                                      "<p>This determines the order of candidates in the combo box when doing code completion.</p>"
+                                                      "<p>The \"%1\" model used by default results from (pre-trained) machine learning and "
+                                                      "provides superior results on average.</p>"
+                                                      "<p>If you feel that its suggestions stray too much from your expectations for your "
+                                                      "code base, you can try switching to the hand-crafted \"%2\" model.</p>").arg(
+                                                          ClangdSettings::rankingModelToDisplayString(RankingModel::DecisionForest),
+                                                          ClangdSettings::rankingModelToDisplayString(RankingModel::Heuristics));
     const QString workerThreadsToolTip = Tr::tr(
         "Number of worker threads used by clangd. Background indexing also uses this many "
         "worker threads.");
     const QString autoIncludeToolTip = Tr::tr(
         "Controls whether clangd may insert header files as part of symbol completion.");
+    const QString updateDependentSourcesToolTip = Tr::tr(
+        "<p>Controls whether when editing a header file, clangd should re-parse all source files "
+        "including that header.</p>"
+        "<p>Note that enabling this option can cause considerable CPU load when editing widely "
+        "included headers.</p>"
+        "<p>If this option is disabled, the dependent source files are only re-parsed when the "
+        "header file is saved.</p>");
     const QString documentUpdateToolTip
         //: %1 is the application name (Qt Creator)
         = Tr::tr("Defines the amount of time %1 waits before sending document changes to the "
@@ -353,6 +647,9 @@ ClangdSettingsWidget::ClangdSettingsWidget(const ClangdSettings::Data &settingsD
     m_autoIncludeHeadersCheckBox.setText(Tr::tr("Insert header files on completion"));
     m_autoIncludeHeadersCheckBox.setChecked(settings.autoIncludeHeaders());
     m_autoIncludeHeadersCheckBox.setToolTip(autoIncludeToolTip);
+    m_updateDependentSourcesCheckBox.setText(Tr::tr("Update dependent sources"));
+    m_updateDependentSourcesCheckBox.setChecked(settings.updateDependentSources());
+    m_updateDependentSourcesCheckBox.setToolTip(updateDependentSourcesToolTip);
     m_threadLimitSpinBox.setValue(settings.workerThreadLimit());
     m_threadLimitSpinBox.setSpecialValueText(Tr::tr("Automatic"));
     m_threadLimitSpinBox.setToolTip(workerThreadsToolTip);
@@ -437,6 +734,7 @@ ClangdSettingsWidget::ClangdSettingsWidget(const ClangdSettings::Data &settingsD
     formLayout->addRow(threadLimitLabel, threadLimitLayout);
 
     formLayout->addRow(QString(), &m_autoIncludeHeadersCheckBox);
+    formLayout->addRow(QString(), &m_updateDependentSourcesCheckBox);
     const auto limitResultsLayout = new QHBoxLayout;
     limitResultsLayout->addWidget(&m_completionResults);
     limitResultsLayout->addStretch(1);
@@ -462,11 +760,11 @@ ClangdSettingsWidget::ClangdSettingsWidget(const ClangdSettings::Data &settingsD
 
     m_configSelectionWidget = new ClangDiagnosticConfigsSelectionWidget(formLayout);
     m_configSelectionWidget->refresh(
-                diagnosticConfigsModel(settings.customDiagnosticConfigs()),
-                settings.diagnosticConfigId(),
-                [](const ClangDiagnosticConfigs &configs, const Utils::Id &configToSelect) {
-                    return new CppEditor::ClangDiagnosticConfigsWidget(configs, configToSelect);
-                });
+        diagnosticConfigsModel(settings.customDiagnosticConfigs()),
+        settings.diagnosticConfigId(),
+        [](const ClangDiagnosticConfigs &configs, const Utils::Id &configToSelect) {
+            return new CppEditor::ClangDiagnosticConfigsWidget(configs, configToSelect);
+        });
 
     layout->addLayout(formLayout);
     if (!isForProject) {
@@ -476,9 +774,9 @@ ClangdSettingsWidget::ClangdSettingsWidget(const ClangdSettings::Data &settingsD
         const auto sessionsView = new Utils::ListView;
         sessionsView->setModel(&m_sessionsModel);
         sessionsView->setToolTip(
-                    Tr::tr("By default, Qt Creator runs one clangd process per project.\n"
-                       "If you have sessions with tightly coupled projects that should be\n"
-                       "managed by the same clangd process, add them here."));
+            Tr::tr("By default, Qt Creator runs one clangd process per project.\n"
+                   "If you have sessions with tightly coupled projects that should be\n"
+                   "managed by the same clangd process, add them here."));
         const auto outerSessionsLayout = new QHBoxLayout;
         const auto innerSessionsLayout = new QHBoxLayout(m_sessionsGroupBox);
         const auto buttonsLayout = new QVBoxLayout;
@@ -530,11 +828,11 @@ ClangdSettingsWidget::ClangdSettingsWidget(const ClangdSettings::Data &settingsD
 
     const auto configFilesHelpLabel = new QLabel;
     configFilesHelpLabel->setText(Tr::tr("Additional settings are available via "
-            "<a href=\"https://clangd.llvm.org/config\"> clangd configuration files</a>.<br>"
-            "User-specific settings go <a href=\"%1\">here</a>, "
-            "project-specific settings can be configured by putting a .clangd file into "
-            "the project source tree.")
-                .arg(ClangdSettings::clangdUserConfigFilePath().toUserOutput()));
+                                         "<a href=\"https://clangd.llvm.org/config\"> clangd configuration files</a>.<br>"
+                                         "User-specific settings go <a href=\"%1\">here</a>, "
+                                         "project-specific settings can be configured by putting a .clangd file into "
+                                         "the project source tree.")
+                                      .arg(ClangdSettings::clangdUserConfigFilePath().toUserOutput()));
     configFilesHelpLabel->setWordWrap(true);
     connect(configFilesHelpLabel, &QLabel::linkHovered, configFilesHelpLabel, &QLabel::setToolTip);
     connect(configFilesHelpLabel, &QLabel::linkActivated, [](const QString &link) {
@@ -602,6 +900,8 @@ ClangdSettingsWidget::ClangdSettingsWidget(const ClangdSettings::Data &settingsD
             this, &ClangdSettingsWidget::settingsDataChanged);
     connect(&m_autoIncludeHeadersCheckBox, &QCheckBox::toggled,
             this, &ClangdSettingsWidget::settingsDataChanged);
+    connect(&m_updateDependentSourcesCheckBox, &QCheckBox::toggled,
+            this, &ClangdSettingsWidget::settingsDataChanged);
     connect(&m_threadLimitSpinBox, &QSpinBox::valueChanged,
             this, &ClangdSettingsWidget::settingsDataChanged);
     connect(&m_sizeThresholdCheckBox, &QCheckBox::toggled,
@@ -632,6 +932,7 @@ ClangdSettings::Data ClangdSettingsWidget::settingsData() const
     data.completionRankingModel = ClangdSettings::CompletionRankingModel(
         m_completionRankingModelComboBox.currentData().toInt());
     data.autoIncludeHeaders = m_autoIncludeHeadersCheckBox.isChecked();
+    data.updateDependentSources = m_updateDependentSourcesCheckBox.isChecked();
     data.workerThreadLimit = m_threadLimitSpinBox.value();
     data.documentUpdateThreshold = m_documentUpdateThreshold.value();
     data.sizeThresholdEnabled = m_sizeThresholdCheckBox.isChecked();
@@ -742,6 +1043,7 @@ void setupClangdProjectSettingsPanel()
     static ClangdProjectSettingsPanelFactory theClangdProjectSettingsPanelFactory;
 }
 
-} // CppEditor::Internal
+} // namespace Internal
+} // namespace CppEditor
 
-#include "cppcodemodelsettingspage.moc"
+#include <clangdsettings.moc>
diff --git a/src/plugins/cppeditor/clangdsettings.h b/src/plugins/cppeditor/clangdsettings.h
new file mode 100644
index 0000000000..e4fb22f552
--- /dev/null
+++ b/src/plugins/cppeditor/clangdsettings.h
@@ -0,0 +1,170 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include "clangdiagnosticconfig.h"
+#include "cppeditor_global.h"
+
+#include <utils/filepath.h>
+#include <utils/store.h>
+
+namespace ProjectExplorer { class Project; }
+namespace Utils { class MacroExpander; }
+
+namespace CppEditor {
+
+// TODO: Can we move this to ClangCodeModel?
+class CPPEDITOR_EXPORT ClangdSettings : public QObject
+{
+    Q_OBJECT
+public:
+    enum class IndexingPriority { Off, Background, Normal, Low, };
+    enum class HeaderSourceSwitchMode { BuiltinOnly, ClangdOnly, Both };
+    enum class CompletionRankingModel { Default, DecisionForest, Heuristics };
+
+    static QString priorityToString(const IndexingPriority &priority);
+    static QString priorityToDisplayString(const IndexingPriority &priority);
+    static QString headerSourceSwitchModeToDisplayString(HeaderSourceSwitchMode mode);
+    static QString rankingModelToCmdLineString(CompletionRankingModel model);
+    static QString rankingModelToDisplayString(CompletionRankingModel model);
+    static QString defaultProjectIndexPathTemplate();
+    static QString defaultSessionIndexPathTemplate();
+
+    class CPPEDITOR_EXPORT Data
+    {
+    public:
+        Utils::Store toMap() const;
+        void fromMap(const Utils::Store &map);
+
+        friend bool operator==(const Data &s1, const Data &s2)
+        {
+            return s1.useClangd == s2.useClangd
+                   && s1.executableFilePath == s2.executableFilePath
+                   && s1.projectIndexPathTemplate == s2.projectIndexPathTemplate
+                   && s1.sessionIndexPathTemplate == s2.sessionIndexPathTemplate
+                   && s1.sessionsWithOneClangd == s2.sessionsWithOneClangd
+                   && s1.customDiagnosticConfigs == s2.customDiagnosticConfigs
+                   && s1.diagnosticConfigId == s2.diagnosticConfigId
+                   && s1.workerThreadLimit == s2.workerThreadLimit
+                   && s1.indexingPriority == s2.indexingPriority
+                   && s1.headerSourceSwitchMode == s2.headerSourceSwitchMode
+                   && s1.completionRankingModel == s2.completionRankingModel
+                   && s1.autoIncludeHeaders == s2.autoIncludeHeaders
+                   && s1.documentUpdateThreshold == s2.documentUpdateThreshold
+                   && s1.sizeThresholdEnabled == s2.sizeThresholdEnabled
+                   && s1.sizeThresholdInKb == s2.sizeThresholdInKb
+                   && s1.haveCheckedHardwareReqirements == s2.haveCheckedHardwareReqirements
+                   && s1.updateDependentSources == s2.updateDependentSources
+                   && s1.completionResults == s2.completionResults;
+        }
+        friend bool operator!=(const Data &s1, const Data &s2) { return !(s1 == s2); }
+
+        Utils::FilePath executableFilePath;
+        QStringList sessionsWithOneClangd;
+        ClangDiagnosticConfigs customDiagnosticConfigs;
+        Utils::Id diagnosticConfigId;
+
+        int workerThreadLimit = 0;
+        int documentUpdateThreshold = 500;
+        qint64 sizeThresholdInKb = 1024;
+        bool useClangd = true;
+        IndexingPriority indexingPriority = IndexingPriority::Low;
+        QString projectIndexPathTemplate = defaultProjectIndexPathTemplate();
+        QString sessionIndexPathTemplate = defaultSessionIndexPathTemplate();
+        HeaderSourceSwitchMode headerSourceSwitchMode = HeaderSourceSwitchMode::Both;
+        CompletionRankingModel completionRankingModel = CompletionRankingModel::Default;
+        bool autoIncludeHeaders = false;
+        bool sizeThresholdEnabled = false;
+        bool haveCheckedHardwareReqirements = false;
+        bool updateDependentSources = false;
+        int completionResults = defaultCompletionResults();
+
+    private:
+        static int defaultCompletionResults();
+    };
+
+    ClangdSettings(const Data &data) : m_data(data) {}
+
+    static ClangdSettings &instance();
+    bool useClangd() const;
+    static void setUseClangd(bool use);
+    static void setUseClangdAndSave(bool use);
+
+    static bool hardwareFulfillsRequirements();
+    static bool haveCheckedHardwareRequirements();
+
+    static void setDefaultClangdPath(const Utils::FilePath &filePath);
+    static void setCustomDiagnosticConfigs(const ClangDiagnosticConfigs &configs);
+    Utils::FilePath clangdFilePath() const;
+    IndexingPriority indexingPriority() const { return m_data.indexingPriority; }
+    Utils::FilePath projectIndexPath(const Utils::MacroExpander &expander) const;
+    Utils::FilePath sessionIndexPath(const Utils::MacroExpander &expander) const;
+    HeaderSourceSwitchMode headerSourceSwitchMode() const { return m_data.headerSourceSwitchMode; }
+    CompletionRankingModel completionRankingModel() const { return m_data.completionRankingModel; }
+    bool autoIncludeHeaders() const { return m_data.autoIncludeHeaders; }
+    bool updateDependentSources() const { return m_data.updateDependentSources; }
+    int workerThreadLimit() const { return m_data.workerThreadLimit; }
+    int documentUpdateThreshold() const { return m_data.documentUpdateThreshold; }
+    qint64 sizeThresholdInKb() const { return m_data.sizeThresholdInKb; }
+    bool sizeThresholdEnabled() const { return m_data.sizeThresholdEnabled; }
+    int completionResults() const { return m_data.completionResults; }
+    bool sizeIsOkay(const Utils::FilePath &fp) const;
+    ClangDiagnosticConfigs customDiagnosticConfigs() const;
+    Utils::Id diagnosticConfigId() const;
+    ClangDiagnosticConfig diagnosticConfig() const;
+
+    enum class Granularity { Project, Session };
+    Granularity granularity() const;
+
+    void setData(const Data &data, bool saveAndEmitSignal = true);
+    Data data() const { return m_data; }
+
+    Utils::FilePath clangdIncludePath() const;
+    static Utils::FilePath clangdUserConfigFilePath();
+
+#ifdef WITH_TESTS
+    static void setClangdFilePath(const Utils::FilePath &filePath);
+#endif
+
+signals:
+    void changed();
+
+private:
+    ClangdSettings();
+
+    void loadSettings();
+    void saveSettings();
+
+    Data m_data;
+};
+
+class CPPEDITOR_EXPORT ClangdProjectSettings
+{
+public:
+    ClangdProjectSettings(ProjectExplorer::Project *project);
+
+    ClangdSettings::Data settings() const;
+    void setSettings(const ClangdSettings::Data &data);
+    bool useGlobalSettings() const { return m_useGlobalSettings; }
+    void setUseGlobalSettings(bool useGlobal);
+    void setDiagnosticConfigId(Utils::Id configId);
+    void blockIndexing();
+    void unblockIndexing();
+
+private:
+    void loadSettings();
+    void saveSettings();
+
+    ProjectExplorer::Project * const m_project;
+    ClangdSettings::Data m_customSettings;
+    bool m_useGlobalSettings = true;
+    bool m_blockIndexing = false;
+};
+
+namespace Internal {
+void setupClangdProjectSettingsPanel();
+void setupClangdSettingsPage();
+}
+
+} // namespace CppEditor
diff --git a/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.cpp b/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.cpp
index 0133292703..3a82a41132 100644
--- a/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.cpp
+++ b/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.cpp
@@ -111,7 +111,8 @@ void BuiltinModelManagerSupport::followSymbol(const CursorInEditor &data,
     SymbolFinder finder;
     m_followSymbol->findLink(data, processLinkCallback,
             resolveTarget, CppModelManager::snapshot(),
-            data.editorWidget()->semanticInfo().doc, &finder, inNextSplit);
+            data.editorWidget() ? data.editorWidget()->semanticInfo().doc : data.cppDocument(),
+            &finder, inNextSplit);
 }
 
 void BuiltinModelManagerSupport::followSymbolToType(const CursorInEditor &data,
diff --git a/src/plugins/cppeditor/cppcodemodelsettings.cpp b/src/plugins/cppeditor/cppcodemodelsettings.cpp
index d1b4c47098..53c009d4c3 100644
--- a/src/plugins/cppeditor/cppcodemodelsettings.cpp
+++ b/src/plugins/cppeditor/cppcodemodelsettings.cpp
@@ -3,93 +3,95 @@
 
 #include "cppcodemodelsettings.h"
 
-#include "clangdiagnosticconfigsmodel.h"
 #include "compileroptionsbuilder.h"
 #include "cppeditorconstants.h"
 #include "cppeditortr.h"
-#include "cpptoolsreuse.h"
+#include "cppmodelmanager.h"
 
+#include <coreplugin/dialogs/ioptionspage.h>
 #include <coreplugin/icore.h>
-#include <coreplugin/session.h>
 
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectmanager.h>
+#include <projectexplorer/projectpanelfactory.h>
+#include <projectexplorer/projectsettingswidget.h>
 
 #include <utils/algorithm.h>
 #include <utils/hostosinfo.h>
+#include <utils/layoutbuilder.h>
 #include <utils/macroexpander.h>
-#include <utils/qtcprocess.h>
 #include <utils/qtcassert.h>
+#include <utils/qtcsettings.h>
 #include <utils/store.h>
 
+#include <QCheckBox>
 #include <QDateTime>
 #include <QDir>
 #include <QHash>
 #include <QPair>
+#include <QPlainTextEdit>
 #include <QSettings>
-#include <QStandardPaths>
+#include <QSpinBox>
+#include <QTimer>
+#include <QVBoxLayout>
 
 using namespace ProjectExplorer;
 using namespace Utils;
 
+
 namespace CppEditor {
+namespace {
+class CppCodeModelProjectSettings
+{
+public:
+    CppCodeModelProjectSettings(ProjectExplorer::Project *project);
+
+    CppCodeModelSettings settings() const;
+    void setSettings(const CppCodeModelSettings &settings);
+    void forceCustomSettingsSettings(const CppCodeModelSettings &settings);
+    bool useGlobalSettings() const { return m_useGlobalSettings; }
+    void setUseGlobalSettings(bool useGlobal);
+
+private:
+    void loadSettings();
+    void saveSettings();
+
+    ProjectExplorer::Project * const m_project;
+    CppCodeModelSettings m_customSettings;
+    bool m_useGlobalSettings = true;
+};
+} // namespace
 
-static Id initialClangDiagnosticConfigId() { return Constants::CPP_CLANG_DIAG_CONFIG_BUILDSYSTEM; }
 static Key pchUsageKey() { return Constants::CPPEDITOR_MODEL_MANAGER_PCH_USAGE; }
 static Key interpretAmbiguousHeadersAsCHeadersKey()
     { return Constants::CPPEDITOR_INTERPRET_AMBIGIUOUS_HEADERS_AS_C_HEADERS; }
+static Key enableIndexingKey() { return "EnableIndexing"; }
 static Key skipIndexingBigFilesKey() { return Constants::CPPEDITOR_SKIP_INDEXING_BIG_FILES; }
 static Key ignoreFilesKey() { return Constants::CPPEDITOR_IGNORE_FILES; }
 static Key ignorePatternKey() { return Constants::CPPEDITOR_IGNORE_PATTERN; }
 static Key useBuiltinPreprocessorKey() { return Constants::CPPEDITOR_USE_BUILTIN_PREPROCESSOR; }
 static Key indexerFileSizeLimitKey() { return Constants::CPPEDITOR_INDEXER_FILE_SIZE_LIMIT; }
-
-static Key clangdSettingsKey() { return "ClangdSettings"; }
-static Key useClangdKey() { return "UseClangdV7"; }
-static Key clangdPathKey() { return "ClangdPath"; }
-static Key clangdIndexingKey() { return "ClangdIndexing"; }
-static Key clangdProjectIndexPathKey() { return "ClangdProjectIndexPath"; }
-static Key clangdSessionIndexPathKey() { return "ClangdSessionIndexPath"; }
-static Key clangdIndexingPriorityKey() { return "ClangdIndexingPriority"; }
-static Key clangdHeaderSourceSwitchModeKey() { return "ClangdHeaderSourceSwitchMode"; }
-static Key clangdCompletionRankingModelKey() { return "ClangdCompletionRankingModel"; }
-static Key clangdHeaderInsertionKey() { return "ClangdHeaderInsertion"; }
-static Key clangdThreadLimitKey() { return "ClangdThreadLimit"; }
-static Key clangdDocumentThresholdKey() { return "ClangdDocumentThreshold"; }
-static Key clangdSizeThresholdEnabledKey() { return "ClangdSizeThresholdEnabled"; }
-static Key clangdSizeThresholdKey() { return "ClangdSizeThreshold"; }
 static Key useGlobalSettingsKey() { return "useGlobalSettings"; }
-static Key clangdblockIndexingSettingsKey() { return "blockIndexing"; }
-static Key sessionsWithOneClangdKey() { return "SessionsWithOneClangd"; }
-static Key diagnosticConfigIdKey() { return "diagnosticConfigId"; }
-static Key checkedHardwareKey() { return "checkedHardware"; }
-static Key completionResultsKey() { return "completionResults"; }
-
-static FilePath g_defaultClangdFilePath;
-static FilePath fallbackClangdFilePath()
-{
-    if (g_defaultClangdFilePath.exists())
-        return g_defaultClangdFilePath;
-    return Environment::systemEnvironment().searchInPath("clangd");
-}
 
-bool operator==(const CppEditor::CppCodeModelSettings::Data &s1,
-                const CppEditor::CppCodeModelSettings::Data &s2)
+bool operator==(const CppEditor::CppCodeModelSettings &s1,
+                const CppEditor::CppCodeModelSettings &s2)
 {
     return s1.pchUsage == s2.pchUsage
            && s1.interpretAmbigiousHeadersAsC == s2.interpretAmbigiousHeadersAsC
+           && s1.enableIndexing == s2.enableIndexing
            && s1.skipIndexingBigFiles == s2.skipIndexingBigFiles
            && s1.useBuiltinPreprocessor == s2.useBuiltinPreprocessor
            && s1.indexerFileSizeLimitInMb == s2.indexerFileSizeLimitInMb
-           && s1.categorizeFindReferences == s2.categorizeFindReferences
+           && s1.m_categorizeFindReferences == s2.m_categorizeFindReferences
            && s1.ignoreFiles == s2.ignoreFiles && s1.ignorePattern == s2.ignorePattern;
 }
 
-Store CppCodeModelSettings::Data::toMap() const
+Store CppCodeModelSettings::toMap() const
 {
     Store store;
     store.insert(pchUsageKey(), pchUsage);
     store.insert(interpretAmbiguousHeadersAsCHeadersKey(), interpretAmbigiousHeadersAsC);
+    store.insert(enableIndexingKey(), enableIndexing);
     store.insert(skipIndexingBigFilesKey(), skipIndexingBigFiles);
     store.insert(ignoreFilesKey(), ignoreFiles);
     store.insert(ignorePatternKey(), ignorePattern);
@@ -98,15 +100,16 @@ Store CppCodeModelSettings::Data::toMap() const
     return store;
 }
 
-void CppCodeModelSettings::Data::fromMap(const Utils::Store &store)
+void CppCodeModelSettings::fromMap(const Utils::Store &store)
 {
-    const CppCodeModelSettings::Data def;
+    const CppCodeModelSettings def;
     pchUsage = static_cast<PCHUsage>(store.value(pchUsageKey(), def.pchUsage).toInt());
-    interpretAmbigiousHeadersAsC = store
-                                       .value(interpretAmbiguousHeadersAsCHeadersKey(),
-                                              def.interpretAmbigiousHeadersAsC)
-                                       .toBool();
-    skipIndexingBigFiles = store.value(skipIndexingBigFilesKey(), def.skipIndexingBigFiles).toBool();
+    interpretAmbigiousHeadersAsC
+        = store.value(interpretAmbiguousHeadersAsCHeadersKey(), def.interpretAmbigiousHeadersAsC)
+              .toBool();
+    enableIndexing = store.value(enableIndexingKey(), def.enableIndexing).toBool();
+    skipIndexingBigFiles
+        = store.value(skipIndexingBigFilesKey(), def.skipIndexingBigFiles).toBool();
     ignoreFiles = store.value(ignoreFilesKey(), def.ignoreFiles).toBool();
     ignorePattern = store.value(ignorePatternKey(), def.ignorePattern).toString();
     useBuiltinPreprocessor
@@ -117,12 +120,13 @@ void CppCodeModelSettings::Data::fromMap(const Utils::Store &store)
 
 void CppCodeModelSettings::fromSettings(QtcSettings *s)
 {
-    m_data.fromMap(storeFromSettings(Constants::CPPEDITOR_SETTINGSGROUP, s));
+    fromMap(storeFromSettings(Constants::CPPEDITOR_SETTINGSGROUP, s));
 }
 
 void CppCodeModelSettings::toSettings(QtcSettings *s)
 {
-    storeToSettingsWithDefault(Constants::CPPEDITOR_SETTINGSGROUP, s, m_data.toMap(), Data().toMap());
+    storeToSettingsWithDefault(
+        Constants::CPPEDITOR_SETTINGSGROUP, s, toMap(), CppCodeModelSettings().toMap());
 }
 
 CppCodeModelSettings &CppCodeModelSettings::globalInstance()
@@ -133,7 +137,7 @@ CppCodeModelSettings &CppCodeModelSettings::globalInstance()
 
 CppCodeModelSettings CppCodeModelSettings::settingsForProject(const ProjectExplorer::Project *project)
 {
-    return {CppCodeModelProjectSettings(const_cast<ProjectExplorer::Project *>(project)).data()};
+    return {CppCodeModelProjectSettings(const_cast<ProjectExplorer::Project *>(project)).settings()};
 }
 
 CppCodeModelSettings CppCodeModelSettings::settingsForProject(const Utils::FilePath &projectFile)
@@ -146,25 +150,38 @@ CppCodeModelSettings CppCodeModelSettings::settingsForFile(const Utils::FilePath
     return settingsForProject(ProjectManager::projectForFile(file));
 }
 
-void CppCodeModelSettings::setGlobalData(const Data &data)
+bool CppCodeModelSettings::hasCustomSettings(const ProjectExplorer::Project *project)
+{
+    return !CppCodeModelProjectSettings(const_cast<ProjectExplorer::Project *>(project))
+                .useGlobalSettings();
+}
+
+void CppCodeModelSettings::setSettingsForProject(
+    ProjectExplorer::Project *project, const CppCodeModelSettings &settings)
 {
-    if (globalInstance().m_data == data)
+    CppCodeModelProjectSettings pSettings(project);
+    pSettings.forceCustomSettingsSettings(settings);
+}
+
+void CppCodeModelSettings::setGlobal(const CppCodeModelSettings &settings)
+{
+    if (globalInstance() == settings)
         return;
 
-    globalInstance().m_data = data;
+    globalInstance() = settings;
     globalInstance().toSettings(Core::ICore::settings());
-    emit globalInstance().changed(nullptr);
+    CppModelManager::handleSettingsChange(nullptr);
 }
 
-CppCodeModelSettings::PCHUsage CppCodeModelSettings::pchUsage(const Project *project)
+CppCodeModelSettings::PCHUsage CppCodeModelSettings::pchUsageForProject(const Project *project)
 {
-    return CppCodeModelSettings::settingsForProject(project).pchUsage();
+    return CppCodeModelSettings::settingsForProject(project).pchUsage;
 }
 
 UsePrecompiledHeaders CppCodeModelSettings::usePrecompiledHeaders() const
 {
-    return pchUsage() == CppCodeModelSettings::PchUse_None ? UsePrecompiledHeaders::No
-                                                           : UsePrecompiledHeaders::Yes;
+    return pchUsage == CppCodeModelSettings::PchUse_None ? UsePrecompiledHeaders::No
+                                                         : UsePrecompiledHeaders::Yes;
 }
 
 UsePrecompiledHeaders CppCodeModelSettings::usePrecompiledHeaders(const Project *project)
@@ -174,17 +191,17 @@ UsePrecompiledHeaders CppCodeModelSettings::usePrecompiledHeaders(const Project
 
 int CppCodeModelSettings::effectiveIndexerFileSizeLimitInMb() const
 {
-    return skipIndexingBigFiles() ? indexerFileSizeLimitInMb() : -1;
+    return skipIndexingBigFiles ? indexerFileSizeLimitInMb : -1;
 }
 
 bool CppCodeModelSettings::categorizeFindReferences()
 {
-    return globalInstance().m_data.categorizeFindReferences;
+    return globalInstance().m_categorizeFindReferences;
 }
 
 void CppCodeModelSettings::setCategorizeFindReferences(bool categorize)
 {
-    globalInstance().m_data.categorizeFindReferences = categorize;
+    globalInstance().m_categorizeFindReferences = categorize;
 }
 
 CppCodeModelProjectSettings::CppCodeModelProjectSettings(ProjectExplorer::Project *project)
@@ -193,23 +210,29 @@ CppCodeModelProjectSettings::CppCodeModelProjectSettings(ProjectExplorer::Projec
     loadSettings();
 }
 
-CppCodeModelSettings::Data CppCodeModelProjectSettings::data() const
+CppCodeModelSettings CppCodeModelProjectSettings::settings() const
 {
-    return m_useGlobalSettings ? CppCodeModelSettings::globalInstance().data() : m_customSettings;
+    return m_useGlobalSettings ? CppCodeModelSettings::global() : m_customSettings;
 }
 
-void CppCodeModelProjectSettings::setData(const CppCodeModelSettings::Data &data)
+void CppCodeModelProjectSettings::setSettings(const CppCodeModelSettings &settings)
 {
-    m_customSettings = data;
+    m_customSettings = settings;
     saveSettings();
-    emit CppCodeModelSettings::globalInstance().changed(m_project);
+    CppModelManager::handleSettingsChange(m_project);
+}
+
+void CppCodeModelProjectSettings::forceCustomSettingsSettings(const CppCodeModelSettings &settings)
+{
+    m_useGlobalSettings = false;
+    setSettings(settings);
 }
 
 void CppCodeModelProjectSettings::setUseGlobalSettings(bool useGlobal)
 {
     m_useGlobalSettings = useGlobal;
     saveSettings();
-    emit CppCodeModelSettings::globalInstance().changed(m_project);
+    CppModelManager::handleSettingsChange(m_project);
 }
 
 void CppCodeModelProjectSettings::loadSettings()
@@ -230,440 +253,200 @@ void CppCodeModelProjectSettings::saveSettings()
     m_project->setNamedSettings(Constants::CPPEDITOR_SETTINGSGROUP, variantFromStore(data));
 }
 
-QString ClangdSettings::priorityToString(const IndexingPriority &priority)
-{
-    switch (priority) {
-    case IndexingPriority::Background: return "background";
-    case IndexingPriority::Normal: return "normal";
-    case IndexingPriority::Low: return "low";
-    case IndexingPriority::Off: return {};
-    }
-    return {};
-}
-
-QString ClangdSettings::priorityToDisplayString(const IndexingPriority &priority)
-{
-    switch (priority) {
-    case IndexingPriority::Background: return Tr::tr("Background Priority");
-    case IndexingPriority::Normal: return Tr::tr("Normal Priority");
-    case IndexingPriority::Low: return Tr::tr("Low Priority");
-    case IndexingPriority::Off: return Tr::tr("Off");
-    }
-    return {};
-}
-
-QString ClangdSettings::headerSourceSwitchModeToDisplayString(HeaderSourceSwitchMode mode)
-{
-    switch (mode) {
-    case HeaderSourceSwitchMode::BuiltinOnly: return Tr::tr("Use Built-in Only");
-    case HeaderSourceSwitchMode::ClangdOnly: return Tr::tr("Use Clangd Only");
-    case HeaderSourceSwitchMode::Both: return Tr::tr("Try Both");
-    }
-    return {};
-}
-
-QString ClangdSettings::rankingModelToCmdLineString(CompletionRankingModel model)
-{
-    switch (model) {
-    case CompletionRankingModel::Default: break;
-    case CompletionRankingModel::DecisionForest: return "decision_forest";
-    case CompletionRankingModel::Heuristics: return "heuristics";
-    }
-    QTC_ASSERT(false, return {});
-}
-
-QString ClangdSettings::rankingModelToDisplayString(CompletionRankingModel model)
-{
-    switch (model) {
-    case CompletionRankingModel::Default: return Tr::tr("Default");
-    case CompletionRankingModel::DecisionForest: return Tr::tr("Decision Forest");
-    case CompletionRankingModel::Heuristics: return Tr::tr("Heuristics");
-    }
-    QTC_ASSERT(false, return {});
-}
-
-QString ClangdSettings::defaultProjectIndexPathTemplate()
-{
-    return QDir::toNativeSeparators("%{BuildConfig:BuildDirectory:FilePath}/.qtc_clangd");
-}
-
-QString ClangdSettings::defaultSessionIndexPathTemplate()
-{
-    return QDir::toNativeSeparators("%{IDE:UserResourcePath}/.qtc_clangd/%{Session:FileBaseName}");
-}
+namespace Internal {
 
-ClangdSettings &ClangdSettings::instance()
+class CppCodeModelSettingsWidget final : public Core::IOptionsPageWidget
 {
-    static ClangdSettings settings;
-    return settings;
-}
+    Q_OBJECT
+public:
+    CppCodeModelSettingsWidget(const CppCodeModelSettings &settings);
+    CppCodeModelSettings settings() const;
 
-ClangdSettings::ClangdSettings()
-{
-    loadSettings();
-    const auto sessionMgr = Core::SessionManager::instance();
-    connect(sessionMgr, &Core::SessionManager::sessionRemoved, this, [this](const QString &name) {
-        m_data.sessionsWithOneClangd.removeOne(name);
-    });
-    connect(sessionMgr,
-            &Core::SessionManager::sessionRenamed,
-            this,
-            [this](const QString &oldName, const QString &newName) {
-                const auto index = m_data.sessionsWithOneClangd.indexOf(oldName);
-                if (index != -1)
-                    m_data.sessionsWithOneClangd[index] = newName;
-            });
-}
+signals:
+    void settingsDataChanged();
 
-bool ClangdSettings::useClangd() const
-{
-    return m_data.useClangd && clangdVersion(clangdFilePath()) >= minimumClangdVersion();
-}
-
-void ClangdSettings::setUseClangd(bool use) { instance().m_data.useClangd = use; }
-
-void ClangdSettings::setUseClangdAndSave(bool use)
-{
-    setUseClangd(use);
-    instance().saveSettings();
-}
-
-bool ClangdSettings::hardwareFulfillsRequirements()
-{
-    instance().m_data.haveCheckedHardwareReqirements = true;
-    instance().saveSettings();
-    const quint64 minRam = quint64(12) * 1024 * 1024 * 1024;
-    const std::optional<quint64> totalRam = Utils::HostOsInfo::totalMemoryInstalledInBytes();
-    return !totalRam || *totalRam >= minRam;
-}
+private:
+    void apply() final { CppCodeModelSettings::setGlobal(settings()); }
 
-bool ClangdSettings::haveCheckedHardwareRequirements()
-{
-    return instance().data().haveCheckedHardwareReqirements;
-}
-
-void ClangdSettings::setDefaultClangdPath(const FilePath &filePath)
-{
-    g_defaultClangdFilePath = filePath;
-}
-
-void ClangdSettings::setCustomDiagnosticConfigs(const ClangDiagnosticConfigs &configs)
-{
-    if (instance().customDiagnosticConfigs() == configs)
-        return;
-    instance().m_data.customDiagnosticConfigs = configs;
-    instance().saveSettings();
-}
-
-FilePath ClangdSettings::clangdFilePath() const
-{
-    if (!m_data.executableFilePath.isEmpty())
-        return m_data.executableFilePath;
-    return fallbackClangdFilePath();
-}
-
-FilePath ClangdSettings::projectIndexPath(const Utils::MacroExpander &expander) const
-{
-    return FilePath::fromUserInput(expander.expand(m_data.projectIndexPathTemplate));
-}
-
-FilePath ClangdSettings::sessionIndexPath(const Utils::MacroExpander &expander) const
-{
-    return FilePath::fromUserInput(expander.expand(m_data.sessionIndexPathTemplate));
-}
+    QCheckBox *m_interpretAmbiguousHeadersAsCHeaders;
+    QCheckBox *m_ignorePchCheckBox;
+    QCheckBox *m_useBuiltinPreprocessorCheckBox;
+    QCheckBox *m_enableIndexingCheckBox;
+    QCheckBox *m_skipIndexingBigFilesCheckBox;
+    QSpinBox *m_bigFilesLimitSpinBox;
+    QCheckBox *m_ignoreFilesCheckBox;
+    QPlainTextEdit *m_ignorePatternTextEdit;
+};
 
-bool ClangdSettings::sizeIsOkay(const Utils::FilePath &fp) const
+CppCodeModelSettingsWidget::CppCodeModelSettingsWidget(const CppCodeModelSettings &settings)
 {
-    return !sizeThresholdEnabled() || sizeThresholdInKb() * 1024 >= fp.fileSize();
-}
+    m_interpretAmbiguousHeadersAsCHeaders
+        = new QCheckBox(Tr::tr("Interpret ambiguous headers as C headers"));
 
-ClangDiagnosticConfigs ClangdSettings::customDiagnosticConfigs() const
-{
-    return m_data.customDiagnosticConfigs;
-}
+    m_enableIndexingCheckBox = new QCheckBox(Tr::tr("Enable indexing"));
+    m_enableIndexingCheckBox->setChecked(settings.enableIndexing);
+    m_enableIndexingCheckBox->setToolTip(Tr::tr(
+        "Indexing should almost always be kept enabled, as disabling it will severely limit the "
+        "capabilities of the code model."));
 
-Id ClangdSettings::diagnosticConfigId() const
-{
-    if (!diagnosticConfigsModel().hasConfigWithId(m_data.diagnosticConfigId))
-        return initialClangDiagnosticConfigId();
-    return m_data.diagnosticConfigId;
-}
+    m_skipIndexingBigFilesCheckBox = new QCheckBox(Tr::tr("Do not index files greater than"));
+    m_skipIndexingBigFilesCheckBox->setChecked(settings.skipIndexingBigFiles);
 
-ClangDiagnosticConfig ClangdSettings::diagnosticConfig() const
-{
-    return diagnosticConfigsModel(customDiagnosticConfigs()).configWithId(diagnosticConfigId());
-}
+    m_bigFilesLimitSpinBox = new QSpinBox;
+    m_bigFilesLimitSpinBox->setSuffix(Tr::tr("MB"));
+    m_bigFilesLimitSpinBox->setRange(1, 500);
+    m_bigFilesLimitSpinBox->setValue(settings.indexerFileSizeLimitInMb);
 
-ClangdSettings::Granularity ClangdSettings::granularity() const
-{
-    if (m_data.sessionsWithOneClangd.contains(Core::SessionManager::activeSession()))
-        return Granularity::Session;
-    return Granularity::Project;
-}
+    m_ignoreFilesCheckBox = new QCheckBox(Tr::tr("Ignore files"));
+    m_ignoreFilesCheckBox->setToolTip(
+        "<html><head/><body><p>"
+        + Tr::tr("Ignore files that match these wildcard patterns, one wildcard per line.")
+        + "</p></body></html>");
 
-void ClangdSettings::setData(const Data &data)
-{
-    if (this == &instance() && data != m_data) {
-        m_data = data;
-        saveSettings();
-        emit changed();
-    }
-}
+    m_ignoreFilesCheckBox->setChecked(settings.ignoreFiles);
+    m_ignorePatternTextEdit = new QPlainTextEdit(settings.ignorePattern);
+    m_ignorePatternTextEdit->setToolTip(m_ignoreFilesCheckBox->toolTip());
+    m_ignorePatternTextEdit->setEnabled(m_ignoreFilesCheckBox->isChecked());
 
-static FilePath getClangHeadersPathFromClang(const FilePath &clangdFilePath)
-{
-    const FilePath clangFilePath = clangdFilePath.absolutePath().pathAppended("clang")
-            .withExecutableSuffix();
-    if (!clangFilePath.exists())
-        return {};
-    Process clang;
-    clang.setCommand({clangFilePath, {"-print-resource-dir"}});
-    clang.start();
-    if (!clang.waitForFinished())
-        return {};
-    const FilePath resourceDir = FilePath::fromUserInput(QString::fromLocal8Bit(
-            clang.rawStdOut().trimmed()));
-    if (resourceDir.isEmpty() || !resourceDir.exists())
-        return {};
-    const FilePath includeDir = resourceDir.pathAppended("include");
-    if (!includeDir.exists())
-        return {};
-    return includeDir;
-}
+    connect(m_ignoreFilesCheckBox, &QCheckBox::stateChanged, this, [this] {
+        m_ignorePatternTextEdit->setEnabled(m_ignoreFilesCheckBox->isChecked());
+    });
 
-static FilePath getClangHeadersPath(const FilePath &clangdFilePath)
-{
-    const FilePath headersPath = getClangHeadersPathFromClang(clangdFilePath);
-    if (!headersPath.isEmpty())
-        return headersPath;
-
-    const QVersionNumber version = Utils::clangdVersion(clangdFilePath);
-    QTC_ASSERT(!version.isNull(), return {});
-    static const QStringList libDirs{"lib", "lib64"};
-    const QStringList versionStrings{QString::number(version.majorVersion()), version.toString()};
-    for (const QString &libDir : libDirs) {
-        for (const QString &versionString : versionStrings) {
-            const FilePath includePath = clangdFilePath.absolutePath().parentDir()
-                                             .pathAppended(libDir).pathAppended("clang")
-                                             .pathAppended(versionString).pathAppended("include");
-            if (includePath.exists())
-                return includePath;
-        }
+    m_ignorePchCheckBox = new QCheckBox(Tr::tr("Ignore precompiled headers"));
+    m_ignorePchCheckBox->setToolTip(Tr::tr(
+        "<html><head/><body><p>When precompiled headers are not ignored, the parsing for code "
+        "completion and semantic highlighting will process the precompiled header before "
+        "processing any file.</p></body></html>"));
+
+    m_useBuiltinPreprocessorCheckBox = new QCheckBox(Tr::tr("Use built-in preprocessor to show "
+                                                            "pre-processed files"));
+    m_useBuiltinPreprocessorCheckBox->setToolTip
+        (Tr::tr("Uncheck this to invoke the actual compiler "
+                "to show a pre-processed source file in the editor."));
+
+    m_interpretAmbiguousHeadersAsCHeaders->setChecked(settings.interpretAmbigiousHeadersAsC);
+    m_ignorePchCheckBox->setChecked(settings.pchUsage == CppCodeModelSettings::PchUse_None);
+    m_useBuiltinPreprocessorCheckBox->setChecked(settings.useBuiltinPreprocessor);
+
+    using namespace Layouting;
+
+    Column {
+        Group {
+            title(Tr::tr("General")),
+            Column {
+                   m_interpretAmbiguousHeadersAsCHeaders,
+                   m_ignorePchCheckBox,
+                   m_useBuiltinPreprocessorCheckBox,
+                   m_enableIndexingCheckBox,
+                   Row { m_skipIndexingBigFilesCheckBox, m_bigFilesLimitSpinBox, st },
+                   Row { Column { m_ignoreFilesCheckBox, st }, m_ignorePatternTextEdit },
+                   }
+        },
+        st
+    }.attachTo(this);
+
+    for (const QCheckBox *const b : {m_interpretAmbiguousHeadersAsCHeaders,
+                                     m_ignorePchCheckBox,
+                                     m_enableIndexingCheckBox,
+                                     m_useBuiltinPreprocessorCheckBox,
+                                     m_skipIndexingBigFilesCheckBox,
+                                     m_ignoreFilesCheckBox}) {
+        connect(b, &QCheckBox::toggled, this, &CppCodeModelSettingsWidget::settingsDataChanged);
     }
-    QTC_CHECK(false);
-    return {};
-}
-
-FilePath ClangdSettings::clangdIncludePath() const
-{
-    QTC_ASSERT(useClangd(), return {});
-    FilePath clangdPath = clangdFilePath();
-    QTC_ASSERT(!clangdPath.isEmpty() && clangdPath.exists(), return {});
-    static QHash<FilePath, FilePath> headersPathCache;
-    const auto it = headersPathCache.constFind(clangdPath);
-    if (it != headersPathCache.constEnd())
-        return *it;
-    const FilePath headersPath = getClangHeadersPath(clangdPath);
-    if (!headersPath.isEmpty())
-        headersPathCache.insert(clangdPath, headersPath);
-    return headersPath;
-}
-
-FilePath ClangdSettings::clangdUserConfigFilePath()
-{
-    return FilePath::fromString(
-                QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation))
-            / "clangd/config.yaml";
+    connect(m_bigFilesLimitSpinBox, &QSpinBox::valueChanged,
+            this, &CppCodeModelSettingsWidget::settingsDataChanged);
+
+    const auto timer = new QTimer(this);
+    timer->setSingleShot(true);
+    timer->setInterval(1000);
+    connect(timer, &QTimer::timeout, this, &CppCodeModelSettingsWidget::settingsDataChanged);
+    connect(m_ignorePatternTextEdit, &QPlainTextEdit::textChanged,
+            timer, qOverload<>(&QTimer::start));
+}
+
+CppCodeModelSettings CppCodeModelSettingsWidget::settings() const
+{
+    CppCodeModelSettings settings;
+    settings.interpretAmbigiousHeadersAsC = m_interpretAmbiguousHeadersAsCHeaders->isChecked();
+    settings.enableIndexing = m_enableIndexingCheckBox->isChecked();
+    settings.skipIndexingBigFiles = m_skipIndexingBigFilesCheckBox->isChecked();
+    settings.useBuiltinPreprocessor = m_useBuiltinPreprocessorCheckBox->isChecked();
+    settings.ignoreFiles = m_ignoreFilesCheckBox->isChecked();
+    settings.ignorePattern = m_ignorePatternTextEdit->toPlainText();
+    settings.indexerFileSizeLimitInMb = m_bigFilesLimitSpinBox->value();
+    settings.pchUsage = m_ignorePchCheckBox->isChecked() ? CppCodeModelSettings::PchUse_None
+                                                         : CppCodeModelSettings::PchUse_BuildSystem;
+    return settings;
 }
 
-void ClangdSettings::loadSettings()
+class CppCodeModelSettingsPage final : public Core::IOptionsPage
 {
-    const auto settings = Core::ICore::settings();
-
-    m_data.fromMap(Utils::storeFromSettings(clangdSettingsKey(), settings));
-
-    settings->beginGroup(Constants::CPPEDITOR_SETTINGSGROUP);
-    m_data.customDiagnosticConfigs = diagnosticConfigsFromSettings(settings);
-
-    // Pre-8.0 compat
-    static const Key oldKey("ClangDiagnosticConfig");
-    const QVariant configId = settings->value(oldKey);
-    if (configId.isValid()) {
-        m_data.diagnosticConfigId = Id::fromSetting(configId);
-        settings->setValue(oldKey, {});
+public:
+    CppCodeModelSettingsPage()
+    {
+        setId(Constants::CPP_CODE_MODEL_SETTINGS_ID);
+        setDisplayName(Tr::tr("Code Model"));
+        setCategory(Constants::CPP_SETTINGS_CATEGORY);
+        setDisplayCategory(Tr::tr("C++"));
+        setCategoryIconPath(":/projectexplorer/images/settingscategory_cpp.png");
+        setWidgetCreator(
+            [] { return new CppCodeModelSettingsWidget(CppCodeModelSettings::global()); });
     }
+};
 
-    settings->endGroup();
-}
-
-void ClangdSettings::saveSettings()
-{
-    const auto settings = Core::ICore::settings();
-    const ClangdSettings::Data defaultData;
-    Utils::storeToSettingsWithDefault(clangdSettingsKey(),
-                                      settings,
-                                      m_data.toMap(),
-                                      defaultData.toMap());
-    settings->beginGroup(Constants::CPPEDITOR_SETTINGSGROUP);
-    diagnosticConfigsToSettings(settings, m_data.customDiagnosticConfigs);
-    settings->endGroup();
-}
-
-#ifdef WITH_TESTS
-void ClangdSettings::setClangdFilePath(const FilePath &filePath)
-{
-    instance().m_data.executableFilePath = filePath;
-}
-#endif
-
-ClangdProjectSettings::ClangdProjectSettings(ProjectExplorer::Project *project) : m_project(project)
-{
-    loadSettings();
-}
-
-ClangdSettings::Data ClangdProjectSettings::settings() const
-{
-    const ClangdSettings::Data globalData = ClangdSettings::instance().data();
-    ClangdSettings::Data data = globalData;
-    if (!m_useGlobalSettings) {
-        data = m_customSettings;
-    // This property is global by definition.
-    data.sessionsWithOneClangd = ClangdSettings::instance().data().sessionsWithOneClangd;
-
-    // This list exists only once.
-    data.customDiagnosticConfigs = ClangdSettings::instance().data().customDiagnosticConfigs;
-}
-    if (m_blockIndexing)
-        data.indexingPriority = ClangdSettings::IndexingPriority::Off;
-    return data;
-}
-
-void ClangdProjectSettings::setSettings(const ClangdSettings::Data &data)
-{
-    m_customSettings = data;
-    saveSettings();
-    ClangdSettings::setCustomDiagnosticConfigs(data.customDiagnosticConfigs);
-    emit ClangdSettings::instance().changed();
-}
-
-void ClangdProjectSettings::setUseGlobalSettings(bool useGlobal)
+void setupCppCodeModelSettingsPage()
 {
-    m_useGlobalSettings = useGlobal;
-    saveSettings();
-    emit ClangdSettings::instance().changed();
+    static CppCodeModelSettingsPage theCppCodeModelSettingsPage;
 }
 
-void ClangdProjectSettings::setDiagnosticConfigId(Utils::Id configId)
+class CppCodeModelProjectSettingsWidget : public ProjectSettingsWidget
 {
-    m_customSettings.diagnosticConfigId = configId;
-    saveSettings();
-    emit ClangdSettings::instance().changed();
-}
+public:
+    CppCodeModelProjectSettingsWidget(const CppCodeModelProjectSettings &settings)
+        : m_settings(settings), m_widget(settings.settings())
+    {
+        setGlobalSettingsId(Constants::CPP_CODE_MODEL_SETTINGS_ID);
+        const auto layout = new QVBoxLayout(this);
+        layout->setContentsMargins(0, 0, 0, 0);
+        layout->addWidget(&m_widget);
 
-void ClangdProjectSettings::blockIndexing()
-{
-    if (m_blockIndexing)
-        return;
-    m_blockIndexing = true;
-    saveSettings();
-    emit ClangdSettings::instance().changed();
-}
-
-void ClangdProjectSettings::unblockIndexing()
-{
-    if (!m_blockIndexing)
-        return;
-    m_blockIndexing = false;
-    saveSettings();
-    // Do not emit changed here since that would restart clients with blocked indexing
-}
+        setUseGlobalSettings(m_settings.useGlobalSettings());
+        m_widget.setEnabled(!useGlobalSettings());
+        connect(this, &ProjectSettingsWidget::useGlobalSettingsChanged, this,
+                [this](bool checked) {
+                    m_widget.setEnabled(!checked);
+                    m_settings.setUseGlobalSettings(checked);
+                    if (!checked)
+                        m_settings.setSettings(m_widget.settings());
+                });
 
-void ClangdProjectSettings::loadSettings()
-{
-    if (!m_project)
-        return;
-    const Store data = storeFromVariant(m_project->namedSettings(clangdSettingsKey()));
-    m_useGlobalSettings = data.value(useGlobalSettingsKey(), true).toBool();
-    m_blockIndexing = data.value(clangdblockIndexingSettingsKey(), false).toBool();
-    if (!m_useGlobalSettings)
-        m_customSettings.fromMap(data);
-}
-
-void ClangdProjectSettings::saveSettings()
-{
-    if (!m_project)
-        return;
-    Store data;
-    if (!m_useGlobalSettings)
-        data = m_customSettings.toMap();
-    data.insert(useGlobalSettingsKey(), m_useGlobalSettings);
-    data.insert(clangdblockIndexingSettingsKey(), m_blockIndexing);
-    m_project->setNamedSettings(clangdSettingsKey(), variantFromStore(data));
-}
-
-Store ClangdSettings::Data::toMap() const
-{
-    Store map;
-
-    map.insert(useClangdKey(), useClangd);
-
-    map.insert(clangdPathKey(),
-               executableFilePath != fallbackClangdFilePath() ? executableFilePath.toString()
-                                                              : QString());
-
-    map.insert(clangdIndexingKey(), indexingPriority != IndexingPriority::Off);
-    map.insert(clangdIndexingPriorityKey(), int(indexingPriority));
-    map.insert(clangdProjectIndexPathKey(), projectIndexPathTemplate);
-    map.insert(clangdSessionIndexPathKey(), sessionIndexPathTemplate);
-    map.insert(clangdHeaderSourceSwitchModeKey(), int(headerSourceSwitchMode));
-    map.insert(clangdCompletionRankingModelKey(), int(completionRankingModel));
-    map.insert(clangdHeaderInsertionKey(), autoIncludeHeaders);
-    map.insert(clangdThreadLimitKey(), workerThreadLimit);
-    map.insert(clangdDocumentThresholdKey(), documentUpdateThreshold);
-    map.insert(clangdSizeThresholdEnabledKey(), sizeThresholdEnabled);
-    map.insert(clangdSizeThresholdKey(), sizeThresholdInKb);
-    map.insert(sessionsWithOneClangdKey(), sessionsWithOneClangd);
-    map.insert(diagnosticConfigIdKey(), diagnosticConfigId.toSetting());
-    map.insert(checkedHardwareKey(), haveCheckedHardwareReqirements);
-    map.insert(completionResultsKey(), completionResults);
-    return map;
-}
-
-void ClangdSettings::Data::fromMap(const Store &map)
-{
-    useClangd = map.value(useClangdKey(), true).toBool();
-    executableFilePath = FilePath::fromString(map.value(clangdPathKey()).toString());
-    indexingPriority = IndexingPriority(
-        map.value(clangdIndexingPriorityKey(), int(this->indexingPriority)).toInt());
-    const auto it = map.find(clangdIndexingKey());
-    if (it != map.end() && !it->toBool())
-        indexingPriority = IndexingPriority::Off;
-    projectIndexPathTemplate
-        = map.value(clangdProjectIndexPathKey(), defaultProjectIndexPathTemplate()).toString();
-    sessionIndexPathTemplate
-        = map.value(clangdSessionIndexPathKey(), defaultSessionIndexPathTemplate()).toString();
-    headerSourceSwitchMode = HeaderSourceSwitchMode(map.value(clangdHeaderSourceSwitchModeKey(),
-                                                              int(headerSourceSwitchMode)).toInt());
-    completionRankingModel = CompletionRankingModel(map.value(clangdCompletionRankingModelKey(),
-                                                              int(completionRankingModel)).toInt());
-    autoIncludeHeaders = map.value(clangdHeaderInsertionKey(), false).toBool();
-    workerThreadLimit = map.value(clangdThreadLimitKey(), 0).toInt();
-    documentUpdateThreshold = map.value(clangdDocumentThresholdKey(), 500).toInt();
-    sizeThresholdEnabled = map.value(clangdSizeThresholdEnabledKey(), false).toBool();
-    sizeThresholdInKb = map.value(clangdSizeThresholdKey(), 1024).toLongLong();
-    sessionsWithOneClangd = map.value(sessionsWithOneClangdKey()).toStringList();
-    diagnosticConfigId = Id::fromSetting(map.value(diagnosticConfigIdKey(),
-                                                   initialClangDiagnosticConfigId().toSetting()));
-    haveCheckedHardwareReqirements = map.value(checkedHardwareKey(), false).toBool();
-    completionResults = map.value(completionResultsKey(), defaultCompletionResults()).toInt();
-}
+        connect(&m_widget, &CppCodeModelSettingsWidget::settingsDataChanged,
+                this, [this] { m_settings.setSettings(m_widget.settings()); });
+    }
 
-int ClangdSettings::Data::defaultCompletionResults()
+private:
+    CppCodeModelProjectSettings m_settings;
+    CppCodeModelSettingsWidget m_widget;
+};
+
+class CppCodeModelProjectSettingsPanelFactory final : public ProjectPanelFactory
+{
+public:
+    CppCodeModelProjectSettingsPanelFactory()
+    {
+        setPriority(100);
+        setDisplayName(Tr::tr("C++ Code Model"));
+        setCreateWidgetFunction([](Project *project) {
+            return new CppCodeModelProjectSettingsWidget(project);
+        });
+    }
+};
+void setupCppCodeModelProjectSettingsPanel()
 {
-    // Default clangd --limit-results value is 100
-    bool ok = false;
-    const int userValue = qtcEnvironmentVariableIntValue("QTC_CLANGD_COMPLETION_RESULTS", &ok);
-    return ok ? userValue : 100;
+    static CppCodeModelProjectSettingsPanelFactory factory;
 }
 
+} // namespace Internal
 } // namespace CppEditor
+
+#include <cppcodemodelsettings.moc>
diff --git a/src/plugins/cppeditor/cppcodemodelsettings.h b/src/plugins/cppeditor/cppcodemodelsettings.h
index 19cc078b26..9bf2b6862d 100644
--- a/src/plugins/cppeditor/cppcodemodelsettings.h
+++ b/src/plugins/cppeditor/cppcodemodelsettings.h
@@ -3,259 +3,79 @@
 
 #pragma once
 
-#include "clangdiagnosticconfig.h"
 #include "cppeditor_global.h"
 
-#include <utils/clangutils.h>
-#include <utils/filepath.h>
-#include <utils/id.h>
 #include <utils/store.h>
-#include <utils/qtcsettings.h>
-
-#include <QObject>
-#include <QStringList>
-#include <QVersionNumber>
 
 namespace ProjectExplorer { class Project; }
 namespace Utils {
-class MacroExpander;
-} // namespace Utils
+class FilePath;
+class QtcSettings;
+}
 
 namespace CppEditor {
 enum class UsePrecompiledHeaders;
 
-class CPPEDITOR_EXPORT CppCodeModelSettings : public QObject
+class CPPEDITOR_EXPORT CppCodeModelSettings
 {
-    Q_OBJECT
-
 public:
     enum PCHUsage {
         PchUse_None = 1,
         PchUse_BuildSystem = 2
     };
 
-    class Data
-    {
-    public:
-        Data() = default;
-        Data(const Utils::Store &store) { fromMap(store); }
-        Utils::Store toMap() const;
-        void fromMap(const Utils::Store &store);
-
-        friend bool operator==(const Data &s1, const Data &s2);
-        friend bool operator!=(const Data &s1, const Data &s2) { return !(s1 == s2); }
+    CppCodeModelSettings() = default;
+    CppCodeModelSettings(const Utils::Store &store) { fromMap(store); }
 
-        PCHUsage pchUsage = PchUse_BuildSystem;
-        bool interpretAmbigiousHeadersAsC = false;
-        bool skipIndexingBigFiles = true;
-        bool useBuiltinPreprocessor = true;
-        int indexerFileSizeLimitInMb = 5;
-        bool categorizeFindReferences = false; // Ephemeral!
-        bool ignoreFiles = false;
-        QString ignorePattern;
-    };
+    friend bool operator==(const CppCodeModelSettings &s1, const CppCodeModelSettings &s2);
+    friend bool operator!=(const CppCodeModelSettings &s1, const CppCodeModelSettings &s2)
+    {
+        return !(s1 == s2);
+    }
 
-    CppCodeModelSettings(const Data &data) : m_data(data) {}
+    Utils::Store toMap() const;
+    void fromMap(const Utils::Store &store);
 
-    static CppCodeModelSettings &globalInstance(); // TODO: Make inaccessible.
     static CppCodeModelSettings settingsForProject(const ProjectExplorer::Project *project);
     static CppCodeModelSettings settingsForProject(const Utils::FilePath &projectFile);
     static CppCodeModelSettings settingsForFile(const Utils::FilePath &file);
+    static bool hasCustomSettings(const ProjectExplorer::Project *project);
+    static void setSettingsForProject(ProjectExplorer::Project *project,
+                                      const CppCodeModelSettings &settings);
 
-    static void setGlobalData(const Data &data); // TODO: Make inaccessible.
-    void setData(const Data &data) { m_data = data; }
-    Data data() const { return m_data; }
+    static const CppCodeModelSettings &global() { return globalInstance(); }
+    static void setGlobal(const CppCodeModelSettings &settings);
 
-    PCHUsage pchUsage() const { return m_data.pchUsage; }
-    static PCHUsage pchUsage(const ProjectExplorer::Project *project);
+    static PCHUsage pchUsageForProject(const ProjectExplorer::Project *project);
     UsePrecompiledHeaders usePrecompiledHeaders() const;
     static UsePrecompiledHeaders usePrecompiledHeaders(const ProjectExplorer::Project *project);
 
-    bool interpretAmbigiousHeadersAsC() const { return m_data.interpretAmbigiousHeadersAsC; }
-    bool skipIndexingBigFiles() const { return m_data.skipIndexingBigFiles; }
-    bool useBuiltinPreprocessor() const { return m_data.useBuiltinPreprocessor; }
-    int indexerFileSizeLimitInMb() const { return m_data.indexerFileSizeLimitInMb; }
     int effectiveIndexerFileSizeLimitInMb() const;
-    bool ignoreFiles() const { return m_data.ignoreFiles; }
-    QString ignorePattern() const { return m_data.ignorePattern; }
 
     static bool categorizeFindReferences();
     static void setCategorizeFindReferences(bool categorize);
 
-signals:
-    void changed(ProjectExplorer::Project *project);
+    QString ignorePattern;
+    PCHUsage pchUsage = PchUse_BuildSystem;
+    int indexerFileSizeLimitInMb = 5;
+    bool interpretAmbigiousHeadersAsC = false;
+    bool skipIndexingBigFiles = true;
+    bool useBuiltinPreprocessor = true;
+    bool ignoreFiles = false;
+    bool enableIndexing = true;
+    bool m_categorizeFindReferences = false; // Ephemeral!
 
 private:
-    CppCodeModelSettings() = default;
     CppCodeModelSettings(Utils::QtcSettings *s) { fromSettings(s); }
+    static CppCodeModelSettings &globalInstance();
 
     void toSettings(Utils::QtcSettings *s);
     void fromSettings(Utils::QtcSettings *s);
-
-    Data m_data;
 };
 
-class CppCodeModelProjectSettings
-{
-public:
-    CppCodeModelProjectSettings(ProjectExplorer::Project *project);
-
-    CppCodeModelSettings::Data data() const;
-    void setData(const CppCodeModelSettings::Data &data);
-    bool useGlobalSettings() const { return m_useGlobalSettings; }
-    void setUseGlobalSettings(bool useGlobal);
-
-private:
-    void loadSettings();
-    void saveSettings();
-
-    ProjectExplorer::Project * const m_project;
-    CppCodeModelSettings::Data m_customSettings;
-    bool m_useGlobalSettings = true;
-};
-
-class CPPEDITOR_EXPORT ClangdSettings : public QObject
-{
-    Q_OBJECT
-public:
-    enum class IndexingPriority { Off, Background, Normal, Low, };
-    enum class HeaderSourceSwitchMode { BuiltinOnly, ClangdOnly, Both };
-    enum class CompletionRankingModel { Default, DecisionForest, Heuristics };
-
-    static QString priorityToString(const IndexingPriority &priority);
-    static QString priorityToDisplayString(const IndexingPriority &priority);
-    static QString headerSourceSwitchModeToDisplayString(HeaderSourceSwitchMode mode);
-    static QString rankingModelToCmdLineString(CompletionRankingModel model);
-    static QString rankingModelToDisplayString(CompletionRankingModel model);
-    static QString defaultProjectIndexPathTemplate();
-    static QString defaultSessionIndexPathTemplate();
-
-    class CPPEDITOR_EXPORT Data
-    {
-    public:
-        Utils::Store toMap() const;
-        void fromMap(const Utils::Store &map);
-
-        friend bool operator==(const Data &s1, const Data &s2)
-        {
-            return s1.useClangd == s2.useClangd
-                    && s1.executableFilePath == s2.executableFilePath
-                    && s1.projectIndexPathTemplate == s2.projectIndexPathTemplate
-                    && s1.sessionIndexPathTemplate == s2.sessionIndexPathTemplate
-                    && s1.sessionsWithOneClangd == s2.sessionsWithOneClangd
-                    && s1.customDiagnosticConfigs == s2.customDiagnosticConfigs
-                    && s1.diagnosticConfigId == s2.diagnosticConfigId
-                    && s1.workerThreadLimit == s2.workerThreadLimit
-                    && s1.indexingPriority == s2.indexingPriority
-                    && s1.headerSourceSwitchMode == s2.headerSourceSwitchMode
-                    && s1.completionRankingModel == s2.completionRankingModel
-                    && s1.autoIncludeHeaders == s2.autoIncludeHeaders
-                    && s1.documentUpdateThreshold == s2.documentUpdateThreshold
-                    && s1.sizeThresholdEnabled == s2.sizeThresholdEnabled
-                    && s1.sizeThresholdInKb == s2.sizeThresholdInKb
-                    && s1.haveCheckedHardwareReqirements == s2.haveCheckedHardwareReqirements
-                    && s1.completionResults == s2.completionResults;
-        }
-        friend bool operator!=(const Data &s1, const Data &s2) { return !(s1 == s2); }
-
-        Utils::FilePath executableFilePath;
-        QStringList sessionsWithOneClangd;
-        ClangDiagnosticConfigs customDiagnosticConfigs;
-        Utils::Id diagnosticConfigId;
-
-        int workerThreadLimit = 0;
-        int documentUpdateThreshold = 500;
-        qint64 sizeThresholdInKb = 1024;
-        bool useClangd = true;
-        IndexingPriority indexingPriority = IndexingPriority::Low;
-        QString projectIndexPathTemplate = defaultProjectIndexPathTemplate();
-        QString sessionIndexPathTemplate = defaultSessionIndexPathTemplate();
-        HeaderSourceSwitchMode headerSourceSwitchMode = HeaderSourceSwitchMode::Both;
-        CompletionRankingModel completionRankingModel = CompletionRankingModel::Default;
-        bool autoIncludeHeaders = false;
-        bool sizeThresholdEnabled = false;
-        bool haveCheckedHardwareReqirements = false;
-        int completionResults = defaultCompletionResults();
-
-    private:
-        static int defaultCompletionResults();
-    };
-
-    ClangdSettings(const Data &data) : m_data(data) {}
-
-    static ClangdSettings &instance();
-    bool useClangd() const;
-    static void setUseClangd(bool use);
-    static void setUseClangdAndSave(bool use);
-
-    static bool hardwareFulfillsRequirements();
-    static bool haveCheckedHardwareRequirements();
-
-    static void setDefaultClangdPath(const Utils::FilePath &filePath);
-    static void setCustomDiagnosticConfigs(const ClangDiagnosticConfigs &configs);
-    Utils::FilePath clangdFilePath() const;
-    IndexingPriority indexingPriority() const { return m_data.indexingPriority; }
-    Utils::FilePath projectIndexPath(const Utils::MacroExpander &expander) const;
-    Utils::FilePath sessionIndexPath(const Utils::MacroExpander &expander) const;
-    HeaderSourceSwitchMode headerSourceSwitchMode() const { return m_data.headerSourceSwitchMode; }
-    CompletionRankingModel completionRankingModel() const { return m_data.completionRankingModel; }
-    bool autoIncludeHeaders() const { return m_data.autoIncludeHeaders; }
-    int workerThreadLimit() const { return m_data.workerThreadLimit; }
-    int documentUpdateThreshold() const { return m_data.documentUpdateThreshold; }
-    qint64 sizeThresholdInKb() const { return m_data.sizeThresholdInKb; }
-    bool sizeThresholdEnabled() const { return m_data.sizeThresholdEnabled; }
-    int completionResults() const { return m_data.completionResults; }
-    bool sizeIsOkay(const Utils::FilePath &fp) const;
-    ClangDiagnosticConfigs customDiagnosticConfigs() const;
-    Utils::Id diagnosticConfigId() const;
-    ClangDiagnosticConfig diagnosticConfig() const;
-
-    enum class Granularity { Project, Session };
-    Granularity granularity() const;
-
-    void setData(const Data &data);
-    Data data() const { return m_data; }
-
-    Utils::FilePath clangdIncludePath() const;
-    static Utils::FilePath clangdUserConfigFilePath();
-
-#ifdef WITH_TESTS
-    static void setClangdFilePath(const Utils::FilePath &filePath);
-#endif
-
-signals:
-    void changed();
-
-private:
-    ClangdSettings();
-
-    void loadSettings();
-    void saveSettings();
-
-    Data m_data;
-};
-
-class CPPEDITOR_EXPORT ClangdProjectSettings
-{
-public:
-    ClangdProjectSettings(ProjectExplorer::Project *project);
-
-    ClangdSettings::Data settings() const;
-    void setSettings(const ClangdSettings::Data &data);
-    bool useGlobalSettings() const { return m_useGlobalSettings; }
-    void setUseGlobalSettings(bool useGlobal);
-    void setDiagnosticConfigId(Utils::Id configId);
-    void blockIndexing();
-    void unblockIndexing();
-
-private:
-    void loadSettings();
-    void saveSettings();
-
-    ProjectExplorer::Project * const m_project;
-    ClangdSettings::Data m_customSettings;
-    bool m_useGlobalSettings = true;
-    bool m_blockIndexing = false;
-};
+namespace Internal {
+void setupCppCodeModelSettingsPage();
+void setupCppCodeModelProjectSettingsPanel();
+} // namespace Internal
 
 } // namespace CppEditor
diff --git a/src/plugins/cppeditor/cppcodemodelsettingspage.h b/src/plugins/cppeditor/cppcodemodelsettingspage.h
deleted file mode 100644
index 4c11b6251e..0000000000
--- a/src/plugins/cppeditor/cppcodemodelsettingspage.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#pragma once
-
-namespace CppEditor::Internal {
-
-void setupCppCodeModelSettingsPage();
-void setupCppCodeModelProjectSettingsPanel();
-void setupClangdProjectSettingsPanel();
-void setupClangdSettingsPage();
-
-} // CppEditor::Internal
diff --git a/src/plugins/cppeditor/cppcompletion_test.cpp b/src/plugins/cppeditor/cppcompletion_test.cpp
index fdc30e16be..6f152c65a6 100644
--- a/src/plugins/cppeditor/cppcompletion_test.cpp
+++ b/src/plugins/cppeditor/cppcompletion_test.cpp
@@ -2889,6 +2889,16 @@ void CompletionTest::testCompletionMemberAccessOperator_data()
         ) << _("p->") << QStringList({"S", "m"})
         << false
         << false;
+    QTest::newRow("dot to arrow: template + reference + double typedef")
+        << _("template <typename T> struct C {\n"
+             "    using ref = T &;\n"
+             "    ref operator[](int i);\n"
+             "};\n"
+             "struct S { int m; };\n"
+             "template<typename T> using CS = C<T>;\n"
+             "CS<S *> v;\n"
+             "@\n")
+        << _("v[0].") << QStringList({"S", "m"}) << false << true;
 }
 
 } // namespace CppEditor::Internal
diff --git a/src/plugins/cppeditor/cppeditor.qbs b/src/plugins/cppeditor/cppeditor.qbs
index b684b0e0ea..c535488de9 100644
--- a/src/plugins/cppeditor/cppeditor.qbs
+++ b/src/plugins/cppeditor/cppeditor.qbs
@@ -45,6 +45,8 @@ QtcPlugin {
         "clangdiagnosticconfigsselectionwidget.h",
         "clangdiagnosticconfigswidget.cpp",
         "clangdiagnosticconfigswidget.h",
+        "clangdsettings.cpp",
+        "clangdsettings.h",
         "compileroptionsbuilder.cpp",
         "compileroptionsbuilder.h",
         "cppautocompleter.cpp",
@@ -63,8 +65,6 @@ QtcPlugin {
         "cppcodemodelinspectordumper.h",
         "cppcodemodelsettings.cpp",
         "cppcodemodelsettings.h",
-        "cppcodemodelsettingspage.cpp",
-        "cppcodemodelsettingspage.h",
         "cppcodestylepreferences.cpp",
         "cppcodestylepreferences.h",
         "cppcodestylepreferencesfactory.cpp",
diff --git a/src/plugins/cppeditor/cppeditor.qrc b/src/plugins/cppeditor/cppeditor.qrc
index c28111d21e..e90b587dc2 100644
--- a/src/plugins/cppeditor/cppeditor.qrc
+++ b/src/plugins/cppeditor/cppeditor.qrc
@@ -4,5 +4,42 @@
         <file>images/dark_qt_h.png</file>
         <file>images/dark_qt_c.png</file>
         <file>testcases/highlightingtestcase.cpp</file>
+        <file>testcases/move-class/complex/complex.pro</file>
+        <file>testcases/move-class/complex/main.cpp</file>
+        <file>testcases/move-class/complex/main.cpp_expected</file>
+        <file>testcases/move-class/complex/theclass.cpp_expected</file>
+        <file>testcases/move-class/complex/theheader.h</file>
+        <file>testcases/move-class/complex/theheader.h_expected</file>
+        <file>testcases/move-class/complex/thesource.cpp</file>
+        <file>testcases/move-class/complex/thesource.cpp_expected</file>
+        <file>testcases/move-class/complex/complex.pro_expected</file>
+        <file>testcases/move-class/nested/main.cpp</file>
+        <file>testcases/move-class/nested/nested.pro</file>
+        <file>testcases/move-class/match1/match1.pro</file>
+        <file>testcases/move-class/match1/TheClass.h</file>
+        <file>testcases/move-class/match2/match2.pro</file>
+        <file>testcases/move-class/match2/theclass.h</file>
+        <file>testcases/move-class/match3/match3.pro</file>
+        <file>testcases/move-class/match3/the_class.h</file>
+        <file>testcases/move-class/single/single.pro</file>
+        <file>testcases/move-class/single/theheader.h</file>
+        <file>testcases/move-class/header-only/header-only.pro</file>
+        <file>testcases/move-class/header-only/header-only.pro_expected</file>
+        <file>testcases/move-class/header-only/theclass.h_expected</file>
+        <file>testcases/move-class/header-only/theheader.h</file>
+        <file>testcases/move-class/header-only/thesource.cpp</file>
+        <file>testcases/move-class/header-only/theheader.h_expected</file>
+        <file>testcases/move-class/header-only/thesource.cpp_expected</file>
+        <file>testcases/move-class/decl-in-source/decl-in-source.pro</file>
+        <file>testcases/move-class/decl-in-source/decl-in-source.pro_expected</file>
+        <file>testcases/move-class/decl-in-source/theclass.h_expected</file>
+        <file>testcases/move-class/decl-in-source/thesource.cpp</file>
+        <file>testcases/move-class/decl-in-source/thesource.cpp_expected</file>
+        <file>testcases/move-class/template/template.pro</file>
+        <file>testcases/move-class/template/template.pro_expected</file>
+        <file>testcases/move-class/template/theclass.h_expected</file>
+        <file>testcases/move-class/template/theheader.h</file>
+        <file>testcases/move-class/template/theheader.h_expected</file>
+        <file>testcases/move-class/complex/theclass.h_expected</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/cppeditor/cppeditorplugin.cpp b/src/plugins/cppeditor/cppeditorplugin.cpp
index 4328c93970..6718d4cbc8 100644
--- a/src/plugins/cppeditor/cppeditorplugin.cpp
+++ b/src/plugins/cppeditor/cppeditorplugin.cpp
@@ -1,10 +1,10 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
+#include "clangdsettings.h"
 #include "cppautocompleter.h"
 #include "cppcodemodelinspectordialog.h"
 #include "cppcodemodelsettings.h"
-#include "cppcodemodelsettingspage.h"
 #include "cppcodestylesettingspage.h"
 #include "cppeditorconstants.h"
 #include "cppeditordocument.h"
@@ -75,7 +75,6 @@
 #include <texteditor/colorpreviewhoverhandler.h>
 #include <texteditor/snippets/snippetprovider.h>
 #include <texteditor/texteditor.h>
-#include <texteditor/texteditoractionhandler.h>
 #include <texteditor/texteditorconstants.h>
 
 #include <utils/algorithm.h>
@@ -139,14 +138,14 @@ public:
         setCodeFoldingSupported(true);
         setParenthesesMatchingEnabled(true);
 
-        setEditorActionHandlers(TextEditorActionHandler::Format
-                                | TextEditorActionHandler::UnCommentSelection
-                                | TextEditorActionHandler::UnCollapseAll
-                                | TextEditorActionHandler::FollowSymbolUnderCursor
-                                | TextEditorActionHandler::FollowTypeUnderCursor
-                                | TextEditorActionHandler::RenameSymbol
-                                | TextEditorActionHandler::TypeHierarchy
-                                | TextEditorActionHandler::FindUsage);
+        setOptionalActionMask(OptionalActions::Format
+                                | OptionalActions::UnCommentSelection
+                                | OptionalActions::UnCollapseAll
+                                | OptionalActions::FollowSymbolUnderCursor
+                                | OptionalActions::FollowTypeUnderCursor
+                                | OptionalActions::RenameSymbol
+                                | OptionalActions::TypeHierarchy
+                                | OptionalActions::FindUsage);
     }
 };
 
@@ -205,7 +204,7 @@ void CppEditorPlugin::initialize()
     setupCppQuickFixSettings();
     setupCppCodeModelSettingsPage();
     provideCppSettingsRetriever([](const Project *p) {
-        return CppCodeModelSettings::settingsForProject(p).data().toMap();
+        return CppCodeModelSettings::settingsForProject(p).toMap();
     });
     setupCppOutline();
     setupCppCodeStyleSettings();
diff --git a/src/plugins/cppeditor/cppindexingsupport.cpp b/src/plugins/cppeditor/cppindexingsupport.cpp
index 1d637f6e8a..73e3fafff3 100644
--- a/src/plugins/cppeditor/cppindexingsupport.cpp
+++ b/src/plugins/cppeditor/cppindexingsupport.cpp
@@ -219,21 +219,22 @@ static void index(QPromise<void> &promise, const ParseParams params)
     qCDebug(indexerLog) << "Indexing finished.";
 }
 
-static void parse(QPromise<void> &promise, const ParseParams &params)
+static void parse(
+    QPromise<void> &promise,
+    const std::function<QSet<QString>()> &sourceFiles,
+    const ProjectExplorer::HeaderPaths &headerPaths,
+    const WorkingCopy &workingCopy)
 {
-    const QSet<QString> &files = params.sourceFiles;
-    if (files.isEmpty())
-        return;
-
-    promise.setProgressRange(0, files.size());
+    ParseParams params{headerPaths, workingCopy, sourceFiles()};
+    promise.setProgressRange(0, params.sourceFiles.size());
 
     if (CppIndexingSupport::isFindErrorsIndexingActive())
         indexFindErrors(promise, params);
     else
         index(promise, params);
 
-    promise.setProgressValue(files.size());
-    CppModelManager::finishedRefreshingSourceFiles(files);
+    promise.setProgressValue(params.sourceFiles.size());
+    CppModelManager::finishedRefreshingSourceFiles(params.sourceFiles);
 }
 
 } // anonymous namespace
@@ -300,18 +301,19 @@ bool CppIndexingSupport::isFindErrorsIndexingActive()
     return Utils::qtcEnvironmentVariable("QTC_FIND_ERRORS_INDEXING") == "1";
 }
 
-QFuture<void> CppIndexingSupport::refreshSourceFiles(const QSet<QString> &sourceFiles,
-                                                     CppModelManager::ProgressNotificationMode mode)
+QFuture<void> CppIndexingSupport::refreshSourceFiles(
+    const std::function<QSet<QString>()> &sourceFiles,
+    CppModelManager::ProgressNotificationMode mode)
 {
-    ParseParams params;
-    params.headerPaths = CppModelManager::headerPaths();
-    params.workingCopy = CppModelManager::workingCopy();
-    params.sourceFiles = sourceFiles;
-
-    QFuture<void> result = Utils::asyncRun(CppModelManager::sharedThreadPool(), parse, params);
+    QFuture<void> result = Utils::asyncRun(
+        CppModelManager::sharedThreadPool(),
+        parse,
+        sourceFiles,
+        CppModelManager::headerPaths(),
+        CppModelManager::workingCopy());
     m_synchronizer.addFuture(result);
 
-    if (mode == CppModelManager::ForcedProgressNotification || sourceFiles.count() > 1) {
+    if (mode == CppModelManager::ForcedProgressNotification) {
         Core::ProgressManager::addTask(result, Tr::tr("Parsing C/C++ Files"),
                                        CppEditor::Constants::TASK_INDEX);
     }
diff --git a/src/plugins/cppeditor/cppindexingsupport.h b/src/plugins/cppeditor/cppindexingsupport.h
index c04eb8ba76..f32498fa5e 100644
--- a/src/plugins/cppeditor/cppindexingsupport.h
+++ b/src/plugins/cppeditor/cppindexingsupport.h
@@ -11,6 +11,8 @@
 
 #include <QFuture>
 
+#include <functional>
+
 namespace Utils { class SearchResultItem; }
 
 namespace CppEditor {
@@ -59,8 +61,10 @@ class CPPEDITOR_EXPORT CppIndexingSupport
 public:
     static bool isFindErrorsIndexingActive();
 
-    QFuture<void> refreshSourceFiles(const QSet<QString> &sourceFiles,
-                                     CppModelManager::ProgressNotificationMode mode);
+    QFuture<void> refreshSourceFiles(
+        const std::function<QSet<QString>()> &sourceFiles,
+        CppModelManager::ProgressNotificationMode mode);
+
 private:
     Utils::FutureSynchronizer m_synchronizer;
 };
diff --git a/src/plugins/cppeditor/cppmodelmanager.cpp b/src/plugins/cppeditor/cppmodelmanager.cpp
index 5ea954add4..fbb727eb72 100644
--- a/src/plugins/cppeditor/cppmodelmanager.cpp
+++ b/src/plugins/cppeditor/cppmodelmanager.cpp
@@ -77,6 +77,7 @@
 #include <QDebug>
 #include <QDir>
 #include <QFutureWatcher>
+#include <QHash>
 #include <QMutexLocker>
 #include <QReadLocker>
 #include <QReadWriteLock>
@@ -89,6 +90,7 @@
 #include <QWriteLocker>
 
 #include <memory>
+#include <unordered_map>
 
 #if defined(QTCREATOR_WITH_DUMP_AST) && defined(Q_CC_GNU)
 #define WITH_AST_DUMP
@@ -407,7 +409,7 @@ void CppModelManager::showPreprocessedFile(bool inNextSplit)
         saveAndOpen(outFilePath, content.append(preprocessedDoc->utf8Source()), inNextSplit);
     };
 
-    if (CppCodeModelSettings::settingsForFile(filePath).useBuiltinPreprocessor()) {
+    if (CppCodeModelSettings::settingsForFile(filePath).useBuiltinPreprocessor) {
         useBuiltinPreprocessor();
         return;
     }
@@ -1023,9 +1025,6 @@ CppModelManager::CppModelManager()
     connect(ICore::instance(), &ICore::coreAboutToClose,
             this, &CppModelManager::onCoreAboutToClose);
 
-    connect(&CppCodeModelSettings::globalInstance(), &CppCodeModelSettings::changed,
-            this, &CppModelManager::onSettingsChange);
-
     d->m_fallbackProjectPartTimer.setSingleShot(true);
     d->m_fallbackProjectPartTimer.setInterval(5000);
     connect(&d->m_fallbackProjectPartTimer, &QTimer::timeout,
@@ -1304,16 +1303,19 @@ CppLocatorData *CppModelManager::locatorData()
     return &d->m_locatorData;
 }
 
-static QSet<QString> filteredFilesRemoved(const QSet<QString> &files, int fileSizeLimitInMb,
-                                          bool ignoreFiles,
-                                          const QString& ignorePattern)
+static QSet<QString> filteredFilesRemoved(const QSet<QString> &files,
+                                          const CppCodeModelSettings &settings)
 {
-    if (fileSizeLimitInMb <= 0 && !ignoreFiles)
+    if (!settings.enableIndexing)
+        return {};
+
+    const int fileSizeLimitInMb = settings.effectiveIndexerFileSizeLimitInMb();
+    if (fileSizeLimitInMb <= 0 && !settings.ignoreFiles)
         return files;
 
     QSet<QString> result;
     QList<QRegularExpression> regexes;
-    const QStringList wildcards = ignorePattern.split('\n');
+    const QStringList wildcards = settings.ignorePattern.split('\n');
 
     for (const QString &wildcard : wildcards)
         regexes.append(QRegularExpression::fromWildcard(wildcard, Qt::CaseInsensitive,
@@ -1324,7 +1326,7 @@ static QSet<QString> filteredFilesRemoved(const QSet<QString> &files, int fileSi
         if (fileSizeLimitInMb > 0 && fileSizeExceedsLimit(filePath, fileSizeLimitInMb))
             continue;
         bool skip = false;
-        if (ignoreFiles) {
+        if (settings.ignoreFiles) {
             for (const QRegularExpression &rx: std::as_const(regexes)) {
                 QRegularExpressionMatch match = rx.match(filePath.absoluteFilePath().path());
                 if (match.hasMatch()) {
@@ -1352,18 +1354,25 @@ QFuture<void> CppModelManager::updateSourceFiles(const QSet<FilePath> &sourceFil
     if (sourceFiles.isEmpty() || !d->m_indexerEnabled)
         return QFuture<void>();
 
-    QHash<Project *, QSet<QString>> sourcesPerProject; // TODO: Work with QList from here on?
+    std::unordered_map<Project *, QSet<QString>> sourcesPerProject;
     for (const FilePath &fp : sourceFiles)
         sourcesPerProject[ProjectManager::projectForFile(fp)] << fp.toString();
-    QSet<QString> filteredFiles;
-    for (auto it = sourcesPerProject.cbegin(); it != sourcesPerProject.cend(); ++it) {
-        const CppCodeModelSettings settings = CppCodeModelSettings::settingsForProject(it.key());
-        filteredFiles.unite(filteredFilesRemoved(it.value(),
-                                                 settings.effectiveIndexerFileSizeLimitInMb(),
-                                                 settings.ignoreFiles(),
-                                                 settings.ignorePattern()));
+    std::vector<std::pair<QSet<QString>, CppCodeModelSettings>> sourcesAndSettings;
+    for (const auto &it : sourcesPerProject) {
+        sourcesAndSettings
+            .emplace_back(it.second, CppCodeModelSettings::settingsForProject(it.first));
     }
 
+    const auto filteredFiles = [sourcesAndSettings = std::move(sourcesAndSettings)] {
+        QSet<QString> result;
+        for (const auto &it : sourcesAndSettings)
+            result.unite(filteredFilesRemoved(it.first, it.second));
+        return result;
+    };
+
+    // "ReservedProgressNotification" should be shown if there is more than one source file.
+    if (sourceFiles.size() > 1)
+        mode = ForcedProgressNotification;
     return d->m_internalIndexingSupport->refreshSourceFiles(filteredFiles, mode);
 }
 
@@ -1388,14 +1397,20 @@ ProjectInfo::ConstPtr CppModelManager::projectInfo(Project *project)
 void CppModelManager::removeProjectInfoFilesAndIncludesFromSnapshot(const ProjectInfo &projectInfo)
 {
     QMutexLocker snapshotLocker(&d->m_snapshotMutex);
+    QStringList removedFiles;
     for (const ProjectPart::ConstPtr &projectPart : projectInfo.projectParts()) {
         for (const ProjectFile &cxxFile : std::as_const(projectPart->files)) {
             const QSet<FilePath> filePaths = d->m_snapshot.allIncludesForDocument(cxxFile.path);
-            for (const FilePath &filePath : filePaths)
+            for (const FilePath &filePath : filePaths) {
                 d->m_snapshot.remove(filePath);
+                removedFiles << filePath.toString();
+            }
             d->m_snapshot.remove(cxxFile.path);
+            removedFiles << cxxFile.path.toString();
         }
     }
+
+    emit m_instance->aboutToRemoveFiles(removedFiles);
 }
 
 const QList<CppEditorDocumentHandle *> CppModelManager::cppEditorDocuments()
@@ -1874,20 +1889,29 @@ QSet<QString> CppModelManager::internalTargets(const FilePath &filePath)
 //       the renamings yet, i.e. they still refer to the old file paths.
 void CppModelManager::renameIncludes(const QList<std::pair<FilePath, FilePath>> &oldAndNewPaths)
 {
+    using IncludingFile = std::pair<FilePath, FilePath>; // old and new path; might be identical
+    struct RewriteCandidate {
+        FilePath oldHeaderFilePath;
+        FilePath newHeaderFilePath;
+        QString oldHeaderFileName;
+        QString newHeaderFileName;
+        int includeLine;
+        bool isUiHeader;
+    };
+    QHash<IncludingFile, QList<RewriteCandidate>> rewriteCandidates;
+
+    const Snapshot theSnapshot = snapshot();
     for (const auto &[oldFilePath, newFilePath] : oldAndNewPaths) {
         if (oldFilePath.isEmpty() || newFilePath.isEmpty())
             continue;
 
-        // We just want to handle renamings so return when the file was actually moved.
-        if (oldFilePath.absolutePath() != newFilePath.absolutePath())
-            continue;
-
-        const TextEditor::PlainRefactoringFileFactory changes;
-
         QString oldFileName = oldFilePath.fileName();
         QString newFileName = newFilePath.fileName();
         const bool isUiFile = oldFilePath.suffix() == "ui" && newFilePath.suffix() == "ui";
+        const bool moved = oldFilePath.absolutePath() != newFilePath.absolutePath();
         if (isUiFile) {
+            if (moved)
+                return; // This is out of scope.
             oldFileName = "ui_" + oldFilePath.baseName() + ".h";
             newFileName = "ui_" + newFilePath.baseName() + ".h";
         }
@@ -1906,7 +1930,8 @@ void CppModelManager::renameIncludes(const QList<std::pair<FilePath, FilePath>>
         if (isUiFile && !productNodeForUiFile)
             continue;
 
-        const QList<Snapshot::IncludeLocation> locations = snapshot().includeLocationsOfDocument(
+        // Handle locations where this file is included.
+        const QList<Snapshot::IncludeLocation> locations = theSnapshot.includeLocationsOfDocument(
             isUiFile ? FilePath::fromString(oldFileName) : oldFilePath);
         for (const Snapshot::IncludeLocation &loc : locations) {
             const FilePath includingFileOld = loc.first->filePath();
@@ -1923,18 +1948,73 @@ void CppModelManager::renameIncludes(const QList<std::pair<FilePath, FilePath>>
             if (isUiFile && getProductNode(includingFileOld) != productNodeForUiFile)
                 continue;
 
-            TextEditor::RefactoringFilePtr file = changes.file(includingFileNew);
-            const QTextBlock &block = file->document()->findBlockByNumber(loc.second - 1);
-            const int replaceStart = block.text().indexOf(oldFileName);
-            if (replaceStart > -1) {
-                ChangeSet changeSet;
+            rewriteCandidates[std::make_pair(includingFileOld, includingFileNew)].append(
+                {oldFilePath, newFilePath, oldFileName, newFileName, loc.second, isUiFile});
+        }
+
+        // Handle the includes of this file: If its location changed, its own local includes
+        // need to get adapted as well.
+        if (isUiFile || !moved)
+            continue;
+        const CPlusPlus::Document::Ptr cppDoc = theSnapshot.document(oldFilePath);
+        if (!cppDoc)
+            continue;
+        const auto key = std::make_pair(oldFilePath, newFilePath);
+        for (const CPlusPlus::Document::Include &include : cppDoc->resolvedIncludes()) {
+            const FilePath oldHeaderPath = include.resolvedFileName();
+            const QString oldHeaderName = oldHeaderPath.fileName();
+            const bool isUiHeader = oldHeaderName.startsWith("ui_") && oldHeaderName.endsWith(".h");
+            if (!isUiHeader && include.type() != CPlusPlus::Client::IncludeLocal)
+                continue;
+            FilePath newHeaderPath = oldHeaderPath;
+            for (const auto &pathPair : oldAndNewPaths) {
+                if (oldHeaderPath == pathPair.first) {
+                    newHeaderPath = pathPair.second;
+                    break;
+                }
+            }
+            rewriteCandidates[key].append(
+                {oldHeaderPath,
+                 newHeaderPath,
+                 oldHeaderName,
+                 newHeaderPath.fileName(),
+                 include.line(),
+                 isUiHeader});
+        }
+    }
+
+    const TextEditor::PlainRefactoringFileFactory changes;
+    for (auto it = rewriteCandidates.cbegin(); it != rewriteCandidates.cend(); ++it) {
+        const FilePath &includingFileOld = it.key().first;
+        const FilePath &includingFileNew = it.key().second;
+        TextEditor::RefactoringFilePtr file = changes.file(includingFileNew);
+        ChangeSet changeSet;
+        for (const RewriteCandidate &candidate : it.value()) {
+            const QTextBlock &block = file->document()->findBlockByNumber(
+                candidate.includeLine - 1);
+            const FilePath relPathOld = FilePath::fromString(FilePath::calcRelativePath(
+                candidate.oldHeaderFilePath.toString(), includingFileOld.parentDir().toString()));
+            const FilePath relPathNew = FilePath::fromString(FilePath::calcRelativePath(
+                candidate.newHeaderFilePath.toString(), includingFileNew.parentDir().toString()));
+            int replaceStart = block.text().indexOf(relPathOld.toString());
+            QString oldString;
+            QString newString;
+            if (candidate.isUiHeader || replaceStart == -1) {
+                replaceStart = block.text().indexOf(candidate.oldHeaderFileName);
+                oldString = candidate.oldHeaderFileName;
+                newString = candidate.newHeaderFileName;
+            } else {
+                oldString = relPathOld.toString();
+                newString = relPathNew.toString();
+            }
+            if (replaceStart > -1 && oldString != newString) {
                 changeSet.replace(block.position() + replaceStart,
-                                  block.position() + replaceStart + oldFileName.length(),
-                                  newFileName);
-                file->setChangeSet(changeSet);
-                file->apply();
+                                  block.position() + replaceStart + oldString.length(),
+                                  newString);
             }
         }
+        file->setChangeSet(changeSet);
+        file->apply();
     }
 }
 
@@ -2000,7 +2080,7 @@ void CppModelManager::onCoreAboutToClose()
     d->m_enableGC = false;
 }
 
-void CppModelManager::onSettingsChange(Project *project)
+void CppModelManager::handleSettingsChange(Project *project)
 {
     ProjectInfoList info;
     if (project)
@@ -2010,7 +2090,7 @@ void CppModelManager::onSettingsChange(Project *project)
     for (const ProjectInfo::ConstPtr &pi : std::as_const(info)) {
         const CppCodeModelSettings newSettings = CppCodeModelSettings::settingsForProject(
             pi->projectFilePath());
-        if (pi->settings().data() != newSettings.data())
+        if (pi->settings() != newSettings)
             updateProjectInfo(ProjectInfo::cloneWithNewSettings(pi, newSettings));
     }
 }
diff --git a/src/plugins/cppeditor/cppmodelmanager.h b/src/plugins/cppeditor/cppmodelmanager.h
index d1a558ce9c..c22a8a9da0 100644
--- a/src/plugins/cppeditor/cppmodelmanager.h
+++ b/src/plugins/cppeditor/cppmodelmanager.h
@@ -110,6 +110,8 @@ public:
     static QFuture<void> updateProjectInfo(const ProjectInfo::ConstPtr &newProjectInfo,
                                            const QSet<Utils::FilePath> &additionalFiles = {});
 
+    static void handleSettingsChange(ProjectExplorer::Project *project);
+
     /// \return The project part with the given project file
     static ProjectPart::ConstPtr projectPartForId(const QString &projectPartId);
     /// \return All project parts that mention the given file name as one of the sources/headers.
@@ -288,7 +290,6 @@ private:
     static void onSourceFilesRefreshed();
     static void onCurrentEditorChanged(Core::IEditor *editor);
     static void onCoreAboutToClose();
-    static void onSettingsChange(ProjectExplorer::Project *project);
     static void setupFallbackProjectPart();
 
     static void delayedGC();
diff --git a/src/plugins/cppeditor/cppmodelmanager_test.cpp b/src/plugins/cppeditor/cppmodelmanager_test.cpp
index a896563a61..21351659a9 100644
--- a/src/plugins/cppeditor/cppmodelmanager_test.cpp
+++ b/src/plugins/cppeditor/cppmodelmanager_test.cpp
@@ -17,6 +17,7 @@
 
 #include <cplusplus/LookupContext.h>
 
+#include <projectexplorer/kitmanager.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectmanager.h>
 #include <projectexplorer/projectnodes.h>
@@ -28,6 +29,8 @@
 #include <QScopeGuard>
 #include <QtTest>
 
+#include <memory>
+
 #define VERIFY_DOCUMENT_REVISION(document, expectedRevision) \
     QVERIFY(document); \
     QCOMPARE(document->revision(), expectedRevision);
@@ -40,6 +43,7 @@ using CPlusPlus::Document;
 // FIXME: Clean up the namespaces
 using CppEditor::Tests::ModelManagerTestHelper;
 using CppEditor::Tests::ProjectOpenerAndCloser;
+using CppEditor::Tests::SourceFilesRefreshGuard;
 using CppEditor::Tests::TemporaryCopiedDir;
 using CppEditor::Tests::TemporaryDir;
 using CppEditor::Tests::TestCase;
@@ -965,53 +969,145 @@ void ModelManagerTest::testUpdateEditorsAfterProjectUpdate()
     QCOMPARE(documentBProjectPart->topLevelProject, pi->projectFilePath());
 }
 
-void ModelManagerTest::testRenameIncludes()
+void ModelManagerTest::testRenameIncludes_data()
 {
-    struct ModelManagerGCHelper {
-        ~ModelManagerGCHelper() { CppModelManager::GC(); }
-    } GCHelper;
-    Q_UNUSED(GCHelper) // do not warn about being unused
+    QTest::addColumn<QString>("oldRelPath");
+    QTest::addColumn<QString>("newRelPath");
+    QTest::addColumn<bool>("successExpected");
+
+    QTest::addRow("rename in place 1")
+        << "subdir1/header1.h" << "subdir1/header1_renamed.h" << true;
+    QTest::addRow("rename in place 2")
+        << "subdir2/header2.h" << "subdir2/header2_renamed.h" << true;
+    QTest::addRow("rename in place 3") << "header.h" << "header_renamed.h" << true;
+    QTest::addRow("move up") << "subdir1/header1.h" << "header1_moved.h" << true;
+    QTest::addRow("move up (breaks build)") << "subdir2/header2.h" << "header2_moved.h" << false;
+    QTest::addRow("move down") << "header.h" << "subdir1/header_moved.h" << true;
+    QTest::addRow("move across") << "subdir1/header1.h" << "subdir2/header1_moved.h" << true;
+    QTest::addRow("move across (breaks build)")
+        << "subdir2/header2.h" << "subdir1/header2_moved.h" << false;
+}
 
+void ModelManagerTest::testRenameIncludes()
+{
+    // Set up project.
     TemporaryDir tmpDir;
     QVERIFY(tmpDir.isValid());
-
-    const QDir workingDir(tmpDir.path());
-    const QStringList fileNames = {"foo.h", "foo.cpp", "main.cpp"};
-    const FilePath oldHeader = FilePath::fromString(workingDir.filePath("foo.h"));
-    const FilePath newHeader = FilePath::fromString(workingDir.filePath("bar.h"));
-    const MyTestDataDir testDir(_("testdata_project1"));
-
-    // Copy test files to a temporary directory
-    QSet<FilePath> sourceFiles;
-    for (const QString &fileName : std::as_const(fileNames)) {
-        const QString &file = workingDir.filePath(fileName);
-        QVERIFY(QFile::copy(testDir.file(fileName), file));
-        // Saving source file names for the model manager update,
-        // so we can update just the relevant files.
-        if (ProjectFile::classify(file) == ProjectFile::CXXSource)
-            sourceFiles.insert(FilePath::fromString(file));
-    }
-
-    // Update the c++ model manager and check for the old includes
-    CppModelManager::updateSourceFiles(sourceFiles).waitForFinished();
-    QCoreApplication::processEvents();
+    const MyTestDataDir sourceDir("testdata_renameheaders");
+    const FilePath srcFilePath = FilePath::fromString(sourceDir.path());
+    const FilePath projectDir = tmpDir.filePath().pathAppended(srcFilePath.fileName());
+    const auto copyResult = srcFilePath.copyRecursively(projectDir);
+    if (!copyResult)
+        qDebug() << copyResult.error();
+    QVERIFY(copyResult);
+    Kit * const kit  = Utils::findOr(KitManager::kits(), nullptr, [](const Kit *k) {
+        return k->isValid() && !k->hasWarning() && k->value("QtSupport.QtInformation").isValid();
+    });
+    if (!kit)
+        QSKIP("The test requires at least one valid kit with a valid Qt");
+    const FilePath projectFile = projectDir.pathAppended(projectDir.fileName() + ".pro");
+    SourceFilesRefreshGuard refreshGuard;
+    ProjectOpenerAndCloser projectMgr;
+    const ProjectInfo::ConstPtr projectInfo = projectMgr.open(projectFile, true, kit);
+    QVERIFY(projectInfo);
+    QVERIFY(refreshGuard.wait());
+
+    // Verify initial code model state.
+    const auto makeAbs = [&](const QStringList &relPaths) {
+        return Utils::transform<QSet<FilePath>>(relPaths, [&](const QString &relPath) {
+            return projectDir.pathAppended(relPath);
+        });
+    };
+    const QSet<FilePath> allSources = makeAbs({"main.cpp", "subdir1/file1.cpp", "subdir2/file2.cpp"});
+    const QSet<FilePath> allHeaders = makeAbs({"header.h", "subdir1/header1.h", "subdir2/header2.h"});
+    QCOMPARE(projectInfo->sourceFiles(), allSources + allHeaders);
     CPlusPlus::Snapshot snapshot = CppModelManager::snapshot();
-    for (const FilePath &sourceFile : std::as_const(sourceFiles)) {
-        QCOMPARE(snapshot.allIncludesForDocument(sourceFile), QSet<FilePath>{oldHeader});
+    for (const FilePath &srcFile : allSources) {
+        QCOMPARE(snapshot.allIncludesForDocument(srcFile), allHeaders);
     }
 
-    // Renaming the header
+    // Rename the header.
+    QFETCH(QString, oldRelPath);
+    QFETCH(QString, newRelPath);
+    QFETCH(bool, successExpected);
+    const FilePath oldHeader = projectDir.pathAppended(oldRelPath);
+    const FilePath newHeader = projectDir.pathAppended(newRelPath);
+    refreshGuard.reset();
     QVERIFY(ProjectExplorerPlugin::renameFile(oldHeader, newHeader));
 
-    // Update the c++ model manager again and check for the new includes
-    CppModelManager::updateSourceFiles(sourceFiles).waitForFinished();
-    QCoreApplication::processEvents();
+    // Verify new code model state.
+    QVERIFY(refreshGuard.wait());
+    QSet<FilePath> incompleteNewHeadersSet = allHeaders;
+    incompleteNewHeadersSet.remove(oldHeader);
+    QSet<FilePath> completeNewHeadersSet = incompleteNewHeadersSet;
+    completeNewHeadersSet << newHeader;
+
     snapshot = CppModelManager::snapshot();
-    for (const FilePath &sourceFile : std::as_const(sourceFiles)) {
-        QCOMPARE(snapshot.allIncludesForDocument(sourceFile), QSet<FilePath>{newHeader});
+    for (const FilePath &srcFile : allSources) {
+        const QSet<FilePath> &expectedHeaders = srcFile.fileName() == "main.cpp" && !successExpected
+            ? incompleteNewHeadersSet : completeNewHeadersSet;
+        QCOMPARE(snapshot.allIncludesForDocument(srcFile), expectedHeaders);
     }
 }
 
+void ModelManagerTest::testMoveIncludingSources_data()
+{
+    QTest::addColumn<QString>("oldRelPath");
+    QTest::addColumn<QString>("newRelPath");
+
+    QTest::addRow("move up") << "subdir1/file1.cpp" << "file1_moved.cpp";
+    QTest::addRow("move down") << "main.cpp" << "subdir1/main.cpp";
+    QTest::addRow("move across") << "subdir1/file1.cpp" << "subdir2/file1_moved.cpp";
+}
+
+void ModelManagerTest::testMoveIncludingSources()
+{
+    QFETCH(QString, oldRelPath);
+    QFETCH(QString, newRelPath);
+
+    // Set up project.
+    TemporaryDir tmpDir;
+    QVERIFY(tmpDir.isValid());
+    const MyTestDataDir sourceDir("testdata_renameheaders");
+    const FilePath srcFilePath = FilePath::fromString(sourceDir.path());
+    const FilePath projectDir = tmpDir.filePath().pathAppended(srcFilePath.fileName());
+    const auto copyResult = srcFilePath.copyRecursively(projectDir);
+    if (!copyResult)
+        qDebug() << copyResult.error();
+    QVERIFY(copyResult);
+    Kit * const kit  = Utils::findOr(KitManager::kits(), nullptr, [](const Kit *k) {
+        return k->isValid() && !k->hasWarning() && k->value("QtSupport.QtInformation").isValid();
+    });
+    if (!kit)
+        QSKIP("The test requires at least one valid kit with a valid Qt");
+    SourceFilesRefreshGuard refreshGuard;
+    const FilePath projectFile = projectDir.pathAppended(projectDir.fileName() + ".pro");
+    ProjectOpenerAndCloser projectMgr;
+    QVERIFY(projectMgr.open(projectFile, true, kit));
+    QVERIFY(refreshGuard.wait());
+
+    // Verify initial code model state.
+    const auto makeAbs = [&](const QStringList &relPaths) {
+        return Utils::transform<QSet<FilePath>>(relPaths, [&](const QString &relPath) {
+            return projectDir.pathAppended(relPath);
+        });
+    };
+    const FilePath oldSource = projectDir.pathAppended(oldRelPath);
+    QVERIFY(oldSource.exists());
+    const QSet<FilePath> includedHeaders = makeAbs(
+        {"header.h", "subdir1/header1.h", "subdir2/header2.h"});
+    QCOMPARE(CppModelManager::snapshot().allIncludesForDocument(oldSource), includedHeaders);
+
+    // Rename the source file.
+    refreshGuard.reset();
+    const FilePath newSource = projectDir.pathAppended(newRelPath);
+    QVERIFY(ProjectExplorerPlugin::renameFile(oldSource, newSource, projectMgr.projects().first()));
+
+    // Verify new code model state.
+    QVERIFY(refreshGuard.wait());
+    QCOMPARE(CppModelManager::snapshot().allIncludesForDocument(newSource), includedHeaders);
+}
+
 void ModelManagerTest::testRenameIncludesInEditor()
 {
     struct ModelManagerGCHelper {
@@ -1244,18 +1340,18 @@ void ModelManagerTest::testSettingsChanges()
     // as the default values are the same.
     refreshCount = 0;
     refreshedFiles.clear();
-    CppCodeModelProjectSettings p1Settings(p1);
-    QVERIFY(p1Settings.useGlobalSettings());
-    p1Settings.setUseGlobalSettings(false);
+    QVERIFY(!CppCodeModelSettings::hasCustomSettings(p1));
+    CppCodeModelSettings p1Settings = CppCodeModelSettings::settingsForProject(p1);
+    CppCodeModelSettings::setSettingsForProject(p1, p1Settings);
+    QVERIFY(CppCodeModelSettings::hasCustomSettings(p1));
     QCOMPARE(refreshCount, 0);
     QVERIFY(!waitForRefresh());
 
     // Change global settings. Only the second project should get re-indexed, as the first one
     // has its own settings, which are still the same.
-    CppCodeModelSettings::Data globalSettings
-        = CppCodeModelSettings::settingsForProject(nullptr).data();
+    CppCodeModelSettings globalSettings = CppCodeModelSettings::settingsForProject(nullptr);
     globalSettings.indexerFileSizeLimitInMb = 1;
-    CppCodeModelSettings::setGlobalData(globalSettings);
+    CppCodeModelSettings::setGlobal(globalSettings);
     if (refreshCount == 0)
         QVERIFY(waitForRefresh());
     QVERIFY(!waitForRefresh());
@@ -1264,10 +1360,9 @@ void ModelManagerTest::testSettingsChanges()
     // Change first project's settings. Only this project should get re-indexed.
     refreshCount = 0;
     refreshedFiles.clear();
-    CppCodeModelSettings::Data p1Data = p1Settings.data();
-    p1Data.ignoreFiles = true;
-    p1Data.ignorePattern = "baz3.h";
-    p1Settings.setData(p1Data);
+    p1Settings.ignoreFiles = true;
+    p1Settings.ignorePattern = "baz3.h";
+    CppCodeModelSettings::setSettingsForProject(p1, p1Settings);
     if (refreshCount == 0)
         QVERIFY(waitForRefresh());
     QVERIFY(!waitForRefresh());
@@ -1276,4 +1371,160 @@ void ModelManagerTest::testSettingsChanges()
     QCOMPARE(refreshedFiles, filteredP1Sources);
 }
 
+static bool True = true;
+static bool False = false;
+
+void ModelManagerTest::testOptionalIndexing_data()
+{
+    QTest::addColumn<bool>("enableGlobally");
+    QTest::addColumn<bool *>("enableForP1");
+    QTest::addColumn<bool *>("enableForP2");
+    QTest::addColumn<bool>("foo1Present");
+    QTest::addColumn<bool>("foo2Present");
+
+    QTest::addRow("globally disabled, no custom settings")
+        << false << (bool *) nullptr << (bool *) nullptr << false << false;
+    QTest::addRow("globally disabled, redundantly disabled for project 2")
+        << false << (bool *) nullptr << &False << false << false;
+    QTest::addRow("globally disabled, enabled for project 2")
+        << false << (bool *) nullptr << &True << false << true;
+    QTest::addRow("globally disabled, redundantly disabled for project 1")
+        << false << &False << (bool *) nullptr << false << false;
+    QTest::addRow("globally disabled, redundantly disabled for both projects")
+        << false << &False << &False << false << false;
+    QTest::addRow("globally disabled, redundantly disabled for project 1, enabled for project 2")
+        << false << &False << &True << false << true;
+    QTest::addRow("globally disabled, enabled for project 1")
+        << false << &True << (bool *) nullptr << true << false;
+    QTest::addRow("globally disabled, enabled for project 1, redundantly disabled for project 2")
+        << false << &True << &False << true << false;
+    QTest::addRow("globally disabled, enabled for both project")
+        << false << &True << &True << true << true;
+    QTest::addRow("globally enabled, no custom settings")
+        << true << (bool *) nullptr << (bool *) nullptr << true << true ;
+    QTest::addRow("globally enabled, disabled for project 2")
+        << true << (bool *) nullptr << &False << true << false;
+    QTest::addRow("globally enabled, redundantly enabled for project 2")
+        << true << (bool *) nullptr << &True << true << true;
+    QTest::addRow("globally enabled, disabled for project 1")
+        << true << &False << (bool *) nullptr << false << true;
+    QTest::addRow("globally enabled, disabled for both projects")
+        << true << &False << &False << false << false;
+    QTest::addRow("globally enabled, disabled for project 1, redundantly enabled for project 2")
+        << true << &False << &True << false << true;
+    QTest::addRow("globally enabled, redundantly enabled for project 1")
+        << true << &True << (bool *) nullptr << true << true;
+    QTest::addRow("globally enabled, redundantly enabled for project 1, disabled for project 2")
+        << true << &True << &False << true << false;
+    QTest::addRow("globally enabled, redundantly enabled for both projects")
+        << true << &True << &True << true << true;
+}
+
+void ModelManagerTest::testOptionalIndexing()
+{
+    if (CppModelManager::isClangCodeModelActive())
+        QSKIP("Test only makes sense with built-in locators");
+
+    QFETCH(bool, enableGlobally);
+    QFETCH(bool *, enableForP1);
+    QFETCH(bool *, enableForP2);
+    QFETCH(bool, foo1Present);
+    QFETCH(bool, foo2Present);
+
+    // Apply global setting, if necessary. Needs to be reverted in the end.
+    class TempIndexingDisabler {
+    public:
+        TempIndexingDisabler(bool enable)
+        {
+            if (!enable)
+                reset(false);
+        }
+        ~TempIndexingDisabler() { reset(true); }
+    private:
+        void reset(bool enable)
+        {
+            CppCodeModelSettings settings = CppCodeModelSettings::global();
+            settings.enableIndexing = enable;
+            CppCodeModelSettings::setGlobal(settings);
+        }
+    };
+    const TempIndexingDisabler disabler(enableGlobally);
+
+    // Set up projects.
+    TemporaryDir tmpDir;
+    QVERIFY(tmpDir.isValid());
+    const MyTestDataDir sourceDir("testdata_optionalindexing");
+    const FilePath srcFilePath = FilePath::fromString(sourceDir.path());
+    const FilePath projectDir = tmpDir.filePath().pathAppended(srcFilePath.fileName());
+    const auto copyResult = srcFilePath.copyRecursively(projectDir);
+    if (!copyResult)
+        qDebug() << copyResult.error();
+    QVERIFY(copyResult);
+    Kit * const kit  = Utils::findOr(KitManager::kits(), nullptr, [](const Kit *k) {
+        return k->isValid() && !k->hasWarning() && k->value("QtSupport.QtInformation").isValid();
+    });
+    if (!kit)
+        QSKIP("The test requires at least one valid kit with a valid Qt");
+    const FilePath p1ProjectFile = projectDir.pathAppended("lib1.pro");
+    auto projectMgr = std::make_unique<ProjectOpenerAndCloser>();
+    SourceFilesRefreshGuard refreshGuard;
+    QVERIFY(projectMgr->open(p1ProjectFile, true, kit));
+    QVERIFY(refreshGuard.wait());
+    refreshGuard.reset();
+    Project *p1 = projectMgr->projects().first();
+    const FilePath p2ProjectFile = projectDir.pathAppended("lib2.pro");
+    QVERIFY(projectMgr->open(p2ProjectFile, true, kit));
+    QVERIFY(refreshGuard.wait());
+    refreshGuard.reset();
+    Project *p2 = projectMgr->projects().last();
+
+    const auto applyProjectSpecificSettings = [&](Project *p, bool *enable) {
+        if (!enable)
+            return;
+        refreshGuard.reset();
+        CppCodeModelSettings settings = CppCodeModelSettings::settingsForProject(p);
+        settings.enableIndexing = *enable;
+        CppCodeModelSettings::setSettingsForProject(p, settings);
+        if (*enable != enableGlobally)
+            QVERIFY(refreshGuard.wait());
+    };
+    applyProjectSpecificSettings(p1, enableForP1);
+    applyProjectSpecificSettings(p2, enableForP2);
+
+    // Compare locator results to expectations.
+    Core::LocatorFilterEntries entries = Core::LocatorMatcher::runBlocking(
+        Core::LocatorMatcher::matchers(Core::MatcherType::Functions), "foo");
+    const auto hasEntry = [&](const QString &name) {
+        return Utils::contains(entries, [&](const Core::LocatorFilterEntry &e) {
+            return e.displayName == name + "()";
+        });
+    };
+    QCOMPARE(hasEntry("foo1"), foo1Present);
+    QCOMPARE(hasEntry("foo2"), foo2Present);
+
+    // Close and re-open projects, then check again, to see whether the settings persisted
+    // and are taking effect.
+    projectMgr.reset(nullptr);
+    projectMgr.reset(new ProjectOpenerAndCloser);
+    refreshGuard.reset();
+    QVERIFY(projectMgr->open(p1ProjectFile, true, kit));
+    p1 = projectMgr->projects().first();
+    QCOMPARE(
+        CppCodeModelSettings::settingsForProject(p1).enableIndexing,
+        enableForP1 ? *enableForP1 : enableGlobally);
+    QVERIFY(refreshGuard.wait());
+    refreshGuard.reset();
+    QVERIFY(projectMgr->open(p2ProjectFile, true, kit));
+    p2 = projectMgr->projects().last();
+    QCOMPARE(
+        CppCodeModelSettings::settingsForProject(p2).enableIndexing,
+        enableForP2 ? *enableForP2 : enableGlobally);
+    QVERIFY(refreshGuard.wait());
+
+    entries = Core::LocatorMatcher::runBlocking(
+        Core::LocatorMatcher::matchers(Core::MatcherType::Functions), "foo");
+    QCOMPARE(hasEntry("foo1"), foo1Present);
+    QCOMPARE(hasEntry("foo2"), foo2Present);
+}
+
 } // CppEditor::Internal
diff --git a/src/plugins/cppeditor/cppmodelmanager_test.h b/src/plugins/cppeditor/cppmodelmanager_test.h
index 26cbefd1c8..bca0753fa9 100644
--- a/src/plugins/cppeditor/cppmodelmanager_test.h
+++ b/src/plugins/cppeditor/cppmodelmanager_test.h
@@ -28,10 +28,15 @@ private slots:
     void testDefinesPerEditor();
     void testUpdateEditorsAfterProjectUpdate();
     void testPrecompiledHeaders();
+    void testRenameIncludes_data();
     void testRenameIncludes();
+    void testMoveIncludingSources_data();
+    void testMoveIncludingSources();
     void testRenameIncludesInEditor();
     void testDocumentsAndRevisions();
     void testSettingsChanges();
+    void testOptionalIndexing_data();
+    void testOptionalIndexing();
 };
 
 } // namespace CppEditor::Internal
diff --git a/src/plugins/cppeditor/cppquickfix_test.cpp b/src/plugins/cppeditor/cppquickfix_test.cpp
index 0a5b71c814..781febee6f 100644
--- a/src/plugins/cppeditor/cppquickfix_test.cpp
+++ b/src/plugins/cppeditor/cppquickfix_test.cpp
@@ -12,6 +12,9 @@
 #include "cppsourceprocessertesthelper.h"
 #include "cpptoolssettings.h"
 
+#include <projectexplorer/kitmanager.h>
+#include <projectexplorer/projectexplorer.h>
+#include <texteditor/textdocument.h>
 #include <utils/fileutils.h>
 
 #include <QDebug>
@@ -23,6 +26,7 @@
  */
 using namespace Core;
 using namespace CPlusPlus;
+using namespace ProjectExplorer;
 using namespace TextEditor;
 using namespace Utils;
 
@@ -9948,4 +9952,100 @@ void QuickfixTest::testConvertToMetaMethodInvocation()
     QuickFixOperationTest({CppTestDocument::create("file.cpp", input, expected)}, &factory);
 }
 
+void QuickfixTest::testMoveClassToOwnFile_data()
+{
+    QTest::addColumn<QString>("projectName");
+    QTest::addColumn<QString>("fileName");
+    QTest::addColumn<QString>("className");
+    QTest::addColumn<bool>("applicable");
+
+    QTest::newRow("nested") << "nested" << "main.cpp" << "Inner" << false;
+    QTest::newRow("file name match 1") << "match1" << "TheClass.h" << "TheClass" << false;
+    QTest::newRow("file name match 2") << "match2" << "theclass.h" << "TheClass" << false;
+    QTest::newRow("file name match 3") << "match3" << "the_class.h" << "TheClass" << false;
+    QTest::newRow("single") << "single" << "theheader.h" << "TheClass" << false;
+    QTest::newRow("complex") << "complex" << "theheader.h" << "TheClass" << true;
+    QTest::newRow("header only") << "header-only" << "theheader.h" << "TheClass" << true;
+    QTest::newRow("decl in source file") << "decl-in-source" << "thesource.cpp" << "TheClass" << true;
+    QTest::newRow("template") << "template" << "theheader.h" << "TheClass" << true;
+}
+
+void QuickfixTest::testMoveClassToOwnFile()
+{
+    QFETCH(QString, projectName);
+    QFETCH(QString, fileName);
+    QFETCH(QString, className);
+    QFETCH(bool, applicable);
+    using namespace CppEditor::Tests;
+
+    // Set up project.
+    Kit * const kit  = Utils::findOr(KitManager::kits(), nullptr, [](const Kit *k) {
+        return k->isValid() && !k->hasWarning() && k->value("QtSupport.QtInformation").isValid();
+    });
+    if (!kit)
+        QSKIP("The test requires at least one valid kit with a valid Qt");
+    const auto projectDir = std::make_unique<TemporaryCopiedDir>(
+                ":/cppeditor/testcases/move-class/" + projectName);
+    SourceFilesRefreshGuard refreshGuard;
+    ProjectOpenerAndCloser projectMgr;
+    QVERIFY(projectMgr.open(projectDir->absolutePath(projectName + ".pro"), true, kit));
+    QVERIFY(refreshGuard.wait());
+
+    // Open header file and locate class.
+    const auto headerFilePath = projectDir->absolutePath(fileName);
+    QVERIFY2(headerFilePath.exists(), qPrintable(headerFilePath.toUserOutput()));
+    const auto editor = qobject_cast<BaseTextEditor *>(EditorManager::openEditor(headerFilePath));
+    QVERIFY(editor);
+    const auto doc = qobject_cast<TextEditor::TextDocument *>(editor->document());
+    QVERIFY(doc);
+    QTextCursor classCursor = doc->document()->find("class " + className);
+    QVERIFY(!classCursor.isNull());
+    editor->setCursorPosition(classCursor.position());
+    const auto editorWidget = qobject_cast<CppEditorWidget *>(editor->editorWidget());
+    QVERIFY(editorWidget);
+    QVERIFY(TestCase::waitForRehighlightedSemanticDocument(editorWidget));
+
+    // Query factory.
+    MoveClassToOwnFile factory;
+    factory.setNonInteractive();
+    CppQuickFixInterface quickFixInterface(editorWidget, ExplicitlyInvoked);
+    QuickFixOperations operations;
+    factory.match(quickFixInterface, operations);
+    QCOMPARE(operations.isEmpty(), !applicable);
+    if (!applicable)
+        return;
+    operations.first()->perform();
+    QVERIFY(waitForSignalOrTimeout(doc, &IDocument::saved, 30000));
+    QTest::qWait(1000);
+
+    // Compare all files.
+    const FileFilter filter({"*_expected"}, QDir::Files);
+    const FilePaths expectedDocuments = projectDir->filePath().dirEntries(filter);
+    QVERIFY(!expectedDocuments.isEmpty());
+    for (const FilePath &expected : expectedDocuments) {
+        static const QString suffix = "_expected";
+        const FilePath actual = expected.parentDir()
+                .pathAppended(expected.fileName().chopped(suffix.length()));
+        QVERIFY(actual.exists());
+        const auto actualContents = actual.fileContents();
+        QVERIFY(actualContents);
+        const auto expectedContents = expected.fileContents();
+        const QByteArrayList actualLines = actualContents->split('\n');
+        const QByteArrayList expectedLines = expectedContents->split('\n');
+        if (actualLines.size() != expectedLines.size()) {
+            qDebug().noquote().nospace() << "---\n" << *expectedContents << "EOF";
+            qDebug().noquote().nospace() << "+++\n" << *actualContents << "EOF";
+        }
+        QCOMPARE(actualLines.size(), expectedLines.size());
+        for (int i = 0; i < actualLines.size(); ++i) {
+            const QByteArray actualLine = actualLines.at(i);
+            const QByteArray expectedLine = expectedLines.at(i);
+            if (actualLine != expectedLine)
+                qDebug() << "Unexpected content in line" << (i + 1) << "of file"
+                         << actual.fileName();
+            QCOMPARE(actualLine, expectedLine);
+        }
+    }
+}
+
 } // namespace CppEditor::Internal::Tests
diff --git a/src/plugins/cppeditor/cppquickfix_test.h b/src/plugins/cppeditor/cppquickfix_test.h
index 917abe19c7..27ba90f0d0 100644
--- a/src/plugins/cppeditor/cppquickfix_test.h
+++ b/src/plugins/cppeditor/cppquickfix_test.h
@@ -229,6 +229,9 @@ private slots:
 
     void testConvertToMetaMethodInvocation_data();
     void testConvertToMetaMethodInvocation();
+
+    void testMoveClassToOwnFile_data();
+    void testMoveClassToOwnFile();
 };
 
 } // namespace Tests
diff --git a/src/plugins/cppeditor/cppquickfixes.cpp b/src/plugins/cppeditor/cppquickfixes.cpp
index 9ac67e1e29..6bb1627676 100644
--- a/src/plugins/cppeditor/cppquickfixes.cpp
+++ b/src/plugins/cppeditor/cppquickfixes.cpp
@@ -8,6 +8,7 @@
 #include "cppeditordocument.h"
 #include "cppeditortr.h"
 #include "cppeditorwidget.h"
+#include "cppfilesettingspage.h"
 #include "cppfunctiondecldeflink.h"
 #include "cppinsertvirtualmethods.h"
 #include "cpplocatordata.h"
@@ -22,7 +23,7 @@
 #include "symbolfinder.h"
 
 #include <coreplugin/icore.h>
-#include <coreplugin/messagebox.h>
+#include <coreplugin/messagemanager.h>
 
 #include <cplusplus/ASTPath.h>
 #include <cplusplus/CPlusPlusForwardDeclarations.h>
@@ -43,11 +44,14 @@
 
 #include <utils/algorithm.h>
 #include <utils/basetreeview.h>
+#include <utils/codegeneration.h>
 #include <utils/layoutbuilder.h>
 #include <utils/fancylineedit.h>
 #include <utils/fileutils.h>
+#include <utils/pathchooser.h>
 #include <utils/qtcassert.h>
 #include <utils/treemodel.h>
+#include <utils/treeviewcombobox.h>
 
 #ifdef WITH_TESTS
 #include <QAbstractItemModelTester>
@@ -84,6 +88,7 @@
 #include <vector>
 
 using namespace CPlusPlus;
+using namespace ProjectExplorer;
 using namespace TextEditor;
 using namespace Utils;
 
@@ -10030,6 +10035,571 @@ void ConvertToMetaMethodCall::doMatch(const CppQuickFixInterface &interface,
     }
 }
 
+namespace {
+class MoveClassToOwnFileOp : public CppQuickFixOperation
+{
+public:
+    MoveClassToOwnFileOp(
+            const CppQuickFixInterface &interface,
+            AST *fullDecl,
+            ClassSpecifierAST *classAst,
+            const QList<Namespace *> &namespacePath,
+            bool interactive)
+        : CppQuickFixOperation(interface)
+        , m_state(std::make_shared<State>())
+    {
+        setDescription(Tr::tr("Move class to a dedicated set of source files"));
+        m_state->originalFilePath = interface.currentFile()->filePath();
+        m_state->classAst = classAst;
+        m_state->namespacePath = namespacePath;
+        m_state->interactive = interactive;
+        PerFileState &perFileState = m_state->perFileState[interface.currentFile()->filePath()];
+        perFileState.refactoringFile = interface.currentFile();
+        perFileState.declarationsToMove << fullDecl;
+    }
+
+private:
+    struct PerFileState {
+        // We want to keep the relative order of moved code.
+        void insertSorted(AST *decl) {
+            declarationsToMove.insert(std::lower_bound(
+                                          declarationsToMove.begin(),
+                                          declarationsToMove.end(),
+                                          decl,
+                                          [](const AST *elem, const AST *value) {
+                return elem->firstToken() < value->firstToken();
+            }), decl);
+        }
+
+        CppRefactoringFilePtr refactoringFile;
+        QList<AST *> declarationsToMove;
+    };
+    struct State {
+        using Ptr = std::shared_ptr<State>;
+
+        FilePath originalFilePath;
+        AST *fullDecl = nullptr;
+        ClassSpecifierAST *classAst = nullptr;
+        QList<Namespace *> namespacePath;
+        Links lookupResults;
+        QMap<FilePath, PerFileState> perFileState; // A map for deterministic order of moved code.
+        CppRefactoringChanges factory{CppModelManager::snapshot()};
+        int remainingFollowSymbolOps = 0;
+        bool interactive = true;
+    };
+    class Dialog : public QDialog {
+    public:
+        Dialog(const FilePath &defaultHeaderFilePath, const FilePath &defaultSourceFilePath,
+               ProjectNode *defaultProjectNode)
+            : m_buttonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel)
+        {
+            ProjectNode * const rootNode = defaultProjectNode
+                    ? defaultProjectNode->getProject()->rootProjectNode()
+                    : nullptr;
+            if (rootNode) {
+                const auto projectRootItem = new NodeItem(rootNode);
+                buildTree(projectRootItem);
+                m_projectModel.rootItem()->appendChild(projectRootItem);
+            }
+            m_projectNodeComboBox.setModel(&m_projectModel);
+            if (defaultProjectNode) {
+                const auto matcher = [defaultProjectNode](TreeItem *item) {
+                    return static_cast<NodeItem *>(item)->node == defaultProjectNode;
+                };
+                TreeItem * const defaultItem = m_projectModel.rootItem()->findAnyChild(matcher);
+                if (defaultItem ) {
+                    QModelIndex index = m_projectModel.indexForItem(defaultItem);
+                    m_projectNodeComboBox.setCurrentIndex(index);
+                    while (index.isValid()) {
+                        m_projectNodeComboBox.view()->expand(index);
+                        index = index.parent();
+                    }
+                }
+
+            }
+            connect(&m_projectNodeComboBox, &QComboBox::currentIndexChanged,
+                    this, [this] {
+                if (m_filesEdited)
+                    return;
+                const auto newProjectNode = projectNode();
+                QTC_ASSERT(newProjectNode, return);
+                const FilePath baseDir = newProjectNode->directory();
+                m_sourcePathChooser.setFilePath(
+                            baseDir.pathAppended(sourceFilePath().fileName()));
+                m_headerPathChooser.setFilePath(
+                            baseDir.pathAppended(headerFilePath().fileName()));
+                m_filesEdited = false;
+            });
+
+            m_headerOnlyCheckBox.setText(Tr::tr("Header file only"));
+            m_headerOnlyCheckBox.setChecked(false);
+            connect(&m_headerOnlyCheckBox, &QCheckBox::toggled,
+                    this, [this](bool checked) { m_sourcePathChooser.setEnabled(!checked); });
+
+            m_headerPathChooser.setExpectedKind(PathChooser::SaveFile);
+            m_sourcePathChooser.setExpectedKind(PathChooser::SaveFile);
+            m_headerPathChooser.setFilePath(defaultHeaderFilePath);
+            m_sourcePathChooser.setFilePath(defaultSourceFilePath);
+            connect(&m_headerPathChooser, &PathChooser::textChanged,
+                    this, [this] { m_filesEdited = true; });
+            connect(&m_sourcePathChooser, &PathChooser::textChanged,
+                    this, [this] { m_filesEdited = true; });
+
+            connect(&m_buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
+            connect(&m_buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
+
+            using namespace Layouting;
+            Column {
+                Form {
+                    Tr::tr("Project:"), &m_projectNodeComboBox, br,
+                    &m_headerOnlyCheckBox, br,
+                    Tr::tr("Header file:"), &m_headerPathChooser, br,
+                    Tr::tr("Implementation file:"), &m_sourcePathChooser, br,
+                },
+                &m_buttonBox
+            }.attachTo(this);
+        }
+
+        ProjectNode *projectNode() const
+        {
+            const QVariant v = m_projectNodeComboBox.currentData(Qt::UserRole);
+            return v.isNull() ? nullptr : static_cast<ProjectNode *>(v.value<void *>());
+        }
+        bool createSourceFile() const { return !m_headerOnlyCheckBox.isChecked(); }
+        FilePath headerFilePath() const { return m_headerPathChooser.absoluteFilePath(); }
+        FilePath sourceFilePath() const { return m_sourcePathChooser.absoluteFilePath(); }
+
+    private:
+        struct NodeItem : public StaticTreeItem {
+            NodeItem(ProjectNode *node)
+                : StaticTreeItem({node->displayName()}, {node->directory().toUserOutput()})
+                , node(node)
+            {}
+            Qt::ItemFlags flags(int) const override
+            {
+                return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
+            }
+            QVariant data(int column, int role) const override
+            {
+                if (role == Qt::UserRole)
+                    return QVariant::fromValue(static_cast<void *>(node));
+                return StaticTreeItem::data(column, role);
+            }
+
+            ProjectNode * const node;
+        };
+
+        void buildTree(NodeItem *parent)
+        {
+            for (Node * const node : parent->node->nodes()) {
+                if (const auto projNode = node->asProjectNode()) {
+                    const auto child = new NodeItem(projNode);
+                    buildTree(child);
+                    parent->appendChild(child);
+                }
+            }
+        }
+
+        TreeViewComboBox m_projectNodeComboBox;
+        QCheckBox m_headerOnlyCheckBox;
+        PathChooser m_headerPathChooser;
+        PathChooser m_sourcePathChooser;
+        QDialogButtonBox m_buttonBox;
+        TreeModel<> m_projectModel;
+        bool m_filesEdited = false;
+    };
+
+    void perform() override
+    {
+        collectImplementations(m_state->classAst->symbol, m_state);
+        if (m_state->remainingFollowSymbolOps == 0)
+            finish(m_state);
+    }
+
+    static CppRefactoringFilePtr getRefactoringFile(const FilePath &filePath, const State::Ptr &state)
+    {
+        CppRefactoringFilePtr &refactoringFile = state->perFileState[filePath].refactoringFile;
+        if (refactoringFile)
+            return refactoringFile;
+        CppEditorWidget *editorWidget = nullptr;
+        const QList<Core::IEditor *> editors = Core::DocumentModel::editorsForFilePath(filePath);
+        for (Core::IEditor *editor : editors) {
+            const auto textEditor = qobject_cast<TextEditor::BaseTextEditor *>(editor);
+            if (textEditor)
+                editorWidget = qobject_cast<CppEditorWidget *>(textEditor->editorWidget());
+            if (editorWidget)
+                break;
+        }
+        refactoringFile = editorWidget
+                ? state->factory.file(editorWidget, editorWidget->semanticInfo().doc)
+                : state->factory.cppFile(filePath);
+        return refactoringFile;
+    }
+
+    static void lookupSymbol(Symbol *symbol, const State::Ptr &state)
+    {
+        const CppRefactoringFilePtr refactoringFile = getRefactoringFile(symbol->filePath(), state);
+        const auto editorWidget = qobject_cast<CppEditorWidget *>(refactoringFile->editor());
+        QTextCursor cursor(refactoringFile->document()->begin());
+        TranslationUnit * const tu = refactoringFile->cppDocument()->translationUnit();
+        const int symbolPos = tu->getTokenPositionInDocument(symbol->sourceLocation(),
+                                                             refactoringFile->document());
+        cursor.setPosition(symbolPos);
+        const CursorInEditor cursorInEditor(
+                    cursor,
+                    symbol->filePath(),
+                    editorWidget,
+                    editorWidget ? editorWidget->textDocument() : nullptr,
+                    refactoringFile->cppDocument());
+        const auto callback = [symbol, symbolPos, doc = cursor.document(), state](const Link &link) {
+            class FinishedChecker {
+            public:
+                FinishedChecker(const State::Ptr &state) : m_state(state) {}
+                ~FinishedChecker() {
+                    if (--m_state->remainingFollowSymbolOps == 0)
+                        finish(m_state);
+                };
+            private:
+                const State::Ptr &m_state;
+            } finishedChecker(state);
+            if (!link.hasValidTarget())
+                return;
+            if (symbol->filePath() == link.targetFilePath) {
+                const int linkPos = Text::positionInText(doc, link.targetLine,
+                                                         link.targetColumn + 1);
+                if (linkPos == symbolPos)
+                    return;
+            }
+            const CppRefactoringFilePtr refactoringFile
+                    = getRefactoringFile(link.targetFilePath, state);
+            const QList<AST *> astPath = ASTPath(
+                        refactoringFile->cppDocument())(link.targetLine, link.targetColumn);
+            const bool isTemplate = symbol->asTemplate();
+            const bool isFunction = symbol->type()->asFunctionType();
+            for (auto it = astPath.rbegin(); it != astPath.rend(); ++it) {
+                const bool match = isTemplate ? bool((*it)->asTemplateDeclaration())
+                                              : isFunction ? bool((*it)->asFunctionDefinition())
+                                                           : bool((*it)->asSimpleDeclaration());
+                if (match) {
+                    // For member functions of class templates.
+                    if (isFunction) {
+                        const auto next = std::next(it);
+                        if (next != astPath.rend() && (*next)->asTemplateDeclaration())
+                            it = next;
+                    }
+                    state->perFileState[link.targetFilePath].insertSorted(*it);
+                    if (symbol->asForwardClassDeclaration()) {
+                        if (const auto classSpec = (*(it - 1))->asClassSpecifier();
+                                classSpec && classSpec->symbol) {
+                            collectImplementations(classSpec->symbol, state);
+                        }
+                    }
+                    break;
+                }
+            }
+        };
+        ++state->remainingFollowSymbolOps;
+
+        // Force queued execution, as the built-in editor can run the callback synchronously.
+        const auto followSymbol = [cursorInEditor, callback] {
+            CppModelManager::followSymbol(
+                        cursorInEditor, callback, true, false, FollowSymbolMode::Exact);
+        };
+        QMetaObject::invokeMethod(CppModelManager::instance(), followSymbol, Qt::QueuedConnection);
+    }
+
+    static void collectImplementations(Class *klass, const State::Ptr &state)
+    {
+        for (int i = 0; i < klass->memberCount(); ++i) {
+            Symbol * const member = klass->memberAt(i);
+            if (member->asForwardClassDeclaration() || member->asTemplate()) {
+                lookupSymbol(member, state);
+                continue;
+            }
+            const auto decl = member->asDeclaration();
+            if (!decl)
+                continue;
+            if (decl->type().type()->asFunctionType()) {
+                if (!decl->asFunction())
+                    lookupSymbol(member, state);
+            } else if (decl->isStatic() && !decl->type().isInline()) {
+                lookupSymbol(member, state);
+            }
+        }
+    }
+
+    static void finish(const State::Ptr &state)
+    {
+        Overview ov;
+        Project * const project = ProjectManager::projectForFile(state->originalFilePath);
+        const CppFileSettings fileSettings = cppFileSettingsForProject(project);
+        const auto constructDefaultFilePaths = [&] {
+            const QString className = ov.prettyName(state->classAst->symbol->name());
+            const QString baseFileName = fileSettings.lowerCaseFiles ? className.toLower() : className;
+            const QString headerFileName = baseFileName + '.' + fileSettings.headerSuffix;
+            const FilePath baseDir = state->originalFilePath.parentDir();
+            const FilePath headerFilePath = baseDir.pathAppended(headerFileName);
+            const QString sourceFileName = baseFileName + '.' + fileSettings.sourceSuffix;
+            const FilePath sourceFilePath = baseDir.pathAppended(sourceFileName);
+            return std::make_pair(headerFilePath, sourceFilePath);
+        };
+        auto [headerFilePath, sourceFilePath] = constructDefaultFilePaths();
+        bool mustCreateSourceFile = false;
+        bool mustNotCreateSourceFile = false;
+        ProjectNode *projectNode = nullptr;
+        if (project && project->rootProjectNode()) {
+            const Node * const origNode = project->nodeForFilePath(state->originalFilePath);
+            if (origNode)
+                projectNode = const_cast<Node *>(origNode)->managingProject();
+        }
+        if (state->interactive) {
+            Dialog dlg(headerFilePath, sourceFilePath, projectNode);
+            if (dlg.exec() != QDialog::Accepted)
+                return;
+            projectNode = dlg.projectNode();
+            headerFilePath = dlg.headerFilePath();
+            sourceFilePath = dlg.sourceFilePath();
+            mustCreateSourceFile = dlg.createSourceFile();
+            mustNotCreateSourceFile = !dlg.createSourceFile();
+        }
+        const auto fileListForDisplay = [](const FilePaths &files) {
+                return Utils::transform<QStringList>(files, [](const FilePath &fp) {
+                    return '"' + fp.toUserOutput() + '"';
+                }).join(", ");
+        };
+        FilePaths existingFiles;
+        if (headerFilePath.exists())
+            existingFiles << headerFilePath;
+        if (!mustNotCreateSourceFile && sourceFilePath.exists())
+            existingFiles << sourceFilePath;
+        if (!existingFiles.isEmpty()) {
+            Core::MessageManager::writeDisrupting(
+                        Tr::tr("Refusing to overwrite the following files: %1\n")
+                        .arg(fileListForDisplay(existingFiles)));
+            return;
+        }
+        const QString headerFileName = headerFilePath.fileName();
+
+        QString headerContent;
+        QString sourceContent;
+        QList<QString *> commonContent{&headerContent};
+        if (!mustNotCreateSourceFile)
+            commonContent << &sourceContent;
+        for (QString *const content : std::as_const(commonContent)) {
+            content->append(fileSettings.licenseTemplate());
+            if (!content->isEmpty())
+                content->append('\n');
+        }
+        sourceContent.append('\n').append("#include \"").append(headerFileName).append("\"\n");
+        const QStringList namespaceNames
+                = Utils::transform<QStringList>(state->namespacePath, [&](const Namespace *ns) {
+            return ov.prettyName(ns->name());
+        });
+        const QString headerGuard = Utils::headerGuard(headerFileName, namespaceNames);
+        if (fileSettings.headerPragmaOnce) {
+            headerContent.append("#pragma once\n");
+        } else {
+            headerContent.append("#ifndef " + headerGuard + "\n");
+            headerContent.append("#define " + headerGuard + "\n");
+        }
+        if (!namespaceNames.isEmpty()) {
+            for (QString *const content : std::as_const(commonContent)) {
+                content->append('\n');
+                for (const QString &ns : namespaceNames)
+                    content->append("namespace " + ns + " {\n");
+            }
+        }
+        bool hasSourceContent = false;
+        for (auto it = state->perFileState.begin(); it != state->perFileState.end(); ++it) {
+            if (it->declarationsToMove.isEmpty())
+                continue;
+            const CppRefactoringFilePtr refactoringFile = it->refactoringFile;
+            QTC_ASSERT(refactoringFile, continue);
+            const bool isDeclFile = refactoringFile->filePath() == state->originalFilePath;
+            ChangeSet changes;
+            if (isDeclFile) {
+                QString relInclude = headerFilePath.relativePathFrom(
+                            refactoringFile->filePath().parentDir()).toString();
+                if (!relInclude.isEmpty())
+                    relInclude.append('/');
+                relInclude.append('"').append(headerFileName).append('"');
+                insertNewIncludeDirective(relInclude, refactoringFile,
+                                          refactoringFile->cppDocument(), changes);
+            }
+            for (AST * const declToMove : std::as_const(it->declarationsToMove)) {
+                const ChangeSet::Range rangeToMove = refactoringFile->range(declToMove);
+                QString &content = isDeclFile || mustNotCreateSourceFile ? headerContent
+                                                                         : sourceContent;
+                if (&content == &sourceContent)
+                    hasSourceContent = true;
+                content.append('\n')
+                        .append(refactoringFile->textOf(rangeToMove))
+                        .append('\n');
+                changes.remove(rangeToMove);
+            }
+            refactoringFile->setChangeSet(changes);
+            refactoringFile->apply();
+        }
+
+        if (!namespaceNames.isEmpty()) {
+            for (QString *const content : std::as_const(commonContent)) {
+                content->append('\n');
+                for (auto it = namespaceNames.rbegin(); it != namespaceNames.rend(); ++it)
+                    content->append("} // namespace " + *it + '\n');
+            }
+        }
+        if (!fileSettings.headerPragmaOnce)
+            headerContent.append("\n#endif // " + headerGuard + '\n');
+
+        CppRefactoringFilePtr headerFile = state->factory.cppFile(headerFilePath);
+        headerFilePath.ensureExistingFile();
+        ChangeSet headerChanges;
+        headerChanges.insert(0, headerContent);
+        headerFile->setChangeSet(headerChanges);
+        headerFile->apply();
+        if (hasSourceContent || mustCreateSourceFile) {
+            sourceFilePath.ensureExistingFile();
+            CppRefactoringFilePtr sourceFile = state->factory.cppFile(sourceFilePath);
+            ChangeSet sourceChanges;
+            sourceChanges.insert(0, sourceContent);
+            sourceFile->setChangeSet(sourceChanges);
+            sourceFile->apply();
+        }
+
+        if (!projectNode)
+            return;
+        FilePaths toAdd{headerFilePath};
+        if (hasSourceContent)
+            toAdd << sourceFilePath;
+        FilePaths notAdded;
+        projectNode->addFiles(toAdd, &notAdded);
+        if (!notAdded.isEmpty()) {
+            Core::MessageManager::writeDisrupting(
+                        Tr::tr("Failed to add to project file \"%1\": %2")
+                        .arg(projectNode->filePath().toUserOutput(), fileListForDisplay(notAdded)));
+        }
+
+        if (state->interactive)
+            Core::EditorManager::openEditor(headerFilePath);
+    }
+
+    const State::Ptr m_state;
+};
+} // namespace
+
+// Applies if and only if:
+//   - Class is not a nested class.
+//   - Class name does not match file name via any of the usual transformations.
+//   - There are other declarations in the same file.
+void MoveClassToOwnFile::doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result)
+{
+    ClassSpecifierAST * const classAst = astForClassOperations(interface);
+    if (!classAst || !classAst->symbol)
+        return;
+    AST *fullDecl = nullptr;
+    for (auto it = interface.path().rbegin(); it != interface.path().rend() && !fullDecl; ++it) {
+        if (*it == classAst && it != interface.path().rend() - 1) {
+            auto next = std::next(it);
+            fullDecl = (*next)->asSimpleDeclaration();
+            if (next != interface.path().rend() - 1) {
+                next = std::next(next);
+                if (const auto templ = (*next)->asTemplateDeclaration())
+                    fullDecl = templ;
+            }
+        }
+    }
+    if (!fullDecl)
+        return;
+
+    // Check file name.
+    const QString className = Overview().prettyName(classAst->symbol->name());
+    if (className.isEmpty())
+        return;
+    const QString lowerFileBaseName = interface.filePath().baseName().toLower();
+    if (lowerFileBaseName.contains(className.toLower()))
+        return;
+    QString underscoredClassName = className;
+    QChar curChar = underscoredClassName.at(0);
+    for (int i = 1; i < underscoredClassName.size(); ++i) {
+        const QChar prevChar = curChar;
+        curChar = underscoredClassName.at(i);
+        if (curChar.isUpper() && prevChar.isLetterOrNumber() && !prevChar.isUpper()) {
+            underscoredClassName.insert(i, '_');
+            ++i;
+        }
+    }
+    if (lowerFileBaseName.contains(underscoredClassName.toLower()))
+        return;
+
+    // Is there more than one class definition in the file?
+    AST * const ast = interface.currentFile()->cppDocument()->translationUnit()->ast();
+    if (!ast)
+        return;
+    DeclarationListAST * const topLevelDecls = ast->asTranslationUnit()->declaration_list;
+    if (!topLevelDecls)
+        return;
+    QList<Namespace *> namespacePath;
+    QList<Namespace *> currentNamespacePath;
+    bool foundOtherDecls = false;
+    bool foundSelf = false;
+    std::function<void(Namespace *)> collectSymbolsFromNamespace;
+    const auto handleSymbol = [&](Symbol *symbol) {
+        if (!symbol)
+            return;
+        if (const auto nsMember = symbol->asNamespace()) {
+            collectSymbolsFromNamespace(nsMember);
+            return;
+        }
+        if (symbol != classAst->symbol) {
+            if (!symbol->asForwardClassDeclaration())
+                foundOtherDecls = true;
+            return;
+        }
+        QTC_ASSERT(symbol->asClass(), return);
+        foundSelf = true;
+        namespacePath = currentNamespacePath;
+    };
+    collectSymbolsFromNamespace = [&](Namespace *ns) {
+        currentNamespacePath << ns;
+        for (int i = 0; i < ns->memberCount() && (!foundSelf || !foundOtherDecls); ++i)
+            handleSymbol(ns->memberAt(i));
+        currentNamespacePath.removeLast();
+    };
+    for (DeclarationListAST *it = topLevelDecls; it && (!foundSelf || !foundOtherDecls);
+         it = it->next) {
+        DeclarationAST *decl = it->value;
+        if (!decl)
+            continue;
+        if (const auto templ = decl->asTemplateDeclaration())
+            decl = templ->declaration;
+        if (!decl)
+            continue;
+        if (const auto ns = decl->asNamespace(); ns && ns->symbol) {
+            collectSymbolsFromNamespace(ns->symbol);
+            continue;
+        }
+        if (const auto simpleDecl = decl->asSimpleDeclaration()) {
+            if (!simpleDecl->decl_specifier_list)
+                continue;
+            for (SpecifierListAST *spec = simpleDecl->decl_specifier_list; spec; spec = spec->next) {
+                if (!spec->value)
+                    continue;
+                if (const auto klass = spec->value->asClassSpecifier())
+                    handleSymbol(klass->symbol);
+                else if (!spec->value->asElaboratedTypeSpecifier()) // forward decl
+                    foundOtherDecls = true;
+            }
+        } else if (decl->asDeclaration()) {
+            foundOtherDecls = true;
+        }
+    }
+
+    if (foundSelf && foundOtherDecls) {
+        result << new MoveClassToOwnFileOp(
+                      interface, fullDecl, classAst, namespacePath, m_interactive);
+    }
+}
+
 void createCppQuickFixes()
 {
     new AddIncludeForUndefinedIdentifier;
@@ -10090,6 +10660,7 @@ void createCppQuickFixes()
     new ConvertCommentStyle;
     new MoveFunctionComments;
     new ConvertToMetaMethodCall;
+    new MoveClassToOwnFile;
 }
 
 void destroyCppQuickFixes()
diff --git a/src/plugins/cppeditor/cppquickfixes.h b/src/plugins/cppeditor/cppquickfixes.h
index bd47b318c7..d23fc86c5f 100644
--- a/src/plugins/cppeditor/cppquickfixes.h
+++ b/src/plugins/cppeditor/cppquickfixes.h
@@ -626,5 +626,19 @@ private:
                  TextEditor::QuickFixOperations &result) override;
 };
 
+//! Move a class into a dedicates set of files.
+class MoveClassToOwnFile : public CppQuickFixFactory
+{
+#ifdef WITH_TESTS
+public:
+    void setNonInteractive() { m_interactive = false; }
+#endif
+private:
+    void doMatch(const CppQuickFixInterface &interface,
+                 TextEditor::QuickFixOperations &result) override;
+
+    bool m_interactive = true;
+};
+
 } // namespace Internal
 } // namespace CppEditor
diff --git a/src/plugins/cppeditor/cpprefactoringchanges.cpp b/src/plugins/cppeditor/cpprefactoringchanges.cpp
index fd6ce277c9..053daeb245 100644
--- a/src/plugins/cppeditor/cpprefactoringchanges.cpp
+++ b/src/plugins/cppeditor/cpprefactoringchanges.cpp
@@ -144,13 +144,23 @@ bool CppRefactoringFile::isCursorOn(const AST *ast) const
 
 QList<Token> CppRefactoringFile::tokensForCursor() const
 {
-    QTextCursor c = cursor();
-    int pos = c.selectionStart();
-    int endPos = c.selectionEnd();
+    return tokensForCursor(cursor());
+}
+
+QList<Token> CppRefactoringFile::tokensForCursor(const QTextCursor &cursor) const
+{
+    int pos = cursor.selectionStart();
+    int endPos = cursor.selectionEnd();
     if (pos > endPos)
         std::swap(pos, endPos);
 
-    const std::vector<Token> &allTokens = m_cppDocument->translationUnit()->allTokens();
+    // Skip whitespace.
+    while (pos < endPos && document()->characterAt(pos).isSpace())
+        ++pos;
+    while (endPos > pos && document()->characterAt(endPos).isSpace())
+        --endPos;
+
+    const std::vector<Token> &allTokens = cppDocument()->translationUnit()->allTokens();
     const int firstIndex = tokenIndexForPosition(allTokens, pos, 0);
     if (firstIndex == -1)
         return {};
@@ -167,6 +177,14 @@ QList<Token> CppRefactoringFile::tokensForCursor() const
     return result;
 }
 
+QList<Token> CppRefactoringFile::tokensForLine(int line) const
+{
+    const QTextBlock block = document()->findBlockByNumber(line - 1);
+    QTextCursor cursor(block);
+    cursor.select(QTextCursor::BlockUnderCursor);
+    return tokensForCursor(cursor);
+}
+
 ChangeSet::Range CppRefactoringFile::range(unsigned tokenIndex) const
 {
     const Token &token = tokenAt(tokenIndex);
@@ -250,7 +268,7 @@ Id CppRefactoringFile::indenterId() const
 int CppRefactoringFile::tokenIndexForPosition(const std::vector<CPlusPlus::Token> &tokens,
                                               int pos, int startIndex) const
 {
-    const TranslationUnit * const tu = m_cppDocument->translationUnit();
+    const TranslationUnit * const tu = cppDocument()->translationUnit();
 
     // Binary search
     for (int l = startIndex, u = int(tokens.size()) - 1; l <= u; ) {
diff --git a/src/plugins/cppeditor/cpprefactoringchanges.h b/src/plugins/cppeditor/cpprefactoringchanges.h
index 9a9cb09dc1..6350751a34 100644
--- a/src/plugins/cppeditor/cpprefactoringchanges.h
+++ b/src/plugins/cppeditor/cpprefactoringchanges.h
@@ -44,6 +44,8 @@ public:
     void startAndEndOf(unsigned index, int *start, int *end) const;
 
     QList<CPlusPlus::Token> tokensForCursor() const;
+    QList<CPlusPlus::Token> tokensForCursor(const QTextCursor &cursor) const;
+    QList<CPlusPlus::Token> tokensForLine(int line) const;
 
     using TextEditor::RefactoringFile::textOf;
     QString textOf(const CPlusPlus::AST *ast) const;
diff --git a/src/plugins/cppeditor/cpptoolsreuse.cpp b/src/plugins/cppeditor/cpptoolsreuse.cpp
index f6e58abddf..947ecdd4c6 100644
--- a/src/plugins/cppeditor/cpptoolsreuse.cpp
+++ b/src/plugins/cppeditor/cpptoolsreuse.cpp
@@ -4,6 +4,7 @@
 #include "cpptoolsreuse.h"
 
 #include "clangdiagnosticconfigsmodel.h"
+#include "clangdsettings.h"
 #include "cppautocompleter.h"
 #include "cppcanonicalsymbol.h"
 #include "cppcodemodelsettings.h"
diff --git a/src/plugins/cppeditor/cpptoolstestcase.cpp b/src/plugins/cppeditor/cpptoolstestcase.cpp
index 869bbf9b84..70435abe9f 100644
--- a/src/plugins/cppeditor/cpptoolstestcase.cpp
+++ b/src/plugins/cppeditor/cpptoolstestcase.cpp
@@ -510,4 +510,19 @@ int clangdIndexingTimeout()
     return intervalAsInt;
 }
 
+SourceFilesRefreshGuard::SourceFilesRefreshGuard()
+{
+    connect(CppModelManager::instance(), &CppModelManager::sourceFilesRefreshed, this, [this] {
+        m_refreshed = true;
+    });
+}
+
+bool SourceFilesRefreshGuard::wait()
+{
+    for (int i = 0; i < 10 && !m_refreshed; ++i) {
+        CppEditor::Tests::waitForSignalOrTimeout(
+            CppModelManager::instance(), &CppModelManager::sourceFilesRefreshed, 1000);
+    }
+    return m_refreshed;
+}
 } // namespace CppEditor::Tests
diff --git a/src/plugins/cppeditor/cpptoolstestcase.h b/src/plugins/cppeditor/cpptoolstestcase.h
index 99969621b3..6e9f0133ba 100644
--- a/src/plugins/cppeditor/cpptoolstestcase.h
+++ b/src/plugins/cppeditor/cpptoolstestcase.h
@@ -171,6 +171,8 @@ public:
             bool configureAsExampleProject = false,
             ProjectExplorer::Kit *kit = nullptr);
 
+    QList<ProjectExplorer::Project *> projects() const { return m_openProjects; };
+
 private:
     QList<ProjectExplorer::Project *> m_openProjects;
 };
@@ -203,5 +205,17 @@ private:
     TemporaryCopiedDir();
 };
 
+class SourceFilesRefreshGuard : public QObject
+{
+public:
+    SourceFilesRefreshGuard();
+
+    void reset() { m_refreshed = false; }
+    bool wait();
+
+private:
+    bool m_refreshed = false;
+};
+
 } // namespace Tests
 } // namespace CppEditor
diff --git a/src/plugins/cppeditor/cursorineditor.h b/src/plugins/cppeditor/cursorineditor.h
index 46dd4b2b2a..77c853f97b 100644
--- a/src/plugins/cppeditor/cursorineditor.h
+++ b/src/plugins/cppeditor/cursorineditor.h
@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include <cplusplus/CppDocument.h>
 #include <utils/fileutils.h>
 #include <utils/link.h>
 
@@ -22,15 +23,18 @@ class CursorInEditor
 {
 public:
     CursorInEditor(const QTextCursor &cursor, const Utils::FilePath &filePath,
-                 CppEditorWidget *editorWidget = nullptr,
-                 TextEditor::TextDocument *textDocument = nullptr)
+                   CppEditorWidget *editorWidget = nullptr,
+                   TextEditor::TextDocument *textDocument = nullptr,
+                   const CPlusPlus::Document::Ptr &cppDocument = {})
         : m_cursor(cursor)
         , m_filePath(filePath)
         , m_editorWidget(editorWidget)
         , m_textDocument(textDocument)
+        , m_cppDocument(cppDocument)
     {}
     CppEditorWidget *editorWidget() const { return m_editorWidget; }
     TextEditor::TextDocument *textDocument() const { return m_textDocument; }
+    CPlusPlus::Document::Ptr cppDocument() const { return m_cppDocument; }
     const QTextCursor &cursor() const { return m_cursor; }
     const Utils::FilePath &filePath() const { return m_filePath; }
 private:
@@ -38,6 +42,7 @@ private:
     Utils::FilePath m_filePath;
     CppEditorWidget *m_editorWidget = nullptr;
     TextEditor::TextDocument * const m_textDocument;
+    const CPlusPlus::Document::Ptr m_cppDocument;
 };
 
 } // namespace CppEditor
diff --git a/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp b/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp
index 9bef50b0b8..41dd6b538f 100644
--- a/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp
+++ b/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp
@@ -3,6 +3,7 @@
 
 #include "followsymbol_switchmethoddecldef_test.h"
 
+#include "clangdsettings.h"
 #include "cppcodemodelsettings.h"
 #include "cppeditorwidget.h"
 #include "cppfollowsymbolundercursor.h"
diff --git a/src/plugins/cppeditor/projectinfo.cpp b/src/plugins/cppeditor/projectinfo.cpp
index 8a393df6d3..9561310f32 100644
--- a/src/plugins/cppeditor/projectinfo.cpp
+++ b/src/plugins/cppeditor/projectinfo.cpp
@@ -33,7 +33,7 @@ bool ProjectInfo::operator ==(const ProjectInfo &other) const
         && m_projectParts == other.m_projectParts
         && m_headerPaths == other.m_headerPaths
         && m_sourceFiles == other.m_sourceFiles
-        && m_settings.data() == other.m_settings.data()
+        && m_settings == other.m_settings
         && m_defines == other.m_defines;
 }
 
@@ -50,7 +50,7 @@ bool ProjectInfo::definesChanged(const ProjectInfo &other) const
 bool ProjectInfo::configurationChanged(const ProjectInfo &other) const
 {
     return definesChanged(other) || m_headerPaths != other.m_headerPaths
-        || m_settings.data() != other.settings().data();
+        || m_settings != other.settings();
 }
 
 bool ProjectInfo::configurationOrFilesChanged(const ProjectInfo &other) const
@@ -98,7 +98,7 @@ ProjectInfo::ProjectInfo(const ProjectExplorer::ProjectUpdateInfo &updateInfo,
       m_headerPaths(getHeaderPaths(projectParts)),
       m_sourceFiles(getSourceFiles(projectParts)),
       m_defines(getDefines(projectParts)),
-      m_settings(CppCodeModelSettings::Data(updateInfo.cppSettings))
+      m_settings(updateInfo.cppSettings)
 {
 }
 
@@ -110,7 +110,7 @@ ProjectInfo::ProjectInfo(const ConstPtr &pi, const CppCodeModelSettings &setting
     m_headerPaths(pi->m_headerPaths),
     m_sourceFiles(pi->sourceFiles()),
     m_defines(pi->m_defines),
-    m_settings(settings.data())
+    m_settings(settings)
 {
 }
 
diff --git a/src/plugins/cppeditor/testcases/move-class/complex/complex.pro b/src/plugins/cppeditor/testcases/move-class/complex/complex.pro
new file mode 100644
index 0000000000..efdac1a69a
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/complex/complex.pro
@@ -0,0 +1,2 @@
+HEADERS = theheader.h
+SOURCES = thesource.cpp main.cpp
diff --git a/src/plugins/cppeditor/testcases/move-class/complex/complex.pro_expected b/src/plugins/cppeditor/testcases/move-class/complex/complex.pro_expected
new file mode 100644
index 0000000000..9a7a013363
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/complex/complex.pro_expected
@@ -0,0 +1,4 @@
+HEADERS = theheader.h \
+    theclass.h
+SOURCES = thesource.cpp main.cpp \
+    theclass.cpp
diff --git a/src/plugins/cppeditor/testcases/move-class/complex/main.cpp b/src/plugins/cppeditor/testcases/move-class/complex/main.cpp
new file mode 100644
index 0000000000..2934727d74
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/complex/main.cpp
@@ -0,0 +1,11 @@
+#include "theheader.h"
+
+namespace Project {
+namespace Internal {
+bool TheClass::needsDefinition = true;
+}
+}
+
+int main()
+{
+}
diff --git a/src/plugins/cppeditor/testcases/move-class/complex/main.cpp_expected b/src/plugins/cppeditor/testcases/move-class/complex/main.cpp_expected
new file mode 100644
index 0000000000..10bdcd280a
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/complex/main.cpp_expected
@@ -0,0 +1,11 @@
+#include "theheader.h"
+
+namespace Project {
+namespace Internal {
+
+}
+}
+
+int main()
+{
+}
diff --git a/src/plugins/cppeditor/testcases/move-class/complex/theclass.cpp_expected b/src/plugins/cppeditor/testcases/move-class/complex/theclass.cpp_expected
new file mode 100644
index 0000000000..5cb8bbb375
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/complex/theclass.cpp_expected
@@ -0,0 +1,20 @@
+
+#include "theclass.h"
+
+namespace Project {
+namespace Internal {
+
+bool TheClass::needsDefinition = true;
+
+class TheClass::Private
+{
+    void func();
+    int m_member = 0;
+};
+
+void TheClass::defined() {}
+
+void TheClass::Private::func() {}
+
+} // namespace Internal
+} // namespace Project
diff --git a/src/plugins/cppeditor/testcases/move-class/complex/theclass.h_expected b/src/plugins/cppeditor/testcases/move-class/complex/theclass.h_expected
new file mode 100644
index 0000000000..c7db776d27
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/complex/theclass.h_expected
@@ -0,0 +1,29 @@
+#ifndef PROJECT_INTERNAL_THECLASS_H
+#define PROJECT_INTERNAL_THECLASS_H
+
+namespace Project {
+namespace Internal {
+
+class TheClass
+{
+public:
+    TheClass() = default;
+    
+    void defined();
+    void undefined();
+    
+    template<typename T> T defaultValue() const;
+private:
+    class Private;
+    class Undefined;
+    static inline bool doesNotNeedDefinition = true;
+    static bool needsDefinition;
+    int m_value = 0;
+};
+
+template<typename T> T TheClass::defaultValue() const { return T(); }
+
+} // namespace Internal
+} // namespace Project
+
+#endif // PROJECT_INTERNAL_THECLASS_H
diff --git a/src/plugins/cppeditor/testcases/move-class/complex/theheader.h b/src/plugins/cppeditor/testcases/move-class/complex/theheader.h
new file mode 100644
index 0000000000..93f0d47a81
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/complex/theheader.h
@@ -0,0 +1,30 @@
+#ifndef THE_HEADER_H
+#define THE_HEADER_H
+
+namespace Project {
+namespace Internal {
+
+class SomeClass {};
+class TheClass
+{
+public:
+    TheClass() = default;
+
+    void defined();
+    void undefined();
+
+    template<typename T> T defaultValue() const;
+private:
+    class Private;
+    class Undefined;
+    static inline bool doesNotNeedDefinition = true;
+    static bool needsDefinition;
+    int m_value = 0;
+};
+
+template<typename T> T TheClass::defaultValue() const { return T(); }
+
+}
+}
+
+#endif
diff --git a/src/plugins/cppeditor/testcases/move-class/complex/theheader.h_expected b/src/plugins/cppeditor/testcases/move-class/complex/theheader.h_expected
new file mode 100644
index 0000000000..65bf2ec7f4
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/complex/theheader.h_expected
@@ -0,0 +1,18 @@
+#ifndef THE_HEADER_H
+#define THE_HEADER_H
+
+#include "theclass.h"
+
+
+namespace Project {
+namespace Internal {
+
+class SomeClass {};
+
+
+
+
+}
+}
+
+#endif
diff --git a/src/plugins/cppeditor/testcases/move-class/complex/thesource.cpp b/src/plugins/cppeditor/testcases/move-class/complex/thesource.cpp
new file mode 100644
index 0000000000..645b6a4b13
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/complex/thesource.cpp
@@ -0,0 +1,19 @@
+#include "theheader.h"
+
+namespace Project {
+namespace Internal {
+
+static void someFunction() {}
+
+class TheClass::Private
+{
+    void func();
+    int m_member = 0;
+};
+
+void TheClass::defined() {}
+
+void TheClass::Private::func() {}
+
+}
+}
diff --git a/src/plugins/cppeditor/testcases/move-class/complex/thesource.cpp_expected b/src/plugins/cppeditor/testcases/move-class/complex/thesource.cpp_expected
new file mode 100644
index 0000000000..d84f180808
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/complex/thesource.cpp_expected
@@ -0,0 +1,15 @@
+#include "theheader.h"
+
+namespace Project {
+namespace Internal {
+
+static void someFunction() {}
+
+
+
+
+
+
+
+}
+}
diff --git a/src/plugins/cppeditor/testcases/move-class/decl-in-source/decl-in-source.pro b/src/plugins/cppeditor/testcases/move-class/decl-in-source/decl-in-source.pro
new file mode 100644
index 0000000000..d527c86ef3
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/decl-in-source/decl-in-source.pro
@@ -0,0 +1,2 @@
+HEADERS = theheader.h
+SOURCES = thesource.cpp
diff --git a/src/plugins/cppeditor/testcases/move-class/decl-in-source/decl-in-source.pro_expected b/src/plugins/cppeditor/testcases/move-class/decl-in-source/decl-in-source.pro_expected
new file mode 100644
index 0000000000..969d1fdb80
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/decl-in-source/decl-in-source.pro_expected
@@ -0,0 +1,3 @@
+HEADERS = theheader.h \
+    theclass.h
+SOURCES = thesource.cpp
diff --git a/src/plugins/cppeditor/testcases/move-class/decl-in-source/theclass.h_expected b/src/plugins/cppeditor/testcases/move-class/decl-in-source/theclass.h_expected
new file mode 100644
index 0000000000..4af91c47e3
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/decl-in-source/theclass.h_expected
@@ -0,0 +1,11 @@
+#ifndef THECLASS_H
+#define THECLASS_H
+
+class TheClass
+{
+    void func();
+};
+
+void TheClass::func() {}
+
+#endif // THECLASS_H
diff --git a/src/plugins/cppeditor/testcases/move-class/decl-in-source/theheader.h b/src/plugins/cppeditor/testcases/move-class/decl-in-source/theheader.h
new file mode 100644
index 0000000000..9c0f94351f
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/decl-in-source/theheader.h
@@ -0,0 +1,4 @@
+class SomeClass
+{
+    void func();
+};
diff --git a/src/plugins/cppeditor/testcases/move-class/decl-in-source/thesource.cpp b/src/plugins/cppeditor/testcases/move-class/decl-in-source/thesource.cpp
new file mode 100644
index 0000000000..79a7651309
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/decl-in-source/thesource.cpp
@@ -0,0 +1,8 @@
+#include "theheader.h"
+
+class TheClass
+{
+    void func();
+};
+void SomeClass::func() {}
+void TheClass::func() {}
diff --git a/src/plugins/cppeditor/testcases/move-class/decl-in-source/thesource.cpp_expected b/src/plugins/cppeditor/testcases/move-class/decl-in-source/thesource.cpp_expected
new file mode 100644
index 0000000000..e26225d719
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/decl-in-source/thesource.cpp_expected
@@ -0,0 +1,6 @@
+#include "theclass.h"
+#include "theheader.h"
+
+
+void SomeClass::func() {}
+
diff --git a/src/plugins/cppeditor/testcases/move-class/header-only/header-only.pro b/src/plugins/cppeditor/testcases/move-class/header-only/header-only.pro
new file mode 100644
index 0000000000..d527c86ef3
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/header-only/header-only.pro
@@ -0,0 +1,2 @@
+HEADERS = theheader.h
+SOURCES = thesource.cpp
diff --git a/src/plugins/cppeditor/testcases/move-class/header-only/header-only.pro_expected b/src/plugins/cppeditor/testcases/move-class/header-only/header-only.pro_expected
new file mode 100644
index 0000000000..969d1fdb80
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/header-only/header-only.pro_expected
@@ -0,0 +1,3 @@
+HEADERS = theheader.h \
+    theclass.h
+SOURCES = thesource.cpp
diff --git a/src/plugins/cppeditor/testcases/move-class/header-only/theclass.h_expected b/src/plugins/cppeditor/testcases/move-class/header-only/theclass.h_expected
new file mode 100644
index 0000000000..9b1f655f3f
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/header-only/theclass.h_expected
@@ -0,0 +1,10 @@
+#ifndef THECLASS_H
+#define THECLASS_H
+
+class TheClass {
+    void func();
+};
+
+void TheClass::func() {}
+
+#endif // THECLASS_H
diff --git a/src/plugins/cppeditor/testcases/move-class/header-only/theheader.h b/src/plugins/cppeditor/testcases/move-class/header-only/theheader.h
new file mode 100644
index 0000000000..131a6d42a6
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/header-only/theheader.h
@@ -0,0 +1,7 @@
+class SomeClass {
+    void func();
+};
+class TheClass {
+    void func();
+};
+void TheClass::func() {}
diff --git a/src/plugins/cppeditor/testcases/move-class/header-only/theheader.h_expected b/src/plugins/cppeditor/testcases/move-class/header-only/theheader.h_expected
new file mode 100644
index 0000000000..1cf9e1d06c
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/header-only/theheader.h_expected
@@ -0,0 +1,7 @@
+#include "theclass.h"
+
+class SomeClass {
+    void func();
+};
+
+
diff --git a/src/plugins/cppeditor/testcases/move-class/header-only/thesource.cpp b/src/plugins/cppeditor/testcases/move-class/header-only/thesource.cpp
new file mode 100644
index 0000000000..d01e0845ab
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/header-only/thesource.cpp
@@ -0,0 +1,3 @@
+#include "theheader.h"
+
+void SomeClass::func() {}
diff --git a/src/plugins/cppeditor/testcases/move-class/header-only/thesource.cpp_expected b/src/plugins/cppeditor/testcases/move-class/header-only/thesource.cpp_expected
new file mode 100644
index 0000000000..d01e0845ab
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/header-only/thesource.cpp_expected
@@ -0,0 +1,3 @@
+#include "theheader.h"
+
+void SomeClass::func() {}
diff --git a/src/plugins/cppeditor/testcases/move-class/match1/TheClass.h b/src/plugins/cppeditor/testcases/move-class/match1/TheClass.h
new file mode 100644
index 0000000000..11b0cf15d1
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/match1/TheClass.h
@@ -0,0 +1,2 @@
+class SomeClass {};
+class TheClass {};
diff --git a/src/plugins/cppeditor/testcases/move-class/match1/match1.pro b/src/plugins/cppeditor/testcases/move-class/match1/match1.pro
new file mode 100644
index 0000000000..72ccc46616
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/match1/match1.pro
@@ -0,0 +1 @@
+HEADERS = TheClass.h
diff --git a/src/plugins/cppeditor/testcases/move-class/match2/match2.pro b/src/plugins/cppeditor/testcases/move-class/match2/match2.pro
new file mode 100644
index 0000000000..6f982e4f16
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/match2/match2.pro
@@ -0,0 +1 @@
+HEADERS = theclass.h
diff --git a/src/plugins/cppeditor/testcases/move-class/match2/theclass.h b/src/plugins/cppeditor/testcases/move-class/match2/theclass.h
new file mode 100644
index 0000000000..11b0cf15d1
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/match2/theclass.h
@@ -0,0 +1,2 @@
+class SomeClass {};
+class TheClass {};
diff --git a/src/plugins/cppeditor/testcases/move-class/match3/match3.pro b/src/plugins/cppeditor/testcases/move-class/match3/match3.pro
new file mode 100644
index 0000000000..850a113845
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/match3/match3.pro
@@ -0,0 +1 @@
+HEADERS = the_class.h
diff --git a/src/plugins/cppeditor/testcases/move-class/match3/the_class.h b/src/plugins/cppeditor/testcases/move-class/match3/the_class.h
new file mode 100644
index 0000000000..11b0cf15d1
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/match3/the_class.h
@@ -0,0 +1,2 @@
+class SomeClass {};
+class TheClass {};
diff --git a/src/plugins/cppeditor/testcases/move-class/nested/main.cpp b/src/plugins/cppeditor/testcases/move-class/nested/main.cpp
new file mode 100644
index 0000000000..73fd1620fa
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/nested/main.cpp
@@ -0,0 +1,6 @@
+class SomeClass {};
+class Outer {
+    class Inner {};
+};
+
+int main() {}
diff --git a/src/plugins/cppeditor/testcases/move-class/nested/nested.pro b/src/plugins/cppeditor/testcases/move-class/nested/nested.pro
new file mode 100644
index 0000000000..bba41b9c12
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/nested/nested.pro
@@ -0,0 +1 @@
+SOURCES = main.cpp
diff --git a/src/plugins/cppeditor/testcases/move-class/single/single.pro b/src/plugins/cppeditor/testcases/move-class/single/single.pro
new file mode 100644
index 0000000000..77db8b92e4
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/single/single.pro
@@ -0,0 +1 @@
+HEADERS = theheader.h
diff --git a/src/plugins/cppeditor/testcases/move-class/single/theheader.h b/src/plugins/cppeditor/testcases/move-class/single/theheader.h
new file mode 100644
index 0000000000..5f7cd96730
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/single/theheader.h
@@ -0,0 +1,2 @@
+class Private;
+class TheClass {};
diff --git a/src/plugins/cppeditor/testcases/move-class/template/template.pro b/src/plugins/cppeditor/testcases/move-class/template/template.pro
new file mode 100644
index 0000000000..77db8b92e4
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/template/template.pro
@@ -0,0 +1 @@
+HEADERS = theheader.h
diff --git a/src/plugins/cppeditor/testcases/move-class/template/template.pro_expected b/src/plugins/cppeditor/testcases/move-class/template/template.pro_expected
new file mode 100644
index 0000000000..0ed81f0008
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/template/template.pro_expected
@@ -0,0 +1,2 @@
+HEADERS = theheader.h \
+    theclass.h
diff --git a/src/plugins/cppeditor/testcases/move-class/template/theclass.h_expected b/src/plugins/cppeditor/testcases/move-class/template/theclass.h_expected
new file mode 100644
index 0000000000..f9681cc796
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/template/theclass.h_expected
@@ -0,0 +1,11 @@
+#ifndef THECLASS_H
+#define THECLASS_H
+
+template<typename T> class TheClass
+{
+    T defaultValue() const;
+};
+
+template<typename T> inline T TheClass<T>::defaultValue() const { return T(); }
+
+#endif // THECLASS_H
diff --git a/src/plugins/cppeditor/testcases/move-class/template/theheader.h b/src/plugins/cppeditor/testcases/move-class/template/theheader.h
new file mode 100644
index 0000000000..58f7a07372
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/template/theheader.h
@@ -0,0 +1,7 @@
+enum SomeEnum { E };
+template<typename T> class TheClass
+{
+    T defaultValue() const;
+};
+
+template<typename T> inline T TheClass<T>::defaultValue() const { return T(); }
diff --git a/src/plugins/cppeditor/testcases/move-class/template/theheader.h_expected b/src/plugins/cppeditor/testcases/move-class/template/theheader.h_expected
new file mode 100644
index 0000000000..20087c3199
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/template/theheader.h_expected
@@ -0,0 +1,6 @@
+#include "theclass.h"
+
+enum SomeEnum { E };
+
+
+
diff --git a/src/plugins/ctfvisualizer/ctftimelinemodel.cpp b/src/plugins/ctfvisualizer/ctftimelinemodel.cpp
index 0128877276..2a2a886012 100644
--- a/src/plugins/ctfvisualizer/ctftimelinemodel.cpp
+++ b/src/plugins/ctfvisualizer/ctftimelinemodel.cpp
@@ -29,7 +29,7 @@ CtfTimelineModel::CtfTimelineModel(Timeline::TimelineModelAggregator *parent,
 {
     updateName();
     setCollapsedRowCount(1);
-    setCategoryColor(colorByHue(qHash(pid)));
+    setCategoryColor(colorByHue(int(qHash(pid))));
     setHasMixedTypesInExpandedState(true);
 }
 
diff --git a/src/plugins/debugger/dap/pydapengine.cpp b/src/plugins/debugger/dap/pydapengine.cpp
index 6893558145..666750b3e6 100644
--- a/src/plugins/debugger/dap/pydapengine.cpp
+++ b/src/plugins/debugger/dap/pydapengine.cpp
@@ -234,7 +234,7 @@ void PyDapEngine::setupEngine()
         info.addCustomButton(Tr::tr("Install debugpy"), [this] {
             Core::ICore::infoBar()->removeInfo(installDebugPyInfoBarId);
             Core::ICore::infoBar()->globallySuppressInfo(installDebugPyInfoBarId);
-            const FilePath target = packageDir(runParameters().interpreter, "dubugpy");
+            const FilePath target = packageDir(runParameters().interpreter, "debugpy");
             QTC_ASSERT(target.isSameDevice(runParameters().interpreter), return);
             m_installProcess.reset(new Process);
             m_installProcess->setCommand(
@@ -244,7 +244,8 @@ void PyDapEngine::setupEngine()
                   "install",
                   "-t",
                   target.needsDevice() ? target.path() : target.toUserOutput(),
-                  "debugpy"}});
+                  "debugpy",
+                  "--upgrade"}});
             m_installProcess->setTerminalMode(TerminalMode::Run);
             m_installProcess->start();
         });
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index d2647f3d7b..cc3c847b63 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -1993,7 +1993,7 @@ void DebuggerPluginPrivate::setInitialState()
 
 void DebuggerPluginPrivate::updateDebugWithoutDeployMenu()
 {
-    const bool state = ProjectExplorerPlugin::projectExplorerSettings().deployBeforeRun;
+    const bool state = projectExplorerSettings().deployBeforeRun;
     m_debugWithoutDeployAction.setVisible(state);
 }
 
diff --git a/src/plugins/debugger/debuggerrunconfigurationaspect.cpp b/src/plugins/debugger/debuggerrunconfigurationaspect.cpp
index 41bbef61bd..d4f4361f78 100644
--- a/src/plugins/debugger/debuggerrunconfigurationaspect.cpp
+++ b/src/plugins/debugger/debuggerrunconfigurationaspect.cpp
@@ -100,10 +100,10 @@ DebuggerRunConfigurationAspect::DebuggerRunConfigurationAspect(Target *target)
         };
         setSummaryText();
 
-        connect(&m_cppAspect, &BaseAspect::changed, this, setSummaryText);
-        connect(&m_qmlAspect, &BaseAspect::changed, this, setSummaryText);
-        connect(&m_pythonAspect, &BaseAspect::changed, this, setSummaryText);
-        connect(&m_overrideStartupAspect, &BaseAspect::changed, this, setSummaryText);
+        connect(&m_cppAspect, &BaseAspect::changed, details, setSummaryText);
+        connect(&m_qmlAspect, &BaseAspect::changed, details, setSummaryText);
+        connect(&m_pythonAspect, &BaseAspect::changed, details, setSummaryText);
+        connect(&m_overrideStartupAspect, &BaseAspect::changed, details, setSummaryText);
 
         return details;
     });
diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp
index a46d34ccda..503bad4bc2 100644
--- a/src/plugins/debugger/debuggerruncontrol.cpp
+++ b/src/plugins/debugger/debuggerruncontrol.cpp
@@ -30,6 +30,8 @@
 #include <projectexplorer/taskhub.h>
 #include <projectexplorer/toolchain.h>
 
+#include <remotelinux/remotelinux_constants.h>
+
 #include <utils/algorithm.h>
 #include <utils/checkablemessagebox.h>
 #include <utils/environment.h>
@@ -1060,7 +1062,15 @@ DebugServerRunner::DebugServerRunner(RunControl *runControl, DebugServerPortsGat
                     cmd.addArg("--multi");
                 if (m_pid.isValid())
                     cmd.addArg("--attach");
-                cmd.addArg(QString(":%1").arg(portsGatherer->gdbServer().port()));
+
+                const auto port = portsGatherer->gdbServer().port();
+                cmd.addArg(QString(":%1").arg(port));
+
+                if (runControl->device()->extraData(RemoteLinux::Constants::SshForwardDebugServerPort).toBool()) {
+                    addExtraData(RemoteLinux::Constants::SshForwardPort, port);
+                    addExtraData(RemoteLinux::Constants::DisableSharing, true);
+                }
+
                 if (m_pid.isValid())
                     cmd.addArg(QString::number(m_pid.pid()));
             }
diff --git a/src/plugins/debugger/lldb/lldbengine.cpp b/src/plugins/debugger/lldb/lldbengine.cpp
index 0e53afad35..3d21f82ca2 100644
--- a/src/plugins/debugger/lldb/lldbengine.cpp
+++ b/src/plugins/debugger/lldb/lldbengine.cpp
@@ -30,6 +30,7 @@
 
 #include <projectexplorer/runcontrol.h>
 
+#include <utils/algorithm.h>
 #include <utils/environment.h>
 #include <utils/qtcprocess.h>
 #include <utils/processinterface.h>
@@ -328,6 +329,16 @@ void LldbEngine::handleLldbStarted()
                 runEngine();
             };
             runCommand(cmd3);
+
+            // Execute post attach commands
+            QStringList commands = settings().gdbPostAttachCommands().split('\n');
+            commands = Utils::filtered(commands, [](const QString line) {
+                const QString trimmed = line.trimmed();
+                return !trimmed.isEmpty() && !trimmed.startsWith('#');
+            });
+            for (const QString &cmd : commands) {
+                executeDebuggerCommand(cmd);
+            }
         } else {
             notifyEngineSetupFailed();
         }
diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp
index 0cc67f5416..3f47df4b88 100644
--- a/src/plugins/debugger/watchhandler.cpp
+++ b/src/plugins/debugger/watchhandler.cpp
@@ -469,7 +469,6 @@ public:
 
     QSet<QString> m_expandedINames;
     QHash<QString, int> m_maxArrayCount;
-    QTimer m_requestUpdateTimer;
     QTimer m_localsWindowsTimer;
 
     QHash<QString, TypeInfo> m_reportedTypeInfo;
@@ -513,10 +512,6 @@ WatchModel::WatchModel(WatchHandler *handler, DebuggerEngine *engine)
     root->appendChild(m_tooltipRoot);
     setRootItem(root);
 
-    m_requestUpdateTimer.setSingleShot(true);
-    connect(&m_requestUpdateTimer, &QTimer::timeout,
-        this, &WatchModel::updateStarted);
-
     m_localsWindowsTimer.setSingleShot(true);
     m_localsWindowsTimer.setInterval(50);
     connect(&m_localsWindowsTimer, &QTimer::timeout, this, [this] {
@@ -2310,7 +2305,7 @@ void WatchHandler::notifyUpdateStarted(const UpdateParameters &updateParameters)
         }
     }
 
-    m_model->m_requestUpdateTimer.start(80);
+    emit m_model->updateStarted();
     m_model->m_contentsValid = false;
     updateLocalsWindow();
 }
@@ -2350,7 +2345,6 @@ void WatchHandler::notifyUpdateFinished()
     m_model->m_contentsValid = true;
     updateLocalsWindow();
     m_model->reexpandItems();
-    m_model->m_requestUpdateTimer.stop();
     emit m_model->updateFinished();
 }
 
diff --git a/src/plugins/debugger/watchwindow.cpp b/src/plugins/debugger/watchwindow.cpp
index 4e95b04b6f..a75e824d70 100644
--- a/src/plugins/debugger/watchwindow.cpp
+++ b/src/plugins/debugger/watchwindow.cpp
@@ -8,6 +8,7 @@
 #include "debuggertr.h"
 #include "watchhandler.h"
 
+#include <utils/algorithm.h>
 #include <utils/aspects.h>
 #include <utils/qtcassert.h>
 
@@ -29,6 +30,10 @@ WatchTreeView::WatchTreeView(WatchType type)
     setAcceptDrops(true);
     setDropIndicatorShown(true);
 
+    m_progressDelayTimer.setSingleShot(true);
+    m_progressDelayTimer.setInterval(80);
+    connect(&m_progressDelayTimer, &QTimer::timeout, this, &WatchTreeView::showProgressIndicator);
+
     connect(this, &QTreeView::expanded, this, &WatchTreeView::expandNode);
     connect(this, &QTreeView::collapsed, this, &WatchTreeView::collapseNode);
 
@@ -71,12 +76,10 @@ void WatchTreeView::setModel(QAbstractItemModel *model)
             this, &QAbstractItemView::setCurrentIndex);
     connect(watchModel, &WatchModelBase::itemIsExpanded,
             this, &WatchTreeView::handleItemIsExpanded);
-    if (m_type == LocalsType) {
-        connect(watchModel, &WatchModelBase::updateStarted,
-                this, &WatchTreeView::showProgressIndicator);
-        connect(watchModel, &WatchModelBase::updateFinished,
-                this, &WatchTreeView::hideProgressIndicator);
-    }
+    connect(watchModel, &WatchModelBase::updateStarted,
+            this, &WatchTreeView::handleUpdateStarted);
+    connect(watchModel, &WatchModelBase::updateFinished,
+            this, &WatchTreeView::handleUpdateFinished);
 
     updateTimeColumn();
 }
@@ -95,6 +98,39 @@ void WatchTreeView::handleItemIsExpanded(const QModelIndex &idx)
         expand(idx);
 }
 
+void WatchTreeView::handleUpdateStarted()
+{
+    m_selectedInames = Utils::transform(selectedIndexes(), [this](const QModelIndex &idx) {
+        return model()->data(idx, LocalsINameRole).toString();
+    });
+    m_currentIname = currentIndex().data(LocalsINameRole).toString();
+    if (m_type == LocalsType)
+        m_progressDelayTimer.start();
+}
+
+void WatchTreeView::handleUpdateFinished()
+{
+    m_progressDelayTimer.stop();
+    if (m_type == LocalsType)
+        hideProgressIndicator();
+
+    auto watchModel = qobject_cast<WatchModelBase *>(model());
+    QTC_ASSERT(watchModel, return);
+    QItemSelection selection;
+    QModelIndex currentIndex;
+    watchModel->forAllItems([&](Utils::TreeItem *item) {
+        const QModelIndex index = item->index();
+        const QString iName = index.data(LocalsINameRole).toString();
+        if (m_selectedInames.contains(iName))
+            selection.append(QItemSelectionRange(index));
+        if (iName == m_currentIname)
+            currentIndex = index;
+    });
+    selectionModel()->select(selection, QItemSelectionModel::Select);
+    if (currentIndex.isValid())
+        setCurrentIndex(currentIndex);
+}
+
 void WatchTreeView::reexpand(QTreeView *view, const QModelIndex &idx)
 {
     if (idx.data(LocalsExpandedRole).toBool()) {
diff --git a/src/plugins/debugger/watchwindow.h b/src/plugins/debugger/watchwindow.h
index 775ac372de..0a2de549b1 100644
--- a/src/plugins/debugger/watchwindow.h
+++ b/src/plugins/debugger/watchwindow.h
@@ -5,6 +5,8 @@
 
 #include <utils/basetreeview.h>
 
+#include <QTimer>
+
 namespace Debugger {
 namespace Internal {
 
@@ -26,6 +28,8 @@ public:
     void watchExpression(const QString &exp);
     void watchExpression(const QString &exp, const QString &name);
     void handleItemIsExpanded(const QModelIndex &idx);
+    void handleUpdateStarted();
+    void handleUpdateFinished();
 
 signals:
     void currentIndexChanged(const QModelIndex &currentIndex);
@@ -42,6 +46,9 @@ private:
 
     WatchType m_type;
     int m_sliderPosition = 0;
+    QStringList m_selectedInames;
+    QString m_currentIname;
+    QTimer m_progressDelayTimer;
 };
 
 } // namespace Internal
diff --git a/src/plugins/diffeditor/diffeditorfactory.cpp b/src/plugins/diffeditor/diffeditorfactory.cpp
index 70537dd3f7..a3981ed49b 100644
--- a/src/plugins/diffeditor/diffeditorfactory.cpp
+++ b/src/plugins/diffeditor/diffeditorfactory.cpp
@@ -7,8 +7,6 @@
 #include "diffeditordocument.h"
 #include "diffeditortr.h"
 
-#include "texteditor/texteditoractionhandler.h"
-
 #include <QCoreApplication>
 
 using namespace Core;
@@ -17,31 +15,7 @@ using namespace Utils;
 
 namespace DiffEditor::Internal {
 
-DiffEditorFactory::DiffEditorFactory() :
-    descriptionHandler {
-        Constants::DIFF_EDITOR_ID,
-        Constants::C_DIFF_EDITOR_DESCRIPTION,
-        TextEditorActionHandler::None,
-        [](IEditor *e) { return static_cast<DiffEditor *>(e)->descriptionWidget(); }
-    },
-    unifiedHandler {
-        Constants::DIFF_EDITOR_ID,
-        Constants::UNIFIED_VIEW_ID,
-        TextEditorActionHandler::None,
-        [](IEditor *e) { return static_cast<DiffEditor *>(e)->unifiedEditorWidget(); }
-    },
-    leftHandler {
-        Constants::DIFF_EDITOR_ID,
-        Id(Constants::SIDE_BY_SIDE_VIEW_ID).withSuffix(1),
-        TextEditorActionHandler::None,
-        [](IEditor *e) { return static_cast<DiffEditor *>(e)->sideEditorWidget(LeftSide); }
-    },
-    rightHandler {
-        Constants::DIFF_EDITOR_ID,
-        Id(Constants::SIDE_BY_SIDE_VIEW_ID).withSuffix(2),
-        TextEditorActionHandler::None,
-        [](Core::IEditor *e) { return static_cast<DiffEditor *>(e)->sideEditorWidget(RightSide); }
-    }
+DiffEditorFactory::DiffEditorFactory()
 {
     setId(Constants::DIFF_EDITOR_ID);
     setDisplayName(Tr::tr("Diff Editor"));
diff --git a/src/plugins/diffeditor/diffeditorfactory.h b/src/plugins/diffeditor/diffeditorfactory.h
index e39f0fc46f..3c05e4af1c 100644
--- a/src/plugins/diffeditor/diffeditorfactory.h
+++ b/src/plugins/diffeditor/diffeditorfactory.h
@@ -5,20 +5,12 @@
 
 #include <coreplugin/editormanager/ieditorfactory.h>
 
-#include <texteditor/texteditoractionhandler.h>
-
 namespace DiffEditor::Internal {
 
 class DiffEditorFactory : public Core::IEditorFactory
 {
 public:
     DiffEditorFactory();
-
-private:
-    TextEditor::TextEditorActionHandler descriptionHandler;
-    TextEditor::TextEditorActionHandler unifiedHandler;
-    TextEditor::TextEditorActionHandler leftHandler;
-    TextEditor::TextEditorActionHandler rightHandler;
 };
 
 } // namespace DiffEditor::Internal
diff --git a/src/plugins/docker/dockerdevice.cpp b/src/plugins/docker/dockerdevice.cpp
index c54bd000eb..d225bbf6e6 100644
--- a/src/plugins/docker/dockerdevice.cpp
+++ b/src/plugins/docker/dockerdevice.cpp
@@ -341,8 +341,6 @@ public:
         return deviceSettings->clangdExecutable();
     }
 
-    bool addTemporaryMount(const FilePath &path, const FilePath &containerPath);
-
     QStringList createMountArgs() const;
 
     bool isImageAvailable() const;
@@ -350,14 +348,12 @@ public:
     DockerDevice *const q;
     DockerDeviceSettings *deviceSettings;
 
-    struct TemporaryMountInfo
+    struct MountPair
     {
         FilePath path;
         FilePath containerPath;
     };
 
-    QList<TemporaryMountInfo> m_temporaryMounts;
-
     QMutex m_shellMutex;
     std::unique_ptr<ContainerShell> m_shell;
 
@@ -750,7 +746,7 @@ QString escapeMountPath(const FilePath &fp)
     return escapeMountPathUnix(fp);
 }
 
-QStringList toMountArg(const DockerDevicePrivate::TemporaryMountInfo &mi)
+QStringList toMountArg(const DockerDevicePrivate::MountPair &mi)
 {
     QString escapedPath;
     QString escapedContainerPath;
@@ -765,7 +761,7 @@ QStringList toMountArg(const DockerDevicePrivate::TemporaryMountInfo &mi)
     return QStringList{"--mount", mountArg};
 }
 
-expected_str<void> isValidMountInfo(const DockerDevicePrivate::TemporaryMountInfo &mi)
+expected_str<void> isValidMountInfo(const DockerDevicePrivate::MountPair &mi)
 {
     if (mi.path.needsDevice())
         return make_unexpected(QString("The path \"%1\" is not local.").arg(mi.path.toUserOutput()));
@@ -801,11 +797,11 @@ expected_str<void> isValidMountInfo(const DockerDevicePrivate::TemporaryMountInf
 QStringList DockerDevicePrivate::createMountArgs() const
 {
     QStringList cmds;
-    QList<TemporaryMountInfo> mounts = m_temporaryMounts;
+    QList<MountPair> mounts;
     for (const FilePath &m : deviceSettings->mounts())
         mounts.append({m, m});
 
-    for (const TemporaryMountInfo &mi : mounts) {
+    for (const MountPair &mi : mounts) {
         if (isValidMountInfo(mi))
             cmds += toMountArg(mi);
     }
@@ -1307,33 +1303,6 @@ void DockerDeviceFactory::shutdownExistingDevices()
     }
 }
 
-bool DockerDevicePrivate::addTemporaryMount(const FilePath &path, const FilePath &containerPath)
-{
-    const bool alreadyAdded = anyOf(m_temporaryMounts,
-                                    [containerPath](const TemporaryMountInfo &info) {
-                                        return info.containerPath == containerPath;
-                                    });
-
-    if (alreadyAdded)
-        return false;
-
-    const bool alreadyManuallyAdded = anyOf(deviceSettings->mounts(),
-                                            [path](const FilePath &mount) { return mount == path; });
-
-    if (alreadyManuallyAdded)
-        return false;
-
-    const TemporaryMountInfo newMount{path, containerPath};
-
-    const expected_str<void> result = isValidMountInfo(newMount);
-    QTC_ASSERT_EXPECTED(result, return false);
-
-    qCDebug(dockerDeviceLog) << "Adding temporary mount:" << path;
-    m_temporaryMounts.append(newMount);
-    stopCurrentContainer(); // Force re-start with new mounts.
-    return true;
-}
-
 expected_str<Environment> DockerDevicePrivate::environment()
 {
     if (!m_cachedEnviroment) {
@@ -1364,13 +1333,6 @@ void DockerDevicePrivate::changeMounts(QStringList newMounts)
 expected_str<FilePath> DockerDevicePrivate::localSource(const FilePath &other) const
 {
     const auto devicePath = FilePath::fromString(other.path());
-    for (const TemporaryMountInfo &info : m_temporaryMounts) {
-        if (devicePath.isChildOf(info.containerPath)) {
-            const FilePath relativePath = devicePath.relativeChildPath(info.containerPath);
-            return info.path.pathAppended(relativePath.path());
-        }
-    }
-
     for (const FilePath &mount : deviceSettings->mounts()) {
         const FilePath mountPoint = mount;
         if (devicePath.isChildOf(mountPoint)) {
@@ -1395,22 +1357,10 @@ bool DockerDevicePrivate::ensureReachable(const FilePath &other)
             return true;
     }
 
-    for (const auto &[path, containerPath] : m_temporaryMounts) {
-        if (path.path() != containerPath.path())
-            continue;
-
-        if (path == other)
-            return true;
-
-        if (other.isChildOf(path))
-            return true;
-    }
-
     if (q->filePath(other.path()).exists())
         return false;
 
-    addTemporaryMount(other, other);
-    return true;
+    return false;
 }
 
 bool DockerDevice::prepareForBuild(const Target *target)
diff --git a/src/plugins/docker/dockerdevice.h b/src/plugins/docker/dockerdevice.h
index ee4334b55b..e08a60cbc3 100644
--- a/src/plugins/docker/dockerdevice.h
+++ b/src/plugins/docker/dockerdevice.h
@@ -68,6 +68,11 @@ public:
     Utils::FilePath rootPath() const override;
     Utils::FilePath filePath(const QString &pathOnDevice) const override;
 
+    bool canMount(const Utils::FilePath &filePath) const override
+    {
+        return !filePath.needsDevice() || filePath.isSameDevice(rootPath());
+    }
+
     bool handlesFile(const Utils::FilePath &filePath) const override;
     bool ensureReachable(const Utils::FilePath &other) const override;
     Utils::expected_str<Utils::FilePath> localSource(const Utils::FilePath &other) const override;
diff --git a/src/plugins/effectcomposer/compositionnode.cpp b/src/plugins/effectcomposer/compositionnode.cpp
index 108eb5801d..d939e2283a 100644
--- a/src/plugins/effectcomposer/compositionnode.cpp
+++ b/src/plugins/effectcomposer/compositionnode.cpp
@@ -113,6 +113,9 @@ void CompositionNode::parse(const QString &effectName, const QString &qenPath, c
     m_fragmentCode = EffectUtils::codeFromJsonArray(json.value("fragmentCode").toArray());
     m_vertexCode = EffectUtils::codeFromJsonArray(json.value("vertexCode").toArray());
 
+    if (json.contains("extraMargin"))
+        m_extraMargin = json.value("extraMargin").toInt();
+
     if (json.contains("enabled"))
         m_isEnabled = json["enabled"].toBool();
 
diff --git a/src/plugins/effectcomposer/compositionnode.h b/src/plugins/effectcomposer/compositionnode.h
index b3348bb38f..433468688a 100644
--- a/src/plugins/effectcomposer/compositionnode.h
+++ b/src/plugins/effectcomposer/compositionnode.h
@@ -52,6 +52,8 @@ public:
     int decRefCount();
     void setRefCount(int count);
 
+    int extraMargin() const { return m_extraMargin; }
+
 signals:
     void uniformsModelChanged();
     void isEnabledChanged();
@@ -70,6 +72,7 @@ private:
     QString m_id;
     bool m_isEnabled = true;
     int m_refCount = 0;
+    int m_extraMargin = 0;
 
     QList<Uniform *> m_uniforms;
 
diff --git a/src/plugins/effectcomposer/effectcomposermodel.cpp b/src/plugins/effectcomposer/effectcomposermodel.cpp
index 5a5ad5718c..a983072334 100644
--- a/src/plugins/effectcomposer/effectcomposermodel.cpp
+++ b/src/plugins/effectcomposer/effectcomposermodel.cpp
@@ -94,6 +94,11 @@ bool EffectComposerModel::setData(const QModelIndex &index, const QVariant &valu
     return true;
 }
 
+void EffectComposerModel::setEffectsTypePrefix(const QString &prefix)
+{
+    m_effectTypePrefix = prefix;
+}
+
 void EffectComposerModel::setIsEmpty(bool val)
 {
     if (m_isEmpty != val) {
@@ -207,14 +212,14 @@ void EffectComposerModel::clear(bool clearName)
 void EffectComposerModel::assignToSelected()
 {
     const QString effectsAssetsDir = QmlDesigner::ModelNodeOperations::getEffectsDefaultDirectory();
-    const QString path = effectsAssetsDir + QDir::separator() + m_currentComposition + ".qep";
+    const QString path = effectsAssetsDir + '/' + m_currentComposition + ".qep";
     emit assignToSelectedTriggered(path);
 }
 
 QString EffectComposerModel::getUniqueEffectName() const
 {
     const QString effectsDir = QmlDesigner::ModelNodeOperations::getEffectsDefaultDirectory();
-    const QString path = effectsDir + QDir::separator() + "Effect%1.qep";
+    const QString path = effectsDir + '/' + "Effect%1.qep";
 
     int num = 0;
 
@@ -224,6 +229,14 @@ QString EffectComposerModel::getUniqueEffectName() const
     return QString("Effect%1").arg(num, 2, 10, QChar('0'));
 }
 
+bool EffectComposerModel::nameExists(const QString &name) const
+{
+    const QString effectsDir = QmlDesigner::ModelNodeOperations::getEffectsDefaultDirectory();
+    const QString path = effectsDir + '/' + "%1" + ".qep";
+
+    return QFile::exists(path.arg(name));
+}
+
 QString EffectComposerModel::fragmentShader() const
 {
     return m_fragmentShader;
@@ -490,6 +503,8 @@ QJsonObject nodeToJson(const CompositionNode &node)
     nodeObject.insert("enabled", node.isEnabled());
     nodeObject.insert("version", 1);
     nodeObject.insert("id", node.id());
+    if (node.extraMargin())
+        nodeObject.insert("extraMargin", node.extraMargin());
 
     // Add properties
     QJsonArray propertiesArray;
@@ -676,10 +691,44 @@ R"(
 )";
             s += frameProp.arg(tr("Frame"), tr("This property allows explicit control of current animation frame."));
         }
+
         s += "        }\n";
         s += "    }\n";
     }
 
+    if (m_shaderFeatures.enabled(ShaderFeatures::Source) && m_extraMargin) {
+        QString generalSection =
+            R"(
+    Section {
+        caption: "%1"
+        width: parent.width
+
+        SectionLayout {
+            PropertyLabel {
+                text: "%2"
+                tooltip: "%3"
+            }
+
+            SecondColumnLayout {
+                SpinBox {
+                    minimumValue: 0
+                    maximumValue: 1000
+                    decimals: 0
+                    stepSize: 1
+                    sliderIndicatorVisible: true
+                    backendValue: backendValues.extraMargin
+                    implicitWidth: StudioTheme.Values.singleControlColumnWidth
+                                   + StudioTheme.Values.actionIndicatorWidth
+                }
+                ExpandingSpacer {}
+            }
+        }
+    }
+)";
+        s += generalSection.arg(tr("General"), tr("Extra Margin"),
+                                tr("This property specifies how much of extra space is reserved for the effect outside the parent geometry."));
+    }
+
     for (const auto &node : std::as_const(m_nodes)) {
         const QList<Uniform *> uniforms = static_cast<EffectComposerUniformsModel *>(
                                               node->uniformsModel())->uniforms();
@@ -739,8 +788,46 @@ Item {
     s += header;
 
     if (m_shaderFeatures.enabled(ShaderFeatures::Source)) {
-        s += "    // This is the main source for the effect. Set internally to the current parent item. Do not modify.\n";
-        s += "    property Item source: null\n";
+        QString sourceStr{
+R"(
+    // This is the main source for the effect. Set internally to the current parent item. Do not modify.
+    property Item source: null
+)"
+        };
+
+        QString extraMarginStr{
+R"(
+    // This property specifies how much of extra space is reserved for the effect outside the parent geometry.
+    // It should be sufficient for most use cases but if the application uses extreme values it may be necessary to
+    // increase this value.
+    property int extraMargin: %1
+
+    onExtraMarginChanged: setupSourceRect()
+
+    function setupSourceRect() {
+        if (source) {
+            var w = source.width + extraMargin * 2
+            var h = source.height + extraMargin * 2
+            source.layer.sourceRect = Qt.rect(-extraMargin, -extraMargin, w, h)
+        }
+    }
+
+    function connectSource(enable) {
+        if (source) {
+            if (enable) {
+                source.widthChanged.connect(setupSourceRect)
+                source.heightChanged.connect(setupSourceRect)
+            } else {
+                source.widthChanged.disconnect(setupSourceRect)
+                source.heightChanged.disconnect(setupSourceRect)
+            }
+        }
+    }
+)"
+        };
+        s += sourceStr;
+        if (m_extraMargin)
+            s += extraMarginStr.arg(m_extraMargin);
     }
     if (m_shaderFeatures.enabled(ShaderFeatures::Time)
         || m_shaderFeatures.enabled(ShaderFeatures::Frame)) {
@@ -762,7 +849,8 @@ R"(
         if (_oldParent && _oldParent !== parent) {
             _oldParent.layer.enabled = false
             _oldParent.layer.effect = null
-            %2
+            %7
+            %4%2
             _oldParent.update()
             _oldParent = null
         }
@@ -772,7 +860,8 @@ R"(
                 parent.layer.enabled = true
                 parent.layer.effect = effectComponent
             }
-            %1
+            %6
+            %4%1%5%3
         }
     }
 
@@ -780,35 +869,50 @@ R"(
         if (visible) {
             parent.layer.enabled = true
             parent.layer.effect = effectComponent
-            source = parent
+            %6
+            %4%1%5%3
         } else {
             parent.layer.enabled = false
             parent.layer.effect = null
-            source = null
+            %8
+            %4%2
         }
         parent.update()
     }
+
 )"
     };
 
+    QString mipmap1;
+    QString mipmap2;
+    QString mipmap3;
     if (m_shaderFeatures.enabled(ShaderFeatures::Mipmap)) {
-        QString mipmap1{
+        mipmap1 = QString {
             R"(parent.layer.smooth = true
-            parent.layer.mipmap = true
-            %1)"
+            parent.layer.mipmap = true)"
         };
-        QString mipmap2{
+        mipmap2 = QString {
             R"(_oldParent.layer.smooth = false
-            _oldParent.layer.mipmap = false
-            %2)"
+            _oldParent.layer.mipmap = false)"
+        };
+        mipmap3 = QString {
+            R"(parent.layer.smooth = false
+            parent.layer.mipmap = false)"
         };
-        parentChanged = parentChanged.arg(mipmap1, mipmap2);
     }
 
-    parentChanged = parentChanged.arg(m_shaderFeatures.enabled(ShaderFeatures::Source)
-                                          ? QString("source = parent") : QString(),
-                                      m_shaderFeatures.enabled(ShaderFeatures::Source)
-                                          ? QString("source = null") : QString());
+    if (m_shaderFeatures.enabled(ShaderFeatures::Source)) {
+        parentChanged = parentChanged.arg(QString("source = parent"),
+                                          QString("source = null"),
+                                          m_extraMargin ? QString("            setupSourceRect()") : QString(),
+                                          m_extraMargin ? QString("connectSource(false)\n            ") : QString(),
+                                          m_extraMargin ? QString("\n            connectSource(true)\n") : QString(),
+                                          mipmap1,
+                                          mipmap2,
+                                          mipmap3);
+    } else {
+        parentChanged = parentChanged.arg(QString(), QString(), QString());
+    }
     s += parentChanged;
 
     // Custom properties
@@ -846,7 +950,7 @@ void EffectComposerModel::saveComposition(const QString &name)
     }
 
     const QString effectsAssetsDir = QmlDesigner::ModelNodeOperations::getEffectsDefaultDirectory();
-    const QString path = effectsAssetsDir + QDir::separator() + name + ".qep";
+    const QString path = effectsAssetsDir + '/' + name + ".qep";
     auto saveFile = QFile(path);
     if (!saveFile.open(QIODevice::WriteOnly)) {
         QString error = QString("Error: Couldn't save composition file: '%1'").arg(path);
@@ -854,6 +958,8 @@ void EffectComposerModel::saveComposition(const QString &name)
         return;
     }
 
+    updateExtraMargin();
+
     QJsonObject json;
     // File format version
     json.insert("version", 1);
@@ -974,7 +1080,7 @@ void EffectComposerModel::saveResources(const QString &name)
 
     // Get effects dir
     const Utils::FilePath effectsResDir = QmlDesigner::ModelNodeOperations::getEffectsImportDirectory();
-    const QString effectsResPath = effectsResDir.pathAppended(name).toString() + QDir::separator();
+    const QString effectsResPath = effectsResDir.pathAppended(name).toString() + '/';
     Utils::FilePath effectPath = Utils::FilePath::fromString(effectsResPath);
 
     // Create the qmldir for effects
@@ -982,7 +1088,7 @@ void EffectComposerModel::saveResources(const QString &name)
     Utils::FilePath qmldirPath = effectsResDir.resolvePath(qmldirFileName);
     QString qmldirContent = QString::fromUtf8(qmldirPath.fileContents().value_or(QByteArray()));
     if (qmldirContent.isEmpty()) {
-        qmldirContent.append("module Effects\n");
+        qmldirContent.append(QString("module %1\n").arg(m_effectTypePrefix));
         qmldirPath.writeFileContents(qmldirContent.toUtf8());
     }
 
@@ -1000,7 +1106,7 @@ void EffectComposerModel::saveResources(const QString &name)
     qmldirPath = effectPath.resolvePath(qmldirFileName);
     qmldirContent = QString::fromUtf8(qmldirPath.fileContents().value_or(QByteArray()));
     if (qmldirContent.isEmpty()) {
-        qmldirContent.append("module Effects.");
+        qmldirContent.append(QString("module %1.").arg(m_effectTypePrefix));
         qmldirContent.append(name);
         qmldirContent.append('\n');
         qmldirContent.append(name);
@@ -1041,7 +1147,27 @@ void EffectComposerModel::saveResources(const QString &name)
 
     const QString qmlString = qmlStringList.join('\n');
     QString qmlFilePath = effectsResPath + qmlFilename;
-    writeToFile(qmlString.toUtf8(), qmlFilePath, FileType::Text);
+
+    // Get exposed properties from the old qml file if it exists
+    QSet<QByteArray> oldExposedProps;
+    Utils::FilePath oldQmlFile = Utils::FilePath::fromString(qmlFilePath);
+    if (oldQmlFile.exists()) {
+        const QByteArray oldQmlContent = oldQmlFile.fileContents().value();
+        oldExposedProps = getExposedProperties(oldQmlContent);
+    }
+
+    const QByteArray qmlUtf8 = qmlString.toUtf8();
+    if (!oldExposedProps.isEmpty()) {
+        const QSet<QByteArray> newExposedProps = getExposedProperties(qmlUtf8);
+        oldExposedProps.subtract(newExposedProps);
+        if (!oldExposedProps.isEmpty()) {
+            // If there were exposed properties that are no longer exposed, those
+            // need to be removed from any instances of the effect in the scene
+            emit removePropertiesFromScene(oldExposedProps, name);
+        }
+    }
+
+    writeToFile(qmlUtf8, qmlFilePath, FileType::Text);
     newFileNames.append(qmlFilename);
 
     // Save shaders and images
@@ -1110,7 +1236,7 @@ void EffectComposerModel::saveResources(const QString &name)
         endResetModel();
     }
 
-    emit resourcesSaved(QString("Effects.%1.%1").arg(name).toUtf8(), effectPath);
+    emit resourcesSaved(QString("%1.%2.%2").arg(m_effectTypePrefix, name).toUtf8(), effectPath);
 }
 
 void EffectComposerModel::resetEffectError(int type)
@@ -1729,6 +1855,19 @@ void EffectComposerModel::setIsEnabled(bool enabled)
     emit isEnabledChanged();
 }
 
+bool EffectComposerModel::hasValidTarget() const
+{
+    return m_hasValidTarget;
+}
+
+void EffectComposerModel::setHasValidTarget(bool validTarget)
+{
+    if (m_hasValidTarget == validTarget)
+        return;
+    m_hasValidTarget = validTarget;
+    emit hasValidTargetChanged();
+}
+
 QString EffectComposerModel::getQmlImagesString(bool localFiles)
 {
     QString imagesString;
@@ -1831,6 +1970,12 @@ QString EffectComposerModel::getQmlComponentString(bool localFiles)
     s += l2 + "vertexShader: 'file:///" + vertFile + "'\n";
     s += l2 + "fragmentShader: 'file:///" + fragFile + "'\n";
     s += l2 + "anchors.fill: " + (localFiles ? "rootItem.source" : "parent") + "\n";
+    if (localFiles) {
+        if (m_extraMargin)
+            s += l2 + "anchors.margins: -rootItem.extraMargin\n";
+    } else {
+        s += l2 + "anchors.margins: -root.extraMargin\n";
+    }
     if (m_shaderFeatures.enabled(ShaderFeatures::GridMesh)) {
         QString gridSize = QString("%1, %2").arg(m_shaderFeatures.gridMeshWidth())
                                             .arg(m_shaderFeatures.gridMeshHeight());
@@ -1866,6 +2011,32 @@ void EffectComposerModel::connectCompositionNode(CompositionNode *node)
     });
 }
 
+void EffectComposerModel::updateExtraMargin()
+{
+    m_extraMargin = 0;
+    for (CompositionNode *node : std::as_const(m_nodes))
+        m_extraMargin = qMax(node->extraMargin(), m_extraMargin);
+}
+
+QSet<QByteArray> EffectComposerModel::getExposedProperties(const QByteArray &qmlContent)
+{
+    QSet<QByteArray> returnSet;
+    const QByteArrayList lines = qmlContent.split('\n');
+    const QByteArray propertyTag {"    property"}; // Match only toplevel exposed properties
+    for (const QByteArray &line : lines) {
+        if (line.startsWith(propertyTag)) {
+            QByteArrayList words = line.trimmed().split(' ');
+            if (words.size() >= 3) {
+                QByteArray propName = words[2];
+                if (propName.endsWith(':'))
+                    propName.chop(1);
+                returnSet.insert(propName);
+            }
+        }
+    }
+    return returnSet;
+}
+
 QString EffectComposerModel::currentComposition() const
 {
     return m_currentComposition;
diff --git a/src/plugins/effectcomposer/effectcomposermodel.h b/src/plugins/effectcomposer/effectcomposermodel.h
index bd4040efc2..14ef09e8a9 100644
--- a/src/plugins/effectcomposer/effectcomposermodel.h
+++ b/src/plugins/effectcomposer/effectcomposermodel.h
@@ -11,6 +11,7 @@
 #include <QFileSystemWatcher>
 #include <QMap>
 #include <QRegularExpression>
+#include <QSet>
 #include <QTemporaryFile>
 #include <QTimer>
 
@@ -48,6 +49,7 @@ class EffectComposerModel : public QAbstractListModel
     Q_PROPERTY(bool hasUnsavedChanges MEMBER m_hasUnsavedChanges WRITE setHasUnsavedChanges NOTIFY hasUnsavedChangesChanged)
     Q_PROPERTY(bool shadersUpToDate READ shadersUpToDate WRITE setShadersUpToDate NOTIFY shadersUpToDateChanged)
     Q_PROPERTY(bool isEnabled READ isEnabled WRITE setIsEnabled NOTIFY isEnabledChanged)
+    Q_PROPERTY(bool hasValidTarget READ hasValidTarget WRITE setHasValidTarget NOTIFY hasValidTargetChanged)
     Q_PROPERTY(QString currentComposition READ currentComposition WRITE setCurrentComposition NOTIFY currentCompositionChanged)
 
 public:
@@ -58,6 +60,8 @@ public:
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
     bool setData(const QModelIndex &index, const QVariant &value, int role) override;
 
+    void setEffectsTypePrefix(const QString &prefix);
+
     bool isEmpty() const { return m_isEmpty; }
     void setIsEmpty(bool val);
 
@@ -70,6 +74,7 @@ public:
     Q_INVOKABLE void clear(bool clearName = false);
     Q_INVOKABLE void assignToSelected();
     Q_INVOKABLE QString getUniqueEffectName() const;
+    Q_INVOKABLE bool nameExists(const QString &name) const;
 
     bool shadersUpToDate() const;
     void setShadersUpToDate(bool newShadersUpToDate);
@@ -77,6 +82,9 @@ public:
     bool isEnabled() const;
     void setIsEnabled(bool enabled);
 
+    bool hasValidTarget() const;
+    void setHasValidTarget(bool validTarget);
+
     QString fragmentShader() const;
     void setFragmentShader(const QString &newFragmentShader);
 
@@ -110,12 +118,14 @@ signals:
     void effectErrorChanged();
     void shadersUpToDateChanged();
     void isEnabledChanged();
+    void hasValidTargetChanged();
     void shadersBaked();
     void currentCompositionChanged();
     void nodesChanged();
     void resourcesSaved(const QByteArray &type, const Utils::FilePath &path);
     void hasUnsavedChangesChanged();
     void assignToSelectedTriggered(const QString &effectPath);
+    void removePropertiesFromScene(QSet<QByteArray> props, const QString &typeName);
 
 private:
     enum Roles {
@@ -176,6 +186,8 @@ private:
     QString getDesignerSpecifics() const;
 
     void connectCompositionNode(CompositionNode *node);
+    void updateExtraMargin();
+    QSet<QByteArray> getExposedProperties(const QByteArray &qmlContent);
 
     QList<CompositionNode *> m_nodes;
 
@@ -210,8 +222,11 @@ private:
     QString m_qmlComponentString;
     bool m_loadComponentImages = true;
     bool m_isEnabled = true;
+    bool m_hasValidTarget = false;
     QString m_currentComposition;
     QTimer m_rebakeTimer;
+    int m_extraMargin = 0;
+    QString m_effectTypePrefix;
 
     const QRegularExpression m_spaceReg = QRegularExpression("\\s+");
 };
diff --git a/src/plugins/effectcomposer/effectcomposeruniformsmodel.cpp b/src/plugins/effectcomposer/effectcomposeruniformsmodel.cpp
index 492d5a9e80..c2c162a87e 100644
--- a/src/plugins/effectcomposer/effectcomposeruniformsmodel.cpp
+++ b/src/plugins/effectcomposer/effectcomposeruniformsmodel.cpp
@@ -59,7 +59,9 @@ bool EffectComposerUniformsModel::setData(const QModelIndex &index, const QVaria
         int idx = value.toString().indexOf("file:");
 
         QString path = idx > 0 ? updatedValue.right(updatedValue.size() - idx - 5) : updatedValue;
-        updatedValue = QUrl::fromLocalFile(path).toString();
+
+        if (idx == -1)
+            updatedValue = QUrl::fromLocalFile(path).toString();
 
         uniform->setValue(updatedValue);
         g_propertyData.insert(uniform->name(), updatedValue);
@@ -73,6 +75,14 @@ bool EffectComposerUniformsModel::setData(const QModelIndex &index, const QVaria
     return true;
 }
 
+bool EffectComposerUniformsModel::resetData(int row)
+{
+    QModelIndex idx = index(row, 0);
+    QTC_ASSERT(idx.isValid(), return false);
+
+    return setData(idx, idx.data(DefaultValueRole), ValueRole);
+}
+
 void EffectComposerUniformsModel::resetModel()
 {
     beginResetModel();
diff --git a/src/plugins/effectcomposer/effectcomposeruniformsmodel.h b/src/plugins/effectcomposer/effectcomposeruniformsmodel.h
index 65b2d7b2f0..fc82194fdf 100644
--- a/src/plugins/effectcomposer/effectcomposeruniformsmodel.h
+++ b/src/plugins/effectcomposer/effectcomposeruniformsmodel.h
@@ -20,6 +20,7 @@ public:
     int rowCount(const QModelIndex & parent = QModelIndex()) const override;
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
     bool setData(const QModelIndex &index, const QVariant &value, int role) override;
+    Q_INVOKABLE bool resetData(int row);
 
     void resetModel();
 
diff --git a/src/plugins/effectcomposer/effectcomposerview.cpp b/src/plugins/effectcomposer/effectcomposerview.cpp
index e7a879bd8b..48c6a33c4b 100644
--- a/src/plugins/effectcomposer/effectcomposerview.cpp
+++ b/src/plugins/effectcomposer/effectcomposerview.cpp
@@ -10,7 +10,9 @@
 #include <designermcumanager.h>
 #include <documentmanager.h>
 #include <modelnodeoperations.h>
+#include <qmlchangeset.h>
 #include <qmldesignerconstants.h>
+#include <qmldesignerplugin.h>
 
 #include <coreplugin/icore.h>
 
@@ -31,6 +33,7 @@ void EffectComposerContext::contextHelp(const HelpCallback &callback) const
 
 EffectComposerView::EffectComposerView(QmlDesigner::ExternalDependenciesInterface &externalDependencies)
     : AbstractView{externalDependencies}
+    , m_componentUtils(externalDependencies)
 {
 }
 
@@ -48,14 +51,73 @@ QmlDesigner::WidgetInfo EffectComposerView::widgetInfo()
         m_widget = new EffectComposerWidget{this};
 
         connect(m_widget->effectComposerModel(), &EffectComposerModel::assignToSelectedTriggered, this,
-                [&] (const QString &effectPath) {
-            executeInTransaction("EffectComposerView::widgetInfo", [&] {
+                [this] (const QString &effectPath) {
+            executeInTransaction("EffectComposerView assignToSelectedTriggered", [&] {
                 const QList<QmlDesigner::ModelNode> selectedNodes = selectedModelNodes();
                 for (const QmlDesigner::ModelNode &node : selectedNodes)
                     QmlDesigner::ModelNodeOperations::handleItemLibraryEffectDrop(effectPath, node);
             });
         });
 
+        connect(m_widget->effectComposerModel(), &EffectComposerModel::removePropertiesFromScene, this,
+                [this] (QSet<QByteArray> props, const QString &typeName) {
+            // Remove specified properties from all instances of specified type
+
+            QmlDesigner::DesignDocument *document
+                = QmlDesigner::QmlDesignerPlugin::instance()->currentDesignDocument();
+            if (!document)
+                return;
+
+            const QByteArray fullType = QString("%1.%2.%2").arg(m_componentUtils.composedEffectsTypePrefix(),
+                                                             typeName).toUtf8();
+            const QList<QmlDesigner::ModelNode> allNodes = allModelNodes();
+            QList<QmlDesigner::ModelNode> typeNodes;
+            QList<QmlDesigner::ModelNode> propertyChangeNodes;
+            for (const QmlDesigner::ModelNode &node : allNodes) {
+                if (QmlDesigner::QmlPropertyChanges::isValidQmlPropertyChanges(node))
+                    propertyChangeNodes.append(node);
+#ifdef QDS_USE_PROJECTSTORAGE
+// TODO: typeName() shouldn't be used with projectstorage. Needs alternative solution (using modules?)
+#else
+                else if (node.metaInfo().typeName() == fullType)
+                    typeNodes.append(node);
+#endif
+            }
+            if (!typeNodes.isEmpty()) {
+                bool clearStacks = false;
+
+                executeInTransaction("EffectComposerView removePropertiesFromScene", [&] {
+                    for (QmlDesigner::ModelNode node : std::as_const(propertyChangeNodes)) {
+                        QmlDesigner::ModelNode targetNode = QmlDesigner::QmlPropertyChanges(node).target();
+                        if (typeNodes.contains(targetNode)) {
+                            for (const QByteArray &prop : props) {
+                                if (node.hasProperty(prop)) {
+                                    node.removeProperty(prop);
+                                    clearStacks = true;
+                                }
+                            }
+                            QList<QmlDesigner::AbstractProperty> remainingProps = node.properties();
+                            if (remainingProps.size() == 1 && remainingProps[0].name() == "target")
+                                node.destroy(); // Remove empty changes node
+                        }
+                    }
+                    for (const QmlDesigner::ModelNode &node : std::as_const(typeNodes)) {
+                        for (const QByteArray &prop : props) {
+                            if (node.hasProperty(prop)) {
+                                node.removeProperty(prop);
+                                clearStacks = true;
+                            }
+                        }
+                    }
+                });
+
+                // Reset undo stack as changing of the actual effect cannot be undone, and thus the
+                // stack will contain only unworkable states
+                if (clearStacks)
+                    document->clearUndoRedoStacks();
+            }
+        });
+
         auto context = new EffectComposerContext(m_widget.data());
         Core::ICore::addContextObject(context);
     }
@@ -91,6 +153,7 @@ void EffectComposerView::modelAttached(QmlDesigner::Model *model)
     if (m_currProjectPath != currProjectPath) { // starting a new project
         m_widget->effectComposerNodesModel()->loadModel();
         m_widget->effectComposerModel()->clear(true);
+        m_widget->effectComposerModel()->setEffectsTypePrefix(m_componentUtils.composedEffectsTypePrefix());
         m_widget->effectComposerModel()->setIsEnabled(
             !QmlDesigner::DesignerMcuManager::instance().isMCUProject());
         m_widget->initView();
@@ -105,4 +168,19 @@ void EffectComposerView::modelAboutToBeDetached(QmlDesigner::Model *model)
     AbstractView::modelAboutToBeDetached(model);
 }
 
+void EffectComposerView::selectedNodesChanged(const QList<QmlDesigner::ModelNode> & selectedNodeList,
+                                              const QList<QmlDesigner::ModelNode> & /*lastSelectedNodeList*/)
+{
+    bool hasValidTarget = false;
+
+    for (const QmlDesigner::ModelNode &node : selectedNodeList) {
+        if (node.metaInfo().isQtQuickItem()) {
+            hasValidTarget = true;
+            break;
+        }
+    }
+
+    m_widget->effectComposerModel()->setHasValidTarget(hasValidTarget);
+}
+
 } // namespace EffectComposer
diff --git a/src/plugins/effectcomposer/effectcomposerview.h b/src/plugins/effectcomposer/effectcomposerview.h
index c7a381cb7d..b264fe0fd9 100644
--- a/src/plugins/effectcomposer/effectcomposerview.h
+++ b/src/plugins/effectcomposer/effectcomposerview.h
@@ -4,7 +4,9 @@
 #pragma once
 
 #include "abstractview.h"
+#include "modelnode.h"
 
+#include <generatedcomponentutils.h>
 #include <coreplugin/icontext.h>
 
 #include <QPointer>
@@ -35,6 +37,8 @@ public:
     // AbstractView
     void modelAttached(QmlDesigner::Model *model) override;
     void modelAboutToBeDetached(QmlDesigner::Model *model) override;
+    void selectedNodesChanged(const QList<QmlDesigner::ModelNode> &selectedNodeList,
+                              const QList<QmlDesigner::ModelNode> &lastSelectedNodeList) override;
 
 private:
     void customNotification(const AbstractView *view, const QString &identifier,
@@ -42,6 +46,7 @@ private:
 
     QPointer<EffectComposerWidget> m_widget;
     QString m_currProjectPath;
+    QmlDesigner::GeneratedComponentUtils m_componentUtils;
 };
 
 } // namespace EffectComposer
diff --git a/src/plugins/effectcomposer/uniform.cpp b/src/plugins/effectcomposer/uniform.cpp
index 98d5ffd336..590b38b423 100644
--- a/src/plugins/effectcomposer/uniform.cpp
+++ b/src/plugins/effectcomposer/uniform.cpp
@@ -94,7 +94,13 @@ void Uniform::setValue(const QVariant &newValue)
 {
     if (m_value != newValue) {
         m_value = newValue;
+
         emit uniformValueChanged();
+
+        if (m_type == Type::Sampler) {
+            m_backendValue->setValue(newValue);
+            emit uniformBackendValueChanged();
+        }
     }
 }
 
diff --git a/src/plugins/extensionmanager/extensionmanagerwidget.cpp b/src/plugins/extensionmanager/extensionmanagerwidget.cpp
index be7e0f92ee..d8574a740f 100644
--- a/src/plugins/extensionmanager/extensionmanagerwidget.cpp
+++ b/src/plugins/extensionmanager/extensionmanagerwidget.cpp
@@ -153,7 +153,7 @@ void ExtensionManagerWidget::updateView(const QModelIndex &current,
                                    "of the extensions that are part of pack ") + data.name
                    : extension->longDescription();
         longDescription.replace("\n", "<br/>");
-        const QString location = isPack ? extension->location() : extension->filePath();
+        const FilePath location = isPack ? extension->location() : extension->filePath();
 
         QString description = htmlStart;
 
@@ -217,7 +217,7 @@ void ExtensionManagerWidget::updateView(const QModelIndex &current,
            .arg(Tr::tr("Version"))
            .arg(extension->version())
            .arg(Tr::tr("Location"))
-           .arg(location));
+           .arg(location.toUserOutput()));
 
         description.append(htmlEnd);
         m_primaryDescription->setText(description);
diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp
index 7a7554da9e..a84598aec0 100644
--- a/src/plugins/fakevim/fakevimplugin.cpp
+++ b/src/plugins/fakevim/fakevimplugin.cpp
@@ -999,6 +999,7 @@ bool FakeVimUserCommandsModel::setData(const QModelIndex &index,
     return true;
 }
 
+#ifdef WITH_TESTS
 static void setupTest(QString *title, FakeVimHandler **handler, QWidget **edit)
 {
     *title = QString::fromLatin1("test.cpp");
@@ -1040,7 +1041,6 @@ static void setupTest(QString *title, FakeVimHandler **handler, QWidget **edit)
     (*handler)->handleCommand("set iskeyword=@,48-57,_,192-255,a-z,A-Z");
 }
 
-#ifdef WITH_TESTS
 QObject *createFakeVimTester( void (*setupTest)(QString *, FakeVimHandler **, QWidget **) ); // in fakevim_test.cpp
 #endif
 
diff --git a/src/plugins/fossil/Fossil.json.in b/src/plugins/fossil/Fossil.json.in
index 61204143ba..d83238ccca 100644
--- a/src/plugins/fossil/Fossil.json.in
+++ b/src/plugins/fossil/Fossil.json.in
@@ -16,5 +16,7 @@
     "Category" : "Version Control",
     "Description" : "Fossil SCM integration.",
     "Url" : "http://www.qt.io",
-    ${IDE_PLUGIN_DEPENDENCIES}
+    ${IDE_PLUGIN_DEPENDENCIES},
+
+    "JsonWizardPaths" : [":/fossil/wizard"]
 }
diff --git a/src/plugins/fossil/constants.h b/src/plugins/fossil/constants.h
index 558c8fc3ed..fe0fcca2f3 100644
--- a/src/plugins/fossil/constants.h
+++ b/src/plugins/fossil/constants.h
@@ -75,7 +75,4 @@ const char FSTATUS_UPDATED_BY_INTEGRATE[] = "Updated by Integrate";
 const char FSTATUS_RENAMED[] = "Renamed";
 const char FSTATUS_UNKNOWN[] = "Unknown";
 
-// Fossil Json Wizards
-const char WIZARD_PATH[] = ":/fossil/wizard";
-
 } // Fossil::Constants
diff --git a/src/plugins/fossil/fossilplugin.cpp b/src/plugins/fossil/fossilplugin.cpp
index ff6fa0fa3f..d627d13fda 100644
--- a/src/plugins/fossil/fossilplugin.cpp
+++ b/src/plugins/fossil/fossilplugin.cpp
@@ -217,7 +217,6 @@ FossilPluginPrivate::FossilPluginPrivate()
     m_commandLocator = new CommandLocator("Fossil", "fossil", "fossil", this);
     m_commandLocator->setDescription(Tr::tr("Triggers a Fossil version control operation."));
 
-    ProjectExplorer::JsonWizardFactory::addWizardPath(FilePath::fromString(Constants::WIZARD_PATH));
     JsExpander::registerGlobalObject("Fossil", [] { return new FossilJsExtension; });
 
     connect(&settings(), &AspectContainer::changed,
diff --git a/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp b/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp
index 878794f81f..ea522606e4 100644
--- a/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp
+++ b/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp
@@ -62,7 +62,7 @@ public:
         setBuildGenerator([](const Kit *, const FilePath &projectPath, bool forSetup) {
             BuildInfo info;
             info.typeName = ProjectExplorer::Tr::tr("Build");
-            info.buildDirectory = forSetup ? Project::projectDirectory(projectPath) : projectPath;
+            info.buildDirectory = forSetup ? projectPath.absolutePath() : projectPath;
 
             if (forSetup)  {
                 //: The name of the build configuration created by default for a generic project.
diff --git a/src/plugins/genericprojectmanager/genericprojectfileseditor.cpp b/src/plugins/genericprojectmanager/genericprojectfileseditor.cpp
index eef322a151..5070cf67cd 100644
--- a/src/plugins/genericprojectmanager/genericprojectfileseditor.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectfileseditor.cpp
@@ -9,7 +9,6 @@
 
 #include <texteditor/textdocument.h>
 #include <texteditor/texteditor.h>
-#include <texteditor/texteditoractionhandler.h>
 
 using namespace TextEditor;
 
@@ -29,7 +28,7 @@ public:
         addMimeType("application/vnd.qtcreator.generic.cflags");
 
         setDocumentCreator([]() { return new TextDocument(Constants::FILES_EDITOR_ID); });
-        setEditorActionHandlers(TextEditorActionHandler::None);
+        setOptionalActionMask(OptionalActions::None);
     }
 };
 
diff --git a/src/plugins/glsleditor/glsleditor.cpp b/src/plugins/glsleditor/glsleditor.cpp
index 36bba04137..a454057ce2 100644
--- a/src/plugins/glsleditor/glsleditor.cpp
+++ b/src/plugins/glsleditor/glsleditor.cpp
@@ -31,7 +31,6 @@
 #include <texteditor/textdocument.h>
 #include <texteditor/syntaxhighlighter.h>
 #include <texteditor/texteditor.h>
-#include <texteditor/texteditoractionhandler.h>
 #include <texteditor/texteditorconstants.h>
 #include <texteditor/texteditorsettings.h>
 
@@ -466,9 +465,9 @@ public:
         setParenthesesMatchingEnabled(true);
         setCodeFoldingSupported(true);
 
-        setEditorActionHandlers(TextEditorActionHandler::Format
-                                | TextEditorActionHandler::UnCommentSelection
-                                | TextEditorActionHandler::UnCollapseAll);
+        setOptionalActionMask(OptionalActions::Format
+                                | OptionalActions::UnCommentSelection
+                                | OptionalActions::UnCollapseAll);
     }
 };
 
diff --git a/src/plugins/haskell/Haskell.json.in b/src/plugins/haskell/Haskell.json.in
index 9cdb34694a..7f99cdf3fe 100644
--- a/src/plugins/haskell/Haskell.json.in
+++ b/src/plugins/haskell/Haskell.json.in
@@ -19,5 +19,6 @@
         "        <glob pattern='*.cabal'/>",
         "    </mime-type>",
         "</mime-info>"
-    ]
+    ],
+    "JsonWizardPaths" : [ ":/haskell/share/wizards/" ]
 }
diff --git a/src/plugins/haskell/haskelleditorfactory.cpp b/src/plugins/haskell/haskelleditorfactory.cpp
index 89bf561b1f..55f077a9f9 100644
--- a/src/plugins/haskell/haskelleditorfactory.cpp
+++ b/src/plugins/haskell/haskelleditorfactory.cpp
@@ -13,7 +13,6 @@
 
 #include <texteditor/textdocument.h>
 #include <texteditor/texteditor.h>
-#include <texteditor/texteditoractionhandler.h>
 #include <texteditor/textindenter.h>
 
 #include <QAction>
@@ -42,8 +41,8 @@ public:
         setId(Constants::C_HASKELLEDITOR_ID);
         setDisplayName(::Core::Tr::tr("Haskell Editor"));
         addMimeType("text/x-haskell");
-        setEditorActionHandlers(TextEditorActionHandler::UnCommentSelection
-                              | TextEditorActionHandler::FollowSymbolUnderCursor);
+        setOptionalActionMask(
+                    OptionalActions::UnCommentSelection | OptionalActions::FollowSymbolUnderCursor);
         setDocumentCreator([] { return new TextDocument(Constants::C_HASKELLEDITOR_ID); });
         setIndenterCreator([](QTextDocument *doc) { return new TextIndenter(doc); });
         setEditorWidgetCreator(&createEditorWidget);
diff --git a/src/plugins/haskell/haskellplugin.cpp b/src/plugins/haskell/haskellplugin.cpp
index f8c32dc288..1041bf4695 100644
--- a/src/plugins/haskell/haskellplugin.cpp
+++ b/src/plugins/haskell/haskellplugin.cpp
@@ -39,8 +39,6 @@ public:
                                                    Tr::tr("Haskell", "SnippetProvider"));
 
         setupHaskellActions(this);
-
-        ProjectExplorer::JsonWizardFactory::addWizardPath(":/haskell/share/wizards/");
     }
 };
 
diff --git a/src/plugins/haskell/haskellproject.cpp b/src/plugins/haskell/haskellproject.cpp
index 01d652c49e..4d05ded890 100644
--- a/src/plugins/haskell/haskellproject.cpp
+++ b/src/plugins/haskell/haskellproject.cpp
@@ -54,7 +54,6 @@ public:
 
 private:
     void updateApplicationTargets();
-    void refresh();
 
 private:
     ParseGuard m_parseGuard;
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index e9706a3db1..49b4624b26 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -102,6 +102,7 @@ public:
     void modeChanged(Id mode, Id old);
 
     void requestContextHelp();
+    void requestContextHelpFor(QList<QPointer<IContext>> contexts);
     void showContextHelp(const HelpItem &contextHelp);
     void activateIndex();
     void activateContents();
@@ -464,11 +465,32 @@ void HelpPluginPrivate::requestContextHelp()
     const HelpItem tipHelp = tipHelpValue.canConvert<HelpItem>()
                                  ? tipHelpValue.value<HelpItem>()
                                  : HelpItem(tipHelpValue.toString());
-    IContext *context = ICore::currentContextObject();
-    if (tipHelp.isEmpty() && context)
-        context->contextHelp([this](const HelpItem &item) { showContextHelp(item); });
-    else
+    const QList<IContext *> contexts = ICore::currentContextObjects();
+    if (contexts.isEmpty() && !tipHelp.isEmpty()) {
         showContextHelp(tipHelp);
+    } else {
+        requestContextHelpFor(Utils::transform(contexts, [](IContext *context) {
+            return QPointer<IContext>(context);
+        }));
+    }
+}
+
+void HelpPluginPrivate::requestContextHelpFor(QList<QPointer<IContext>> contexts)
+{
+    if (contexts.isEmpty())
+        return;
+    QPointer<IContext> context = contexts.takeFirst();
+    while (!context) {
+        if (contexts.isEmpty())
+            return;
+        context = contexts.takeFirst();
+    }
+    context->contextHelp([contexts, this](const HelpItem &item) {
+        if (!item.isEmpty())
+            showContextHelp(item);
+        else
+            requestContextHelpFor(contexts);
+    });
 }
 
 void HelpPluginPrivate::showContextHelp(const HelpItem &contextHelp)
diff --git a/src/plugins/incredibuild/buildconsolebuildstep.cpp b/src/plugins/incredibuild/buildconsolebuildstep.cpp
index 61b40a8b2f..2b8bcd2185 100644
--- a/src/plugins/incredibuild/buildconsolebuildstep.cpp
+++ b/src/plugins/incredibuild/buildconsolebuildstep.cpp
@@ -55,9 +55,12 @@ public:
     CommandBuilderAspect commandBuilder{this};
 
     TextDisplay t2{this, "<i>" + Tr::tr("Enter the appropriate arguments to your build command.")};
-    TextDisplay t3{this, "<i>" + Tr::tr("Make sure the build command's multi-job "
-                                        "parameter value is large enough "
-                                        "(such as -j200 for the JOM or Make build tools)")};
+    TextDisplay
+        t3{this,
+           "<i>"
+               + Tr::tr("Make sure the build command's multi-job "
+                        "parameter value is large enough "
+                        "(such as -j200 for the JOM or Make build tools).")};
     BoolAspect keepJobNum{this};
 
     TextDisplay t4{this, "<b>" + Tr::tr("IncrediBuild Distribution Control")};
@@ -187,7 +190,7 @@ BuildConsoleBuildStep::BuildConsoleBuildStep(BuildStepList *buildStepList, Id id
 
     hideHeader.setSettingsKey("IncrediBuild.BuildConsole.HideHeader");
     hideHeader.setLabel(Tr::tr("Hide IncrediBuild Header in output:"));
-    hideHeader.setToolTip(Tr::tr("Suppresses IncrediBuild's header in the build output"));
+    hideHeader.setToolTip(Tr::tr("Suppresses IncrediBuild's header in the build output."));
 
     logLevel.setSettingsKey("IncrediBuild.BuildConsole.LogLevel");
     logLevel.setDisplayName(Tr::tr("Internal IncrediBuild logging level:"));
@@ -198,7 +201,7 @@ BuildConsoleBuildStep::BuildConsoleBuildStep(BuildStepList *buildStepList, Id id
     logLevel.addOption("Detailed");
     logLevel.setToolTip(Tr::tr("Overrides the internal Incredibuild logging level for this build. "
                                "Does not affect output or any user accessible logging. Used mainly "
-                               "to troubleshoot issues with the help of IncrediBuild support"));
+                               "to troubleshoot issues with the help of IncrediBuild support."));
 
     setEnv.setSettingsKey("IncrediBuild.BuildConsole.SetEnv");
     setEnv.setLabelText(Tr::tr("Set an Environment Variable:"));
@@ -210,14 +213,14 @@ BuildConsoleBuildStep::BuildConsoleBuildStep(BuildStepList *buildStepList, Id id
     stopOnError.setToolTip(Tr::tr("When specified, the execution will stop as soon as an error "
                                   "is encountered. This is the default behavior in "
                                   "\"Visual Studio\" builds, but not the default for "
-                                  "\"Make and Build tools\" or \"Dev Tools\" builds"));
+                                  "\"Make and Build tools\" or \"Dev Tools\" builds."));
 
     additionalArguments.setSettingsKey("IncrediBuild.BuildConsole.AdditionalArguments");
     additionalArguments.setLabelText(Tr::tr("Additional Arguments:"));
     additionalArguments.setDisplayStyle(StringAspect::LineEditDisplay);
     additionalArguments.setToolTip(Tr::tr("Add additional buildconsole arguments manually. "
                                           "The value of this field will be concatenated to the "
-                                          "final buildconsole command line"));
+                                          "final buildconsole command line."));
 
     openMonitor.setSettingsKey("IncrediBuild.BuildConsole.OpenMonitor");
     openMonitor.setLabel(Tr::tr("Open Build Monitor:"));
diff --git a/src/plugins/incredibuild/ibconsolebuildstep.cpp b/src/plugins/incredibuild/ibconsolebuildstep.cpp
index c53ffad455..8dd68baa60 100644
--- a/src/plugins/incredibuild/ibconsolebuildstep.cpp
+++ b/src/plugins/incredibuild/ibconsolebuildstep.cpp
@@ -34,9 +34,12 @@ public:
     BoolAspect keepJobNum{this};
 
     TextDisplay t2{this, "<i>" + Tr::tr("Enter the appropriate arguments to your build command.")};
-    TextDisplay t3{this, "<i>" + Tr::tr("Make sure the build command's "
-                                        "multi-job parameter value is large enough (such as "
-                                        "-j200 for the JOM or Make build tools)")};
+    TextDisplay
+        t3{this,
+           "<i>"
+               + Tr::tr("Make sure the build command's "
+                        "multi-job parameter value is large enough (such as "
+                        "-j200 for the JOM or Make build tools).")};
 
     TextDisplay t4{this, "<b>" + Tr::tr("IncrediBuild Distribution Control")};
 
diff --git a/src/plugins/ios/CMakeLists.txt b/src/plugins/ios/CMakeLists.txt
index e6ec1665b2..1b7256e43e 100644
--- a/src/plugins/ios/CMakeLists.txt
+++ b/src/plugins/ios/CMakeLists.txt
@@ -2,7 +2,6 @@ add_qtc_plugin(Ios
   DEPENDS QmlDebug Qt::Xml
   PLUGIN_DEPENDS Core Debugger ProjectExplorer QmakeProjectManager CMakeProjectManager
   SOURCES
-    createsimulatordialog.cpp createsimulatordialog.h
     devicectlutils.cpp
     devicectlutils.h
     ios.qrc
@@ -23,8 +22,6 @@ add_qtc_plugin(Ios
     iostoolhandler.cpp iostoolhandler.h
     iostr.h
     simulatorcontrol.cpp simulatorcontrol.h
-    simulatorinfomodel.cpp simulatorinfomodel.h
-    simulatoroperationdialog.cpp simulatoroperationdialog.h
 )
 
 extend_qtc_plugin(Ios
diff --git a/src/plugins/ios/createsimulatordialog.cpp b/src/plugins/ios/createsimulatordialog.cpp
deleted file mode 100644
index bacba246f2..0000000000
--- a/src/plugins/ios/createsimulatordialog.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-// Copyright (C) 2017 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#include "createsimulatordialog.h"
-
-#include "iostr.h"
-#include "simulatorcontrol.h"
-
-#include <utils/algorithm.h>
-#include <utils/async.h>
-#include <utils/layoutbuilder.h>
-
-#include <QApplication>
-#include <QComboBox>
-#include <QDialogButtonBox>
-#include <QLabel>
-#include <QLineEdit>
-#include <QPushButton>
-
-namespace Ios::Internal {
-
-CreateSimulatorDialog::CreateSimulatorDialog(QWidget *parent)
-    : QDialog(parent)
-{
-    resize(320, 160);
-    setWindowTitle(Tr::tr("Create Simulator"));
-
-    m_nameEdit = new QLineEdit(this);
-    m_deviceTypeCombo = new QComboBox(this);
-    m_runtimeCombo = new QComboBox(this);
-
-    auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
-    buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
-
-    using namespace Layouting;
-
-    Column {
-        Form {
-            Tr::tr("Simulator name:"), m_nameEdit, br,
-            Tr::tr("Device type:"), m_deviceTypeCombo, br,
-            Tr::tr("OS version:"), m_runtimeCombo, br,
-        },
-        buttonBox
-    }.attachTo(this);
-
-    connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
-    connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
-
-    const auto enableOk = [this, buttonBox] {
-        buttonBox->button(QDialogButtonBox::Ok)->setEnabled(
-                    !m_nameEdit->text().isEmpty() &&
-                    m_deviceTypeCombo->currentIndex() > 0 &&
-                    m_runtimeCombo->currentIndex() > 0);
-    };
-
-    connect(m_nameEdit, &QLineEdit::textChanged, this, enableOk);
-    connect(m_runtimeCombo, &QComboBox::currentIndexChanged, this, enableOk);
-    connect(m_deviceTypeCombo, &QComboBox::currentIndexChanged, this, [this, enableOk] {
-        populateRuntimes(m_deviceTypeCombo->currentData().value<DeviceTypeInfo>());
-        enableOk();
-    });
-
-    m_futureSync.addFuture(Utils::onResultReady(SimulatorControl::updateDeviceTypes(), this,
-                                                &CreateSimulatorDialog::populateDeviceTypes));
-
-    QFuture<QList<RuntimeInfo>> runtimesfuture = SimulatorControl::updateRuntimes();
-    Utils::onResultReady(runtimesfuture, this, [this](const QList<RuntimeInfo> &runtimes) {
-        m_runtimes = runtimes;
-    });
-    m_futureSync.addFuture(runtimesfuture);
-    populateRuntimes(DeviceTypeInfo());
-}
-
-CreateSimulatorDialog::~CreateSimulatorDialog() = default;
-
-/*!
-    Returns the simulator name entered by user.
- */
-QString CreateSimulatorDialog::name() const
-{
-    return m_nameEdit->text();
-}
-
-/*!
-    Returns the simulator runtime (OS version) selected by user.
-    Though the runtimes are filtered by the selected device type but the runtime camppatibility is
-    not checked. i.e. User can select the Runtime iOS 10.2 for iPhone 4 but the combination is not
-    possible as iOS 10.2 is not compatible with iPhone 4. In this case the command to create
-    simulator shall fail with an error message describing the compatibility.
- */
-RuntimeInfo CreateSimulatorDialog::runtime() const
-{
-    return m_runtimeCombo->currentData().value<RuntimeInfo>();
-}
-
-/*!
-    Returns the selected device type.
- */
-DeviceTypeInfo CreateSimulatorDialog::deviceType() const
-{
-    return m_deviceTypeCombo->currentData().value<DeviceTypeInfo>();
-}
-
-/*!
-    Populates the devices types. Similar device types are grouped together.
- */
-void CreateSimulatorDialog::populateDeviceTypes(const QList<DeviceTypeInfo> &deviceTypes)
-{
-    m_deviceTypeCombo->clear();
-    m_deviceTypeCombo->addItem(Tr::tr("None"));
-
-    if (deviceTypes.isEmpty())
-        return;
-
-    m_deviceTypeCombo->insertSeparator(1);
-
-    auto addItems = [this, deviceTypes](const QString &filter) {
-        const auto filteredTypes = Utils::filtered(deviceTypes, [filter](const DeviceTypeInfo &type){
-            return type.name.contains(filter, Qt::CaseInsensitive);
-        });
-        for (auto type : filteredTypes) {
-            m_deviceTypeCombo->addItem(type.name, QVariant::fromValue<DeviceTypeInfo>(type));
-        }
-        return filteredTypes.count();
-    };
-
-    if (addItems(QStringLiteral("iPhone")) > 0)
-        m_deviceTypeCombo->insertSeparator(m_deviceTypeCombo->count());
-    if (addItems(QStringLiteral("iPad")) > 0)
-        m_deviceTypeCombo->insertSeparator(m_deviceTypeCombo->count());
-    if (addItems(QStringLiteral("TV")) > 0)
-        m_deviceTypeCombo->insertSeparator(m_deviceTypeCombo->count());
-    addItems(QStringLiteral("Watch"));
-}
-
-/*!
-    Populates the available runtimes. Though the runtimes are filtered by the selected device type
-    but the runtime camppatibility is not checked. i.e. User can select the Runtime iOS 10.2 for
-    iPhone 4 but the combination is not possible as iOS 10.2 is not compatible with iPhone 4. In
-    this case the command to create simulator shall fail with an error message describing the
-    compatibility issue.
- */
-void CreateSimulatorDialog::populateRuntimes(const DeviceTypeInfo &deviceType)
-{
-    m_runtimeCombo->clear();
-    m_runtimeCombo->addItem(Tr::tr("None"));
-
-    if (deviceType.name.isEmpty())
-        return;
-
-    m_runtimeCombo->insertSeparator(1);
-
-    auto addItems = [this](const QString &filter) {
-        const auto filteredTypes = Utils::filtered(m_runtimes, [filter](const RuntimeInfo &runtime){
-            return runtime.name.contains(filter, Qt::CaseInsensitive);
-        });
-        for (auto runtime : filteredTypes) {
-            m_runtimeCombo->addItem(runtime.name, QVariant::fromValue<RuntimeInfo>(runtime));
-        }
-    };
-
-    if (deviceType.name.contains(QStringLiteral("iPhone")))
-        addItems(QStringLiteral("iOS"));
-    else if (deviceType.name.contains(QStringLiteral("iPad")))
-        addItems(QStringLiteral("iOS"));
-    else if (deviceType.name.contains(QStringLiteral("TV")))
-        addItems(QStringLiteral("tvOS"));
-    else if (deviceType.name.contains(QStringLiteral("Watch")))
-        addItems(QStringLiteral("watchOS"));
-}
-
-} // Ios::Internal
diff --git a/src/plugins/ios/createsimulatordialog.h b/src/plugins/ios/createsimulatordialog.h
deleted file mode 100644
index 9f269cc636..0000000000
--- a/src/plugins/ios/createsimulatordialog.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (C) 2017 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#pragma once
-
-#include <utils/futuresynchronizer.h>
-
-#include <QDialog>
-
-QT_BEGIN_NAMESPACE
-class QComboBox;
-class QLineEdit;
-QT_END_NAMESPACE
-
-namespace Ios::Internal {
-
-class DeviceTypeInfo;
-class RuntimeInfo;
-
-/*!
-    A dialog to select the iOS Device type and the runtime for a new
-    iOS simulator device.
- */
-class CreateSimulatorDialog : public QDialog
-{
-public:
-    explicit CreateSimulatorDialog(QWidget *parent = nullptr);
-    ~CreateSimulatorDialog() override;
-
-    QString name() const;
-    RuntimeInfo runtime() const;
-    DeviceTypeInfo deviceType() const;
-
-private:
-    void populateDeviceTypes(const QList<DeviceTypeInfo> &deviceTypes);
-    void populateRuntimes(const DeviceTypeInfo &deviceType);
-
-    QList<RuntimeInfo> m_runtimes;
-
-    QLineEdit *m_nameEdit;
-    QComboBox *m_deviceTypeCombo;
-    QComboBox *m_runtimeCombo;
-    Utils::FutureSynchronizer m_futureSync; // Keep me last
-};
-
-} // Ios::Internal
diff --git a/src/plugins/ios/ios.qbs b/src/plugins/ios/ios.qbs
index fa81e1facd..f07418443d 100644
--- a/src/plugins/ios/ios.qbs
+++ b/src/plugins/ios/ios.qbs
@@ -15,8 +15,6 @@ QtcPlugin {
     cpp.frameworks: base.concat(qbs.targetOS.contains("macos") ? ["CoreFoundation", "IOKit"] : [])
 
     files: [
-        "createsimulatordialog.cpp",
-        "createsimulatordialog.h",
         "devicectlutils.cpp",
         "devicectlutils.h",
         "ios.qrc",
@@ -51,9 +49,5 @@ QtcPlugin {
         "iostr.h",
         "simulatorcontrol.cpp",
         "simulatorcontrol.h",
-        "simulatorinfomodel.cpp",
-        "simulatorinfomodel.h",
-        "simulatoroperationdialog.cpp",
-        "simulatoroperationdialog.h",
     ]
 }
diff --git a/src/plugins/ios/iosconfigurations.cpp b/src/plugins/ios/iosconfigurations.cpp
index ff995c6c2c..d7ad6bf3be 100644
--- a/src/plugins/ios/iosconfigurations.cpp
+++ b/src/plugins/ios/iosconfigurations.cpp
@@ -69,7 +69,6 @@ const bool IgnoreAllDevicesDefault = false;
 
 const char SettingsGroup[] = "IosConfigurations";
 const char ignoreAllDevicesKey[] = "IgnoreAllDevices";
-const char screenshotDirPathKey[] = "ScreeshotDirPath";
 
 const char provisioningTeamsTag[] = "IDEProvisioningTeams";
 const char freeTeamTag[] = "isFreeProvisioningTeam";
@@ -343,19 +342,6 @@ void IosConfigurations::setIgnoreAllDevices(bool ignoreDevices)
     }
 }
 
-void IosConfigurations::setScreenshotDir(const FilePath &path)
-{
-    if (m_instance->m_screenshotDir != path) {
-        m_instance->m_screenshotDir = path;
-        m_instance->save();
-    }
-}
-
-FilePath IosConfigurations::screenshotDir()
-{
-    return m_instance->m_screenshotDir;
-}
-
 FilePath IosConfigurations::developerPath()
 {
     return m_instance->m_developerPath;
@@ -366,20 +352,11 @@ QVersionNumber IosConfigurations::xcodeVersion()
     return m_instance->m_xcodeVersion;
 }
 
-static FilePath defaultScreenshotDirPath()
-{
-    return FilePath::fromUserInput(
-        QStandardPaths::standardLocations(QStandardPaths::PicturesLocation).constFirst());
-}
-
 void IosConfigurations::save()
 {
     QtcSettings *settings = Core::ICore::settings();
     settings->beginGroup(SettingsGroup);
     settings->setValueWithDefault(ignoreAllDevicesKey, m_ignoreAllDevices, IgnoreAllDevicesDefault);
-    settings->setValueWithDefault(screenshotDirPathKey,
-                                  m_screenshotDir.toSettings(),
-                                  defaultScreenshotDirPath().toSettings());
     settings->endGroup();
 }
 
@@ -396,11 +373,6 @@ void IosConfigurations::load()
     QtcSettings *settings = Core::ICore::settings();
     settings->beginGroup(SettingsGroup);
     m_ignoreAllDevices = settings->value(ignoreAllDevicesKey, IgnoreAllDevicesDefault).toBool();
-    m_screenshotDir = FilePath::fromSettings(settings->value(screenshotDirPathKey));
-
-    if (!m_screenshotDir.isWritableDir())
-        m_screenshotDir = defaultScreenshotDirPath();
-
     settings->endGroup();
 }
 
diff --git a/src/plugins/ios/iosconfigurations.h b/src/plugins/ios/iosconfigurations.h
index 7b65f2f8e6..953b872cd0 100644
--- a/src/plugins/ios/iosconfigurations.h
+++ b/src/plugins/ios/iosconfigurations.h
@@ -78,8 +78,6 @@ public:
     static void initialize();
     static bool ignoreAllDevices();
     static void setIgnoreAllDevices(bool ignoreDevices);
-    static void setScreenshotDir(const Utils::FilePath &path);
-    static Utils::FilePath screenshotDir();
     static Utils::FilePath developerPath();
     static QVersionNumber xcodeVersion();
     static Utils::FilePath lldbPath();
@@ -103,7 +101,6 @@ private:
     void loadProvisioningData(bool notify = true);
 
     Utils::FilePath m_developerPath;
-    Utils::FilePath m_screenshotDir;
     QVersionNumber m_xcodeVersion;
     bool m_ignoreAllDevices;
     QFileSystemWatcher *m_provisioningDataWatcher = nullptr;
diff --git a/src/plugins/ios/iosrunconfiguration.cpp b/src/plugins/ios/iosrunconfiguration.cpp
index 676fb68724..23a27e85f6 100644
--- a/src/plugins/ios/iosrunconfiguration.cpp
+++ b/src/plugins/ios/iosrunconfiguration.cpp
@@ -21,10 +21,11 @@
 #include <projectexplorer/target.h>
 
 #include <utils/algorithm.h>
+#include <utils/async.h>
 #include <utils/filepath.h>
 #include <utils/layoutbuilder.h>
-#include <utils/qtcprocess.h>
 #include <utils/qtcassert.h>
+#include <utils/qtcprocess.h>
 
 #include <QAction>
 #include <QApplication>
@@ -33,6 +34,7 @@
 #include <QLabel>
 #include <QLineEdit>
 #include <QList>
+#include <QPushButton>
 #include <QVariant>
 #include <QWidget>
 
@@ -342,12 +344,25 @@ void IosDeviceTypeAspect::addToLayout(Layouting::LayoutItem &parent)
 
     m_deviceTypeLabel = new QLabel(Tr::tr("Device type:"));
 
-    parent.addItems({m_deviceTypeLabel, m_deviceTypeComboBox});
+    m_updateButton = new QPushButton(Tr::tr("Update"));
+
+    parent.addItems({m_deviceTypeLabel, m_deviceTypeComboBox, m_updateButton, Layouting::st});
 
     updateValues();
 
     connect(m_deviceTypeComboBox, &QComboBox::currentIndexChanged,
             this, &IosDeviceTypeAspect::setDeviceTypeIndex);
+    connect(m_updateButton, &QPushButton::clicked, this, [this] {
+        m_updateButton->setEnabled(false);
+        Utils::onFinished(
+            QFuture<void>(SimulatorControl::updateAvailableSimulators(this)),
+            this,
+            [this](QFuture<void>) {
+                m_updateButton->setEnabled(true);
+                m_deviceTypeModel.clear();
+                updateValues();
+            });
+    });
 }
 
 void IosDeviceTypeAspect::setDeviceTypeIndex(int devIndex)
@@ -363,6 +378,7 @@ void IosDeviceTypeAspect::updateValues()
     bool showDeviceSelector = deviceType().type != IosDeviceType::IosDevice;
     m_deviceTypeLabel->setVisible(showDeviceSelector);
     m_deviceTypeComboBox->setVisible(showDeviceSelector);
+    m_updateButton->setVisible(showDeviceSelector);
     if (showDeviceSelector && m_deviceTypeModel.rowCount() == 0) {
         const QList<SimulatorInfo> devices = SimulatorControl::availableSimulators();
         for (const SimulatorInfo &device : devices) {
diff --git a/src/plugins/ios/iosrunconfiguration.h b/src/plugins/ios/iosrunconfiguration.h
index baef05cd1d..524369605c 100644
--- a/src/plugins/ios/iosrunconfiguration.h
+++ b/src/plugins/ios/iosrunconfiguration.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#include "iosconstants.h"
-#include "iosconfigurations.h"
 #include "iossimulator.h"
 
 #include <projectexplorer/runconfiguration.h>
@@ -12,9 +10,13 @@
 
 #include <utils/fileutils.h>
 
-#include <QComboBox>
 #include <QStandardItemModel>
 
+QT_BEGIN_NAMESPACE
+class QComboBox;
+class QPushButton;
+QT_END_NAMESPACE
+
 namespace Ios::Internal {
 
 class IosRunConfiguration;
@@ -58,6 +60,7 @@ private:
     QStandardItemModel m_deviceTypeModel;
     QLabel *m_deviceTypeLabel = nullptr;
     QComboBox *m_deviceTypeComboBox = nullptr;
+    QPushButton *m_updateButton = nullptr;
 };
 
 class IosRunConfiguration : public ProjectExplorer::RunConfiguration
diff --git a/src/plugins/ios/iosrunner.cpp b/src/plugins/ios/iosrunner.cpp
index ff3d10f491..e5b03e5229 100644
--- a/src/plugins/ios/iosrunner.cpp
+++ b/src/plugins/ios/iosrunner.cpp
@@ -60,18 +60,29 @@ using namespace Tasking;
 
 namespace Ios::Internal {
 
+static QString identifierForRunControl(RunControl *runControl)
+{
+    const IosDeviceTypeAspect::Data *data = runControl->aspectData<IosDeviceTypeAspect>();
+    return data ? data->deviceType.identifier : QString();
+}
+
 static void stopRunningRunControl(RunControl *runControl)
 {
     static QMap<Id, QPointer<RunControl>> activeRunControls;
 
+    // clean up deleted
+    Utils::erase(activeRunControls, [](const QPointer<RunControl> &rc) { return !rc; });
+
     Target *target = runControl->target();
-    Id devId = DeviceKitAspect::deviceId(target->kit());
+    const Id devId = DeviceKitAspect::deviceId(target->kit());
+    const QString identifier = identifierForRunControl(runControl);
 
     // The device can only run an application at a time, if an app is running stop it.
-    if (activeRunControls.contains(devId)) {
-        if (QPointer<RunControl> activeRunControl = activeRunControls[devId])
+    if (QPointer<RunControl> activeRunControl = activeRunControls[devId]) {
+        if (identifierForRunControl(activeRunControl) == identifier) {
             activeRunControl->initiateStop();
-        activeRunControls.remove(devId);
+            activeRunControls.remove(devId);
+        }
     }
 
     if (devId.isValid())
diff --git a/src/plugins/ios/iossettingspage.cpp b/src/plugins/ios/iossettingspage.cpp
index 042dfca9af..8c699ebc03 100644
--- a/src/plugins/ios/iossettingspage.cpp
+++ b/src/plugins/ios/iossettingspage.cpp
@@ -3,34 +3,17 @@
 
 #include "iossettingspage.h"
 
-#include "createsimulatordialog.h"
 #include "iosconfigurations.h"
 #include "iosconstants.h"
 #include "iostr.h"
-#include "simulatorcontrol.h"
-#include "simulatorinfomodel.h"
-#include "simulatoroperationdialog.h"
 
 #include <coreplugin/dialogs/ioptionspage.h>
 
 #include <projectexplorer/projectexplorerconstants.h>
 
-#include <utils/algorithm.h>
-#include <utils/async.h>
 #include <utils/layoutbuilder.h>
-#include <utils/pathchooser.h>
 
 #include <QCheckBox>
-#include <QDateTime>
-#include <QGroupBox>
-#include <QHeaderView>
-#include <QInputDialog>
-#include <QLabel>
-#include <QMessageBox>
-#include <QPointer>
-#include <QPushButton>
-#include <QSortFilterProxyModel>
-#include <QTreeView>
 
 using namespace std::placeholders;
 
@@ -47,43 +30,10 @@ private:
 
     void saveSettings();
 
-    void onStart();
-    void onCreate();
-    void onReset();
-    void onRename();
-    void onDelete();
-    void onScreenshot();
-    void onSelectionChanged();
-
 private:
-    Utils::PathChooser *m_pathWidget;
-    QPushButton *m_startButton;
-    QPushButton *m_renameButton;
-    QPushButton *m_deleteButton;
-    QPushButton *m_resetButton;
-    QTreeView *m_deviceView;
     QCheckBox *m_deviceAskCheckBox;
 };
 
-const int simStartWarnCount = 4;
-
-static SimulatorInfoList selectedSimulators(const QTreeView *deviceTreeView)
-{
-    SimulatorInfoList list;
-    QItemSelectionModel *selectionModel = deviceTreeView->selectionModel();
-    for (QModelIndex index: selectionModel->selectedRows())
-        list << deviceTreeView->model()->data(index, Qt::UserRole).value<SimulatorInfo>();
-    return list;
-}
-
-static void onSimOperation(const SimulatorInfo &simInfo,
-                           SimulatorOperationDialog *dlg,
-                           const QString &contextStr,
-                           const SimulatorControl::Response &response)
-{
-    dlg->addMessage(simInfo, response, contextStr);
-}
-
 IosSettingsWidget::IosSettingsWidget()
 {
     setWindowTitle(Tr::tr("iOS Configuration"));
@@ -91,43 +41,14 @@ IosSettingsWidget::IosSettingsWidget()
     m_deviceAskCheckBox = new QCheckBox(Tr::tr("Ask about devices not in developer mode"));
     m_deviceAskCheckBox->setChecked(!IosConfigurations::ignoreAllDevices());
 
-    m_renameButton = new QPushButton(Tr::tr("Rename"));
-    m_renameButton->setEnabled(false);
-    m_renameButton->setToolTip(Tr::tr("Rename a simulator device."));
-
-    m_deleteButton = new QPushButton(Tr::tr("Delete"));
-    m_deleteButton->setEnabled(false);
-    m_deleteButton->setToolTip(Tr::tr("Delete simulator devices."));
-
-    m_resetButton = new QPushButton(Tr::tr("Reset"));
-    m_resetButton->setEnabled(false);
-    m_resetButton->setToolTip(Tr::tr("Reset contents and settings of simulator devices."));
-
-    auto createButton = new QPushButton(Tr::tr("Create"));
-    createButton->setToolTip(Tr::tr("Create a new simulator device."));
-
-    m_startButton = new QPushButton(Tr::tr("Start"));
-    m_startButton->setEnabled(false);
-    m_startButton->setToolTip(Tr::tr("Start simulator devices."));
-
-    auto proxyModel = new QSortFilterProxyModel(this);
-    proxyModel->setSourceModel(new SimulatorInfoModel(this));
-
-    m_deviceView = new QTreeView;
-    m_deviceView->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Expanding);
-    m_deviceView->setSelectionMode(QAbstractItemView::ExtendedSelection);
-    m_deviceView->setSelectionBehavior(QAbstractItemView::SelectRows);
-    m_deviceView->setSortingEnabled(true);
-    m_deviceView->setModel(proxyModel);
-    m_deviceView->header()->setSectionResizeMode(0, QHeaderView::ResizeToContents);
-
-    m_pathWidget = new Utils::PathChooser;
-    m_pathWidget->setExpectedKind(Utils::PathChooser::ExistingDirectory);
-    m_pathWidget->lineEdit()->setReadOnly(true);
-    m_pathWidget->setFilePath(IosConfigurations::screenshotDir());
-    m_pathWidget->addButton(Tr::tr("Screenshot"), this,
-                            std::bind(&IosSettingsWidget::onScreenshot, this));
+    auto xcodeLabel = new QLabel(
+        Tr::tr("Configure available simulator devices in <a href=\"%1\">Xcode</a>.")
+            .arg("https://developer.apple.com/documentation/xcode/"
+                 "running-your-app-in-simulator-or-on-a-device/"
+                 "#Configure-the-list-of-simulated-devices"));
+    xcodeLabel->setOpenExternalLinks(true);
 
+    // clang-format off
     using namespace Layouting;
     Column {
         Group {
@@ -136,33 +57,11 @@ IosSettingsWidget::IosSettingsWidget()
         },
         Group {
             title(Tr::tr("Simulator")),
-            Column {
-                Row {
-                    m_deviceView,
-                    Column {
-                        createButton,
-                        st,  // FIXME: Better some fixed space?
-                        m_startButton,
-                        m_renameButton,
-                        m_resetButton,
-                        m_deleteButton,
-                        st
-                    },
-                },
-                hr,
-                Row { Tr::tr("Screenshot directory:"), m_pathWidget }
-            }
-        }
+            Row { xcodeLabel }
+        },
+        st
     }.attachTo(this);
-
-    connect(m_startButton, &QPushButton::clicked, this, &IosSettingsWidget::onStart);
-    connect(createButton, &QPushButton::clicked, this, &IosSettingsWidget::onCreate);
-    connect(m_renameButton, &QPushButton::clicked, this, &IosSettingsWidget::onRename);
-    connect(m_resetButton, &QPushButton::clicked, this, &IosSettingsWidget::onReset);
-    connect(m_deleteButton, &QPushButton::clicked, this, &IosSettingsWidget::onDelete);
-
-    connect(m_deviceView->selectionModel(), &QItemSelectionModel::selectionChanged,
-            this, &IosSettingsWidget::onSelectionChanged);
+    // clang-format on
 }
 
 IosSettingsWidget::~IosSettingsWidget() = default;
@@ -173,229 +72,9 @@ void IosSettingsWidget::apply()
     IosConfigurations::updateAutomaticKitList();
 }
 
-/*!
-    Called on start button click. Selected simulator devices are started. Multiple devices can be
-    started simultaneously provided they in shutdown state.
- */
-void IosSettingsWidget::onStart()
-{
-    const SimulatorInfoList simulatorInfoList = selectedSimulators(m_deviceView);
-    if (simulatorInfoList.isEmpty())
-        return;
-
-    if (simulatorInfoList.count() > simStartWarnCount) {
-        const QString message =
-            Tr::tr("You are trying to launch %n simulators simultaneously. This "
-                                       "will take significant system resources. Do you really want to "
-                                       "continue?", "", simulatorInfoList.count());
-        const int buttonCode = QMessageBox::warning(this, Tr::tr("Simulator Start"), message,
-                                                    QMessageBox::Ok | QMessageBox::Abort,
-                                                    QMessageBox::Abort);
-
-        if (buttonCode == QMessageBox::Abort)
-            return;
-    }
-
-    QPointer<SimulatorOperationDialog> statusDialog = new SimulatorOperationDialog(this);
-    statusDialog->setAttribute(Qt::WA_DeleteOnClose);
-    statusDialog->addMessage(Tr::tr("Starting %n simulator device(s)...", "", simulatorInfoList.count()),
-                             Utils::NormalMessageFormat);
-
-    QList<QFuture<void>> futureList;
-    for (const SimulatorInfo &info : simulatorInfoList) {
-        if (!info.isShutdown()) {
-            statusDialog->addMessage(Tr::tr("Cannot start simulator (%1, %2) in current state: %3.")
-                                         .arg(info.name)
-                                         .arg(info.runtimeName)
-                                         .arg(info.state),
-                                     Utils::StdErrFormat);
-        } else {
-            futureList << QFuture<void>(Utils::onResultReady(
-                SimulatorControl::startSimulator(info.identifier), this,
-                std::bind(onSimOperation, info, statusDialog, Tr::tr("simulator start"), _1)));
-        }
-    }
-
-    statusDialog->addFutures(futureList);
-    statusDialog->exec(); // Modal dialog returns only when all the operations are done or cancelled.
-}
-
-/*!
-    Called on create button click. User is presented with the create simulator dialog and with the
-    selected options a new device is created.
- */
-void IosSettingsWidget::onCreate()
-{
-    QPointer<SimulatorOperationDialog> statusDialog = new SimulatorOperationDialog(this);
-    statusDialog->setAttribute(Qt::WA_DeleteOnClose);
-    statusDialog->addMessage(Tr::tr("Creating simulator device..."), Utils::NormalMessageFormat);
-    const auto onSimulatorCreate = [statusDialog](const QString &name,
-                                                  const SimulatorControl::Response &response) {
-        if (response) {
-            statusDialog->addMessage(Tr::tr("Simulator device (%1) created.\nUDID: %2")
-                                         .arg(name)
-                                         .arg(response->simUdid),
-                                     Utils::StdOutFormat);
-        } else {
-            statusDialog->addMessage(Tr::tr("Simulator device (%1) creation failed.\nError: %2")
-                                         .arg(name)
-                                         .arg(response.error()),
-                                     Utils::StdErrFormat);
-        }
-    };
-
-    CreateSimulatorDialog createDialog(this);
-    if (createDialog.exec() == QDialog::Accepted) {
-        QFuture<void> f = QFuture<void>(Utils::onResultReady(SimulatorControl::createSimulator(
-                createDialog.name(), createDialog.deviceType(), createDialog.runtime()),
-                this, std::bind(onSimulatorCreate, createDialog.name(), _1)));
-        statusDialog->addFutures({ f });
-        statusDialog->exec(); // Modal dialog returns only when all the operations are done or cancelled.
-    }
-}
-
-/*!
-    Called on reset button click. Contents and settings of the selected devices are erased. Multiple
-    devices can be erased simultaneously provided they in shutdown state.
- */
-void IosSettingsWidget::onReset()
-{
-    const SimulatorInfoList simulatorInfoList = selectedSimulators(m_deviceView);
-    if (simulatorInfoList.isEmpty())
-        return;
-
-    const int userInput = QMessageBox::question(this, Tr::tr("Reset"),
-                                      Tr::tr("Do you really want to reset the contents and settings"
-                                             " of the %n selected device(s)?", "",
-                                             simulatorInfoList.count()));
-    if (userInput == QMessageBox::No)
-        return;
-
-    QPointer<SimulatorOperationDialog> statusDialog = new SimulatorOperationDialog(this);
-    statusDialog->setAttribute(Qt::WA_DeleteOnClose);
-    statusDialog->addMessage(Tr::tr("Resetting contents and settings..."),
-                             Utils::NormalMessageFormat);
-
-    QList<QFuture<void>> futureList;
-    for (const SimulatorInfo &info : simulatorInfoList) {
-        futureList << QFuture<void>(Utils::onResultReady(
-            SimulatorControl::resetSimulator(info.identifier), this,
-            std::bind(onSimOperation, info, statusDialog, Tr::tr("simulator reset"), _1)));
-    }
-
-    statusDialog->addFutures(futureList);
-    statusDialog->exec(); // Modal dialog returns only when all the operations are done or cancelled.
-}
-
-/*!
-    Called on rename button click. Selected device is renamed. Only one device can be renamed at a
-    time. Rename button is disabled on multi-selection.
- */
-void IosSettingsWidget::onRename()
-{
-    const SimulatorInfoList simulatorInfoList = selectedSimulators(m_deviceView);
-    if (simulatorInfoList.isEmpty() || simulatorInfoList.count() > 1)
-        return;
-
-    const SimulatorInfo &simInfo = simulatorInfoList.at(0);
-    const QString newName = QInputDialog::getText(this, Tr::tr("Rename %1").arg(simInfo.name),
-                                                  Tr::tr("Enter new name:"));
-    if (newName.isEmpty())
-        return;
-
-    QPointer<SimulatorOperationDialog> statusDialog = new SimulatorOperationDialog(this);
-    statusDialog->setAttribute(Qt::WA_DeleteOnClose);
-    statusDialog->addMessage(Tr::tr("Renaming simulator device..."), Utils::NormalMessageFormat);
-    QFuture<void> f = QFuture<void>(Utils::onResultReady(
-        SimulatorControl::renameSimulator(simInfo.identifier, newName), this,
-        std::bind(onSimOperation, simInfo, statusDialog, Tr::tr("simulator rename"), _1)));
-    statusDialog->addFutures({f});
-    statusDialog->exec(); // Modal dialog returns only when all the operations are done or cancelled.
-}
-
-/*!
-    Called on delete button click. Selected devices are deleted. Multiple devices can be deleted
-    simultaneously provided they in shutdown state.
- */
-void IosSettingsWidget::onDelete()
-{
-    const SimulatorInfoList simulatorInfoList = selectedSimulators(m_deviceView);
-    if (simulatorInfoList.isEmpty())
-        return;
-
-    const int userInput =
-        QMessageBox::question(this, Tr::tr("Delete Device"),
-                                    Tr::tr("Do you really want to delete the %n selected "
-                                           "device(s)?", "", simulatorInfoList.count()));
-    if (userInput == QMessageBox::No)
-        return;
-
-    QPointer<SimulatorOperationDialog> statusDialog = new SimulatorOperationDialog(this);
-    statusDialog->setAttribute(Qt::WA_DeleteOnClose);
-    statusDialog->addMessage(Tr::tr("Deleting %n simulator device(s)...", "", simulatorInfoList.count()),
-                             Utils::NormalMessageFormat);
-    QList<QFuture<void>> futureList;
-    for (const SimulatorInfo &info : simulatorInfoList) {
-        futureList << QFuture<void>(Utils::onResultReady(
-            SimulatorControl::deleteSimulator(info.identifier), this,
-            std::bind(onSimOperation, info, statusDialog, Tr::tr("simulator delete"), _1)));
-    }
-
-    statusDialog->addFutures(futureList);
-    statusDialog->exec(); // Modal dialog returns only when all the operations are done or cancelled.
-}
-
-/*!
-    Called on screenshot button click. Screenshot of the selected devices are saved to the selected
-    path. Screenshot from multiple devices can be taken simultaneously provided they in booted state.
- */
-void IosSettingsWidget::onScreenshot()
-{
-    const SimulatorInfoList simulatorInfoList = selectedSimulators(m_deviceView);
-    if (simulatorInfoList.isEmpty())
-        return;
-
-    const auto generatePath = [this](const SimulatorInfo &info) {
-        const QString fileName = QString("%1_%2_%3.png").arg(info.name).arg(info.runtimeName)
-                .arg(QDateTime::currentDateTime().toString("yyyy-MM-dd_HH-mm-ss-z")).replace(' ', '_');
-        return m_pathWidget->filePath().pathAppended(fileName).toString();
-    };
-
-    QPointer<SimulatorOperationDialog> statusDialog = new SimulatorOperationDialog(this);
-    statusDialog->setAttribute(Qt::WA_DeleteOnClose);
-    statusDialog->addMessage(Tr::tr("Capturing screenshots from %n device(s)...", "",
-                                    simulatorInfoList.count()), Utils::NormalMessageFormat);
-    QList<QFuture<void>> futureList;
-    for (const SimulatorInfo &info : simulatorInfoList) {
-        futureList << QFuture<void>(Utils::onResultReady(
-            SimulatorControl::takeSceenshot(info.identifier, generatePath(info)), this,
-            std::bind(onSimOperation, info, statusDialog, Tr::tr("simulator screenshot"), _1)));
-    }
-
-    statusDialog->addFutures(futureList);
-    statusDialog->exec(); // Modal dialog returns only when all the operations are done or cancelled.
-}
-
-void IosSettingsWidget::onSelectionChanged()
-{
-    const SimulatorInfoList infoList = selectedSimulators(m_deviceView);
-    const bool hasRunning = Utils::anyOf(infoList, [](const SimulatorInfo &info) {
-        return info.isBooted();
-    });
-    const bool hasShutdown = Utils::anyOf(infoList, [](const SimulatorInfo &info) {
-        return info.isShutdown();
-    });
-    m_startButton->setEnabled(hasShutdown);
-    m_deleteButton->setEnabled(hasShutdown);
-    m_resetButton->setEnabled(hasShutdown);
-    m_renameButton->setEnabled(infoList.count() == 1 && hasShutdown);
-    m_pathWidget->buttonAtIndex(1)->setEnabled(hasRunning); // Screenshot button
-}
-
 void IosSettingsWidget::saveSettings()
 {
     IosConfigurations::setIgnoreAllDevices(!m_deviceAskCheckBox->isChecked());
-    IosConfigurations::setScreenshotDir(m_pathWidget->filePath());
 }
 
 // IosSettingsPage
diff --git a/src/plugins/ios/simulatorinfomodel.cpp b/src/plugins/ios/simulatorinfomodel.cpp
deleted file mode 100644
index dce5646713..0000000000
--- a/src/plugins/ios/simulatorinfomodel.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright (C) 2017 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#include "simulatorinfomodel.h"
-
-#include "iostr.h"
-
-#include <utils/algorithm.h>
-#include <utils/async.h>
-
-#include <QTimer>
-
-namespace Ios::Internal {
-
-using namespace std::placeholders;
-
-const int colCount = 3;
-const int nameCol = 0;
-const int runtimeCol = 1;
-const int stateCol = 2;
-const int deviceUpdateInterval = 1000; // Update simulator state every 1 sec.
-
-SimulatorInfoModel::SimulatorInfoModel(QObject *parent) :
-    QAbstractItemModel(parent)
-{
-    requestSimulatorInfo();
-
-    auto updateTimer = new QTimer(this);
-    connect(updateTimer, &QTimer::timeout, this, &SimulatorInfoModel::requestSimulatorInfo);
-    updateTimer->setInterval(deviceUpdateInterval);
-    updateTimer->start();
-}
-
-QVariant SimulatorInfoModel::data(const QModelIndex &index, int role) const
-{
-    if (!index.isValid())
-        return {};
-
-    const SimulatorInfo &simInfo = m_simList[index.row()];
-    if (role == Qt::EditRole || role == Qt::DisplayRole) {
-        switch (index.column()) {
-        case nameCol:
-            return simInfo.name;
-        case runtimeCol:
-            return simInfo.runtimeName;
-        case stateCol:
-            return simInfo.state;
-        default:
-            return "";
-        }
-    } else if (role == Qt::ToolTipRole) {
-        return Tr::tr("UDID: %1").arg(simInfo.identifier);
-    } else if (role == Qt::UserRole) {
-        return QVariant::fromValue<SimulatorInfo>(simInfo);
-    }
-
-    return {};
-}
-
-int SimulatorInfoModel::rowCount(const QModelIndex &parent) const
-{
-    if (!parent.isValid())
-        return m_simList.count();
-    return 0;
-}
-
-int SimulatorInfoModel::columnCount(const QModelIndex &parent) const
-{
-    Q_UNUSED(parent)
-    return colCount;
-}
-
-QVariant SimulatorInfoModel::headerData(int section, Qt::Orientation orientation, int role) const
-{
-    if (orientation == Qt::Vertical || section > colCount)
-        return {};
-
-    if (role == Qt::DisplayRole) {
-        switch (section) {
-        case nameCol:
-            return Tr::tr("Simulator Name");
-        case runtimeCol:
-            return Tr::tr("Runtime");
-        case stateCol:
-            return Tr::tr("Current State");
-        default:
-            return {};
-        }
-    }
-
-    return {};
-}
-
-QModelIndex SimulatorInfoModel::index(int row, int column, const QModelIndex &parent) const
-{
-    return hasIndex(row, column, parent) ? createIndex(row, column) : QModelIndex();
-}
-
-QModelIndex SimulatorInfoModel::parent(const QModelIndex &) const
-{
-    return {};
-}
-
-void SimulatorInfoModel::requestSimulatorInfo()
-{
-    m_fetchFuture.flushFinishedFutures();
-    if (!m_fetchFuture.isEmpty())
-        return; // Ignore the request if the last request is still pending.
-
-    m_fetchFuture.addFuture(Utils::onResultReady(SimulatorControl::updateAvailableSimulators(this),
-                                                 this, &SimulatorInfoModel::populateSimulators));
-}
-
-void SimulatorInfoModel::populateSimulators(const SimulatorInfoList &simulatorList)
-{
-    if (m_simList.isEmpty() || m_simList.count() != simulatorList.count()) {
-        // Reset the model in case of addition or deletion.
-        beginResetModel();
-        m_simList = simulatorList;
-        endResetModel();
-    } else {
-        // update the rows with data chagne. e.g. state changes.
-        auto newItr = simulatorList.cbegin();
-        int start = -1, end = -1;
-        std::list<std::pair<int, int>> updatedIndexes;
-        for (auto itr = m_simList.cbegin(); itr < m_simList.cend(); ++itr, ++newItr) {
-            if (*itr == *newItr) {
-                if (end != -1)
-                    updatedIndexes.emplace_back(start, end - 1);
-                start = std::distance(m_simList.cbegin(), itr);
-                end = -1;
-            } else {
-                end = std::distance(m_simList.cbegin(), itr);
-            }
-        }
-        m_simList = simulatorList;
-        for (auto pair: updatedIndexes)
-            emit dataChanged(index(pair.first,0), index(pair.second, colCount - 1));
-    }
-}
-
-} // Ios::Internal
diff --git a/src/plugins/ios/simulatorinfomodel.h b/src/plugins/ios/simulatorinfomodel.h
deleted file mode 100644
index c5769000d3..0000000000
--- a/src/plugins/ios/simulatorinfomodel.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (C) 2017 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#pragma once
-
-#include "simulatorcontrol.h"
-
-#include <utils/futuresynchronizer.h>
-
-#include <QAbstractListModel>
-
-namespace Ios::Internal {
-
-using SimulatorInfoList = QList<SimulatorInfo>;
-
-class SimulatorInfoModel : public QAbstractItemModel
-{
-public:
-    SimulatorInfoModel(QObject *parent = nullptr);
-
-    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
-    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
-    int columnCount(const QModelIndex &parent) const override;
-    QVariant headerData(int section, Qt::Orientation orientation,
-                        int role = Qt::DisplayRole) const override;
-    QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
-    QModelIndex parent(const QModelIndex &) const override;
-
-private:
-    void requestSimulatorInfo();
-    void populateSimulators(const SimulatorInfoList &simulatorList);
-
-    Utils::FutureSynchronizer m_fetchFuture;
-    SimulatorInfoList m_simList;
-};
-
-} // Ios::Internal
diff --git a/src/plugins/ios/simulatoroperationdialog.cpp b/src/plugins/ios/simulatoroperationdialog.cpp
deleted file mode 100644
index b260f50310..0000000000
--- a/src/plugins/ios/simulatoroperationdialog.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright (C) 2017 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#include "simulatoroperationdialog.h"
-
-#include "iostr.h"
-
-#include <utils/layoutbuilder.h>
-#include <utils/outputformatter.h>
-#include <utils/qtcassert.h>
-
-#include <QDialogButtonBox>
-#include <QFutureWatcher>
-#include <QLoggingCategory>
-#include <QPlainTextEdit>
-#include <QProgressBar>
-#include <QPushButton>
-
-namespace Ios::Internal {
-
-static Q_LOGGING_CATEGORY(iosCommon, "qtc.ios.common", QtWarningMsg)
-
-SimulatorOperationDialog::SimulatorOperationDialog(QWidget *parent) :
-    // TODO: Maximize buttong only because of QTBUG-41932
-    QDialog(parent,Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::WindowMaximizeButtonHint)
-{
-    resize(580, 320);
-    setModal(true);
-    setWindowTitle(Tr::tr("Simulator Operation Status"));
-
-    auto messageEdit = new QPlainTextEdit;
-    messageEdit->setReadOnly(true);
-
-    m_progressBar = new QProgressBar;
-    m_progressBar->setMaximum(0);
-    m_progressBar->setValue(-1);
-
-    m_buttonBox = new QDialogButtonBox(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
-
-    m_formatter = new Utils::OutputFormatter;
-    m_formatter->setPlainTextEdit(messageEdit);
-
-    using namespace Layouting;
-
-    Column {
-        messageEdit,
-        m_progressBar,
-        m_buttonBox
-    }.attachTo(this);
-
-    connect(m_buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
-    connect(m_buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
-}
-
-SimulatorOperationDialog::~SimulatorOperationDialog()
-{
-    // Cancel all pending futures.
-    const auto futureWatchList = m_futureWatchList;
-    for (auto watcher : futureWatchList) {
-        if (!watcher->isFinished())
-            watcher->cancel();
-    }
-
-    // wait for futures to finish
-    for (auto watcher : futureWatchList) {
-        if (!watcher->isFinished())
-            watcher->waitForFinished();
-        delete watcher;
-    }
-
-    delete m_formatter;
-}
-
-void SimulatorOperationDialog::addFutures(const QList<QFuture<void> > &futureList)
-{
-    for (auto future : futureList) {
-        if (!future.isFinished() || !future.isCanceled()) {
-            auto watcher = new QFutureWatcher<void>;
-            connect(watcher, &QFutureWatcherBase::finished, this, [this, watcher] {
-                m_futureWatchList.removeAll(watcher);
-                watcher->deleteLater();
-                updateInputs();
-            });
-            watcher->setFuture(future);
-            m_futureWatchList << watcher;
-        }
-    }
-    updateInputs();
-}
-
-void SimulatorOperationDialog::addMessage(const QString &message, Utils::OutputFormat format)
-{
-    m_formatter->appendMessage(message + "\n\n", format);
-}
-
-void SimulatorOperationDialog::addMessage(const SimulatorInfo &siminfo,
-                                          const SimulatorControl::Response &response,
-                                          const QString &context)
-{
-    if (response) {
-        QTC_CHECK(siminfo.identifier == response->simUdid);
-        addMessage(Tr::tr("%1, %2\nOperation %3 completed successfully.").arg(siminfo.name)
-                   .arg(siminfo.runtimeName).arg(context), Utils::StdOutFormat);
-    } else {
-        QString erroMsg = response.error();
-        QString message = Tr::tr("%1, %2\nOperation %3 failed.\nUDID: %4\nError: %5").arg(siminfo.name)
-                .arg(siminfo.runtimeName).arg(context).arg(siminfo.identifier)
-                .arg(erroMsg.isEmpty() ? Tr::tr("Unknown") : erroMsg);
-        addMessage(message, Utils::StdErrFormat);
-        qCDebug(iosCommon) << message;
-    }
-}
-
-void SimulatorOperationDialog::updateInputs()
-{
-    bool enableOk = m_futureWatchList.isEmpty();
-    m_buttonBox->button(QDialogButtonBox::Cancel)->setEnabled(!enableOk);
-    m_buttonBox->button(QDialogButtonBox::Ok)->setEnabled(enableOk);
-    if (enableOk) {
-        addMessage(Tr::tr("Done."), Utils::NormalMessageFormat);
-        m_progressBar->setMaximum(1); // Stop progress bar.
-    }
-}
-
-} // Ios::Internal
diff --git a/src/plugins/ios/simulatoroperationdialog.h b/src/plugins/ios/simulatoroperationdialog.h
deleted file mode 100644
index 46cbb3f787..0000000000
--- a/src/plugins/ios/simulatoroperationdialog.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (C) 2017 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#pragma once
-
-#include "simulatorcontrol.h"
-
-#include <utils/outputformat.h>
-
-#include <QDialog>
-#include <QFuture>
-#include <QList>
-
-QT_BEGIN_NAMESPACE
-class QDialogButtonBox;
-class QProgressBar;
-QT_END_NAMESPACE
-
-namespace Utils { class OutputFormatter; }
-
-namespace Ios::Internal {
-
-class SimulatorOperationDialog : public QDialog
-{
-
-public:
-    explicit SimulatorOperationDialog(QWidget *parent = nullptr);
-    ~SimulatorOperationDialog() override;
-
-public:
-    void addFutures(const QList<QFuture<void> > &futureList);
-    void addMessage(const QString &message, Utils::OutputFormat format);
-    void addMessage(const SimulatorInfo &siminfo,
-                    const SimulatorControl::Response &response,
-                    const QString &context);
-
-private:
-    void updateInputs();
-
-    Utils::OutputFormatter *m_formatter = nullptr;
-
-    QList<QFutureWatcher<void> *> m_futureWatchList;
-    QProgressBar *m_progressBar;
-    QDialogButtonBox *m_buttonBox;
-};
-
-} // Ios::Internal
diff --git a/src/plugins/languageclient/CMakeLists.txt b/src/plugins/languageclient/CMakeLists.txt
index e098168a1c..b9a36e9c50 100644
--- a/src/plugins/languageclient/CMakeLists.txt
+++ b/src/plugins/languageclient/CMakeLists.txt
@@ -36,3 +36,5 @@ add_qtc_plugin(LanguageClient
     semantichighlightsupport.cpp semantichighlightsupport.h
     snippet.cpp snippet.h
 )
+
+add_subdirectory(lualanguageclient)
diff --git a/src/plugins/languageclient/callandtypehierarchy.cpp b/src/plugins/languageclient/callandtypehierarchy.cpp
index 14e5935c6a..d759ea3534 100644
--- a/src/plugins/languageclient/callandtypehierarchy.cpp
+++ b/src/plugins/languageclient/callandtypehierarchy.cpp
@@ -311,7 +311,11 @@ private:
     virtual void sendRequest(Client *client, const TextDocumentPositionParams &params,
                              const Core::IDocument *document) = 0;
 
-    virtual void onItemDoubleClicked(const QModelIndex &index) { Q_UNUSED(index) }
+    void onItemDoubleClicked(const QModelIndex &index)
+    {
+        if (const auto link = index.data(LinkRole).value<Link>(); link.hasValidTarget())
+            updateHierarchyAtCursorPosition();
+    }
 
     void onItemActivated(const QModelIndex &index)
     {
@@ -392,12 +396,6 @@ private:
         client->sendMessage(request);
     }
 
-    void onItemDoubleClicked(const QModelIndex &index) override
-    {
-        if (const auto link = index.data(LinkRole).value<Link>(); link.hasValidTarget())
-            reload();
-    }
-
     void handlePrepareResponse(Client *client,
                                const PrepareTypeHierarchyRequest::Response &response)
     {
diff --git a/src/plugins/languageclient/client.cpp b/src/plugins/languageclient/client.cpp
index 5e3d240f8c..f56538d6cb 100644
--- a/src/plugins/languageclient/client.cpp
+++ b/src/plugins/languageclient/client.cpp
@@ -49,7 +49,6 @@
 #include <texteditor/tabsettings.h>
 #include <texteditor/textdocument.h>
 #include <texteditor/texteditor.h>
-#include <texteditor/texteditoractionhandler.h>
 #include <texteditor/texteditorsettings.h>
 
 #include <utils/appinfo.h>
@@ -904,7 +903,8 @@ void ClientPrivate::requestDocumentHighlightsNow(TextEditor::TextEditorWidget *w
             = m_serverCapabilities.documentHighlightProvider();
         if (!provider.has_value())
             return;
-        if (std::holds_alternative<bool>(*provider) && !std::get<bool>(*provider))
+        const auto boolvalue = std::get_if<bool>(&*provider);
+        if (boolvalue && !*boolvalue)
             return;
     }
 
@@ -936,7 +936,8 @@ void ClientPrivate::requestDocumentHighlightsNow(TextEditor::TextEditorWidget *w
             const QTextCharFormat &format =
                 widget->textDocument()->fontSettings().toTextCharFormat(TextEditor::C_OCCURRENCES);
             QTextDocument *document = widget->document();
-            for (const auto &highlight : std::get<QList<DocumentHighlight>>(*result)) {
+            const auto highlights = std::get_if<QList<DocumentHighlight>>(&*result);
+            for (const auto &highlight : *highlights) {
                 QTextEdit::ExtraSelection selection{widget->textCursor(), format};
                 const int &start = highlight.range().start().toPositionInDocument(document);
                 const int &end = highlight.range().end().toPositionInDocument(document);
@@ -1005,17 +1006,17 @@ void Client::activateEditor(Core::IEditor *editor)
         d->requestDocumentHighlights(widget);
         uint optionalActions = widget->optionalActions();
         if (symbolSupport().supportsFindUsages(widget->textDocument()))
-            optionalActions |= TextEditor::TextEditorActionHandler::FindUsage;
+            optionalActions |= TextEditor::OptionalActions::FindUsage;
         if (symbolSupport().supportsRename(widget->textDocument()))
-            optionalActions |= TextEditor::TextEditorActionHandler::RenameSymbol;
+            optionalActions |= TextEditor::OptionalActions::RenameSymbol;
         if (symbolSupport().supportsFindLink(widget->textDocument(), LinkTarget::SymbolDef))
-            optionalActions |= TextEditor::TextEditorActionHandler::FollowSymbolUnderCursor;
+            optionalActions |= TextEditor::OptionalActions::FollowSymbolUnderCursor;
         if (symbolSupport().supportsFindLink(widget->textDocument(), LinkTarget::SymbolTypeDef))
-            optionalActions |= TextEditor::TextEditorActionHandler::FollowTypeUnderCursor;
+            optionalActions |= TextEditor::OptionalActions::FollowTypeUnderCursor;
         if (supportsCallHierarchy(this, textEditor->document()))
-            optionalActions |= TextEditor::TextEditorActionHandler::CallHierarchy;
+            optionalActions |= TextEditor::OptionalActions::CallHierarchy;
         if (supportsTypeHierarchy(this, textEditor->document()))
-            optionalActions |= TextEditor::TextEditorActionHandler::TypeHierarchy;
+            optionalActions |= TextEditor::OptionalActions::TypeHierarchy;
         widget->setOptionalActions(optionalActions);
     }
 }
@@ -1436,7 +1437,8 @@ void Client::requestCodeActions(const CodeActionRequest &request)
     } else {
         std::variant<bool, CodeActionOptions> provider
             = d->m_serverCapabilities.codeActionProvider().value_or(false);
-        if (!(std::holds_alternative<CodeActionOptions>(provider) || std::get<bool>(provider)))
+        const auto boolvalue = std::get_if<bool>(&provider);
+        if (boolvalue && !*boolvalue)
             return;
     }
 
@@ -1662,8 +1664,8 @@ bool Client::supportsDocumentSymbols(const TextEditor::TextDocument *doc) const
         = capabilities().documentSymbolProvider();
     if (!provider.has_value())
         return false;
-    if (std::holds_alternative<bool>(*provider))
-        return std::get<bool>(*provider);
+    if (const auto boolvalue = std::get_if<bool>(&*provider))
+        return *boolvalue;
     return true;
 }
 
@@ -2234,10 +2236,10 @@ bool ClientPrivate::sendWorkspceFolderChanges() const
         if (auto folder = workspace->workspaceFolders()) {
             if (folder->supported().value_or(false)) {
                 // holds either the Id for deregistration or whether it is registered
-                auto notification = folder->changeNotifications().value_or(false);
-                return std::holds_alternative<QString>(notification)
-                       || (std::holds_alternative<bool>(notification)
-                           && std::get<bool>(notification));
+                const std::variant<QString, bool> notification
+                    = folder->changeNotifications().value_or(false);
+                const auto boolvalue = std::get_if<bool>(&notification);
+                return !boolvalue || *boolvalue;
             }
         }
     }
diff --git a/src/plugins/languageclient/clientrequest.cpp b/src/plugins/languageclient/clientrequest.cpp
index 4e221f1b9d..3125b25a72 100644
--- a/src/plugins/languageclient/clientrequest.cpp
+++ b/src/plugins/languageclient/clientrequest.cpp
@@ -29,7 +29,8 @@ bool ClientWorkspaceSymbolRequest::preStartCheck()
         = client()->capabilities().workspaceSymbolProvider();
     if (!capability.has_value())
         return false;
-    if (std::holds_alternative<bool>(*capability) && !std::get<bool>(*capability))
+    const auto boolvalue = std::get_if<bool>(&*capability);
+    if (boolvalue && !boolvalue)
         return false;
 
     return true;
diff --git a/src/plugins/languageclient/diagnosticmanager.cpp b/src/plugins/languageclient/diagnosticmanager.cpp
index dd58407f9e..7fc4efb6dd 100644
--- a/src/plugins/languageclient/diagnosticmanager.cpp
+++ b/src/plugins/languageclient/diagnosticmanager.cpp
@@ -4,11 +4,13 @@
 #include "diagnosticmanager.h"
 
 #include "client.h"
+#include "languageclientmanager.h"
 #include "languageclienttr.h"
 
 #include <coreplugin/editormanager/documentmodel.h>
 
 #include <projectexplorer/project.h>
+#include <projectexplorer/taskhub.h>
 
 #include <texteditor/fontsettings.h>
 #include <texteditor/textdocument.h>
@@ -23,8 +25,9 @@
 #include <QAction>
 
 using namespace LanguageServerProtocol;
-using namespace Utils;
+using namespace ProjectExplorer;
 using namespace TextEditor;
+using namespace Utils;
 
 namespace LanguageClient {
 
@@ -46,10 +49,56 @@ public:
     }
 };
 
+struct VersionedDiagnostics
+{
+    std::optional<int> version;
+    QList<LanguageServerProtocol::Diagnostic> diagnostics;
+};
+
+class Marks
+{
+public:
+    ~Marks() { qDeleteAll(marks); }
+    bool enabled = true;
+    QList<TextEditor::TextMark *> marks;
+};
+
+class DiagnosticManager::DiagnosticManagerPrivate
+{
+public:
+    DiagnosticManagerPrivate(Client *client)
+        : m_client(client)
+    {}
+
+    void showTasks(TextDocument *doc) {
+        if (!doc || m_client != LanguageClientManager::clientForDocument(doc))
+            return;
+        TaskHub::clearTasks(m_taskCategory);
+        const Tasks tasks = m_issuePaneEntries.value(doc->filePath());
+        for (const Task &t : tasks)
+            TaskHub::addTask(t);
+    }
+
+    QMap<FilePath, VersionedDiagnostics> m_diagnostics;
+    QMap<FilePath, Marks> m_marks;
+    Client *m_client;
+    QHash<FilePath, Tasks> m_issuePaneEntries;
+    Id m_extraSelectionsId = TextEditorWidget::CodeWarningsSelection;
+    bool m_forceCreateTasks = true;
+    Id m_taskCategory = Constants::TASK_CATEGORY_DIAGNOSTICS;
+};
+
 DiagnosticManager::DiagnosticManager(Client *client)
-    : m_client(client)
-    , m_extraSelectionsId(TextEditorWidget::CodeWarningsSelection)
+    : d(std::make_unique<DiagnosticManagerPrivate>(client))
 {
+    auto updateCurrentEditor = [this](Core::IEditor *editor) {
+        if (editor)
+            d->showTasks(qobject_cast<TextDocument *>(editor->document()));
+    };
+    connect(Core::EditorManager::instance(),
+            &Core::EditorManager::currentEditorChanged,
+            this,
+            updateCurrentEditor);
 }
 
 DiagnosticManager::~DiagnosticManager()
@@ -62,16 +111,19 @@ void DiagnosticManager::setDiagnostics(const FilePath &filePath,
                                        const std::optional<int> &version)
 {
     hideDiagnostics(filePath);
-    m_diagnostics[filePath] = {version, filteredDiagnostics(diagnostics)};
+    d->m_diagnostics[filePath] = {version, filteredDiagnostics(diagnostics)};
 }
 
 void DiagnosticManager::hideDiagnostics(const Utils::FilePath &filePath)
 {
     if (auto doc = TextDocument::textDocumentForFilePath(filePath)) {
+        if (doc == TextDocument::currentTextDocument())
+            TaskHub::clearTasks(d->m_taskCategory);
         for (BaseTextEditor *editor : BaseTextEditor::textEditorsForDocument(doc))
-            editor->editorWidget()->setExtraSelections(m_extraSelectionsId, {});
+            editor->editorWidget()->setExtraSelections(d->m_extraSelectionsId, {});
     }
-    m_marks.remove(filePath);
+    d->m_marks.remove(filePath);
+    d->m_issuePaneEntries.remove(filePath);
 }
 
 QList<Diagnostic> DiagnosticManager::filteredDiagnostics(const QList<Diagnostic> &diagnostics) const
@@ -82,7 +134,7 @@ QList<Diagnostic> DiagnosticManager::filteredDiagnostics(const QList<Diagnostic>
 void DiagnosticManager::disableDiagnostics(TextEditor::TextDocument *document)
 {
 
-    Marks &marks = m_marks[document->filePath()];
+    Marks &marks = d->m_marks[document->filePath()];
     if (!marks.enabled)
         return;
     for (TextEditor::TextMark *mark : marks.marks)
@@ -92,13 +144,14 @@ void DiagnosticManager::disableDiagnostics(TextEditor::TextDocument *document)
 
 void DiagnosticManager::showDiagnostics(const FilePath &filePath, int version)
 {
+    d->m_issuePaneEntries.remove(filePath);
     if (TextDocument *doc = TextDocument::textDocumentForFilePath(filePath)) {
         QList<QTextEdit::ExtraSelection> extraSelections;
-        const VersionedDiagnostics &versionedDiagnostics = m_diagnostics.value(filePath);
+        const VersionedDiagnostics &versionedDiagnostics = d->m_diagnostics.value(filePath);
         if (versionedDiagnostics.version.value_or(version) == version
             && !versionedDiagnostics.diagnostics.isEmpty()) {
-            Marks &marks = m_marks[filePath];
-            const bool isProjectFile = m_client->fileBelongsToProject(filePath);
+            Marks &marks = d->m_marks[filePath];
+            const bool isProjectFile = d->m_client->fileBelongsToProject(filePath);
             for (const Diagnostic &diagnostic : versionedDiagnostics.diagnostics) {
                 const QTextEdit::ExtraSelection selection
                     = createDiagnosticSelection(diagnostic, doc->document());
@@ -106,23 +159,33 @@ void DiagnosticManager::showDiagnostics(const FilePath &filePath, int version)
                     extraSelections << selection;
                 if (TextEditor::TextMark *mark = createTextMark(doc, diagnostic, isProjectFile))
                     marks.marks.append(mark);
+                if (std::optional<Task> task = createTask(doc, diagnostic, isProjectFile))
+                    d->m_issuePaneEntries[filePath].append(*task);
             }
             if (!marks.marks.isEmpty())
                 emit textMarkCreated(filePath);
         }
 
         for (BaseTextEditor *editor : BaseTextEditor::textEditorsForDocument(doc))
-            editor->editorWidget()->setExtraSelections(m_extraSelectionsId, extraSelections);
+            editor->editorWidget()->setExtraSelections(d->m_extraSelectionsId, extraSelections);
+
+        if (doc == TextDocument::currentTextDocument())
+            d->showTasks(doc);
     }
 }
 
+Client *DiagnosticManager::client() const
+{
+    return d->m_client;
+}
+
 TextEditor::TextMark *DiagnosticManager::createTextMark(TextDocument *doc,
                                                         const Diagnostic &diagnostic,
                                                         bool /*isProjectFile*/) const
 {
     static const QIcon icon = Icon::fromTheme("edit-copy");
     static const QString tooltip = Tr::tr("Copy to Clipboard");
-    auto mark = new TextMark(doc, diagnostic, m_client);
+    auto mark = new TextMark(doc, diagnostic, d->m_client);
     mark->setActionsProvider([text = diagnostic.message()] {
         QAction *action = new QAction();
         action->setIcon(icon);
@@ -135,6 +198,56 @@ TextEditor::TextMark *DiagnosticManager::createTextMark(TextDocument *doc,
     return mark;
 }
 
+std::optional<Task> DiagnosticManager::createTask(
+        TextDocument *doc,
+        const LanguageServerProtocol::Diagnostic &diagnostic,
+        bool isProjectFile) const
+{
+    if (!isProjectFile && !d->m_forceCreateTasks)
+        return {};
+
+    Task::TaskType taskType = Task::TaskType::Unknown;
+    QIcon icon;
+
+    if (const std::optional<DiagnosticSeverity> severity = diagnostic.severity()) {
+        switch (*severity) {
+        case DiagnosticSeverity::Error:
+            taskType = Task::TaskType::Error;
+            icon = Icons::CODEMODEL_ERROR.icon();
+            break;
+        case DiagnosticSeverity::Warning:
+            taskType = Task::TaskType::Warning;
+            icon = Icons::CODEMODEL_WARNING.icon();
+            break;
+        default:
+            break;
+        }
+    }
+
+    return Task(taskType,
+                taskText(diagnostic),
+                doc->filePath(),
+                diagnostic.range().start().line(),
+                d->m_taskCategory,
+                icon,
+                Task::NoOptions);
+}
+
+QString DiagnosticManager::taskText(const LanguageServerProtocol::Diagnostic &diagnostic) const
+{
+    return diagnostic.message();
+}
+
+void DiagnosticManager::setTaskCategory(const Utils::Id &taskCategory)
+{
+    d->m_taskCategory = taskCategory;
+}
+
+void DiagnosticManager::setForceCreateTasks(bool forceCreateTasks)
+{
+    d->m_forceCreateTasks = forceCreateTasks;
+}
+
 QTextEdit::ExtraSelection DiagnosticManager::createDiagnosticSelection(
     const LanguageServerProtocol::Diagnostic &diagnostic, QTextDocument *textDocument) const
 {
@@ -153,13 +266,13 @@ QTextEdit::ExtraSelection DiagnosticManager::createDiagnosticSelection(
 void DiagnosticManager::setExtraSelectionsId(const Utils::Id &extraSelectionsId)
 {
     // this function should be called before any diagnostics are handled
-    QTC_CHECK(m_diagnostics.isEmpty());
-    m_extraSelectionsId = extraSelectionsId;
+    QTC_CHECK(d->m_diagnostics.isEmpty());
+    d->m_extraSelectionsId = extraSelectionsId;
 }
 
 void DiagnosticManager::forAllMarks(std::function<void (TextEditor::TextMark *)> func)
 {
-    for (const Marks &marks : std::as_const(m_marks)) {
+    for (const Marks &marks : std::as_const(d->m_marks)) {
         for (TextEditor::TextMark *mark : marks.marks)
             func(mark);
     }
@@ -167,18 +280,18 @@ void DiagnosticManager::forAllMarks(std::function<void (TextEditor::TextMark *)>
 
 void DiagnosticManager::clearDiagnostics()
 {
-    for (const Utils::FilePath &path : m_diagnostics.keys())
+    for (const Utils::FilePath &path : d->m_diagnostics.keys())
         hideDiagnostics(path);
-    m_diagnostics.clear();
-    QTC_ASSERT(m_marks.isEmpty(), m_marks.clear());
+    d->m_diagnostics.clear();
+    QTC_ASSERT(d->m_marks.isEmpty(), d->m_marks.clear());
 }
 
 QList<Diagnostic> DiagnosticManager::diagnosticsAt(const FilePath &filePath,
                                                    const QTextCursor &cursor) const
 {
-    const int documentRevision = m_client->documentVersion(filePath);
-    auto it = m_diagnostics.find(filePath);
-    if (it == m_diagnostics.end())
+    const int documentRevision = d->m_client->documentVersion(filePath);
+    auto it = d->m_diagnostics.find(filePath);
+    if (it == d->m_diagnostics.end())
         return {};
     if (documentRevision != it->version.value_or(documentRevision))
         return {};
@@ -193,10 +306,10 @@ bool DiagnosticManager::hasDiagnostic(const FilePath &filePath,
 {
     if (!doc)
         return false;
-    const auto it = m_diagnostics.find(filePath);
-    if (it == m_diagnostics.end())
+    const auto it = d->m_diagnostics.find(filePath);
+    if (it == d->m_diagnostics.end())
         return {};
-    const int revision = m_client->documentVersion(filePath);
+    const int revision = d->m_client->documentVersion(filePath);
     if (revision != it->version.value_or(revision))
         return false;
     return it->diagnostics.contains(diag);
@@ -205,18 +318,13 @@ bool DiagnosticManager::hasDiagnostic(const FilePath &filePath,
 bool DiagnosticManager::hasDiagnostics(const TextDocument *doc) const
 {
     const FilePath docPath = doc->filePath();
-    const auto it = m_diagnostics.find(docPath);
-    if (it == m_diagnostics.end())
+    const auto it = d->m_diagnostics.find(docPath);
+    if (it == d->m_diagnostics.end())
         return {};
-    const int revision = m_client->documentVersion(docPath);
+    const int revision = d->m_client->documentVersion(docPath);
     if (revision != it->version.value_or(revision))
         return false;
     return !it->diagnostics.isEmpty();
 }
 
-DiagnosticManager::Marks::~Marks()
-{
-    qDeleteAll(marks);
-}
-
 } // namespace LanguageClient
diff --git a/src/plugins/languageclient/diagnosticmanager.h b/src/plugins/languageclient/diagnosticmanager.h
index a4ad23e1b9..cb3798be13 100644
--- a/src/plugins/languageclient/diagnosticmanager.h
+++ b/src/plugins/languageclient/diagnosticmanager.h
@@ -9,7 +9,6 @@
 
 #include <utils/id.h>
 
-#include <QMap>
 #include <QTextEdit>
 
 #include <functional>
@@ -19,6 +18,8 @@ class TextDocument;
 class TextMark;
 }
 
+namespace ProjectExplorer { class Task; }
+
 namespace LanguageClient {
 
 class Client;
@@ -54,34 +55,30 @@ signals:
     void textMarkCreated(const Utils::FilePath &path);
 
 protected:
-    Client *client() const { return m_client; }
+    Client *client() const;
     virtual TextEditor::TextMark *createTextMark(TextEditor::TextDocument *doc,
                                                  const LanguageServerProtocol::Diagnostic &diagnostic,
                                                  bool isProjectFile) const;
+
+    virtual std::optional<ProjectExplorer::Task> createTask(
+        TextEditor::TextDocument *doc,
+        const LanguageServerProtocol::Diagnostic &diagnostic,
+        bool isProjectFile) const;
+    virtual QString taskText(const LanguageServerProtocol::Diagnostic &diagnostic) const;
+    void setTaskCategory(const Utils::Id &taskCategory);
+
+    // enables task creations for diagnostics outside of the clients project (default: on)
+    void setForceCreateTasks(bool forceCreateTasks);
+
     virtual QTextEdit::ExtraSelection createDiagnosticSelection(
         const LanguageServerProtocol::Diagnostic &diagnostic, QTextDocument *textDocument) const;
 
     void setExtraSelectionsId(const Utils::Id &extraSelectionsId);
 
     void forAllMarks(std::function<void (TextEditor::TextMark *)> func);
-
 private:
-    struct VersionedDiagnostics
-    {
-        std::optional<int> version;
-        QList<LanguageServerProtocol::Diagnostic> diagnostics;
-    };
-    QMap<Utils::FilePath, VersionedDiagnostics> m_diagnostics;
-    class Marks
-    {
-    public:
-        ~Marks();
-        bool enabled = true;
-        QList<TextEditor::TextMark *> marks;
-    };
-    QMap<Utils::FilePath, Marks> m_marks;
-    Client *m_client;
-    Utils::Id m_extraSelectionsId;
+    class DiagnosticManagerPrivate;
+    std::unique_ptr<DiagnosticManagerPrivate> d;
 };
 
 } // namespace LanguageClient
diff --git a/src/plugins/languageclient/languageclient_global.h b/src/plugins/languageclient/languageclient_global.h
index 2abb395d86..cdcd1fb5dd 100644
--- a/src/plugins/languageclient/languageclient_global.h
+++ b/src/plugins/languageclient/languageclient_global.h
@@ -41,6 +41,7 @@ const char LANGUAGECLIENT_WORKSPACE_METHOD_FILTER_DESCRIPTION[]
                         "Locates functions and methods in the language server workspace.");
 
 const char CALL_HIERARCHY_FACTORY_ID[] = "LanguageClient.CallHierarchy";
+const char TASK_CATEGORY_DIAGNOSTICS[] = "LanguageClient.DiagnosticTask";
 
 } // namespace Constants
 } // namespace LanguageClient
diff --git a/src/plugins/languageclient/languageclientcompletionassist.cpp b/src/plugins/languageclient/languageclientcompletionassist.cpp
index d6a2904fa4..7486ca102c 100644
--- a/src/plugins/languageclient/languageclientcompletionassist.cpp
+++ b/src/plugins/languageclient/languageclientcompletionassist.cpp
@@ -123,11 +123,11 @@ QString LanguageClientCompletionItem::detail() const
     if (auto _doc = m_item.documentation()) {
         auto doc = *_doc;
         QString detailDocText;
-        if (std::holds_alternative<QString>(doc)) {
-            detailDocText = std::get<QString>(doc);
-        } else if (std::holds_alternative<MarkupContent>(doc)) {
+        if (const auto s = std::get_if<QString>(&doc)) {
+            detailDocText = *s;
+        } else if (const auto m = std::get_if<MarkupContent>(&doc)) {
             // TODO markdown parser?
-            detailDocText = std::get<MarkupContent>(doc).content();
+            detailDocText = m->content();
         }
         if (!detailDocText.isEmpty())
             return detailDocText;
@@ -495,12 +495,10 @@ void LanguageClientCompletionAssistProcessor::handleCompletionResponse(
     }
 
     QList<CompletionItem> items;
-    if (std::holds_alternative<CompletionList>(*result)) {
-        const auto &list = std::get<CompletionList>(*result);
-        items = list.items().value_or(QList<CompletionItem>());
-    } else if (std::holds_alternative<QList<CompletionItem>>(*result)) {
-        items = std::get<QList<CompletionItem>>(*result);
-    }
+    if (const auto list = std::get_if<CompletionList>(&*result))
+        items = list->items().value_or(QList<CompletionItem>());
+    else if (const auto l = std::get_if<QList<CompletionItem>>(&*result))
+        items = *l;
     auto proposalItems = generateCompletionItems(items);
     if (!m_snippetsGroup.isEmpty()) {
         proposalItems << TextEditor::SnippetAssistCollector(m_snippetsGroup,
diff --git a/src/plugins/languageclient/languageclientformatter.cpp b/src/plugins/languageclient/languageclientformatter.cpp
index 52f35856af..acebc3184b 100644
--- a/src/plugins/languageclient/languageclientformatter.cpp
+++ b/src/plugins/languageclient/languageclientformatter.cpp
@@ -69,7 +69,8 @@ QFutureWatcher<ChangeSet> *LanguageClientFormatter::format(
             = m_client->capabilities().documentRangeFormattingProvider();
         if (!provider.has_value())
             return nullptr;
-        if (std::holds_alternative<bool>(*provider) && !std::get<bool>(*provider))
+        const auto boolvalue = std::get_if<bool>(&*provider);
+        if (boolvalue && !*boolvalue)
             return nullptr;
     }
     DocumentRangeFormattingParams params;
diff --git a/src/plugins/languageclient/languageclienthoverhandler.cpp b/src/plugins/languageclient/languageclienthoverhandler.cpp
index e878a62749..429c89e511 100644
--- a/src/plugins/languageclient/languageclienthoverhandler.cpp
+++ b/src/plugins/languageclient/languageclienthoverhandler.cpp
@@ -87,9 +87,8 @@ void HoverHandler::identifyMatch(TextEditor::TextEditorWidget *editorWidget,
 
     const std::optional<std::variant<bool, WorkDoneProgressOptions>> &provider
         = m_client->capabilities().hoverProvider();
-    bool sendMessage = provider.has_value();
-    if (sendMessage && std::holds_alternative<bool>(*provider))
-        sendMessage = std::get<bool>(*provider);
+    const bool *boolvalue = provider.has_value() ? std::get_if<bool>(&*provider) : nullptr;
+    bool sendMessage = provider.has_value() && (!boolvalue || *boolvalue);
     if (std::optional<bool> registered = m_client->dynamicCapabilities().isRegistered(
             HoverRequest::methodName)) {
         sendMessage = *registered;
diff --git a/src/plugins/languageclient/languageclientoutline.cpp b/src/plugins/languageclient/languageclientoutline.cpp
index 8c45513ce9..30dea87688 100644
--- a/src/plugins/languageclient/languageclientoutline.cpp
+++ b/src/plugins/languageclient/languageclientoutline.cpp
@@ -228,10 +228,10 @@ void LanguageClientOutlineWidget::handleResponse(const DocumentUri &uri,
 {
     if (uri != m_uri)
         return;
-    if (std::holds_alternative<QList<SymbolInformation>>(result))
-        m_model.setInfo(std::get<QList<SymbolInformation>>(result));
-    else if (std::holds_alternative<QList<DocumentSymbol>>(result))
-        m_model.setInfo(std::get<QList<DocumentSymbol>>(result));
+    if (const auto i = std::get_if<QList<SymbolInformation>>(&result))
+        m_model.setInfo(*i);
+    else if (const auto s = std::get_if<QList<DocumentSymbol>>(&result))
+        m_model.setInfo(*s);
     else
         m_model.clear();
 
@@ -369,10 +369,10 @@ void OutlineComboBox::updateModel(const DocumentUri &resultUri, const DocumentSy
 {
     if (m_uri != resultUri)
         return;
-    if (std::holds_alternative<QList<SymbolInformation>>(result))
-        m_model.setInfo(std::get<QList<SymbolInformation>>(result));
-    else if (std::holds_alternative<QList<DocumentSymbol>>(result))
-        m_model.setInfo(std::get<QList<DocumentSymbol>>(result));
+    if (const auto i = std::get_if<QList<SymbolInformation>>(&result))
+        m_model.setInfo(*i);
+    else if (const auto s = std::get_if<QList<DocumentSymbol>>(&result))
+        m_model.setInfo(*s);
     else
         m_model.clear();
 
diff --git a/src/plugins/languageclient/languageclientplugin.cpp b/src/plugins/languageclient/languageclientplugin.cpp
index 985f00da1e..a466a5b300 100644
--- a/src/plugins/languageclient/languageclientplugin.cpp
+++ b/src/plugins/languageclient/languageclientplugin.cpp
@@ -14,6 +14,8 @@
 #include <extensionsystem/iplugin.h>
 #include <extensionsystem/pluginmanager.h>
 
+#include <projectexplorer/taskhub.h>
+
 #include <QAction>
 #include <QMenu>
 
@@ -59,6 +61,11 @@ void LanguageClientPlugin::initialize()
     inspectAction.setText(Tr::tr("Inspect Language Clients..."));
     inspectAction.addToContainer(Core::Constants::M_TOOLS_DEBUG);
     inspectAction.addOnTriggered(this, &LanguageClientManager::showInspector);
+
+    ProjectExplorer::TaskHub::addCategory(
+                {Constants::TASK_CATEGORY_DIAGNOSTICS,
+                 Tr::tr("Language Server Diagnostics"),
+                 Tr::tr("Issues provided by the Language Server in the current document.")});
 }
 
 void LanguageClientPlugin::extensionsInitialized()
diff --git a/src/plugins/languageclient/languageclientsettings.cpp b/src/plugins/languageclient/languageclientsettings.cpp
index 38c5a46159..b994da6096 100644
--- a/src/plugins/languageclient/languageclientsettings.cpp
+++ b/src/plugins/languageclient/languageclientsettings.cpp
@@ -25,6 +25,7 @@
 #include <utils/delegates.h>
 #include <utils/fancylineedit.h>
 #include <utils/jsontreeitem.h>
+#include <utils/layoutbuilder.h>
 #include <utils/macroexpander.h>
 #include <utils/mimeconstants.h>
 #include <utils/stringutils.h>
@@ -184,6 +185,8 @@ LanguageClientSettingsPageWidget::LanguageClientSettingsPageWidget(LanguageClien
     auto addMenu = new QMenu(this);
     addMenu->clear();
     for (const ClientType &type : clientTypes()) {
+        if (!type.userAddable)
+            continue;
         auto action = new QAction(type.name, this);
         connect(action, &QAction::triggered, this, [this, id = type.id]() { addItem(id); });
         addMenu->addAction(action);
@@ -603,6 +606,27 @@ void LanguageClientSettings::init()
     LanguageClientManager::applySettings();
 }
 
+QList<Utils::Store> LanguageClientSettings::storesBySettingsType(Utils::Id settingsTypeId)
+{
+    QList<Utils::Store> result;
+
+    QtcSettings *settingsIn = Core::ICore::settings();
+    settingsIn->beginGroup(settingsGroupKey);
+
+    for (const QVariantList &varList :
+         {settingsIn->value(clientsKey).toList(), settingsIn->value(typedClientsKey).toList()}) {
+        for (const QVariant &var : varList) {
+            const Store store = storeFromVariant(var);
+            if (settingsTypeId == Id::fromSetting(store.value(typeIdKey)))
+                result << store;
+        }
+    }
+
+    settingsIn->endGroup();
+
+    return result;
+}
+
 QList<BaseSettings *> LanguageClientSettings::fromSettings(QtcSettings *settingsIn)
 {
     settingsIn->beginGroup(settingsGroupKey);
@@ -664,10 +688,19 @@ void LanguageClientSettings::toSettings(QtcSettings *settings,
     auto isStdioSetting = Utils::equal(&BaseSettings::m_settingsTypeId,
                                        Utils::Id(Constants::LANGUAGECLIENT_STDIO_SETTINGS_ID));
     auto [stdioSettings, typedSettings] = Utils::partition(languageClientSettings, isStdioSetting);
-    if (!stdioSettings.isEmpty())
-        settings->setValue(clientsKey, transform(stdioSettings));
-    if (!typedSettings.isEmpty())
-        settings->setValue(typedClientsKey, transform(typedSettings));
+    settings->setValue(clientsKey, transform(stdioSettings));
+
+    // write back typed settings for unregistered client types
+    QVariantList typedSettingsVariant;
+    for (const QVariant &var : settings->value(typedClientsKey).toList()) {
+        const Store map = storeFromVariant(var);
+        Id typeId = Id::fromSetting(map.value(typeIdKey));
+        if (typeId.isValid() && !clientTypes().contains(typeId))
+            typedSettingsVariant << var;
+    }
+
+    typedSettingsVariant << transform(typedSettings);
+    settings->setValue(typedClientsKey, typedSettingsVariant);
     settings->endGroup();
 }
 
@@ -784,71 +817,70 @@ static QString startupBehaviorString(BaseSettings::StartBehavior behavior)
     return {};
 }
 
-BaseSettingsWidget::BaseSettingsWidget(const BaseSettings *settings, QWidget *parent)
+BaseSettingsWidget::BaseSettingsWidget(
+    const BaseSettings *settings, QWidget *parent, Layouting::LayoutItems additionalItems)
     : QWidget(parent)
     , m_name(new QLineEdit(settings->m_name, this))
     , m_mimeTypes(new QLabel(settings->m_languageFilter.mimeTypes.join(filterSeparator), this))
-    , m_filePattern(new QLineEdit(settings->m_languageFilter.filePattern.join(filterSeparator), this))
+    , m_filePattern(
+          new QLineEdit(settings->m_languageFilter.filePattern.join(filterSeparator), this))
     , m_startupBehavior(new QComboBox)
     , m_initializationOptions(new Utils::FancyLineEdit(this))
 {
-    int row = 0;
-    auto *mainLayout = new QGridLayout;
+    using namespace Layouting;
 
-    mainLayout->addWidget(new QLabel(Tr::tr("Name:")), row, 0);
-    mainLayout->addWidget(m_name, row, 1);
     auto chooser = new Utils::VariableChooser(this);
     chooser->addSupportedWidget(m_name);
+    chooser->addSupportedWidget(m_initializationOptions);
 
-    mainLayout->addWidget(new QLabel(Tr::tr("Language:")), ++row, 0);
-    auto mimeLayout = new QHBoxLayout;
-    mimeLayout->addWidget(m_mimeTypes);
-    mimeLayout->addStretch();
     auto addMimeTypeButton = new QPushButton(Tr::tr("Set MIME Types..."), this);
-    mimeLayout->addWidget(addMimeTypeButton);
-    mainLayout->addLayout(mimeLayout, row, 1);
+    connect(
+        addMimeTypeButton, &QPushButton::pressed, this, &BaseSettingsWidget::showAddMimeTypeDialog);
+
     m_filePattern->setPlaceholderText(Tr::tr("File pattern"));
     m_filePattern->setToolTip(
         Tr::tr("List of file patterns.\nExample: *.cpp%1*.h").arg(filterSeparator));
-    mainLayout->addWidget(m_filePattern, ++row, 1);
 
-    mainLayout->addWidget(new QLabel(Tr::tr("Startup behavior:")), ++row, 0);
     for (int behavior = 0; behavior < BaseSettings::LastSentinel ; ++behavior)
         m_startupBehavior->addItem(startupBehaviorString(BaseSettings::StartBehavior(behavior)));
     m_startupBehavior->setCurrentIndex(settings->m_startBehavior);
-    mainLayout->addWidget(m_startupBehavior, row, 1);
 
+    m_initializationOptions->setValidationFunction(
+        [](Utils::FancyLineEdit *edit, QString *errorMessage) {
+            const QString value = Utils::globalMacroExpander()->expand(edit->text());
 
-    connect(addMimeTypeButton, &QPushButton::pressed,
-            this, &BaseSettingsWidget::showAddMimeTypeDialog);
+            if (value.isEmpty())
+                return true;
 
-    mainLayout->addWidget(new QLabel(Tr::tr("Initialization options:")), ++row, 0);
-    mainLayout->addWidget(m_initializationOptions, row, 1);
-    chooser->addSupportedWidget(m_initializationOptions);
-    m_initializationOptions->setValidationFunction([](Utils::FancyLineEdit *edit, QString *errorMessage) {
-        const QString value = Utils::globalMacroExpander()->expand(edit->text());
+            QJsonParseError parseInfo;
+            const QJsonDocument json = QJsonDocument::fromJson(value.toUtf8(), &parseInfo);
 
-        if (value.isEmpty())
+            if (json.isNull()) {
+                if (errorMessage)
+                    *errorMessage = Tr::tr("Failed to parse JSON at %1: %2")
+                                        .arg(parseInfo.offset)
+                                        .arg(parseInfo.errorString());
+                return false;
+            }
             return true;
-
-        QJsonParseError parseInfo;
-        const QJsonDocument json = QJsonDocument::fromJson(value.toUtf8(), &parseInfo);
-
-        if (json.isNull()) {
-            if (errorMessage)
-                *errorMessage = Tr::tr("Failed to parse JSON at %1: %2")
-                    .arg(parseInfo.offset)
-                    .arg(parseInfo.errorString());
-            return false;
-        }
-        return true;
-    });
+        });
     m_initializationOptions->setText(settings->m_initializationOptions);
     m_initializationOptions->setPlaceholderText(Tr::tr("Language server-specific JSON to pass via "
                                                    "\"initializationOptions\" field of \"initialize\" "
                                                    "request."));
 
-    setLayout(mainLayout);
+    // clang-format off
+    auto form = Form {
+        Tr::tr("Name:"), m_name, br,
+        Tr::tr("Language:"), Row { m_mimeTypes, st, addMimeTypeButton }, br,
+        Tr::tr("File pattern:"), m_filePattern, br,
+        Tr::tr("Startup behavior:"), m_startupBehavior, br,
+        Tr::tr("Initialization options:"), m_initializationOptions, br
+
+    };
+    form.addItems(additionalItems);
+    form.attachTo(this);
+    // clang-format on
 }
 
 QString BaseSettingsWidget::name() const
@@ -969,15 +1001,17 @@ StdIOSettingsWidget::StdIOSettingsWidget(const StdIOSettings *settings, QWidget
     , m_executable(new Utils::PathChooser(this))
     , m_arguments(new QLineEdit(settings->m_arguments, this))
 {
-    auto mainLayout = qobject_cast<QGridLayout *>(layout());
-    QTC_ASSERT(mainLayout, return);
-    const int baseRows = mainLayout->rowCount();
-    mainLayout->addWidget(new QLabel(Tr::tr("Executable:")), baseRows, 0);
-    mainLayout->addWidget(m_executable, baseRows, 1);
-    mainLayout->addWidget(new QLabel(Tr::tr("Arguments:")), baseRows + 1, 0);
+    using namespace Layouting;
+
     m_executable->setExpectedKind(Utils::PathChooser::ExistingCommand);
     m_executable->setFilePath(settings->m_executable);
-    mainLayout->addWidget(m_arguments, baseRows + 1, 1);
+
+    auto mainLayout = qobject_cast<QFormLayout *>(layout());
+    QTC_ASSERT(mainLayout, return);
+    int row = mainLayout->rowCount();
+
+    mainLayout->insertRow(row++, Tr::tr("Executable:"), m_executable);
+    mainLayout->insertRow(row++, Tr::tr("Arguments:"), m_arguments);
 
     auto chooser = new Utils::VariableChooser(this);
     chooser->addSupportedWidget(m_arguments);
diff --git a/src/plugins/languageclient/languageclientsettings.h b/src/plugins/languageclient/languageclientsettings.h
index 867a0deb2e..ad2f01ac74 100644
--- a/src/plugins/languageclient/languageclientsettings.h
+++ b/src/plugins/languageclient/languageclientsettings.h
@@ -7,6 +7,8 @@
 
 #include <coreplugin/dialogs/ioptionspage.h>
 
+#include <utils/layoutbuilder.h>
+
 #include <QAbstractItemModel>
 #include <QCoreApplication>
 #include <QJsonObject>
@@ -127,6 +129,7 @@ struct ClientType {
     QString name;
     using SettingsGenerator = std::function<BaseSettings*()>;
     SettingsGenerator generator = nullptr;
+    bool userAddable = true;
 };
 
 class LANGUAGECLIENT_EXPORT LanguageClientSettings
@@ -137,6 +140,8 @@ public:
     static QList<BaseSettings *> pageSettings();
     static QList<BaseSettings *> changedSettings();
 
+    static QList<Utils::Store> storesBySettingsType(Utils::Id settingsTypeId);
+
     /**
      * must be called before the delayed initialize phase
      * otherwise the settings are not loaded correctly
@@ -154,7 +159,11 @@ class LANGUAGECLIENT_EXPORT BaseSettingsWidget : public QWidget
 {
     Q_OBJECT
 public:
-    explicit BaseSettingsWidget(const BaseSettings* settings, QWidget *parent = nullptr);
+    explicit BaseSettingsWidget(
+        const BaseSettings *settings,
+        QWidget *parent = nullptr,
+        Layouting::LayoutItems additionalItems = {});
+
     ~BaseSettingsWidget() override = default;
 
     QString name() const;
diff --git a/src/plugins/languageclient/languageclientsymbolsupport.cpp b/src/plugins/languageclient/languageclientsymbolsupport.cpp
index 3a9a1b0970..71b41bbcbf 100644
--- a/src/plugins/languageclient/languageclientsymbolsupport.cpp
+++ b/src/plugins/languageclient/languageclientsymbolsupport.cpp
@@ -100,9 +100,8 @@ static MessageId sendTextDocumentPositionParamsRequest(Client *client,
             sendMessage = supportedFile;
     } else {
         const auto provider = std::mem_fn(member)(serverCapability);
-        sendMessage = provider.has_value();
-        if (sendMessage && std::holds_alternative<bool>(*provider))
-            sendMessage = std::get<bool>(*provider);
+        const bool *boolvalue = provider.has_value() ? std::get_if<bool>(&*provider) : nullptr;
+        sendMessage = provider.has_value() && (!boolvalue || *boolvalue);
     }
     if (sendMessage) {
         client->sendMessage(request);
@@ -191,9 +190,8 @@ bool SymbolSupport::supportsFindLink(TextEditor::TextDocument *document, LinkTar
         else
             supported = m_client->isSupportedUri(uri);
     } else {
-        supported = provider.has_value();
-        if (supported && std::holds_alternative<bool>(*provider))
-            supported = std::get<bool>(*provider);
+        const bool *boolvalue = provider.has_value() ? std::get_if<bool>(&*provider) : nullptr;
+        supported = provider.has_value() && (!boolvalue || *boolvalue);
     }
     return supported;
 }
@@ -259,8 +257,8 @@ bool SymbolSupport::supportsFindUsages(TextEditor::TextDocument *document) const
             return false;
         }
     } else if (auto referencesProvider = m_client->capabilities().referencesProvider()) {
-        if (std::holds_alternative<bool>(*referencesProvider)) {
-            if (!std::get<bool>(*referencesProvider))
+        if (const auto b = std::get_if<bool>(&*referencesProvider)) {
+            if (!*b)
                 return false;
         }
     } else {
@@ -300,8 +298,9 @@ QStringList SymbolSupport::getFileContents(const Utils::FilePath &filePath)
 
 Utils::SearchResultItems generateSearchResultItems(
     const QMap<Utils::FilePath, QList<ItemData>> &rangesInDocument,
-    Core::SearchResult *search = nullptr,
-    bool limitToProjects = false)
+    Client *client,
+    Core::SearchResult *search,
+    bool limitToProjects)
 {
     Utils::SearchResultItems result;
     const bool renaming = search && search->supportsReplace();
@@ -321,8 +320,15 @@ Utils::SearchResultItems generateSearchResultItems(
         if (renaming && limitToProjects) {
             const ProjectExplorer::Node * const node
                 = ProjectExplorer::ProjectTree::nodeForFile(filePath);
-            item.setSelectForReplacement(node && !node->isGenerated());
-            if (node
+            if (node) {
+                item.setSelectForReplacement(!node->isGenerated());
+            } else {
+                item.setSelectForReplacement(
+                    client->project()
+                    && ProjectExplorer::ProjectManager::isInProjectSourceDir(
+                        filePath, *client->project()));
+            }
+            if (item.selectForReplacement()
                 && filePath.baseName().compare(oldSymbolName, Qt::CaseInsensitive) == 0) {
                 fileRenameCandidates << filePath;
             }
@@ -362,17 +368,17 @@ void filterFileAliases(ItemDataPerPath &itemDataPerPath)
 }
 
 Utils::SearchResultItems generateSearchResultItems(
-    const LanguageClientArray<Location> &locations, const DocumentUri::PathMapper &pathMapper)
+    const LanguageClientArray<Location> &locations, Client *client)
 {
     if (locations.isNull())
         return {};
     ItemDataPerPath rangesInDocument;
     for (const Location &location : locations.toList()) {
-        rangesInDocument[location.uri().toFilePath(pathMapper)]
+        rangesInDocument[location.uri().toFilePath(client->hostPathMapper())]
             << ItemData{SymbolSupport::convertRange(location.range()), {}};
     }
     filterFileAliases(rangesInDocument);
-    return generateSearchResultItems(rangesInDocument);
+    return generateSearchResultItems(rangesInDocument, client, nullptr, false);
 }
 
 void SymbolSupport::handleFindReferencesResponse(const FindReferencesRequest::Response &response,
@@ -388,7 +394,7 @@ void SymbolSupport::handleFindReferencesResponse(const FindReferencesRequest::Re
     if (result) {
         Core::SearchResult *search = Core::SearchResultWindow::instance()->startNewSearch(
             Tr::tr("Find References with %1 for:").arg(m_client->name()), "", wordUnderCursor);
-        search->addResults(generateSearchResultItems(*result, m_client->hostPathMapper()),
+        search->addResults(generateSearchResultItems(*result, m_client),
                            Core::SearchResult::AddOrdered);
         connect(search, &Core::SearchResult::activated, [](const Utils::SearchResultItem &item) {
             Core::EditorManager::openEditorAtSearchResult(item);
@@ -439,13 +445,11 @@ static bool supportsRename(Client *client,
         }
     }
     if (auto renameProvider = client->capabilities().renameProvider()) {
-        if (std::holds_alternative<bool>(*renameProvider)) {
-            if (!std::get<bool>(*renameProvider))
+        if (const auto b = std::get_if<bool>(&*renameProvider)) {
+            if (!*b)
                 return false;
-        } else if (std::holds_alternative<ServerCapabilities::RenameOptions>(*renameProvider)) {
-            prepareSupported = std::get<ServerCapabilities::RenameOptions>(*renameProvider)
-                                   .prepareProvider()
-                                   .value_or(false);
+        } else if (const auto opt = std::get_if<ServerCapabilities::RenameOptions>(&*renameProvider)) {
+            prepareSupported = opt->prepareProvider().value_or(false);
         }
     } else {
         return false;
@@ -516,19 +520,17 @@ void SymbolSupport::requestPrepareRename(TextEditor::TextDocument *document,
 
         const std::optional<PrepareRenameResult> &result = response.result();
         if (result.has_value()) {
-            if (std::holds_alternative<PlaceHolderResult>(*result)) {
-                auto placeHolderResult = std::get<PlaceHolderResult>(*result);
-                startRenameSymbol(params,
-                                  placeholder.isEmpty() ? placeHolderResult.placeHolder()
-                                                        : placeholder,
-                                  oldSymbolName,
-                                  callback,
-                                  preferLowerCaseFileNames);
-            } else if (std::holds_alternative<Range>(*result)) {
-                auto range = std::get<Range>(*result);
+            if (const auto placeHolderResult = std::get_if<PlaceHolderResult>(&*result)) {
+                startRenameSymbol(
+                    params,
+                    placeholder.isEmpty() ? placeHolderResult->placeHolder() : placeholder,
+                    oldSymbolName,
+                    callback,
+                    preferLowerCaseFileNames);
+            } else if (const auto range = std::get_if<Range>(&*result)) {
                 if (document) {
-                    const int start = range.start().toPositionInDocument(document->document());
-                    const int end = range.end().toPositionInDocument(document->document());
+                    const int start = range->start().toPositionInDocument(document->document());
+                    const int end = range->end().toPositionInDocument(document->document());
                     const QString reportedSymbolName = document->textAt(start, end - start);
                     startRenameSymbol(params,
                                       derivePlaceholder(reportedSymbolName, placeholder),
@@ -563,9 +565,9 @@ void SymbolSupport::requestRename(const TextDocumentPositionParams &positionPara
 }
 
 Utils::SearchResultItems generateReplaceItems(const WorkspaceEdit &edits,
+                                              Client *client,
                                               Core::SearchResult *search,
-                                              bool limitToProjects,
-                                              const DocumentUri::PathMapper &pathMapper)
+                                              bool limitToProjects)
 {
     Utils::SearchResultItems items;
     auto convertEdits = [](const QList<TextEdit> &edits) {
@@ -575,30 +577,27 @@ Utils::SearchResultItems generateReplaceItems(const WorkspaceEdit &edits,
     };
     ItemDataPerPath rangesInDocument;
     auto documentChanges = edits.documentChanges().value_or(QList<DocumentChange>());
+    const DocumentUri::PathMapper &pathMapper = client->hostPathMapper();
     if (!documentChanges.isEmpty()) {
         for (const DocumentChange &documentChange : std::as_const(documentChanges)) {
-            if (std::holds_alternative<TextDocumentEdit>(documentChange)) {
-                const TextDocumentEdit edit = std::get<TextDocumentEdit>(documentChange);
-                rangesInDocument[edit.textDocument().uri().toFilePath(pathMapper)] = convertEdits(
-                    edit.edits());
+            if (const auto edit = std::get_if<TextDocumentEdit>(&documentChange)) {
+                rangesInDocument[edit->textDocument().uri().toFilePath(pathMapper)] = convertEdits(
+                    edit->edits());
             } else {
                 Utils::SearchResultItem item;
 
-                if (std::holds_alternative<CreateFileOperation>(documentChange)) {
-                    auto op = std::get<CreateFileOperation>(documentChange);
-                    item.setLineText(op.message(pathMapper));
-                    item.setFilePath(op.uri().toFilePath(pathMapper));
-                    item.setUserData(QVariant(op));
-                } else if (std::holds_alternative<RenameFileOperation>(documentChange)) {
-                    auto op = std::get<RenameFileOperation>(documentChange);
-                    item.setLineText(op.message(pathMapper));
-                    item.setFilePath(op.oldUri().toFilePath(pathMapper));
-                    item.setUserData(QVariant(op));
-                } else if (std::holds_alternative<DeleteFileOperation>(documentChange)) {
-                    auto op = std::get<DeleteFileOperation>(documentChange);
-                    item.setLineText(op.message(pathMapper));
-                    item.setFilePath(op.uri().toFilePath(pathMapper));
-                    item.setUserData(QVariant(op));
+                if (const auto op = std::get_if<CreateFileOperation>(&documentChange)) {
+                    item.setLineText(op->message(pathMapper));
+                    item.setFilePath(op->uri().toFilePath(pathMapper));
+                    item.setUserData(QVariant(*op));
+                } else if (const auto op = std::get_if<RenameFileOperation>(&documentChange)) {
+                    item.setLineText(op->message(pathMapper));
+                    item.setFilePath(op->oldUri().toFilePath(pathMapper));
+                    item.setUserData(QVariant(*op));
+                } else if (const auto op = std::get_if<DeleteFileOperation>(&documentChange)) {
+                    item.setLineText(op->message(pathMapper));
+                    item.setFilePath(op->uri().toFilePath(pathMapper));
+                    item.setUserData(QVariant(*op));
                 }
 
                 items << item;
@@ -610,7 +609,7 @@ Utils::SearchResultItems generateReplaceItems(const WorkspaceEdit &edits,
             rangesInDocument[it.key().toFilePath(pathMapper)] = convertEdits(it.value());
     }
     filterFileAliases(rangesInDocument);
-    items += generateSearchResultItems(rangesInDocument, search, limitToProjects);
+    items += generateSearchResultItems(rangesInDocument, client, search, limitToProjects);
     return items;
 }
 
@@ -686,7 +685,7 @@ void SymbolSupport::handleRenameResponse(Core::SearchResult *search,
     const std::optional<WorkspaceEdit> &edits = response.result();
     if (edits.has_value()) {
         const Utils::SearchResultItems items = generateReplaceItems(
-            *edits, search, m_limitRenamingToProjects, m_client->hostPathMapper());
+            *edits, m_client, search, m_limitRenamingToProjects);
         search->addResults(items, Core::SearchResult::AddOrdered);
         if (m_renameResultsEnhancer) {
             Utils::SearchResultItems additionalItems = m_renameResultsEnhancer(items);
diff --git a/src/plugins/languageclient/languageclientutils.cpp b/src/plugins/languageclient/languageclientutils.cpp
index 0428fd6a84..4924654ffc 100644
--- a/src/plugins/languageclient/languageclientutils.cpp
+++ b/src/plugins/languageclient/languageclientutils.cpp
@@ -235,8 +235,8 @@ void updateEditorToolBar(Core::IEditor *editor)
     TextDocument *document = textEditor->textDocument();
     Client *client = LanguageClientManager::clientForDocument(textEditor->textDocument());
 
-    ClientExtras *extras = widget->findChild<ClientExtras *>(clientExtrasName,
-                                                             Qt::FindDirectChildrenOnly);
+    ClientExtras *extras = dynamic_cast<ClientExtras *>(
+        widget->findChild<QObject *>(clientExtrasName, Qt::FindDirectChildrenOnly));
     if (!extras) {
         if (!client)
             return;
@@ -349,13 +349,12 @@ bool applyDocumentChange(const Client *client, const DocumentChange &change)
     if (!client)
         return false;
 
-    if (std::holds_alternative<TextDocumentEdit>(change)) {
-        return applyTextDocumentEdit(client, std::get<TextDocumentEdit>(change));
-    } else if (std::holds_alternative<CreateFileOperation>(change)) {
-        const auto createOperation = std::get<CreateFileOperation>(change);
-        const FilePath filePath = createOperation.uri().toFilePath(client->hostPathMapper());
+    if (const auto e = std::get_if<TextDocumentEdit>(&change)) {
+        return applyTextDocumentEdit(client, *e);
+    } else if (const auto createOperation = std::get_if<CreateFileOperation>(&change)) {
+        const FilePath filePath = createOperation->uri().toFilePath(client->hostPathMapper());
         if (filePath.exists()) {
-            if (const std::optional<CreateFileOptions> options = createOperation.options()) {
+            if (const std::optional<CreateFileOptions> options = createOperation->options()) {
                 if (options->overwrite().value_or(false)) {
                     if (!filePath.removeFile())
                         return false;
@@ -365,16 +364,15 @@ bool applyDocumentChange(const Client *client, const DocumentChange &change)
             }
         }
         return filePath.ensureExistingFile();
-    } else if (std::holds_alternative<RenameFileOperation>(change)) {
-        const RenameFileOperation renameOperation = std::get<RenameFileOperation>(change);
-        const FilePath oldPath = renameOperation.oldUri().toFilePath(client->hostPathMapper());
+    } else if (const auto renameOperation = std::get_if<RenameFileOperation>(&change)) {
+        const FilePath oldPath = renameOperation->oldUri().toFilePath(client->hostPathMapper());
         if (!oldPath.exists())
             return false;
-        const FilePath newPath = renameOperation.newUri().toFilePath(client->hostPathMapper());
+        const FilePath newPath = renameOperation->newUri().toFilePath(client->hostPathMapper());
         if (oldPath == newPath)
             return true;
         if (newPath.exists()) {
-            if (const std::optional<CreateFileOptions> options = renameOperation.options()) {
+            if (const std::optional<CreateFileOptions> options = renameOperation->options()) {
                 if (options->overwrite().value_or(false)) {
                     if (!newPath.removeFile())
                         return false;
@@ -384,10 +382,9 @@ bool applyDocumentChange(const Client *client, const DocumentChange &change)
             }
         }
         return oldPath.renameFile(newPath);
-    } else if (std::holds_alternative<DeleteFileOperation>(change)) {
-        const auto deleteOperation = std::get<DeleteFileOperation>(change);
-        const FilePath filePath = deleteOperation.uri().toFilePath(client->hostPathMapper());
-        if (const std::optional<DeleteFileOptions> options = deleteOperation.options()) {
+    } else if (const auto deleteOperation = std::get_if<DeleteFileOperation>(&change)) {
+        const FilePath filePath = deleteOperation->uri().toFilePath(client->hostPathMapper());
+        if (const std::optional<DeleteFileOptions> options = deleteOperation->options()) {
             if (!filePath.exists())
                 return options->ignoreIfNotExists().value_or(false);
             if (filePath.isDir() && options->recursive().value_or(false))
diff --git a/src/plugins/languageclient/lualanguageclient/CMakeLists.txt b/src/plugins/languageclient/lualanguageclient/CMakeLists.txt
new file mode 100644
index 0000000000..3bccee0808
--- /dev/null
+++ b/src/plugins/languageclient/lualanguageclient/CMakeLists.txt
@@ -0,0 +1,6 @@
+add_qtc_plugin(LuaLanguageClient
+  CONDITION TARGET Lua
+  PLUGIN_DEPENDS LanguageClient Lua
+  SOURCES
+    lualanguageclient.cpp
+)
diff --git a/src/plugins/languageclient/lualanguageclient/LuaLanguageClient.json.in b/src/plugins/languageclient/lualanguageclient/LuaLanguageClient.json.in
new file mode 100644
index 0000000000..a74e87f34c
--- /dev/null
+++ b/src/plugins/languageclient/lualanguageclient/LuaLanguageClient.json.in
@@ -0,0 +1,21 @@
+{
+    "Name" : "LuaLanguageClient",
+    "Version" : "${IDE_VERSION}",
+    "DisabledByDefault" : true,
+    "SoftLoadable" : true,
+    "CompatVersion" : "${IDE_VERSION_COMPAT}",
+    "Vendor" : "The Qt Company Ltd",
+    "Copyright" : "(C) ${IDE_COPYRIGHT_YEAR} The Qt Company Ltd",
+    "License" : [ "Commercial Usage",
+                  "",
+                  "Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and The Qt Company.",
+                  "",
+                  "GNU General Public License Usage",
+                  "",
+                  "Alternatively, this plugin may be used under the terms of the GNU General Public License version 3 as published by the Free Software Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT included in the packaging of this plugin. Please review the following information to ensure the GNU General Public License requirements will be met: https://www.gnu.org/licenses/gpl-3.0.html."
+    ],
+    "Category" : "Scripting",
+    "Description" : "Lua Language Client scripting support",
+    "Url" : "http://www.qt.io",
+    ${IDE_PLUGIN_DEPENDENCIES}
+}
diff --git a/src/plugins/languageclient/lualanguageclient/lualanguageclient.cpp b/src/plugins/languageclient/lualanguageclient/lualanguageclient.cpp
new file mode 100644
index 0000000000..bcd9ade763
--- /dev/null
+++ b/src/plugins/languageclient/lualanguageclient/lualanguageclient.cpp
@@ -0,0 +1,512 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include <languageclient/languageclientinterface.h>
+#include <languageclient/languageclientmanager.h>
+#include <languageclient/languageclientsettings.h>
+
+#include <lua/bindings/inheritance.h>
+#include <lua/luaengine.h>
+
+#include <extensionsystem/iplugin.h>
+#include <extensionsystem/pluginmanager.h>
+
+#include <projectexplorer/project.h>
+
+#include <utils/commandline.h>
+#include <utils/layoutbuilder.h>
+
+#include <QJsonDocument>
+
+using namespace Utils;
+using namespace Core;
+using namespace TextEditor;
+using namespace ProjectExplorer;
+
+namespace LanguageClient::Lua {
+
+static void registerLuaApi();
+
+class LuaLanguageClientPlugin final : public ExtensionSystem::IPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "LuaLanguageClient.json")
+
+public:
+    LuaLanguageClientPlugin() {}
+
+private:
+    void initialize() final { registerLuaApi(); }
+};
+
+class LuaLocalSocketClientInterface : public LocalSocketClientInterface
+{
+public:
+    LuaLocalSocketClientInterface(const CommandLine &cmd, const QString &serverName)
+        : LocalSocketClientInterface(serverName)
+        , m_cmd(cmd)
+        , m_logFile("lua-lspclient.XXXXXX.log")
+
+    {}
+
+    void startImpl() override
+    {
+        if (m_process) {
+            QTC_CHECK(!m_process->isRunning());
+            delete m_process;
+        }
+        m_process = new Process;
+        m_process->setProcessMode(ProcessMode::Writer);
+        connect(m_process,
+                &Process::readyReadStandardError,
+                this,
+                &LuaLocalSocketClientInterface::readError);
+        connect(m_process,
+                &Process::readyReadStandardOutput,
+                this,
+                &LuaLocalSocketClientInterface::readOutput);
+        connect(m_process, &Process::started, this, [this]() {
+            this->LocalSocketClientInterface::startImpl();
+            emit started();
+        });
+        connect(m_process, &Process::done, this, [this] {
+            if (m_process->result() != ProcessResult::FinishedWithSuccess)
+                emit error(QString("%1 (see logs in \"%2\")")
+                               .arg(m_process->exitMessage())
+                               .arg(m_logFile.fileName()));
+            emit finished();
+        });
+        m_logFile.write(
+            QString("Starting server: %1\nOutput:\n\n").arg(m_cmd.toUserOutput()).toUtf8());
+        m_process->setCommand(m_cmd);
+        m_process->setWorkingDirectory(m_workingDirectory);
+        if (m_env.hasChanges())
+            m_process->setEnvironment(m_env);
+        m_process->start();
+    }
+
+    void setWorkingDirectory(const FilePath &workingDirectory)
+    {
+        m_workingDirectory = workingDirectory;
+    }
+
+    FilePath serverDeviceTemplate() const override { return m_cmd.executable(); }
+
+    void readError()
+    {
+        QTC_ASSERT(m_process, return);
+
+        const QByteArray stdErr = m_process->readAllRawStandardError();
+        m_logFile.write(stdErr);
+    }
+
+    void readOutput()
+    {
+        QTC_ASSERT(m_process, return);
+        const QByteArray &out = m_process->readAllRawStandardOutput();
+        parseData(out);
+    }
+
+private:
+    Utils::CommandLine m_cmd;
+    Utils::FilePath m_workingDirectory;
+    Utils::Process *m_process = nullptr;
+    Utils::Environment m_env;
+    QTemporaryFile m_logFile;
+};
+
+class LuaClientWrapper;
+
+class LuaClientSettings : public BaseSettings
+{
+    std::weak_ptr<LuaClientWrapper> m_wrapper;
+
+public:
+    LuaClientSettings(const std::weak_ptr<LuaClientWrapper> &wrapper);
+    ~LuaClientSettings() override = default;
+
+    bool applyFromSettingsWidget(QWidget *widget) override;
+
+    Utils::Store toMap() const override;
+    void fromMap(const Utils::Store &map) override;
+
+    QWidget *createSettingsWidget(QWidget *parent = nullptr) const override;
+
+    BaseSettings *copy() const override { return new LuaClientSettings(*this); }
+
+protected:
+    BaseClientInterface *createInterface(ProjectExplorer::Project *project) const override;
+};
+enum class TransportType { StdIO, LocalSocket };
+
+class LuaClientWrapper : public QObject
+{
+public:
+    TransportType m_transportType{TransportType::StdIO};
+    std::function<expected_str<void>(CommandLine &)> m_cmdLineCallback;
+    AspectContainer *m_aspects{nullptr};
+    QString m_name;
+    Utils::Id m_settingsTypeId;
+    QString m_initializationOptions;
+    CommandLine m_cmdLine;
+    QString m_serverName;
+    LanguageFilter m_languageFilter;
+    BaseSettings::StartBehavior m_startBehavior = BaseSettings::RequiresFile;
+
+    std::optional<sol::protected_function> m_onInstanceStart;
+    QMap<QString, sol::protected_function> m_messageCallbacks;
+
+    QList<Client *> m_clients;
+
+public:
+    static BaseSettings::StartBehavior startBehaviorFromString(const QString &str)
+    {
+        if (str == "RequiresProject")
+            return BaseSettings::RequiresProject;
+        if (str == "RequiresFile")
+            return BaseSettings::RequiresFile;
+        if (str == "AlwaysOn")
+            return BaseSettings::AlwaysOn;
+
+        throw sol::error("Unknown start behavior: " + str.toStdString());
+    }
+
+    LuaClientWrapper(const sol::table &options)
+    {
+        m_cmdLineCallback = addValue<CommandLine>(
+            options,
+            "cmd",
+            m_cmdLine,
+            [](const sol::protected_function_result &res) -> expected_str<CommandLine> {
+                if (res.get_type(0) != sol::type::table)
+                    return make_unexpected(QString("cmd callback did not return a table"));
+                return cmdFromTable(res.get<sol::table>());
+            });
+
+        m_name = options.get<QString>("name");
+        m_settingsTypeId = Utils::Id::fromString(QString("Lua_%1").arg(m_name));
+        m_serverName = options.get_or<QString>("serverName", "");
+
+        m_startBehavior = startBehaviorFromString(
+            options.get_or<QString>("startBehavior", "AlwaysOn"));
+
+        QString transportType = options.get_or<QString>("transport", "stdio");
+        if (transportType == "stdio")
+            m_transportType = TransportType::StdIO;
+        else if (transportType == "localsocket")
+            m_transportType = TransportType::LocalSocket;
+        else
+            qWarning() << "Unknown transport type:" << transportType;
+
+        auto languageFilter = options.get<std::optional<sol::table>>("languageFilter");
+        if (languageFilter) {
+            auto patterns = languageFilter->get<std::optional<sol::table>>("patterns");
+            auto mimeTypes = languageFilter->get<std::optional<sol::table>>("mimeTypes");
+
+            if (patterns)
+                for (auto [_, v] : *patterns)
+                    m_languageFilter.filePattern.push_back(v.as<QString>());
+
+            if (mimeTypes)
+                for (auto [_, v] : *mimeTypes)
+                    m_languageFilter.mimeTypes.push_back(v.as<QString>());
+        }
+
+        auto initOptionsTable = options.get<sol::optional<sol::table>>("initializationOptions");
+        if (initOptionsTable) {
+            QJsonValue json = ::Lua::LuaEngine::toJson(*initOptionsTable);
+            QJsonDocument doc;
+            if (json.isArray()) {
+                doc.setArray(json.toArray());
+                m_initializationOptions = QString::fromUtf8(doc.toJson());
+            } else if (json.isObject()) {
+                doc.setObject(json.toObject());
+                m_initializationOptions = QString::fromUtf8(doc.toJson());
+            }
+        }
+        auto initOptionsString = options.get<sol::optional<QString>>("initializationOptions");
+        if (initOptionsString)
+            m_initializationOptions = *initOptionsString;
+
+        // get<sol::optional<>> because on MSVC, get_or(..., nullptr) fails to compile
+        m_aspects = options.get<sol::optional<AspectContainer *>>("settings").value_or(nullptr);
+
+        connect(
+            LanguageClientManager::instance(),
+            &LanguageClientManager::clientInitialized,
+            this,
+            [this](Client *c) {
+                if (m_onInstanceStart) {
+                    if (auto settings = LanguageClientManager::settingForClient(c)) {
+                        if (settings->m_settingsTypeId == m_settingsTypeId) {
+                            auto result = m_onInstanceStart->call();
+
+                            if (!result.valid()) {
+                                qWarning() << "Error calling instance start callback:"
+                                           << (result.get<sol::error>().what());
+                            }
+
+                            m_clients.push_back(c);
+                            updateMessageCallbacks();
+                        }
+                    }
+                }
+            });
+        connect(
+            LanguageClientManager::instance(),
+            &LanguageClientManager::clientRemoved,
+            this,
+            [this](Client *c) {
+                if (m_clients.contains(c))
+                    m_clients.removeOne(c);
+            });
+    }
+
+    // TODO: Unregister Client settings from LanguageClientManager
+    ~LuaClientWrapper() = default;
+
+    TransportType transportType() { return m_transportType; }
+
+    void applySettings()
+    {
+        if (m_aspects)
+            m_aspects->apply();
+
+        updateOptions();
+    }
+
+    void fromMap(const Utils::Store &map)
+    {
+        if (m_aspects)
+            m_aspects->fromMap(map);
+        updateOptions();
+    }
+
+    void toMap(Utils::Store &map) const
+    {
+        if (m_aspects)
+            m_aspects->toMap(map);
+    }
+
+    std::optional<Layouting::LayoutItem> settingsLayout()
+    {
+        if (m_aspects && m_aspects->layouter())
+            return m_aspects->layouter()();
+        return {};
+    }
+
+    void registerMessageCallback(const QString &msg, const sol::function &callback)
+    {
+        m_messageCallbacks.insert(msg, callback);
+        updateMessageCallbacks();
+    }
+
+    void updateMessageCallbacks()
+    {
+        for (Client *c : m_clients) {
+            for (const auto &[msg, func] : m_messageCallbacks.asKeyValueRange()) {
+                c->registerCustomMethod(
+                    msg, [name = msg, f = func](const LanguageServerProtocol::JsonRpcMessage &m) {
+                        auto table = ::Lua::LuaEngine::toTable(f.lua_state(), m.toJsonObject());
+                        auto result = f.call(table);
+                        if (!result.valid()) {
+                            qWarning() << "Error calling message callback for:" << name << ":"
+                                       << (result.get<sol::error>().what());
+                        }
+                    });
+            }
+        }
+    }
+
+    void sendMessage(const sol::table &message)
+    {
+        const QJsonValue messageValue = ::Lua::LuaEngine::toJson(message);
+        if (!messageValue.isObject())
+            throw sol::error("Message is not an object");
+        const LanguageServerProtocol::JsonRpcMessage jsonrpcmessage(messageValue.toObject());
+        for (Client *c : m_clients)
+            c->sendMessage(jsonrpcmessage);
+    }
+
+    void updateOptions()
+    {
+        if (m_cmdLineCallback) {
+            auto result = m_cmdLineCallback(m_cmdLine);
+            if (!result)
+                qWarning() << "Error applying option callback:" << result.error();
+        }
+    }
+
+    static CommandLine cmdFromTable(const sol::table &tbl)
+    {
+        CommandLine cmdLine;
+        cmdLine.setExecutable(FilePath::fromUserInput(tbl.get<QString>(1)));
+
+        for (size_t i = 2; i < tbl.size() + 1; i++)
+            cmdLine.addArg(tbl.get<QString>(i));
+
+        return cmdLine;
+    }
+
+    template<typename T>
+    std::function<expected_str<void>(T &)> addValue(
+        const sol::table &options,
+        const char *fieldName,
+        T &dest,
+        std::function<expected_str<T>(const sol::protected_function_result &)> transform)
+    {
+        auto fixed = options.get<sol::optional<sol::table>>(fieldName);
+        auto cb = options.get<sol::optional<sol::protected_function>>(fieldName);
+
+        if (fixed) {
+            dest = fixed.value().get<T>(1);
+        } else if (cb) {
+            std::function<expected_str<void>(T &)> callback =
+                [cb, transform](T &dest) -> expected_str<void> {
+                auto res = cb.value().call();
+                if (!res.valid()) {
+                    sol::error err = res;
+                    return Utils::make_unexpected(QString::fromLocal8Bit(err.what()));
+                }
+
+                expected_str<T> trResult = transform(res);
+                if (!trResult)
+                    return make_unexpected(trResult.error());
+
+                dest = *trResult;
+                return {};
+            };
+
+            QTC_CHECK_EXPECTED(callback(dest));
+            return callback;
+        }
+        return {};
+    }
+
+    BaseClientInterface *createInterface(ProjectExplorer::Project *project)
+    {
+        if (m_transportType == TransportType::StdIO) {
+            auto interface = new StdIOClientInterface;
+            interface->setCommandLine(m_cmdLine);
+            if (project)
+                interface->setWorkingDirectory(project->projectDirectory());
+            return interface;
+        } else if (m_transportType == TransportType::LocalSocket) {
+            if (m_serverName.isEmpty())
+                return nullptr;
+
+            auto interface = new LuaLocalSocketClientInterface(m_cmdLine, m_serverName);
+            if (project)
+                interface->setWorkingDirectory(project->projectDirectory());
+            return interface;
+        }
+        return nullptr;
+    }
+};
+
+LuaClientSettings::LuaClientSettings(const std::weak_ptr<LuaClientWrapper> &wrapper)
+    : m_wrapper(wrapper)
+{
+    if (auto w = m_wrapper.lock()) {
+        m_name = w->m_name;
+        m_settingsTypeId = w->m_settingsTypeId;
+        m_languageFilter = w->m_languageFilter;
+        m_initializationOptions = w->m_initializationOptions;
+        m_startBehavior = w->m_startBehavior;
+    }
+}
+
+bool LuaClientSettings::applyFromSettingsWidget(QWidget *widget)
+{
+    BaseSettings::applyFromSettingsWidget(widget);
+
+    if (auto w = m_wrapper.lock())
+        w->applySettings();
+
+    return true;
+}
+
+Utils::Store LuaClientSettings::toMap() const
+{
+    auto store = BaseSettings::toMap();
+    if (auto w = m_wrapper.lock())
+        w->toMap(store);
+    return store;
+}
+
+void LuaClientSettings::fromMap(const Utils::Store &map)
+{
+    BaseSettings::fromMap(map);
+    if (auto w = m_wrapper.lock()) {
+        w->m_name = m_name;
+        w->m_initializationOptions = m_initializationOptions;
+        w->m_languageFilter = m_languageFilter;
+        w->m_startBehavior = m_startBehavior;
+        w->fromMap(map);
+    }
+}
+
+QWidget *LuaClientSettings::createSettingsWidget(QWidget *parent) const
+{
+    using namespace Layouting;
+
+    if (auto w = m_wrapper.lock())
+        if (std::optional<LayoutItem> layout = w->settingsLayout())
+            return new BaseSettingsWidget(this, parent, layout->subItems);
+
+    return new BaseSettingsWidget(this, parent);
+}
+
+BaseClientInterface *LuaClientSettings::createInterface(ProjectExplorer::Project *project) const
+{
+    if (auto w = m_wrapper.lock())
+        return w->createInterface(project);
+
+    return nullptr;
+}
+
+static void registerLuaApi()
+{
+    ::Lua::LuaEngine::registerProvider("LSP", [](sol::state_view lua) -> sol::object {
+        sol::table result = lua.create_table();
+
+        auto wrapperClass = result.new_usertype<LuaClientWrapper>(
+            "Client",
+            "on_instance_start",
+            sol::property(
+                [](const LuaClientWrapper *c) -> sol::function {
+                    if (!c->m_onInstanceStart)
+                        return sol::lua_nil;
+                    return c->m_onInstanceStart.value();
+                },
+                [](LuaClientWrapper *c, const sol::function &f) { c->m_onInstanceStart = f; }),
+            "registerMessage",
+            &LuaClientWrapper::registerMessageCallback,
+            "sendMessage",
+            &LuaClientWrapper::sendMessage,
+            "create",
+            [](const sol::table &options) -> std::shared_ptr<LuaClientWrapper> {
+                auto luaClient = std::make_shared<LuaClientWrapper>(options);
+                auto client = new LuaClientSettings(luaClient);
+
+                // The order is important!
+                // First restore the settings ...
+                const QList<Utils::Store> savedSettings
+                    = LanguageClientSettings::storesBySettingsType(luaClient->m_settingsTypeId);
+
+                if (!savedSettings.isEmpty())
+                    client->fromMap(savedSettings.first());
+
+                // ... then register the settings.
+                LanguageClientManager::registerClientSettings(client);
+
+                return luaClient;
+            });
+
+        return result;
+    });
+}
+
+} // namespace LanguageClient::Lua
+
+#include "lualanguageclient.moc"
diff --git a/src/plugins/languageclient/lualanguageclient/lualanguageclient.qbs b/src/plugins/languageclient/lualanguageclient/lualanguageclient.qbs
new file mode 100644
index 0000000000..88fc8ef6a8
--- /dev/null
+++ b/src/plugins/languageclient/lualanguageclient/lualanguageclient.qbs
@@ -0,0 +1,14 @@
+QtcPlugin {
+    name: "LuaLanguageClient"
+
+    Depends { name: "Core" }
+    Depends { name: "LanguageClient" }
+    Depends { name: "Lua" }
+    Depends { name: "ProjectExplorer" }
+    Depends { name: "TextEditor" }
+    Depends { name: "Utils" }
+
+    files: [
+        "lualanguageclient.cpp",
+    ]
+}
diff --git a/src/plugins/languageclient/progressmanager.cpp b/src/plugins/languageclient/progressmanager.cpp
index 6b82d289df..4ef7d0b60d 100644
--- a/src/plugins/languageclient/progressmanager.cpp
+++ b/src/plugins/languageclient/progressmanager.cpp
@@ -69,10 +69,10 @@ bool ProgressManager::isProgressEndMessage(const LanguageServerProtocol::Progres
 Utils::Id languageClientProgressId(const ProgressToken &token)
 {
     constexpr char k_LanguageClientProgressId[] = "LanguageClient.ProgressId.";
-    auto toString = [](const ProgressToken &token){
-        if (std::holds_alternative<int>(token))
-            return QString::number(std::get<int>(token));
-        return std::get<QString>(token);
+    auto toString = [](const ProgressToken &token) {
+        if (const auto i = std::get_if<int>(&token))
+            return QString::number(*i);
+        return *std::get_if<QString>(&token);
     };
     return Utils::Id(k_LanguageClientProgressId).withSuffix(toString(token));
 }
diff --git a/src/plugins/languageclient/snippet.cpp b/src/plugins/languageclient/snippet.cpp
index 7a0fd21131..b401123ef8 100644
--- a/src/plugins/languageclient/snippet.cpp
+++ b/src/plugins/languageclient/snippet.cpp
@@ -251,11 +251,11 @@ void SnippetParsingTest::testSnippetParsing()
     QFETCH(Parts, parts);
 
     SnippetParseResult result = LanguageClient::parseSnippet(input);
-    QCOMPARE(std::holds_alternative<ParsedSnippet>(result), success);
+    const auto snippet = std::get_if<ParsedSnippet>(&result);
+    QCOMPARE(snippet != nullptr, success);
     if (!success)
         return;
 
-    ParsedSnippet snippet = std::get<ParsedSnippet>(result);
 
     auto rangesCompare = [&](const ParsedSnippet::Part &actual, const SnippetPart &expected) {
         QCOMPARE(actual.text, expected.text);
@@ -264,10 +264,10 @@ void SnippetParsingTest::testSnippetParsing()
         QCOMPARE(manglerId, expected.manglerId);
     };
 
-    QCOMPARE(snippet.parts.count(), parts.count());
+    QCOMPARE(snippet->parts.count(), parts.count());
 
     for (int i = 0; i < parts.count(); ++i)
-        rangesCompare(snippet.parts.at(i), parts.at(i));
+        rangesCompare(snippet->parts.at(i), parts.at(i));
 }
 
 QObject *createSnippetParsingTest()
diff --git a/src/plugins/lua/CMakeLists.txt b/src/plugins/lua/CMakeLists.txt
new file mode 100644
index 0000000000..9663ef5081
--- /dev/null
+++ b/src/plugins/lua/CMakeLists.txt
@@ -0,0 +1,35 @@
+
+add_qtc_plugin(Lua
+  PLUGIN_DEPENDS Core
+  PUBLIC_DEPENDS lua546 sol2
+  PUBLIC_DEFINES LUA_AVAILABLE
+  SOURCES
+    bindings/action.cpp
+    bindings/async.cpp
+    bindings/core.cpp
+    bindings/fetch.cpp
+    bindings/hook.cpp
+    bindings/inheritance.h
+    bindings/layout.cpp
+    bindings/messagemanager.cpp
+    bindings/qtcprocess.cpp
+    bindings/settings.cpp
+    bindings/utils.cpp
+    luaengine.cpp
+    luaengine.h
+    luaplugin.cpp
+    luapluginspec.cpp
+    luapluginspec.h
+    luaqttypes.cpp
+    luaqttypes.h
+    luatr.h
+    # generateqtbindings.cpp # Use this if you need to generate some code.
+)
+
+
+set_source_files_properties(luauibindings.cpp PROPERTY SKIP_AUTOMOC ON PROPERTY SKIP_AUTOGEN ON)
+
+if (MSVC)
+    # Prevent fatal error C1128
+    set_property(SOURCE bindings/settings.cpp PROPERTY COMPILE_FLAGS /bigobj)
+endif()
diff --git a/src/plugins/lua/Lua.json.in b/src/plugins/lua/Lua.json.in
new file mode 100644
index 0000000000..7007945934
--- /dev/null
+++ b/src/plugins/lua/Lua.json.in
@@ -0,0 +1,21 @@
+{
+    "Name" : "Lua",
+    "Version" : "${IDE_VERSION}",
+    "CompatVersion" : "${IDE_VERSION_COMPAT}",
+    "DisabledByDefault" : true,
+    "SoftLoadable" : true,
+    "Vendor" : "The Qt Company Ltd",
+    "Copyright" : "(C) ${IDE_COPYRIGHT_YEAR} The Qt Company Ltd",
+    "License" : [ "Commercial Usage",
+                  "",
+                  "Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and The Qt Company.",
+                  "",
+                  "GNU General Public License Usage",
+                  "",
+                  "Alternatively, this plugin may be used under the terms of the GNU General Public License version 3 as published by the Free Software Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT included in the packaging of this plugin. Please review the following information to ensure the GNU General Public License requirements will be met: https://www.gnu.org/licenses/gpl-3.0.html."
+    ],
+    "Category" : "Scripting",
+    "Description" : "Support for Lua based plugins.",
+    "Url" : "http://www.qt.io",
+    ${IDE_PLUGIN_DEPENDENCIES}
+}
diff --git a/src/plugins/lua/README.md b/src/plugins/lua/README.md
new file mode 100644
index 0000000000..108420735e
--- /dev/null
+++ b/src/plugins/lua/README.md
@@ -0,0 +1,115 @@
+# Lua Plugin
+
+## Introduction
+
+The Lua plugin provides support for writing plugins using the Lua scripting language.
+
+## Usage
+
+The plugin scans the folder `lua-plugins` folder inside the normal plugin folder of Qt Creator
+`ExtensionSystem::PluginManager::pluginPaths()`. It loads scripts from any folder that contains
+a .lua script named the same as the folder.
+Whether or not the script is enabled is determined by the `disabledByDefault` field in the plugin
+table and the settings configured via the "About Plugins" dialog in Qt Creator.
+
+## Basic Lua plugin
+
+A Lua script needs to provide the following table to be considered a plugin:
+
+```lua
+-- lua-plugins/myluaplugin/myluaplugin.lua
+return {
+    name = "MyLuaPlugin",
+    version = "1.0.0",
+    compatVersion = "1.0.0",
+    vendor = "The Qt Company",
+    category = "Language Client",
+    setup = function() print("Hello World!") end,
+
+    --- The following fields are optional
+    description = "My first lua plugin",
+    longDescription = [[
+A long description.
+Can contain newlines.
+    ]],
+    url = "https://www.qt.io",
+    license = "MIT",
+    revision = "rev1",
+    copyright = "2024",
+    experimental = true,
+    disabledByDefault = false,
+
+    dependencies = {
+        { name="Core", version = "12.0.0" }
+    },
+} --[[@as QtcPlugin]]
+```
+
+Your base file needs to be named the same as the folder its contained in.
+It must only return the plugin specification table and not execute or require any other code.
+Use `require` to load other files from within the setup function.
+
+```lua
+-- lua-plugins/myluaplugin/myluaplugin.lua
+return {
+    -- ... required fields omitted ..
+    setup = function() require 'init'.setup() end,
+} --[[@as QtcPlugin]]
+
+-- lua-plugins/myluaplugin/init.lua
+local function setup()
+    print("Hello from Lua!")
+end
+
+return {
+    setup = setup,
+}
+```
+
+The `require` function will search for files as such:
+
+```
+my-lua-plugin/?.lua
+```
+
+## Lua <=> C++ bindings
+
+The Lua plugin provides the [sol2](https://github.com/ThePhD/sol2) library to bind C++ code to Lua.
+sol2 is well [documented here](https://sol2.rtfd.io).
+
+## Lua Language Server
+
+To make developing plugins easier, we provide a meta file [qtc.lua](meta/qtc.lua) that describes
+what functions and classes are available in the Lua plugin. If you add bindings yourself
+please add them to this file. The [.luarc.json](../../.luarc.json) file contains the configuration
+for the [Lua Language Server](https://luals.github.io/) and will automatically load the `qtc.lua` file.
+
+## Coroutines
+
+A lot of Qt Creator functions will take some time to complete. To not block the main thread during
+that time, we make heavy use of lua coroutines. Functions that need a coroutine to work are documented
+as such, lets take for example `qtc.waitms(ms)`. This function will wait for `ms` milliseconds and
+then return. To use it you need to call it using the async module from a running coroutine:
+
+```lua
+local a = require 'async'
+local function myFunction()
+    a.wait(qtc.waitms(1000))
+    print("Hello from Lua!")
+end
+
+local function setup()
+    a.sync(myFunction)()
+end
+```
+
+The waitms function will immediately yield, which will suspend the execution of `myFunction` **AND**
+make the `a.sync(myFunction)()` return.
+
+Once the internal timer is triggered, the C++ code will resume `myFunction` and it will continue to
+print the message. `myFunction` will then return and the coroutine will be "dead", meaning it cannot
+be resumed again. You can of course create a new coroutine and call `myFunction` again.
+
+## Contributing
+
+Contributions to the Lua plugin are welcome. Please read the contributing guide for more information.
diff --git a/src/plugins/lua/bindings/ASYNC-LICENSE.txt b/src/plugins/lua/bindings/ASYNC-LICENSE.txt
new file mode 100644
index 0000000000..609bb2e52b
--- /dev/null
+++ b/src/plugins/lua/bindings/ASYNC-LICENSE.txt
@@ -0,0 +1,22 @@
+
+MIT License
+
+Copyright (c) 2020 whocares
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/src/plugins/lua/bindings/action.cpp b/src/plugins/lua/bindings/action.cpp
new file mode 100644
index 0000000000..c8052a785f
--- /dev/null
+++ b/src/plugins/lua/bindings/action.cpp
@@ -0,0 +1,69 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "../luaengine.h"
+
+#include <coreplugin/actionmanager/actionmanager.h>
+
+using namespace Utils;
+
+namespace Lua::Internal {
+
+void addActionModule()
+{
+    LuaEngine::registerProvider("Action", [](sol::state_view lua) -> sol::object {
+        sol::table result = lua.create_table();
+
+        result.new_enum("CommandAttribute",
+                        "CA_Hide",
+                        Core::Command::CA_Hide,
+                        "CA_UpdateText",
+                        Core::Command::CA_UpdateText,
+                        "CA_UpdateIcon",
+                        Core::Command::CA_UpdateIcon,
+                        "CA_NonConfigurable",
+                        Core::Command::CA_NonConfigurable);
+
+        result["create"] = [parent = std::make_unique<QObject>()](
+                               const std::string &actionId, const sol::table &options) mutable {
+            Core::ActionBuilder b(parent.get(), Id::fromString(QString::fromStdString(actionId)));
+
+            for (const auto &[k, v] : options) {
+                QString key = k.as<QString>();
+
+                if (key == "context")
+                    b.setContext(Id::fromString(v.as<QString>()));
+                else if (key == "onTrigger")
+                    b.addOnTriggered([f = v.as<sol::function>()]() {
+                        auto res = Lua::LuaEngine::void_safe_call(f);
+                        QTC_CHECK_EXPECTED(res);
+                    });
+                else if (key == "text")
+                    b.setText(v.as<QString>());
+                else if (key == "iconText")
+                    b.setIconText(v.as<QString>());
+                else if (key == "toolTip")
+                    b.setToolTip(v.as<QString>());
+                else if (key == "commandAttributes")
+                    b.setCommandAttribute((Core::Command::CommandAttribute) v.as<int>());
+                else if (key == "commandDescription")
+                    b.setCommandDescription(v.as<QString>());
+                else if (key == "defaultKeySequence")
+                    b.setDefaultKeySequence(QKeySequence(v.as<QString>()));
+                else if (key == "defaultKeySequences") {
+                    sol::table t = v.as<sol::table>();
+                    QList<QKeySequence> sequences;
+                    sequences.reserve(t.size());
+                    for (const auto &[_, v] : t)
+                        sequences.push_back(QKeySequence(v.as<QString>()));
+                    b.setDefaultKeySequences(sequences);
+                } else
+                    throw std::runtime_error("Unknown key: " + key.toStdString());
+            }
+        };
+
+        return result;
+    });
+}
+
+} // namespace Lua::Internal
diff --git a/src/plugins/lua/bindings/async.cpp b/src/plugins/lua/bindings/async.cpp
new file mode 100644
index 0000000000..8d7d4f4750
--- /dev/null
+++ b/src/plugins/lua/bindings/async.cpp
@@ -0,0 +1,99 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "../luaengine.h"
+
+namespace Lua::Internal {
+
+static const char *async_source = R"(
+-- From: https://github.com/ms-jpq/lua-async-await
+-- Licensed under MIT
+local co = coroutine
+-- use with wrap
+local pong = function(func, callback)
+    assert(type(func) == "function", "type error :: expected func")
+    local thread = co.create(func)
+    local step = nil
+    step = function(...)
+        local stat, ret = co.resume(thread, ...)
+        if not stat then
+            print(ret)
+            print(debug.traceback(thread))
+        end
+        assert(stat, ret)
+        if co.status(thread) == "dead" then
+            (callback or function() end)(ret)
+        else
+            assert(type(ret) == "function", "type error :: expected func")
+            ret(step)
+        end
+    end
+    step()
+end
+-- use with pong, creates thunk factory
+local wrap = function(func)
+    assert(type(func) == "function", "type error :: expected func")
+    local factory = function(...)
+        local params = { ... }
+        local thunk = function(step)
+            table.insert(params, step)
+            return func(table.unpack(params))
+        end
+        return thunk
+    end
+    return factory
+end
+-- many thunks -> single thunk
+local join = function(thunks)
+    local len = #thunks
+    local done = 0
+    local acc = {}
+
+    local thunk = function(step)
+        if len == 0 then
+            return step()
+        end
+        for i, tk in ipairs(thunks) do
+            assert(type(tk) == "function", "thunk must be function")
+            local callback = function(...)
+                acc[i] = ...
+                done = done + 1
+                if done == len then
+                    step(acc)
+                end
+            end
+            tk(callback)
+        end
+    end
+    return thunk
+end
+-- sugar over coroutine
+local await = function(defer)
+    local _, isMain = coroutine.running()
+    assert(not isMain, "a.wait was called outside of a running coroutine. You need to start one using a.sync(my_function)() first")
+    assert(type(defer) == "function", "type error :: expected func :: was: " .. type(defer))
+    return co.yield(defer)
+end
+local await_all = function(defer)
+    local _, isMain = coroutine.running()
+    assert(not isMain, "a.wait_all was called outside of a running coroutine. You need to start one using a.sync(my_function)() first")
+    assert(type(defer) == "table", "type error :: expected table")
+    return co.yield(join(defer))
+end
+return {
+    sync = wrap(pong),
+    wait = await,
+    wait_all = await_all,
+    wrap = wrap,
+}
+)";
+
+void addAsyncModule()
+{
+    LuaEngine::registerProvider("async", [](sol::state_view lua) -> sol::object {
+        sol::protected_function_result res = lua.script(async_source, "async.cpp");
+        return res.get<sol::table>(0);
+    });
+}
+
+} // namespace Lua::Internal
diff --git a/src/plugins/lua/bindings/core.cpp b/src/plugins/lua/bindings/core.cpp
new file mode 100644
index 0000000000..18bafa7b31
--- /dev/null
+++ b/src/plugins/lua/bindings/core.cpp
@@ -0,0 +1,46 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "../luaengine.h"
+
+#include <coreplugin/generatedfile.h>
+
+using namespace Core;
+
+namespace Lua::Internal {
+
+void addCoreModule()
+{
+    LuaEngine::registerProvider("Core", [](sol::state_view lua) -> sol::object {
+        sol::table core = lua.create_table();
+
+        auto generatedFileType = core.new_usertype<GeneratedFile>(
+            "GeneratedFile",
+            "filePath",
+            sol::property(&GeneratedFile::filePath, &GeneratedFile::setFilePath),
+            "contents",
+            sol::property(&GeneratedFile::contents, &GeneratedFile::setContents),
+            "attributes",
+            sol::property([](GeneratedFile *f) -> int { return f->attributes().toInt(); },
+                          [](GeneratedFile *f, int flags) {
+                              f->setAttributes(GeneratedFile::Attributes::fromInt(flags));
+                          }),
+            "isBinary",
+            sol::property(&GeneratedFile::isBinary, &GeneratedFile::setBinary));
+
+        // clang-format off
+        generatedFileType["Attribute"] = lua.create_table_with(
+            "OpenEditorAttribute", GeneratedFile::OpenEditorAttribute,
+            "OpenProjectAttribute", GeneratedFile::OpenProjectAttribute,
+            "CustomGeneratorAttribute", GeneratedFile::CustomGeneratorAttribute,
+            "KeepExistingFileAttribute", GeneratedFile::KeepExistingFileAttribute,
+            "ForceOverwrite", GeneratedFile::ForceOverwrite,
+            "TemporaryFile", GeneratedFile::TemporaryFile
+        );
+        // clang-format on
+
+        return core;
+    });
+}
+
+} // namespace Lua::Internal
diff --git a/src/plugins/lua/bindings/fetch.cpp b/src/plugins/lua/bindings/fetch.cpp
new file mode 100644
index 0000000000..0790ed8e29
--- /dev/null
+++ b/src/plugins/lua/bindings/fetch.cpp
@@ -0,0 +1,133 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "../luaengine.h"
+#include "../luaqttypes.h"
+
+#include <utils/networkaccessmanager.h>
+
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+
+namespace Lua::Internal {
+
+static QString opToString(QNetworkAccessManager::Operation op)
+{
+    switch (op) {
+    case QNetworkAccessManager::HeadOperation:
+        return "HEAD";
+    case QNetworkAccessManager::GetOperation:
+        return "GET";
+    case QNetworkAccessManager::PutOperation:
+        return "PUT";
+    case QNetworkAccessManager::PostOperation:
+        return "POST";
+
+    case QNetworkAccessManager::DeleteOperation:
+        return "DELETE";
+    case QNetworkAccessManager::CustomOperation:
+        return "CUSTOM";
+    default:
+        return "UNKNOWN";
+    }
+}
+
+void addFetchModule()
+{
+    LuaEngine::registerProvider(
+        "Fetch", [](sol::state_view lua) -> sol::object {
+            sol::table async = lua.script("return require('async')", "_fetch_").get<sol::table>();
+            sol::function wrap = async["wrap"];
+
+            sol::table fetch = lua.create_table();
+
+            auto networkReplyType = lua.new_usertype<QNetworkReply>(
+                "QNetworkReply",
+                "error",
+                sol::property([](QNetworkReply *self) -> int { return self->error(); }),
+                "readAll",
+                [](QNetworkReply *r) { return r->readAll().toStdString(); },
+                "__tostring",
+                [](QNetworkReply *r) {
+                    return QString("QNetworkReply(%1 \"%2\") => %3")
+                        .arg(opToString(r->operation()))
+                        .arg(r->url().toString())
+                        .arg(r->error());
+                });
+
+            fetch["fetch_cb"] = [](const sol::table &options,
+                                   const sol::function &callback,
+                                   const sol::this_state &thisState) {
+                auto url = options.get<QString>("url");
+
+                auto method = (options.get_or<QString>("method", "GET")).toLower();
+                auto headers = options.get_or<sol::table>("headers", {});
+                auto data = options.get_or<QString>("body", {});
+                bool convertToTable
+                    = options.get<std::optional<bool>>("convertToTable").value_or(false);
+
+                QNetworkRequest request((QUrl(url)));
+                if (headers && !headers.empty()) {
+                    for (const auto &[k, v] : headers)
+                        request.setRawHeader(k.as<QString>().toUtf8(), v.as<QString>().toUtf8());
+                }
+
+                QNetworkReply *reply = nullptr;
+                if (method == "get")
+                    reply = Utils::NetworkAccessManager::instance()->get(request);
+                else if (method == "post")
+                    reply = Utils::NetworkAccessManager::instance()->post(request, data.toUtf8());
+                else
+                    throw std::runtime_error("Unknown method: " + method.toStdString());
+
+                if (convertToTable) {
+                    QObject::connect(
+                        reply,
+                        &QNetworkReply::finished,
+                        &LuaEngine::instance(),
+                        [reply, thisState, callback]() {
+                            reply->deleteLater();
+
+                            if (reply->error() != QNetworkReply::NoError) {
+                                callback(
+                                    QString("%1 (%2)").arg(reply->errorString()).arg(reply->error()));
+                                return;
+                            }
+
+                            QByteArray data = reply->readAll();
+                            QJsonParseError error;
+                            QJsonDocument doc = QJsonDocument::fromJson(data, &error);
+                            if (error.error != QJsonParseError::NoError) {
+                                callback(error.errorString());
+                                return;
+                            }
+                            if (doc.isObject()) {
+                                callback(LuaEngine::toTable(thisState, doc.object()));
+                            } else if (doc.isArray()) {
+                                callback(LuaEngine::toTable(thisState, doc.array()));
+                            } else {
+                                sol::state_view lua(thisState);
+                                callback(lua.create_table());
+                            }
+                        });
+
+                } else {
+                    QObject::connect(
+                        reply, &QNetworkReply::finished, &LuaEngine::instance(), [reply, callback]() {
+                            // We don't want the network reply to be deleted by the manager, but
+                            // by the Lua GC
+                            reply->setParent(nullptr);
+                            callback(std::unique_ptr<QNetworkReply>(reply));
+                        });
+                }
+            };
+
+            fetch["fetch"] = wrap(fetch["fetch_cb"]);
+
+            return fetch;
+        });
+}
+
+} // namespace Lua::Internal
diff --git a/src/plugins/lua/bindings/hook.cpp b/src/plugins/lua/bindings/hook.cpp
new file mode 100644
index 0000000000..261e6fe115
--- /dev/null
+++ b/src/plugins/lua/bindings/hook.cpp
@@ -0,0 +1,65 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "../luaengine.h"
+
+#include <coreplugin/editormanager/editormanager.h>
+
+namespace Lua {
+
+class Hook : public QObject
+{
+    Q_OBJECT
+
+public:
+    Hook(QObject *source);
+
+signals:
+    void trigger(sol::table &args);
+};
+
+Hook::Hook(QObject *source)
+    : QObject(source)
+{}
+
+namespace Internal {
+
+void addHookModule()
+{
+    LuaEngine::autoRegister([](sol::state_view lua) {
+        auto connection = lua.new_usertype<QMetaObject::Connection>("QMetaConnection",
+                                                                    sol::no_constructor);
+
+        auto hook = lua.new_usertype<Hook>(
+            "Hook",
+            sol::no_constructor,
+            "connect",
+            [](Hook *hook, const sol::function &func) -> QMetaObject::Connection {
+                QMetaObject::Connection con
+                    = QObject::connect(hook, &Hook::trigger, [func](sol::table args) {
+                          auto res = LuaEngine::void_safe_call(func, args);
+                          QTC_CHECK_EXPECTED(res);
+                      });
+                return con;
+            },
+            "disconnect",
+            [](Hook *, QMetaObject::Connection con) { QObject::disconnect(con); });
+    });
+
+    LuaEngine::registerHook("editors.documentOpened", [](const sol::function &func) {
+        QObject::connect(Core::EditorManager::instance(),
+                         &Core::EditorManager::documentOpened,
+                         [func](Core::IDocument *document) { func(document); });
+    });
+    LuaEngine::registerHook("editors.documentClosed", [](const sol::function &func) {
+        QObject::connect(Core::EditorManager::instance(),
+                         &Core::EditorManager::documentClosed,
+                         [func](Core::IDocument *document) { func(document); });
+    });
+}
+
+} // namespace Internal
+
+} // namespace Lua
+
+#include "hook.moc"
diff --git a/src/plugins/lua/bindings/inheritance.h b/src/plugins/lua/bindings/inheritance.h
new file mode 100644
index 0000000000..6336ff4d2d
--- /dev/null
+++ b/src/plugins/lua/bindings/inheritance.h
@@ -0,0 +1,126 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include <sol/forward.hpp>
+
+namespace Lua::Internal {
+class LuaAspectContainer;
+}
+
+namespace Utils {
+class AspectContainer;
+class BoolAspect;
+class ColorAspect;
+class SelectionAspect;
+class MultiSelectionAspect;
+class StringAspect;
+class FilePathAspect;
+class IntegerAspect;
+class DoubleAspect;
+class StringListAspect;
+class FilePathListAspect;
+class IntegersAspect;
+class StringSelectionAspect;
+class ToggleAspect;
+class TriStateAspect;
+class TextDisplay;
+class AspectList;
+class BaseAspect;
+} // namespace Utils
+
+SOL_BASE_CLASSES(::Lua::Internal::LuaAspectContainer, Utils::AspectContainer, Utils::BaseAspect);
+
+SOL_BASE_CLASSES(Utils::BoolAspect, Utils::BaseAspect);
+SOL_BASE_CLASSES(Utils::ColorAspect, Utils::BaseAspect);
+SOL_BASE_CLASSES(Utils::SelectionAspect, Utils::BaseAspect);
+SOL_BASE_CLASSES(Utils::MultiSelectionAspect, Utils::BaseAspect);
+SOL_BASE_CLASSES(Utils::StringAspect, Utils::BaseAspect);
+SOL_BASE_CLASSES(Utils::FilePathAspect, Utils::BaseAspect);
+SOL_BASE_CLASSES(Utils::IntegerAspect, Utils::BaseAspect);
+SOL_BASE_CLASSES(Utils::DoubleAspect, Utils::BaseAspect);
+SOL_BASE_CLASSES(Utils::StringListAspect, Utils::BaseAspect);
+SOL_BASE_CLASSES(Utils::FilePathListAspect, Utils::BaseAspect);
+SOL_BASE_CLASSES(Utils::IntegersAspect, Utils::BaseAspect);
+SOL_BASE_CLASSES(Utils::StringSelectionAspect, Utils::BaseAspect);
+SOL_BASE_CLASSES(Utils::ToggleAspect, Utils::BoolAspect, Utils::BaseAspect);
+SOL_BASE_CLASSES(Utils::TriStateAspect, Utils::SelectionAspect, Utils::BaseAspect);
+SOL_BASE_CLASSES(Utils::TextDisplay, Utils::BaseAspect);
+SOL_BASE_CLASSES(Utils::AspectList, Utils::BaseAspect);
+
+SOL_DERIVED_CLASSES(Utils::AspectContainer, Lua::Internal::LuaAspectContainer);
+
+SOL_DERIVED_CLASSES(
+    Utils::BaseAspect,
+    Utils::AspectContainer,
+    Utils::BoolAspect,
+    Utils::ColorAspect,
+    Utils::SelectionAspect,
+    Utils::MultiSelectionAspect,
+    Utils::StringAspect,
+    Utils::FilePathAspect,
+    Utils::IntegerAspect,
+    Utils::DoubleAspect,
+    Utils::StringListAspect,
+    Utils::FilePathListAspect,
+    Utils::IntegersAspect,
+    Utils::StringSelectionAspect,
+    Utils::ToggleAspect,
+    Utils::TriStateAspect,
+    Utils::TextDisplay,
+    Utils::AspectList);
+
+namespace Layouting {
+class LayoutItem;
+class Column;
+class Row;
+class Flow;
+class Grid;
+class Form;
+class Widget;
+class Stack;
+class Tab;
+class Group;
+class TextEdit;
+class PushButton;
+class SpinBox;
+class Splitter;
+class ToolBar;
+class TabWidget;
+class Group;
+} // namespace Layouting
+
+SOL_BASE_CLASSES(Layouting::Column, Layouting::LayoutItem);
+SOL_BASE_CLASSES(Layouting::Row, Layouting::LayoutItem);
+SOL_BASE_CLASSES(Layouting::Flow, Layouting::LayoutItem);
+SOL_BASE_CLASSES(Layouting::Grid, Layouting::LayoutItem);
+SOL_BASE_CLASSES(Layouting::Form, Layouting::LayoutItem);
+SOL_BASE_CLASSES(Layouting::Widget, Layouting::LayoutItem);
+SOL_BASE_CLASSES(Layouting::Stack, Layouting::LayoutItem);
+SOL_BASE_CLASSES(Layouting::Tab, Layouting::LayoutItem);
+SOL_BASE_CLASSES(Layouting::Group, Layouting::LayoutItem);
+SOL_BASE_CLASSES(Layouting::TextEdit, Layouting::LayoutItem);
+SOL_BASE_CLASSES(Layouting::PushButton, Layouting::LayoutItem);
+SOL_BASE_CLASSES(Layouting::SpinBox, Layouting::LayoutItem);
+SOL_BASE_CLASSES(Layouting::Splitter, Layouting::LayoutItem);
+SOL_BASE_CLASSES(Layouting::ToolBar, Layouting::LayoutItem);
+SOL_BASE_CLASSES(Layouting::TabWidget, Layouting::LayoutItem);
+
+SOL_DERIVED_CLASSES(
+    Layouting::LayoutItem,
+    Layouting::Column,
+    Layouting::Row,
+    Layouting::Flow,
+    Layouting::Grid,
+    Layouting::Form,
+    Layouting::Widget,
+    Layouting::Stack,
+    Layouting::Tab,
+    Layouting::Group,
+    Layouting::TextEdit,
+    Layouting::PushButton,
+    Layouting::SpinBox,
+    Layouting::Splitter,
+    Layouting::ToolBar,
+    Layouting::TabWidget);
diff --git a/src/plugins/lua/bindings/layout.cpp b/src/plugins/lua/bindings/layout.cpp
new file mode 100644
index 0000000000..6225bce9f3
--- /dev/null
+++ b/src/plugins/lua/bindings/layout.cpp
@@ -0,0 +1,177 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "../luaengine.h"
+
+#include "inheritance.h"
+
+#include <utils/aspects.h>
+#include <utils/layoutbuilder.h>
+
+using namespace Layouting;
+using namespace Utils;
+
+namespace Lua::Internal {
+
+static void processChildren(LayoutItem *item, const sol::table &children)
+{
+    for (size_t i = 1; i <= children.size(); ++i) {
+        const sol::object v = children[i];
+
+        if (v.is<LayoutItem *>()) {
+            item->addItem(*v.as<LayoutItem *>());
+        } else if (v.is<BaseAspect>()) {
+            v.as<BaseAspect *>()->addToLayout(*item);
+        } else if (v.is<QString>()) {
+            item->addItem(v.as<QString>());
+        } else if (v.is<sol::function>()) {
+            const sol::function f = v.as<sol::function>();
+            auto res = LuaEngine::safe_call<LayoutItem *>(f);
+            QTC_ASSERT_EXPECTED(res, continue);
+            item->addItem(**res);
+        } else {
+            qWarning() << "Incompatible object added to layout item: " << (int) v.get_type()
+                       << " (expected LayoutItem, Aspect or function returning LayoutItem)";
+        }
+    }
+}
+
+template<class T, typename... Args>
+static std::unique_ptr<T> construct(Args &&...args, const sol::table &children)
+{
+    std::unique_ptr<T> item(new T(std::forward<Args>(args)..., {}));
+
+    processChildren(item.get(), children);
+
+    return item;
+}
+
+void addLayoutModule()
+{
+    LuaEngine::registerProvider("Layout", [](sol::state_view l) -> sol::object {
+        sol::table layout = l.create_table();
+
+        layout.new_usertype<LayoutItem>("LayoutItem", "attachTo", &LayoutItem::attachTo);
+
+        layout["Span"] = [](int span, LayoutItem *item) {
+            return createItem(item, Span(span, *item));
+        };
+        layout["Space"] = [](int space) { return createItem(nullptr, Space(space)); };
+        layout["Stretch"] = [](int stretch) { return createItem(nullptr, Stretch(stretch)); };
+
+        layout.new_usertype<Column>("Column",
+                                    sol::call_constructor,
+                                    sol::factories(&construct<Column>),
+                                    sol::base_classes,
+                                    sol::bases<LayoutItem>());
+        layout.new_usertype<Row>("Row",
+                                 sol::call_constructor,
+                                 sol::factories(&construct<Row>),
+                                 sol::base_classes,
+                                 sol::bases<LayoutItem>());
+        layout.new_usertype<Flow>("Flow",
+                                  sol::call_constructor,
+                                  sol::factories(&construct<Flow>),
+                                  sol::base_classes,
+                                  sol::bases<LayoutItem>());
+        layout.new_usertype<Grid>("Grid",
+                                  sol::call_constructor,
+                                  sol::factories(&construct<Grid>),
+                                  sol::base_classes,
+                                  sol::bases<LayoutItem>());
+        layout.new_usertype<Form>("Form",
+                                  sol::call_constructor,
+                                  sol::factories(&construct<Form>),
+                                  sol::base_classes,
+                                  sol::bases<LayoutItem>());
+        layout.new_usertype<Widget>("Widget",
+                                    sol::call_constructor,
+                                    sol::factories(&construct<Widget>),
+                                    sol::base_classes,
+                                    sol::bases<LayoutItem>());
+        layout.new_usertype<Stack>("Stack",
+                                   sol::call_constructor,
+                                   sol::factories(&construct<Stack>),
+                                   sol::base_classes,
+                                   sol::bases<LayoutItem>());
+        layout.new_usertype<Tab>(
+            "Tab",
+            sol::call_constructor,
+            sol::factories(&construct<Tab, QString>),
+            sol::base_classes,
+            sol::bases<LayoutItem>());
+        layout.new_usertype<TextEdit>("TextEdit",
+                                      sol::call_constructor,
+                                      sol::factories(&construct<TextEdit>),
+                                      sol::base_classes,
+                                      sol::bases<LayoutItem>());
+        layout.new_usertype<PushButton>("PushButton",
+                                        sol::call_constructor,
+                                        sol::factories(&construct<PushButton>),
+                                        sol::base_classes,
+                                        sol::bases<LayoutItem>());
+        layout.new_usertype<SpinBox>("SpinBox",
+                                     sol::call_constructor,
+                                     sol::factories(&construct<SpinBox>),
+                                     sol::base_classes,
+                                     sol::bases<LayoutItem>());
+        layout.new_usertype<Splitter>("Splitter",
+                                      sol::call_constructor,
+                                      sol::factories(&construct<Splitter>),
+                                      sol::base_classes,
+                                      sol::bases<LayoutItem>());
+        layout.new_usertype<ToolBar>("ToolBar",
+                                     sol::call_constructor,
+                                     sol::factories(&construct<ToolBar>),
+                                     sol::base_classes,
+                                     sol::bases<LayoutItem>());
+        layout.new_usertype<TabWidget>("TabWidget",
+                                       sol::call_constructor,
+                                       sol::factories(&construct<TabWidget>),
+                                       sol::base_classes,
+                                       sol::bases<LayoutItem>());
+
+        layout.new_usertype<Group>("Group",
+                                   sol::call_constructor,
+                                   sol::factories(&construct<Group>),
+                                   sol::base_classes,
+                                   sol::bases<LayoutItem>());
+
+        layout["br"] = &br;
+        layout["st"] = &st;
+        layout["empty"] = &empty;
+        layout["hr"] = &hr;
+        layout["noMargin"] = &noMargin;
+        layout["normalMargin"] = &normalMargin;
+        layout["customMargin"] = [](int left, int top, int right, int bottom) {
+            return customMargin(QMargins(left, top, right, bottom));
+        };
+        layout["withFormAlignment"] = &withFormAlignment;
+        layout["title"] = &title;
+        layout["text"] = &text;
+        layout["tooltip"] = &tooltip;
+        layout["resize"] = &resize;
+        layout["columnStretch"] = &columnStretch;
+        layout["spacing"] = &spacing;
+        layout["windowTitle"] = &windowTitle;
+        layout["fieldGrowthPolicy"] = &fieldGrowthPolicy;
+        layout["id"] = &id;
+        layout["setText"] = &setText;
+        layout["onClicked"] = [](const sol::function &f) {
+            return onClicked([f]() {
+                auto res = LuaEngine::void_safe_call(f);
+                QTC_CHECK_EXPECTED(res);
+            });
+        };
+        layout["onTextChanged"] = [](const sol::function &f) {
+            return onTextChanged([f](const QString &text) {
+                auto res = LuaEngine::void_safe_call(f, text);
+                QTC_CHECK_EXPECTED(res);
+            });
+        };
+
+        return layout;
+    });
+}
+
+} // namespace Lua::Internal
diff --git a/src/plugins/lua/bindings/messagemanager.cpp b/src/plugins/lua/bindings/messagemanager.cpp
new file mode 100644
index 0000000000..f6b8e874ad
--- /dev/null
+++ b/src/plugins/lua/bindings/messagemanager.cpp
@@ -0,0 +1,29 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "../luaengine.h"
+
+#include <coreplugin/messagemanager.h>
+
+namespace Lua::Internal {
+
+void addMessageManagerModule()
+{
+    LuaEngine::registerProvider("MessageManager", [](sol::state_view lua) -> sol::object {
+        sol::table mm = lua.create_table();
+
+        mm.set_function("writeFlashing", [](const sol::variadic_args &vargs) {
+            Core::MessageManager::writeFlashing(LuaEngine::variadicToStringList(vargs).join(""));
+        });
+        mm.set_function("writeDisrupting", [](const sol::variadic_args &vargs) {
+            Core::MessageManager::writeDisrupting(LuaEngine::variadicToStringList(vargs).join(""));
+        });
+        mm.set_function("writeSilently", [](const sol::variadic_args &vargs) {
+            Core::MessageManager::writeSilently(LuaEngine::variadicToStringList(vargs).join(""));
+        });
+
+        return mm;
+    });
+}
+
+} // namespace Lua::Internal
diff --git a/src/plugins/lua/bindings/qtcprocess.cpp b/src/plugins/lua/bindings/qtcprocess.cpp
new file mode 100644
index 0000000000..93d3af2e0a
--- /dev/null
+++ b/src/plugins/lua/bindings/qtcprocess.cpp
@@ -0,0 +1,41 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "../luaengine.h"
+
+#include <utils/environment.h>
+#include <utils/qtcprocess.h>
+
+using namespace Utils;
+
+namespace Lua::Internal {
+
+void addProcessModule()
+{
+    LuaEngine::registerProvider(
+        "Process", [](sol::state_view lua) -> sol::object {
+            sol::table async = lua.script("return require('async')", "_process_").get<sol::table>();
+            sol::function wrap = async["wrap"];
+
+            sol::table process = lua.create_table();
+
+            process["runInTerminal_cb"] = [](const QString &cmdline, const sol::function &cb) {
+                Process *p = new Process;
+                p->setTerminalMode(TerminalMode::Run);
+                p->setCommand(CommandLine::fromUserInput((cmdline)));
+                p->setEnvironment(Environment::systemEnvironment());
+
+                QObject::connect(p, &Process::done, &LuaEngine::instance(), [p, cb]() {
+                    cb(p->exitCode());
+                });
+
+                p->start();
+            };
+
+            process["runInTerminal"] = wrap(process["runInTerminal_cb"]);
+
+            return process;
+        });
+}
+
+} // namespace Lua::Internal
diff --git a/src/plugins/lua/bindings/settings.cpp b/src/plugins/lua/bindings/settings.cpp
new file mode 100644
index 0000000000..b1c388605f
--- /dev/null
+++ b/src/plugins/lua/bindings/settings.cpp
@@ -0,0 +1,534 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "../luaengine.h"
+
+#include <utils/aspects.h>
+#include <utils/environment.h>
+#include <utils/layoutbuilder.h>
+
+#include <coreplugin/dialogs/ioptionspage.h>
+
+using namespace Utils;
+
+namespace Lua::Internal {
+
+class LuaAspectContainer : public AspectContainer
+{
+public:
+    using AspectContainer::AspectContainer;
+
+    sol::object dynamic_get(const std::string &key)
+    {
+        auto it = m_entries.find(key);
+        if (it == m_entries.cend()) {
+            return sol::lua_nil;
+        }
+        return it->second;
+    }
+
+    void dynamic_set(const std::string &key, const sol::stack_object &value)
+    {
+        if (!value.is<BaseAspect>())
+            throw std::runtime_error("AspectContainer can only contain BaseAspect instances");
+
+        registerAspect(value.as<BaseAspect *>(), false);
+
+        auto it = m_entries.find(key);
+        if (it == m_entries.cend()) {
+            m_entries.insert(it, {std::move(key), std::move(value)});
+        } else {
+            std::pair<const std::string, sol::object> &kvp = *it;
+            sol::object &entry = kvp.second;
+            entry = sol::object(std::move(value));
+        }
+    }
+
+    size_t size() const { return m_entries.size(); }
+
+public:
+    std::unordered_map<std::string, sol::object> m_entries;
+};
+
+std::unique_ptr<LuaAspectContainer> aspectContainerCreate(const sol::table &options)
+{
+    auto container = std::make_unique<LuaAspectContainer>();
+
+    for (const auto &[k, v] : options) {
+        if (k.is<std::string>()) {
+            std::string key = k.as<std::string>();
+            if (key == "autoApply") {
+                container->setAutoApply(v.as<bool>());
+            } else if (key == "layouter") {
+                if (v.is<sol::function>())
+                    container->setLayouter(
+                        [func = v.as<sol::function>()]() -> Layouting::LayoutItem {
+                            auto res = Lua::LuaEngine::safe_call<Layouting::LayoutItem>(func);
+                            QTC_ASSERT_EXPECTED(res, return {});
+                            return *res;
+                        });
+            } else {
+                container->m_entries[key] = v;
+                if (v.is<BaseAspect>()) {
+                    container->registerAspect(v.as<BaseAspect *>());
+                }
+            }
+        }
+    }
+
+    container->readSettings();
+
+    return container;
+}
+
+void baseAspectCreate(BaseAspect *aspect, const std::string &key, const sol::object &value)
+{
+    if (key == "settingsKey")
+        aspect->setSettingsKey(keyFromString(value.as<QString>()));
+    else if (key == "displayName")
+        aspect->setDisplayName(value.as<QString>());
+    else if (key == "labelText")
+        aspect->setLabelText(value.as<QString>());
+    else if (key == "toolTip")
+        aspect->setToolTip(value.as<QString>());
+    else if (key == "onValueChanged") {
+        QObject::connect(aspect, &BaseAspect::changed, aspect, [func = value.as<sol::function>()]() {
+            Lua::LuaEngine::void_safe_call(func);
+        });
+    } else if (key == "onVolatileValueChanged") {
+        QObject::connect(aspect,
+                         &BaseAspect::volatileValueChanged,
+                         aspect,
+                         [func = value.as<sol::function>()]() {
+                             Lua::LuaEngine::void_safe_call(func);
+                         });
+    } else if (key == "enabler")
+        aspect->setEnabler(value.as<BoolAspect *>());
+    else
+        qWarning() << "Unknown key:" << key.c_str();
+}
+
+template<class T>
+void typedAspectCreate(T *aspect, const std::string &key, const sol::object &value)
+{
+    if (key == "defaultValue")
+        aspect->setDefaultValue(value.as<typename T::valueType>());
+    else if (key == "value")
+        aspect->setValue(value.as<typename T::valueType>());
+    else
+        baseAspectCreate(aspect, key, value);
+}
+
+template<>
+void typedAspectCreate(StringAspect *aspect, const std::string &key, const sol::object &value)
+{
+    if (key == "displayStyle")
+        aspect->setDisplayStyle((StringAspect::DisplayStyle) value.as<int>());
+    else if (key == "historyId")
+        aspect->setHistoryCompleter(value.as<QString>().toLocal8Bit());
+    else if (key == "valueAcceptor")
+        aspect->setValueAcceptor([func = value.as<sol::function>()](const QString &oldValue,
+                                                                    const QString &newValue)
+                                     -> std::optional<QString> {
+            auto res = Lua::LuaEngine::safe_call<std::optional<QString>>(func, oldValue, newValue);
+            QTC_ASSERT_EXPECTED(res, return std::nullopt);
+            return *res;
+        });
+    else if (key == "showToolTipOnLabel")
+        aspect->setShowToolTipOnLabel(value.as<bool>());
+    else if (key == "displayFilter")
+        aspect->setDisplayFilter([func = value.as<sol::function>()](const QString &value) {
+            auto res = Lua::LuaEngine::safe_call<QString>(func, value);
+            QTC_ASSERT_EXPECTED(res, return value);
+            return *res;
+        });
+    else if (key == "placeHolderText")
+        aspect->setPlaceHolderText(value.as<QString>());
+    else if (key == "acceptRichText")
+        aspect->setAcceptRichText(value.as<bool>());
+    else if (key == "autoApplyOnEditingFinished")
+        aspect->setAutoApplyOnEditingFinished(value.as<bool>());
+    else if (key == "elideMode")
+        aspect->setElideMode((Qt::TextElideMode) value.as<int>());
+    else
+        typedAspectCreate(static_cast<TypedAspect<QString> *>(aspect), key, value);
+}
+
+template<>
+void typedAspectCreate(FilePathAspect *aspect, const std::string &key, const sol::object &value)
+{
+    if (key == "defaultPath")
+        aspect->setDefaultPathValue(value.as<FilePath>());
+    else if (key == "historyId")
+        aspect->setHistoryCompleter(value.as<QString>().toLocal8Bit());
+    else if (key == "promptDialogFilter")
+        aspect->setPromptDialogFilter(value.as<QString>());
+    else if (key == "promptDialogTitle")
+        aspect->setPromptDialogTitle(value.as<QString>());
+    else if (key == "commandVersionArguments")
+        aspect->setCommandVersionArguments(value.as<QStringList>());
+    else if (key == "allowPathFromDevice")
+        aspect->setAllowPathFromDevice(value.as<bool>());
+    else if (key == "validatePlaceHolder")
+        aspect->setValidatePlaceHolder(value.as<bool>());
+    else if (key == "openTerminalHandler")
+        aspect->setOpenTerminalHandler([func = value.as<sol::function>()]() {
+            auto res = Lua::LuaEngine::void_safe_call(func);
+            QTC_CHECK_EXPECTED(res);
+        });
+    else if (key == "expectedKind")
+        aspect->setExpectedKind((PathChooser::Kind) value.as<int>());
+    else if (key == "environment")
+        aspect->setEnvironment(value.as<Environment>());
+    else if (key == "baseFileName")
+        aspect->setBaseFileName(value.as<FilePath>());
+    else if (key == "valueAcceptor")
+        aspect->setValueAcceptor([func = value.as<sol::function>()](const QString &oldValue,
+                                                                    const QString &newValue)
+                                     -> std::optional<QString> {
+            auto res = Lua::LuaEngine::safe_call<std::optional<QString>>(func, oldValue, newValue);
+            QTC_ASSERT_EXPECTED(res, return std::nullopt);
+            return *res;
+        });
+    else if (key == "showToolTipOnLabel")
+        aspect->setShowToolTipOnLabel(value.as<bool>());
+    else if (key == "autoApplyOnEditingFinished")
+        aspect->setAutoApplyOnEditingFinished(value.as<bool>());
+    /*else if (key == "validationFunction")
+        aspect->setValidationFunction(
+            [func = value.as<sol::function>()](const QString &path) {
+                return func.call<std::optional<QString>>(path);
+            });
+    */
+    else if (key == "displayFilter")
+        aspect->setDisplayFilter([func = value.as<sol::function>()](const QString &path) {
+            auto res = Lua::LuaEngine::safe_call<QString>(func, path);
+            QTC_ASSERT_EXPECTED(res, return path);
+            return *res;
+        });
+    else if (key == "placeHolderText")
+        aspect->setPlaceHolderText(value.as<QString>());
+    else
+        typedAspectCreate(static_cast<TypedAspect<QString> *>(aspect), key, value);
+}
+
+template<>
+void typedAspectCreate(BoolAspect *aspect, const std::string &key, const sol::object &value)
+{
+    if (key == "labelPlacement") {
+        aspect->setLabelPlacement((BoolAspect::LabelPlacement) value.as<int>());
+    } else {
+        typedAspectCreate(static_cast<TypedAspect<bool> *>(aspect), key, value);
+    }
+}
+
+template<class T>
+std::unique_ptr<T> createAspectFromTable(
+    const sol::table &options, const std::function<void(T *, const std::string &, sol::object)> &f)
+{
+    auto aspect = std::make_unique<T>();
+
+    for (const auto &[k, v] : options) {
+        if (k.template is<std::string>()) {
+            f(aspect.get(), k.template as<std::string>(), v);
+        }
+    }
+
+    return aspect;
+}
+
+template<class T>
+void addTypedAspectBaseBindings(sol::table &lua)
+{
+    lua.new_usertype<TypedAspect<T>>("TypedAspect<bool>",
+                                     "value",
+                                     sol::property(&TypedAspect<T>::value,
+                                                   [](TypedAspect<T> *a, const T &v) {
+                                                       a->setValue(v);
+                                                   }),
+                                     "volatileValue",
+                                     sol::property(&TypedAspect<T>::volatileValue,
+                                                   [](TypedAspect<T> *a, const T &v) {
+                                                       a->setVolatileValue(v);
+                                                   }),
+                                     "defaultValue",
+                                     sol::property(&TypedAspect<T>::defaultValue),
+                                     sol::base_classes,
+                                     sol::bases<BaseAspect>());
+}
+
+template<class T>
+sol::usertype<T> addTypedAspect(sol::table &lua, const QString &name)
+{
+    addTypedAspectBaseBindings<typename T::valueType>(lua);
+
+    return lua.new_usertype<T>(
+        name,
+        "create",
+        [](const sol::table &options) {
+            return createAspectFromTable<T>(options, &typedAspectCreate<T>);
+        },
+        sol::base_classes,
+        sol::bases<TypedAspect<typename T::valueType>, BaseAspect>());
+}
+
+void addSettingsModule()
+{
+    LuaEngine::registerProvider("Settings", [](sol::state_view l) -> sol::object {
+        sol::table settings = l.create_table();
+
+        settings.new_usertype<BaseAspect>("Aspect", "apply", &BaseAspect::apply);
+
+        settings.new_usertype<LuaAspectContainer>("AspectContainer",
+                                                  "create",
+                                                  &aspectContainerCreate,
+                                                  "apply",
+                                                  &LuaAspectContainer::apply,
+                                                  sol::meta_function::index,
+                                                  &LuaAspectContainer::dynamic_get,
+                                                  sol::meta_function::new_index,
+                                                  &LuaAspectContainer::dynamic_set,
+                                                  sol::meta_function::length,
+                                                  &LuaAspectContainer::size,
+                                                  sol::base_classes,
+                                                  sol::bases<AspectContainer, BaseAspect>());
+
+        addTypedAspect<BoolAspect>(settings, "BoolAspect");
+        addTypedAspect<ColorAspect>(settings, "ColorAspect");
+        addTypedAspect<SelectionAspect>(settings, "SelectionAspect");
+        addTypedAspect<MultiSelectionAspect>(settings, "MultiSelectionAspect");
+        addTypedAspect<StringAspect>(settings, "StringAspect");
+
+        auto filePathAspectType = addTypedAspect<FilePathAspect>(settings, "FilePathAspect");
+        filePathAspectType.set("expandedValue", sol::property(&FilePathAspect::expandedValue));
+        filePathAspectType.set(
+            "defaultPath",
+            sol::property(
+                [](FilePathAspect &self) { return FilePath::fromUserInput(self.defaultValue()); },
+                &FilePathAspect::setDefaultPathValue));
+
+        addTypedAspect<IntegerAspect>(settings, "IntegerAspect");
+        addTypedAspect<DoubleAspect>(settings, "DoubleAspect");
+        addTypedAspect<StringListAspect>(settings, "StringListAspect");
+        addTypedAspect<FilePathListAspect>(settings, "FilePathListAspect");
+        addTypedAspect<IntegersAspect>(settings, "IntegersAspect");
+        addTypedAspect<StringSelectionAspect>(settings, "StringSelectionAspect");
+
+        settings.new_usertype<ToggleAspect>(
+            "ToggleAspect",
+            "create",
+            [](const sol::table &options) {
+                return createAspectFromTable<ToggleAspect>(
+                    options,
+                    [](ToggleAspect *aspect, const std::string &key, const sol::object &value) {
+                        if (key == "offIcon")
+                            aspect->setOffIcon(QIcon(value.as<QString>()));
+                        else if (key == "offTooltip")
+                            aspect->setOffTooltip(value.as<QString>());
+                        else if (key == "onIcon")
+                            aspect->setOnIcon(QIcon(value.as<QString>()));
+                        else if (key == "onTooltip")
+                            aspect->setOnTooltip(value.as<QString>());
+                        else if (key == "onText")
+                            aspect->setOnText(value.as<QString>());
+                        else if (key == "offText")
+                            aspect->setOffText(value.as<QString>());
+                        else
+                            typedAspectCreate(aspect, key, value);
+                    });
+            },
+            "action",
+            &ToggleAspect::action,
+            sol::base_classes,
+            sol::bases<BoolAspect, TypedAspect<bool>, BaseAspect>());
+
+        static auto triStateFromString = [](const QString &str) -> TriState {
+            const QString l = str.toLower();
+            if (l == "enabled")
+                return TriState::Enabled;
+            else if (l == "disabled")
+                return TriState::Disabled;
+            else if (l == "default")
+                return TriState::Default;
+            else
+                return TriState::Default;
+        };
+
+        static auto triStateToString = [](TriState state) -> QString {
+            if (state == TriState::Enabled)
+                return "enabled";
+            else if (state == TriState::Disabled)
+                return "disabled";
+            return "default";
+        };
+
+        settings.new_usertype<TriStateAspect>(
+            "TriStateAspect",
+            "create",
+            [](const sol::table &options) {
+                return createAspectFromTable<TriStateAspect>(
+                    options,
+                    [](TriStateAspect *aspect, const std::string &key, const sol::object &value) {
+                        if (key == "defaultValue")
+                            aspect->setDefaultValue(triStateFromString(value.as<QString>()));
+                        else if (key == "value")
+                            aspect->setValue(triStateFromString(value.as<QString>()));
+                        else
+                            baseAspectCreate(aspect, key, value);
+                    });
+            },
+            "value",
+            sol::property(
+                [](TriStateAspect *a) { return triStateToString(a->value()); },
+                [](TriStateAspect *a, const QString &v) { a->setValue(triStateFromString(v)); }),
+            "volatileValue",
+            sol::property(
+                [](TriStateAspect *a) {
+                    return triStateToString(TriState::fromInt(a->volatileValue()));
+                },
+                [](TriStateAspect *a, const QString &v) {
+                    a->setVolatileValue(triStateFromString(v).toInt());
+                }),
+            "defaultValue",
+            sol::property([](TriStateAspect *a) { return triStateToString(a->defaultValue()); }),
+            sol::base_classes,
+            sol::bases<SelectionAspect, TypedAspect<int>, BaseAspect>());
+
+        settings.new_usertype<TextDisplay>(
+            "TextDisplay",
+            "create",
+            [](const sol::table &options) {
+                return createAspectFromTable<TextDisplay>(
+                    options,
+                    [](TextDisplay *aspect, const std::string &key, const sol::object &value) {
+                        if (key == "text") {
+                            aspect->setText(value.as<QString>());
+                        } else if (key == "iconType") {
+                            const QString type = value.as<QString>().toLower();
+
+                            if (type.isEmpty() || type == "None")
+                                aspect->setIconType(Utils::InfoLabel::InfoType::None);
+                            else if (type == "information")
+                                aspect->setIconType(Utils::InfoLabel::InfoType::Information);
+                            else if (type == "warning")
+                                aspect->setIconType(Utils::InfoLabel::InfoType::Warning);
+                            else if (type == "error")
+                                aspect->setIconType(Utils::InfoLabel::InfoType::Error);
+                            else if (type == "ok")
+                                aspect->setIconType(Utils::InfoLabel::InfoType::Ok);
+                            else if (type == "notok")
+                                aspect->setIconType(Utils::InfoLabel::InfoType::NotOk);
+                            else
+                                aspect->setIconType(Utils::InfoLabel::InfoType::None);
+                        } else {
+                            baseAspectCreate(aspect, key, value);
+                        }
+                    });
+            },
+            sol::base_classes,
+            sol::bases<BaseAspect>());
+
+        settings.new_usertype<AspectList>(
+            "AspectList",
+            "create",
+            [](const sol::table &options) {
+                return createAspectFromTable<AspectList>(
+                    options,
+                    [](AspectList *aspect, const std::string &key, const sol::object &value) {
+                        if (key == "createItemFunction") {
+                            aspect->setCreateItemFunction([func = value.as<sol::function>()]()
+                                                              -> std::shared_ptr<BaseAspect> {
+                                auto res = Lua::LuaEngine::safe_call<std::shared_ptr<BaseAspect>>(
+                                    func);
+                                QTC_ASSERT_EXPECTED(res, return nullptr);
+                                return *res;
+                            });
+                        } else if (key == "onItemAdded") {
+                            aspect->setItemAddedCallback([func = value.as<sol::function>()](
+                                                             std::shared_ptr<BaseAspect> item) {
+                                auto res = Lua::LuaEngine::void_safe_call(func, item);
+                                QTC_CHECK_EXPECTED(res);
+                            });
+                        } else if (key == "onItemRemoved") {
+                            aspect->setItemRemovedCallback([func = value.as<sol::function>()](
+                                                               std::shared_ptr<BaseAspect> item) {
+                                auto res = Lua::LuaEngine::void_safe_call(func, item);
+                                QTC_CHECK_EXPECTED(res);
+                            });
+                        } else {
+                            baseAspectCreate(aspect, key, value);
+                        }
+                    });
+            },
+            "createAndAddItem",
+            &AspectList::createAndAddItem,
+            "foreach",
+            [](AspectList *a, const sol::function &clbk) {
+                a->forEachItem<BaseAspect>([clbk](std::shared_ptr<BaseAspect> item) {
+                    auto res = Lua::LuaEngine::void_safe_call(clbk, item);
+                    QTC_CHECK_EXPECTED(res);
+                });
+            },
+            "enumerate",
+            [](AspectList *a, const sol::function &clbk) {
+                a->forEachItem<BaseAspect>([clbk](std::shared_ptr<BaseAspect> item, int idx) {
+                    auto res = Lua::LuaEngine::void_safe_call(clbk, item, idx);
+                    QTC_CHECK_EXPECTED(res);
+                });
+            },
+            sol::base_classes,
+            sol::bases<BaseAspect>());
+
+        class OptionsPage : public Core::IOptionsPage
+        {
+        public:
+            OptionsPage(const sol::table &options)
+            {
+                setId(Id::fromString(options.get<QString>("id")));
+                setDisplayName(options.get<QString>("displayName"));
+                setCategory(Id::fromString(options.get<QString>("categoryId")));
+                setDisplayCategory(options.get<QString>("displayCategory"));
+                setCategoryIconPath(
+                    FilePath::fromUserInput(options.get<QString>("categoryIconPath")));
+                AspectContainer *container = options.get<AspectContainer *>("aspectContainer");
+                setSettingsProvider([container]() { return container; });
+            }
+        };
+
+        settings.new_usertype<OptionsPage>("OptionsPage", "create", [](const sol::table &options) {
+            return std::make_unique<OptionsPage>(options);
+        });
+
+        // clang-format off
+        settings["StringDisplayStyle"] = l.create_table_with(
+            "Label", StringAspect::DisplayStyle::LabelDisplay,
+            "LineEdit", StringAspect::DisplayStyle::LineEditDisplay,
+            "TextEdit", StringAspect::DisplayStyle::TextEditDisplay,
+            "PasswordLineEdit", StringAspect::DisplayStyle::PasswordLineEditDisplay
+        );
+
+        settings["CheckBoxPlacement"] = l.create_table_with(
+            "Top", CheckBoxPlacement::Top,
+            "Right", CheckBoxPlacement::Right
+        );
+        settings["Kind"] = l.create_table_with(
+            "ExistingDirectory", PathChooser::Kind::ExistingDirectory,
+            "Directory", PathChooser::Kind::Directory,
+            "File", PathChooser::Kind::File,
+            "SaveFile", PathChooser::Kind::SaveFile,
+            "ExistingCommand", PathChooser::Kind::ExistingCommand,
+            "Command", PathChooser::Kind::Command,
+            "Any", PathChooser::Kind::Any
+        );
+        settings["LabelPlacement"] = l.create_table_with(
+            "AtCheckBox", BoolAspect::LabelPlacement::AtCheckBox,
+            "Compact", BoolAspect::LabelPlacement::Compact,
+            "InExtraLabel", BoolAspect::LabelPlacement::InExtraLabel
+        );
+        // clang-format on
+
+        return settings;
+    });
+}
+
+} // namespace Lua::Internal
diff --git a/src/plugins/lua/bindings/utils.cpp b/src/plugins/lua/bindings/utils.cpp
new file mode 100644
index 0000000000..7893a1e5e0
--- /dev/null
+++ b/src/plugins/lua/bindings/utils.cpp
@@ -0,0 +1,143 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "../luaengine.h"
+#include "../luaqttypes.h"
+
+#include <utils/async.h>
+#include <utils/futuresynchronizer.h>
+#include <utils/hostosinfo.h>
+
+#include <QTimer>
+
+using namespace Utils;
+
+namespace Lua::Internal {
+
+void addUtilsModule()
+{
+    LuaEngine::registerProvider(
+        "Utils",
+        [futureSync = Utils::FutureSynchronizer()](sol::state_view lua) mutable -> sol::object {
+            auto async = lua.script("return require('async')", "_utils_").get<sol::table>();
+
+            sol::table utils = lua.create_table();
+
+            utils.set_function("waitms_cb", [](int ms, const sol::function &cb) {
+                QTimer::singleShot(ms, &LuaEngine::instance(), [cb]() { cb(); });
+            });
+
+            auto dirEntries_cb =
+                [&futureSync](const FilePath &p, const sol::table &options, const sol::function &cb) {
+                    const QStringList nameFilters = options.get_or<QStringList>("nameFilters", {});
+                    QDir::Filters fileFilters
+                        = (QDir::Filters) options.get_or<int>("fileFilters", QDir::NoFilter);
+                    QDirIterator::IteratorFlags flags
+                        = (QDirIterator::IteratorFlags)
+                              options.get_or<int>("flags", QDirIterator::NoIteratorFlags);
+
+                    FileFilter filter(nameFilters, fileFilters, flags);
+
+                    QFuture<FilePath> future = Utils::asyncRun(
+                        [p, filter](QPromise<FilePath> &promise) {
+                            p.iterateDirectory(
+                                [&promise](const FilePath &item) {
+                                    if (promise.isCanceled())
+                                        return IterationPolicy::Stop;
+
+                                    promise.addResult(item);
+                                    return IterationPolicy::Continue;
+                                },
+                                filter);
+                        });
+
+                    futureSync.addFuture<FilePath>(future);
+
+                    Utils::onFinished<FilePath>(
+                        future, &LuaEngine::instance(), [cb](const QFuture<FilePath> &future) {
+                            cb(future.results());
+                        });
+                };
+
+            auto searchInPath_cb = [&futureSync](const FilePath &p, const sol::function &cb) {
+                QFuture<FilePath> future = Utils::asyncRun(
+                    [p](QPromise<FilePath> &promise) { promise.addResult(p.searchInPath()); });
+
+                futureSync.addFuture<FilePath>(future);
+
+                Utils::onFinished<FilePath>(
+                    future, &LuaEngine::instance(), [cb](const QFuture<FilePath> &future) {
+                        cb(future.result());
+                    });
+            };
+
+            utils.set_function("__dirEntries_cb__", dirEntries_cb);
+            utils.set_function("__searchInPath_cb__", searchInPath_cb);
+
+            sol::function wrap = async["wrap"].get<sol::function>();
+
+            utils["waitms"] = wrap(utils["waitms_cb"]);
+
+            auto hostOsInfoType = utils.new_usertype<HostOsInfo>("HostOsInfo");
+            hostOsInfoType["isWindowsHost"] = &HostOsInfo::isWindowsHost;
+            hostOsInfoType["isMacHost"] = &HostOsInfo::isMacHost;
+            hostOsInfoType["isLinuxHost"] = &HostOsInfo::isLinuxHost;
+            hostOsInfoType["os"] = sol::var([]() {
+                if (HostOsInfo::isMacHost())
+                    return "mac";
+                else if (HostOsInfo::isLinuxHost())
+                    return "linux";
+                else if (HostOsInfo::isWindowsHost())
+                    return "windows";
+                else
+                    return "unknown";
+            }());
+
+            sol::usertype<FilePath> filePathType = utils.new_usertype<FilePath>(
+                "FilePath",
+                sol::call_constructor,
+                sol::constructors<FilePath()>(),
+                sol::meta_function::to_string,
+                &FilePath::toUserOutput,
+                "fromUserInput",
+                &FilePath::fromUserInput,
+                "exists",
+                &FilePath::exists,
+                "resolveSymlinks",
+                &FilePath::resolveSymlinks,
+                "isExecutableFile",
+                &FilePath::isExecutableFile,
+                "isDir",
+                &FilePath::isDir,
+                "nativePath",
+                &FilePath::nativePath,
+                "toUserOutput",
+                &FilePath::toUserOutput,
+                "fileName",
+                &FilePath::fileName,
+                "currentWorkingPath",
+                &FilePath::currentWorkingPath,
+                "parentDir",
+                &FilePath::parentDir,
+                "suffix",
+                &FilePath::suffix,
+                "completeSuffix",
+                &FilePath::completeSuffix,
+                "isAbsolutePath",
+                &FilePath::isAbsolutePath,
+                "resolvePath",
+                sol::overload(
+                    [](const FilePath &p, const QString &path) { return p.resolvePath(path); },
+                    [](const FilePath &p, const FilePath &path) { return p.resolvePath(path); }));
+
+            utils["FilePath"]["dirEntries_cb"] = utils["__dirEntries_cb__"];
+            utils["FilePath"]["dirEntries"] = wrap(utils["__dirEntries_cb__"]);
+
+            utils["FilePath"]["searchInPath_cb"] = utils["__searchInPath_cb__"];
+            utils["FilePath"]["searchInPath"] = wrap(utils["__searchInPath_cb__"]);
+
+            return utils;
+        });
+}
+
+} // namespace Lua::Internal
diff --git a/src/plugins/lua/generateqtbindings.cpp b/src/plugins/lua/generateqtbindings.cpp
new file mode 100644
index 0000000000..c7ed25dfd8
--- /dev/null
+++ b/src/plugins/lua/generateqtbindings.cpp
@@ -0,0 +1,401 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "lua_global.h"
+
+#include "luaapiregistry.h"
+#include "luaengine.h"
+
+#include <utils/layoutbuilder.h>
+
+#include <QAbstractButton>
+#include <QAbstractSlider>
+#include <QAbstractSpinBox>
+#include <QCalendarWidget>
+#include <QComboBox>
+#include <QDialog>
+#include <QDialogButtonBox>
+#include <QDockWidget>
+#include <QElapsedTimer>
+#include <QFocusFrame>
+#include <QFrame>
+#include <QGroupBox>
+#include <QKeySequenceEdit>
+#include <QLineEdit>
+#include <QMainWindow>
+#include <QMdiSubWindow>
+#include <QMenu>
+#include <QMenuBar>
+#include <QMetaProperty>
+#include <QProgressBar>
+#include <QRubberBand>
+#include <QSizeGrip>
+#include <QSplashScreen>
+#include <QSplitterHandle>
+#include <QStatusBar>
+#include <QTabBar>
+#include <QTabWidget>
+#include <QToolBar>
+#include <QWizardPage>
+
+#include <fstream>
+#include <iostream>
+#include <valarray>
+
+namespace Lua::Internal {
+
+QStringList baseClasses(const QMetaObject *metaObject)
+{
+    QStringList bases;
+    const QMetaObject *base = metaObject;
+    while ((base = base->superClass())) {
+        bases << QString::fromLocal8Bit(base->className());
+    }
+    return bases;
+}
+
+bool isBaseClassProperty(QString name, const QMetaObject *metaObject)
+{
+    const QMetaObject *base = metaObject;
+    while ((base = base->superClass())) {
+        for (int i = 0; i < base->propertyCount(); ++i) {
+            QMetaProperty p = base->property(i);
+            if (QString::fromLocal8Bit(p.name()) == name)
+                return true;
+        }
+    }
+    return false;
+}
+
+template<class T>
+QString createQObjectRegisterCode()
+{
+    // Add new types here when you've added "sol_lua_check, sol_lua_get and sol_lua_push" for them.
+    // clang-format off
+    static const QStringList whiteListedTypes = {
+        "bool", "int", "double", "float",
+        "QString", "QRect"};
+    // clang-format on
+
+    auto &metaObject = T::staticMetaObject;
+    auto className = QString::fromLocal8Bit(metaObject.className());
+
+    QStringList parts = {};
+
+    // properties
+    for (int i = 0; i < metaObject.propertyCount(); ++i) {
+        QMetaProperty p = metaObject.property(i);
+        QMetaType t = p.metaType();
+        QString typeName = QString::fromLocal8Bit(t.name());
+        QString propName = QString::fromLocal8Bit(p.name());
+        if (isBaseClassProperty(propName, &metaObject))
+            continue;
+
+        if (!p.isEnumType() && !whiteListedTypes.contains(typeName)) {
+            qDebug() << "Skipping" << p.name() << "of type" << typeName
+                     << "as it is not whitelisted";
+            continue;
+        }
+
+        QString propTemplate
+            = QString("    \"%1\",\nsol::property(").arg(QString::fromLocal8Bit(p.name()));
+
+        if (p.isReadable()) {
+            QString readTemplate;
+
+            if (p.isEnumType()) {
+                readTemplate = QString(R"([](const %1 *obj) -> const char * {
+                    auto p = %1::staticMetaObject.property(%2);
+                    int v = p.read(obj).toInt();
+                    return p.enumerator().valueToKey(v);
+            })")
+                                   .arg(className)
+                                   .arg(i);
+
+            } else {
+                readTemplate = QString(R"([](const %1 *obj) -> %2 {
+    return qvariant_cast<%2>(
+        %1::staticMetaObject.property(%3).read(obj));
+    })")
+                                   .arg(className)
+                                   .arg(typeName)
+                                   .arg(i);
+            }
+
+            propTemplate += readTemplate;
+        }
+
+        if (p.isWritable()) {
+            QString writeTemplate = ",\n";
+
+            if (p.isEnumType()) {
+                writeTemplate += QString(R"([](%1 *obj, const char *v) {
+                    auto p = %1::staticMetaObject.property(%2);
+                    int i = p.enumerator().keyToValue(v);
+                    p.write(obj, i);
+            })")
+                                     .arg(className)
+                                     .arg(i);
+
+            } else {
+                writeTemplate += QString(R"([](%1 *obj, %2 v) {
+    %1::staticMetaObject.property(%3).write(obj, QVariant::fromValue(v));
+    })")
+                                     .arg(className)
+                                     .arg(typeName)
+                                     .arg(i);
+            }
+
+            propTemplate += writeTemplate;
+        }
+
+        propTemplate += ")";
+
+        parts << propTemplate;
+    }
+
+    // Methods
+
+    /*for (int i = 0; i < metaObject.methodCount(); i++) {
+        QMetaMethod m = metaObject.method(i);
+        QString methodTemplate;
+        if (m.methodType() == QMetaMethod::Signal) {
+            QString name = QString::fromLocal8Bit(m.name());
+            name[0] = name[0].toUpper();
+            name = "on" + name;
+
+            methodTemplate = QString("    \"%1\",\n").arg(name);
+
+
+
+        } else if (m.methodType() == QMetaMethod::Slot) {
+        } else if (m.methodType() == QMetaMethod::Method) {
+        } else if (m.methodType() == QMetaMethod::Constructor) {
+        } else {
+            qDebug() << "Unknown method type" << m.methodType();
+        }
+
+        templateString += methodTemplate;
+    }*/
+
+    // Generate base classes
+    if (metaObject.superClass()) {
+        parts << QString("sol::base_classes,\nsol::bases<%1>()")
+                     .arg(baseClasses(&metaObject).join(','));
+    }
+
+    const QString registerFunctionTemplate = QString(R"(
+static void register%1Bindings(sol::state &lua) {
+    lua.new_usertype<%1>("%1",
+                         %2
+    );
+}
+    )")
+                                                 .arg(className)
+                                                 .arg(parts.join(",\n"));
+
+    return registerFunctionTemplate;
+}
+
+template<class... Classes>
+QStringList createQObjectRegisterCodes()
+{
+    QStringList result;
+    ((result << createQObjectRegisterCode<Classes>()), ...);
+    return result;
+}
+
+template<class... Classes>
+QStringList createRegisterCalls()
+{
+    QStringList result;
+    ((result << QString("register%1Bindings(lua);")
+                    .arg(QString::fromLocal8Bit(Classes::staticMetaObject.className()))),
+     ...);
+    return result;
+}
+
+template<class... Classes>
+QStringList createIncludeCalls()
+{
+    QStringList result;
+    ((result << QString("#include <%1>")
+                    .arg(QString::fromLocal8Bit(Classes::staticMetaObject.className()))),
+     ...);
+    return result;
+}
+
+template<class... Classes>
+QString createBindings()
+{
+    QStringList registerFunctions = createQObjectRegisterCodes<Classes...>();
+
+    QString finalFunction = QString(R"(
+void registerUiBindings() {
+    auto &lua = LuaEngine::instance().lua();
+    %1
+}
+    )")
+                                .arg(createRegisterCalls<Classes...>().join('\n'));
+
+    return QString(R"(
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "lua_global.h"
+#include "luaengine.h"
+
+#include <QMetaProperty>
+
+%1
+
+namespace Lua::Internal
+{
+    %2
+
+    %3
+}
+    )")
+        .arg(createIncludeCalls<Classes...>().join('\n'))
+        .arg(registerFunctions.join('\n'))
+        .arg(finalFunction);
+}
+
+void createWidgetBindings()
+{
+    std::ofstream out("/tmp/bindings.cpp", std::ios::out | std::ios::trunc);
+
+    out << createBindings<QObject,
+                          QWidget,
+                          QDialog,
+                          QAbstractButton,
+                          QAbstractSlider,
+                          QAbstractSpinBox,
+                          QCalendarWidget,
+                          QComboBox,
+                          QDialogButtonBox,
+                          QDockWidget,
+                          QFocusFrame,
+                          QFrame,
+                          QGroupBox,
+                          QKeySequenceEdit,
+                          QLineEdit,
+                          QMainWindow,
+                          QMdiSubWindow,
+                          QMenu,
+                          QMenuBar,
+                          QProgressBar,
+                          QRubberBand,
+                          QSizeGrip,
+                          QSplashScreen,
+                          QSplitterHandle,
+                          QStatusBar,
+                          QTabBar,
+                          QTabWidget,
+                          QToolBar,
+                          QWizardPage>()
+               .toStdString()
+        << std::endl;
+
+    qDebug() << "Done!";
+}
+
+template<typename... T>
+std::valarray<QString> createTypeBinding(QString typeName, QString fieldTypeName, T... fields)
+{
+    QString cppTemplateStr = R"(
+// %1
+bool sol_lua_check(sol::types<%1>,
+                   lua_State *L,
+                   int index,
+                   std::function<sol::check_handler_type> handler,
+                   sol::stack::record &tracking)
+{ return sol::stack::check<sol::table>(L, index, handler, tracking); }
+%1 sol_lua_get(sol::types<%1>, lua_State *L, int index, sol::stack::record &tracking)
+{
+    sol::state_view lua(L);
+    sol::table table = sol::stack::get<sol::table>(L, index, tracking);
+    return %2;
+}
+int sol_lua_push(sol::types<%1>, lua_State *L, const %1 &value)
+{
+    sol::state_view lua(L);
+    sol::table table = lua.create_table();
+    %3;
+    return sol::stack::push(L, table);
+}
+)";
+
+    QString headerTemplateStr = R"(SOL_CONVERSION_FUNCTIONS(%1)
+)";
+
+    auto createField = [&](const std::pair<QString, QString> &field) {
+        return QString("table.get_or<%1, const char *, %1>(\"%2\", %3)")
+            .arg(fieldTypeName)
+            .arg(field.first)
+            .arg(field.second);
+    };
+    QString createTypeFromTable = QString("%1(%2)").arg(typeName).arg(
+        QStringList{createField(fields)...}.join(','));
+
+    QString createTableFromType
+        = QString("table.set(%1)")
+              .arg(QStringList{QString(R"("%1", value.%1())").arg(fields.first)...}.join(','));
+
+    return {cppTemplateStr.arg(typeName).arg(createTypeFromTable).arg(createTableFromType),
+            headerTemplateStr.arg(typeName)};
+}
+
+void createTypeBindings()
+{
+    std::valarray<QString> code = {"", R"(
+#define SOL_CONVERSION_FUNCTIONS(TYPE) \
+    bool LUA_EXPORT sol_lua_check(sol::types<TYPE>, \
+                                  lua_State *L, \
+                                  int index, \
+                                  std::function<sol::check_handler_type> handler, \
+                                  sol::stack::record &tracking); \
+    TYPE LUA_EXPORT sol_lua_get(sol::types<TYPE>, \
+                                lua_State *L, \
+                                int index, \
+                                sol::stack::record &tracking); \
+    int LUA_EXPORT sol_lua_push(sol::types<TYPE>, lua_State *L, const TYPE &rect);
+
+    SOL_CONVERSION_FUNCTIONS(QString)
+
+)"};
+
+    using T = std::pair<QString, QString>;
+
+    code += createTypeBinding("QRect",
+                              "int",
+                              T{"x", "0"},
+                              T{"y", "0"},
+                              T{"width", "0"},
+                              T{"height", "0"});
+    code += createTypeBinding("QSize", "int", T{"width", "0"}, T{"height", "0"});
+    code += createTypeBinding("QPoint", "int", T{"x", "0"}, T{"y", "0"});
+
+    code += createTypeBinding("QRectF",
+                              "qreal",
+                              T{"x", "0.0"},
+                              T{"y", "0.0"},
+                              T{"width", "0.0"},
+                              T{"height", "0.0"});
+    code += createTypeBinding("QSizeF", "qreal", T{"width", "0.0"}, T{"height", "0.0"});
+    code += createTypeBinding("QPointF", "qreal", T{"x", "0.0"}, T{"y", "0.0"});
+
+    code += createTypeBinding("QColor",
+                              "int",
+                              T{"red", "0"},
+                              T{"green", "0"},
+                              T{"blue", "0"},
+                              T{"alpha", "255"});
+
+    code[1] += "\n#undef SOL_CONVERSION_FUNCTIONS\n";
+
+    qDebug().noquote() << code[0];
+    qDebug().noquote() << code[1];
+}
+
+} // namespace Lua::Internal
diff --git a/src/plugins/lua/lua.qbs b/src/plugins/lua/lua.qbs
new file mode 100644
index 0000000000..e7f1507ba7
--- /dev/null
+++ b/src/plugins/lua/lua.qbs
@@ -0,0 +1,85 @@
+import qbs 1.0
+
+QtcPlugin {
+    name: "Lua"
+
+    Depends { name: "Core" }
+    Depends { name: "Qt"; submodules: ["network", "widgets"] }
+
+    Depends { name: "lua546" }
+    Depends { name: "sol2" }
+
+    files: [
+        // "generateqtbindings.cpp", // use this if you need to generate some code
+        "lua_global.h",
+        "luaengine.cpp",
+        "luaengine.h",
+        "luaplugin.cpp",
+        "luapluginspec.cpp",
+        "luapluginspec.h",
+        "luaqttypes.cpp",
+        "luaqttypes.h",
+        "luatr.h",
+        "luauibindings.cpp",
+    ]
+
+    Group {
+        name: "Bindings"
+        prefix: "bindings/"
+
+        files: [
+            "action.cpp",
+            "async.cpp",
+            "core.cpp",
+            "fetch.cpp",
+            "hook.cpp",
+            "inheritance.h",
+            "layout.cpp",
+            "messagemanager.cpp",
+            "qtcprocess.cpp",
+            "settings.cpp",
+            "utils.cpp",
+        ]
+
+        Properties {
+            condition: qbs.toolchain.contains("msvc")
+            cpp.cxxFlags: "/bigobj"
+        }
+    }
+
+    Group {
+        name: "Meta"
+        prefix: "meta/"
+
+        files: [
+            "action.lua",
+            "async.lua",
+            "core.lua",
+            "fetch.lua",
+            "layout.lua",
+            "lsp.lua",
+            "messagemanager.lua",
+            "process.lua",
+            "qt.lua",
+            "qtc.lua",
+            "settings.lua",
+            "simpletypes.lua",
+            "utils.lua",
+            "widgets.lua",
+            "wizard.lua",
+        ]
+    }
+
+    Group {
+        name: "Meta-Backup"
+        prefix: "metabackup/"
+        files: [
+            "qobject.lua",
+        ]
+    }
+
+    Export {
+        Depends { name: "sol2" }
+        Depends { name: "lua546" }
+    }
+}
diff --git a/src/plugins/lua/lua_global.h b/src/plugins/lua/lua_global.h
new file mode 100644
index 0000000000..e786361010
--- /dev/null
+++ b/src/plugins/lua/lua_global.h
@@ -0,0 +1,14 @@
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include <qglobal.h>
+
+#if defined(LUA_LIBRARY)
+#  define LUA_EXPORT Q_DECL_EXPORT
+#elif defined(LUA_STATIC_LIBRARY) // Abuse single files for manual tests
+#  define LUA_EXPORT
+#else
+#  define LUA_EXPORT Q_DECL_IMPORT
+#endif
diff --git a/src/plugins/lua/luaengine.cpp b/src/plugins/lua/luaengine.cpp
new file mode 100644
index 0000000000..a49af1a388
--- /dev/null
+++ b/src/plugins/lua/luaengine.cpp
@@ -0,0 +1,259 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "luaengine.h"
+
+#include "luapluginspec.h"
+
+#include <utils/algorithm.h>
+
+#include <QJsonArray>
+#include <QJsonObject>
+
+using namespace Utils;
+
+namespace Lua {
+
+class LuaEnginePrivate
+{
+public:
+    LuaEnginePrivate() {}
+
+    QHash<QString, LuaEngine::PackageProvider> m_providers;
+    QList<std::function<void(sol::state_view)>> m_autoProviders;
+
+    QMap<QString, std::function<void(sol::function)>> m_hooks;
+};
+
+static LuaEngine *s_instance = nullptr;
+
+LuaEngine &LuaEngine::instance()
+{
+    Q_ASSERT(s_instance);
+    return *s_instance;
+}
+
+LuaEngine::LuaEngine()
+    : d(new LuaEnginePrivate())
+{
+    s_instance = this;
+}
+
+LuaEngine::~LuaEngine()
+{
+    s_instance = nullptr;
+}
+
+void LuaEngine::registerProvider(const QString &packageName, const PackageProvider &provider)
+{
+    QTC_ASSERT(!instance().d->m_providers.contains(packageName), return);
+    instance().d->m_providers[packageName] = provider;
+}
+
+void LuaEngine::autoRegister(const std::function<void(sol::state_view)> &registerFunction)
+{
+    instance().d->m_autoProviders.append(registerFunction);
+}
+
+void LuaEngine::registerHook(QString name, const std::function<void(sol::function)> &hook)
+{
+    instance().d->m_hooks.insert("." + name, hook);
+}
+
+expected_str<void> LuaEngine::connectHooks(
+    sol::state_view lua, const sol::table &table, const QString &path)
+{
+    for (const auto &[k, v] : table) {
+        if (v.get_type() == sol::type::table) {
+            return connectHooks(lua, v.as<sol::table>(), QStringList{path, k.as<QString>()}.join("."));
+        } else if (v.get_type() == sol::type::function) {
+            QString hookName = QStringList{path, k.as<QString>()}.join(".");
+            auto it = d->m_hooks.find(hookName);
+            if (it == d->m_hooks.end())
+                return make_unexpected(QString("No hook named '%1' found").arg(hookName));
+            else
+                it.value()(v.as<sol::function>());
+        }
+    }
+
+    return {};
+}
+
+expected_str<void> LuaEngine::connectHooks(sol::state_view lua, const sol::table &hookTable)
+{
+    if (!hookTable)
+        return {};
+
+    return instance().connectHooks(lua, hookTable, "");
+}
+
+expected_str<LuaPluginSpec *> LuaEngine::loadPlugin(const Utils::FilePath &path)
+{
+    auto contents = path.fileContents();
+    if (!contents)
+        return make_unexpected(contents.error());
+
+    sol::state lua;
+
+    lua["print"] = [prefix = path.fileName()](sol::variadic_args va) {
+        qDebug().noquote() << "[" << prefix << "]" << variadicToStringList(va).join("\t");
+    };
+
+    auto result = lua.safe_script(
+        std::string_view(contents->data(), contents->size()),
+        sol::script_pass_on_error,
+        path.fileName().toUtf8().constData());
+
+    if (!result.valid()) {
+        sol::error err = result;
+        return make_unexpected(QString(QString::fromUtf8(err.what())));
+    }
+
+    if (result.get_type() != sol::type::table)
+        return make_unexpected(QString("Script did not return a table"));
+
+    sol::table pluginInfo = result.get<sol::table>();
+    if (!pluginInfo.valid())
+        return make_unexpected(QString("Script did not return a table with plugin info"));
+    return LuaPluginSpec::create(path, std::move(lua), pluginInfo);
+}
+
+expected_str<void> LuaEngine::prepareSetup(
+    sol::state_view &lua, const LuaPluginSpec &pluginSpec, sol::optional<sol::table> hookTable)
+{
+    // TODO: Only open libraries requested by the plugin
+    lua.open_libraries(
+        sol::lib::base,
+        sol::lib::bit32,
+        sol::lib::coroutine,
+        sol::lib::debug,
+        sol::lib::io,
+        sol::lib::math,
+        sol::lib::os,
+        sol::lib::package,
+        sol::lib::string,
+        sol::lib::table,
+        sol::lib::utf8);
+
+    const QString searchPath = (pluginSpec.location() / "?.lua").toUserOutput();
+    lua["package"]["path"] = searchPath.toStdString();
+
+    // TODO: only register what the plugin requested
+    for (const auto &[name, func] : d->m_providers.asKeyValueRange()) {
+        lua["package"]["preload"][name.toStdString()] = [func = func](const sol::this_state &s) {
+            return func(s);
+        };
+    }
+
+    for (const auto &func : d->m_autoProviders)
+        func(lua);
+
+    if (hookTable)
+        return LuaEngine::connectHooks(lua, *hookTable);
+
+    return {};
+}
+
+bool LuaEngine::isCoroutine(lua_State *state)
+{
+    bool ismain = lua_pushthread(state) == 1;
+    return !ismain;
+}
+
+template<typename KeyType>
+static void setFromJson(sol::table &t, KeyType k, const QJsonValue &v)
+{
+    if (v.isDouble())
+        t[k] = v.toDouble();
+    else if (v.isBool())
+        t[k] = v.toBool();
+    else if (v.isString())
+        t[k] = v.toString();
+    else if (v.isObject())
+        t[k] = LuaEngine::toTable(t.lua_state(), v);
+    else if (v.isArray())
+        t[k] = LuaEngine::toTable(t.lua_state(), v);
+}
+
+sol::table LuaEngine::toTable(const sol::state_view &lua, const QJsonValue &v)
+{
+    sol::table table(lua, sol::create);
+
+    if (v.isObject()) {
+        QJsonObject o = v.toObject();
+        for (auto it = o.constBegin(); it != o.constEnd(); ++it)
+            setFromJson(table, it.key(), it.value());
+    } else if (v.isArray()) {
+        int i = 1;
+        for (const auto &v : v.toArray())
+            setFromJson(table, i++, v);
+    }
+
+    return table;
+}
+
+QJsonValue toJsonValue(const sol::object &object);
+
+QJsonValue toJsonValue(const sol::table &table)
+{
+    if (table.get<std::optional<sol::object>>(1)) {
+        // Is Array
+        QJsonArray arr;
+
+        for (size_t i = 0; i < table.size(); ++i) {
+            std::optional<sol::object> v = table.get<std::optional<sol::object>>(i + 1);
+            if (!v)
+                continue;
+            arr.append(toJsonValue(*v));
+        }
+
+        return arr;
+    }
+
+    // Is Object
+    QJsonObject obj;
+    for (const auto &[k, v] : table)
+        obj[k.as<QString>()] = toJsonValue(v);
+
+    return obj;
+}
+
+QJsonValue toJsonValue(const sol::object &object)
+{
+    switch (object.get_type()) {
+    case sol::type::lua_nil:
+        return {};
+    case sol::type::boolean:
+        return object.as<bool>();
+    case sol::type::number:
+        return object.as<double>();
+    case sol::type::string:
+        return object.as<QString>();
+    case sol::type::table:
+        return toJsonValue(object.as<sol::table>());
+    default:
+        return {};
+    }
+}
+
+QJsonValue LuaEngine::toJson(const sol::table &table)
+{
+    return toJsonValue(table);
+}
+
+QStringList LuaEngine::variadicToStringList(const sol::variadic_args &vargs)
+{
+    QStringList strings;
+    int n = vargs.size();
+    int i;
+    for (i = 1; i <= n; i++) {
+        size_t l;
+        const char *s = luaL_tolstring(vargs.lua_state(), i, &l);
+        if (s != nullptr)
+            strings.append(QString::fromUtf8(s, l));
+    }
+
+    return strings;
+}
+
+} // namespace Lua
diff --git a/src/plugins/lua/luaengine.h b/src/plugins/lua/luaengine.h
new file mode 100644
index 0000000000..a683f43f2d
--- /dev/null
+++ b/src/plugins/lua/luaengine.h
@@ -0,0 +1,112 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include "lua_global.h"
+
+#include <extensionsystem/iplugin.h>
+#include <extensionsystem/pluginspec.h>
+
+#include <utils/expected.h>
+#include <utils/filepath.h>
+
+#include <sol/sol.hpp>
+
+// this needs to be included after sol/sol.hpp!
+#include "luaqttypes.h"
+
+#include <QJsonValue>
+
+#include <memory>
+
+namespace Lua {
+class LuaEnginePrivate;
+class LuaPluginSpec;
+
+namespace Internal {
+class LuaPlugin;
+}
+
+struct CoroutineState
+{
+    bool isMainThread;
+};
+
+class LUA_EXPORT LuaEngine final : public QObject
+{
+    friend class Internal::LuaPlugin;
+
+protected:
+    LuaEngine();
+
+public:
+    using PackageProvider = std::function<sol::object(sol::state_view)>;
+
+    ~LuaEngine();
+    static LuaEngine &instance();
+
+    Utils::expected_str<LuaPluginSpec *> loadPlugin(const Utils::FilePath &path);
+    Utils::expected_str<void> prepareSetup(
+        sol::state_view &lua, const LuaPluginSpec &pluginSpec, sol::optional<sol::table> hookTable);
+
+    static void registerProvider(const QString &packageName, const PackageProvider &provider);
+    static void autoRegister(const std::function<void(sol::state_view)> &registerFunction);
+    static void registerHook(QString name, const std::function<void(sol::function)> &hookProvider);
+
+    static Utils::expected_str<void> connectHooks(sol::state_view lua, const sol::table &hookTable);
+
+    static bool isCoroutine(lua_State *state);
+
+    static sol::table toTable(const sol::state_view &lua, const QJsonValue &v);
+    static QJsonValue toJson(const sol::table &t);
+
+    template<class T>
+    static void checkKey(const sol::table &table, const QString &key)
+    {
+        if (table[key].template is<T>())
+            return;
+        if (!table[key].valid())
+            throw sol::error("Expected " + key.toStdString() + " to be defined");
+        throw sol::error(
+            "Expected " + key.toStdString() + " to be of type " + sol::detail::demangle<T>());
+    }
+
+    static QStringList variadicToStringList(const sol::variadic_args &vargs);
+
+    template<typename R, typename... Args>
+    static Utils::expected_str<R> safe_call(const sol::protected_function &function, Args &&...args)
+    {
+        sol::protected_function_result result = function(std::forward<Args>(args)...);
+        if (!result.valid()) {
+            sol::error err = result;
+            return Utils::make_unexpected(QString::fromLocal8Bit(err.what()));
+        }
+        try {
+            return result.get<R>();
+        } catch (std::runtime_error &e) {
+            return Utils::make_unexpected(QString::fromLocal8Bit(e.what()));
+        }
+    }
+
+    template<typename... Args>
+    static Utils::expected_str<void> void_safe_call(
+        const sol::protected_function &function, Args &&...args)
+    {
+        sol::protected_function_result result = function(std::forward<Args>(args)...);
+        if (!result.valid()) {
+            sol::error err = result;
+            return Utils::make_unexpected(QString::fromLocal8Bit(err.what()));
+        }
+        return {};
+    }
+
+protected:
+    Utils::expected_str<void> connectHooks(
+        sol::state_view lua, const sol::table &table, const QString &path);
+
+private:
+    std::unique_ptr<LuaEnginePrivate> d;
+};
+
+} // namespace Lua
diff --git a/src/plugins/lua/luaplugin.cpp b/src/plugins/lua/luaplugin.cpp
new file mode 100644
index 0000000000..047847459c
--- /dev/null
+++ b/src/plugins/lua/luaplugin.cpp
@@ -0,0 +1,102 @@
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "luaengine.h"
+#include "luapluginspec.h"
+
+#include <coreplugin/messagemanager.h>
+
+#include <extensionsystem/iplugin.h>
+#include <extensionsystem/pluginmanager.h>
+
+#include <utils/algorithm.h>
+
+#include <QDebug>
+
+using namespace Core;
+using namespace Utils;
+using namespace ExtensionSystem;
+
+namespace Lua::Internal {
+
+void addAsyncModule();
+void addFetchModule();
+void addActionModule();
+void addUtilsModule();
+void addMessageManagerModule();
+void addProcessModule();
+void addSettingsModule();
+void addLayoutModule();
+void addQtModule();
+void addCoreModule();
+void addHookModule();
+
+class LuaPlugin : public IPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "Lua.json")
+
+private:
+    std::unique_ptr<LuaEngine> m_luaEngine;
+
+public:
+    LuaPlugin() {}
+    ~LuaPlugin() override = default;
+
+    void initialize() final
+    {
+        m_luaEngine.reset(new LuaEngine());
+
+        addAsyncModule();
+        addFetchModule();
+        addActionModule();
+        addUtilsModule();
+        addMessageManagerModule();
+        addProcessModule();
+        addSettingsModule();
+        addLayoutModule();
+        addQtModule();
+        addCoreModule();
+        addHookModule();
+    }
+
+    bool delayedInitialize() final
+    {
+        scanForPlugins(transform(PluginManager::pluginPaths(), [](const FilePath &path) {
+            return path / "lua-plugins";
+        }));
+
+        return true;
+    }
+
+    void scanForPlugins(const FilePaths &paths)
+    {
+        QSet<PluginSpec *> plugins;
+        for (const FilePath &path : paths) {
+            const FilePaths folders = path.dirEntries(
+                FileFilter({}, QDir::Dirs | QDir::NoDotAndDotDot));
+
+            for (const FilePath &folder : folders) {
+                const FilePath script = folder / (folder.baseName() + ".lua");
+                const expected_str<LuaPluginSpec *> result = m_luaEngine->loadPlugin(script);
+
+                if (!result) {
+                    qWarning() << "Failed to load plugin" << script << ":" << result.error();
+                    MessageManager::writeFlashing(tr("Failed to load plugin %1: %2")
+                                                      .arg(script.toUserOutput())
+                                                      .arg(result.error()));
+                    continue;
+                }
+
+                plugins.insert(*result);
+            }
+        }
+
+        PluginManager::addPlugins({plugins.begin(), plugins.end()});
+        PluginManager::loadPluginsAtRuntime(plugins);
+    }
+};
+
+} // namespace Lua::Internal
+
+#include "luaplugin.moc"
diff --git a/src/plugins/lua/luapluginspec.cpp b/src/plugins/lua/luapluginspec.cpp
new file mode 100644
index 0000000000..19d52dbf37
--- /dev/null
+++ b/src/plugins/lua/luapluginspec.cpp
@@ -0,0 +1,141 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "luapluginspec.h"
+
+#include "luaengine.h"
+#include "luatr.h"
+
+#include <extensionsystem/extensionsystemtr.h>
+
+#include <utils/algorithm.h>
+#include <utils/expected.h>
+
+#include <QJsonDocument>
+#include <QLoggingCategory>
+
+Q_LOGGING_CATEGORY(luaPluginSpecLog, "qtc.lua.pluginspec", QtWarningMsg)
+
+using namespace ExtensionSystem;
+using namespace Utils;
+
+namespace Lua {
+
+class LuaScriptPluginPrivate
+{
+public:
+    QString name;
+    QList<QString> cppDepends;
+    sol::function setup;
+    sol::environment pluginEnvironment;
+};
+
+class LuaPluginSpecPrivate
+{
+public:
+    FilePath pluginScriptPath;
+
+    sol::state lua;
+    sol::table pluginTable;
+
+    sol::function setupFunction;
+};
+
+LuaPluginSpec::LuaPluginSpec()
+    : d(new LuaPluginSpecPrivate())
+{}
+
+expected_str<LuaPluginSpec *> LuaPluginSpec::create(const FilePath &filePath,
+                                                    sol::state lua,
+                                                    sol::table pluginTable)
+{
+    std::unique_ptr<LuaPluginSpec> pluginSpec(new LuaPluginSpec());
+
+    pluginSpec->d->lua = std::move(lua);
+    pluginSpec->d->pluginTable = pluginTable;
+
+    pluginSpec->d->setupFunction = pluginTable.get_or<sol::function>("setup", {});
+    if (!pluginSpec->d->setupFunction)
+        return make_unexpected(QString("Plugin info table did not contain a setup function"));
+
+    QJsonValue v = LuaEngine::toJson(pluginTable);
+    if (luaPluginSpecLog().isDebugEnabled()) {
+        qCDebug(luaPluginSpecLog).noquote()
+            << "Plugin info table:" << QJsonDocument(v.toObject()).toJson(QJsonDocument::Indented);
+    }
+
+    QJsonObject obj = v.toObject();
+    obj["SoftLoadable"] = true;
+
+    auto r = pluginSpec->PluginSpec::readMetaData(obj);
+    if (!r)
+        return make_unexpected(r.error());
+
+    pluginSpec->setFilePath(filePath);
+    pluginSpec->setLocation(filePath.parentDir());
+
+    pluginSpec->d->pluginScriptPath = filePath;
+
+    return pluginSpec.release();
+}
+
+ExtensionSystem::IPlugin *LuaPluginSpec::plugin() const
+{
+    return nullptr;
+}
+
+// LuaPluginSpec::For internal use {}
+bool LuaPluginSpec::loadLibrary()
+{
+    // We are actually already loaded, but we need to set the state to loaded as well.
+    // We cannot set it earlier as it is used as a state machine that would break for earlier steps.
+    setState(PluginSpec::State::Loaded);
+    return true;
+}
+bool LuaPluginSpec::initializePlugin()
+{
+    expected_str<void> setupResult
+        = LuaEngine::instance()
+              .prepareSetup(d->lua, *this, d->pluginTable.get<sol::optional<sol::table>>("hooks"));
+
+    if (!setupResult) {
+        setError(Lua::Tr::tr("Failed to prepare plugin setup: %1").arg(setupResult.error()));
+        return false;
+    }
+
+    auto result = d->setupFunction.call();
+
+    if (result.get_type() == sol::type::boolean && result.get<bool>() == false) {
+        setError(Lua::Tr::tr("Plugin setup function returned false"));
+        return false;
+    } else if (result.get_type() == sol::type::string) {
+        std::string error = result.get<sol::error>().what();
+        if (!error.empty()) {
+            setError(Lua::Tr::tr("Plugin setup function returned error: %1")
+                         .arg(QString::fromStdString(error)));
+            return false;
+        }
+    }
+
+    setState(PluginSpec::State::Initialized);
+    return true;
+}
+
+bool LuaPluginSpec::initializeExtensions()
+{
+    setState(PluginSpec::State::Running);
+    return true;
+}
+
+bool LuaPluginSpec::delayedInitialize()
+{
+    return true;
+}
+ExtensionSystem::IPlugin::ShutdownFlag LuaPluginSpec::stop()
+{
+    return ExtensionSystem::IPlugin::ShutdownFlag::SynchronousShutdown;
+}
+
+void LuaPluginSpec::kill() {}
+
+} // namespace Lua
diff --git a/src/plugins/lua/luapluginspec.h b/src/plugins/lua/luapluginspec.h
new file mode 100644
index 0000000000..208aa8f196
--- /dev/null
+++ b/src/plugins/lua/luapluginspec.h
@@ -0,0 +1,57 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include "sol/forward.hpp"
+
+#include <extensionsystem/iplugin.h>
+#include <extensionsystem/pluginspec.h>
+
+#include <utils/expected.h>
+#include <utils/filepath.h>
+
+#include <QString>
+
+namespace Lua {
+class LuaScriptPluginPrivate;
+class LuaPluginSpecPrivate;
+
+class LuaScriptPlugin : public ExtensionSystem::IPlugin
+{
+public:
+    LuaScriptPlugin() = delete;
+    LuaScriptPlugin(const LuaScriptPlugin &other);
+    LuaScriptPlugin(const std::shared_ptr<LuaScriptPluginPrivate> &d);
+
+    QString name() const;
+    QStringList cppDependencies() const;
+    void setup() const;
+
+private:
+    std::shared_ptr<LuaScriptPluginPrivate> d;
+};
+
+class LuaPluginSpec : public ExtensionSystem::PluginSpec
+{
+    std::unique_ptr<LuaPluginSpecPrivate> d;
+
+    LuaPluginSpec();
+
+public:
+    static Utils::expected_str<LuaPluginSpec *> create(const Utils::FilePath &filePath,
+                                                       sol::state lua,
+                                                       sol::table pluginTable);
+
+    ExtensionSystem::IPlugin *plugin() const override;
+
+    // For internal use only
+    bool loadLibrary() override;
+    bool initializePlugin() override;
+    bool initializeExtensions() override;
+    bool delayedInitialize() override;
+    ExtensionSystem::IPlugin::ShutdownFlag stop() override;
+    void kill() override;
+};
+
+} // namespace Lua
diff --git a/src/plugins/lua/luaqttypes.cpp b/src/plugins/lua/luaqttypes.cpp
new file mode 100644
index 0000000000..ad57e83062
--- /dev/null
+++ b/src/plugins/lua/luaqttypes.cpp
@@ -0,0 +1,314 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "luaengine.h"
+
+// This defines the conversion from QString to lua_string and vice versa
+bool sol_lua_check(sol::types<QString>,
+                   lua_State *L,
+                   int index,
+                   std::function<sol::check_handler_type> handler,
+                   sol::stack::record &tracking)
+{
+    // use sol's method for checking specifically for a string
+    return sol::stack::check<const char *>(L, index, handler, tracking);
+}
+
+QString sol_lua_get(sol::types<QString>, lua_State *L, int index, sol::stack::record &tracking)
+{
+    const char *str = sol::stack::get<const char *>(L, index, tracking);
+    return QString::fromLocal8Bit(str);
+}
+
+int sol_lua_push(sol::types<QString>, lua_State *L, const QString &qStr)
+{
+    // create table
+    sol::state_view lua(L);
+    // use base sol method to push the string
+    int amount = sol::stack::push(L, qStr.toLocal8Bit().data());
+    // return # of things pushed onto stack
+    return amount;
+}
+
+// QRect
+bool sol_lua_check(sol::types<QRect>,
+                   lua_State *L,
+                   int index,
+                   std::function<sol::check_handler_type> handler,
+                   sol::stack::record &tracking)
+{
+    return sol::stack::check<sol::table>(L, index, handler, tracking);
+}
+QRect sol_lua_get(sol::types<QRect>, lua_State *L, int index, sol::stack::record &tracking)
+{
+    sol::state_view lua(L);
+    sol::table table = sol::stack::get<sol::table>(L, index, tracking);
+    return QRect(table.get_or<int, const char *, int>("x", 0),
+                 table.get_or<int, const char *, int>("y", 0),
+                 table.get_or<int, const char *, int>("width", 0),
+                 table.get_or<int, const char *, int>("height", 0));
+}
+int sol_lua_push(sol::types<QRect>, lua_State *L, const QRect &value)
+{
+    sol::state_view lua(L);
+    sol::table table = lua.create_table();
+    table.set("x", value.x(), "y", value.y(), "width", value.width(), "height", value.height());
+    return sol::stack::push(L, table);
+}
+
+// QSize
+bool sol_lua_check(sol::types<QSize>,
+                   lua_State *L,
+                   int index,
+                   std::function<sol::check_handler_type> handler,
+                   sol::stack::record &tracking)
+{
+    return sol::stack::check<sol::table>(L, index, handler, tracking);
+}
+QSize sol_lua_get(sol::types<QSize>, lua_State *L, int index, sol::stack::record &tracking)
+{
+    sol::state_view lua(L);
+    sol::table table = sol::stack::get<sol::table>(L, index, tracking);
+    return QSize(table.get_or<int, const char *, int>("width", 0),
+                 table.get_or<int, const char *, int>("height", 0));
+}
+int sol_lua_push(sol::types<QSize>, lua_State *L, const QSize &value)
+{
+    sol::state_view lua(L);
+    sol::table table = lua.create_table();
+    table.set("width", value.width(), "height", value.height());
+    return sol::stack::push(L, table);
+}
+
+// QPoint
+bool sol_lua_check(sol::types<QPoint>,
+                   lua_State *L,
+                   int index,
+                   std::function<sol::check_handler_type> handler,
+                   sol::stack::record &tracking)
+{
+    return sol::stack::check<sol::table>(L, index, handler, tracking);
+}
+QPoint sol_lua_get(sol::types<QPoint>, lua_State *L, int index, sol::stack::record &tracking)
+{
+    sol::state_view lua(L);
+    sol::table table = sol::stack::get<sol::table>(L, index, tracking);
+    return QPoint(table.get_or<int, const char *, int>("x", 0),
+                  table.get_or<int, const char *, int>("y", 0));
+}
+int sol_lua_push(sol::types<QPoint>, lua_State *L, const QPoint &value)
+{
+    sol::state_view lua(L);
+    sol::table table = lua.create_table();
+    table.set("x", value.x(), "y", value.y());
+    return sol::stack::push(L, table);
+}
+
+// QRectF
+bool sol_lua_check(sol::types<QRectF>,
+                   lua_State *L,
+                   int index,
+                   std::function<sol::check_handler_type> handler,
+                   sol::stack::record &tracking)
+{
+    return sol::stack::check<sol::table>(L, index, handler, tracking);
+}
+QRectF sol_lua_get(sol::types<QRectF>, lua_State *L, int index, sol::stack::record &tracking)
+{
+    sol::state_view lua(L);
+    sol::table table = sol::stack::get<sol::table>(L, index, tracking);
+    return QRectF(table.get_or<qreal, const char *, qreal>("x", 0.0),
+                  table.get_or<qreal, const char *, qreal>("y", 0.0),
+                  table.get_or<qreal, const char *, qreal>("width", 0.0),
+                  table.get_or<qreal, const char *, qreal>("height", 0.0));
+}
+int sol_lua_push(sol::types<QRectF>, lua_State *L, const QRectF &value)
+{
+    sol::state_view lua(L);
+    sol::table table = lua.create_table();
+    table.set("x", value.x(), "y", value.y(), "width", value.width(), "height", value.height());
+    return sol::stack::push(L, table);
+}
+
+// QSizeF
+bool sol_lua_check(sol::types<QSizeF>,
+                   lua_State *L,
+                   int index,
+                   std::function<sol::check_handler_type> handler,
+                   sol::stack::record &tracking)
+{
+    return sol::stack::check<sol::table>(L, index, handler, tracking);
+}
+QSizeF sol_lua_get(sol::types<QSizeF>, lua_State *L, int index, sol::stack::record &tracking)
+{
+    sol::state_view lua(L);
+    sol::table table = sol::stack::get<sol::table>(L, index, tracking);
+    return QSizeF(table.get_or<qreal, const char *, qreal>("width", 0.0),
+                  table.get_or<qreal, const char *, qreal>("height", 0.0));
+}
+int sol_lua_push(sol::types<QSizeF>, lua_State *L, const QSizeF &value)
+{
+    sol::state_view lua(L);
+    sol::table table = lua.create_table();
+    table.set("width", value.width(), "height", value.height());
+    return sol::stack::push(L, table);
+}
+
+// QPointF
+bool sol_lua_check(sol::types<QPointF>,
+                   lua_State *L,
+                   int index,
+                   std::function<sol::check_handler_type> handler,
+                   sol::stack::record &tracking)
+{
+    return sol::stack::check<sol::table>(L, index, handler, tracking);
+}
+QPointF sol_lua_get(sol::types<QPointF>, lua_State *L, int index, sol::stack::record &tracking)
+{
+    sol::state_view lua(L);
+    sol::table table = sol::stack::get<sol::table>(L, index, tracking);
+    return QPointF(table.get_or<qreal, const char *, qreal>("x", 0.0),
+                   table.get_or<qreal, const char *, qreal>("y", 0.0));
+}
+int sol_lua_push(sol::types<QPointF>, lua_State *L, const QPointF &value)
+{
+    sol::state_view lua(L);
+    sol::table table = lua.create_table();
+    table.set("x", value.x(), "y", value.y());
+    return sol::stack::push(L, table);
+}
+
+// QColor
+bool sol_lua_check(sol::types<QColor>,
+                   lua_State *L,
+                   int index,
+                   std::function<sol::check_handler_type> handler,
+                   sol::stack::record &tracking)
+{
+    return sol::stack::check<sol::table>(L, index, handler, tracking);
+}
+QColor sol_lua_get(sol::types<QColor>, lua_State *L, int index, sol::stack::record &tracking)
+{
+    sol::state_view lua(L);
+    sol::table table = sol::stack::get<sol::table>(L, index, tracking);
+    return QColor(table.get_or<int, const char *, int>("red", 0),
+                  table.get_or<int, const char *, int>("green", 0),
+                  table.get_or<int, const char *, int>("blue", 0),
+                  table.get_or<int, const char *, int>("alpha", 255));
+}
+int sol_lua_push(sol::types<QColor>, lua_State *L, const QColor &value)
+{
+    sol::state_view lua(L);
+    sol::table table = lua.create_table();
+    table.set("red",
+              value.red(),
+              "green",
+              value.green(),
+              "blue",
+              value.blue(),
+              "alpha",
+              value.alpha());
+    return sol::stack::push(L, table);
+}
+
+// QStringList
+bool sol_lua_check(sol::types<QStringList>,
+                   lua_State *L,
+                   int index,
+                   std::function<sol::check_handler_type> handler,
+                   sol::stack::record &tracking)
+{
+    return sol::stack::check<sol::table>(L, index, handler, tracking);
+}
+QStringList sol_lua_get(sol::types<QStringList>,
+                        lua_State *L,
+                        int index,
+                        sol::stack::record &tracking)
+{
+    QStringList result;
+    sol::state_view lua(L);
+    sol::table table = sol::stack::get<sol::table>(L, index, tracking);
+    for (size_t i = 1; i < table.size() + 1; i++) {
+        result.append(table.get<QString>(i));
+    }
+    return result;
+}
+int sol_lua_push(sol::types<QStringList>, lua_State *L, const QStringList &value)
+{
+    sol::state_view lua(L);
+    sol::table table = lua.create_table();
+    for (const QString &str : value)
+        table.add(str);
+    return sol::stack::push(L, table);
+}
+
+namespace Lua::Internal {
+void addQtModule()
+{
+    LuaEngine::registerProvider("Qt", [](sol::state_view lua) {
+        sol::table qt(lua, sol::create);
+
+        // clang-format off
+        qt["TextElideMode"] = lua.create_table_with(
+            "ElideLeft", Qt::ElideLeft,
+            "ElideRight", Qt::ElideRight,
+            "ElideMiddle", Qt::ElideMiddle,
+            "ElideNone", Qt::ElideNone
+        );
+
+        qt["QDirIterator"] = lua.create_table_with(
+            "IteratorFlag", lua.create_table_with(
+                "NoIteratorFlags", QDirIterator::NoIteratorFlags,
+                "FollowSymlinks", QDirIterator::FollowSymlinks,
+                "Subdirectories", QDirIterator::Subdirectories
+            )
+        );
+
+        qt["QDir"] = lua.create_table_with(
+            // QDir::Filters
+            "Filters", lua.create_table_with(
+                "Dirs", QDir::Dirs,
+                "Files", QDir::Files,
+                "Drives", QDir::Drives,
+                "NoSymLinks", QDir::NoSymLinks,
+                "AllEntries", QDir::AllEntries,
+                "TypeMask", QDir::TypeMask,
+                "Readable", QDir::Readable,
+                "Writable", QDir::Writable,
+                "Executable", QDir::Executable,
+                "PermissionMask", QDir::PermissionMask,
+                "Modified", QDir::Modified,
+                "Hidden", QDir::Hidden,
+                "System", QDir::System,
+                "AccessMask", QDir::AccessMask,
+                "AllDirs", QDir::AllDirs,
+                "CaseSensitive", QDir::CaseSensitive,
+                "NoDot", QDir::NoDot,
+                "NoDotDot", QDir::NoDotDot,
+                "NoDotAndDotDot", QDir::NoDotAndDotDot,
+                "NoFilter", QDir::NoFilter
+            ),
+
+            // QDir::SortFlag
+            "SortFlags", lua.create_table_with(
+                "Name", QDir::Name,
+                "Time", QDir::Time,
+                "Size", QDir::Size,
+                "Unsorted", QDir::Unsorted,
+                "SortByMask", QDir::SortByMask,
+                "DirsFirst", QDir::DirsFirst,
+                "Reversed", QDir::Reversed,
+                "IgnoreCase", QDir::IgnoreCase,
+                "DirsLast", QDir::DirsLast,
+                "LocaleAware", QDir::LocaleAware,
+                "Type", QDir::Type,
+                "NoSort", QDir::NoSort
+            )
+        );
+        // clang-format on
+
+        return qt;
+    });
+}
+
+} // namespace Lua::Internal
diff --git a/src/plugins/lua/luaqttypes.h b/src/plugins/lua/luaqttypes.h
new file mode 100644
index 0000000000..9df10e1a02
--- /dev/null
+++ b/src/plugins/lua/luaqttypes.h
@@ -0,0 +1,39 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+// DO NOT INCLUDE THIS YOURSELF!!1!
+
+#include "lua_global.h"
+
+#include <QColor>
+#include <QList>
+#include <QRect>
+#include <QString>
+
+#define SOL_CONVERSION_FUNCTIONS(TYPE) \
+    bool LUA_EXPORT sol_lua_check(sol::types<TYPE>, \
+                                  lua_State *L, \
+                                  int index, \
+                                  std::function<sol::check_handler_type> handler, \
+                                  sol::stack::record &tracking); \
+    TYPE LUA_EXPORT sol_lua_get(sol::types<TYPE>, \
+                                lua_State *L, \
+                                int index, \
+                                sol::stack::record &tracking); \
+    int LUA_EXPORT sol_lua_push(sol::types<TYPE>, lua_State *L, const TYPE &rect);
+
+SOL_CONVERSION_FUNCTIONS(QString)
+
+SOL_CONVERSION_FUNCTIONS(QRect)
+SOL_CONVERSION_FUNCTIONS(QSize)
+SOL_CONVERSION_FUNCTIONS(QPoint)
+SOL_CONVERSION_FUNCTIONS(QRectF)
+SOL_CONVERSION_FUNCTIONS(QSizeF)
+SOL_CONVERSION_FUNCTIONS(QPointF)
+SOL_CONVERSION_FUNCTIONS(QColor)
+
+SOL_CONVERSION_FUNCTIONS(QStringList)
+
+#undef SOL_CONVERSION_FUNCTIONS
diff --git a/src/plugins/lua/luatr.h b/src/plugins/lua/luatr.h
new file mode 100644
index 0000000000..0c5fb4acad
--- /dev/null
+++ b/src/plugins/lua/luatr.h
@@ -0,0 +1,15 @@
+// Copyright (C) 2022 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include <QCoreApplication>
+
+namespace Lua {
+
+struct Tr
+{
+    Q_DECLARE_TR_FUNCTIONS(QtC::Lua)
+};
+
+} // namespace Lua
diff --git a/src/plugins/lua/luauibindings.cpp b/src/plugins/lua/luauibindings.cpp
new file mode 100644
index 0000000000..3c99085bda
--- /dev/null
+++ b/src/plugins/lua/luauibindings.cpp
@@ -0,0 +1,141 @@
+
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "luaengine.h"
+#include "luaqttypes.h"
+
+#include <QMetaProperty>
+
+#include <QDialog>
+
+namespace Lua::Internal {
+
+template<class T = QObject>
+sol::object qobject_index_get(const sol::this_state &s, QObject *obj, const char *key)
+{
+    auto &metaObject = T::staticMetaObject;
+    int iProp = metaObject.indexOfProperty(key);
+    if (iProp != -1) {
+        QMetaProperty p = metaObject.property(iProp);
+
+        if (p.isEnumType()) {
+            int v = p.read(obj).toInt();
+            return sol::make_object(s.lua_state(), p.enumerator().valueToKey(v));
+        }
+
+#define LUA_VALUE_FROM_PROPERTY(VARIANT_TYPE, TYPE) \
+    case VARIANT_TYPE: { \
+        TYPE r = qvariant_cast<TYPE>(p.read(obj)); \
+        return sol::make_object(s.lua_state(), r); \
+    }
+
+        switch (p.type()) {
+            LUA_VALUE_FROM_PROPERTY(QVariant::Type::Rect, QRect)
+            LUA_VALUE_FROM_PROPERTY(QVariant::Type::Size, QSize)
+            LUA_VALUE_FROM_PROPERTY(QVariant::Type::Point, QPoint)
+            LUA_VALUE_FROM_PROPERTY(QVariant::Type::RectF, QRectF)
+            LUA_VALUE_FROM_PROPERTY(QVariant::Type::SizeF, QSizeF)
+            LUA_VALUE_FROM_PROPERTY(QVariant::Type::PointF, QPointF)
+            LUA_VALUE_FROM_PROPERTY(QVariant::Type::Color, QColor)
+            LUA_VALUE_FROM_PROPERTY(QVariant::Type::Bool, bool)
+            LUA_VALUE_FROM_PROPERTY(QVariant::Type::Int, int)
+            LUA_VALUE_FROM_PROPERTY(QVariant::Type::Double, double)
+            LUA_VALUE_FROM_PROPERTY(QVariant::Type::String, QString)
+        default:
+            break;
+        }
+    }
+
+    for (int i = 0; i < metaObject.methodCount(); i++) {
+        QMetaMethod method = metaObject.method(i);
+        if (method.methodType() != QMetaMethod::Signal && method.name() == key) {
+            if (method.parameterCount() == 0) {
+                return sol::make_object(s.lua_state(),
+                                        [obj, i]() { obj->metaObject()->method(i).invoke(obj); });
+            }
+        }
+    }
+
+    return sol::lua_nil;
+}
+
+template<class T>
+void qobject_index_set(QObject *obj, const char *key, sol::stack_object value)
+{
+    auto &metaObject = T::staticMetaObject;
+    int iProp = metaObject.indexOfProperty(key);
+    if (iProp == -1)
+        return;
+
+    QMetaProperty p = metaObject.property(iProp);
+
+    if (p.isEnumType()) {
+        int v = p.enumerator().keyToValue(value.as<const char *>());
+        p.write(obj, v);
+    } else {
+#define SET_PROPERTY_FROM_LUA(VARIANT_TYPE, TYPE) \
+    case VARIANT_TYPE: { \
+        TYPE r = value.as<TYPE>(); \
+        p.write(obj, QVariant::fromValue(r)); \
+        break; \
+    }
+
+        switch (p.type()) {
+            SET_PROPERTY_FROM_LUA(QVariant::Type::Rect, QRect)
+            SET_PROPERTY_FROM_LUA(QVariant::Type::Size, QSize)
+            SET_PROPERTY_FROM_LUA(QVariant::Type::Point, QPoint)
+            SET_PROPERTY_FROM_LUA(QVariant::Type::RectF, QRectF)
+            SET_PROPERTY_FROM_LUA(QVariant::Type::SizeF, QSizeF)
+            SET_PROPERTY_FROM_LUA(QVariant::Type::PointF, QPointF)
+            SET_PROPERTY_FROM_LUA(QVariant::Type::Color, QColor)
+            SET_PROPERTY_FROM_LUA(QVariant::Type::Bool, bool)
+            SET_PROPERTY_FROM_LUA(QVariant::Type::Int, int)
+            SET_PROPERTY_FROM_LUA(QVariant::Type::Double, double)
+            SET_PROPERTY_FROM_LUA(QVariant::Type::String, QString)
+        default:
+            break;
+        }
+    }
+}
+
+template<class T>
+size_t qobject_index_size(QObject *)
+{
+    return 0;
+}
+
+template<class T, class... Bases>
+sol::usertype<T> runtimeObject(sol::state_view lua)
+{
+    auto &metaObject = T::staticMetaObject;
+    auto className = metaObject.className();
+
+    return lua.new_usertype<T>(
+        className,
+        sol::call_constructor,
+        sol::constructors<T>(),
+        sol::meta_function::index,
+        [](sol::this_state s, T *obj, const char *key) { return qobject_index_get<T>(s, obj, key); },
+        sol::meta_function::new_index,
+        [](T *obj, const char *key, sol::stack_object value) {
+            qobject_index_set<T>(obj, key, value);
+        },
+        sol::meta_function::length,
+        [](T *obj) { return qobject_index_size<T>(obj); },
+        sol::base_classes,
+        sol::bases<Bases...>());
+}
+
+void registerUiBindings()
+{
+    LuaEngine::registerProvider("Qt.Gui", [](sol::state_view lua) {
+        runtimeObject<QObject>(lua);
+        runtimeObject<QWidget, QObject>(lua);
+        runtimeObject<QDialog, QWidget, QObject>(lua);
+
+        return sol::object{};
+    });
+}
+
+} // namespace Lua::Internal
diff --git a/src/plugins/lua/meta/action.lua b/src/plugins/lua/meta/action.lua
new file mode 100644
index 0000000000..713dbcddb3
--- /dev/null
+++ b/src/plugins/lua/meta/action.lua
@@ -0,0 +1,34 @@
+---@meta Action
+
+local action = {}
+
+---@enum CommandAttributes
+action.CommandAttribute = {
+    ---Hide the command from the menu
+    CA_Hide = 1,
+    ---Update the text of the command
+    CA_UpdateText = 2,
+    ---Update the icon of the command
+    CA_UpdateIcon = 4,
+    ---The command cannot be configured
+    CA_NonConfigurable = 8,
+}
+
+---@class ActionOptions
+---@field context? string The context in which the action is available
+---@field text? string The text to display for the action
+---@field iconText? string The icon text to display for the action
+---@field toolTip? string The tooltip to display for the action
+---@field onTrigger? function The callback to call when the action is triggered
+---@field commandAttributes? CommandAttributes The attributes of the action
+---@field commandDescription? string The description of the command
+---@field defaultKeySequence? string The default key sequence for the action
+---@field defaultKeySequences? string[] The default key sequences for the action
+local ActionOptions = {}
+
+---Creates a new Action
+---@param id string The id of the action
+---@param options ActionOptions
+function action.create(id, options) end
+
+return action
diff --git a/src/plugins/lua/meta/async.lua b/src/plugins/lua/meta/async.lua
new file mode 100644
index 0000000000..8f7232a001
--- /dev/null
+++ b/src/plugins/lua/meta/async.lua
@@ -0,0 +1,62 @@
+---@meta async
+
+local async = {}
+
+
+---Wraps the provided function so it can be started in another thread.
+---
+--- Example:
+--- ```lua
+--- local a = require("async")
+--- local u = require("Utils")
+---
+--- function asyncFunction()
+---   a.wait(u.waitms(500))
+--- end
+---
+--- a.sync(asyncFunction)()
+--- ```
+---@param func function The function to call from the new thread.
+function async.sync(func) end
+
+---@async
+---Calls an async function and waits for it to finish. **Must** be called from async.sync()
+---
+--- Example:
+--- ```lua
+--- local a = require("async")
+--- local u = require("Utils")
+---
+--- function asyncFunction()
+---   a.wait(u.waitms(500))
+---   a.wait(u.waitms(1000))
+--- end
+---
+--- a.sync(asyncFunction)()
+--- ```
+---@param func any The function to call and wait for its result.
+---@return any any The result of the function.
+function async.wait(func) end
+
+---@async
+---Calls multiple async functions and waits for all of them to finish. **Must** be called from async.sync()
+---
+--- Example:
+--- ```lua
+--- local a = require("async")
+--- local u = require("Utils")
+---
+--- function asyncFunction()
+---   a.wait_all {
+---     u.waitms(500),
+---     u.waitms(1000),
+---   }
+--- end
+---
+--- a.sync(asyncFunction)()
+--- ```
+---@param funcs table The functions to call and wait for.
+---@return table table The result of each of the functions as an array.
+function async.wait_all(funcs) end
+
+return async
diff --git a/src/plugins/lua/meta/core.lua b/src/plugins/lua/meta/core.lua
new file mode 100644
index 0000000000..e30e55e73d
--- /dev/null
+++ b/src/plugins/lua/meta/core.lua
@@ -0,0 +1,26 @@
+---@meta Core
+
+Core = {}
+
+---@enum Attribute
+Core.GeneratedFile.Attribute = {
+    OpenEditorAttribute = 0,
+    OpenProjectAttribute = 0,
+    CustomGeneratorAttribute = 0,
+    KeepExistingFileAttribute = 0,
+    ForceOverwrite = 0,
+    TemporaryFile = 0,
+}
+
+---@class GeneratedFile
+---@field filePath FilePath
+---@field contents string
+---@field isBinary boolean
+---@field attributes Attribute A combination of Attribute
+Core.GeneratedFile = {}
+
+---Create a new GeneratedFile
+---@return GeneratedFile
+function Core.GeneratedFile.new() end
+
+return Core;
diff --git a/src/plugins/lua/meta/fetch.lua b/src/plugins/lua/meta/fetch.lua
new file mode 100644
index 0000000000..877f6c99f6
--- /dev/null
+++ b/src/plugins/lua/meta/fetch.lua
@@ -0,0 +1,30 @@
+---@meta Fetch
+local Fetch = {}
+
+---A network reply from fetch
+---@class QNetworkReply
+---@field error integer The error code of the reply or 0 if no error
+local QNetworkReply = {}
+
+---Returns the data of the reply
+---@return string
+function QNetworkReply:readAll() end
+
+---Fetches a url. Call `a.wait` on the returned value to get the result.
+---@param options FetchOptions
+---@return table|QNetworkReply|string
+function Fetch.fetch(options) end
+
+--@param options FetchOptions
+--@param callback function The callback to call when the fetch is done
+function Fetch.fetch_cb(options, callback) end
+
+---@class FetchOptions
+---@field url string The url to fetch
+---@field method? string The method to use (GET, POST, ...), default is GET
+---@field headers? table The headers to send
+---@field body? string The body to send
+---@field convertToTable? boolean If true, the resulting data will expect JSON and converted it to a table
+local FetchOptions = {}
+
+return Fetch
diff --git a/src/plugins/lua/meta/layout.lua b/src/plugins/lua/meta/layout.lua
new file mode 100644
index 0000000000..272171beff
--- /dev/null
+++ b/src/plugins/lua/meta/layout.lua
@@ -0,0 +1,186 @@
+---@meta Layout
+
+local layout = {}
+
+---The base class of all layout items
+---@class LayoutItem
+layout.LayoutItem = {
+    ---Attaches the layout to the specified widget
+    ---@param widget QWidget
+    attachTo = function(widget) end
+}
+
+---Column layout
+---@class Column : LayoutItem
+local column = {}
+
+---@param children LayoutItem|string|BaseAspect|function
+---@return Column
+function layout.Column(children) end
+
+---A group box with a title
+---@class Group : LayoutItem
+local group = {}
+
+---@return Group
+function layout.Group(children) end
+
+---Row layout
+---@class Row : LayoutItem
+local row = {}
+
+---@param children LayoutItem|string|BaseAspect|function
+---@return Row
+function layout.Row(children) end
+
+---Flow layout
+---@class Flow : LayoutItem
+local flow = {}
+
+---@param children LayoutItem|string|BaseAspect|function
+---@return Flow
+function layout.Flow(children) end
+
+---Grid layout
+---@class Grid : LayoutItem
+local grid = {}
+
+---@param children LayoutItem|string|BaseAspect|function
+---@return Grid
+function layout.Grid(children) end
+
+---Form layout
+---@class Form : LayoutItem
+local form = {}
+
+---@param children LayoutItem|string|BaseAspect|function
+---@return Form
+function layout.Form(children) end
+
+---An empty widget
+---@class Widget : LayoutItem
+local widget = {}
+
+---@param children LayoutItem|string|BaseAspect|function
+---@return Widget
+function layout.Widget(children) end
+
+---A stack of multiple widgets
+---@class Stack : LayoutItem
+local stack = {}
+
+---@param children LayoutItem|string|BaseAspect|function
+---@return Stack
+function layout.Stack(children) end
+
+---A Tab widget
+---@class Tab : LayoutItem
+local tab = {}
+
+---@param children LayoutItem|string|BaseAspect|function
+---@return Tab
+function layout.Tab(children) end
+
+---A Multiline text edit
+---@class TextEdit : LayoutItem
+local textEdit = {}
+
+---@param children LayoutItem|string|BaseAspect|function
+---@return TextEdit
+function layout.TextEdit(children) end
+
+---A PushButton
+---@class PushButton : LayoutItem
+local pushButton = {}
+
+---@param children LayoutItem|string|BaseAspect|function
+---@return PushButton
+function layout.PushButton(children) end
+
+---A SpinBox
+---@class SpinBox : LayoutItem
+local spinBox = {}
+
+---@param children LayoutItem|string|BaseAspect|function
+---@return SpinBox
+function layout.SpinBox(children) end
+
+---A Splitter
+---@class Splitter : LayoutItem
+local splitter = {}
+
+---@param children LayoutItem|string|BaseAspect|function
+---@return Splitter
+function layout.Splitter(children) end
+
+---A Toolbar
+---@class ToolBar : LayoutItem
+local toolBar = {}
+
+---@param children LayoutItem|string|BaseAspect|function
+---@return ToolBar
+function layout.ToolBar(children) end
+
+---A TabWidget
+---@class TabWidget : LayoutItem
+local tabWidget = {}
+
+---@param children LayoutItem|string|BaseAspect|function
+---@return TabWidget
+function layout.TabWidget(children) end
+
+---A "Line break" in the layout
+function layout.br() end
+
+---A "Stretch" in the layout
+function layout.st() end
+
+---An empty space in the layout
+function layout.empty() end
+
+---A horizontal line in the layout
+function layout.hr() end
+
+---Clears the margin of the layout
+function layout.noMargin() end
+
+---Sets the margin of the layout to the default value
+function layout.normalMargin() end
+
+---Sets the margin of the layout to a custom value
+function layout.customMargin(left, top, right, bottom) end
+
+---Sets the alignment of the layout to "Form"
+function layout.withFormAlignment() end
+
+---Sets the title of the parent object if possible
+function layout.title(text) end
+
+---Sets the text of the parent object if possible
+function layout.text(text) end
+
+---Sets the tooltip of the parent object if possible
+function layout.tooltip(text) end
+
+---Sets the size of the parent object if possible
+function layout.resize(width, height) end
+
+---Sets the stretch of the column at `index`
+function layout.columnStretch(index, stretch) end
+
+---Sets the spacing of the layout
+function layout.spacing(spacing) end
+
+---Sets the window title of the parent object if possible
+function layout.windowTitle(text) end
+
+---Sets the field growth policy of the layout
+function layout.fieldGrowthPolicy(policy) end
+
+---Sets the onClicked handler of the parent object if possible
+function layout.onClicked(f) end
+
+---Sets the onTextChanged handler of the parent object if possible
+function layout.onTextChanged(f) end
+
+return layout
diff --git a/src/plugins/lua/meta/lsp.lua b/src/plugins/lua/meta/lsp.lua
new file mode 100644
index 0000000000..65b1ef8361
--- /dev/null
+++ b/src/plugins/lua/meta/lsp.lua
@@ -0,0 +1,39 @@
+---@meta LSP
+
+local lsp = {}
+
+---@class ClientOptions
+---@field name string The name under which to register the language server.
+---@field cmd function|string[] The command to start the language server, or a function returning a string[].
+---@field transport? "stdio"|"localsocket" Defaults to stdio
+---@field serverName? string The socket path when transport == "localsocket"
+---@field languageFilter LanguageFilter The language filter deciding which files to open with the language server
+---@field startBehavior? "AlwaysOn"|"RequiresFile"|"RequiresProject"
+---@field initializationOptions? table|string The initialization options to pass to the language server, either a json string, or a table
+---@field settings? AspectContainer
+local ClientOptions = {}
+
+---@class LanguageFilter
+---@field patterns? string[] The file patterns supported by the language server
+---@field mimeTypes? string[] The mime types supported by the language server
+local LanguageFilter = {}
+
+---@class Client
+---@field on_instance_start function The callback to call when a language client starts
+lsp.Client = {}
+
+---@param msg string The name of the message to handle
+---@param callback function The callback to call when the message is received
+---Registers a message handler for the message named 'msg'
+function lsp.Client:registerMessage(msg, callback) end
+
+---@param msg table the message to send
+---Sends a message to the language server
+function lsp.Client:sendMessage(msg, callback) end
+
+---Creates a new Language Client
+---@param options ClientOptions
+---@return Client
+function lsp.Client.create(options) end
+
+return lsp
diff --git a/src/plugins/lua/meta/messagemanager.lua b/src/plugins/lua/meta/messagemanager.lua
new file mode 100644
index 0000000000..61419ee4b7
--- /dev/null
+++ b/src/plugins/lua/meta/messagemanager.lua
@@ -0,0 +1,17 @@
+---@meta MessageManager
+
+local messagemanager = {}
+
+---Writes a message to the Output pane
+---@param ... any
+function messagemanager.writeSilently(...) end
+
+---Writes a message to the Output pane and flashes the pane if its not open
+---@param ... any
+function messagemanager.writeFlashing(...) end
+
+---Writes a message to the Output pane and opens the pane if its not open
+---@param ... any
+function messagemanager.writeDisrupting(...) end
+
+return messagemanager
diff --git a/src/plugins/lua/meta/process.lua b/src/plugins/lua/meta/process.lua
new file mode 100644
index 0000000000..0519990770
--- /dev/null
+++ b/src/plugins/lua/meta/process.lua
@@ -0,0 +1,11 @@
+---@meta Process
+
+local process = {}
+
+---@async
+---Runs a command in a terminal, has to be called from a coroutine!
+---@param cmd string The command to run
+---@return number The exit code of the command
+function process.runInTerminal(cmd) end
+
+return process
diff --git a/src/plugins/lua/meta/qt.lua b/src/plugins/lua/meta/qt.lua
new file mode 100644
index 0000000000..7d446bce62
--- /dev/null
+++ b/src/plugins/lua/meta/qt.lua
@@ -0,0 +1,66 @@
+---@meta Qt
+
+--- The values in enums here do not matter, as they are defined by the C++ code.
+
+local qt = {}
+
+---@enum TextElideMode
+qt.TextElideMode = {
+    ElideLeft = 0,
+    ElideRight = 0,
+    ElideMiddle = 0,
+    ElideNone = 0,
+}
+
+qt.QDir = {
+    ---@enum Filters
+    Filters = {
+        Dirs = 0,
+        Files = 0,
+        Drives = 0,
+        NoSymLinks = 0,
+        AllEntries = 0,
+        TypeMask = 0,
+        Readable = 0,
+        Writable = 0,
+        Executable = 0,
+        PermissionMask = 0,
+        Modified = 0,
+        Hidden = 0,
+        System = 0,
+        AccessMask = 0,
+        AllDirs = 0,
+        CaseSensitive = 0,
+        NoDot = 0,
+        NoDotDot = 0,
+        NoDotAndDotDot = 0,
+        NoFilter = 0,
+    },
+
+    ---@enum SortFlags
+    SortFlags = {
+        Name = 0,
+        Time = 0,
+        Size = 0,
+        Unsorted = 0,
+        SortByMask = 0,
+        DirsFirst = 0,
+        Reversed = 0,
+        IgnoreCase = 0,
+        DirsLast = 0,
+        LocaleAware = 0,
+        Type = 0,
+        NoSort = 0,
+    }
+}
+
+qt.QDirIterator = {
+    ---@enum IteratorFlag
+    IteratorFlag = {
+        NoIteratorFlags = 0,
+        FollowSymlinks = 0,
+        Subdirectories = 0,
+    }
+}
+
+return qt
diff --git a/src/plugins/lua/meta/qtc.lua b/src/plugins/lua/meta/qtc.lua
new file mode 100644
index 0000000000..bfcfd457eb
--- /dev/null
+++ b/src/plugins/lua/meta/qtc.lua
@@ -0,0 +1,42 @@
+---@meta
+
+---The global qtc object defined in the Lua plugin.
+---@class qtc
+Qtc = {}
+
+---@class (exact) QtcPlugin
+---@field Name string The name of the plugin.
+---@field Version string The version of the plugin. (`major.minor.patch`)
+---@field CompatVersion string The lowest previous version of the plugin that this one is compatible to. (`major.minor.patch`)
+---@field Vendor string The vendor of the plugin.
+---@field Category string The category of the plugin.
+---@field Dependencies? QtcPluginDependency[] The dependencies of the plugin.
+---@field Description? string A short one line description of the plugin.
+---@field LongDescription? string A long description of the plugin. Can contain newlines.
+---@field Url? string The url of the plugin.
+---@field License? string The license text of the plugin.
+---@field Revision? string The revision of the plugin.
+---@field Copyright? string The copyright of the plugin.
+---@field Experimental? boolean Whether the plugin is experimental or not. ( Default: true )
+---@field DisabledByDefault? boolean Whether the plugin is disabled by default or not. ( Default: true )
+---@field setup function The setup function of the plugin.
+---@field hooks? Hooks The hooks of the plugin.
+---@field Mimetypes? string XML MIME-info for registering additional or adapting built-in MIME types.
+---@field JsonWizardPaths? string[] A list of paths relative to the plugin location or paths to the Qt resource system that are searched for template-based wizards.
+QtcPlugin = {}
+
+---@class QtcPluginDependency
+---@field Name string The name of the dependency.
+---@field Version string The version of the dependency. (`major.minor.patch`)
+---@field Required boolean Whether the dependency is required or not.
+QtcPluginDependency = {}
+
+
+---@class EditorHooks
+---@field documentOpened function function(document)
+---@field documentClosed function function(document)
+EditorHooks = {}
+
+---@class Hooks
+---@field editors? EditorHooks
+Hooks = {}
diff --git a/src/plugins/lua/meta/settings.lua b/src/plugins/lua/meta/settings.lua
new file mode 100644
index 0000000000..2c947f4250
--- /dev/null
+++ b/src/plugins/lua/meta/settings.lua
@@ -0,0 +1,183 @@
+---@meta Settings
+
+---@module 'Qt'
+
+local settings = {}
+
+---The base class of all aspects
+---@class BaseAspect
+settings.BaseAspect = {}
+
+---Applies the changes from its volatileValue to its value
+function settings.BaseAspect:apply() end
+
+---@class AspectCreate
+---@field settingsKey? string The settings key of the aspect
+---@field displayName? string The display name of the aspect
+---@field labelText? string The label text of the aspect
+---@field toolTip? string The tool tip of the aspect
+---@field enabler? BoolAspect Enable / Disable this aspect based on the state of the `enabler`
+---@field onValueChanged? function () Called when the value of the aspect changes
+---@field onVolatileValueChanged? function () Called when the volatile value of the aspect changes
+local AspectCreate = {}
+
+---The base class of most typed aspects
+---@generic T
+---@class TypedAspect<T> : BaseAspect
+---@field value `T` The value of the aspect
+---@field volatileValue `T` The temporary value of the aspect
+---@field defaultValue `T` The default value of the aspect
+local TypedAspect = {}
+
+---@generic T
+---@class TypedAspectCreate<T> : AspectCreate
+---@field defaultValue `T` The default value of the aspect
+local TypedAspectCreate = {}
+
+---A container for aspects
+---@class AspectContainer : BaseAspect
+settings.AspectContainer = {}
+
+---Options for creating an AspectContainer
+---@class AspectContainerCreate
+---@field autoApply? boolean Whether the aspects should be applied automatically or not
+AspectContainerCreate = {}
+
+
+---Create a new AspectContainer
+---@param options AspectContainerCreate
+---@return AspectContainer
+function settings.AspectContainer.create(options) end
+
+---A aspect containing a boolean value
+---@class BoolAspect : TypedAspect<boolean>
+settings.BoolAspect = {}
+
+---@enum LabelPlacement
+settings.LabelPlacement = {
+    AtCheckBox = 0,
+    Compact = 0,
+    InExtraLabel = 0
+};
+---@class BoolAspectCreate : TypedAspectCreate<boolean>
+---@field labelPlacement? LabelPlacement:
+BoolAspectCreate = {}
+
+---Create a new BoolAspect
+---@param options BoolAspectCreate
+---@return BoolAspect
+function settings.BoolAspect.create(options) end
+
+settings.ColorAspect = {}
+function settings.ColorAspect.create(options) end
+
+settings.SelectionAspect = {}
+function settings.SelectionAspect.create(options) end
+
+settings.MultiSelectionAspect = {}
+function settings.MultiSelectionAspect.create(options) end
+
+---@enum StringDisplayStyle
+settings.StringDisplayStyle = {
+    Label = 0,
+    LineEdit = 0,
+    TextEdit = 0,
+    PasswordLineEdit = 0,
+};
+
+---@class StringAspectCreate : TypedAspectCreate<string>
+---@field displayStyle? StringDisplayStyle The display type of the aspect
+---@field historyId? string The history id of the aspect
+---@field valueAcceptor? function string (oldvalue: string, newValue: string)
+---@field showToolTipOnLabel? boolean
+---@field displayFilter? function string (value: string)
+---@field placeHolderText? string
+---@field acceptRichText? boolean
+---@field autoApplyOnEditingFinished? boolean
+---@field elideMode? Qt.TextElideMode The elide mode of the aspect
+StringAspectCreate = {}
+
+---@class StringAspect : TypedAspect<string>
+settings.StringAspect = {}
+
+---Create a new StringAspect
+---@param options StringAspectCreate
+function settings.StringAspect.create(options) end
+
+---@enum Kind
+settings.Kind = {
+    ExistingDirectory = 0,
+    Directory = 0,
+    File = 0,
+    SaveFile = 0,
+    ExistingCommand = 0,
+    Command = 0,
+    Any = 0
+};
+
+---@class FilePathAspectCreate
+---@field expectedKind? Kind The kind of path we want to select
+---@field historyId? string The history id of the aspect
+---@field defaultPath? FilePath The default path of the aspect
+---@field promptDialogFilter? string
+---@field promptDialogTitle? string
+---@field commandVersionArguments? string[]
+---@field allowPathFromDevice? boolean
+---@field validatePlaceHolder? boolean
+---@field openTerminalHandler? function
+---@field environment? Environment
+---@field baseFileName? FilePath
+---@field valueAcceptor? function string (oldvalue: string, newValue: string)
+---@field showToolTipOnLabel?  boolean
+---@field autoApplyOnEditingFinished? boolean
+---@field validationFunction? function
+---@field displayFilter? function string (value: string)
+---@field placeHolderText? string
+FilePathAspectCreate = {}
+
+---@class FilePathAspect
+---@field expandedValue FilePath The expanded value of the aspect
+---@field defaultPath FilePath The default path of the aspect
+settings.FilePathAspect = {}
+
+---Create a new FilePathAspect
+---@param options FilePathAspectCreate : TypedAspectCreate<string>
+---@return FilePathAspect
+function settings.FilePathAspect.create(options) end
+
+settings.IntegerAspect = {}
+function settings.IntegerAspect.create(options) end
+
+settings.DoubleAspect = {}
+function settings.DoubleAspect.create(options) end
+
+settings.StringListAspect = {}
+function settings.StringListAspect.create(options) end
+
+settings.FilePathListAspect = {}
+function settings.FilePathListAspect.create(options) end
+
+settings.IntegersAspect = {}
+function settings.IntegersAspect.create(options) end
+
+settings.StringSelectionAspect = {}
+function settings.StringSelectionAspect.create(options) end
+
+---@class OptionsPage
+settings.OptionsPage = {}
+
+---@class OptionsPageCreate
+---@field id string
+---@field displayName string
+---@field categoryId string
+---@field displayCategory string
+---@field categoryIconPath string
+---@field aspectContainer AspectContainer
+OptionsPageCreate = {}
+
+---Creates a new OptionsPage
+---@param options OptionsPageCreate
+---@return OptionsPage
+function settings.OptionsPage.create(options) end
+
+return settings
diff --git a/src/plugins/lua/meta/simpletypes.lua b/src/plugins/lua/meta/simpletypes.lua
new file mode 100644
index 0000000000..fdb65cf098
--- /dev/null
+++ b/src/plugins/lua/meta/simpletypes.lua
@@ -0,0 +1,36 @@
+---@meta
+
+---@class QRect
+---@field x integer The x position of the rectangle
+---@field y integer The y position of the rectangle
+---@field width integer The width of the rectangle
+---@field height integer The height of the rectangle
+QRect = {}
+
+---@class QSize
+---@field width integer The width of the size
+---@field height integer The height of the size
+QSize = {}
+
+---@class QPoint
+---@field x integer The x position of the point
+---@field y integer The y position of the point
+QPoint = {}
+
+
+---@class QPointF
+---@field x number The x position of the floating point
+---@field y number The y position of the floating point
+QPointF = {}
+
+---@class QSizeF
+---@field width number The width of the floating point size
+---@field height number The height of the floating point size
+QSizeF = {}
+
+---@class QRectF
+---@field x number The x position of the floating point rectangle
+---@field y number The y position of the floating point rectangle
+---@field width number The width of the floating point rectangle
+---@field height number The height of the floating point rectangle
+QRectF = {}
diff --git a/src/plugins/lua/meta/utils.lua b/src/plugins/lua/meta/utils.lua
new file mode 100644
index 0000000000..2463c01fda
--- /dev/null
+++ b/src/plugins/lua/meta/utils.lua
@@ -0,0 +1,84 @@
+---@meta Utils
+
+local utils = {}
+
+---Suspends the current coroutine for the given amount of milliseconds. Call `a.wait` on the returned value to get the result.
+---@param ms number The amount of milliseconds to wait
+function utils.waitms(ms) end
+
+---Calls the callback after the given amount of milliseconds
+---@param ms number The amount of milliseconds to wait
+---@param callback function The callback to call
+function utils.waitms_cb(ms, callback) end
+
+---@class FilePath
+utils.FilePath = {}
+
+---@param path string The path to convert
+---@return FilePath The converted path
+---Convert and clean a path, returning a FilePath object
+function utils.FilePath.fromUserInput(path) end
+
+---@return FilePath The new absolute path
+---Searches for the path inside the PATH environment variable. Call `a.wait` on the returned value to get the result.
+function utils.FilePath:searchInPath() end
+
+---@class (exact) DirEntriesOptions
+---@field nameFilters? string[] The name filters to use (e.g. "*.lua"), defaults to all files
+---@field fileFilters? integer The filters to use (combination of QDir.Filters.*), defaults to QDir.Filters.NoFilter
+---@field flags? integer The iterator flags (combination of QDirIterator.Flags.*), defaults to QDirIterator.Flags.NoIteratorFlags
+
+---Returns all entries in the directory. Call `a.wait` on the returned value to get the result.
+---@param options DirEntriesOptions
+---@return FilePath[]
+function utils.FilePath:dirEntries(options) end
+
+---Returns the FilePath as it should be displayed to the user
+---@return string
+function utils.FilePath:toUserOutput() end
+
+---Returns whether the target exists
+---@return boolean
+function utils.FilePath:exists() end
+
+---Returns whether the target is a file and executable
+---@return boolean
+function utils.FilePath:isExecutableFile() end
+
+---Returns the path portion of FilePath as a string in the hosts native format
+---@return string
+function utils.FilePath:nativePath() end
+
+---Returns the last part of the path
+---@return string
+function utils.FilePath:fileName() end
+
+---Returns the current working path of Qt Creator
+---@return FilePath
+function utils.FilePath.currentWorkingPath() end
+
+---Returns a new FilePath with the given tail appended
+---@param tail string|FilePath The tail to append
+---@return FilePath
+function utils.FilePath:resolvePath(tail) end
+
+---Returns the parent directory of the path
+---@return FilePath
+function utils.FilePath:parentDir() end
+
+---If the path targets a symlink, this function returns the target of the symlink
+---@return FilePath The resolved path
+function utils.FilePath:resolveSymlinks() end
+
+---Returns the suffix of the path (e.g. "test.ui.qml" -> ".qml")
+---@return string
+function utils.FilePath:suffix() end
+
+---Returns the complete suffix of the path (e.g. "test.ui.qml" -> "ui.qml")
+---@return string
+function utils.FilePath:completeSuffix() end
+
+---Returns whether the path is absolute
+---@return boolean
+function utils.FilePath:isAbsolutePath() end
+return utils
diff --git a/src/plugins/lua/meta/widgets.lua b/src/plugins/lua/meta/widgets.lua
new file mode 100644
index 0000000000..3f28bd49e9
--- /dev/null
+++ b/src/plugins/lua/meta/widgets.lua
@@ -0,0 +1,111 @@
+---@meta Widgets
+
+local widgets = {}
+
+---A QWidget, see https://doc.qt.io/qt-6/QWidget.html
+---@class QWidget : QObject
+---@field acceptDrops boolean
+---@field accessibleDescription string
+---@field accessibleName string
+---@field autoFillBackground boolean
+---@field baseSize QSize
+---@field childrenRect QRect
+---@field childrenRegion QRegion
+---@field contextMenuPolicy QtContextMenuPolicy
+---@field cursor QCursor
+---@field enabled boolean
+---@field focus boolean
+---@field focusPolicy QtFocusPolicy
+---@field font QFont
+---@field frameGeometry QRect
+---@field frameSize QSize
+---@field fullScreen boolean
+---@field geometry QRect
+---@field height integer
+---@field inputMethodHints QtInputMethodHints
+---@field isActiveWindow boolean
+---@field layoutDirection QtLayoutDirection
+---@field locale QLocale
+---@field maximized boolean
+---@field maximumHeight integer
+---@field maximumSize QSize
+---@field maximumWidth integer
+---@field minimized boolean
+---@field minimumHeight integer
+---@field minimumSize QSize
+---@field minimumSizeHint QSize
+---@field minimumWidth integer
+---@field modal boolean
+---@field mouseTracking boolean
+---@field normalGeometry QRect
+---@field palette QPalette
+---@field pos QPoint
+---@field rect QRect
+---@field size QSize
+---@field sizeHint QSize
+---@field sizeIncrement QSize
+---@field sizePolicy QSizePolicy
+---@field statusTip string
+---@field styleSheet string
+---@field tabletTracking boolean
+---@field toolTip string
+---@field toolTipDuration integer
+---@field updatesEnabled boolean
+---@field visible boolean
+---@field whatsThis string
+---@field width integer
+---@field windowFilePath string
+---@field windowFlags QtWindowFlags
+---@field windowIcon QIcon
+---@field windowModality QtWindowModality
+---@field windowModified boolean
+---@field windowOpacity double
+---@field windowTitle string
+---@field x integer
+---@field y integer
+widgets.QWidget = {}
+
+---@return boolean
+function widgets.QWidget:close() end
+
+function widgets.QWidget:hide() end
+
+function widgets.QWidget:lower() end
+
+function widgets.QWidget:raise() end
+
+function widgets.QWidget:repaint() end
+
+function widgets.QWidget:setDisabled(disable) end
+
+function widgets.QWidget:setEnabled(enabled) end
+
+function widgets.QWidget:setFocus() end
+
+function widgets.QWidget:setHidden(hidden) end
+
+function widgets.QWidget:setStyleSheet(styleSheet) end
+
+function widgets.QWidget:setVisible(visible) end
+
+function widgets.QWidget:setWindowModified(modified) end
+
+function widgets.QWidget:setWindowTitle(title) end
+
+function widgets.QWidget:show() end
+
+function widgets.QWidget:showFullScreen() end
+
+function widgets.QWidget:showMaximized() end
+
+function widgets.QWidget:showMinimized() end
+
+function widgets.QWidget:showNormal() end
+
+function widgets.QWidget:update() end
+
+---A QDialog, see https://doc.qt.io/qt-6/qdialog.html
+---@class QDialog : QWidget
+widgets.QDialog = {}
+
+return widgets
diff --git a/src/plugins/lua/meta/wizard.lua b/src/plugins/lua/meta/wizard.lua
new file mode 100644
index 0000000000..fb5b000d51
--- /dev/null
+++ b/src/plugins/lua/meta/wizard.lua
@@ -0,0 +1,61 @@
+---@meta Wizard
+
+---@module "Layout"
+local Layout = require("Layout")
+
+---@module "Core"
+local Core = require("Core")
+
+local wizard = {}
+
+---@class (exact) WizardFactoryOptions
+---@field id string
+---@field displayName string
+---@field description string
+---@field category string
+---@field displayCategory string
+---@field icon? string
+---@field iconText? string
+---@field factory function A function returning a Wizard
+
+--- Registers a wizard factory.
+---@param options WizardFactoryOptions
+function wizard.registerFactory(options) end
+
+---@class Wizard
+Wizard = {}
+
+---@class (exact) WizardPageOptions
+---@field title string
+---@field layout LayoutItem
+---@field initializePage? function The function called before showing the page
+
+---Add a page to the wizard
+---@param options WizardPageOptions
+function Wizard:addPage(options) end
+
+---@class SummaryPage
+Wizard.SummaryPage = {}
+
+---Set the files to be shown on the summary page
+---@param generatedFiles Core.GeneratedFile[]
+function Wizard.SummaryPage:setFiles(generatedFiles) end
+
+---@class SummaryPageOptions
+---@field title? string
+---@field initializePage? function The function called before showing the page
+
+---Add a summary page to the wizard
+---@param options SummaryPageOptions
+---@return SummaryPage
+function Wizard:addSummaryPage(options) end
+
+---@class WizardOptions
+---@field fileFactory function A function returning a GeneratedFile[]
+
+---Create a wizard
+---@param options WizardOptions
+---@return Wizard
+function wizard.create(options) end
+
+return wizard
diff --git a/src/plugins/lua/metabackup/qobject.lua b/src/plugins/lua/metabackup/qobject.lua
new file mode 100644
index 0000000000..4584fc6a9f
--- /dev/null
+++ b/src/plugins/lua/metabackup/qobject.lua
@@ -0,0 +1,6 @@
+---@meta
+
+---A QObject, see https://doc.qt.io/qt-6/qobject.html
+---@class QObject
+---@field objectName string
+QObject = {}
diff --git a/src/plugins/lualsp/CMakeLists.txt b/src/plugins/lualsp/CMakeLists.txt
new file mode 100644
index 0000000000..bd794c48b1
--- /dev/null
+++ b/src/plugins/lualsp/CMakeLists.txt
@@ -0,0 +1,4 @@
+add_qtc_lua_plugin(lualsp
+    SOURCES lualsp/lualsp.lua
+            lualsp/init.lua
+)
diff --git a/src/plugins/lualsp/lualsp/init.lua b/src/plugins/lualsp/lualsp/init.lua
new file mode 100644
index 0000000000..75162c95c0
--- /dev/null
+++ b/src/plugins/lualsp/lualsp/init.lua
@@ -0,0 +1,160 @@
+-- Copyright (C) 2024 The Qt Company Ltd.
+-- SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+local LSP = require('LSP')
+local mm = require('MessageManager')
+local Utils = require('Utils')
+local Process = require('Process')
+local S = require('Settings')
+local Layout = require('Layout')
+local a = require('async')
+
+Settings = {}
+
+local function createCommand()
+  local cmd = { Settings.binary.expandedValue:nativePath() }
+  if Settings.showNode.value then
+    table.insert(cmd, '--shownode=true')
+  end
+  if Settings.showSource.value then
+    table.insert(cmd, '--showsource=true')
+  end
+  if Settings.developMode.value then
+    table.insert(cmd, '--develop=true')
+  end
+
+  return cmd
+end
+local function setupClient()
+  Client = LSP.Client.create({
+    name = 'Lua Language Server',
+    cmd = createCommand,
+    transport = 'stdio',
+    languageFilter = {
+      patterns = { '*.lua' },
+      mimeTypes = { 'text/x-lua' }
+    },
+    settings = Settings,
+    startBehavior = "RequiresFile",
+  })
+
+  Client.on_instance_start = function()
+    print("Instance has started")
+  end
+
+  Client:registerMessage("$/status/report", function(params)
+    mm.writeFlashing(params.params.text .. ": " .. params.params.tooltip);
+  end)
+end
+
+local function installServer()
+  print("Lua Language Server not found, installing ...")
+  local cmds = {
+    mac = "brew install lua-language-server",
+    windows = "winget install lua-language-server",
+    linux = "sudo apt install lua-language-server"
+  }
+  if a.wait(Process.runInTerminal(cmds[Utils.HostOsInfo.os])) == 0 then
+    print("Lua Language Server installed!")
+    Settings.binary.defaultPath = Utils.FilePath.fromUserInput("lua-language-server"):resolveSymlinks()
+    Settings:apply()
+    return true
+  end
+
+  print("Lua Language Server installation failed!")
+  return false
+end
+
+local function using(tbl)
+  local result = _G
+  for k, v in pairs(tbl) do result[k] = v end
+  return result
+end
+local function layoutSettings()
+  --- "using namespace Layout"
+  local _ENV = using(Layout)
+
+  local installButton = {}
+
+  if Settings.binary.expandedValue:isExecutableFile() == false then
+    installButton = {
+      "Language server not found:",
+      Row {
+        PushButton {
+          text("Try to install lua language server"),
+          onClicked(function() a.sync(installServer)() end),
+          br,
+        },
+        st
+      }
+    }
+  end
+  local layout = Form {
+    Settings.binary, br,
+    Settings.developMode, br,
+    Settings.showSource, br,
+    Settings.showNode, br,
+    table.unpack(installButton)
+  }
+
+  return layout
+end
+
+local function setupAspect()
+  ---@class Settings: AspectContainer
+  Settings = S.AspectContainer.create({
+    autoApply = false,
+    layouter = layoutSettings,
+  });
+
+  Settings.binary = S.FilePathAspect.create({
+    settingsKey = "LuaCopilot.Binary",
+    displayName = "Binary",
+    labelText = "Binary:",
+    toolTip = "The path to the lua-language-server binary.",
+    expectedKind = S.Kind.ExistingCommand,
+    defaultPath = Utils.FilePath.fromUserInput("lua-language-server"):resolveSymlinks(),
+  })
+  Settings.developMode = S.BoolAspect.create({
+    settingsKey = "LuaCopilot.DevelopMode",
+    displayName = "Enable Develop Mode",
+    labelText = "Enable Develop Mode:",
+    toolTip = "Turns on the develop mode of the language server.",
+    defaultValue = false,
+    labelPlacement = S.LabelPlacement.InExtraLabel,
+  })
+
+  Settings.showSource = S.BoolAspect.create({
+    settingsKey = "LuaCopilot.ShowSource",
+    displayName = "Show Source",
+    labelText = "Show Source:",
+    toolTip = "Display the internal data of the hovering token.",
+    defaultValue = false,
+    labelPlacement = S.LabelPlacement.InExtraLabel,
+  })
+
+  Settings.showNode = S.BoolAspect.create({
+    settingsKey = "LuaCopilot.ShowNode",
+    displayName = "Show Node",
+    labelText = "Show Node:",
+    toolTip = "Display the internal data of the hovering token.",
+    defaultValue = false,
+    labelPlacement = S.LabelPlacement.InExtraLabel,
+  })
+  return Settings
+end
+local function setup(parameters)
+  print("Setting up Lua Language Server ...")
+  setupAspect()
+  local serverPath = Utils.FilePath.fromUserInput("lua-language-server")
+  local absolute = a.wait(serverPath:searchInPath()):resolveSymlinks()
+  if absolute:isExecutableFile() == true then
+    Settings.binary.defaultPath = absolute
+  else
+    installServer()
+  end
+  setupClient()
+end
+
+return {
+  setup = function() a.sync(setup)() end,
+}
diff --git a/src/plugins/lualsp/lualsp/lualsp.lua b/src/plugins/lualsp/lualsp/lualsp.lua
new file mode 100644
index 0000000000..ba2de87414
--- /dev/null
+++ b/src/plugins/lualsp/lualsp/lualsp.lua
@@ -0,0 +1,30 @@
+-- Copyright (C) 2024 The Qt Company Ltd.
+-- SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+return {
+    Name = "LuaLanguageServer",
+    Version = "1.0.0",
+    CompatVersion = "1.0.0",
+    Vendor = "The Qt Company",
+    Category = "Language Client",
+    Description = "The Lua Language Server",
+    Experimental = false,
+    DisabledByDefault = false,
+    LongDescription = [[
+This plugin provides the Lua Language Server.
+It will try to install it if it is not found.
+    ]],
+    Dependencies = {
+        { Name = "Core",              Version = "13.0.82", Required = true },
+        { Name = "Lua",               Version = "13.0.82", Required = true },
+        { Name = "LuaLanguageClient", Version = "13.0.82", Required = true }
+    },
+    setup = function()
+        require 'init'.setup()
+    end,
+    hooks = {
+        editors = {
+            documentOpened = function(doc) print("documentOpened", doc) end,
+            documentClosed = function(doc) print("documentClosed", doc) end,
+        }
+    }
+} --[[@as QtcPlugin]]
diff --git a/src/plugins/luatemplates/CMakeLists.txt b/src/plugins/luatemplates/CMakeLists.txt
new file mode 100644
index 0000000000..87088b7058
--- /dev/null
+++ b/src/plugins/luatemplates/CMakeLists.txt
@@ -0,0 +1,10 @@
+
+
+add_qtc_plugin(LuaTemplates
+  CONDITION TARGET Lua
+  PLUGIN_DEPENDS Lua TextEditor ProjectExplorer Core
+  SOURCES
+    luatemplates.cpp
+)
+
+add_subdirectory(templates)
diff --git a/src/plugins/luatemplates/LuaTemplates.json.in b/src/plugins/luatemplates/LuaTemplates.json.in
new file mode 100644
index 0000000000..400630aa93
--- /dev/null
+++ b/src/plugins/luatemplates/LuaTemplates.json.in
@@ -0,0 +1,21 @@
+{
+    "Name" : "LuaTemplates",
+    "Version" : "${IDE_VERSION}",
+    "DisabledByDefault" : true,
+    "SoftLoadable" : true,
+    "CompatVersion" : "${IDE_VERSION_COMPAT}",
+    "Vendor" : "The Qt Company Ltd",
+    "Copyright" : "(C) ${IDE_COPYRIGHT_YEAR} The Qt Company Ltd",
+    "License" : [ "Commercial Usage",
+                  "",
+                  "Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and The Qt Company.",
+                  "",
+                  "GNU General Public License Usage",
+                  "",
+                  "Alternatively, this plugin may be used under the terms of the GNU General Public License version 3 as published by the Free Software Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT included in the packaging of this plugin. Please review the following information to ensure the GNU General Public License requirements will be met: https://www.gnu.org/licenses/gpl-3.0.html."
+    ],
+    "Category" : "Scripting",
+    "Description" : "Allows writing template wizards using lua",
+    "Url" : "http://www.qt.io",
+    ${IDE_PLUGIN_DEPENDENCIES}
+}
diff --git a/src/plugins/luatemplates/luatemplates.cpp b/src/plugins/luatemplates/luatemplates.cpp
new file mode 100644
index 0000000000..3adea77040
--- /dev/null
+++ b/src/plugins/luatemplates/luatemplates.cpp
@@ -0,0 +1,402 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include <lua/bindings/inheritance.h>
+#include <lua/luaengine.h>
+
+#include <coreplugin/dialogs/promptoverwritedialog.h>
+#include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/icore.h>
+#include <coreplugin/iwizardfactory.h>
+
+#include <extensionsystem/iplugin.h>
+#include <extensionsystem/pluginmanager.h>
+
+#include <utils/algorithm.h>
+#include <utils/expected.h>
+#include <utils/layoutbuilder.h>
+#include <utils/mimeutils.h>
+#include <utils/wizard.h>
+#include <utils/wizardpage.h>
+
+#include <projectexplorer/editorconfiguration.h>
+#include <projectexplorer/project.h>
+#include <projectexplorer/projectexplorertr.h>
+#include <projectexplorer/projectwizardpage.h>
+
+#include <texteditor/icodestylepreferences.h>
+#include <texteditor/icodestylepreferencesfactory.h>
+#include <texteditor/storagesettings.h>
+#include <texteditor/tabsettings.h>
+#include <texteditor/texteditorsettings.h>
+#include <texteditor/textindenter.h>
+
+#include <QMessageBox>
+
+using namespace Utils;
+using namespace Layouting;
+using namespace Core;
+using namespace ProjectExplorer;
+using namespace TextEditor;
+
+namespace LuaTemplates {
+
+static ICodeStylePreferences *codeStylePreferences(Project *project, Id languageId)
+{
+    if (!languageId.isValid())
+        return nullptr;
+
+    if (project)
+        return project->editorConfiguration()->codeStyle(languageId);
+
+    return TextEditorSettings::codeStyle(languageId);
+}
+
+class LuaWizard : public Wizard
+{
+public:
+    LuaWizard()
+        : Wizard(Core::ICore::dialogParent())
+    {}
+
+    expected_str<bool> promptForOverwrite(GeneratedFiles &files)
+    {
+        FilePaths existingFiles;
+        bool oddStuffFound = false;
+
+        for (const auto &f : files) {
+            if (f.filePath().exists() && !(f.attributes() & GeneratedFile::ForceOverwrite)
+                && !(f.attributes() & GeneratedFile::KeepExistingFileAttribute))
+                existingFiles.append(f.filePath());
+        }
+        if (existingFiles.isEmpty())
+            return true;
+
+        // Before prompting to overwrite existing files, loop over files and check
+        // if there is anything blocking overwriting them (like them being links or folders).
+        // Format a file list message as ( "<file1> [readonly], <file2> [folder]").
+        const QString commonExistingPath = FileUtils::commonPath(existingFiles).toUserOutput();
+        const int commonPathSize = commonExistingPath.size();
+        QString fileNamesMsgPart;
+        for (const FilePath &filePath : std::as_const(existingFiles)) {
+            if (filePath.exists()) {
+                if (!fileNamesMsgPart.isEmpty())
+                    fileNamesMsgPart += QLatin1String(", ");
+                const QString namePart = filePath.toUserOutput().mid(commonPathSize);
+                if (filePath.isDir()) {
+                    oddStuffFound = true;
+                    fileNamesMsgPart += Tr::tr("%1 [folder]").arg(namePart);
+                } else if (filePath.isSymLink()) {
+                    oddStuffFound = true;
+                    fileNamesMsgPart += Tr::tr("%1 [symbolic link]").arg(namePart);
+                } else if (!filePath.isWritableDir() && !filePath.isWritableFile()) {
+                    oddStuffFound = true;
+                    fileNamesMsgPart += Tr::tr("%1 [read only]").arg(namePart);
+                }
+            }
+        }
+
+        if (oddStuffFound) {
+            return make_unexpected(
+                Tr::tr("The directory %1 contains files which cannot be overwritten:\n%2.")
+                    .arg(commonExistingPath)
+                    .arg(fileNamesMsgPart));
+        }
+
+        // Prompt to overwrite existing files.
+        PromptOverwriteDialog overwriteDialog;
+
+        // Scripts cannot handle overwrite
+        overwriteDialog.setFiles(existingFiles);
+        for (const auto &file : files) {
+            if (!allowKeepingExistingFiles)
+                overwriteDialog.setFileEnabled(file.filePath(), false);
+        }
+        if (overwriteDialog.exec() != QDialog::Accepted)
+            return false;
+
+        const QSet<FilePath> existingFilesToKeep = Utils::toSet(overwriteDialog.uncheckedFiles());
+        if (existingFilesToKeep.size() == files.size()) // All exist & all unchecked->Cancel.
+            return false;
+
+        // Set 'keep' attribute in files
+        for (auto &file : files) {
+            if (!existingFilesToKeep.contains(file.filePath()))
+                continue;
+
+            file.setAttributes(file.attributes() | GeneratedFile::KeepExistingFileAttribute);
+        }
+        return true;
+    }
+
+    void formatFile(GeneratedFile &file)
+    {
+        if (file.isBinary() || file.contents().isEmpty())
+            return; // nothing to do
+
+        Id languageId = TextEditorSettings::languageId(
+            Utils::mimeTypeForFile(file.filePath()).name());
+
+        if (!languageId.isValid())
+            return; // don't modify files like *.ui, *.pro
+
+        // TODO:
+        auto baseProject
+            = nullptr; // qobject_cast<Project *>( wizard->property("SelectedProject").value<QObject *>());
+
+        ICodeStylePreferencesFactory *factory = TextEditorSettings::codeStyleFactory(languageId);
+
+        QTextDocument doc(file.contents());
+        QTextCursor cursor(&doc);
+        Indenter *indenter = nullptr;
+        if (factory) {
+            indenter = factory->createIndenter(&doc);
+            indenter->setFileName(file.filePath());
+        }
+        if (!indenter)
+            indenter = new TextIndenter(&doc);
+        ICodeStylePreferences *codeStylePrefs = codeStylePreferences(baseProject, languageId);
+        indenter->setCodeStylePreferences(codeStylePrefs);
+
+        cursor.select(QTextCursor::Document);
+        indenter->indent(cursor, QChar::Null, codeStylePrefs->currentTabSettings());
+        delete indenter;
+        if (TextEditor::globalStorageSettings().m_cleanWhitespace) {
+            QTextBlock block = doc.firstBlock();
+            while (block.isValid()) {
+                TabSettings::removeTrailingWhitespace(cursor, block);
+                block = block.next();
+            }
+        }
+        file.setContents(doc.toPlainText());
+    }
+
+    void formatFiles(GeneratedFiles &files)
+    {
+        for (auto &file : files)
+            formatFile(file);
+    }
+
+    void accept() override
+    {
+        auto files = Lua::LuaEngine::safe_call<GeneratedFiles>(fileFactory);
+        QTC_ASSERT_EXPECTED(files, return);
+
+        auto result = promptForOverwrite(*files);
+        if (!result) {
+            QMessageBox::warning(this, Tr::tr("Failed to Overwrite Files"), result.error());
+            return;
+        }
+
+        formatFiles(*files);
+
+        if (*result) {
+            for (const auto &file : *files) {
+                QString errorMsg;
+                if (file.attributes().testFlag(GeneratedFile::KeepExistingFileAttribute))
+                    continue;
+
+                if (!file.write(&errorMsg)) {
+                    qWarning() << "Failed writing file:" << errorMsg;
+                    continue;
+                } else if (file.attributes().testFlag(GeneratedFile::OpenEditorAttribute)) {
+                    EditorManager::openEditor(file.filePath());
+                }
+            }
+        }
+
+        Wizard::accept();
+        return;
+    }
+
+    void reject() override { Wizard::reject(); }
+
+    sol::protected_function fileFactory;
+    bool allowKeepingExistingFiles{true};
+};
+
+class WizardFactory : public IWizardFactory
+{
+public:
+    WizardFactory() {}
+
+    Wizard *runWizardImpl(
+        const FilePath &path,
+        QWidget *parent,
+        Id /*platform*/,
+        const QVariantMap & /*variables*/,
+        bool showWizard = true) override
+    {
+        // We assume that the parent is always "dialogParent".
+        QTC_CHECK(parent == Core::ICore::dialogParent());
+        auto wizard = Lua::LuaEngine::safe_call<LuaWizard *>(m_setupFunction, path);
+        QTC_ASSERT_EXPECTED(wizard, return nullptr);
+
+        if (showWizard)
+            (*wizard)->show();
+        return (*wizard);
+    }
+
+    sol::protected_function m_setupFunction;
+};
+
+class LuaWizardPage : public WizardPage
+{
+public:
+    void initializePage() override
+    {
+        if (m_initializePage) {
+            auto res = Lua::LuaEngine::void_safe_call(*m_initializePage, this);
+            QTC_CHECK_EXPECTED(res);
+        }
+        WizardPage::initializePage();
+    }
+    std::optional<sol::function> m_initializePage;
+};
+
+class SummaryPage : public ProjectWizardPage
+{
+public:
+    void initializePage() override
+    {
+        if (m_initializePage) {
+            auto res = Lua::LuaEngine::void_safe_call(*m_initializePage, this);
+            QTC_CHECK_EXPECTED(res);
+        }
+
+        FilePaths paths = Utils::transform(m_files,
+                                           [](const GeneratedFile &f) { return f.filePath(); });
+        initializeProjectTree(nullptr,
+                              paths,
+                              IWizardFactory::WizardKind::FileWizard,
+                              ProjectAction::AddNewFile);
+
+        initializeVersionControls();
+
+        ProjectWizardPage::initializePage();
+    }
+
+    void setFiles(const GeneratedFiles &files)
+    {
+        m_files = std::move(files);
+        FilePaths paths = Utils::transform(m_files,
+                                           [](const GeneratedFile &f) { return f.filePath(); });
+        ProjectWizardPage::setFiles(paths);
+    }
+
+    GeneratedFiles m_files;
+    std::optional<sol::protected_function> m_initializePage;
+};
+
+class LuaTemplatesPlugin final : public ExtensionSystem::IPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "LuaTemplates.json")
+
+public:
+    LuaTemplatesPlugin() {}
+
+    using Factories = QList<std::function<IWizardFactory *()>>;
+    using WeakFactories = std::weak_ptr<QList<std::function<IWizardFactory *()>>>;
+
+private:
+    void initialize() final
+    {
+        Lua::LuaEngine::registerProvider(
+            "Wizard", [](sol::state_view lua) -> sol::object {
+                sol::table wizard = lua.create_table();
+                wizard.new_usertype<WizardFactory>("Factory", sol::no_constructor);
+
+                wizard.new_usertype<SummaryPage>(
+                    "SummaryPage", "setFiles", [](SummaryPage *page, QList<GeneratedFile> files) {
+                        page->setFiles(std::move(files));
+                    });
+
+                wizard.new_usertype<LuaWizard>(
+                    "Wizard",
+                    sol::no_constructor,
+                    "addPage",
+                    [](LuaWizard *wizard, const sol::table &options) {
+                        LuaWizardPage *page = new LuaWizardPage();
+
+                        page->m_initializePage = options.get<std::optional<sol::function>>(
+                            "initializePage");
+
+                        page->setTitle(options.get<QString>("title"));
+                        auto item = options.get<Layouting::LayoutItem *>("layout");
+                        item->attachTo(page);
+                        wizard->addPage(page);
+                        return page;
+                    },
+                    "addSummaryPage",
+                    [](LuaWizard *wizard, const sol::table &options) {
+                        SummaryPage *page = new SummaryPage();
+
+                        page->m_initializePage = options.get<std::optional<sol::function>>(
+                            "initializePage");
+
+                        wizard->addPage(page);
+                        return page;
+                    });
+
+                wizard.set_function("create", [](const sol::table &options) {
+                    std::unique_ptr<LuaWizard> wizard(new LuaWizard());
+                    wizard->fileFactory = options.get<sol::function>("fileFactory");
+                    wizard->allowKeepingExistingFiles
+                        = options.get<std::optional<bool>>("allowKeepingExistingFiles")
+                              .value_or(true);
+                    return wizard.release();
+                });
+
+                wizard.set_function(
+                    "registerFactory",
+                    [factories = std::make_shared<Factories>()](const sol::table &options) mutable {
+                        // We need to make sure that all options are available before registering
+                        // the factory.
+                        Lua::LuaEngine::checkKey<QString>(options, "id");
+                        Lua::LuaEngine::checkKey<QString>(options, "displayName");
+                        Lua::LuaEngine::checkKey<QString>(options, "description");
+                        Lua::LuaEngine::checkKey<QString>(options, "category");
+                        Lua::LuaEngine::checkKey<QString>(options, "displayCategory");
+                        Lua::LuaEngine::checkKey<sol::function>(options, "factory");
+
+                        // We have to make sure that no lua object is accessed after the lua_state
+                        // is destroyed. Therefore we store the factory in a shared_ptr and
+                        // only give a weak pointer to the actual registered factory function.
+                        // That way we can make sure that the factory list is destroyed when the
+                        // lua_state is destroyed, as the current function is stored inside the table
+                        // "wizard" which is automatically destroyed when the lua_state is destroyed.
+                        factories->push_back([options]() -> IWizardFactory * {
+                            std::unique_ptr<WizardFactory> factory(new WizardFactory());
+
+                            factory->setId(Utils::Id::fromString(options.get<QString>("id")));
+                            factory->setDisplayName(options.get<QString>("displayName"));
+                            factory->setDescription(options.get<QString>("description"));
+                            factory->setCategory(options.get<QString>("category"));
+                            factory->setDisplayCategory(options.get<QString>("displayCategory"));
+                            factory->setFlags(IWizardFactory::PlatformIndependent);
+                            factory->setIcon(
+                                QIcon(options.get_or<QString>("icon", {})),
+                                options.get_or<QString>("iconText", {}));
+                            factory->m_setupFunction = options.get<sol::function>("factory");
+
+                            return factory.release();
+                        });
+
+                        IWizardFactory::registerFactoryCreator(
+                            [weakFactories = WeakFactories(factories),
+                             index = factories->size() - 1]() -> IWizardFactory * {
+                                if (auto factories = weakFactories.lock())
+                                    return (*factories)[index]();
+                                return nullptr;
+                            });
+                    });
+
+                return wizard;
+            });
+    }
+};
+
+} // namespace LuaTemplates
+
+#include "luatemplates.moc"
diff --git a/src/plugins/luatemplates/templates/CMakeLists.txt b/src/plugins/luatemplates/templates/CMakeLists.txt
new file mode 100644
index 0000000000..96e6dee944
--- /dev/null
+++ b/src/plugins/luatemplates/templates/CMakeLists.txt
@@ -0,0 +1,4 @@
+add_qtc_lua_plugin(lua_basic_templates
+    SOURCES basic_templates/basic_templates.lua
+            basic_templates/init.lua
+)
diff --git a/src/plugins/luatemplates/templates/basic_templates/basic_templates.lua b/src/plugins/luatemplates/templates/basic_templates/basic_templates.lua
new file mode 100644
index 0000000000..d3668daf4d
--- /dev/null
+++ b/src/plugins/luatemplates/templates/basic_templates/basic_templates.lua
@@ -0,0 +1,13 @@
+-- Copyright (C) 2024 The Qt Company Ltd.
+-- SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+return {
+    Name = "BasicTemplates",
+    Version = "1.0.0",
+    CompatVersion = "1.0.0",
+    Vendor = "The Qt Company",
+    Category = "Templates",
+    Dependencies = {
+        { Name = "LuaTemplates", Version = "13.0.82", Required = true },
+    },
+    setup = function() require "init".setup() end,
+} --[[@as QtcPlugin]]
diff --git a/src/plugins/luatemplates/templates/basic_templates/init.lua b/src/plugins/luatemplates/templates/basic_templates/init.lua
new file mode 100644
index 0000000000..60399467bd
--- /dev/null
+++ b/src/plugins/luatemplates/templates/basic_templates/init.lua
@@ -0,0 +1,65 @@
+-- Copyright (C) 2024 The Qt Company Ltd.
+-- SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+local Wizard = require('Wizard')
+local Layout = require('Layout')
+local Settings = require('Settings')
+local Core = require('Core')
+local Utils = require('Utils')
+
+---@param settings AspectContainer
+local function generateFiles(settings)
+    local mainFile = Core.GeneratedFile.new()
+    mainFile.filePath = settings.path.expandedValue:resolvePath(settings.fileName.value)
+    mainFile.contents = [[print("Hello world!")]]
+    mainFile.attributes = Core.GeneratedFile.Attribute.OpenEditorAttribute
+    return { mainFile }
+end
+
+local function createWizard(path)
+    ---@class AspectContainer
+    local settings = Settings.AspectContainer.create({
+        autoApply = true,
+    })
+    settings.fileName = Settings.StringAspect.create({
+        defaultValue = "script.lua",
+        displayStyle = Settings.StringDisplayStyle.LineEdit,
+        historyId = "BasicTemplate.FileName",
+    })
+    settings.path = Settings.FilePathAspect.create({
+        defaultPath = path,
+        expectedKind = Settings.Kind.ExistingDirectory,
+    })
+
+    local wizard = Wizard.create({
+        fileFactory = function() return generateFiles(settings) end,
+    })
+
+    wizard:addPage({
+        title = "Location",
+        layout = Layout.Form {
+            "File name:", settings.fileName, Layout.br,
+            "Path:", settings.path, Layout.br,
+        },
+    })
+
+    wizard:addSummaryPage({
+        initializePage = function(page)
+            page:setFiles(generateFiles(settings))
+        end
+    })
+    return wizard
+end
+
+local function setup()
+    Wizard.registerFactory({
+        id = "org.qtproject.Qt.QtCreator.Plugin.LuaTemplates.BasicTemplates",
+        displayName = "Basic Templates",
+        description = "Basic Template for Lua",
+        category = "Lua",
+        displayCategory = "Lua",
+        iconText = "lua",
+        factory = createWizard,
+    })
+end
+
+return { setup = setup }
diff --git a/src/plugins/luatests/CMakeLists.txt b/src/plugins/luatests/CMakeLists.txt
new file mode 100644
index 0000000000..80e03b66ca
--- /dev/null
+++ b/src/plugins/luatests/CMakeLists.txt
@@ -0,0 +1,10 @@
+add_qtc_lua_plugin(luatests
+    SOURCES
+        luatests/luatests.lua
+        luatests/tests.lua
+        luatests/inspect.lua
+        luatests/qtctest.lua
+        luatests/tst_aspectcontainer.lua
+        luatests/tst_fetch.lua
+        luatests/tst_utils.lua
+)
diff --git a/src/plugins/luatests/luatests/INSPECT-LICENSE.txt b/src/plugins/luatests/luatests/INSPECT-LICENSE.txt
new file mode 100644
index 0000000000..6149bd7823
--- /dev/null
+++ b/src/plugins/luatests/luatests/INSPECT-LICENSE.txt
@@ -0,0 +1,22 @@
+MIT LICENSE
+
+Copyright (c) 2022 Enrique García Cota
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/src/plugins/luatests/luatests/inspect.lua b/src/plugins/luatests/luatests/inspect.lua
new file mode 100644
index 0000000000..9900a0b81b
--- /dev/null
+++ b/src/plugins/luatests/luatests/inspect.lua
@@ -0,0 +1,371 @@
+local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local math = _tl_compat and _tl_compat.math or math; local string = _tl_compat and _tl_compat.string or string; local table = _tl_compat and _tl_compat.table or table
+local inspect = {Options = {}, }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+inspect._VERSION = 'inspect.lua 3.1.0'
+inspect._URL = 'http://github.com/kikito/inspect.lua'
+inspect._DESCRIPTION = 'human-readable representations of tables'
+inspect._LICENSE = [[
+  MIT LICENSE
+
+  Copyright (c) 2022 Enrique García Cota
+
+  Permission is hereby granted, free of charge, to any person obtaining a
+  copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be included
+  in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+]]
+inspect.KEY = setmetatable({}, { __tostring = function() return 'inspect.KEY' end })
+inspect.METATABLE = setmetatable({}, { __tostring = function() return 'inspect.METATABLE' end })
+
+local tostring = tostring
+local rep = string.rep
+local match = string.match
+local char = string.char
+local gsub = string.gsub
+local fmt = string.format
+
+local _rawget
+if rawget then
+   _rawget = rawget
+else
+   _rawget = function(t, k) return t[k] end
+end
+
+local function rawpairs(t)
+   return next, t, nil
+end
+
+
+
+local function smartQuote(str)
+   if match(str, '"') and not match(str, "'") then
+      return "'" .. str .. "'"
+   end
+   return '"' .. gsub(str, '"', '\\"') .. '"'
+end
+
+
+local shortControlCharEscapes = {
+   ["\a"] = "\\a", ["\b"] = "\\b", ["\f"] = "\\f", ["\n"] = "\\n",
+   ["\r"] = "\\r", ["\t"] = "\\t", ["\v"] = "\\v", ["\127"] = "\\127",
+}
+local longControlCharEscapes = { ["\127"] = "\127" }
+for i = 0, 31 do
+   local ch = char(i)
+   if not shortControlCharEscapes[ch] then
+      shortControlCharEscapes[ch] = "\\" .. i
+      longControlCharEscapes[ch] = fmt("\\%03d", i)
+   end
+end
+
+local function escape(str)
+   return (gsub(gsub(gsub(str, "\\", "\\\\"),
+   "(%c)%f[0-9]", longControlCharEscapes),
+   "%c", shortControlCharEscapes))
+end
+
+local luaKeywords = {
+   ['and'] = true,
+   ['break'] = true,
+   ['do'] = true,
+   ['else'] = true,
+   ['elseif'] = true,
+   ['end'] = true,
+   ['false'] = true,
+   ['for'] = true,
+   ['function'] = true,
+   ['goto'] = true,
+   ['if'] = true,
+   ['in'] = true,
+   ['local'] = true,
+   ['nil'] = true,
+   ['not'] = true,
+   ['or'] = true,
+   ['repeat'] = true,
+   ['return'] = true,
+   ['then'] = true,
+   ['true'] = true,
+   ['until'] = true,
+   ['while'] = true,
+}
+
+local function isIdentifier(str)
+   return type(str) == "string" and
+   not not str:match("^[_%a][_%a%d]*$") and
+   not luaKeywords[str]
+end
+
+local flr = math.floor
+local function isSequenceKey(k, sequenceLength)
+   return type(k) == "number" and
+   flr(k) == k and
+   1 <= (k) and
+   k <= sequenceLength
+end
+
+local defaultTypeOrders = {
+   ['number'] = 1, ['boolean'] = 2, ['string'] = 3, ['table'] = 4,
+   ['function'] = 5, ['userdata'] = 6, ['thread'] = 7,
+}
+
+local function sortKeys(a, b)
+   local ta, tb = type(a), type(b)
+
+
+   if ta == tb and (ta == 'string' or ta == 'number') then
+      return (a) < (b)
+   end
+
+   local dta = defaultTypeOrders[ta] or 100
+   local dtb = defaultTypeOrders[tb] or 100
+
+
+   return dta == dtb and ta < tb or dta < dtb
+end
+
+local function getKeys(t)
+
+   local seqLen = 1
+   while _rawget(t, seqLen) ~= nil do
+      seqLen = seqLen + 1
+   end
+   seqLen = seqLen - 1
+
+   local keys, keysLen = {}, 0
+   for k in rawpairs(t) do
+      if not isSequenceKey(k, seqLen) then
+         keysLen = keysLen + 1
+         keys[keysLen] = k
+      end
+   end
+   table.sort(keys, sortKeys)
+   return keys, keysLen, seqLen
+end
+
+local function countCycles(x, cycles)
+   if type(x) == "table" then
+      if cycles[x] then
+         cycles[x] = cycles[x] + 1
+      else
+         cycles[x] = 1
+         for k, v in rawpairs(x) do
+            countCycles(k, cycles)
+            countCycles(v, cycles)
+         end
+         countCycles(getmetatable(x), cycles)
+      end
+   end
+end
+
+local function makePath(path, a, b)
+   local newPath = {}
+   local len = #path
+   for i = 1, len do newPath[i] = path[i] end
+
+   newPath[len + 1] = a
+   newPath[len + 2] = b
+
+   return newPath
+end
+
+
+local function processRecursive(process,
+   item,
+   path,
+   visited)
+   if item == nil then return nil end
+   if visited[item] then return visited[item] end
+
+   local processed = process(item, path)
+   if type(processed) == "table" then
+      local processedCopy = {}
+      visited[item] = processedCopy
+      local processedKey
+
+      for k, v in rawpairs(processed) do
+         processedKey = processRecursive(process, k, makePath(path, k, inspect.KEY), visited)
+         if processedKey ~= nil then
+            processedCopy[processedKey] = processRecursive(process, v, makePath(path, processedKey), visited)
+         end
+      end
+
+      local mt = processRecursive(process, getmetatable(processed), makePath(path, inspect.METATABLE), visited)
+      if type(mt) ~= 'table' then mt = nil end
+      setmetatable(processedCopy, mt)
+      processed = processedCopy
+   end
+   return processed
+end
+
+local function puts(buf, str)
+   buf.n = buf.n + 1
+   buf[buf.n] = str
+end
+
+
+
+local Inspector = {}
+
+
+
+
+
+
+
+
+
+
+local Inspector_mt = { __index = Inspector }
+
+local function tabify(inspector)
+   puts(inspector.buf, inspector.newline .. rep(inspector.indent, inspector.level))
+end
+
+function Inspector:getId(v)
+   local id = self.ids[v]
+   local ids = self.ids
+   if not id then
+      local tv = type(v)
+      id = (ids[tv] or 0) + 1
+      ids[v], ids[tv] = id, id
+   end
+   return tostring(id)
+end
+
+function Inspector:putValue(v)
+   local buf = self.buf
+   local tv = type(v)
+   if tv == 'string' then
+      puts(buf, smartQuote(escape(v)))
+   elseif tv == 'number' or tv == 'boolean' or tv == 'nil' or
+      tv == 'cdata' or tv == 'ctype' then
+      puts(buf, tostring(v))
+   elseif tv == 'table' and not self.ids[v] then
+      local t = v
+
+      if t == inspect.KEY or t == inspect.METATABLE then
+         puts(buf, tostring(t))
+      elseif self.level >= self.depth then
+         puts(buf, '{...}')
+      else
+         if self.cycles[t] > 1 then puts(buf, fmt('<%d>', self:getId(t))) end
+
+         local keys, keysLen, seqLen = getKeys(t)
+
+         puts(buf, '{')
+         self.level = self.level + 1
+
+         for i = 1, seqLen + keysLen do
+            if i > 1 then puts(buf, ',') end
+            if i <= seqLen then
+               puts(buf, ' ')
+               self:putValue(t[i])
+            else
+               local k = keys[i - seqLen]
+               tabify(self)
+               if isIdentifier(k) then
+                  puts(buf, k)
+               else
+                  puts(buf, "[")
+                  self:putValue(k)
+                  puts(buf, "]")
+               end
+               puts(buf, ' = ')
+               self:putValue(t[k])
+            end
+         end
+
+         local mt = getmetatable(t)
+         if type(mt) == 'table' then
+            if seqLen + keysLen > 0 then puts(buf, ',') end
+            tabify(self)
+            puts(buf, '<metatable> = ')
+            self:putValue(mt)
+         end
+
+         self.level = self.level - 1
+
+         if keysLen > 0 or type(mt) == 'table' then
+            tabify(self)
+         elseif seqLen > 0 then
+            puts(buf, ' ')
+         end
+
+         puts(buf, '}')
+      end
+
+   else
+      puts(buf, fmt('<%s %d>', tv, self:getId(v)))
+   end
+end
+
+
+
+
+function inspect.inspect(root, options)
+   options = options or {}
+
+   local depth = options.depth or (math.huge)
+   local newline = options.newline or '\n'
+   local indent = options.indent or '  '
+   local process = options.process
+
+   if process then
+      root = processRecursive(process, root, {}, {})
+   end
+
+   local cycles = {}
+   countCycles(root, cycles)
+
+   local inspector = setmetatable({
+      buf = { n = 0 },
+      ids = {},
+      cycles = cycles,
+      depth = depth,
+      level = 0,
+      newline = newline,
+      indent = indent,
+   }, Inspector_mt)
+
+   inspector:putValue(root)
+
+   return table.concat(inspector.buf)
+end
+
+setmetatable(inspect, {
+   __call = function(_, root, options)
+      return inspect.inspect(root, options)
+   end,
+})
+
+return inspect
diff --git a/src/plugins/luatests/luatests/luatests.lua b/src/plugins/luatests/luatests/luatests.lua
new file mode 100644
index 0000000000..db0fb7f0c6
--- /dev/null
+++ b/src/plugins/luatests/luatests/luatests.lua
@@ -0,0 +1,20 @@
+-- Copyright (C) 2024 The Qt Company Ltd.
+-- SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+return {
+    Name = "LuaTests",
+    Version = "1.0.0",
+    CompatVersion = "1.0.0",
+    Vendor = "The Qt Company",
+    Category = "Tests",
+    DisabledByDefault = true,
+    Experimental = true,
+    Description = "This plugin tests the Lua API.",
+    LongDescription = [[
+        It has tests for (almost) all functionality exposed by the API.
+    ]],
+    Dependencies = {
+        { Name = "Core", Version = "13.0.82", Required = true },
+        { Name = "Lua",  Version = "13.0.82", Required = true }
+    },
+    setup = function() require 'tests'.setup() end,
+} --[[@as QtcPlugin]]
diff --git a/src/plugins/luatests/luatests/qtctest.lua b/src/plugins/luatests/luatests/qtctest.lua
new file mode 100644
index 0000000000..3914979d55
--- /dev/null
+++ b/src/plugins/luatests/luatests/qtctest.lua
@@ -0,0 +1,32 @@
+-- Copyright (C) 2024 The Qt Company Ltd.
+-- SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+local inspect = require('inspect')
+
+local function traceback()
+    local result = ""
+    local level = 1
+    while true do
+        local info = debug.getinfo(level, "Sl")
+        if not info then break end
+        if info.what ~= "C" then
+            ---Get the last part of the path in info.source
+            local fileName = info.source:match("^.+/(.+)$")
+            result = result .. (string.format("  %s:%d\n", fileName, info.currentline))
+        end
+        level = level + 1
+    end
+    return result
+end
+
+local function compare(actual, expected)
+    if (actual == expected) then
+        return true
+    end
+
+    error("Compared values were not the same.\n  Actual: " ..
+        inspect(actual) .. "\n  Expected: " .. inspect(expected) .. "\nTrace:\n" .. traceback())
+end
+
+return {
+    compare = compare,
+}
diff --git a/src/plugins/luatests/luatests/tests.lua b/src/plugins/luatests/luatests/tests.lua
new file mode 100644
index 0000000000..fb246ae94d
--- /dev/null
+++ b/src/plugins/luatests/luatests/tests.lua
@@ -0,0 +1,69 @@
+-- Copyright (C) 2024 The Qt Company Ltd.
+-- SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+local Utils = require("Utils")
+local Action = require("Action")
+local a = require("async")
+
+
+local function script_path()
+    local str = debug.getinfo(2, "S").source:sub(2)
+    return str
+end
+
+local function printResults(results)
+    print("Passed:", results.passed)
+    print("Failed:", results.failed)
+    for index, value in ipairs(results.failedTests) do
+        print("Failed test:", value.name, value.error)
+    end
+end
+
+local function runTest(testFile, results)
+    local testScript, err = loadfile(testFile:nativePath())
+    if not testScript then
+        print("Failed to load test:", testFile, err)
+        return
+    end
+
+    local ok, testFunctions = pcall(testScript)
+    if not ok then
+        print("Failed to run test:", testFile, testFunctions)
+        return
+    end
+
+    for k, v in pairs(testFunctions) do
+        print("* " .. testFile:fileName() .. " : " .. k)
+        local ok, res_or_error = pcall(v)
+
+        if ok then
+            results.passed = results.passed + 1
+        else
+            results.failed = results.failed + 1
+            table.insert(results.failedTests, { name = testFile:fileName() .. ":" .. k, error = res_or_error })
+        end
+    end
+end
+
+local function runTests()
+    local results = {
+        passed = 0,
+        failed = 0,
+        failedTests = {}
+    }
+
+    local testDir = Utils.FilePath.fromUserInput(script_path()):parentDir()
+    local tests = a.wait(testDir:dirEntries({ nameFilters = { "tst_*.lua" } }))
+    for _, testFile in ipairs(tests) do
+        runTest(testFile, results)
+    end
+    printResults(results)
+end
+
+local function setup()
+    Action.create("LuaTests.run", {
+        text = "Run lua tests",
+        onTrigger = function() a.sync(runTests)() end,
+    })
+end
+
+return { setup = setup }
diff --git a/src/plugins/luatests/luatests/tst_aspectcontainer.lua b/src/plugins/luatests/luatests/tst_aspectcontainer.lua
new file mode 100644
index 0000000000..f948583e1c
--- /dev/null
+++ b/src/plugins/luatests/luatests/tst_aspectcontainer.lua
@@ -0,0 +1,32 @@
+-- Copyright (C) 2024 The Qt Company Ltd.
+-- SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+T = require("qtctest")
+local S = require('Settings')
+
+local function testAutoApply()
+    local container = S.AspectContainer.create({ autoApply = true })
+
+    container.test = S.BoolAspect.create({ defaultValue = true })
+    T.compare(container.test.value, true)
+    container.test.volatileValue = false
+    T.compare(container.test.volatileValue, false)
+    T.compare(container.test.value, false)
+end
+
+local function testNoAutoApply()
+    local container = S.AspectContainer.create({ autoApply = false })
+
+    container.test = S.BoolAspect.create({ defaultValue = true })
+    T.compare(container.test.value, true)
+    container.test.volatileValue = false
+    T.compare(container.test.volatileValue, false)
+    T.compare(container.test.value, true)
+    container:apply()
+    T.compare(container.test.volatileValue, false)
+    T.compare(container.test.value, false)
+end
+
+return {
+    testAutoApply = testAutoApply,
+    testNoAutoApply = testNoAutoApply,
+}
diff --git a/src/plugins/luatests/luatests/tst_fetch.lua b/src/plugins/luatests/luatests/tst_fetch.lua
new file mode 100644
index 0000000000..55a8d1773b
--- /dev/null
+++ b/src/plugins/luatests/luatests/tst_fetch.lua
@@ -0,0 +1,38 @@
+-- Copyright (C) 2024 The Qt Company Ltd.
+-- SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+local T = require("qtctest")
+local fetch = require("Fetch").fetch
+local inspect = require('inspect')
+local a = require("async")
+local string = require("string")
+
+local function testFetch()
+    local r = a.wait(fetch({ url = "https://dummyjson.com/products", convertToTable = true }))
+    local y = a.wait(fetch({ url = "https://dummyjson.com/products", convertToTable = true }))
+    T.compare(type(r), "table")
+    T.compare(type(y), "table")
+end
+
+local function testGoogle()
+    local r = a.wait(fetch({ url = "https://www.google.com" }))
+    T.compare(r.error, 0)
+    print(r)
+end
+
+local function fetchTwo()
+    local r = a.wait_all {
+        fetch({ url = "https://dummyjson.com/products", convertToTable = true }),
+        fetch({ url = "https://www.google.com" }),
+    }
+
+    T.compare(type(r), "table")
+    T.compare(#r, 2)
+    T.compare(type(r[1]), "table")
+    T.compare(r[2].error, 0)
+end
+
+return {
+    testFetch = testFetch,
+    testGoogle = testGoogle,
+    testFetchTwo = fetchTwo
+}
diff --git a/src/plugins/luatests/luatests/tst_utils.lua b/src/plugins/luatests/luatests/tst_utils.lua
new file mode 100644
index 0000000000..c6bbfcf084
--- /dev/null
+++ b/src/plugins/luatests/luatests/tst_utils.lua
@@ -0,0 +1,26 @@
+-- Copyright (C) 2024 The Qt Company Ltd.
+-- SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+local T = require("qtctest")
+local a = require('async')
+local Utils = require('Utils')
+local Qt = require('Qt')
+
+local function testDirEntries()
+    local u = require("Utils")
+    local d = u.FilePath.currentWorkingPath()
+    print("CWD:", d)
+    local result = a.wait(d:dirEntries({}))
+    print("RESULT:", result, #result)
+end
+
+local function testSearchInPath()
+    local u = require("Utils")
+    local d = u.FilePath.fromUserInput('hostname')
+    local result = a.wait(d:searchInPath())
+    print("Hostname found at:", result)
+end
+
+return {
+    testDirEntries = testDirEntries,
+    testSearchInPath = testSearchInPath,
+}
diff --git a/src/plugins/mcusupport/McuSupport.json.in b/src/plugins/mcusupport/McuSupport.json.in
index 94586c932e..bac0409ee7 100644
--- a/src/plugins/mcusupport/McuSupport.json.in
+++ b/src/plugins/mcusupport/McuSupport.json.in
@@ -16,5 +16,7 @@
     "Category" : "Device Support",
     "Description" : "Helper for MCU related projects.",
     "Url" : "http://www.qt.io",
-    ${IDE_PLUGIN_DEPENDENCIES}
+    ${IDE_PLUGIN_DEPENDENCIES},
+
+    "JsonWizardPaths" : [":/mcusupport/wizards/"]
 }
diff --git a/src/plugins/mcusupport/mcusupportplugin.cpp b/src/plugins/mcusupport/mcusupportplugin.cpp
index d9a4aeeeb5..938dcb233a 100644
--- a/src/plugins/mcusupport/mcusupportplugin.cpp
+++ b/src/plugins/mcusupport/mcusupportplugin.cpp
@@ -262,7 +262,6 @@ void McuSupportPlugin::initialize()
 
     dd->m_options.registerQchFiles();
     dd->m_options.registerExamples();
-    ProjectExplorer::JsonWizardFactory::addWizardPath(":/mcusupport/wizards/");
 
 #if defined(WITH_TESTS) && defined(GOOGLE_TEST_IS_FOUND)
     addTest<Test::McuSupportTest>();
diff --git a/src/plugins/mesonprojectmanager/mesonbuildconfiguration.cpp b/src/plugins/mesonprojectmanager/mesonbuildconfiguration.cpp
index 38d525502c..c936ac3130 100644
--- a/src/plugins/mesonprojectmanager/mesonbuildconfiguration.cpp
+++ b/src/plugins/mesonprojectmanager/mesonbuildconfiguration.cpp
@@ -64,7 +64,7 @@ static FilePath shadowBuildDirectory(const FilePath &projectFilePath,
 
     const QString projectName = projectFilePath.parentDir().fileName();
     return MesonBuildConfiguration::buildDirectoryFromTemplate(
-        Project::projectDirectory(projectFilePath), projectFilePath,
+        projectFilePath.absolutePath(), projectFilePath,
         projectName, k, bcName, buildType, "meson");
 }
 
diff --git a/src/plugins/modeleditor/actionhandler.cpp b/src/plugins/modeleditor/actionhandler.cpp
index 47599413aa..00ed184b8b 100644
--- a/src/plugins/modeleditor/actionhandler.cpp
+++ b/src/plugins/modeleditor/actionhandler.cpp
@@ -35,6 +35,7 @@ public:
     QAction *deleteAction = nullptr;
     QAction *selectAllAction = nullptr;
     QAction *openParentDiagramAction = nullptr;
+    QAction *toggleViewFilterAction = nullptr;
     QAction *synchronizeBrowserAction = nullptr;
     QAction *exportDiagramAction = nullptr;
     QAction *exportSelectedElementsAction = nullptr;
@@ -95,6 +96,11 @@ QAction *ActionHandler::openParentDiagramAction() const
     return d->openParentDiagramAction;
 }
 
+QAction *ActionHandler::toggleViewFilterAction() const
+{
+    return d->toggleViewFilterAction;
+}
+
 QAction *ActionHandler::synchronizeBrowserAction() const
 {
     return d->synchronizeBrowserAction;
@@ -162,6 +168,15 @@ void ActionHandler::createActions()
                     QKeySequence(), QIcon(":/modelinglib/48x48/class.png"));
     registerCommand(Constants::ACTION_ADD_CANVAS_DIAGRAM, nullptr, Core::Context(), Tr::tr("Add Canvas Diagram"),
                     QKeySequence(), QIcon(":/modelinglib/48x48/canvas-diagram.png"));
+    d->toggleViewFilterAction
+        = registerCommand(
+              Constants::ACTION_TOGGLE_VIEWFILTER,
+              &ModelEditor::toggleModelTreeFilter,
+              Core::Context(),
+              Tr::tr("Toggle View and Filter Settings"),
+              QKeySequence(Tr::tr("Ctrl+Shift+L")),
+              Utils::Icons::EYE_OPEN_TOOLBAR.icon())->action();
+    d->toggleViewFilterAction->setCheckable(true);
     d->synchronizeBrowserAction
         = registerCommand(
               Constants::ACTION_SYNC_BROWSER,
diff --git a/src/plugins/modeleditor/actionhandler.h b/src/plugins/modeleditor/actionhandler.h
index 82b7c5321a..337fa23736 100644
--- a/src/plugins/modeleditor/actionhandler.h
+++ b/src/plugins/modeleditor/actionhandler.h
@@ -43,6 +43,7 @@ public:
     QAction *deleteAction() const;
     QAction *selectAllAction() const;
     QAction *openParentDiagramAction() const;
+    QAction *toggleViewFilterAction() const;
     QAction *synchronizeBrowserAction() const;
     QAction *exportDiagramAction() const;
     QAction *exportSelectedElementsAction() const;
diff --git a/src/plugins/modeleditor/elementtasks.cpp b/src/plugins/modeleditor/elementtasks.cpp
index 3cc271214f..173ccd6524 100644
--- a/src/plugins/modeleditor/elementtasks.cpp
+++ b/src/plugins/modeleditor/elementtasks.cpp
@@ -11,6 +11,9 @@
 
 #include "qmt/diagram/delement.h"
 #include "qmt/diagram/dpackage.h"
+#include "qmt/diagram_controller/dselection.h"
+#include "qmt/diagram_scene/diagramscenemodel.h"
+#include "qmt/diagram_ui/diagramsmanager.h"
 #include "qmt/document_controller/documentcontroller.h"
 #include "qmt/infrastructure/contextmenuaction.h"
 #include "qmt/model/melement.h"
@@ -19,6 +22,7 @@
 #include "qmt/model/mcanvasdiagram.h"
 #include "qmt/model/mpackage.h"
 #include "qmt/model_controller/modelcontroller.h"
+#include "qmt/model_widgets_ui/addrelatedelementsdialog.h"
 #include "qmt/tasks/finddiagramvisitor.h"
 #include "qmt/project_controller/projectcontroller.h"
 #include "qmt/project/project.h"
@@ -28,9 +32,11 @@
 #include <cppeditor/indexitem.h>
 #include <cppeditor/searchsymbols.h>
 #include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/icore.h>
 #include <utils/qtcassert.h>
 
 #include <QMenu>
+#include <QMessageBox>
 
 using namespace Core;
 using namespace CppEditor;
@@ -42,12 +48,14 @@ class ElementTasks::ElementTasksPrivate {
 public:
     qmt::DocumentController *documentController = nullptr;
     ComponentViewController *componentViewController = nullptr;
+    QScopedPointer<qmt::AddRelatedElementsDialog> addRelatedElementsDialog;
 };
 
 ElementTasks::ElementTasks(QObject *parent)
     : QObject(parent),
       d(new ElementTasksPrivate)
 {
+    d->addRelatedElementsDialog.reset(new qmt::AddRelatedElementsDialog(Core::ICore::dialogParent()));
 }
 
 ElementTasks::~ElementTasks()
@@ -58,6 +66,7 @@ ElementTasks::~ElementTasks()
 void ElementTasks::setDocumentController(qmt::DocumentController *documentController)
 {
     d->documentController = documentController;
+    d->addRelatedElementsDialog->setDiagramSceneController(documentController->diagramSceneController());
 }
 
 void ElementTasks::setComponentViewController(ComponentViewController *componentViewController)
@@ -392,9 +401,75 @@ void ElementTasks::createAndOpenDiagram(const qmt::DElement *element, const qmt:
     createAndOpenDiagram(melement);
 }
 
+bool ElementTasks::hasLinkedFile(const qmt::MElement *element) const
+{
+    if (auto mobject = dynamic_cast<const qmt::MObject *>(element)) {
+        QString filename = mobject->linkedFileName();
+        if (!filename.isEmpty()) {
+            QString projectName = d->documentController->projectController()->project()->fileName();
+            Utils::FilePath relativePath = Utils::FilePath::fromString(filename);
+            Utils::FilePath projectPath = Utils::FilePath::fromString(projectName);
+            QString filepath = relativePath.resolvePath(projectPath).toString();
+            return QFileInfo::exists(filepath);
+        }
+    }
+    return false;
+}
+
+bool ElementTasks::hasLinkedFile(const qmt::DElement *element, const qmt::MDiagram *diagram) const
+{
+    Q_UNUSED(diagram)
+
+    qmt::MElement *melement = d->documentController->modelController()->findElement(element->modelUid());
+    if (!melement)
+        return false;
+    return hasLinkedFile(melement);
+}
+
+void ElementTasks::openLinkedFile(const qmt::MElement *element)
+{
+    if (auto mobject = dynamic_cast<const qmt::MObject *>(element)) {
+        QString filename = mobject->linkedFileName();
+        if (!filename.isEmpty()) {
+            QString projectName = d->documentController->projectController()->project()->fileName();
+            QString filepath;
+            if (QFileInfo(filename).isRelative())
+                filepath = QFileInfo(QFileInfo(projectName).path() + "/" + filename).canonicalFilePath();
+            else
+                filepath = filename;
+            if (QFileInfo::exists(filepath)) {
+                Core::EditorFactories list = Core::IEditorFactory::preferredEditorFactories(Utils::FilePath::fromString(filepath));
+                if (list.empty() || (list.count() <= 1 && list.at(0)->id() == "Core.BinaryEditor")) {
+                    // intentionally ignore return code
+                    (void) Core::EditorManager::instance()->openExternalEditor(Utils::FilePath::fromString(filepath), "CorePlugin.OpenWithSystemEditor");
+                } else {
+                    // intentionally ignore return code
+                    (void) Core::EditorManager::instance()->openEditor(Utils::FilePath::fromString(filepath));
+                }
+            } else {
+                QMessageBox::critical(Core::ICore::dialogParent(), Tr::tr("Opening File"), Tr::tr("File %1 does not exist.").arg(filepath));
+            }
+        }
+    }
+}
+
+void ElementTasks::openLinkedFile(const qmt::DElement *element, const qmt::MDiagram *diagram)
+{
+    Q_UNUSED(diagram)
+
+    qmt::MElement *melement = d->documentController->modelController()->findElement(element->modelUid());
+    if (!melement)
+        return;
+    openLinkedFile(melement);
+}
+
 bool ElementTasks::extendContextMenu(const qmt::DElement *delement, const qmt::MDiagram *, QMenu *menu)
 {
     bool extended = false;
+    if (dynamic_cast<const qmt::DObject *>(delement)) {
+        menu->addAction(new qmt::ContextMenuAction(Tr::tr("Add Related Elements..."), "addRelatedElementsDialog", menu));
+        extended = true;
+    }
     if (dynamic_cast<const qmt::DPackage *>(delement)) {
         menu->addAction(new qmt::ContextMenuAction(Tr::tr("Update Include Dependencies"), "updateIncludeDependencies", menu));
         extended = true;
@@ -402,9 +477,14 @@ bool ElementTasks::extendContextMenu(const qmt::DElement *delement, const qmt::M
     return extended;
 }
 
-bool ElementTasks::handleContextMenuAction(const qmt::DElement *element, const qmt::MDiagram *, const QString &id)
+bool ElementTasks::handleContextMenuAction(qmt::DElement *element, qmt::MDiagram *diagram, const QString &id)
 {
-    if (id == "updateIncludeDependencies") {
+    if (id == "addRelatedElementsDialog") {
+        qmt::DSelection selection = d->documentController->diagramsManager()->diagramSceneModel(diagram)->selectedElements();
+        d->addRelatedElementsDialog->setElements(selection, diagram);
+        d->addRelatedElementsDialog->open();
+        return true;
+    } else if (id == "updateIncludeDependencies") {
         qmt::MPackage *mpackage = d->documentController->modelController()->findElement<qmt::MPackage>(element->modelUid());
         if (mpackage)
             d->componentViewController->updateIncludeDependencies(mpackage);
diff --git a/src/plugins/modeleditor/elementtasks.h b/src/plugins/modeleditor/elementtasks.h
index b99512d65f..caee1e9e6f 100644
--- a/src/plugins/modeleditor/elementtasks.h
+++ b/src/plugins/modeleditor/elementtasks.h
@@ -66,8 +66,13 @@ public:
     void createAndOpenDiagram(const qmt::MElement *element) override;
     void createAndOpenDiagram(const qmt::DElement *element, const qmt::MDiagram *diagram) override;
 
-    bool extendContextMenu(const qmt::DElement *delement, const qmt::MDiagram *, QMenu *menu) override;
-    bool handleContextMenuAction(const qmt::DElement *element, const qmt::MDiagram *, const QString &id) override;
+    bool hasLinkedFile(const qmt::MElement *element) const override;
+    bool hasLinkedFile(const qmt::DElement *element, const qmt::MDiagram *diagram) const override;
+    void openLinkedFile(const qmt::MElement *element) override;
+    void openLinkedFile(const qmt::DElement *element, const qmt::MDiagram *diagram) override;
+
+    bool extendContextMenu(const qmt::DElement *delement, const qmt::MDiagram *diagram, QMenu *menu) override;
+    bool handleContextMenuAction(qmt::DElement *element, qmt::MDiagram *diagram, const QString &id) override;
 
 private:
     ElementTasksPrivate *d;
diff --git a/src/plugins/modeleditor/extpropertiesmview.cpp b/src/plugins/modeleditor/extpropertiesmview.cpp
index b57d1bc2a9..fcae9ada22 100644
--- a/src/plugins/modeleditor/extpropertiesmview.cpp
+++ b/src/plugins/modeleditor/extpropertiesmview.cpp
@@ -6,18 +6,60 @@
 #include "modeleditortr.h"
 
 #include "qmt/model/mpackage.h"
+#include "qmt/diagram/dobject.h"
 #include "qmt/project/project.h"
 #include "qmt/project_controller/projectcontroller.h"
 
+#include <coreplugin/icore.h>
+#include <utils/fileutils.h>
 #include <utils/pathchooser.h>
 
 #include <QLabel>
 #include <QFileInfo>
 #include <QDir>
+#include <QMessageBox>
+#include <QMimeDatabase>
+#include <QImageReader>
 
 namespace ModelEditor {
 namespace Internal {
 
+static QString imageNameFilterString()
+{
+    static QString result;
+    if (result.isEmpty()) {
+        QMimeDatabase mimeDatabase;
+        const QString separator = QStringLiteral(";;");
+        const auto mimeTypes = QImageReader::supportedMimeTypes();
+        for (const QByteArray &mimeType : mimeTypes) {
+            const QString filter = mimeDatabase.mimeTypeForName(QLatin1String(mimeType))
+                                       .filterString();
+            if (!filter.isEmpty()) {
+                if (mimeType == QByteArrayLiteral("image/png")) {
+                    if (!result.isEmpty())
+                        result.prepend(separator);
+                    result.prepend(filter);
+                } else {
+                    if (!result.isEmpty())
+                        result.append(separator);
+                    result.append(filter);
+                }
+            }
+        }
+    }
+    return result;
+}
+
+/// Constructs an absolute FilePath from \a relativePath which
+/// is interpreted as being relative to \a anchor.
+Utils::FilePath absoluteFromRelativePath(const Utils::FilePath &relativePath,
+                                         const Utils::FilePath &anchor)
+{
+    QDir anchorDir = QFileInfo(anchor.path()).absoluteDir();
+    QString absoluteFilePath = QFileInfo(anchorDir, relativePath.path()).canonicalFilePath();
+    return Utils::FilePath::fromString(absoluteFilePath);
+}
+
 ExtPropertiesMView::ExtPropertiesMView(qmt::PropertiesView *view)
     : qmt::PropertiesView::MView(view)
 {
@@ -45,7 +87,8 @@ void ExtPropertiesMView::visitMPackage(const qmt::MPackage *package)
                 Utils::FilePath::fromString(project->fileName()).absolutePath());
             addRow(Tr::tr("Config path:"), m_configPath, "configpath");
             connect(m_configPath, &Utils::PathChooser::textChanged,
-                    this, &ExtPropertiesMView::onConfigPathChanged);
+                    this, &ExtPropertiesMView::onConfigPathChanged,
+                    Qt::QueuedConnection);
         }
         if (!m_configPath->hasFocus()) {
             if (project->configPath().isEmpty()) {
@@ -63,9 +106,78 @@ void ExtPropertiesMView::visitMPackage(const qmt::MPackage *package)
     }
 }
 
-void ExtPropertiesMView::onConfigPathChanged()
+void ExtPropertiesMView::visitMObjectBehind(const qmt::MObject *object)
+{
+    qmt::Project *project = m_projectController->project();
+    QList<qmt::MObject *> selection = filter<qmt::MObject>(m_modelElements);
+    bool isSingleSelection = selection.size() == 1;
+    if (!m_filelinkPathChooser) {
+        m_filelinkPathChooser = new Utils::PathChooser(m_topWidget);
+        m_filelinkPathChooser->setPromptDialogTitle((Tr::tr("Select File Target")));
+        m_filelinkPathChooser->setExpectedKind(Utils::PathChooser::File);
+        m_filelinkPathChooser->setInitialBrowsePathBackup(Utils::FilePath::fromString(QFileInfo(project->fileName()).absolutePath()));
+        addRow(Tr::tr("Linked file:"), m_filelinkPathChooser, "filelink");
+        connect(m_filelinkPathChooser, &Utils::PathChooser::textChanged,
+                this, &ExtPropertiesMView::onFileLinkPathChanged,
+                Qt::QueuedConnection);
+    }
+    if (isSingleSelection) {
+        if (!m_filelinkPathChooser->hasFocus()) {
+            QString path = object->linkedFileName();
+            if (path.isEmpty()) {
+                m_filelinkPathChooser->setPath(QString());
+            } else {
+                Utils::FilePath relativePath = Utils::FilePath::fromString(path);
+                Utils::FilePath projectPath = Utils::FilePath::fromString(project->fileName());
+                QString filePath = absoluteFromRelativePath(relativePath, projectPath).toString();
+                m_filelinkPathChooser->setPath(filePath);
+            }
+        }
+    } else {
+        m_filelinkPathChooser->setPath(QString());
+    }
+    if (m_filelinkPathChooser->isEnabled() != isSingleSelection)
+        m_filelinkPathChooser->setEnabled(isSingleSelection);
+}
+
+void ExtPropertiesMView::visitDObjectBefore(const qmt::DObject *object)
+{
+    qmt::Project *project = m_projectController->project();
+    QList<qmt::DObject *> selection = filter<qmt::DObject>(m_diagramElements);
+    bool isSingleSelection = selection.size() == 1;
+    if (!m_imagePathChooser) {
+        m_imagePathChooser = new Utils::PathChooser(m_topWidget);
+        m_imagePathChooser->setPromptDialogTitle(Tr::tr("Select Image File"));
+        m_imagePathChooser->setExpectedKind(Utils::PathChooser::File);
+        m_imagePathChooser->setPromptDialogFilter(imageNameFilterString());
+        m_imagePathChooser->setInitialBrowsePathBackup(
+            Utils::FilePath::fromString(QFileInfo(project->fileName()).absolutePath()));
+        addRow(Tr::tr("Image:"), m_imagePathChooser, "imagepath");
+        connect(m_imagePathChooser, &Utils::PathChooser::textChanged,
+                this, &ExtPropertiesMView::onImagePathChanged,
+                Qt::QueuedConnection);
+    }
+    if (isSingleSelection) {
+        if (!m_imagePathChooser->hasFocus()) {
+            QString path = object->imagePath();
+            if (path.isEmpty()) {
+                m_imagePathChooser->setPath(QString());
+            } else {
+                Utils::FilePath relativePath = Utils::FilePath::fromString(path);
+                Utils::FilePath projectPath = Utils::FilePath::fromString(project->fileName());
+                QString filePath = absoluteFromRelativePath(relativePath, projectPath).toString();
+                m_imagePathChooser->setPath(filePath);
+            }
+        }
+    } else {
+        m_imagePathChooser->setPath(QString());
+    }
+    if (m_imagePathChooser->isEnabled() != isSingleSelection)
+        m_imagePathChooser->setEnabled(isSingleSelection);
+}
+
+void ExtPropertiesMView::onConfigPathChanged(const QString &path)
 {
-    const Utils::FilePath path = m_configPath->rawFilePath();
     bool modified = false;
     qmt::Project *project = m_projectController->project();
     if (path.isEmpty()) {
@@ -76,7 +188,7 @@ void ExtPropertiesMView::onConfigPathChanged()
         }
     } else {
         // make path relative to current project's directory
-        QFileInfo absConfigPath = path.toFileInfo();
+        QFileInfo absConfigPath = Utils::FilePath::fromString(path).toFileInfo();
         absConfigPath.makeAbsolute();
         QDir projectDir = QFileInfo(project->fileName()).dir();
         QString configPath = projectDir.relativeFilePath(absConfigPath.filePath());
@@ -90,5 +202,55 @@ void ExtPropertiesMView::onConfigPathChanged()
         m_configPathInfo->setText(Tr::tr("<font color=red>Model file must be reloaded.</font>"));
 }
 
+void ExtPropertiesMView::onFileLinkPathChanged(const QString &path)
+{
+    qmt::Project *project = m_projectController->project();
+    if (path.isEmpty()) {
+        assignModelElement<qmt::MObject, QString>(m_modelElements, SelectionSingle, QString(),
+                                                  &qmt::MObject::linkedFileName, &qmt::MObject::setLinkedFileName);
+    } else {
+        // make path relative to current project's directory
+        Utils::FilePath filePath = Utils::FilePath::fromString(path);
+        Utils::FilePath projectPath = Utils::FilePath::fromString(QFileInfo(project->fileName()).path());
+        QString relativeFilePath = filePath.relativePathFrom(projectPath).toString();
+        if (!relativeFilePath.isEmpty()) {
+            assignModelElement<qmt::MObject, QString>(m_modelElements, SelectionSingle, relativeFilePath,
+                                                      &qmt::MObject::linkedFileName, &qmt::MObject::setLinkedFileName);
+        }
+    }
+}
+
+void ExtPropertiesMView::onImagePathChanged(const QString &path)
+{
+    qmt::Project *project = m_projectController->project();
+    if (path.isEmpty()) {
+        assignModelElement<qmt::DObject, QString>(m_diagramElements, SelectionSingle, QString(),
+                                                  &qmt::DObject::imagePath, &qmt::DObject::setImagePath);
+        assignModelElement<qmt::DObject, QImage>(m_diagramElements, SelectionSingle, QImage(),
+                                                 &qmt::DObject::image, &qmt::DObject::setImage);
+    } else {
+        // make path relative to current project's directory
+        Utils::FilePath filePath = Utils::FilePath::fromString(path);
+        Utils::FilePath projectPath = Utils::FilePath::fromString(
+            QFileInfo(project->fileName()).path());
+        QString relativeFilePath = filePath.relativePathFrom(projectPath).toString();
+        if (!relativeFilePath.isEmpty()
+             && isValueChanged<qmt::DObject, QString>(m_diagramElements, SelectionSingle, relativeFilePath,
+                                                      &qmt::DObject::imagePath))
+        {
+            QImage image;
+            if (image.load(path)) {
+                assignModelElement<qmt::DObject, QString>(m_diagramElements, SelectionSingle, relativeFilePath,
+                                                          &qmt::DObject::imagePath, &qmt::DObject::setImagePath);
+                assignModelElement<qmt::DObject, QImage>(m_diagramElements, SelectionSingle, image,
+                                                         &qmt::DObject::image, &qmt::DObject::setImage);
+            } else {
+                QMessageBox::critical(Core::ICore::dialogParent(), Tr::tr("Selecting Image"),
+                                      Tr::tr("Unable to read image file %1").arg(path));
+            }
+        }
+    }
+}
+
 } // namespace Interal
 } // namespace ModelEditor
diff --git a/src/plugins/modeleditor/extpropertiesmview.h b/src/plugins/modeleditor/extpropertiesmview.h
index 19e061d78f..d0c9d76bcb 100644
--- a/src/plugins/modeleditor/extpropertiesmview.h
+++ b/src/plugins/modeleditor/extpropertiesmview.h
@@ -24,13 +24,21 @@ public:
 
     void visitMPackage(const qmt::MPackage *package) override;
 
+protected:
+    void visitMObjectBehind(const qmt::MObject *object) override;
+    void visitDObjectBefore(const qmt::DObject *object) override;
+
 private:
-    void onConfigPathChanged();
+    void onConfigPathChanged(const QString &path);
+    void onFileLinkPathChanged(const QString &path);
+    void onImagePathChanged(const QString &path);
 
 private:
     qmt::ProjectController *m_projectController = nullptr;
+    Utils::PathChooser *m_filelinkPathChooser = nullptr;
     Utils::PathChooser *m_configPath = nullptr;
     QLabel *m_configPathInfo = nullptr;
+    Utils::PathChooser *m_imagePathChooser = nullptr;
 };
 
 } // namespace Interal
diff --git a/src/plugins/modeleditor/modeleditor.cpp b/src/plugins/modeleditor/modeleditor.cpp
index f17a35e434..bd39057f45 100644
--- a/src/plugins/modeleditor/modeleditor.cpp
+++ b/src/plugins/modeleditor/modeleditor.cpp
@@ -36,6 +36,7 @@
 #include "qmt/model_controller/mselection.h"
 #include "qmt/model_ui/treemodel.h"
 #include "qmt/model_ui/treemodelmanager.h"
+#include "qmt/model_widgets_ui/modeltreefilter.h"
 #include "qmt/model_widgets_ui/modeltreeview.h"
 #include "qmt/model_widgets_ui/propertiesview.h"
 #include "qmt/stereotype/shapepaintvisitor.h"
@@ -110,6 +111,10 @@ public:
     EditorDiagramView *diagramView = nullptr;
     QLabel *noDiagramLabel = nullptr;
     DiagramsViewManager *diagramsViewManager = nullptr;
+    QWidget *rightPanel = nullptr;
+    QVBoxLayout *rightPanelLayout = nullptr;
+    QScrollArea *viewFilterScrollArea = nullptr;
+    qmt::ModelTreeFilter *viewFilterWidget = nullptr;
     MiniSplitter *rightHorizSplitter = nullptr;
     qmt::ModelTreeView *modelTreeView = nullptr;
     qmt::TreeModelManager *modelTreeViewServant = nullptr;
@@ -122,6 +127,7 @@ public:
     QAction *syncBrowserWithDiagramAction = nullptr;
     QAction *syncDiagramWithBrowserAction = nullptr;
     QAction *syncEachOtherAction = nullptr;
+    int formerViewFilterHeight = 0;
 };
 
 ModelEditor::ModelEditor(UiController *uiController, ActionHandler *actionHandler)
@@ -254,7 +260,22 @@ void ModelEditor::init()
     d->leftGroupLayout->addWidget(frame, 0);
     d->leftGroupLayout->addWidget(d->diagramStack, 1);
 
-    d->rightHorizSplitter = new MiniSplitter(d->rightSplitter);
+    d->rightPanel = new QWidget(d->rightSplitter);
+    d->rightPanelLayout = new QVBoxLayout(d->rightPanel);
+    d->rightPanelLayout->setContentsMargins(0, 0, 0, 0);
+    d->rightPanelLayout->setSpacing(0);
+
+    d->viewFilterScrollArea = new QScrollArea(d->rightPanel);
+    d->viewFilterScrollArea->setFrameShape(QFrame::NoFrame);
+    d->viewFilterScrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
+    d->viewFilterScrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded);
+    d->viewFilterScrollArea->setWidgetResizable(true);
+    d->viewFilterScrollArea->setVisible(false);
+
+    d->viewFilterWidget = new qmt::ModelTreeFilter(d->viewFilterScrollArea);
+    d->viewFilterScrollArea->setWidget(d->viewFilterWidget);
+
+    d->rightHorizSplitter = new MiniSplitter(d->rightPanel);
     d->rightHorizSplitter->setOrientation(Qt::Vertical);
     connect(d->rightHorizSplitter, &QSplitter::splitterMoved,
             this, &ModelEditor::onRightHorizSplitterMoved);
@@ -263,6 +284,10 @@ void ModelEditor::init()
 
     d->modelTreeView = new qmt::ModelTreeView(d->rightHorizSplitter);
     d->modelTreeView->setFrameShape(QFrame::NoFrame);
+    connect(d->viewFilterWidget, &qmt::ModelTreeFilter::viewDataChanged,
+            d->modelTreeView, &qmt::ModelTreeView::setModelTreeViewData);
+    connect(d->viewFilterWidget, &qmt::ModelTreeFilter::filterDataChanged,
+            d->modelTreeView, &qmt::ModelTreeView::setModelTreeFilterData);
 
     d->modelTreeViewServant = new qmt::TreeModelManager(this);
     d->modelTreeViewServant->setModelTreeView(d->modelTreeView);
@@ -278,8 +303,11 @@ void ModelEditor::init()
     d->rightHorizSplitter->setStretchFactor(0, 2); // magic stretch factors for equal sizing
     d->rightHorizSplitter->setStretchFactor(1, 3);
 
+    d->rightPanelLayout->addWidget(d->viewFilterScrollArea, 0);
+    d->rightPanelLayout->addWidget(d->rightHorizSplitter, 1);
+
     d->rightSplitter->insertWidget(0, d->leftGroup);
-    d->rightSplitter->insertWidget(1, d->rightHorizSplitter);
+    d->rightSplitter->insertWidget(1, d->rightPanel);
     d->rightSplitter->setStretchFactor(0, 1);
     d->rightSplitter->setStretchFactor(1, 0);
 
@@ -328,6 +356,11 @@ void ModelEditor::init()
                                                         d->toolbar));
     toolbarLayout->addSpacing(20);
 
+    auto toggleViewFilterButton
+        = Command::toolButtonWithAppendedShortcut(d->actionHandler->toggleViewFilterAction(),
+                                                  Constants::ACTION_TOGGLE_VIEWFILTER);
+    toolbarLayout->addWidget(toggleViewFilterButton);
+
     auto syncToggleButton
         = Command::toolButtonWithAppendedShortcut(d->actionHandler->synchronizeBrowserAction(),
                                                   Constants::ACTION_SYNC_BROWSER);
@@ -668,6 +701,16 @@ void ModelEditor::resetZoom()
     showZoomIndicator();
 }
 
+void ModelEditor::showModelTreeFilter(bool visible)
+{
+    d->viewFilterScrollArea->setVisible(visible);
+}
+
+void ModelEditor::toggleModelTreeFilter()
+{
+    d->viewFilterScrollArea->setVisible(!d->viewFilterScrollArea->isVisible());
+}
+
 qmt::MPackage *ModelEditor::guessSelectedPackage() const
 {
     qmt::MPackage *package = nullptr;
@@ -959,7 +1002,7 @@ void ModelEditor::onTreeViewDoubleClicked(const QModelIndex &index)
     QModelIndex treeModelIndex = d->modelTreeView->mapToSourceModelIndex(index);
     qmt::MElement *melement = documentController->treeModel()->element(treeModelIndex);
     // double click on package is already used for toggeling tree
-    if (melement && !dynamic_cast<qmt::MPackage *>(melement))
+    if (melement && !d->modelTreeView->model()->hasChildren(index))
         documentController->elementTasks()->openElement(melement);
 }
 
diff --git a/src/plugins/modeleditor/modeleditor.h b/src/plugins/modeleditor/modeleditor.h
index 639cd348b0..a477033c4b 100644
--- a/src/plugins/modeleditor/modeleditor.h
+++ b/src/plugins/modeleditor/modeleditor.h
@@ -69,6 +69,8 @@ public:
     void zoomInAtPos(const QPoint &pos);
     void zoomOutAtPos(const QPoint &pos);
     void resetZoom();
+    void showModelTreeFilter(bool visible = true);
+    void toggleModelTreeFilter();
 
     qmt::MPackage *guessSelectedPackage() const;
 
diff --git a/src/plugins/modeleditor/modeleditor_constants.h b/src/plugins/modeleditor/modeleditor_constants.h
index c773181061..d35bce258a 100644
--- a/src/plugins/modeleditor/modeleditor_constants.h
+++ b/src/plugins/modeleditor/modeleditor_constants.h
@@ -16,6 +16,7 @@ const char ACTION_ADD_PACKAGE[] = "ModelEditor.Action.AddPackage";
 const char ACTION_ADD_COMPONENT[] = "ModelEditor.Action.AddComponent";
 const char ACTION_ADD_CLASS[] = "ModelEditor.Action.AddClass";
 const char ACTION_ADD_CANVAS_DIAGRAM[] = "ModelEditor.Action.AddCanvasDiagram";
+const char ACTION_TOGGLE_VIEWFILTER[] = "ModelEditor.Action.ToggleViewFilter";
 const char ACTION_SYNC_BROWSER[] = "ModelEditor.Action.SynchronizeBrowser";
 
 const char EXPLORER_GROUP_MODELING[] = "ModelEditor.ProjectFolder.Group.Modeling";
diff --git a/src/plugins/modeleditor/openelementvisitor.cpp b/src/plugins/modeleditor/openelementvisitor.cpp
index 60866f63ae..4fbc610571 100644
--- a/src/plugins/modeleditor/openelementvisitor.cpp
+++ b/src/plugins/modeleditor/openelementvisitor.cpp
@@ -132,7 +132,8 @@ void OpenModelElementVisitor::visitMElement(const qmt::MElement *element)
 
 void OpenModelElementVisitor::visitMObject(const qmt::MObject *object)
 {
-    Q_UNUSED(object)
+    if (m_elementTasks->hasLinkedFile(object))
+        m_elementTasks->openLinkedFile(object);
 }
 
 void OpenModelElementVisitor::visitMPackage(const qmt::MPackage *package)
@@ -145,17 +146,26 @@ void OpenModelElementVisitor::visitMPackage(const qmt::MPackage *package)
 
 void OpenModelElementVisitor::visitMClass(const qmt::MClass *klass)
 {
-    m_elementTasks->openClassDefinition(klass);
+    if (m_elementTasks->hasClassDefinition(klass))
+        m_elementTasks->openClassDefinition(klass);
+    else
+        visitMObject(klass);
 }
 
 void OpenModelElementVisitor::visitMComponent(const qmt::MComponent *component)
 {
-    m_elementTasks->openSourceFile(component);
+    if (m_elementTasks->hasSourceFile(component))
+        m_elementTasks->openSourceFile(component);
+    else
+        visitMObject(component);
 }
 
 void OpenModelElementVisitor::visitMDiagram(const qmt::MDiagram *diagram)
 {
-    m_elementTasks->openDiagram(diagram);
+    if (m_elementTasks->hasDiagram(diagram))
+        m_elementTasks->openDiagram(diagram);
+    else
+        visitMObject(diagram);
 }
 
 void OpenModelElementVisitor::visitMCanvasDiagram(const qmt::MCanvasDiagram *diagram)
diff --git a/src/plugins/modeleditor/pxnodecontroller.cpp b/src/plugins/modeleditor/pxnodecontroller.cpp
index e015e7a240..f659e46f3d 100644
--- a/src/plugins/modeleditor/pxnodecontroller.cpp
+++ b/src/plugins/modeleditor/pxnodecontroller.cpp
@@ -14,6 +14,7 @@
 #include "qmt/model/mclass.h"
 #include "qmt/model/mcomponent.h"
 #include "qmt/model/mdiagram.h"
+#include "qmt/model/mitem.h"
 #include "qmt/model/mcanvasdiagram.h"
 #include "qmt/controller/namecontroller.h"
 #include "qmt/controller/undocontroller.h"
@@ -45,7 +46,10 @@ public:
         TYPE_ADD_PACKAGE_AND_DIAGRAM,
         TYPE_ADD_PACKAGE_MODEL,
         TYPE_ADD_COMPONENT_MODEL,
-        TYPE_ADD_CLASS_MODEL
+        TYPE_ADD_CLASS_MODEL,
+        TYPE_ADD_PACKAGE_LINK,
+        TYPE_ADD_DIAGRAM_LINK,
+        TYPE_ADD_DOCUMENT_LINK,
     };
 
 public:
@@ -58,6 +62,17 @@ public:
     {
     }
 
+    MenuAction(const QString &text, const QString &elementName, Type type, const QString &stereotype,
+               const QString &filePath, QObject *parent)
+        : QAction(text, parent),
+          elementName(elementName),
+          type(type),
+          index(-1),
+          stereotype(stereotype),
+          filePath(filePath)
+    {
+    }
+
     MenuAction(const QString &text, const QString &elementName, Type type, QObject *parent)
         : QAction(text, parent),
           elementName(elementName),
@@ -70,7 +85,8 @@ public:
     int type;
     int index;
     QString className;
-    QString packageStereotype;
+    QString stereotype;
+    QString filePath;
 };
 
 class PxNodeController::PxNodeControllerPrivate
@@ -151,6 +167,14 @@ void PxNodeController::addFileSystemEntry(const QString &filePath, int line, int
                 ++index;
             }
         }
+        menu->addSeparator();
+        QString fileName = fileInfo.fileName();
+        menu->addAction(new MenuAction(Tr::tr("Add Package Link to %1").arg(fileName), fileName,
+                                       MenuAction::TYPE_ADD_PACKAGE_LINK, "package", filePath, menu));
+        menu->addAction(new MenuAction(Tr::tr("Add Diagram Link to %1").arg(fileName), fileName,
+                                       MenuAction::TYPE_ADD_DIAGRAM_LINK, "diagram", filePath, menu));
+        menu->addAction(new MenuAction(Tr::tr("Add Document Link to %1").arg(fileName), fileName,
+                                       MenuAction::TYPE_ADD_DOCUMENT_LINK, "document", filePath, menu));
         connect(menu, &QMenu::aboutToHide, menu, &QMenu::deleteLater);
         connect(menu, &QMenu::triggered, this, [this, filePath, topMostElementAtPos, pos, diagram](
                                                    QAction *action) {
@@ -160,21 +184,13 @@ void PxNodeController::addFileSystemEntry(const QString &filePath, int line, int
         });
         menu->popup(QCursor::pos());
     } else if (fileInfo.exists() && fileInfo.isDir()) {
-        // ignore line and column
-        QString stereotype;
         auto menu = new QMenu;
-        auto action = new MenuAction(Tr::tr("Add Package %1").arg(elementName), elementName,
-                                     MenuAction::TYPE_ADD_PACKAGE, menu);
-        action->packageStereotype = stereotype;
-        menu->addAction(action);
-        action = new MenuAction(Tr::tr("Add Package and Diagram %1").arg(elementName), elementName,
-                                MenuAction::TYPE_ADD_PACKAGE_AND_DIAGRAM, menu);
-        action->packageStereotype = stereotype;
-        menu->addAction(action);
-        action = new MenuAction(Tr::tr("Add Component Model"), elementName,
-                                MenuAction::TYPE_ADD_COMPONENT_MODEL, menu);
-        action->packageStereotype = stereotype;
-        menu->addAction(action);
+        menu->addAction(new MenuAction(Tr::tr("Add Package %1").arg(elementName), elementName,
+                                       MenuAction::TYPE_ADD_PACKAGE, menu));
+        menu->addAction(new MenuAction(Tr::tr("Add Package and Diagram %1").arg(elementName), elementName,
+                                       MenuAction::TYPE_ADD_PACKAGE_AND_DIAGRAM, menu));
+        menu->addAction(new MenuAction(Tr::tr("Add Component Model"), elementName,
+                                       MenuAction::TYPE_ADD_COMPONENT_MODEL, menu));
         connect(menu, &QMenu::aboutToHide, menu, &QMenu::deleteLater);
         connect(menu, &QMenu::triggered, this, [this, filePath, topMostElementAtPos, pos, diagram](
                                                    QAction *action) {
@@ -261,6 +277,7 @@ void PxNodeController::onMenuActionTriggered(PxNodeController::MenuAction *actio
 {
     qmt::MObject *newObject = nullptr;
     qmt::MDiagram *newDiagramInObject = nullptr;
+    bool dropInCurrentDiagram = false;
 
     switch (action->type) {
     case MenuAction::TYPE_ADD_COMPONENT:
@@ -286,8 +303,8 @@ void PxNodeController::onMenuActionTriggered(PxNodeController::MenuAction *actio
             auto package = new qmt::MPackage();
             package->setFlags(qmt::MElement::ReverseEngineered);
             package->setName(action->elementName);
-            if (!action->packageStereotype.isEmpty())
-                package->setStereotypes({action->packageStereotype});
+            if (!action->stereotype.isEmpty())
+                package->setStereotypes({action->stereotype});
             newObject = package;
             if (action->type == MenuAction::TYPE_ADD_PACKAGE_AND_DIAGRAM) {
                 auto diagram = new qmt::MCanvasDiagram();
@@ -301,8 +318,8 @@ void PxNodeController::onMenuActionTriggered(PxNodeController::MenuAction *actio
         auto package = new qmt::MPackage();
         package->setFlags(qmt::MElement::ReverseEngineered);
         package->setName(action->elementName);
-        if (!action->packageStereotype.isEmpty())
-            package->setStereotypes({action->packageStereotype});
+        if (!action->stereotype.isEmpty())
+            package->setStereotypes({action->stereotype});
         d->diagramSceneController->modelController()->undoController()->beginMergeSequence(Tr::tr("Create Component Model"));
         QStringList relativeElements = qmt::NameController::buildElementsPath(
                     d->pxnodeUtilities->calcRelativePath(filePath, d->anchorFolder), true);
@@ -321,34 +338,54 @@ void PxNodeController::onMenuActionTriggered(PxNodeController::MenuAction *actio
         d->diagramSceneController->modelController()->undoController()->endMergeSequence();
         break;
     }
+    case MenuAction::TYPE_ADD_PACKAGE_LINK:
+    case MenuAction::TYPE_ADD_DIAGRAM_LINK:
+    case MenuAction::TYPE_ADD_DOCUMENT_LINK:
+    {
+        auto item = new qmt::MItem();
+        item->setName(action->elementName);
+        item->setVariety(action->stereotype);
+        item->setVarietyEditable(false);
+        Utils::FilePath filePath = Utils::FilePath::fromString(action->filePath);
+        item->setLinkedFileName(filePath.relativePathFrom(Utils::FilePath::fromString(d->anchorFolder)).toString());
+        newObject = item;
+        dropInCurrentDiagram = true;
+        break;
+    }
     }
 
     if (newObject) {
         d->diagramSceneController->modelController()->undoController()->beginMergeSequence(Tr::tr("Drop Node"));
-        qmt::MObject *parentForDiagram = nullptr;
-        QStringList relativeElements = qmt::NameController::buildElementsPath(
-                    d->pxnodeUtilities->calcRelativePath(filePath, d->anchorFolder),
-                    dynamic_cast<qmt::MPackage *>(newObject) != nullptr);
-        if (qmt::MObject *existingObject = d->pxnodeUtilities->findSameObject(relativeElements, newObject)) {
-            delete newObject;
-            newObject = nullptr;
-            d->diagramSceneController->addExistingModelElement(existingObject->uid(), pos, diagram);
-            parentForDiagram = existingObject;
+        if (dropInCurrentDiagram) {
+            auto *parentPackage = dynamic_cast<qmt::MPackage *>(diagram->owner());
+            if (parentPackage)
+                d->diagramSceneController->dropNewModelElement(newObject, parentPackage, pos, diagram);
         } else {
-            qmt::MPackage *requestedRootPackage = d->diagramSceneController->findSuitableParentPackage(topMostElementAtPos, diagram);
-            qmt::MPackage *bestParentPackage = d->pxnodeUtilities->createBestMatchingPackagePath(requestedRootPackage, relativeElements);
-            d->diagramSceneController->dropNewModelElement(newObject, bestParentPackage, pos, diagram);
-            parentForDiagram = newObject;
-        }
+            qmt::MObject *parentForDiagram = nullptr;
+            QStringList relativeElements = qmt::NameController::buildElementsPath(
+                        d->pxnodeUtilities->calcRelativePath(filePath, d->anchorFolder),
+                        dynamic_cast<qmt::MPackage *>(newObject) != nullptr);
+            if (qmt::MObject *existingObject = d->pxnodeUtilities->findSameObject(relativeElements, newObject)) {
+                delete newObject;
+                newObject = nullptr;
+                d->diagramSceneController->addExistingModelElement(existingObject->uid(), pos, diagram);
+                parentForDiagram = existingObject;
+            } else {
+                qmt::MPackage *requestedRootPackage = d->diagramSceneController->findSuitableParentPackage(topMostElementAtPos, diagram);
+                qmt::MPackage *bestParentPackage = d->pxnodeUtilities->createBestMatchingPackagePath(requestedRootPackage, relativeElements);
+                d->diagramSceneController->dropNewModelElement(newObject, bestParentPackage, pos, diagram);
+                parentForDiagram = newObject;
+            }
 
-        // if requested and not existing then create new diagram in package
-        if (newDiagramInObject) {
-            auto package = dynamic_cast<qmt::MPackage *>(parentForDiagram);
-            QMT_ASSERT(package, return);
-            if (d->diagramSceneController->findDiagramBySearchId(package, newDiagramInObject->name()))
-                delete newDiagramInObject;
-            else
-                d->diagramSceneController->modelController()->addObject(package, newDiagramInObject);
+            // if requested and not existing then create new diagram in package
+            if (newDiagramInObject) {
+                auto package = dynamic_cast<qmt::MPackage *>(parentForDiagram);
+                QMT_ASSERT(package, return);
+                if (d->diagramSceneController->findDiagramBySearchId(package, newDiagramInObject->name()))
+                    delete newDiagramInObject;
+                else
+                    d->diagramSceneController->modelController()->addObject(package, newDiagramInObject);
+            }
         }
         d->diagramSceneController->modelController()->undoController()->endMergeSequence();
     }
diff --git a/src/plugins/nim/editor/nimeditorfactory.cpp b/src/plugins/nim/editor/nimeditorfactory.cpp
index ac8aa6c932..edd7bcea06 100644
--- a/src/plugins/nim/editor/nimeditorfactory.cpp
+++ b/src/plugins/nim/editor/nimeditorfactory.cpp
@@ -11,7 +11,6 @@
 
 #include <coreplugin/coreplugintr.h>
 #include <texteditor/textdocument.h>
-#include <texteditor/texteditoractionhandler.h>
 #include <texteditor/texteditorconstants.h>
 
 using namespace TextEditor;
@@ -26,10 +25,10 @@ NimEditorFactory::NimEditorFactory()
     addMimeType(QLatin1String(Nim::Constants::C_NIM_MIMETYPE));
     addMimeType(QLatin1String(Nim::Constants::C_NIM_SCRIPT_MIMETYPE));
 
-    setEditorActionHandlers(TextEditorActionHandler::Format
-                            | TextEditorActionHandler::UnCommentSelection
-                            | TextEditorActionHandler::UnCollapseAll
-                            | TextEditorActionHandler::FollowSymbolUnderCursor);
+    setOptionalActionMask(OptionalActions::Format
+                            | OptionalActions::UnCommentSelection
+                            | OptionalActions::UnCollapseAll
+                            | OptionalActions::FollowSymbolUnderCursor);
     setEditorWidgetCreator([]{
         return new NimTextEditorWidget();
     });
diff --git a/src/plugins/perfprofiler/perfprofilerruncontrol.cpp b/src/plugins/perfprofiler/perfprofilerruncontrol.cpp
index 4c51b82b3f..a0927260c1 100644
--- a/src/plugins/perfprofiler/perfprofilerruncontrol.cpp
+++ b/src/plugins/perfprofiler/perfprofilerruncontrol.cpp
@@ -183,15 +183,21 @@ public:
                 &PerfProfilerTool::onRunControlFinished);
 
         PerfDataReader *reader = m_perfParserWorker->reader();
+        Process *perfProcess = nullptr;
         if (auto prw = qobject_cast<LocalPerfRecordWorker *>(m_perfRecordWorker)) {
             // That's the local case.
-            Process *recorder = prw->recorder();
-            connect(recorder, &Process::readyReadStandardError, this, [this, recorder] {
-                appendMessage(QString::fromLocal8Bit(recorder->readAllRawStandardError()),
+            perfProcess = prw->recorder();
+        } else {
+            perfProcess = runControl()->property("PerfProcess").value<Process *>();
+        }
+
+        if (perfProcess) {
+            connect(perfProcess, &Process::readyReadStandardError, this, [this, perfProcess] {
+                appendMessage(QString::fromLocal8Bit(perfProcess->readAllRawStandardError()),
                               StdErrFormat);
             });
-            connect(recorder, &Process::readyReadStandardOutput, this, [this, reader, recorder] {
-                if (!reader->feedParser(recorder->readAllRawStandardOutput()))
+            connect(perfProcess, &Process::readyReadStandardOutput, this, [this, reader, perfProcess] {
+                if (!reader->feedParser(perfProcess->readAllRawStandardOutput()))
                     reportFailure(Tr::tr("Failed to transfer Perf data to perfparser."));
             });
         }
diff --git a/src/plugins/plugins.qbs b/src/plugins/plugins.qbs
index 4b7af74a30..b16970c07c 100644
--- a/src/plugins/plugins.qbs
+++ b/src/plugins/plugins.qbs
@@ -52,6 +52,8 @@ Project {
         "incredibuild/incredibuild.qbs",
         "ios/ios.qbs",
         "languageclient/languageclient.qbs",
+        "languageclient/lualanguageclient/lualanguageclient.qbs",
+        "lua/lua.qbs",
         "macros/macros.qbs",
         "marketplace/marketplace.qbs",
         "mcusupport/mcusupport.qbs",
diff --git a/src/plugins/projectexplorer/abstractprocessstep.cpp b/src/plugins/projectexplorer/abstractprocessstep.cpp
index 5cfb66e811..fcdfdc6b63 100644
--- a/src/plugins/projectexplorer/abstractprocessstep.cpp
+++ b/src/plugins/projectexplorer/abstractprocessstep.cpp
@@ -189,7 +189,7 @@ bool AbstractProcessStep::setupProcess(Process &process)
     process.setEnvironment(envWithPwd);
     process.setCommand({d->m_param.effectiveCommand(), d->m_param.effectiveArguments(),
                         CommandLine::Raw});
-    if (d->m_lowPriority && ProjectExplorerPlugin::projectExplorerSettings().lowBuildPriority)
+    if (d->m_lowPriority && projectExplorerSettings().lowBuildPriority)
         process.setLowPriority();
 
     process.setStdOutCodec(buildEnvironment().hasKey("VSLANG")
diff --git a/src/plugins/projectexplorer/appoutputpane.cpp b/src/plugins/projectexplorer/appoutputpane.cpp
index 94e2694acc..3d48946024 100644
--- a/src/plugins/projectexplorer/appoutputpane.cpp
+++ b/src/plugins/projectexplorer/appoutputpane.cpp
@@ -391,14 +391,14 @@ void AppOutputPane::createNewOutputWindow(RunControl *rc)
     const CommandLine thisCommand = rc->commandLine();
     const FilePath thisWorkingDirectory = rc->workingDirectory();
     const Environment thisEnvironment = rc->environment();
-    const auto tab = std::find_if(m_runControlTabs.begin(), m_runControlTabs.end(),
-                                  [&](const RunControlTab &tab) {
-        if (!tab.runControl || tab.runControl->isRunning() || tab.runControl->isStarting())
-            return false;
-        return thisCommand == tab.runControl->commandLine()
-                && thisWorkingDirectory == tab.runControl->workingDirectory()
-                && thisEnvironment == tab.runControl->environment();
-    });
+    const auto tab = std::find_if(
+        m_runControlTabs.begin(), m_runControlTabs.end(), [&](const RunControlTab &tab) {
+            if (!tab.runControl || !tab.runControl->isStopped())
+                return false;
+            return thisCommand == tab.runControl->commandLine()
+                   && thisWorkingDirectory == tab.runControl->workingDirectory()
+                   && thisEnvironment == tab.runControl->environment();
+        });
     if (tab != m_runControlTabs.end()) {
         // Reuse this tab
         if (tab->runControl)
@@ -661,10 +661,10 @@ void AppOutputPane::closeTab(int tabIndex, CloseTabMode closeTabMode)
 
 bool AppOutputPane::optionallyPromptToStop(RunControl *runControl)
 {
-    ProjectExplorerSettings settings = ProjectExplorerPlugin::projectExplorerSettings();
-    if (!runControl->promptToStop(&settings.prompToStopRunControl))
+    bool promptToStop = projectExplorerSettings().prompToStopRunControl;
+    if (!runControl->promptToStop(&promptToStop))
         return false;
-    ProjectExplorerPlugin::setProjectExplorerSettings(settings);
+    setPromptToStopSettings(promptToStop);
     return true;
 }
 
diff --git a/src/plugins/projectexplorer/buildaspects.cpp b/src/plugins/projectexplorer/buildaspects.cpp
index 0f9c025fce..969f0b09bc 100644
--- a/src/plugins/projectexplorer/buildaspects.cpp
+++ b/src/plugins/projectexplorer/buildaspects.cpp
@@ -190,15 +190,15 @@ QString BuildDirectoryAspect::updateProblemLabelsHelper(const QString &value)
 
     QString genericProblem;
     QString genericProblemLabelString;
-    if (ProjectExplorerPlugin::projectExplorerSettings().warnAgainstNonAsciiBuildDir) {
+    if (projectExplorerSettings().warnAgainstNonAsciiBuildDir) {
         const auto isInvalid = [](QChar c) { return c.isSpace() || !isascii(c.toLatin1()); };
         if (const auto invalidChar = Utils::findOr(value, std::nullopt, isInvalid)) {
             genericProblem = Tr::tr(
                                  "Build directory contains potentially problematic character \"%1\".")
                                  .arg(*invalidChar);
             genericProblemLabelString
-                = genericProblem
-                  + Tr::tr(" This warning can be suppressed <a href=\"dummy\">here</a>.");
+                = genericProblem + " "
+                  + Tr::tr("This warning can be suppressed <a href=\"dummy\">here</a>.");
         }
     }
 
diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp
index f189cf0a9b..dd1e077af4 100644
--- a/src/plugins/projectexplorer/buildconfiguration.cpp
+++ b/src/plugins/projectexplorer/buildconfiguration.cpp
@@ -617,7 +617,15 @@ FilePath BuildConfiguration::buildDirectoryFromTemplate(const FilePath &projectD
                          [buildType] { return buildTypeName(buildType); });
     exp.registerSubProvider([kit] { return kit->macroExpander(); });
 
-    FilePath buildDir = FilePath::fromUserInput(buildPropertiesSettings().buildDirectoryTemplate());
+    auto project = ProjectManager::projectWithProjectFilePath(mainFilePath);
+    auto environment = Environment::systemEnvironment();
+    // This adds the environment variables from the <project>.shared file
+    if (project)
+        environment.modify(project->additionalEnvironment());
+
+    FilePath buildDir = FilePath::fromUserInput(environment.value_or(
+        Constants::QTC_DEFAULT_BUILD_DIRECTORY_TEMPLATE,
+        buildPropertiesSettings().buildDirectoryTemplate()));
     qCDebug(bcLog) << "build dir template:" << buildDir.toUserOutput();
     buildDir = exp.expand(buildDir);
     qCDebug(bcLog) << "expanded build:" << buildDir.toUserOutput();
@@ -625,16 +633,8 @@ FilePath BuildConfiguration::buildDirectoryFromTemplate(const FilePath &projectD
 
     auto buildDevice = BuildDeviceKitAspect::device(kit);
 
-    if (buildDir.isAbsolutePath()) {
-        bool isReachable = buildDevice->ensureReachable(buildDir);
-        if (!isReachable)
-            return {};
+    if (buildDir.isAbsolutePath())
         return buildDevice->rootPath().withNewMappedPath(buildDir);
-    }
-
-    bool isReachable = buildDevice->ensureReachable(projectDir);
-    if (!isReachable)
-        return {};
 
     const FilePath baseDir = buildDevice->rootPath().withNewMappedPath(projectDir);
     return baseDir.resolvePath(buildDir);
@@ -656,12 +656,57 @@ BuildConfigurationFactory::~BuildConfigurationFactory()
     g_buildConfigurationFactories.removeOne(this);
 }
 
+static Tasks defaultIssueReporter(
+    Kit *kit, const Utils::FilePath &projectDir, const Utils::FilePath &buildDirectory)
+{
+    auto buildDevice = BuildDeviceKitAspect::device(kit);
+    if (!buildDevice) {
+        return {Task(
+            Task::Error,
+            Tr::tr("No build device is set for the kit \"%1\".").arg(kit->displayName()),
+            {},
+            0,
+            ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)};
+    }
+
+    auto canMountHintFor = [&buildDevice](const FilePath &path) {
+        if (buildDevice->canMount(path))
+            return Tr::tr("You can try mounting the folder in your device settings.");
+        return QString{};
+    };
+
+    if (!buildDevice->ensureReachable(projectDir)) {
+        return {Task(
+            Task::Error,
+            Tr::tr("The build device \"%1\" cannot reach the project directory.")
+                    .arg(buildDevice->displayName())
+                + " " + canMountHintFor(projectDir),
+            {},
+            0,
+            ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)};
+    }
+
+    if (!buildDirectory.isEmpty() && !buildDevice->ensureReachable(buildDirectory)) {
+        return {Task(
+            Task::Error,
+            Tr::tr("The build device \"%1\" cannot reach the build directory.")
+                    .arg(buildDevice->displayName())
+                + " " + canMountHintFor(buildDirectory),
+            {},
+            0,
+            ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)};
+    }
+
+    return {};
+};
+
 const Tasks BuildConfigurationFactory::reportIssues(Kit *kit, const FilePath &projectPath,
                                                     const FilePath &buildDir) const
 {
+    Tasks issues = defaultIssueReporter(kit, projectPath, buildDir);
     if (m_issueReporter)
-        return m_issueReporter(kit, projectPath, buildDir);
-    return {};
+        issues += m_issueReporter(kit, projectPath, buildDir);
+    return issues;
 }
 
 const QList<BuildInfo> BuildConfigurationFactory::allAvailableBuilds(const Target *parent) const
diff --git a/src/plugins/projectexplorer/buildconfiguration.h b/src/plugins/projectexplorer/buildconfiguration.h
index 0b38b3b3a8..362c260548 100644
--- a/src/plugins/projectexplorer/buildconfiguration.h
+++ b/src/plugins/projectexplorer/buildconfiguration.h
@@ -155,8 +155,8 @@ public:
     static BuildConfigurationFactory *find(const Kit *k, const Utils::FilePath &projectPath);
     static BuildConfigurationFactory *find(Target *parent);
 
-    using IssueReporter
-        = std::function<Tasks(Kit *, const Utils::FilePath &, const Utils::FilePath &)>;
+    using IssueReporter = std::function<
+        Tasks(Kit *, const Utils::FilePath &projectDir, const Utils::FilePath &buildDirectory)>;
     void setIssueReporter(const IssueReporter &issueReporter);
     const Tasks reportIssues(ProjectExplorer::Kit *kit,
                              const Utils::FilePath &projectPath,
diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp
index 1a32d340f2..b65aa609f4 100644
--- a/src/plugins/projectexplorer/buildmanager.cpp
+++ b/src/plugins/projectexplorer/buildmanager.cpp
@@ -209,10 +209,10 @@ static int queue(const QList<Project *> &projects, const QList<Id> &stepIds,
     if (!ProjectExplorerPlugin::saveModifiedFiles())
         return -1;
 
-    const ProjectExplorerSettings &settings = ProjectExplorerPlugin::projectExplorerSettings();
-    if (settings.stopBeforeBuild != StopBeforeBuild::None
+    const StopBeforeBuild stopBeforeBuild = projectExplorerSettings().stopBeforeBuild;
+    if (stopBeforeBuild != StopBeforeBuild::None
             && stepIds.contains(Constants::BUILDSTEPS_BUILD)) {
-        StopBeforeBuild stopCondition = settings.stopBeforeBuild;
+        StopBeforeBuild stopCondition = stopBeforeBuild;
         if (stopCondition == StopBeforeBuild::SameApp && !forRunConfig)
             stopCondition = StopBeforeBuild::SameBuildDir;
         const auto isStoppableRc = [&projects, stopCondition, configSelection, forRunConfig,
@@ -258,7 +258,7 @@ static int queue(const QList<Project *> &projects, const QList<Id> &stepIds,
 
         if (!toStop.isEmpty()) {
             bool stopThem = true;
-            if (settings.prompToStopRunControl) {
+            if (projectExplorerSettings().prompToStopRunControl) {
                 QStringList names = Utils::transform(toStop, &RunControl::displayName);
                 if (QMessageBox::question(ICore::dialogParent(),
                         Tr::tr("Stop Applications"),
@@ -516,7 +516,7 @@ void BuildManager::rebuildProjects(const QList<Project *> &projects,
 void BuildManager::deployProjects(const QList<Project *> &projects)
 {
     QList<Id> steps;
-    if (ProjectExplorerPlugin::projectExplorerSettings().buildBeforeDeploy != BuildBeforeRunMode::Off)
+    if (projectExplorerSettings().buildBeforeDeploy != BuildBeforeRunMode::Off)
         steps << Id(Constants::BUILDSTEPS_BUILD);
     steps << Id(Constants::BUILDSTEPS_DEPLOY);
     queue(projects, steps, ConfigSelection::Active);
@@ -525,10 +525,9 @@ void BuildManager::deployProjects(const QList<Project *> &projects)
 BuildForRunConfigStatus BuildManager::potentiallyBuildForRunConfig(RunConfiguration *rc)
 {
     QList<Id> stepIds;
-    const ProjectExplorerSettings &settings = ProjectExplorerPlugin::projectExplorerSettings();
-    if (settings.deployBeforeRun) {
+    if (projectExplorerSettings().deployBeforeRun) {
         if (!isBuilding()) {
-            switch (settings.buildBeforeDeploy) {
+            switch (projectExplorerSettings().buildBeforeDeploy) {
             case BuildBeforeRunMode::AppOnly:
                 if (rc->target()->activeBuildConfiguration())
                     rc->target()->activeBuildConfiguration()->restrictNextBuild(rc);
@@ -721,8 +720,7 @@ void BuildManager::startBuildQueue()
     };
 
     const GroupItem abortPolicy
-        = ProjectExplorerPlugin::projectExplorerSettings().abortBuildAllOnError
-              ? stopOnError : continueOnError;
+        = projectExplorerSettings().abortBuildAllOnError ? stopOnError : continueOnError;
 
     QList<GroupItem> topLevel { abortPolicy, ParserAwaiterTask(onAwaiterSetup) };
     Project *lastProject = nullptr;
@@ -856,7 +854,7 @@ bool BuildManager::buildQueueAppend(const QList<BuildItem> &items, const QString
 {
     if (!d->m_taskTreeRunner.isRunning()) {
         d->m_outputWindow->clearContents();
-        if (ProjectExplorerPlugin::projectExplorerSettings().clearIssuesOnRebuild) {
+        if (projectExplorerSettings().clearIssuesOnRebuild) {
             TaskHub::clearTasks(Constants::TASK_CATEGORY_COMPILE);
             TaskHub::clearTasks(Constants::TASK_CATEGORY_BUILDSYSTEM);
             TaskHub::clearTasks(Constants::TASK_CATEGORY_DEPLOYMENT);
diff --git a/src/plugins/projectexplorer/buildpropertiessettings.cpp b/src/plugins/projectexplorer/buildpropertiessettings.cpp
index c9cde2624d..ff7c180851 100644
--- a/src/plugins/projectexplorer/buildpropertiessettings.cpp
+++ b/src/plugins/projectexplorer/buildpropertiessettings.cpp
@@ -8,6 +8,7 @@
 
 #include <coreplugin/dialogs/ioptionspage.h>
 
+#include <utils/environment.h>
 #include <utils/layoutbuilder.h>
 
 using namespace Utils;
@@ -16,7 +17,9 @@ namespace ProjectExplorer {
 
 static QString defaultBuildDirectoryTemplate()
 {
-    return "./build/%{Asciify:%{Kit:FileSystemName}-%{BuildConfig:Name}}";
+    return qtcEnvironmentVariable(
+        Constants::QTC_DEFAULT_BUILD_DIRECTORY_TEMPLATE,
+        "./build/%{Asciify:%{Kit:FileSystemName}-%{BuildConfig:Name}}");
 }
 
 BuildPropertiesSettings &buildPropertiesSettings()
@@ -51,6 +54,11 @@ BuildPropertiesSettings::BuildPropertiesSettings()
     buildDirectoryTemplate.setSettingsKey("Directories/BuildDirectory.TemplateV2");
     buildDirectoryTemplate.setDefaultValue(defaultBuildDirectoryTemplate());
     buildDirectoryTemplate.setLabelText(Tr::tr("Default build directory:"));
+    buildDirectoryTemplate.setToolTip(
+        Tr::tr("Template used to construct the default build directory.<br><br>"
+               "The default value can be set using the environment variable "
+               "<tt>%1</tt>")
+            .arg(Constants::QTC_DEFAULT_BUILD_DIRECTORY_TEMPLATE));
     buildDirectoryTemplate.setUseGlobalMacroExpander();
     buildDirectoryTemplate.setUseResetButton();
 
diff --git a/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.cpp b/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.cpp
index 920d7f69c5..714d311a1e 100644
--- a/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.cpp
+++ b/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.cpp
@@ -7,6 +7,8 @@
 #include "sshparameters.h"
 #include "../projectexplorertr.h"
 
+#include <remotelinux/remotelinux_constants.h>
+
 #include <utils/port.h>
 #include <utils/portlist.h>
 #include <utils/qtcprocess.h>
@@ -179,7 +181,10 @@ public:
     void start() final
     {
         m_channel.setScheme(urlTcpScheme());
-        m_channel.setHost(device()->toolControlChannel(IDevice::ControlChannelHint()).host());
+        if (device()->extraData(RemoteLinux::Constants::SshForwardDebugServerPort).toBool())
+            m_channel.setHost("localhost");
+        else
+            m_channel.setHost(device()->toolControlChannel(IDevice::ControlChannelHint()).host());
         if (m_portGatherer)
             m_channel.setPort(m_portGatherer->findEndPoint().port());
         reportStarted();
diff --git a/src/plugins/projectexplorer/devicesupport/idevice.cpp b/src/plugins/projectexplorer/devicesupport/idevice.cpp
index 0fcdae1c91..1387f9edc4 100644
--- a/src/plugins/projectexplorer/devicesupport/idevice.cpp
+++ b/src/plugins/projectexplorer/devicesupport/idevice.cpp
@@ -194,10 +194,10 @@ DeviceSettings::DeviceSettings()
     displayName.setValueAcceptor(
         [validateDisplayName](const QString &old,
                               const QString &newValue) -> std::optional<QString> {
-            if (validateDisplayName(old, newValue))
+            if (!validateDisplayName(old, newValue))
                 return std::nullopt;
 
-            return old;
+            return newValue;
         });
 }
 
@@ -442,6 +442,11 @@ DeviceTester *IDevice::createDeviceTester() const
     return nullptr;
 }
 
+bool IDevice::canMount(const Utils::FilePath &) const
+{
+    return false;
+}
+
 OsType IDevice::osType() const
 {
     return d->osType;
diff --git a/src/plugins/projectexplorer/devicesupport/idevice.h b/src/plugins/projectexplorer/devicesupport/idevice.h
index 6434b5b6dd..b83c558e87 100644
--- a/src/plugins/projectexplorer/devicesupport/idevice.h
+++ b/src/plugins/projectexplorer/devicesupport/idevice.h
@@ -151,6 +151,8 @@ public:
     virtual bool hasDeviceTester() const { return false; }
     virtual DeviceTester *createDeviceTester() const;
 
+    virtual bool canMount(const Utils::FilePath &filePath) const;
+
     virtual DeviceProcessSignalOperation::Ptr signalOperation() const;
 
     enum DeviceState { DeviceReadyToUse, DeviceConnected, DeviceDisconnected, DeviceStateUnknown };
diff --git a/src/plugins/projectexplorer/environmentaspect.cpp b/src/plugins/projectexplorer/environmentaspect.cpp
index af4d8449d1..fb5aaa2c24 100644
--- a/src/plugins/projectexplorer/environmentaspect.cpp
+++ b/src/plugins/projectexplorer/environmentaspect.cpp
@@ -31,9 +31,7 @@ EnvironmentAspect::EnvironmentAspect(AspectContainer *container)
     setConfigWidgetCreator([this] { return new EnvironmentAspectWidget(this); });
     addDataExtractor(this, &EnvironmentAspect::environment, &Data::environment);
     if (qobject_cast<RunConfiguration *>(container)) {
-        addModifier([](Environment &env) {
-            env.modify(ProjectExplorerPlugin::projectExplorerSettings().appEnvChanges);
-        });
+        addModifier([](Environment &env) { env.modify(projectExplorerSettings().appEnvChanges); });
         connect(ProjectExplorerPlugin::instance(), &ProjectExplorerPlugin::settingsChanged,
                 this, &EnvironmentAspect::environmentChanged);
     }
diff --git a/src/plugins/projectexplorer/extracompiler.cpp b/src/plugins/projectexplorer/extracompiler.cpp
index 0d28129733..932e5c1bd7 100644
--- a/src/plugins/projectexplorer/extracompiler.cpp
+++ b/src/plugins/projectexplorer/extracompiler.cpp
@@ -301,8 +301,7 @@ void ExtraCompiler::setContent(const FilePath &file, const QByteArray &contents)
     }
 }
 
-ExtraCompilerFactory::ExtraCompilerFactory(QObject *parent)
-    : QObject(parent)
+ExtraCompilerFactory::ExtraCompilerFactory()
 {
     factories->append(this);
 }
diff --git a/src/plugins/projectexplorer/extracompiler.h b/src/plugins/projectexplorer/extracompiler.h
index 82bd9070f2..a8045d25b1 100644
--- a/src/plugins/projectexplorer/extracompiler.h
+++ b/src/plugins/projectexplorer/extracompiler.h
@@ -108,12 +108,11 @@ private:
                      const Utils::Environment &env);
 };
 
-class PROJECTEXPLORER_EXPORT ExtraCompilerFactory : public QObject
+class PROJECTEXPLORER_EXPORT ExtraCompilerFactory
 {
-    Q_OBJECT
 public:
-    explicit ExtraCompilerFactory(QObject *parent = nullptr);
-    ~ExtraCompilerFactory() override;
+    ExtraCompilerFactory();
+    virtual ~ExtraCompilerFactory();
 
     virtual FileType sourceType() const = 0;
     virtual QString sourceTag() const = 0;
diff --git a/src/plugins/projectexplorer/filesinallprojectsfind.cpp b/src/plugins/projectexplorer/filesinallprojectsfind.cpp
index f3554f18a9..92c2fc8059 100644
--- a/src/plugins/projectexplorer/filesinallprojectsfind.cpp
+++ b/src/plugins/projectexplorer/filesinallprojectsfind.cpp
@@ -43,7 +43,7 @@ void FilesInAllProjectsFind::readSettings(QtcSettings *settings)
     readCommonSettings(
         settings,
         "CMakeLists.txt,*.cmake,*.pro,*.pri,*.qbs,*.cpp,*.h,*.mm,*.qml,*.md,*.txt,*.qdoc",
-        "*/.git/*,*/.cvs/*,*/.svn/*,*.autosave");
+        "*/.git/*,*/.cvs/*,*/.svn/*,*.autosave,*/build/*");
     settings->endGroup();
 }
 
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp b/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp
index ec55e3218f..8db6d46cac 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp
@@ -62,12 +62,12 @@ static IWizardFactory::WizardKind wizardKind(JsonWizard *wiz)
 // --------------------------------------------------------------------
 
 JsonSummaryPage::JsonSummaryPage(QWidget *parent) :
-    Internal::ProjectWizardPage(parent),
+    ProjectWizardPage(parent),
     m_wizard(nullptr)
 {
-    connect(this, &Internal::ProjectWizardPage::projectNodeChanged,
+    connect(this, &ProjectWizardPage::projectNodeChanged,
             this, &JsonSummaryPage::summarySettingsHaveChanged);
-    connect(this, &Internal::ProjectWizardPage::versionControlChanged,
+    connect(this, &ProjectWizardPage::versionControlChanged,
             this, &JsonSummaryPage::summarySettingsHaveChanged);
 }
 
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.h b/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.h
index 95a971376d..c1b4578799 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.h
+++ b/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.h
@@ -14,7 +14,7 @@ class FolderNode;
 class Node;
 
 // Documentation inside.
-class JsonSummaryPage : public Internal::ProjectWizardPage
+class JsonSummaryPage : public ProjectWizardPage
 {
     Q_OBJECT
 
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp
index 7f8ff6baf5..9c00a32329 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp
@@ -16,6 +16,7 @@
 #include <coreplugin/messagemanager.h>
 
 #include <extensionsystem/pluginmanager.h>
+#include <extensionsystem/pluginspec.h>
 
 #include <utils/algorithm.h>
 #include <utils/environment.h>
@@ -28,6 +29,7 @@
 #include <QDebug>
 #include <QDir>
 #include <QJSEngine>
+#include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonParseError>
@@ -35,6 +37,7 @@
 #include <QUuid>
 
 using namespace Utils;
+using namespace ExtensionSystem;
 
 namespace ProjectExplorer {
 
@@ -214,8 +217,10 @@ QVariantMap JsonWizardFactory::loadDefaultValues(const QString &fileName)
         FilePath dir = FilePath::fromString(path.toString());
         if (!dir.exists()) {
             if (verbose())
-                verboseLog.append(Tr::tr("Path \"%1\" does not exist when checking Json wizard search paths.\n")
-                                  .arg(path.toUserOutput()));
+                verboseLog.append(
+                    Tr::tr("Path \"%1\" does not exist when checking JSON wizard search paths.")
+                        .arg(path.toUserOutput())
+                    + "\n");
             continue;
         }
 
@@ -225,9 +230,11 @@ QVariantMap JsonWizardFactory::loadDefaultValues(const QString &fileName)
         while (!dirs.isEmpty()) {
             const FilePath current = dirs.takeFirst();
             if (verbose())
-                verboseLog.append(Tr::tr("Checking \"%1\" for %2.\n")
-                                  .arg(QDir::toNativeSeparators(current.absolutePath().toString()))
-                                  .arg(fileName));
+                verboseLog.append(
+                    Tr::tr("Checking \"%1\" for %2.")
+                        .arg(QDir::toNativeSeparators(current.absolutePath().toString()))
+                        .arg(fileName)
+                    + "\n");
             if (current.pathAppended(fileName).exists()) {
                 QFile configFile(current.pathAppended(fileName).toString());
                 configFile.open(QIODevice::ReadOnly);
@@ -247,10 +254,13 @@ QVariantMap JsonWizardFactory::loadDefaultValues(const QString &fileName)
                             ++column;
                         }
                     }
-                    verboseLog.append(Tr::tr("* Failed to parse \"%1\":%2:%3: %4\n")
-                                      .arg(configFile.fileName())
-                                      .arg(line).arg(column)
-                                      .arg(error.errorString()));
+                    verboseLog.append(
+                        Tr::tr("* Failed to parse \"%1\":%2:%3: %4")
+                            .arg(configFile.fileName())
+                            .arg(line)
+                            .arg(column)
+                            .arg(error.errorString())
+                        + "\n");
                     continue;
                 }
 
@@ -261,7 +271,7 @@ QVariantMap JsonWizardFactory::loadDefaultValues(const QString &fileName)
                 }
 
                 if (verbose())
-                    verboseLog.append(Tr::tr("* Configuration found and parsed.\n"));
+                    verboseLog.append(Tr::tr("* Configuration found and parsed.") + "\n");
 
                 return json.object().toVariantMap();
             }
@@ -271,7 +281,7 @@ QVariantMap JsonWizardFactory::loadDefaultValues(const QString &fileName)
                 dirs.swap(subDirs);
                 dirs.append(subDirs);
             } else if (verbose()) {
-                verboseLog.append(Tr::tr("JsonWizard: \"%1\" not found\n").arg(fileName));
+                verboseLog.append(Tr::tr("JsonWizard: \"%1\" not found.").arg(fileName) + "\n");
             }
         }
     }
@@ -448,8 +458,10 @@ QList<Core::IWizardFactory *> JsonWizardFactory::createWizardFactories()
 
         if (!path.exists()) {
             if (verbose())
-                verboseLog.append(Tr::tr("Path \"%1\" does not exist when checking Json wizard search paths.\n")
-                                  .arg(path.toUserOutput()));
+                verboseLog.append(
+                    Tr::tr("Path \"%1\" does not exist when checking JSON wizard search paths.")
+                        .arg(path.toUserOutput())
+                    + "\n");
             continue;
         }
 
@@ -475,27 +487,31 @@ QList<Core::IWizardFactory *> JsonWizardFactory::createWizardFactories()
                         ++column;
                     }
                 }
-                verboseLog.append(Tr::tr("* Failed to parse \"%1\":%2:%3: %4\n")
-                                  .arg(currentFile.fileName())
-                                  .arg(line).arg(column)
-                                  .arg(error.errorString()));
+                verboseLog.append(
+                    Tr::tr("* Failed to parse \"%1\":%2:%3: %4")
+                        .arg(currentFile.fileName())
+                        .arg(line)
+                        .arg(column)
+                        .arg(error.errorString())
+                    + "\n");
                 continue;
             }
 
             if (!json.isObject()) {
-                verboseLog.append(Tr::tr("* Did not find a JSON object in \"%1\".\n")
-                                  .arg(currentFile.fileName()));
+                verboseLog.append(
+                    Tr::tr("* Did not find a JSON object in \"%1\".").arg(currentFile.fileName())
+                    + "\n");
                 continue;
             }
 
             if (verbose())
-                verboseLog.append(Tr::tr("* Configuration found and parsed.\n"));
+                verboseLog.append(Tr::tr("* Configuration found and parsed.") + "\n");
 
             QVariantMap data = json.object().toVariantMap();
 
             int version = data.value(QLatin1String(VERSION_KEY), 0).toInt();
             if (version < 1 || version > 1) {
-                verboseLog.append(Tr::tr("* Version %1 not supported.\n").arg(version));
+                verboseLog.append(Tr::tr("* Version %1 not supported.").arg(version) + "\n");
                 continue;
             }
 
@@ -504,7 +520,7 @@ QList<Core::IWizardFactory *> JsonWizardFactory::createWizardFactories()
                                                              currentFile.parentDir(),
                                                              &errorMessage);
             if (!factory) {
-                verboseLog.append(Tr::tr("* Failed to create: %1\n").arg(errorMessage));
+                verboseLog.append(Tr::tr("* Failed to create: %1").arg(errorMessage) + "\n");
                 continue;
             }
 
@@ -551,12 +567,13 @@ static QStringList environmentTemplatesPaths()
     return paths;
 }
 
+static bool s_searchPathsInitialized = false;
+
 FilePaths &JsonWizardFactory::searchPaths()
 {
     static FilePaths m_searchPaths;
-    static bool searchPathsInitialized = false;
-    if (!searchPathsInitialized) {
-        searchPathsInitialized = true;
+    if (!s_searchPathsInitialized) {
+        s_searchPathsInitialized = true;
         m_searchPaths = {Core::ICore::userResourcePath(WIZARD_PATH),
                          Core::ICore::resourcePath(WIZARD_PATH)};
         for (const QString &environmentTemplateDirName : environmentTemplatesPaths())
@@ -564,11 +581,29 @@ FilePaths &JsonWizardFactory::searchPaths()
         m_searchPaths << Utils::transform(
             Core::ICore::settings()->value("Wizards/SearchPaths").toStringList(),
             [](const QString &s) { return FilePath::fromUserInput(s); });
+        // add paths from enabled plugin meta data
+        for (PluginSpec *plugin : PluginManager::plugins()) {
+            if (plugin->state() == PluginSpec::Running) {
+                const auto base = plugin->location();
+                const auto values = plugin->metaData().value("JsonWizardPaths").toArray();
+                for (const QJsonValue &v : values) {
+                    const auto path = FilePath::fromString(v.toString());
+                    if (!path.isEmpty() && !path.needsDevice()) {
+                        m_searchPaths << base.resolvePath(path);
+                    }
+                }
+            }
+        }
     }
 
     return m_searchPaths;
 }
 
+void JsonWizardFactory::resetSearchPaths()
+{
+    s_searchPathsInitialized = false;
+}
+
 void JsonWizardFactory::addWizardPath(const FilePath &path)
 {
     searchPaths().append(path);
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.h b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.h
index 412787827f..1ab133d5bd 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.h
+++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.h
@@ -69,6 +69,7 @@ private:
                                                   const Utils::FilePath &baseDir,
                                                   QString *errorMessage);
     static Utils::FilePaths &searchPaths();
+    static void resetSearchPaths();
 
     static void setVerbose(int level);
     static int verbose();
diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp
index 5066d0969a..310e170e5a 100644
--- a/src/plugins/projectexplorer/msvctoolchain.cpp
+++ b/src/plugins/projectexplorer/msvctoolchain.cpp
@@ -1151,7 +1151,7 @@ static QString wrappedMakeCommand(const QString &command)
 
 FilePath MsvcToolchain::makeCommand(const Environment &environment) const
 {
-    bool useJom = ProjectExplorerPlugin::projectExplorerSettings().useJom;
+    const bool useJom = projectExplorerSettings().useJom;
     const QString jom("jom.exe");
     const QString nmake("nmake.exe");
     Utils::FilePath tmp;
diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp
index 1bb1629ef7..7d0ed75c6c 100644
--- a/src/plugins/projectexplorer/project.cpp
+++ b/src/plugins/projectexplorer/project.cpp
@@ -793,20 +793,7 @@ void Project::toMap(Store &map) const
 
 FilePath Project::projectDirectory() const
 {
-    return projectDirectory(projectFilePath());
-}
-
-/*!
-    Returns the directory that contains the file \a top.
-
-    This includes the absolute path.
-*/
-
-FilePath Project::projectDirectory(const FilePath &top)
-{
-    if (top.isEmpty())
-        return {};
-    return top.absolutePath();
+    return projectFilePath().absolutePath();
 }
 
 void Project::changeRootProjectDirectory()
diff --git a/src/plugins/projectexplorer/project.h b/src/plugins/projectexplorer/project.h
index 06508a18fe..9906047bc2 100644
--- a/src/plugins/projectexplorer/project.h
+++ b/src/plugins/projectexplorer/project.h
@@ -70,7 +70,6 @@ public:
 
     Utils::FilePath projectFilePath() const;
     Utils::FilePath projectDirectory() const;
-    static Utils::FilePath projectDirectory(const Utils::FilePath &top);
 
     // This does not affect nodes, only the root path.
     void changeRootProjectDirectory();
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index cf82aa6e73..7ec216c138 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -128,6 +128,7 @@
 
 #include <utils/action.h>
 #include <utils/algorithm.h>
+#include <utils/async.h>
 #include <utils/fileutils.h>
 #include <utils/macroexpander.h>
 #include <utils/mimeutils.h>
@@ -262,27 +263,7 @@ const char PROJECT_OPEN_LOCATIONS_CONTEXT_MENU[]  = "Project.P.OpenLocation.CtxM
 
 const char RECENTPROJECTS_FILE_NAMES_KEY[] = "ProjectExplorer/RecentProjects/FileNames";
 const char RECENTPROJECTS_DISPLAY_NAMES_KEY[] = "ProjectExplorer/RecentProjects/DisplayNames";
-const char BUILD_BEFORE_DEPLOY_SETTINGS_KEY[] = "ProjectExplorer/Settings/BuildBeforeDeploy";
-const char DEPLOY_BEFORE_RUN_SETTINGS_KEY[] = "ProjectExplorer/Settings/DeployBeforeRun";
-const char SAVE_BEFORE_BUILD_SETTINGS_KEY[] = "ProjectExplorer/Settings/SaveBeforeBuild";
-const char USE_JOM_SETTINGS_KEY[] = "ProjectExplorer/Settings/UseJom";
-const char ADD_LIBRARY_PATHS_TO_RUN_ENV_SETTINGS_KEY[] =
-        "ProjectExplorer/Settings/AddLibraryPathsToRunEnv";
-const char PROMPT_TO_STOP_RUN_CONTROL_SETTINGS_KEY[] =
-        "ProjectExplorer/Settings/PromptToStopRunControl";
-const char AUTO_CREATE_RUN_CONFIGS_SETTINGS_KEY[] =
-        "ProjectExplorer/Settings/AutomaticallyCreateRunConfigurations";
-const char ENVIRONMENT_ID_SETTINGS_KEY[] = "ProjectExplorer/Settings/EnvironmentId";
-const char STOP_BEFORE_BUILD_SETTINGS_KEY[] = "ProjectExplorer/Settings/StopBeforeBuild";
-const char TERMINAL_MODE_SETTINGS_KEY[] = "ProjectExplorer/Settings/TerminalMode";
-const char CLOSE_FILES_WITH_PROJECT_SETTINGS_KEY[]
-    = "ProjectExplorer/Settings/CloseFilesWithProject";
-const char CLEAR_ISSUES_ON_REBUILD_SETTINGS_KEY[] = "ProjectExplorer/Settings/ClearIssuesOnRebuild";
-const char ABORT_BUILD_ALL_ON_ERROR_SETTINGS_KEY[]
-    = "ProjectExplorer/Settings/AbortBuildAllOnError";
-const char LOW_BUILD_PRIORITY_SETTINGS_KEY[] = "ProjectExplorer/Settings/LowBuildPriority";
-const char WARN_AGAINST_NON_ASCII_BUILD_DIR_SETTINGS_KEY[] = "ProjectExplorer/Settings/LowBuildPriority";
-const char APP_ENV_CHANGES_SETTINGS_KEY[] = "ProjectExplorer/Settings/AppEnvChanges";
+const char RECENTPROJECTS_EXISTENCE_KEY[] = "ProjectExplorer/RecentProjects/Existence";
 
 const char CUSTOM_PARSER_COUNT_KEY[] = "ProjectExplorer/Settings/CustomParserCount";
 const char CUSTOM_PARSER_PREFIX_KEY[] = "ProjectExplorer/Settings/CustomParser";
@@ -524,6 +505,7 @@ public:
     void setStartupProject(Project *project);
     bool closeAllFilesInProject(const Project *project);
 
+    void checkRecentProjectsAsync();
     void updateRecentProjectMenu();
     void clearRecentProjects();
     void openRecentProject(const FilePath &filePath);
@@ -634,13 +616,14 @@ public:
 
     QHash<QString, std::function<Project *(const FilePath &)>> m_projectCreators;
     RecentProjectsEntries m_recentProjects; // pair of filename, displayname
+    QFuture<RecentProjectsEntry> m_recentProjectsFuture;
+    QThreadPool m_recentProjectsPool;
     static const int m_maxRecentProjects = 25;
 
     FilePath m_lastOpenDirectory;
     QPointer<RunConfiguration> m_defaultRunConfiguration;
     QPointer<RunConfiguration> m_delayedRunConfiguration;
     MiniProjectTargetSelector * m_targetSelector;
-    ProjectExplorerSettings m_projectExplorerSettings;
     QList<CustomParserSettings> m_customParsers;
     bool m_shouldHaveRunConfiguration = false;
     Id m_runMode = Constants::NO_RUN_MODE;
@@ -700,7 +683,6 @@ public:
     ProjectFileWizardExtension m_projectFileWizardExtension;
 
     // Settings pages
-    ProjectExplorerSettingsPage m_projectExplorerSettingsPage;
     AppOutputSettingsPage m_appOutputSettingsPage;
     DeviceSettingsPage m_deviceSettingsPage;
     SshSettingsPage m_sshSettingsPage;
@@ -795,6 +777,24 @@ ProjectExplorerPlugin *ProjectExplorerPlugin::instance()
     return m_instance;
 }
 
+static void restoreRecentProjects(QtcSettings *s)
+{
+    const QStringList filePaths = s->value(Constants::RECENTPROJECTS_FILE_NAMES_KEY).toStringList();
+    const QStringList displayNames
+        = s->value(Constants::RECENTPROJECTS_DISPLAY_NAMES_KEY).toStringList();
+    // filename -> bool:
+    const QHash<QString, QVariant> existence
+        = s->value(Constants::RECENTPROJECTS_EXISTENCE_KEY).toHash();
+    if (QTC_GUARD(filePaths.size() == displayNames.size())) {
+        for (int i = 0; i < filePaths.size(); ++i) {
+            const bool exists = existence.value(filePaths.at(i), true).toBool();
+            dd->m_recentProjects.append(
+                {FilePath::fromUserInput(filePaths.at(i)), displayNames.at(i), exists});
+        }
+    }
+    dd->checkRecentProjectsAsync();
+}
+
 bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *error)
 {
     Q_UNUSED(error)
@@ -811,6 +811,8 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
 
     setupProjectTreeWidgetFactory();
 
+    setupProjectExplorerSettings();
+
     dd = new ProjectExplorerPluginPrivate;
 
     setupDesktopRunConfigurations();
@@ -825,6 +827,11 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
     setupJsonWizardPages();
     setupJsonWizardFileGenerator();
     setupJsonWizardScannerGenerator();
+    // new plugins might add new paths via the plugin spec
+    connect(
+        PluginManager::instance(),
+        &PluginManager::pluginsChanged,
+        &JsonWizardFactory::resetSearchPaths);
 
     dd->extendFolderNavigationWidgetFactory();
 
@@ -1160,8 +1167,11 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
     mrecent->menu()->setTitle(Tr::tr("Recent P&rojects"));
     mrecent->setOnAllDisabledBehavior(ActionContainer::Show);
     mfile->addMenu(mrecent, Core::Constants::G_FILE_OPEN);
-    connect(mfile->menu(), &QMenu::aboutToShow,
-            dd, &ProjectExplorerPluginPrivate::updateRecentProjectMenu);
+    connect(
+        m_instance,
+        &ProjectExplorerPlugin::recentProjectsChanged,
+        dd,
+        &ProjectExplorerPluginPrivate::updateRecentProjectMenu);
 
     // unload action
     dd->m_unloadAction = new Action(Tr::tr("Close Project"), Tr::tr("Close Pro&ject \"%1\""),
@@ -1624,85 +1634,12 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
             dd, &ProjectExplorerPluginPrivate::savePersistentSettings);
     connect(qApp, &QApplication::applicationStateChanged, this, [](Qt::ApplicationState state) {
         if (!PluginManager::isShuttingDown() && state == Qt::ApplicationActive)
-            dd->updateWelcomePage();
+            dd->checkRecentProjectsAsync();
     });
 
     QtcSettings *s = ICore::settings();
-    const QStringList fileNames = s->value(Constants::RECENTPROJECTS_FILE_NAMES_KEY).toStringList();
-    const QStringList displayNames = s->value(Constants::RECENTPROJECTS_DISPLAY_NAMES_KEY)
-                                         .toStringList();
-    if (fileNames.size() == displayNames.size()) {
-        for (int i = 0; i < fileNames.size(); ++i) {
-            dd->m_recentProjects.append({FilePath::fromUserInput(fileNames.at(i)), displayNames.at(i)});
-        }
-    }
-
-    const QVariant buildBeforeDeploy = s->value(Constants::BUILD_BEFORE_DEPLOY_SETTINGS_KEY);
-    const QString buildBeforeDeployString = buildBeforeDeploy.toString();
-    if (buildBeforeDeployString == "true") { // backward compatibility with QtC < 4.12
-        dd->m_projectExplorerSettings.buildBeforeDeploy = BuildBeforeRunMode::WholeProject;
-    } else if (buildBeforeDeployString == "false") {
-        dd->m_projectExplorerSettings.buildBeforeDeploy = BuildBeforeRunMode::Off;
-    } else if (buildBeforeDeploy.isValid()) {
-        dd->m_projectExplorerSettings.buildBeforeDeploy
-                = static_cast<BuildBeforeRunMode>(buildBeforeDeploy.toInt());
-    }
 
-    static const ProjectExplorerSettings defaultSettings;
-
-    dd->m_projectExplorerSettings.deployBeforeRun
-        = s->value(Constants::DEPLOY_BEFORE_RUN_SETTINGS_KEY, defaultSettings.deployBeforeRun)
-              .toBool();
-    dd->m_projectExplorerSettings.saveBeforeBuild
-        = s->value(Constants::SAVE_BEFORE_BUILD_SETTINGS_KEY, defaultSettings.saveBeforeBuild)
-              .toBool();
-    dd->m_projectExplorerSettings.useJom
-        = s->value(Constants::USE_JOM_SETTINGS_KEY, defaultSettings.useJom).toBool();
-    dd->m_projectExplorerSettings.addLibraryPathsToRunEnv
-        = s->value(Constants::ADD_LIBRARY_PATHS_TO_RUN_ENV_SETTINGS_KEY,
-                   defaultSettings.addLibraryPathsToRunEnv)
-              .toBool();
-    dd->m_projectExplorerSettings.prompToStopRunControl
-        = s->value(Constants::PROMPT_TO_STOP_RUN_CONTROL_SETTINGS_KEY,
-                   defaultSettings.prompToStopRunControl)
-              .toBool();
-    dd->m_projectExplorerSettings.automaticallyCreateRunConfigurations
-        = s->value(Constants::AUTO_CREATE_RUN_CONFIGS_SETTINGS_KEY,
-                   defaultSettings.automaticallyCreateRunConfigurations)
-              .toBool();
-    dd->m_projectExplorerSettings.environmentId =
-            QUuid(s->value(Constants::ENVIRONMENT_ID_SETTINGS_KEY).toByteArray());
-    if (dd->m_projectExplorerSettings.environmentId.isNull())
-        dd->m_projectExplorerSettings.environmentId = QUuid::createUuid();
-    int tmp = s->value(Constants::STOP_BEFORE_BUILD_SETTINGS_KEY,
-                       int(defaultSettings.stopBeforeBuild))
-                  .toInt();
-    if (tmp < 0 || tmp > int(StopBeforeBuild::SameApp))
-        tmp = int(defaultSettings.stopBeforeBuild);
-    dd->m_projectExplorerSettings.stopBeforeBuild = StopBeforeBuild(tmp);
-    dd->m_projectExplorerSettings.terminalMode = static_cast<TerminalMode>(
-        s->value(Constants::TERMINAL_MODE_SETTINGS_KEY, int(defaultSettings.terminalMode)).toInt());
-    dd->m_projectExplorerSettings.closeSourceFilesWithProject
-        = s->value(Constants::CLOSE_FILES_WITH_PROJECT_SETTINGS_KEY,
-                   defaultSettings.closeSourceFilesWithProject)
-              .toBool();
-    dd->m_projectExplorerSettings.clearIssuesOnRebuild
-        = s->value(Constants::CLEAR_ISSUES_ON_REBUILD_SETTINGS_KEY,
-                   defaultSettings.clearIssuesOnRebuild)
-              .toBool();
-    dd->m_projectExplorerSettings.abortBuildAllOnError
-        = s->value(Constants::ABORT_BUILD_ALL_ON_ERROR_SETTINGS_KEY,
-                   defaultSettings.abortBuildAllOnError)
-              .toBool();
-    dd->m_projectExplorerSettings.lowBuildPriority
-        = s->value(Constants::LOW_BUILD_PRIORITY_SETTINGS_KEY, defaultSettings.lowBuildPriority)
-              .toBool();
-    dd->m_projectExplorerSettings.warnAgainstNonAsciiBuildDir
-        = s->value(Constants::WARN_AGAINST_NON_ASCII_BUILD_DIR_SETTINGS_KEY,
-                   defaultSettings.warnAgainstNonAsciiBuildDir)
-              .toBool();
-    dd->m_projectExplorerSettings.appEnvChanges = EnvironmentItem::fromStringList(
-        s->value(Constants::APP_ENV_CHANGES_SETTINGS_KEY).toStringList());
+    restoreRecentProjects(s);
 
     const int customParserCount = s->value(Constants::CUSTOM_PARSER_COUNT_KEY).toInt();
     for (int i = 0; i < customParserCount; ++i) {
@@ -2145,7 +2082,7 @@ bool ProjectExplorerPlugin::delayedInitialize()
 
 void ProjectExplorerPluginPrivate::updateRunWithoutDeployMenu()
 {
-    m_runWithoutDeployAction->setVisible(m_projectExplorerSettings.deployBeforeRun);
+    m_runWithoutDeployAction->setVisible(projectExplorerSettings().deployBeforeRun);
 }
 
 IPlugin::ShutdownFlag ProjectExplorerPlugin::aboutToShutdown()
@@ -2203,6 +2140,35 @@ bool ProjectExplorerPluginPrivate::closeAllFilesInProject(const Project *project
     return EditorManager::closeDocuments(openFiles);
 }
 
+void ProjectExplorerPluginPrivate::checkRecentProjectsAsync()
+{
+    m_recentProjectsFuture.cancel();
+
+    m_recentProjectsFuture
+        = QtConcurrent::mapped(&m_recentProjectsPool, m_recentProjects, [](RecentProjectsEntry p) {
+              // check if project is available, but avoid querying devices
+              p.exists = p.filePath.needsDevice() || p.filePath.isFile();
+              return p;
+          });
+    PluginManager::futureSynchronizer()->addFuture(m_recentProjectsFuture);
+
+    onResultReady(m_recentProjectsFuture, this, [this](const RecentProjectsEntry &p) {
+        auto it = std::find_if(
+            m_recentProjects.begin(), m_recentProjects.end(), [&p](const RecentProjectsEntry &e) {
+                return p.filePath == e.filePath;
+            });
+        // nothing to do if it no longer is in the recent projects, or if the state already was
+        // correct
+        if (it == m_recentProjects.end())
+            return;
+        if (it->exists == p.exists)
+            return;
+
+        *it = p;
+        emit m_instance->recentProjectsChanged();
+    });
+}
+
 void ProjectExplorerPluginPrivate::savePersistentSettings()
 {
     if (PluginManager::isShuttingDown())
@@ -2216,66 +2182,21 @@ void ProjectExplorerPluginPrivate::savePersistentSettings()
     QtcSettings *s = ICore::settings();
     s->remove("ProjectExplorer/RecentProjects/Files");
 
-    QStringList fileNames;
+    QStringList filePaths;
     QStringList displayNames;
+    QHash<QString, QVariant> existence;
     RecentProjectsEntries::const_iterator it, end;
     end = dd->m_recentProjects.constEnd();
     for (it = dd->m_recentProjects.constBegin(); it != end; ++it) {
-        fileNames << (*it).first.toUserOutput();
-        displayNames << (*it).second;
+        const QString filePath = it->filePath.toUserOutput();
+        filePaths << filePath;
+        displayNames << it->displayName;
+        existence.insert(filePath, it->exists);
     }
 
-    s->setValueWithDefault(Constants::RECENTPROJECTS_FILE_NAMES_KEY, fileNames);
+    s->setValueWithDefault(Constants::RECENTPROJECTS_FILE_NAMES_KEY, filePaths);
     s->setValueWithDefault(Constants::RECENTPROJECTS_DISPLAY_NAMES_KEY, displayNames);
-
-    static const ProjectExplorerSettings defaultSettings;
-
-    s->setValueWithDefault(Constants::BUILD_BEFORE_DEPLOY_SETTINGS_KEY,
-                           int(dd->m_projectExplorerSettings.buildBeforeDeploy),
-                           int(defaultSettings.buildBeforeDeploy));
-    s->setValueWithDefault(Constants::DEPLOY_BEFORE_RUN_SETTINGS_KEY,
-                           dd->m_projectExplorerSettings.deployBeforeRun,
-                           defaultSettings.deployBeforeRun);
-    s->setValueWithDefault(Constants::SAVE_BEFORE_BUILD_SETTINGS_KEY,
-                           dd->m_projectExplorerSettings.saveBeforeBuild,
-                           defaultSettings.saveBeforeBuild);
-    s->setValueWithDefault(Constants::USE_JOM_SETTINGS_KEY,
-                           dd->m_projectExplorerSettings.useJom,
-                           defaultSettings.useJom);
-    s->setValueWithDefault(Constants::ADD_LIBRARY_PATHS_TO_RUN_ENV_SETTINGS_KEY,
-                           dd->m_projectExplorerSettings.addLibraryPathsToRunEnv,
-                           defaultSettings.addLibraryPathsToRunEnv);
-    s->setValueWithDefault(Constants::PROMPT_TO_STOP_RUN_CONTROL_SETTINGS_KEY,
-                           dd->m_projectExplorerSettings.prompToStopRunControl,
-                           defaultSettings.prompToStopRunControl);
-    s->setValueWithDefault(Constants::TERMINAL_MODE_SETTINGS_KEY,
-                           int(dd->m_projectExplorerSettings.terminalMode),
-                           int(defaultSettings.terminalMode));
-    s->setValueWithDefault(Constants::CLOSE_FILES_WITH_PROJECT_SETTINGS_KEY,
-                           dd->m_projectExplorerSettings.closeSourceFilesWithProject,
-                           defaultSettings.closeSourceFilesWithProject);
-    s->setValueWithDefault(Constants::CLEAR_ISSUES_ON_REBUILD_SETTINGS_KEY,
-                           dd->m_projectExplorerSettings.clearIssuesOnRebuild,
-                           defaultSettings.clearIssuesOnRebuild);
-    s->setValueWithDefault(Constants::ABORT_BUILD_ALL_ON_ERROR_SETTINGS_KEY,
-                           dd->m_projectExplorerSettings.abortBuildAllOnError,
-                           defaultSettings.abortBuildAllOnError);
-    s->setValueWithDefault(Constants::LOW_BUILD_PRIORITY_SETTINGS_KEY,
-                           dd->m_projectExplorerSettings.lowBuildPriority,
-                           defaultSettings.lowBuildPriority);
-    s->setValueWithDefault(Constants::WARN_AGAINST_NON_ASCII_BUILD_DIR_SETTINGS_KEY,
-                           dd->m_projectExplorerSettings.warnAgainstNonAsciiBuildDir,
-                           defaultSettings.warnAgainstNonAsciiBuildDir);
-    s->setValueWithDefault(Constants::AUTO_CREATE_RUN_CONFIGS_SETTINGS_KEY,
-                           dd->m_projectExplorerSettings.automaticallyCreateRunConfigurations,
-                           defaultSettings.automaticallyCreateRunConfigurations);
-    s->setValueWithDefault(Constants::ENVIRONMENT_ID_SETTINGS_KEY,
-                           dd->m_projectExplorerSettings.environmentId.toByteArray());
-    s->setValueWithDefault(Constants::STOP_BEFORE_BUILD_SETTINGS_KEY,
-                           int(dd->m_projectExplorerSettings.stopBeforeBuild),
-                           int(defaultSettings.stopBeforeBuild));
-    s->setValueWithDefault(Constants::APP_ENV_CHANGES_SETTINGS_KEY,
-                           EnvironmentItem::toStringList(dd->m_projectExplorerSettings.appEnvChanges));
+    s->setValueWithDefault(Constants::RECENTPROJECTS_EXISTENCE_KEY, existence);
 
     buildPropertiesSettings().writeSettings(); // FIXME: Should not be needed.
 
@@ -2501,12 +2422,20 @@ QList<std::pair<FilePath, FilePath>> ProjectExplorerPlugin::renameFiles(
 }
 
 #ifdef WITH_TESTS
-bool ProjectExplorerPlugin::renameFile(const Utils::FilePath &source, const Utils::FilePath &target)
-{
-    const bool success = Core::FileUtils::renameFile(source, target, HandleIncludeGuards::Yes);
-    if (success)
-        emit ProjectExplorerPlugin::instance()->filesRenamed({std::make_pair(source, target)});
-    return success;
+bool ProjectExplorerPlugin::renameFile(const Utils::FilePath &source, const Utils::FilePath &target,
+                                       Project *project)
+{
+    if (!project) {
+        const bool success = Core::FileUtils::renameFile(source, target, HandleIncludeGuards::Yes);
+        if (success)
+            emit ProjectExplorerPlugin::instance()->filesRenamed({std::make_pair(source, target)});
+        return success;
+    }
+    Node * const sourceNode = const_cast<Node *>(project->nodeForFilePath(source));
+    if (!sourceNode)
+        return false;
+    return !renameFiles({std::make_pair(sourceNode, target)}).isEmpty();
+
 }
 #endif // WITH_TESTS
 
@@ -2588,10 +2517,7 @@ void ProjectExplorerPluginPrivate::buildQueueFinished(bool success)
 
 RecentProjectsEntries ProjectExplorerPluginPrivate::recentProjects() const
 {
-    return Utils::filtered(dd->m_recentProjects, [](const RecentProjectsEntry &p) {
-        // check if project is available, but avoid querying devices
-        return p.first.needsDevice() || p.first.isFile();
-    });
+    return filtered(m_recentProjects, &RecentProjectsEntry::exists);
 }
 
 void ProjectExplorerPluginPrivate::updateActions()
@@ -2723,7 +2649,7 @@ bool ProjectExplorerPlugin::saveModifiedFiles()
 {
     QList<IDocument *> documentsToSave = DocumentManager::modifiedDocuments();
     if (!documentsToSave.isEmpty()) {
-        if (dd->m_projectExplorerSettings.saveBeforeBuild) {
+        if (projectExplorerSettings().saveBeforeBuild) {
             bool cancelled = false;
             DocumentManager::saveModifiedDocumentsSilently(documentsToSave, &cancelled);
             if (cancelled)
@@ -2738,7 +2664,7 @@ bool ProjectExplorerPlugin::saveModifiedFiles()
             }
 
             if (alwaysSave)
-                dd->m_projectExplorerSettings.saveBeforeBuild = true;
+                setSaveBeforeBuildSettings(true);
         }
     }
     return true;
@@ -3054,7 +2980,7 @@ void ProjectExplorerPluginPrivate::updateDeployActions()
                               && !BuildManager::isBuilding(currentProject)
                               && hasDeploySettings(currentProject);
 
-    if (m_projectExplorerSettings.buildBeforeDeploy != BuildBeforeRunMode::Off) {
+    if (projectExplorerSettings().buildBeforeDeploy != BuildBeforeRunMode::Off) {
         if (hasBuildSettings(project)
                 && !buildSettingsEnabled(project).first)
             enableDeployActions = false;
@@ -3072,7 +2998,7 @@ void ProjectExplorerPluginPrivate::updateDeployActions()
     m_deployProjectOnlyAction->setEnabled(enableDeployActions);
 
     bool enableDeploySessionAction = true;
-    if (m_projectExplorerSettings.buildBeforeDeploy != BuildBeforeRunMode::Off) {
+    if (projectExplorerSettings().buildBeforeDeploy != BuildBeforeRunMode::Off) {
         auto hasDisabledBuildConfiguration = [](Project *project) {
             return project && project->activeTarget()
                     && project->activeTarget()->activeBuildConfiguration()
@@ -3116,8 +3042,8 @@ expected_str<void> ProjectExplorerPlugin::canRunStartupProject(Utils::Id runMode
     if (!activeRC->isEnabled(runMode))
         return make_unexpected(activeRC->disabledReason(runMode));
 
-    if (dd->m_projectExplorerSettings.buildBeforeDeploy != BuildBeforeRunMode::Off
-            && dd->m_projectExplorerSettings.deployBeforeRun
+    if (projectExplorerSettings().buildBeforeDeploy != BuildBeforeRunMode::Off
+            && projectExplorerSettings().deployBeforeRun
             && !BuildManager::isBuilding(project)
             && hasBuildSettings(project)) {
         QPair<bool, QString> buildState = dd->buildSettingsEnabled(project);
@@ -3155,16 +3081,13 @@ void ProjectExplorerPluginPrivate::addToRecentProjects(const FilePath &filePath,
     if (filePath.isEmpty())
         return;
 
-    RecentProjectsEntries::iterator it;
-    for (it = m_recentProjects.begin(); it != m_recentProjects.end();)
-        if ((*it).first == filePath)
-            it = m_recentProjects.erase(it);
-        else
-            ++it;
-
-    if (m_recentProjects.count() > m_maxRecentProjects)
+    Utils::erase(m_recentProjects, [filePath](const RecentProjectsEntry &e) {
+        return e.filePath == filePath;
+    });
+    if (m_recentProjects.size() >= m_maxRecentProjects)
         m_recentProjects.removeLast();
-    m_recentProjects.push_front({filePath, displayName});
+    m_recentProjects.push_front({filePath, displayName, true});
+    checkRecentProjectsAsync();
     m_lastOpenDirectory = filePath.absolutePath();
     emit m_instance->recentProjectsChanged();
 }
@@ -3191,7 +3114,7 @@ void ProjectExplorerPluginPrivate::updateRecentProjectMenu()
     const RecentProjectsEntries projects = recentProjects();
     //projects (ignore sessions, they used to be in this list)
     for (const RecentProjectsEntry &item : projects) {
-        const FilePath &filePath = item.first;
+        const FilePath &filePath = item.filePath;
         if (filePath.endsWith(QLatin1String(".qws")))
             continue;
 
@@ -3216,13 +3139,12 @@ void ProjectExplorerPluginPrivate::updateRecentProjectMenu()
         connect(action, &QAction::triggered,
                 this, &ProjectExplorerPluginPrivate::clearRecentProjects);
     }
-    emit m_instance->recentProjectsChanged();
 }
 
 void ProjectExplorerPluginPrivate::clearRecentProjects()
 {
     m_recentProjects.clear();
-    updateWelcomePage();
+    emit m_instance->recentProjectsChanged();
 }
 
 void ProjectExplorerPluginPrivate::openRecentProject(const FilePath &filePath)
@@ -3238,8 +3160,10 @@ void ProjectExplorerPluginPrivate::removeFromRecentProjects(const FilePath &file
 {
     QTC_ASSERT(!filePath.isEmpty(), return);
     QTC_CHECK(Utils::eraseOne(m_recentProjects, [filePath](const RecentProjectsEntry &entry) {
-        return entry.first == filePath;
+        return entry.filePath == filePath;
     }));
+    checkRecentProjectsAsync();
+    emit m_instance->recentProjectsChanged();
 }
 
 void ProjectExplorerPluginPrivate::invalidateProject(Project *project)
@@ -3968,21 +3892,6 @@ void ProjectExplorerPluginPrivate::handleSetStartupProject()
     setStartupProject(ProjectTree::currentProject());
 }
 
-void ProjectExplorerPlugin::setProjectExplorerSettings(const ProjectExplorerSettings &pes)
-{
-    QTC_ASSERT(dd->m_projectExplorerSettings.environmentId == pes.environmentId, return);
-
-    if (dd->m_projectExplorerSettings == pes)
-        return;
-    dd->m_projectExplorerSettings = pes;
-    emit m_instance->settingsChanged();
-}
-
-const ProjectExplorerSettings &ProjectExplorerPlugin::projectExplorerSettings()
-{
-    return dd->m_projectExplorerSettings;
-}
-
 void ProjectExplorerPlugin::setAppOutputSettings(const AppOutputSettings &settings)
 {
     dd->m_outputPane.setSettings(settings);
diff --git a/src/plugins/projectexplorer/projectexplorer.h b/src/plugins/projectexplorer/projectexplorer.h
index ffb5d1bcd3..0c737aa9ab 100644
--- a/src/plugins/projectexplorer/projectexplorer.h
+++ b/src/plugins/projectexplorer/projectexplorer.h
@@ -29,7 +29,6 @@ class CustomParserSettings;
 class FolderNode;
 class Node;
 class Project;
-class ProjectExplorerSettings;
 class RunControl;
 class RunConfiguration;
 
@@ -38,7 +37,14 @@ class AppOutputSettings;
 class MiniProjectTargetSelector;
 }
 
-using RecentProjectsEntry = QPair<Utils::FilePath, QString>;
+class RecentProjectsEntry
+{
+public:
+    Utils::FilePath filePath;
+    QString displayName;
+    bool exists = true;
+};
+
 using RecentProjectsEntries = QList<RecentProjectsEntry>;
 
 class PROJECTEXPLORER_EXPORT OpenProjectResult
@@ -110,9 +116,6 @@ public:
     bool delayedInitialize() override;
     ShutdownFlag aboutToShutdown() override;
 
-    static void setProjectExplorerSettings(const ProjectExplorerSettings &pes);
-    static const ProjectExplorerSettings &projectExplorerSettings();
-
     static void setAppOutputSettings(const Internal::AppOutputSettings &settings);
     static const Internal::AppOutputSettings &appOutputSettings();
 
@@ -128,7 +131,8 @@ public:
     renameFiles(const QList<std::pair<Node *, Utils::FilePath>> &nodesAndNewFilePaths);
 
 #ifdef WITH_TESTS
-    static bool renameFile(const Utils::FilePath &source, const Utils::FilePath &target);
+    static bool renameFile(const Utils::FilePath &source, const Utils::FilePath &target,
+                           Project *project = nullptr);
 #endif
 
     static QStringList projectFilePatterns();
diff --git a/src/plugins/projectexplorer/projectexplorerconstants.h b/src/plugins/projectexplorer/projectexplorerconstants.h
index 80ffefcc51..ca0fe5c9e0 100644
--- a/src/plugins/projectexplorer/projectexplorerconstants.h
+++ b/src/plugins/projectexplorer/projectexplorerconstants.h
@@ -145,6 +145,8 @@ const char CUSTOM_TOOLCHAIN_TYPEID[] = "ProjectExplorer.ToolChain.Custom";
 const char DEFAULT_WORKING_DIR[] = "%{buildDir}";
 const char DEFAULT_WORKING_DIR_ALTERNATE[] = "%{sourceDir}";
 
+const char QTC_DEFAULT_BUILD_DIRECTORY_TEMPLATE[] = "QTC_DEFAULT_BUILD_DIRECTORY_TEMPLATE";
+
 // Desktop Device related ids:
 const char DESKTOP_DEVICE_ID[] = "Desktop Device";
 const char DESKTOP_DEVICE_TYPE[] = "Desktop";
diff --git a/src/plugins/projectexplorer/projectexplorersettings.cpp b/src/plugins/projectexplorer/projectexplorersettings.cpp
index b99a38d461..5d4df2aecd 100644
--- a/src/plugins/projectexplorer/projectexplorersettings.cpp
+++ b/src/plugins/projectexplorer/projectexplorersettings.cpp
@@ -9,7 +9,9 @@
 #include "projectexplorertr.h"
 
 #include <coreplugin/coreconstants.h>
+#include <coreplugin/dialogs/ioptionspage.h>
 #include <coreplugin/documentmanager.h>
+#include <coreplugin/icore.h>
 
 #include <utils/environmentdialog.h>
 #include <utils/layoutbuilder.h>
@@ -27,10 +29,204 @@
 using namespace Core;
 using namespace Utils;
 
-namespace ProjectExplorer::Internal {
+namespace ProjectExplorer {
+namespace Internal {
+
+namespace Constants {
+const char BUILD_BEFORE_DEPLOY_SETTINGS_KEY[] = "ProjectExplorer/Settings/BuildBeforeDeploy";
+const char DEPLOY_BEFORE_RUN_SETTINGS_KEY[] = "ProjectExplorer/Settings/DeployBeforeRun";
+const char SAVE_BEFORE_BUILD_SETTINGS_KEY[] = "ProjectExplorer/Settings/SaveBeforeBuild";
+const char USE_JOM_SETTINGS_KEY[] = "ProjectExplorer/Settings/UseJom";
+const char ADD_LIBRARY_PATHS_TO_RUN_ENV_SETTINGS_KEY[] =
+        "ProjectExplorer/Settings/AddLibraryPathsToRunEnv";
+const char PROMPT_TO_STOP_RUN_CONTROL_SETTINGS_KEY[] =
+        "ProjectExplorer/Settings/PromptToStopRunControl";
+const char AUTO_CREATE_RUN_CONFIGS_SETTINGS_KEY[] =
+        "ProjectExplorer/Settings/AutomaticallyCreateRunConfigurations";
+const char ENVIRONMENT_ID_SETTINGS_KEY[] = "ProjectExplorer/Settings/EnvironmentId";
+const char STOP_BEFORE_BUILD_SETTINGS_KEY[] = "ProjectExplorer/Settings/StopBeforeBuild";
+const char TERMINAL_MODE_SETTINGS_KEY[] = "ProjectExplorer/Settings/TerminalMode";
+const char CLOSE_FILES_WITH_PROJECT_SETTINGS_KEY[]
+    = "ProjectExplorer/Settings/CloseFilesWithProject";
+const char CLEAR_ISSUES_ON_REBUILD_SETTINGS_KEY[] = "ProjectExplorer/Settings/ClearIssuesOnRebuild";
+const char ABORT_BUILD_ALL_ON_ERROR_SETTINGS_KEY[]
+    = "ProjectExplorer/Settings/AbortBuildAllOnError";
+const char LOW_BUILD_PRIORITY_SETTINGS_KEY[] = "ProjectExplorer/Settings/LowBuildPriority";
+const char APP_ENV_CHANGES_SETTINGS_KEY[] = "ProjectExplorer/Settings/AppEnvChanges";
+const char WARN_AGAINST_NON_ASCII_BUILD_DIR_SETTINGS_KEY[]
+    = "ProjectExplorer/Settings/WarnAgainstNonAsciiBuildDir";
+
+} // Constants
 
 enum { UseCurrentDirectory, UseProjectDirectory };
 
+void saveProjectExplorerSettings();
+
+static bool operator==(const ProjectExplorerSettings &p1, const ProjectExplorerSettings &p2)
+{
+    return p1.buildBeforeDeploy == p2.buildBeforeDeploy
+            && p1.deployBeforeRun == p2.deployBeforeRun
+            && p1.saveBeforeBuild == p2.saveBeforeBuild
+            && p1.useJom == p2.useJom
+            && p1.prompToStopRunControl == p2.prompToStopRunControl
+            && p1.automaticallyCreateRunConfigurations == p2.automaticallyCreateRunConfigurations
+            && p1.addLibraryPathsToRunEnv == p2.addLibraryPathsToRunEnv
+            && p1.environmentId == p2.environmentId
+            && p1.stopBeforeBuild == p2.stopBeforeBuild
+            && p1.terminalMode == p2.terminalMode
+            && p1.closeSourceFilesWithProject == p2.closeSourceFilesWithProject
+            && p1.clearIssuesOnRebuild == p2.clearIssuesOnRebuild
+            && p1.abortBuildAllOnError == p2.abortBuildAllOnError
+            && p1.appEnvChanges == p2.appEnvChanges
+            && p1.lowBuildPriority == p2.lowBuildPriority;
+}
+
+ProjectExplorerSettings &mutableProjectExplorerSettings()
+{
+    static ProjectExplorerSettings theProjectExplorerSettings;
+    return theProjectExplorerSettings;
+}
+
+void setPromptToStopSettings(bool promptToStop)
+{
+    mutableProjectExplorerSettings().prompToStopRunControl = promptToStop;
+    saveProjectExplorerSettings();
+    emit ProjectExplorerPlugin::instance()->settingsChanged();
+}
+
+void setSaveBeforeBuildSettings(bool saveBeforeBuild)
+{
+    mutableProjectExplorerSettings().saveBeforeBuild = saveBeforeBuild;
+    saveProjectExplorerSettings();
+}
+
+static void loadProjectExplorerSettings()
+{
+    QtcSettings *s = ICore::settings();
+
+    const QVariant buildBeforeDeploy = s->value(Constants::BUILD_BEFORE_DEPLOY_SETTINGS_KEY);
+    const QString buildBeforeDeployString = buildBeforeDeploy.toString();
+    ProjectExplorerSettings &settings = mutableProjectExplorerSettings();
+    if (buildBeforeDeployString == "true") { // backward compatibility with QtC < 4.12
+        settings.buildBeforeDeploy = BuildBeforeRunMode::WholeProject;
+    } else if (buildBeforeDeployString == "false") {
+        settings.buildBeforeDeploy = BuildBeforeRunMode::Off;
+    } else if (buildBeforeDeploy.isValid()) {
+        settings.buildBeforeDeploy
+                = static_cast<BuildBeforeRunMode>(buildBeforeDeploy.toInt());
+    }
+
+    static const ProjectExplorerSettings defaultSettings;
+
+    settings.deployBeforeRun
+        = s->value(Constants::DEPLOY_BEFORE_RUN_SETTINGS_KEY, defaultSettings.deployBeforeRun)
+              .toBool();
+    settings.saveBeforeBuild
+        = s->value(Constants::SAVE_BEFORE_BUILD_SETTINGS_KEY, defaultSettings.saveBeforeBuild)
+              .toBool();
+    settings.useJom
+        = s->value(Constants::USE_JOM_SETTINGS_KEY, defaultSettings.useJom).toBool();
+    settings.addLibraryPathsToRunEnv
+        = s->value(Constants::ADD_LIBRARY_PATHS_TO_RUN_ENV_SETTINGS_KEY,
+                   defaultSettings.addLibraryPathsToRunEnv)
+              .toBool();
+    settings.prompToStopRunControl
+        = s->value(Constants::PROMPT_TO_STOP_RUN_CONTROL_SETTINGS_KEY,
+                   defaultSettings.prompToStopRunControl)
+              .toBool();
+    settings.automaticallyCreateRunConfigurations
+        = s->value(Constants::AUTO_CREATE_RUN_CONFIGS_SETTINGS_KEY,
+                   defaultSettings.automaticallyCreateRunConfigurations)
+              .toBool();
+    settings.environmentId =
+            QUuid(s->value(Constants::ENVIRONMENT_ID_SETTINGS_KEY).toByteArray());
+    if (settings.environmentId.isNull())
+        settings.environmentId = QUuid::createUuid();
+    int tmp = s->value(Constants::STOP_BEFORE_BUILD_SETTINGS_KEY,
+                       int(defaultSettings.stopBeforeBuild))
+                  .toInt();
+    if (tmp < 0 || tmp > int(StopBeforeBuild::SameApp))
+        tmp = int(defaultSettings.stopBeforeBuild);
+    settings.stopBeforeBuild = StopBeforeBuild(tmp);
+    settings.terminalMode = static_cast<TerminalMode>(
+        s->value(Constants::TERMINAL_MODE_SETTINGS_KEY, int(defaultSettings.terminalMode)).toInt());
+    settings.closeSourceFilesWithProject
+        = s->value(Constants::CLOSE_FILES_WITH_PROJECT_SETTINGS_KEY,
+                   defaultSettings.closeSourceFilesWithProject)
+              .toBool();
+    settings.clearIssuesOnRebuild
+        = s->value(Constants::CLEAR_ISSUES_ON_REBUILD_SETTINGS_KEY,
+                   defaultSettings.clearIssuesOnRebuild)
+              .toBool();
+    settings.abortBuildAllOnError
+        = s->value(Constants::ABORT_BUILD_ALL_ON_ERROR_SETTINGS_KEY,
+                   defaultSettings.abortBuildAllOnError)
+              .toBool();
+    settings.lowBuildPriority
+        = s->value(Constants::LOW_BUILD_PRIORITY_SETTINGS_KEY, defaultSettings.lowBuildPriority)
+              .toBool();
+    settings.warnAgainstNonAsciiBuildDir
+        = s->value(Constants::WARN_AGAINST_NON_ASCII_BUILD_DIR_SETTINGS_KEY,
+                   defaultSettings.warnAgainstNonAsciiBuildDir)
+              .toBool();
+    settings.appEnvChanges = EnvironmentItem::fromStringList(
+        s->value(Constants::APP_ENV_CHANGES_SETTINGS_KEY).toStringList());
+}
+
+void saveProjectExplorerSettings()
+{
+    QtcSettings *s = ICore::settings();
+    static const ProjectExplorerSettings defaultSettings;
+
+    const ProjectExplorerSettings &settings = projectExplorerSettings();
+    s->setValueWithDefault(Constants::BUILD_BEFORE_DEPLOY_SETTINGS_KEY,
+                           int(settings.buildBeforeDeploy),
+                           int(defaultSettings.buildBeforeDeploy));
+    s->setValueWithDefault(Constants::DEPLOY_BEFORE_RUN_SETTINGS_KEY,
+                           settings.deployBeforeRun,
+                           defaultSettings.deployBeforeRun);
+    s->setValueWithDefault(Constants::SAVE_BEFORE_BUILD_SETTINGS_KEY,
+                           settings.saveBeforeBuild,
+                           defaultSettings.saveBeforeBuild);
+    s->setValueWithDefault(Constants::USE_JOM_SETTINGS_KEY,
+                           settings.useJom,
+                           defaultSettings.useJom);
+    s->setValueWithDefault(Constants::ADD_LIBRARY_PATHS_TO_RUN_ENV_SETTINGS_KEY,
+                           settings.addLibraryPathsToRunEnv,
+                           defaultSettings.addLibraryPathsToRunEnv);
+    s->setValueWithDefault(Constants::PROMPT_TO_STOP_RUN_CONTROL_SETTINGS_KEY,
+                           settings.prompToStopRunControl,
+                           defaultSettings.prompToStopRunControl);
+    s->setValueWithDefault(Constants::TERMINAL_MODE_SETTINGS_KEY,
+                           int(settings.terminalMode),
+                           int(defaultSettings.terminalMode));
+    s->setValueWithDefault(Constants::CLOSE_FILES_WITH_PROJECT_SETTINGS_KEY,
+                           settings.closeSourceFilesWithProject,
+                           defaultSettings.closeSourceFilesWithProject);
+    s->setValueWithDefault(Constants::CLEAR_ISSUES_ON_REBUILD_SETTINGS_KEY,
+                           settings.clearIssuesOnRebuild,
+                           defaultSettings.clearIssuesOnRebuild);
+    s->setValueWithDefault(Constants::ABORT_BUILD_ALL_ON_ERROR_SETTINGS_KEY,
+                           settings.abortBuildAllOnError,
+                           defaultSettings.abortBuildAllOnError);
+    s->setValueWithDefault(Constants::LOW_BUILD_PRIORITY_SETTINGS_KEY,
+                           settings.lowBuildPriority,
+                           defaultSettings.lowBuildPriority);
+    s->setValueWithDefault(Constants::WARN_AGAINST_NON_ASCII_BUILD_DIR_SETTINGS_KEY,
+                           settings.warnAgainstNonAsciiBuildDir,
+                           defaultSettings.warnAgainstNonAsciiBuildDir);
+    s->setValueWithDefault(Constants::AUTO_CREATE_RUN_CONFIGS_SETTINGS_KEY,
+                           settings.automaticallyCreateRunConfigurations,
+                           defaultSettings.automaticallyCreateRunConfigurations);
+    s->setValueWithDefault(Constants::ENVIRONMENT_ID_SETTINGS_KEY,
+                           settings.environmentId.toByteArray());
+    s->setValueWithDefault(Constants::STOP_BEFORE_BUILD_SETTINGS_KEY,
+                           int(settings.stopBeforeBuild),
+                           int(defaultSettings.stopBeforeBuild));
+    s->setValueWithDefault(Constants::APP_ENV_CHANGES_SETTINGS_KEY,
+                           EnvironmentItem::toStringList(settings.appEnvChanges));
+}
+
 class ProjectExplorerSettingsWidget : public IOptionsPageWidget
 {
 public:
@@ -47,7 +243,15 @@ public:
 
     void apply() final
     {
-        ProjectExplorerPlugin::setProjectExplorerSettings(settings());
+        ProjectExplorerSettings newSettings = settings();
+        QTC_CHECK(projectExplorerSettings().environmentId == newSettings.environmentId);
+
+        if (!(projectExplorerSettings() == newSettings)) {
+            mutableProjectExplorerSettings() = newSettings;
+            saveProjectExplorerSettings();
+            emit ProjectExplorerPlugin::instance()->settingsChanged();
+        }
+
         DocumentManager::setProjectsDirectory(projectsDirectory());
         DocumentManager::setUseProjectsDirectory(useProjectsDirectory());
     }
@@ -56,7 +260,6 @@ private:
     void slotDirectoryButtonGroupChanged();
     void updateAppEnvChangesLabel();
 
-    mutable ProjectExplorerSettings m_settings;
     Utils::EnvironmentItems m_appEnvChanges;
     QRadioButton *m_currentDirectoryRadioButton;
     QRadioButton *m_directoryRadioButton;
@@ -204,7 +407,7 @@ ProjectExplorerSettingsWidget::ProjectExplorerSettingsWidget()
     connect(m_directoryButtonGroup, &QButtonGroup::buttonClicked,
             this, &ProjectExplorerSettingsWidget::slotDirectoryButtonGroupChanged);
 
-    setSettings(ProjectExplorerPlugin::projectExplorerSettings());
+    setSettings(projectExplorerSettings());
     setProjectsDirectory(DocumentManager::projectsDirectory());
     setUseProjectsDirectory(DocumentManager::useProjectsDirectory());
     updateAppEnvChangesLabel();
@@ -212,46 +415,47 @@ ProjectExplorerSettingsWidget::ProjectExplorerSettingsWidget()
 
 ProjectExplorerSettings ProjectExplorerSettingsWidget::settings() const
 {
-    m_settings.buildBeforeDeploy = static_cast<BuildBeforeRunMode>(
-                m_buildBeforeDeployComboBox->currentData().toInt());
-    m_settings.deployBeforeRun = m_deployProjectBeforeRunCheckBox->isChecked();
-    m_settings.saveBeforeBuild = m_saveAllFilesCheckBox->isChecked();
-    m_settings.useJom = m_jomCheckbox->isChecked();
-    m_settings.addLibraryPathsToRunEnv = m_addLibraryPathsToRunEnvCheckBox->isChecked();
-    m_settings.prompToStopRunControl = m_promptToStopRunControlCheckBox->isChecked();
-    m_settings.automaticallyCreateRunConfigurations = m_automaticallyCreateRunConfiguration->isChecked();
-    m_settings.stopBeforeBuild = static_cast<StopBeforeBuild>(
-                m_stopBeforeBuildComboBox->currentData().toInt());
-    m_settings.terminalMode = static_cast<ProjectExplorer::TerminalMode>(m_terminalModeComboBox->currentIndex());
-    m_settings.closeSourceFilesWithProject = m_closeSourceFilesCheckBox->isChecked();
-    m_settings.clearIssuesOnRebuild = m_clearIssuesCheckBox->isChecked();
-    m_settings.abortBuildAllOnError = m_abortBuildAllOnErrorCheckBox->isChecked();
-    m_settings.lowBuildPriority = m_lowBuildPriorityCheckBox->isChecked();
-    m_settings.warnAgainstNonAsciiBuildDir = m_warnAgainstNonAsciiBuildDirCheckBox->isChecked();
-    m_settings.appEnvChanges = m_appEnvChanges;
-    return m_settings;
+    ProjectExplorerSettings s;
+    s.buildBeforeDeploy = static_cast<BuildBeforeRunMode>(
+       m_buildBeforeDeployComboBox->currentData().toInt());
+    s.deployBeforeRun = m_deployProjectBeforeRunCheckBox->isChecked();
+    s.saveBeforeBuild = m_saveAllFilesCheckBox->isChecked();
+    s.useJom = m_jomCheckbox->isChecked();
+    s.addLibraryPathsToRunEnv = m_addLibraryPathsToRunEnvCheckBox->isChecked();
+    s.prompToStopRunControl = m_promptToStopRunControlCheckBox->isChecked();
+    s.automaticallyCreateRunConfigurations = m_automaticallyCreateRunConfiguration->isChecked();
+    s.stopBeforeBuild = static_cast<StopBeforeBuild>(
+       m_stopBeforeBuildComboBox->currentData().toInt());
+    s.terminalMode = static_cast<ProjectExplorer::TerminalMode>(m_terminalModeComboBox->currentIndex());
+    s.closeSourceFilesWithProject = m_closeSourceFilesCheckBox->isChecked();
+    s.clearIssuesOnRebuild = m_clearIssuesCheckBox->isChecked();
+    s.abortBuildAllOnError = m_abortBuildAllOnErrorCheckBox->isChecked();
+    s.lowBuildPriority = m_lowBuildPriorityCheckBox->isChecked();
+    s.warnAgainstNonAsciiBuildDir = m_warnAgainstNonAsciiBuildDirCheckBox->isChecked();
+    s.appEnvChanges = m_appEnvChanges;
+    s.environmentId = projectExplorerSettings().environmentId;
+    return s;
 }
 
-void ProjectExplorerSettingsWidget::setSettings(const ProjectExplorerSettings  &pes)
+void ProjectExplorerSettingsWidget::setSettings(const ProjectExplorerSettings  &s)
 {
-    m_settings = pes;
-    m_appEnvChanges = pes.appEnvChanges;
+    m_appEnvChanges = s.appEnvChanges;
     m_buildBeforeDeployComboBox->setCurrentIndex(
-                m_buildBeforeDeployComboBox->findData(int(m_settings.buildBeforeDeploy)));
-    m_deployProjectBeforeRunCheckBox->setChecked(m_settings.deployBeforeRun);
-    m_saveAllFilesCheckBox->setChecked(m_settings.saveBeforeBuild);
-    m_jomCheckbox->setChecked(m_settings.useJom);
-    m_addLibraryPathsToRunEnvCheckBox->setChecked(m_settings.addLibraryPathsToRunEnv);
-    m_promptToStopRunControlCheckBox->setChecked(m_settings.prompToStopRunControl);
-    m_automaticallyCreateRunConfiguration->setChecked(m_settings.automaticallyCreateRunConfigurations);
+                m_buildBeforeDeployComboBox->findData(int(s.buildBeforeDeploy)));
+    m_deployProjectBeforeRunCheckBox->setChecked(s.deployBeforeRun);
+    m_saveAllFilesCheckBox->setChecked(s.saveBeforeBuild);
+    m_jomCheckbox->setChecked(s.useJom);
+    m_addLibraryPathsToRunEnvCheckBox->setChecked(s.addLibraryPathsToRunEnv);
+    m_promptToStopRunControlCheckBox->setChecked(s.prompToStopRunControl);
+    m_automaticallyCreateRunConfiguration->setChecked(s.automaticallyCreateRunConfigurations);
     m_stopBeforeBuildComboBox->setCurrentIndex(
-                m_stopBeforeBuildComboBox->findData(int(m_settings.stopBeforeBuild)));
-    m_terminalModeComboBox->setCurrentIndex(static_cast<int>(m_settings.terminalMode));
-    m_closeSourceFilesCheckBox->setChecked(m_settings.closeSourceFilesWithProject);
-    m_clearIssuesCheckBox->setChecked(m_settings.clearIssuesOnRebuild);
-    m_abortBuildAllOnErrorCheckBox->setChecked(m_settings.abortBuildAllOnError);
-    m_lowBuildPriorityCheckBox->setChecked(m_settings.lowBuildPriority);
-    m_warnAgainstNonAsciiBuildDirCheckBox->setChecked(m_settings.warnAgainstNonAsciiBuildDir);
+                m_stopBeforeBuildComboBox->findData(int(s.stopBeforeBuild)));
+    m_terminalModeComboBox->setCurrentIndex(static_cast<int>(s.terminalMode));
+    m_closeSourceFilesCheckBox->setChecked(s.closeSourceFilesWithProject);
+    m_clearIssuesCheckBox->setChecked(s.clearIssuesOnRebuild);
+    m_abortBuildAllOnErrorCheckBox->setChecked(s.abortBuildAllOnError);
+    m_lowBuildPriorityCheckBox->setChecked(s.lowBuildPriority);
+    m_warnAgainstNonAsciiBuildDirCheckBox->setChecked(s.warnAgainstNonAsciiBuildDir);
 }
 
 FilePath ProjectExplorerSettingsWidget::projectsDirectory() const
@@ -292,14 +496,34 @@ void ProjectExplorerSettingsWidget::updateAppEnvChangesLabel()
 
 // ProjectExplorerSettingsPage
 
-ProjectExplorerSettingsPage::ProjectExplorerSettingsPage()
+class ProjectExplorerSettingsPage final : public IOptionsPage
+{
+public:
+    ProjectExplorerSettingsPage()
+    {
+        setId(ProjectExplorer::Constants::BUILD_AND_RUN_SETTINGS_PAGE_ID);
+        setDisplayName(Tr::tr("General"));
+        setCategory(ProjectExplorer::Constants::BUILD_AND_RUN_SETTINGS_CATEGORY);
+        setDisplayCategory(Tr::tr("Build & Run"));
+        setCategoryIconPath(":/projectexplorer/images/settingscategory_buildrun.png");
+        setWidgetCreator([] { return new ProjectExplorerSettingsWidget; });
+    }
+};
+
+void setupProjectExplorerSettings()
 {
-    setId(Constants::BUILD_AND_RUN_SETTINGS_PAGE_ID);
-    setDisplayName(Tr::tr("General"));
-    setCategory(Constants::BUILD_AND_RUN_SETTINGS_CATEGORY);
-    setDisplayCategory(Tr::tr("Build & Run"));
-    setCategoryIconPath(":/projectexplorer/images/settingscategory_buildrun.png");
-    setWidgetCreator([] { return new ProjectExplorerSettingsWidget; });
+    static ProjectExplorerSettingsPage theProjectExplorerSettingsPage;
+
+    loadProjectExplorerSettings();
 }
 
-} // ProjectExplorer::Internal
+
+} // Internal
+
+const ProjectExplorerSettings &projectExplorerSettings()
+{
+    return Internal::mutableProjectExplorerSettings();
+}
+
+} // ProjectExplorer
+
diff --git a/src/plugins/projectexplorer/projectexplorersettings.h b/src/plugins/projectexplorer/projectexplorersettings.h
index dbec8ea2ae..51970eb290 100644
--- a/src/plugins/projectexplorer/projectexplorersettings.h
+++ b/src/plugins/projectexplorer/projectexplorersettings.h
@@ -3,8 +3,9 @@
 
 #pragma once
 
+#include "projectexplorer_export.h"
+
 #include <coreplugin/coreconstants.h>
-#include <coreplugin/dialogs/ioptionspage.h>
 
 #include <utils/environment.h>
 #include <utils/hostosinfo.h>
@@ -20,26 +21,6 @@ enum class StopBeforeBuild { None, SameProject, All, SameBuildDir, SameApp };
 class ProjectExplorerSettings
 {
 public:
-    friend bool operator==(const ProjectExplorerSettings &p1, const ProjectExplorerSettings &p2)
-    {
-        return p1.buildBeforeDeploy == p2.buildBeforeDeploy
-                && p1.deployBeforeRun == p2.deployBeforeRun
-                && p1.saveBeforeBuild == p2.saveBeforeBuild
-                && p1.useJom == p2.useJom
-                && p1.prompToStopRunControl == p2.prompToStopRunControl
-                && p1.automaticallyCreateRunConfigurations == p2.automaticallyCreateRunConfigurations
-                && p1.addLibraryPathsToRunEnv == p2.addLibraryPathsToRunEnv
-                && p1.environmentId == p2.environmentId
-                && p1.stopBeforeBuild == p2.stopBeforeBuild
-                && p1.terminalMode == p2.terminalMode
-                && p1.closeSourceFilesWithProject == p2.closeSourceFilesWithProject
-                && p1.clearIssuesOnRebuild == p2.clearIssuesOnRebuild
-                && p1.abortBuildAllOnError == p2.abortBuildAllOnError
-                && p1.appEnvChanges == p2.appEnvChanges
-                && p1.warnAgainstNonAsciiBuildDir == p2.warnAgainstNonAsciiBuildDir
-                && p1.lowBuildPriority == p2.lowBuildPriority;
-    }
-
     BuildBeforeRunMode buildBeforeDeploy = BuildBeforeRunMode::WholeProject;
     bool deployBeforeRun = true;
     bool saveBeforeBuild = false;
@@ -64,8 +45,13 @@ public:
     QUuid environmentId;
 };
 
+PROJECTEXPLORER_EXPORT const ProjectExplorerSettings &projectExplorerSettings();
+
 namespace Internal {
 
+void setPromptToStopSettings(bool promptToStop); // FIXME: Remove.
+void setSaveBeforeBuildSettings(bool saveBeforeBuild); // FIXME: Remove.
+
 enum class AppOutputPaneMode { FlashOnOutput, PopupOnOutput, PopupOnFirstOutput };
 
 class AppOutputSettings
@@ -79,11 +65,7 @@ public:
     int maxCharCount = Core::Constants::DEFAULT_MAX_CHAR_COUNT;
 };
 
-class ProjectExplorerSettingsPage : public Core::IOptionsPage
-{
-public:
-    ProjectExplorerSettingsPage();
-};
+void setupProjectExplorerSettings();
 
 } // namespace Internal
 } // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/projectfilewizardextension.cpp b/src/plugins/projectexplorer/projectfilewizardextension.cpp
index 7655456392..74a767cc98 100644
--- a/src/plugins/projectexplorer/projectfilewizardextension.cpp
+++ b/src/plugins/projectexplorer/projectfilewizardextension.cpp
@@ -49,7 +49,7 @@ using namespace Utils;
         managed) and do 'add' if the VCS supports it.
     \endlist
 
-    \sa ProjectExplorer::Internal::ProjectWizardPage
+    \sa ProjectExplorer::ProjectWizardPage
 */
 
 enum { debugExtension = 0 };
diff --git a/src/plugins/projectexplorer/projectmanager.cpp b/src/plugins/projectexplorer/projectmanager.cpp
index e0cb5e2ca5..9da6ce358e 100644
--- a/src/plugins/projectexplorer/projectmanager.cpp
+++ b/src/plugins/projectexplorer/projectmanager.cpp
@@ -502,16 +502,30 @@ Project *ProjectManager::projectForFile(const FilePath &fileName)
             [&fileName](const Project *p) { return p->isKnownFile(fileName); })) {
         return project;
     }
-    return Utils::findOrDefault(ProjectManager::projects(),
-                                [&fileName](const Project *p) {
-        for (const Target * const target : p->targets()) {
-            for (const BuildConfiguration * const bc : target->buildConfigurations()) {
-                if (fileName.isChildOf(bc->buildDirectory()))
-                    return false;
+    return Utils::findOrDefault(ProjectManager::projects(), [&fileName](const Project *p) {
+        return isInProjectSourceDir(fileName, *p);
+    });
+}
+
+bool ProjectManager::isInProjectSourceDir(const Utils::FilePath &filePath, const Project &project)
+{
+    for (const Target * const target : project.targets()) {
+        for (const BuildConfiguration * const bc : target->buildConfigurations()) {
+            if (filePath.isChildOf(bc->buildDirectory()))
+                return false;
+            if (const FilePath canonicalBuildDir = bc->buildDirectory().canonicalPath();
+                canonicalBuildDir != bc->buildDirectory() && filePath.isChildOf(canonicalBuildDir)) {
+                return false;
             }
         }
-        return fileName.isChildOf(p->projectDirectory());
-    });
+    }
+    if (filePath.isChildOf(project.projectDirectory()))
+        return true;
+    if (const FilePath canonicalRoot = project.projectDirectory().canonicalPath();
+        canonicalRoot != project.projectDirectory()) {
+        return filePath.isChildOf(canonicalRoot);
+    }
+    return false;
 }
 
 Project *ProjectManager::projectWithProjectFilePath(const FilePath &filePath)
diff --git a/src/plugins/projectexplorer/projectmanager.h b/src/plugins/projectexplorer/projectmanager.h
index 27913a00cd..16ad897281 100644
--- a/src/plugins/projectexplorer/projectmanager.h
+++ b/src/plugins/projectexplorer/projectmanager.h
@@ -77,6 +77,7 @@ public:
     static QList<Project *> projectOrder(const Project *project = nullptr);
 
     static Project *projectForFile(const Utils::FilePath &fileName);
+    static bool isInProjectSourceDir(const Utils::FilePath &filePath, const Project &project);
     static Project *projectWithProjectFilePath(const Utils::FilePath &filePath);
 
     static Utils::FilePaths projectsForSessionName(const QString &session);
diff --git a/src/plugins/projectexplorer/projectmodels.cpp b/src/plugins/projectexplorer/projectmodels.cpp
index 9d603b4730..c8b7392bf9 100644
--- a/src/plugins/projectexplorer/projectmodels.cpp
+++ b/src/plugins/projectexplorer/projectmodels.cpp
@@ -802,6 +802,10 @@ bool FlatModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int r
             if (vcsAddPossible && !targetVcs.vcs->vcsAdd(targetFile))
                 failedVcsOp << targetFile;
         }
+        QList<std::pair<FilePath, FilePath>> renameList;
+        for (int i = 0; i < filesToAdd.size(); ++i)
+            renameList.emplaceBack(filesToRemove.at(i), filesToAdd.at(i));
+        emit ProjectExplorerPlugin::instance()->filesRenamed(renameList);
         const RemovedFilesFromProject result
                 = sourceProjectNode->removeFiles(filesToRemove, &failedRemoveFromProject);
         if (result == RemovedFilesFromProject::Wildcard)
diff --git a/src/plugins/projectexplorer/projecttreewidget.cpp b/src/plugins/projectexplorer/projecttreewidget.cpp
index 774a8bb160..db335d1ea2 100644
--- a/src/plugins/projectexplorer/projecttreewidget.cpp
+++ b/src/plugins/projectexplorer/projecttreewidget.cpp
@@ -308,11 +308,11 @@ ProjectTreeWidget::~ProjectTreeWidget()
 int ProjectTreeWidget::expandedCount(Node *node)
 {
     if (m_projectTreeWidgets.isEmpty())
-        return 0;
+        return INT_MAX;
     FlatModel *model = m_projectTreeWidgets.first()->m_model;
     QModelIndex index = model->indexForNode(node);
     if (!index.isValid())
-        return 0;
+        return INT_MAX;
 
     int count = 0;
     for (ProjectTreeWidget *tree : std::as_const(m_projectTreeWidgets)) {
diff --git a/src/plugins/projectexplorer/projectwelcomepage.cpp b/src/plugins/projectexplorer/projectwelcomepage.cpp
index 2974225644..8d97d1ca8a 100644
--- a/src/plugins/projectexplorer/projectwelcomepage.cpp
+++ b/src/plugins/projectexplorer/projectwelcomepage.cpp
@@ -47,10 +47,9 @@ const char PROJECT_BASE_ID[] = "Welcome.OpenRecentProject";
 namespace ProjectExplorer {
 namespace Internal {
 
-constexpr TextFormat projectNameTF {Theme::Token_Text_Accent, StyleHelper::UiElementH6};
-constexpr TextFormat projectPathTF {Theme::Token_Text_Muted, StyleHelper::UiElementCaptionStrong};
-constexpr TextFormat sessionNameTF = {projectNameTF.themeColor, projectNameTF.uiElement,
-                                      Qt::AlignVCenter | Qt::TextDontClip};
+constexpr TextFormat projectNameTF {Theme::Token_Text_Accent, StyleHelper::UiElementH5};
+constexpr TextFormat projectPathTF {Theme::Token_Text_Muted, StyleHelper::UiElementH6};
+constexpr TextFormat sessionNameTF = projectNameTF;
 constexpr TextFormat sessionProjectNameTF {Theme::Token_Text_Default, projectNameTF.uiElement};
 constexpr TextFormat shortcutNumberTF {Theme::Token_Text_Default,
                                       StyleHelper::UiElementCaptionStrong,
@@ -59,7 +58,7 @@ constexpr TextFormat actionTF {Theme::Token_Text_Default, StyleHelper::UiElement
                               Qt::AlignCenter | Qt::TextDontClip};
 constexpr TextFormat actionDisabledTF {Theme::Token_Text_Subtle, actionTF.uiElement,
                                       actionTF.drawTextFlags};
-constexpr int shortcutNumberWidth = 16;
+constexpr int shortcutNumberWidth = 6;
 constexpr int actionSepWidth = 1;
 constexpr int sessionScrollBarGap = HPaddingXs;
 
@@ -106,12 +105,12 @@ QVariant ProjectModel::data(const QModelIndex &index, int role) const
     RecentProjectsEntry data = m_projects.at(index.row());
     switch (role) {
     case Qt::DisplayRole:
-        return data.second;
+        return data.displayName;
     case Qt::ToolTipRole:
     case FilePathRole:
-        return data.first.toVariant();
+        return data.filePath.toVariant();
     case PrettyFilePathRole:
-        return data.first.withTildeHomePath(); // FIXME: FilePath::displayName() ?
+        return data.filePath.withTildeHomePath(); // FIXME: FilePath::displayName() ?
     case ShortcutRole: {
         const Id projectBase = PROJECT_BASE_ID;
         if (Command *cmd = ActionManager::command(projectBase.withSuffix(index.row() + 1)))
@@ -316,36 +315,36 @@ public:
     void paint(QPainter *painter, const QStyleOptionViewItem &option,
                const QModelIndex &idx) const final
     {
-        //                                        visible on withIcon()         Gap + arrow visible on hover   Extra margin right of project item
-        //                                                  |                                 |                               |
-        //                                      +-----------+----------+             +--------+-------+            +----------+----------+
-        //                                      |                      |             |                |            |                     |
+        //                                       visible on withIcon()        Gap + arrow visible on hover   Extra margin right of project item
+        //                                                |                                 |                               |
+        //                                     +----------+----------+             +--------+-------+            +----------+----------+
+        //                                     |                     |             |                |            |                     |
         //
-        //      +------------+--------+---------+------------+---------+-------------+--------+-------+------------+---------------------+  --+
-        //      |            |        |         |(VPaddingXs)|         |(VPaddingXs) |        |       |            |                     |    |
-        //      |            |        |         +------------+         +-------------+        |       |            |                     |    |
-        //      |(HPaddingXs)|<number>|(HGapXxs)|   <icon>   |(HGapXxs)|<sessionName>|(HGapXs)|<arrow>|            |                     |    +-- Header
-        //      |            |(16x16) |         +------------+         +-------------+        |       |            |                     |    |
-        //      |            |        |         |(VPaddingXs)|         |(VPaddingXs) |        |       |            |                     |    |
-        //      |------------+--------+---------+------------+---------+-------------+--------+-------+            |                     |  --+
-        //      |                                                 +--  |         (VPaddingXxs)        |            |                     |    |
-        //      |                                                 |    +------------------------------+(HPaddingXs)|                     |    |
-        //      |                                                 |    |         <projectName>        |            |                     |    |
-        //      |                                                 |    +------------------------------+            |                     |    |
-        //      |                        Per project in session --+    |        (ExPaddingGapS)       |            |(sessionScrollBarGap)|    |
-        //      |                                                 |    +------------------------------+            |                     |    |
-        //      |                                                 |    |         <projectPath>        |            |                     |    |
-        //      |                                                 |    +------------------------------+            |                     |    +-- Expansion
-        //      |                                                 +--  |         (VPaddingXxs)        |            |                     |    |
-        //      +------------------------------------------------------+------------------------------+------------+                     |    |
-        //      |                                           (VPaddingXs)                                           |                     |    |
-        //      +-----------------------------------------+--------------+-----------------------------------------+                     |    |
-        // +--  |                            <cloneButton>|<renameButton>|<deleteButton>                           |                     |    |
-        // |    +-----------------------------------------+--------------+-----------------------------------------+                     |    |
-        // |    |                                           (VPaddingXs)                                           |                     |    |
-        // |    +--------------------------------------------------------------------------------------------------+---------------------+  --+
-        // |    |                                                         (VGapL)                                                        |    +-- Gap between session items
-        // |    +------------------------------------------------------------------------------------------------------------------------+  --+
+        //      +------------+--------+--------+------------+--------+-------------+--------+-------+------------+---------------------+  --+
+        //      |            |        |        |(VPaddingXs)|        |(VPaddingXs) |        |       |            |                     |    |
+        //      |            |        |        +------------+        +-------------+        |       |            |                     |    |
+        //      |(HPaddingXs)|<number>|(HGapXs)|   <icon>   |(HGapXs)|<sessionName>|(HGapXs)|<arrow>|            |                     |    +-- Header
+        //      |            |(w:6)   |        +------------+        +-------------+        |       |            |                     |    |
+        //      |            |        |        |(VPaddingXs)|        |(VPaddingXs) |        |       |            |                     |    |
+        //      |------------+--------+--------+------------+--------+-------------+--------+-------+            |                     |  --+
+        //      |                                               +--  |         (VPaddingXxs)        |            |                     |    |
+        //      |                                               |    +------------------------------+(HPaddingXs)|                     |    |
+        //      |                                               |    |         <projectName>        |            |                     |    |
+        //      |                                               |    +------------------------------+            |                     |    |
+        //      |                      Per project in session --+    |        (ExPaddingGapS)       |            |(sessionScrollBarGap)|    |
+        //      |                                               |    +------------------------------+            |                     |    |
+        //      |                                               |    |         <projectPath>        |            |                     |    |
+        //      |                                               |    +------------------------------+            |                     |    +-- Expansion
+        //      |                                               +--  |         (VPaddingXxs)        |            |                     |    |
+        //      +----------------------------------------------------+------------------------------+------------+                     |    |
+        //      |                                          (VPaddingXs)                                          |                     |    |
+        //      +---------------------------------------+--------------+-----------------------------------------+                     |    |
+        // +--  |                           <cloneButton>|<renameButton>|<deleteButton>                          |                     |    |
+        // |    +---------------------------------------+--------------+-----------------------------------------+                     |    |
+        // |    |                                          (VPaddingXs)                                          |                     |    |
+        // |    +------------------------------------------------------------------------------------------------+---------------------+  --+
+        // |    |                                                        (VGapL)                                                       |    +-- Gap between session items
+        // |    +----------------------------------------------------------------------------------------------------------------------+  --+
         // |
         // \    session action "buttons" and dividers
         // +-----------------------------------------------+--------+---------+--------+
@@ -381,11 +380,11 @@ public:
         const int y = bgR.y();
 
         const int numberX = x + s(HPaddingXs);
-        const int iconX = numberX + shortcutNumberWidth + s(HGapXxs);
+        const int iconX = numberX + shortcutNumberWidth + s(HGapXs);
         const int arrowX = bgR.right() - s(HPaddingXs) - arrowS.width();
         const QRect arrowHoverR(arrowX - s(HGapXs) + 1, y,
                                 s(HGapXs) + arrowS.width() + s(HPaddingXs), hdR.height());
-        const int textX = withIcon() ? iconX + iconS.width() + s(HGapXxs) : iconX;
+        const int textX = withIcon() ? iconX + iconS.width() + s(HGapXs) : iconX;
 
         const int iconY = y + (hdR.height() - iconS.height()) / 2;
         const int arrowY = y + (hdR.height() - arrowS.height()) / 2;
@@ -622,24 +621,24 @@ class ProjectDelegate : public BaseDelegate
 public:
     void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &idx) const final
     {
-        //                               visible on with Icon()               Extra margin right of project item
-        //                                          |                                         |
-        //                                 +--------+-------+                          +------+-----+
-        //                                 |                |                          |            |
+        //                              visible on with Icon()               Extra margin right of project item
+        //                                         |                                         |
+        //                                +--------+-------+                          +------+-----+
+        //                                |                |                          |            |
         //
-        // +------------+--------+---------+------+---------+-------------+------------+------------+
-        // |            |        |         |      |         | (VPaddingXs)|            |            |
-        // |            |        |         |      |         +-------------+            |            |
-        // |            |        |         |      |         |<projectName>|            |            |
-        // |            |        |         |      |         +-------------+            |            |
-        // |(HPaddingXs)|<number>|(HGapXxs)|<icon>|(HGapXxs)|   (VGapXs)  |(HPaddingXs)|(HPaddingXs)|
-        // |            |(16x16) |         |      |         +-------------+            |            |
-        // |            |        |         |      |         |<projectPath>|            |            |
-        // |            |        |         |      |         +-------------+            |            |
-        // |            |        |         |      |         | (VPaddingXs)|            |            |
-        // +------------+--------+---------+------+---------+-------------+------------+------------+  --+
-        // |                                          (VGapL)                                       |    +-- Gap between project items
-        // +----------------------------------------------------------------------------------------+  --+
+        // +------------+--------+--------+------+---------+-------------+------------+------------+
+        // |            |        |        |      |         | (VPaddingXs)|            |            |
+        // |            |        |        |      |         +-------------+            |            |
+        // |            |        |        |      |         |<projectName>|            |            |
+        // |            |        |        |      |         +-------------+            |            |
+        // |(HPaddingXs)|<number>|(HGapXs)|<icon>|(HGapXxs)|   (VGapXs)  |(HPaddingXs)|(HPaddingXs)|
+        // |            |(w:6)   |        |      |         +-------------+            |            |
+        // |            |        |        |      |         |<projectPath>|            |            |
+        // |            |        |        |      |         +-------------+            |            |
+        // |            |        |        |      |         | (VPaddingXs)|            |            |
+        // +------------+--------+--------+------+---------+-------------+------------+------------+  --+
+        // |                                        (VGapL)                                        |    +-- Gap between project items
+        // +---------------------------------------------------------------------------------------+  --+
 
         const bool hovered = option.widget->isActiveWindow()
                              && option.state & QStyle::State_MouseOver;
@@ -651,9 +650,9 @@ public:
 
         const int x = bgR.x();
         const int numberX = x + s(HPaddingXs);
-        const int iconX = numberX + shortcutNumberWidth + s(HGapXxs);
+        const int iconX = numberX + shortcutNumberWidth + s(HGapXs);
         const int iconWidth = iconS.width();
-        const int textX = withIcon() ? iconX + iconWidth + s(HGapXxs) : iconX;
+        const int textX = withIcon() ? iconX + iconWidth + s(HGapXs) : iconX;
         const int textWidth = bgR.width() - s(HPaddingXs) - textX;
 
         const int y = bgR.y();
diff --git a/src/plugins/projectexplorer/projectwizardpage.cpp b/src/plugins/projectexplorer/projectwizardpage.cpp
index d3f60faeae..b3c0bd37d9 100644
--- a/src/plugins/projectexplorer/projectwizardpage.cpp
+++ b/src/plugins/projectexplorer/projectwizardpage.cpp
@@ -32,7 +32,7 @@
 #include <QTextStream>
 
 /*!
-    \class ProjectExplorer::Internal::ProjectWizardPage
+    \class ProjectExplorer::ProjectWizardPage
 
     \brief The ProjectWizardPage class provides a wizard page showing projects
     and version control to add new files to.
@@ -261,6 +261,8 @@ static AddNewTree *buildAddFilesTree(FolderNode *root, const FilePaths &files,
     return new AddNewTree(root, children, root->displayName());
 }
 
+} // namespace Internal
+
 // --------------------------------------------------------------------
 // ProjectWizardPage:
 // --------------------------------------------------------------------
@@ -302,7 +304,7 @@ ProjectWizardPage::ProjectWizardPage(QWidget *parent)
     setProperty(SHORT_TITLE_PROPERTY, Tr::tr("Summary"));
 
     connect(VcsManager::instance(), &VcsManager::configurationChanged,
-            this, &ProjectExplorer::Internal::ProjectWizardPage::initializeVersionControls);
+            this, &ProjectExplorer::ProjectWizardPage::initializeVersionControls);
 
     m_projectComboBox->setModel(&m_model);
 }
@@ -333,14 +335,14 @@ bool ProjectWizardPage::expandTree(const QModelIndex &root)
         m_projectComboBox->view()->collapse(root);
 
     // if we are a high priority node, our *parent* needs to be expanded
-    auto tree = static_cast<AddNewTree *>(root.internalPointer());
+    auto tree = static_cast<Internal::AddNewTree *>(root.internalPointer());
     if (tree && tree->priority() >= 100)
         expand = true;
 
     return expand;
 }
 
-void ProjectWizardPage::setBestNode(AddNewTree *tree)
+void ProjectWizardPage::setBestNode(Internal::AddNewTree *tree)
 {
     QModelIndex index = tree ? m_model.indexForItem(tree) : QModelIndex();
     m_projectComboBox->setCurrentIndex(index);
@@ -458,29 +460,29 @@ void ProjectWizardPage::initializeProjectTree(Node *context, const FilePaths &pa
                                               ProjectAction action)
 {
     m_projectComboBox->disconnect();
-    BestNodeSelector selector(m_commonDirectory, paths);
+    Internal::BestNodeSelector selector(m_commonDirectory, paths);
 
     TreeItem *root = m_model.rootItem();
     root->removeChildren();
     for (Project *project : ProjectManager::projects()) {
         if (ProjectNode *pn = project->rootProjectNode()) {
             if (kind == IWizardFactory::ProjectWizard) {
-                if (AddNewTree *child = buildAddProjectTree(pn, paths.first(), context, &selector))
+                if (Internal::AddNewTree *child = buildAddProjectTree(pn, paths.first(), context, &selector))
                     root->appendChild(child);
             } else {
-                if (AddNewTree *child = buildAddFilesTree(pn, paths, context, &selector))
+                if (Internal::AddNewTree *child = buildAddFilesTree(pn, paths, context, &selector))
                     root->appendChild(child);
             }
         }
     }
     root->sortChildren([](const TreeItem *ti1, const TreeItem *ti2) {
-        return compareNodes(static_cast<const AddNewTree *>(ti1)->node(),
-                            static_cast<const AddNewTree *>(ti2)->node());
+        return Internal::compareNodes(static_cast<const Internal::AddNewTree *>(ti1)->node(),
+                            static_cast<const Internal::AddNewTree *>(ti2)->node());
     });
     root->prependChild(createNoneNode(&selector));
 
     // Set combobox to context node if that appears in the tree:
-    auto predicate = [context](TreeItem *ti) { return static_cast<AddNewTree*>(ti)->node() == context; };
+    auto predicate = [context](TreeItem *ti) { return static_cast<Internal::AddNewTree*>(ti)->node() == context; };
     TreeItem *contextItem = root->findAnyChild(predicate);
     if (contextItem)
         m_projectComboBox->setCurrentIndex(m_model.indexForItem(contextItem));
@@ -600,5 +602,4 @@ void ProjectWizardPage::setProjectUiVisible(bool visible)
     m_projectComboBox->setVisible(visible);
 }
 
-} // namespace Internal
 } // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/projectwizardpage.h b/src/plugins/projectexplorer/projectwizardpage.h
index 90d17dee60..cf5cf42788 100644
--- a/src/plugins/projectexplorer/projectwizardpage.h
+++ b/src/plugins/projectexplorer/projectwizardpage.h
@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include "projectexplorer_export.h"
 #include "projectnodes.h"
 
 #include <coreplugin/generatedfile.h>
@@ -25,9 +26,10 @@ namespace ProjectExplorer {
 namespace Internal {
 
 class AddNewTree;
+}
 
 // Documentation inside.
-class ProjectWizardPage : public Utils::WizardPage
+class PROJECTEXPLORER_EXPORT ProjectWizardPage : public Utils::WizardPage
 {
     Q_OBJECT
 
@@ -87,5 +89,4 @@ private:
     QLabel *m_filesLabel;
 };
 
-} // namespace Internal
 } // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/runconfigurationaspects.cpp b/src/plugins/projectexplorer/runconfigurationaspects.cpp
index 7b6c7f4f5d..c042f081f1 100644
--- a/src/plugins/projectexplorer/runconfigurationaspects.cpp
+++ b/src/plugins/projectexplorer/runconfigurationaspects.cpp
@@ -107,7 +107,7 @@ void TerminalAspect::calculateUseTerminal()
     if (m_userSet)
         return;
     bool useTerminal;
-    switch (ProjectExplorerPlugin::projectExplorerSettings().terminalMode) {
+    switch (projectExplorerSettings().terminalMode) {
     case TerminalMode::On: useTerminal = true; break;
     case TerminalMode::Off: useTerminal = false; break;
     default: useTerminal = m_useTerminalHint;
@@ -737,7 +737,7 @@ UseLibraryPathsAspect::UseLibraryPathsAspect(AspectContainer *container)
         setLabel(Tr::tr("Add build library search path to LD_LIBRARY_PATH"),
                  LabelPlacement::AtCheckBox);
     }
-    setValue(ProjectExplorerPlugin::projectExplorerSettings().addLibraryPathsToRunEnv);
+    setValue(projectExplorerSettings().addLibraryPathsToRunEnv);
 }
 
 
diff --git a/src/plugins/projectexplorer/runcontrol.cpp b/src/plugins/projectexplorer/runcontrol.cpp
index f5f24b05c7..6085a72083 100644
--- a/src/plugins/projectexplorer/runcontrol.cpp
+++ b/src/plugins/projectexplorer/runcontrol.cpp
@@ -1264,6 +1264,7 @@ public:
 
     bool m_stopReported = false;
     bool m_stopForced = false;
+    bool m_suppressDefaultStdOutHandling = false;
 
     void forwardStarted();
     void forwardDone();
@@ -1372,6 +1373,9 @@ void SimpleTargetRunnerPrivate::handleDone()
 
 void SimpleTargetRunnerPrivate::handleStandardOutput()
 {
+    if (m_suppressDefaultStdOutHandling)
+        return;
+
     const QByteArray data = m_process.readAllRawStandardOutput();
     const QString msg = m_outputCodec->toUnicode(
                 data.constData(), data.length(), &m_outputCodecState);
@@ -1380,6 +1384,9 @@ void SimpleTargetRunnerPrivate::handleStandardOutput()
 
 void SimpleTargetRunnerPrivate::handleStandardError()
 {
+    if (m_suppressDefaultStdOutHandling)
+        return;
+
     const QByteArray data = m_process.readAllRawStandardError();
     const QString msg = m_outputCodec->toUnicode(
                 data.constData(), data.length(), &m_errorCodecState);
@@ -1571,6 +1578,16 @@ void SimpleTargetRunner::setProcessMode(Utils::ProcessMode processMode)
     d->m_process.setProcessMode(processMode);
 }
 
+Process *SimpleTargetRunner::process() const
+{
+    return &d->m_process;
+}
+
+void SimpleTargetRunner::suppressDefaultStdOutHandling()
+{
+    d->m_suppressDefaultStdOutHandling = true;
+}
+
 void SimpleTargetRunner::forceRunOnHost()
 {
     const FilePath executable = d->m_command.executable();
@@ -1580,6 +1597,11 @@ void SimpleTargetRunner::forceRunOnHost()
     }
 }
 
+void SimpleTargetRunner::addExtraData(const QString &key, const QVariant &value)
+{
+    d->m_extraData[key] = value;
+}
+
 // RunWorkerPrivate
 
 RunWorkerPrivate::RunWorkerPrivate(RunWorker *runWorker, RunControl *runControl)
diff --git a/src/plugins/projectexplorer/runcontrol.h b/src/plugins/projectexplorer/runcontrol.h
index 629fff8346..9428866436 100644
--- a/src/plugins/projectexplorer/runcontrol.h
+++ b/src/plugins/projectexplorer/runcontrol.h
@@ -27,6 +27,7 @@ class Icon;
 class MacroExpander;
 class OutputLineParser;
 class ProcessRunData;
+class Process;
 } // Utils
 
 namespace ProjectExplorer {
@@ -271,8 +272,11 @@ protected:
     void setEnvironment(const Utils::Environment &environment);
     void setWorkingDirectory(const Utils::FilePath &workingDirectory);
     void setProcessMode(Utils::ProcessMode processMode);
+    Utils::Process *process() const;
 
+    void suppressDefaultStdOutHandling();
     void forceRunOnHost();
+    void addExtraData(const QString &key, const QVariant &value);
 
 private:
     void start() final;
diff --git a/src/plugins/projectexplorer/target.cpp b/src/plugins/projectexplorer/target.cpp
index b4d8a776f8..cae9a01d02 100644
--- a/src/plugins/projectexplorer/target.cpp
+++ b/src/plugins/projectexplorer/target.cpp
@@ -722,7 +722,7 @@ void Target::updateDefaultRunConfigurations()
     configuredCount -= toRemove.count();
 
     bool removeExistingUnconfigured = false;
-    if (ProjectExplorerPlugin::projectExplorerSettings().automaticallyCreateRunConfigurations) {
+    if (projectExplorerSettings().automaticallyCreateRunConfigurations) {
         // Create new "automatic" RCs and put them into newConfigured/newUnconfigured
         for (const RunConfigurationCreationInfo &item : creators) {
             if (item.creationMode == RunConfigurationCreationInfo::ManualCreationOnly)
diff --git a/src/plugins/projectexplorer/userfileaccessor.cpp b/src/plugins/projectexplorer/userfileaccessor.cpp
index a370d80ff6..82e4d0edfb 100644
--- a/src/plugins/projectexplorer/userfileaccessor.cpp
+++ b/src/plugins/projectexplorer/userfileaccessor.cpp
@@ -300,7 +300,7 @@ UserFileAccessor::UserFileAccessor(Project *project)
     secondary->setReadOnly();
     setSecondaryAccessor(std::move(secondary));
 
-    setSettingsId(ProjectExplorerPlugin::projectExplorerSettings().environmentId.toByteArray());
+    setSettingsId(projectExplorerSettings().environmentId.toByteArray());
 
     // Register Upgraders:
     addVersionUpgrader(std::make_unique<UserFileVersion14Upgrader>());
@@ -990,7 +990,7 @@ void ProjectExplorerTest::testUserFileAccessor_prepareToWriteSettings()
 
     QCOMPARE(result.count(), data.count() + 3);
     QCOMPARE(result.value("EnvironmentId").toByteArray(),
-             ProjectExplorerPlugin::projectExplorerSettings().environmentId.toByteArray());
+             projectExplorerSettings().environmentId.toByteArray());
     QCOMPARE(result.value("UserStickyKeys"), QVariant(QStringList({"shared1"})));
     QCOMPARE(result.value("Version").toInt(), accessor.currentVersion());
     QCOMPARE(result.value("ProjectExplorer.Project.Updater.FileVersion").toInt(), accessor.currentVersion());
@@ -1013,7 +1013,7 @@ void ProjectExplorerTest::testUserFileAccessor_mergeSettings()
 
     Store data;
     data.insert("Version", accessor.currentVersion());
-    data.insert("EnvironmentId", ProjectExplorerPlugin::projectExplorerSettings().environmentId.toByteArray());
+    data.insert("EnvironmentId", projectExplorerSettings().environmentId.toByteArray());
     data.insert("UserStickyKeys", QStringList({"shared1"}));
     data.insert("shared1", "bar1");
     data.insert("unique1", 1234);
@@ -1025,7 +1025,7 @@ void ProjectExplorerTest::testUserFileAccessor_mergeSettings()
     QCOMPARE(result.data.count(), data.count() + 1);
     // mergeSettings does not run updateSettings, so no OriginalVersion will be set
     QCOMPARE(result.data.value("EnvironmentId").toByteArray(),
-             ProjectExplorerPlugin::projectExplorerSettings().environmentId.toByteArray()); // unchanged
+             projectExplorerSettings().environmentId.toByteArray()); // unchanged
     QCOMPARE(result.data.value("UserStickyKeys"), QVariant(QStringList({"shared1"}))); // unchanged
     QCOMPARE(result.data.value("Version").toInt(), accessor.currentVersion()); // forced
     QCOMPARE(result.data.value("shared1"), data.value("shared1")); // from data
@@ -1066,7 +1066,7 @@ void ProjectExplorerTest::testUserFileAccessor_mergeSettingsEmptyShared()
     Store data;
     data.insert("Version", accessor.currentVersion());
     data.insert("OriginalVersion", accessor.currentVersion());
-    data.insert("EnvironmentId", ProjectExplorerPlugin::projectExplorerSettings().environmentId.toByteArray());
+    data.insert("EnvironmentId", projectExplorerSettings().environmentId.toByteArray());
     data.insert("UserStickyKeys", QStringList({"shared1"}));
     data.insert("shared1", "bar1");
     data.insert("unique1", 1234);
diff --git a/src/plugins/python/pipsupport.cpp b/src/plugins/python/pipsupport.cpp
index 8723ca7510..673dbdccf3 100644
--- a/src/plugins/python/pipsupport.cpp
+++ b/src/plugins/python/pipsupport.cpp
@@ -66,18 +66,21 @@ void PipInstallTask::run()
         emit finished(false);
         return;
     }
-    const QString taskTitle = Tr::tr("Install Python Packages");
-    Core::ProgressManager::addTask(m_future.future(), taskTitle, pipInstallTaskId);
+    QString operation = Tr::tr("Install");
+    QString operant;
     QStringList arguments = {"-m", "pip", "install"};
-    if (!m_requirementsFile.isEmpty())
+    if (!m_requirementsFile.isEmpty()) {
+        operant = Tr::tr("Requirements");
         arguments << "-r" << m_requirementsFile.toString();
-    else {
+    } else {
+
         for (const PipPackage &package : m_packages) {
             QString pipPackage = package.packageName;
             if (!package.version.isEmpty())
                 pipPackage += "==" + package.version;
             arguments << pipPackage;
         }
+        operant = m_packages.count() == 1 ? m_packages.first().displayName : Tr::tr("Packages");
     }
 
     if (!m_targetPath.isEmpty()) {
@@ -87,10 +90,17 @@ void PipInstallTask::run()
         arguments << "--user"; // add --user to global pythons, but skip it for venv pythons
     }
 
+    if (m_upgrade) {
+        arguments << "--upgrade";
+        operation = Tr::tr("Update");
+    }
+
     m_process.setCommand({m_python, arguments});
-    m_process.setTerminalMode(TerminalMode::Run);
+    m_process.setTerminalMode(m_silent ? TerminalMode::Off : TerminalMode::Run);
     m_process.start();
 
+    const QString taskTitle = Tr::tr("%1 %2").arg(operation).arg(operant);
+    Core::ProgressManager::addTask(m_future.future(), taskTitle, pipInstallTaskId);
     Core::MessageManager::writeSilently(
         Tr::tr("Running \"%1\" to install %2.")
             .arg(m_process.commandLine().toUserOutput(), packagesDisplayName()));
@@ -143,6 +153,16 @@ QString PipInstallTask::packagesDisplayName() const
                : m_requirementsFile.toUserOutput();
 }
 
+void PipInstallTask::setUpgrade(bool upgrade)
+{
+    m_upgrade = upgrade;
+}
+
+void PipInstallTask::setSilent(bool silent)
+{
+    m_silent = silent;
+}
+
 void PipPackageInfo::parseField(const QString &field, const QStringList &data)
 {
     if (field.isEmpty())
diff --git a/src/plugins/python/pipsupport.h b/src/plugins/python/pipsupport.h
index da217282eb..35e6e765aa 100644
--- a/src/plugins/python/pipsupport.h
+++ b/src/plugins/python/pipsupport.h
@@ -68,6 +68,8 @@ public:
     void addPackage(const PipPackage &package);
     void setPackages(const QList<PipPackage> &packages);
     void setTargetPath(const Utils::FilePath &targetPath);
+    void setUpgrade(bool upgrade);
+    void setSilent(bool silent);
     void run();
 
 signals:
@@ -86,6 +88,8 @@ private:
     Utils::FilePath m_requirementsFile;
     Utils::FilePath m_targetPath;
     Utils::Process m_process;
+    bool m_upgrade = false;
+    bool m_silent = false;
     QFutureInterface<void> m_future;
     QFutureWatcher<void> m_watcher;
     QTimer m_killTimer;
diff --git a/src/plugins/python/pyside.cpp b/src/plugins/python/pyside.cpp
index 79ffb8b951..7010e099ff 100644
--- a/src/plugins/python/pyside.cpp
+++ b/src/plugins/python/pyside.cpp
@@ -4,9 +4,13 @@
 #include "pyside.h"
 
 #include "pipsupport.h"
+#include "pythonbuildconfiguration.h"
+#include "pythonconstants.h"
+#include "pythonproject.h"
 #include "pythontr.h"
 #include "pythonutils.h"
 
+#include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/icore.h>
 
 #include <projectexplorer/runconfigurationaspects.h>
@@ -19,8 +23,9 @@
 #include <utils/algorithm.h>
 #include <utils/async.h>
 #include <utils/infobar.h>
-#include <utils/qtcprocess.h>
+#include <utils/mimeconstants.h>
 #include <utils/qtcassert.h>
+#include <utils/qtcprocess.h>
 
 #include <QBoxLayout>
 #include <QComboBox>
@@ -39,13 +44,13 @@ void PySideInstaller::checkPySideInstallation(const FilePath &python,
                                               TextEditor::TextDocument *document)
 {
     document->infoBar()->removeInfo(installPySideInfoBarId);
-    if (QPointer<QFutureWatcher<bool>> watcher = pySideInstaller().m_futureWatchers.value(document))
+    if (QPointer<QFutureWatcher<bool>> watcher = m_futureWatchers.value(document))
         watcher->cancel();
     if (!python.exists())
         return;
-    const QString pySide = importedPySide(document->plainText());
+    const QString pySide = usedPySide(document->plainText(), document->mimeType());
     if (pySide == "PySide2" || pySide == "PySide6")
-        pySideInstaller().runPySideChecker(python, pySide, document);
+        runPySideChecker(python, pySide, document);
 }
 
 bool PySideInstaller::missingPySideInstallation(const FilePath &pythonPath,
@@ -65,15 +70,25 @@ bool PySideInstaller::missingPySideInstallation(const FilePath &pythonPath,
     return missing;
 }
 
-QString PySideInstaller::importedPySide(const QString &text)
+QString PySideInstaller::usedPySide(const QString &text, const QString &mimeType)
 {
-    static QRegularExpression importScanner("^\\s*(import|from)\\s+(PySide\\d)",
-                                            QRegularExpression::MultilineOption);
-    const QRegularExpressionMatch match = importScanner.match(text);
-    return match.captured(2);
+    using namespace Python::Constants;
+    if (mimeType == C_PY_MIMETYPE || mimeType == C_PY3_MIMETYPE || mimeType == C_PY_GUI_MIMETYPE) {
+        static QRegularExpression
+            scanner("^\\s*(import|from)\\s+(PySide\\d)", QRegularExpression::MultilineOption);
+        const QRegularExpressionMatch match = scanner.match(text);
+        return match.captured(2);
+    }
+    if (mimeType == Utils::Constants::QML_MIMETYPE)
+        return QStringLiteral("PySide6"); // Good enough for now.
+    return {};
 }
 
-PySideInstaller::PySideInstaller() = default;
+PySideInstaller::PySideInstaller()
+{
+    connect(Core::EditorManager::instance(), &Core::EditorManager::documentOpened,
+            this, &PySideInstaller::handleDocumentOpened);
+}
 
 void PySideInstaller::installPyside(const FilePath &python,
                                     const QString &pySide,
@@ -191,6 +206,30 @@ void PySideInstaller::handlePySideMissing(const FilePath &python,
     document->infoBar()->addInfo(info);
 }
 
+void PySideInstaller::handleDocumentOpened(Core::IDocument *document)
+{
+    if (document->mimeType() != Utils::Constants::QML_MIMETYPE)
+        return;
+
+    TextEditor::TextDocument *textDocument = qobject_cast<TextEditor::TextDocument *>(document);
+    if (!textDocument)
+        return;
+    PythonProject *project = pythonProjectForFile(textDocument->filePath());
+    if (!project)
+        return;
+    Target *target = project->activeTarget();
+    if (!target)
+        return;
+    BuildConfiguration *buildConfig = target->activeBuildConfiguration();
+    if (!buildConfig)
+        return;
+    auto *pythonBuildConfig = qobject_cast<PythonBuildConfiguration *>(buildConfig);
+    if (!pythonBuildConfig)
+        return;
+
+    PySideInstaller::instance().checkPySideInstallation(pythonBuildConfig->python(), textDocument);
+}
+
 void PySideInstaller::runPySideChecker(const FilePath &python,
                                        const QString &pySide,
                                        TextEditor::TextDocument *document)
@@ -217,7 +256,7 @@ void PySideInstaller::runPySideChecker(const FilePath &python,
     m_futureWatchers[document] = watcher;
 }
 
-PySideInstaller &pySideInstaller()
+PySideInstaller &PySideInstaller::instance()
 {
     static PySideInstaller thePySideInstaller;
     return thePySideInstaller;
diff --git a/src/plugins/python/pyside.h b/src/plugins/python/pyside.h
index 237b812d3c..3df882acf1 100644
--- a/src/plugins/python/pyside.h
+++ b/src/plugins/python/pyside.h
@@ -10,6 +10,7 @@
 #include <QPointer>
 #include <QTextDocument>
 
+namespace Core { class IDocument; }
 namespace TextEditor { class TextDocument; }
 namespace ProjectExplorer { class RunConfiguration; }
 
@@ -27,32 +28,30 @@ class PySideInstaller : public QObject
     Q_OBJECT
 
 public:
-    static void checkPySideInstallation(const Utils::FilePath &python,
-                                        TextEditor::TextDocument *document);
+    void checkPySideInstallation(const Utils::FilePath &python, TextEditor::TextDocument *document);
+    static PySideInstaller &instance();
 
 signals:
     void pySideInstalled(const Utils::FilePath &python, const QString &pySide);
 
 private:
     PySideInstaller();
-    friend PySideInstaller &pySideInstaller();
 
     void installPyside(const Utils::FilePath &python,
                        const QString &pySide, TextEditor::TextDocument *document);
     void handlePySideMissing(const Utils::FilePath &python,
                              const QString &pySide,
                              TextEditor::TextDocument *document);
+    void handleDocumentOpened(Core::IDocument *document);
 
     void runPySideChecker(const Utils::FilePath &python,
                           const QString &pySide,
                           TextEditor::TextDocument *document);
     static bool missingPySideInstallation(const Utils::FilePath &python, const QString &pySide);
-    static QString importedPySide(const QString &text);
+    static QString usedPySide(const QString &text, const QString &mimeType);
 
     QHash<Utils::FilePath, QList<TextEditor::TextDocument *>> m_infoBarEntries;
     QHash<TextEditor::TextDocument *, QPointer<QFutureWatcher<bool>>> m_futureWatchers;
 };
 
-PySideInstaller &pySideInstaller();
-
 } // Python::Internal
diff --git a/src/plugins/python/pythonbuildconfiguration.cpp b/src/plugins/python/pythonbuildconfiguration.cpp
index d13e8cbc6a..1255af1442 100644
--- a/src/plugins/python/pythonbuildconfiguration.cpp
+++ b/src/plugins/python/pythonbuildconfiguration.cpp
@@ -37,6 +37,7 @@
 #include <utils/detailswidget.h>
 #include <utils/futuresynchronizer.h>
 #include <utils/layoutbuilder.h>
+#include <utils/mimeconstants.h>
 #include <utils/qtcprocess.h>
 
 using namespace ProjectExplorer;
@@ -265,7 +266,7 @@ PythonBuildConfiguration::PythonBuildConfiguration(Target *target, const Id &id)
 
     updateCacheAndEmitEnvironmentChanged();
 
-    connect(&pySideInstaller(),
+    connect(&PySideInstaller::instance(),
             &PySideInstaller::pySideInstalled,
             this,
             &PythonBuildConfiguration::handlePythonUpdated);
@@ -273,13 +274,7 @@ PythonBuildConfiguration::PythonBuildConfiguration(Target *target, const Id &id)
     auto update = [this] {
         if (isActive()) {
             m_buildSystem->emitBuildSystemUpdated();
-            const FilePaths files = project()->files(Project::AllFiles);
-            for (const FilePath &file : files) {
-                if (auto doc = qobject_cast<PythonDocument *>(
-                        Core::DocumentModel::documentForFilePath(file))) {
-                    doc->updatePython(m_python);
-                }
-            }
+            updateDocuments();
         }
     };
     connect(target, &Target::activeBuildConfigurationChanged, this, update);
@@ -338,16 +333,23 @@ void PythonBuildConfiguration::updatePython(const FilePath &python)
     m_python = python;
     if (auto buildStep = buildSteps()->firstOfType<PySideBuildStep>())
         buildStep->checkForPySide(python);
+    updateDocuments();
+    m_buildSystem->requestParse();
+}
+
+void PythonBuildConfiguration::updateDocuments()
+{
     if (isActive()) {
         const FilePaths files = project()->files(Project::AllFiles);
         for (const FilePath &file : files) {
-            if (auto doc = qobject_cast<PythonDocument *>(
-                    Core::DocumentModel::documentForFilePath(file))) {
-                doc->updatePython(m_python);
+            if (auto doc = TextEditor::TextDocument::textDocumentForFilePath(file)) {
+                if (auto pyDoc = qobject_cast<PythonDocument *>(doc))
+                    pyDoc->updatePython(m_python);
+                else if (doc->mimeType() == Utils::Constants::QML_MIMETYPE)
+                    PySideInstaller::instance().checkPySideInstallation(m_python, doc);
             }
         }
     }
-    m_buildSystem->requestParse();
 }
 
 void PythonBuildConfiguration::handlePythonUpdated(const FilePath &python)
diff --git a/src/plugins/python/pythonbuildconfiguration.h b/src/plugins/python/pythonbuildconfiguration.h
index 61b87b4c67..9696722d0b 100644
--- a/src/plugins/python/pythonbuildconfiguration.h
+++ b/src/plugins/python/pythonbuildconfiguration.h
@@ -64,6 +64,7 @@ private:
     void initialize(const ProjectExplorer::BuildInfo &info);
     void updateInterpreter(const std::optional<ProjectExplorer::Interpreter> &python);
     void updatePython(const Utils::FilePath &python);
+    void updateDocuments();
     void handlePythonUpdated(const Utils::FilePath &python);
 
     Utils::FilePath m_python;
diff --git a/src/plugins/python/pythoneditor.cpp b/src/plugins/python/pythoneditor.cpp
index ddd30f2acf..64ad03052d 100644
--- a/src/plugins/python/pythoneditor.cpp
+++ b/src/plugins/python/pythoneditor.cpp
@@ -27,7 +27,6 @@
 #include <projectexplorer/target.h>
 
 #include <texteditor/texteditor.h>
-#include <texteditor/texteditoractionhandler.h>
 
 #include <utils/stylehelper.h>
 
@@ -304,7 +303,7 @@ void PythonDocument::updateCurrentPython()
 void PythonDocument::updatePython(const FilePath &python)
 {
     openDocumentWithPython(python, this);
-    PySideInstaller::checkPySideInstallation(python, this);
+    PySideInstaller::instance().checkPySideInstallation(python, this);
     emit pythonUpdated(python);
 }
 
@@ -317,10 +316,10 @@ public:
         setDisplayName(::Core::Tr::tr(Constants::C_EDITOR_DISPLAY_NAME));
         addMimeType(Constants::C_PY_MIMETYPE);
 
-        setEditorActionHandlers(TextEditorActionHandler::Format
-                                | TextEditorActionHandler::UnCommentSelection
-                                | TextEditorActionHandler::UnCollapseAll
-                                | TextEditorActionHandler::FollowSymbolUnderCursor);
+        setOptionalActionMask(OptionalActions::Format
+                                | OptionalActions::UnCommentSelection
+                                | OptionalActions::UnCollapseAll
+                                | OptionalActions::FollowSymbolUnderCursor);
 
         setDocumentCreator([]() { return new PythonDocument; });
         setEditorWidgetCreator([]() { return new PythonEditorWidget; });
diff --git a/src/plugins/python/pythonlanguageclient.cpp b/src/plugins/python/pythonlanguageclient.cpp
index 86cebde0e9..2379ffb1a1 100644
--- a/src/plugins/python/pythonlanguageclient.cpp
+++ b/src/plugins/python/pythonlanguageclient.cpp
@@ -46,14 +46,17 @@ using namespace Utils;
 namespace Python::Internal {
 
 static constexpr char installPylsInfoBarId[] = "Python::InstallPyls";
+static constexpr char updatePylsInfoBarId[] = "Python::updatePyls";
+static constexpr char alwaysUpdateKey[] = "Python/AlwaysUpdatePyls";
 
 class PythonLanguageServerState
 {
 public:
     enum {
-        CanNotBeInstalled,
-        CanBeInstalled,
-        AlreadyInstalled
+        NotInstallable,
+        Installable,
+        Updatable,
+        Installed
     } state;
     FilePath pylsModulePath;
 };
@@ -79,18 +82,40 @@ static PythonLanguageServerState checkPythonLanguageServer(const FilePath &pytho
     using namespace LanguageClient;
     auto lspPath = pyLspPath(python);
     if (lspPath.isEmpty())
-        return {PythonLanguageServerState::CanNotBeInstalled, FilePath()};
-
-    if (lspPath.pathAppended("bin").pathAppended("pylsp").withExecutableSuffix().exists())
-        return {PythonLanguageServerState::AlreadyInstalled, lspPath};
+        return {PythonLanguageServerState::NotInstallable, FilePath()};
 
     Process pythonProcess;
     pythonProcess.setCommand({python, {"-m", "pip", "-V"}});
     using namespace std::chrono_literals;
     pythonProcess.runBlocking(2s);
-    if (pythonProcess.allOutput().startsWith("pip "))
-        return {PythonLanguageServerState::CanBeInstalled, lspPath};
-    return {PythonLanguageServerState::CanNotBeInstalled, FilePath()};
+    bool pipAvailable = pythonProcess.allOutput().startsWith("pip ");
+
+    if (lspPath.pathAppended("bin").pathAppended("pylsp").withExecutableSuffix().exists()) {
+        if (pipAvailable) {
+            Process pythonProcess;
+            Environment env = pythonProcess.environment();
+            env.set("PYTHONPATH", lspPath.toUserOutput());
+            pythonProcess.setEnvironment(env);
+            pythonProcess.setCommand({python, {"-m", "pip", "list", "--outdated", "--format=json"}});
+            pythonProcess.runBlocking(20s);
+            QString output = pythonProcess.allOutput();
+
+            // Only the first line contains the json data. Following lines might contain warnings.
+            if (int index = output.indexOf('\n'); index >= 0)
+                output.truncate(index);
+
+            const QJsonDocument doc = QJsonDocument::fromJson(output.toUtf8());
+            for (const QJsonValue &value : doc.array()) {
+                if (value.toObject().value("name") == "python-lsp-server")
+                    return {PythonLanguageServerState::Updatable, lspPath};
+            }
+        }
+        return {PythonLanguageServerState::Installed, lspPath};
+    }
+
+    if (pipAvailable)
+        return {PythonLanguageServerState::Installable, lspPath};
+    return {PythonLanguageServerState::NotInstallable, FilePath()};
 }
 
 
@@ -256,23 +281,25 @@ class PyLSConfigureAssistant : public QObject
 public:
     PyLSConfigureAssistant();
 
-    void handlePyLSState(const Utils::FilePath &python,
+    void handlePyLSState(const FilePath &python,
                          const PythonLanguageServerState &state,
                          TextEditor::TextDocument *document);
     void resetEditorInfoBar(TextEditor::TextDocument *document);
-    void installPythonLanguageServer(const Utils::FilePath &python,
+    void installPythonLanguageServer(const FilePath &python,
                                      QPointer<TextEditor::TextDocument> document,
-                                     const Utils::FilePath &pylsPath);
+                                     const FilePath &pylsPath, bool silent, bool upgrade);
     void openDocument(const FilePath &python, TextEditor::TextDocument *document);
 
-    QHash<Utils::FilePath, QList<TextEditor::TextDocument *>> m_infoBarEntries;
+    QHash<FilePath, QList<TextEditor::TextDocument *>> m_infoBarEntries;
     QHash<TextEditor::TextDocument *, QPointer<QFutureWatcher<PythonLanguageServerState>>>
         m_runningChecks;
 };
 
 void PyLSConfigureAssistant::installPythonLanguageServer(const FilePath &python,
                                                          QPointer<TextEditor::TextDocument> document,
-                                                         const FilePath &pylsPath)
+                                                         const FilePath &pylsPath,
+                                                         bool silent,
+                                                         bool upgrade)
 {
     document->infoBar()->removeInfo(installPylsInfoBarId);
 
@@ -299,6 +326,8 @@ void PyLSConfigureAssistant::installPythonLanguageServer(const FilePath &python,
 
     install->setTargetPath(pylsPath);
     install->setPackages({PipPackage{"python-lsp-server[all]", "Python Language Server"}});
+    install->setUpgrade(upgrade);
+    install->setSilent(silent);
     install->run();
 }
 
@@ -342,24 +371,55 @@ void PyLSConfigureAssistant::handlePyLSState(const FilePath &python,
                                              const PythonLanguageServerState &state,
                                              TextEditor::TextDocument *document)
 {
-    if (state.state == PythonLanguageServerState::CanNotBeInstalled)
+    if (state.state == PythonLanguageServerState::NotInstallable)
         return;
 
-    Utils::InfoBar *infoBar = document->infoBar();
-    if (state.state == PythonLanguageServerState::CanBeInstalled
+    InfoBar *infoBar = document->infoBar();
+    if (state.state == PythonLanguageServerState::Installable
         && infoBar->canInfoBeAdded(installPylsInfoBarId)) {
         auto message = Tr::tr("Install Python language server (PyLS) for %1 (%2). "
                               "The language server provides Python specific completion and annotation.")
                            .arg(pythonName(python), python.toUserOutput());
-        Utils::InfoBarEntry info(installPylsInfoBarId,
-                                 message,
-                                 Utils::InfoBarEntry::GlobalSuppression::Enabled);
+        InfoBarEntry info(installPylsInfoBarId, message, InfoBarEntry::GlobalSuppression::Enabled);
         info.addCustomButton(Tr::tr("Install"), [this, python, document, state] {
-            installPythonLanguageServer(python, document, state.pylsModulePath);
+            installPythonLanguageServer(python, document, state.pylsModulePath, false, false);
         });
         infoBar->addInfo(info);
         m_infoBarEntries[python] << document;
-    } else if (state.state == PythonLanguageServerState::AlreadyInstalled) {
+    } else if (state.state == PythonLanguageServerState::Updatable) {
+        if (infoBar->canInfoBeAdded(updatePylsInfoBarId)) {
+            auto message = Tr::tr("Update Python language server (PyLS) for %1 (%2).")
+                               .arg(pythonName(python), python.toUserOutput());
+            InfoBarEntry info(updatePylsInfoBarId, message);
+            info.addCustomButton(Tr::tr("Always Update"), [this, python, document, state] {
+                document->infoBar()->removeInfo(updatePylsInfoBarId);
+                Core::ICore::settings()->setValue(alwaysUpdateKey, true);
+                InfoBar::globallySuppressInfo(updatePylsInfoBarId);
+                installPythonLanguageServer(python, document, state.pylsModulePath, false, true);
+            });
+            info.addCustomButton(Tr::tr("Update"), [this, python, document, state] {
+                document->infoBar()->removeInfo(updatePylsInfoBarId);
+                installPythonLanguageServer(python, document, state.pylsModulePath, false, true);
+            });
+            info.addCustomButton(Tr::tr("Never"), [document, python] {
+                document->infoBar()->removeInfo(updatePylsInfoBarId);
+                InfoBar::globallySuppressInfo(updatePylsInfoBarId);
+                if (auto client = clientForPython(python))
+                    LanguageClientManager::openDocumentWithClient(document, client);
+            });
+            info.setCancelButtonInfo([python, document]{
+                if (auto client = clientForPython(python))
+                    LanguageClientManager::openDocumentWithClient(document, client);
+            });
+            infoBar->addInfo(info);
+
+            m_infoBarEntries[python] << document;
+        } else if (Core::ICore::settings()->value(alwaysUpdateKey, false).toBool()) {
+            installPythonLanguageServer(python, document, state.pylsModulePath, true, true);
+        } else if (auto client = clientForPython(python)) {
+            LanguageClientManager::openDocumentWithClient(document, client);
+        }
+    } else if (state.state == PythonLanguageServerState::Installed) {
         if (auto client = clientForPython(python))
             LanguageClientManager::openDocumentWithClient(document, client);
     }
diff --git a/src/plugins/python/pythonproject.cpp b/src/plugins/python/pythonproject.cpp
index db0831005f..ed81e8cc8b 100644
--- a/src/plugins/python/pythonproject.cpp
+++ b/src/plugins/python/pythonproject.cpp
@@ -33,9 +33,8 @@ Tasks PythonProject::projectIssues(const Kit *k) const
 {
     if (PythonKitAspect::python(k))
         return {};
-    return {
-        BuildSystemTask{Task::Error,
-                        Tr::tr("No Python interpreter set for kit \"%1\"").arg(k->displayName())}};
+    return {BuildSystemTask{
+        Task::Error, Tr::tr("No Python interpreter set for kit \"%1\".").arg(k->displayName())}};
 }
 
 PythonProjectNode::PythonProjectNode(const FilePath &path)
diff --git a/src/plugins/python/pythonsettings.cpp b/src/plugins/python/pythonsettings.cpp
index 8d30659f31..cad296ae5d 100644
--- a/src/plugins/python/pythonsettings.cpp
+++ b/src/plugins/python/pythonsettings.cpp
@@ -404,7 +404,6 @@ static const QStringList &plugins()
                                      "pydocstyle",
                                      "pyflakes",
                                      "pylint",
-                                     "rope_completion",
                                      "yapf"};
     return plugins;
 }
@@ -610,7 +609,6 @@ static QString defaultPylsConfiguration()
         plugins.insert("pydocstyle", disabled);
         plugins.insert("pyflakes", enabled);
         plugins.insert("pylint", disabled);
-        plugins.insert("rope_completion", enabled);
         plugins.insert("yapf", enabled);
         QJsonObject pylsp;
         pylsp.insert("plugins", plugins);
diff --git a/src/plugins/python/pythonutils.cpp b/src/plugins/python/pythonutils.cpp
index bf97831cad..2e4cd4ed58 100644
--- a/src/plugins/python/pythonutils.cpp
+++ b/src/plugins/python/pythonutils.cpp
@@ -158,11 +158,11 @@ QString pythonName(const FilePath &pythonPath)
     return name;
 }
 
-PythonProject *pythonProjectForFile(const FilePath &pythonFile)
+PythonProject *pythonProjectForFile(const FilePath &file)
 {
     for (Project *project : ProjectManager::projects()) {
         if (auto pythonProject = qobject_cast<PythonProject *>(project)) {
-            if (pythonProject->isKnownFile(pythonFile))
+            if (pythonProject->isKnownFile(file))
                 return pythonProject;
         }
     }
diff --git a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp
index 6cf4cc7e31..2bea6158d7 100644
--- a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp
+++ b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp
@@ -44,8 +44,7 @@ static FilePath defaultBuildDirectory(const FilePath &projectFilePath, const Kit
 {
     const QString projectName = projectFilePath.completeBaseName();
     return BuildConfiguration::buildDirectoryFromTemplate(
-                Project::projectDirectory(projectFilePath),
-                projectFilePath, projectName, k, bcName, buildType, "qbs");
+        projectFilePath.absolutePath(), projectFilePath, projectName, k, bcName, buildType, "qbs");
 }
 
 // ---------------------------------------------------------------------------
diff --git a/src/plugins/qbsprojectmanager/qbsprojectimporter.cpp b/src/plugins/qbsprojectmanager/qbsprojectimporter.cpp
index 71e25aa405..4e31b8d765 100644
--- a/src/plugins/qbsprojectmanager/qbsprojectimporter.cpp
+++ b/src/plugins/qbsprojectmanager/qbsprojectimporter.cpp
@@ -74,8 +74,13 @@ static FilePath buildDir(const FilePath &projectFilePath, const Kit *k)
 {
     const QString projectName = projectFilePath.completeBaseName();
     return BuildConfiguration::buildDirectoryFromTemplate(
-                Project::projectDirectory(projectFilePath),
-                projectFilePath, projectName, k, QString(), BuildConfiguration::Unknown, "qbs");
+        projectFilePath.absolutePath(),
+        projectFilePath,
+        projectName,
+        k,
+        QString(),
+        BuildConfiguration::Unknown,
+        "qbs");
 }
 
 static bool hasBuildGraph(const FilePath &dir)
diff --git a/src/plugins/qmakeprojectmanager/profileeditor.cpp b/src/plugins/qmakeprojectmanager/profileeditor.cpp
index c510e13901..8b86a58b4b 100644
--- a/src/plugins/qmakeprojectmanager/profileeditor.cpp
+++ b/src/plugins/qmakeprojectmanager/profileeditor.cpp
@@ -19,7 +19,6 @@
 #include <projectexplorer/target.h>
 
 #include <texteditor/textdocument.h>
-#include <texteditor/texteditoractionhandler.h>
 
 #include <utils/fsengine/fileiconprovider.h>
 #include <utils/mimeconstants.h>
@@ -273,8 +272,8 @@ ProFileEditorFactory::ProFileEditorFactory()
     setCompletionAssistProvider(completionAssistProvider);
 
     setCommentDefinition(CommentDefinition::HashStyle);
-    setEditorActionHandlers(TextEditorActionHandler::UnCommentSelection
-                | TextEditorActionHandler::JumpToFileUnderCursor);
+    setOptionalActionMask(OptionalActions::UnCommentSelection
+                | OptionalActions::JumpToFileUnderCursor);
 
     addHoverHandler(new ProFileHoverHandler);
     setSyntaxHighlighterCreator([]() { return new ProFileHighlighter; });
diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
index 541e848c1f..44cceab6c1 100644
--- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
@@ -73,7 +73,7 @@ FilePath QmakeBuildConfiguration::shadowBuildDirectory(const FilePath &proFilePa
         return {};
 
     const QString projectName = proFilePath.completeBaseName();
-    return buildDirectoryFromTemplate(Project::projectDirectory(proFilePath), proFilePath,
+    return buildDirectoryFromTemplate(proFilePath.absolutePath(), proFilePath,
                                       projectName, k, suffix, buildType, "qmake");
 }
 
diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp
index 9dd3fa079b..c2f2d2c6e2 100644
--- a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp
@@ -36,7 +36,6 @@
 #include <projectexplorer/projectexplorericons.h>
 
 #include <texteditor/texteditor.h>
-#include <texteditor/texteditoractionhandler.h>
 #include <texteditor/texteditorconstants.h>
 
 #include <utils/action.h>
diff --git a/src/plugins/qmldesigner/.clang-format b/src/plugins/qmldesigner/.clang-format
index d3695ac298..366f82f76f 100644
--- a/src/plugins/qmldesigner/.clang-format
+++ b/src/plugins/qmldesigner/.clang-format
@@ -2,6 +2,7 @@ Language:        Cpp
 AccessModifierOffset: -4
 AlignEscapedNewlines: DontAlign
 AllowShortFunctionsOnASingleLine: Inline
+AlwaysBreakTemplateDeclarations: true # use with clang 19
 BinPackArguments: false
 BinPackParameters: false
 BraceWrapping:
@@ -15,6 +16,7 @@ BreakBeforeBinaryOperators: All
 BreakBeforeBraces: Custom
 BreakConstructorInitializers: BeforeComma
 BreakInheritanceList: AfterComma
+# BreakTemplateDeclarations: Yes # use with clang 19
 ColumnLimit:    100
 IncludeCategories:
   - Regex:           'Q.*'
diff --git a/src/plugins/qmldesigner/CMakeLists.txt b/src/plugins/qmldesigner/CMakeLists.txt
index b5b64bebbc..0b0075915f 100644
--- a/src/plugins/qmldesigner/CMakeLists.txt
+++ b/src/plugins/qmldesigner/CMakeLists.txt
@@ -8,7 +8,6 @@ if (APPLE)
   set(QmlDesignerPluginInstallPrefix "${IDE_PLUGIN_PATH}/QmlDesigner")
 endif()
 
-add_compile_options("$<$<COMPILE_LANG_AND_ID:CXX,Clang,GNU>:-Wno-error=maybe-uninitialized>")
 
 set(BUILD_NOT_DESIGNSTUDIO NOT ${BUILD_NOT_DESIGNSTUDIO})
 option(QTC_USE_QML_DESIGNER_LITE "Use Qml Designer Lite" ${BUILD_NOT_DESIGNSTUDIO})
@@ -46,6 +45,11 @@ add_qtc_library(QmlDesignerUtils STATIC
     qmldesignerutils_global.h
 )
 
+if (TARGET QmlDesignerUtils)
+    target_compile_options(QmlDesignerUtils PUBLIC $<$<COMPILE_LANG_AND_ID:CXX,Clang,GNU>:-Wno-error=maybe-uninitialized>)
+    target_compile_options(QmlDesignerUtils PUBLIC $<$<COMPILE_LANG_AND_ID:CXX,Clang>:-Wno-unneeded-internal-declaration>)
+endif()
+
 extend_qtc_library(QmlDesignerUtils
     CONDITION ENABLE_COMPILE_WARNING_AS_ERROR
     PROPERTIES COMPILE_WARNING_AS_ERROR ON
@@ -91,6 +95,8 @@ add_qtc_library(QmlDesignerCore STATIC
   SOURCES
     rewritertransaction.cpp
     rewritertransaction.h
+    generatedcomponentutils.cpp
+    generatedcomponentutils.h
 )
 
 extend_qtc_library(QmlDesignerCore
@@ -631,6 +637,7 @@ extend_qtc_plugin(QmlDesigner
     svgpasteaction.cpp svgpasteaction.h
     viewmanager.cpp viewmanager.h
     utils3d.cpp utils3d.h
+    dialogutils.cpp dialogutils.h
 )
 
 extend_qtc_plugin(QmlDesigner
@@ -822,6 +829,7 @@ extend_qtc_plugin(QmlDesigner
     contentlibraryeffect.cpp contentlibraryeffect.h
     contentlibraryeffectscategory.cpp contentlibraryeffectscategory.h
     contentlibraryeffectsmodel.cpp contentlibraryeffectsmodel.h
+    contentlibraryusermodel.cpp contentlibraryusermodel.h
 )
 
 extend_qtc_plugin(QmlDesigner
diff --git a/src/plugins/qmldesigner/components/assetslibrary/assetslibraryiconprovider.cpp b/src/plugins/qmldesigner/components/assetslibrary/assetslibraryiconprovider.cpp
index dc5a1c9741..b821cc6595 100644
--- a/src/plugins/qmldesigner/components/assetslibrary/assetslibraryiconprovider.cpp
+++ b/src/plugins/qmldesigner/components/assetslibrary/assetslibraryiconprovider.cpp
@@ -2,9 +2,8 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "assetslibraryiconprovider.h"
-#include "asset.h"
-#include "modelnodeoperations.h"
 
+#include <modelnodeoperations.h>
 #include <theme.h>
 #include <utils/hdrimage.h>
 #include <utils/ktximage.h>
diff --git a/src/plugins/qmldesigner/components/assetslibrary/assetslibraryiconprovider.h b/src/plugins/qmldesigner/components/assetslibrary/assetslibraryiconprovider.h
index fb38605ea6..d52779232f 100644
--- a/src/plugins/qmldesigner/components/assetslibrary/assetslibraryiconprovider.h
+++ b/src/plugins/qmldesigner/components/assetslibrary/assetslibraryiconprovider.h
@@ -3,12 +3,11 @@
 
 #pragma once
 
+#include <asset.h>
 #include <synchronousimagecache.h>
 
 #include <QQuickImageProvider>
 
-#include "asset.h"
-
 namespace QmlDesigner {
 
 struct Thumbnail
diff --git a/src/plugins/qmldesigner/components/assetslibrary/assetslibrarymodel.cpp b/src/plugins/qmldesigner/components/assetslibrary/assetslibrarymodel.cpp
index c2359409eb..9d09f52d8f 100644
--- a/src/plugins/qmldesigner/components/assetslibrary/assetslibrarymodel.cpp
+++ b/src/plugins/qmldesigner/components/assetslibrary/assetslibrarymodel.cpp
@@ -1,21 +1,19 @@
 // Copyright (C) 2022 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#include <QCheckBox>
-#include <QFileInfo>
-#include <QFileSystemModel>
-#include <QMessageBox>
-#include <QSortFilterProxyModel>
-
-#include "asset.h"
 #include "assetslibrarymodel.h"
 
+#include <asset.h>
 #include <modelnodeoperations.h>
 #include <qmldesignerplugin.h>
 
 #include <coreplugin/icore.h>
 #include <utils/algorithm.h>
-#include <utils/qtcassert.h>
+#include <utils/filesystemwatcher.h>
+
+#include <QFileInfo>
+#include <QFileSystemModel>
+#include <QMessageBox>
 
 namespace QmlDesigner {
 
@@ -38,7 +36,7 @@ void AssetsLibraryModel::createBackendModel()
 
     QObject::connect(m_sourceFsModel, &QFileSystemModel::directoryLoaded, this,
                      [this]([[maybe_unused]] const QString &dir) {
-        syncHaveFiles();
+        syncHasFiles();
     });
 
     m_fileWatcher = new Utils::FileSystemWatcher(parent());
@@ -207,7 +205,7 @@ bool AssetsLibraryModel::filterAcceptsRow(int sourceRow, const QModelIndex &sour
     }
 }
 
-bool AssetsLibraryModel::checkHaveFiles(const QModelIndex &parentIdx) const
+bool AssetsLibraryModel::checkHasFiles(const QModelIndex &parentIdx) const
 {
     if (!parentIdx.isValid())
         return false;
@@ -218,30 +216,30 @@ bool AssetsLibraryModel::checkHaveFiles(const QModelIndex &parentIdx) const
         if (!isDirectory(newIdx))
             return true;
 
-        if (checkHaveFiles(newIdx))
+        if (checkHasFiles(newIdx))
             return true;
     }
 
     return false;
 }
 
-void AssetsLibraryModel::setHaveFiles(bool value)
+void AssetsLibraryModel::setHasFiles(bool value)
 {
-    if (m_haveFiles != value) {
-        m_haveFiles = value;
-        emit haveFilesChanged();
+    if (m_hasFiles != value) {
+        m_hasFiles = value;
+        emit hasFilesChanged();
     }
 }
 
-bool AssetsLibraryModel::checkHaveFiles() const
+bool AssetsLibraryModel::checkHasFiles() const
 {
     auto rootIdx = indexForPath(m_rootPath);
-    return checkHaveFiles(rootIdx);
+    return checkHasFiles(rootIdx);
 }
 
-void AssetsLibraryModel::syncHaveFiles()
+void AssetsLibraryModel::syncHasFiles()
 {
-    setHaveFiles(checkHaveFiles());
+    setHasFiles(checkHasFiles());
 }
 
 QString AssetsLibraryModel::getUniqueName(const QString &oldName) {
diff --git a/src/plugins/qmldesigner/components/assetslibrary/assetslibrarymodel.h b/src/plugins/qmldesigner/components/assetslibrary/assetslibrarymodel.h
index 9334e86e9b..2516be787f 100644
--- a/src/plugins/qmldesigner/components/assetslibrary/assetslibrarymodel.h
+++ b/src/plugins/qmldesigner/components/assetslibrary/assetslibrarymodel.h
@@ -3,12 +3,13 @@
 
 #pragma once
 
-#include <QFileInfo>
-#include <QFileSystemModel>
 #include <QSortFilterProxyModel>
 
-#include <utils/filesystemwatcher.h>
-#include <utils/qtcassert.h>
+namespace Utils {
+class FileSystemWatcher;
+}
+
+QT_FORWARD_DECLARE_CLASS(QFileSystemModel)
 
 namespace QmlDesigner {
 
@@ -22,7 +23,7 @@ public:
     void setRootPath(const QString &newPath);
     void setSearchText(const QString &searchText);
 
-    Q_PROPERTY(bool haveFiles READ haveFiles NOTIFY haveFilesChanged);
+    Q_PROPERTY(bool hasFiles READ hasFiles NOTIFY hasFilesChanged)
 
     Q_INVOKABLE QString rootPath() const;
     Q_INVOKABLE QString filePath(const QModelIndex &index) const;
@@ -35,7 +36,7 @@ public:
     Q_INVOKABLE QModelIndex parentDirIndex(const QString &path) const;
     Q_INVOKABLE QModelIndex parentDirIndex(const QModelIndex &index) const;
     Q_INVOKABLE QString parentDirPath(const QString &path) const;
-    Q_INVOKABLE void syncHaveFiles();
+    Q_INVOKABLE void syncHasFiles();
 
     Q_INVOKABLE QList<QModelIndex> parentIndices(const QModelIndex &index) const;
     Q_INVOKABLE bool indexIsValid(const QModelIndex &index) const;
@@ -55,30 +56,30 @@ public:
         return std::min(result, 1);
     }
 
-    bool haveFiles() const { return m_haveFiles; }
+    bool hasFiles() const { return m_hasFiles; }
 
     QString getUniqueName(const QString &oldName);
 
 signals:
     void directoryLoaded(const QString &path);
     void rootPathChanged();
-    void haveFilesChanged();
+    void hasFilesChanged();
     void fileChanged(const QString &path);
     void effectsDeleted(const QStringList &effectNames);
 
 private:
-    void setHaveFiles(bool value);
+    void setHasFiles(bool value);
     bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
     void resetModel();
     void createBackendModel();
     void destroyBackendModel();
-    bool checkHaveFiles(const QModelIndex &parentIdx) const;
-    bool checkHaveFiles() const;
+    bool checkHasFiles(const QModelIndex &parentIdx) const;
+    bool checkHasFiles() const;
 
     QString m_searchText;
     QString m_rootPath;
     QFileSystemModel *m_sourceFsModel = nullptr;
-    bool m_haveFiles = false;
+    bool m_hasFiles = false;
     Utils::FileSystemWatcher *m_fileWatcher = nullptr;
 };
 
diff --git a/src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp b/src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp
index 3b98eb6baf..4b270c8902 100644
--- a/src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp
+++ b/src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp
@@ -3,20 +3,22 @@
 
 #include "assetslibrarywidget.h"
 
-#include "asset.h"
 #include "assetslibraryiconprovider.h"
 #include "assetslibrarymodel.h"
 #include "assetslibraryview.h"
-#include "designeractionmanager.h"
-#include "import.h"
-#include "modelnodeoperations.h"
-#include "nodemetainfo.h"
-#include "qmldesignerconstants.h"
-#include "qmldesignerplugin.h"
-#include "theme.h"
-#include <utils3d.h>
 
+#include <asset.h>
+#include <designeractionmanager.h>
+#include <designerpaths.h>
+#include <hdrimage.h>
+#include <import.h>
+#include <modelnodeoperations.h>
+#include <nodemetainfo.h>
+#include <qmldesignerconstants.h>
+#include <qmldesignerplugin.h>
 #include <studioquickwidget.h>
+#include <theme.h>
+#include <utils3d.h>
 
 #include <coreplugin/fileutils.h>
 #include <coreplugin/icore.h>
@@ -287,14 +289,16 @@ void AssetsLibraryWidget::handleDeleteEffects([[maybe_unused]] const QStringList
     // Remove usages of deleted effects from the current document
     m_assetsView->executeInTransaction(__FUNCTION__, [&]() {
         QList<ModelNode> allNodes = m_assetsView->allModelNodes();
-        const QString typeTemplate = "Effects.%1.%1";
-        const QString importUrlTemplate = "Effects.%1";
+        const QString typeTemplate = "%1.%2.%2";
+        const QString importUrlTemplate = "%1.%2";
         const Imports imports = m_assetsView->model()->imports();
         Imports removedImports;
+        const QString typePrefix = QmlDesignerPlugin::instance()->documentManager()
+                                       .generatedComponentUtils().composedEffectsTypePrefix();
         for (const QString &effectName : effectNames) {
             if (effectName.isEmpty())
                 continue;
-            const TypeName type = typeTemplate.arg(effectName).toUtf8();
+            const TypeName type = typeTemplate.arg(typePrefix, effectName).toUtf8();
             for (ModelNode &node : allNodes) {
                 if (node.metaInfo().typeName() == type) {
                     clearStacks = true;
@@ -302,7 +306,7 @@ void AssetsLibraryWidget::handleDeleteEffects([[maybe_unused]] const QStringList
                 }
             }
 
-            const QString importPath = importUrlTemplate.arg(effectName);
+            const QString importPath = importUrlTemplate.arg(typePrefix, effectName);
             Import removedImport = Utils::findOrDefault(imports, [&importPath](const Import &import) {
                 return import.url() == importPath;
             });
@@ -374,7 +378,7 @@ QList<QToolButton *> AssetsLibraryWidget::createToolBarWidgets()
 
 void AssetsLibraryWidget::handleSearchFilterChanged(const QString &filterText)
 {
-    if (filterText == m_filterText || (!m_assetsModel->haveFiles()
+    if (filterText == m_filterText || (!m_assetsModel->hasFiles()
                                        && filterText.contains(m_filterText, Qt::CaseInsensitive)))
         return;
 
@@ -643,4 +647,15 @@ void AssetsLibraryWidget::addResources(const QStringList &files, bool showDialog
     }
 }
 
+bool AssetsLibraryWidget::userBundleEnabled() const
+{
+    // TODO: this method is to be removed after user bundle implementation is complete
+    return Core::ICore::settings()->value("QML/Designer/UseExperimentalFeatures45", false).toBool();
+}
+
+void AssetsLibraryWidget::addAssetsToContentLibrary(const QStringList &assetPaths)
+{
+    m_assetsView->emitCustomNotification("add_assets_to_content_lib", {}, {assetPaths});
+}
+
 } // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.h b/src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.h
index ed987d14de..8b59ae0785 100644
--- a/src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.h
+++ b/src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.h
@@ -98,6 +98,8 @@ public:
 
     Q_INVOKABLE void showInGraphicalShell(const QString &path);
     Q_INVOKABLE QString showInGraphicalShellMsg() const;
+    Q_INVOKABLE bool userBundleEnabled() const;
+    Q_INVOKABLE void addAssetsToContentLibrary(const QStringList &assetPaths);
 
 signals:
     void itemActivated(const QString &itemName);
diff --git a/src/plugins/qmldesigner/components/bindingeditor/bindingeditorwidget.cpp b/src/plugins/qmldesigner/components/bindingeditor/bindingeditorwidget.cpp
index ff2361aa36..b067dc8d46 100644
--- a/src/plugins/qmldesigner/components/bindingeditor/bindingeditorwidget.cpp
+++ b/src/plugins/qmldesigner/components/bindingeditor/bindingeditorwidget.cpp
@@ -147,7 +147,6 @@ BindingEditorFactory::BindingEditorFactory()
 {
     setId(BINDINGEDITOR_CONTEXT_ID);
     setDisplayName(::Core::Tr::tr("Binding Editor"));
-    setEditorActionHandlers(0);
     addMimeType(BINDINGEDITOR_CONTEXT_ID);
     addMimeType(Utils::Constants::QML_MIMETYPE);
     addMimeType(Utils::Constants::QMLTYPES_MIMETYPE);
diff --git a/src/plugins/qmldesigner/components/collectioneditor/collectiondatatypemodel.cpp b/src/plugins/qmldesigner/components/collectioneditor/collectiondatatypemodel.cpp
index cb306c58cb..9a534ec88e 100644
--- a/src/plugins/qmldesigner/components/collectioneditor/collectiondatatypemodel.cpp
+++ b/src/plugins/qmldesigner/components/collectioneditor/collectiondatatypemodel.cpp
@@ -23,7 +23,6 @@ const QList<CollectionDataTypeModel::Details> CollectionDataTypeModel::m_ordered
     {DataType::Color, "Color", "HEX value"},
     {DataType::Url, "Url", "Resource locator"},
     {DataType::Boolean, "Boolean", "True/false"},
-    {DataType::Unknown, "Unknown", "Unknown data type"},
 };
 
 CollectionDataTypeModel::CollectionDataTypeModel(QObject *parent)
@@ -76,7 +75,7 @@ CollectionDetails::DataType CollectionDataTypeModel::dataTypeFromString(const QS
     if (stringTypeHash.contains(dataType))
         return stringTypeHash.value(dataType);
 
-    return DataType::Unknown;
+    return DataType::String;
 }
 
 void CollectionDataTypeModel::registerDeclarativeType()
diff --git a/src/plugins/qmldesigner/components/collectioneditor/collectiondetails.cpp b/src/plugins/qmldesigner/components/collectioneditor/collectiondetails.cpp
index ddfb82746c..a391d9bb1f 100644
--- a/src/plugins/qmldesigner/components/collectioneditor/collectiondetails.cpp
+++ b/src/plugins/qmldesigner/components/collectioneditor/collectiondetails.cpp
@@ -60,28 +60,21 @@ inline static bool isValidColorName(const QString &colorName)
 
 /**
  * @brief getCustomUrl
- * MimeType = <MainType/SubType>
  * Address = <Url|LocalFile>
  *
  * @param value The input value to be evaluated
- * @param dataType if the value is a valid url or image, the data type
- * will be stored to this parameter, otherwise, it will be Unknown
- * @param urlResult if the value is a valid url or image, the address
+ * @param dataType if the value is a valid url, the data type
+ * will be stored to this parameter, otherwise, it will be String
+ * @param urlResult if the value is a valid url, the address
  * will be stored in this parameter, otherwise it will be empty.
- * @param subType if the value is a valid image, the image subtype
- * will be stored in this parameter, otherwise it will be empty.
- * @return true if the result is either url or image
+ * @return true if the result is url
  */
 static bool getCustomUrl(const QString &value,
                          CollectionDetails::DataType &dataType,
-                         QUrl *urlResult = nullptr,
-                         QString *subType = nullptr)
+                         QUrl *urlResult = nullptr)
 {
     static const QRegularExpression urlRegex{
-        "^(?<MimeType>"
-        "(?<MainType>image)\\/"
-        "(?<SubType>apng|avif|gif|jpeg|png|(?:svg\\+xml)|webp|xyz)\\:)?" // end of MimeType
-        "(?<Address>"
+        "^(?<Address>"
         "(?<Url>https?:\\/\\/"
         "(?:www\\.|(?!www))[A-z0-9][A-z0-9-]+[A-z0-9]\\.[^\\s]{2,}|www\\.[A-z0-9][A-z0-9-]+"
         "[A-z0-9]\\.[^\\s]{2,}|https?:\\/\\/"
@@ -92,38 +85,27 @@ static bool getCustomUrl(const QString &value,
     };
 
     const QRegularExpressionMatch match = urlRegex.match(value.trimmed());
-    if (match.hasMatch()) {
-        if (match.hasCaptured("Address")) {
-            if (match.hasCaptured("MimeType") && match.captured("MainType") == "image")
-                dataType = CollectionDetails::DataType::Image;
-            else
-                dataType = CollectionDetails::DataType::Url;
-
-            if (urlResult)
-                urlResult->setUrl(match.captured("Address"));
+    if (match.hasCaptured("Address")) {
+        dataType = CollectionDetails::DataType::Url;
 
-            if (subType)
-                *subType = match.captured("SubType");
+        if (urlResult)
+            urlResult->setUrl(match.captured("Address"));
 
-            return true;
-        }
+        return true;
     }
 
     if (urlResult)
         urlResult->clear();
 
-    if (subType)
-        subType->clear();
-
-    dataType = CollectionDetails::DataType::Unknown;
+    dataType = CollectionDetails::DataType::String;
     return false;
 }
 
 /**
  * @brief dataTypeFromString
  * @param value The string value to be evaluated
- * @return Unknown if the string is empty, But returns Bool, Color, Integer,
- * Real, Url, Image if these types are detected within the non-empty string,
+ * @return Bool, Color, Integer, Real, Url,
+ * Image if these types are detected within the non-empty string,
  * Otherwise it returns String.
  * If the value is integer, but it's out of the int range, it will be
  * considered as a Real.
@@ -149,7 +131,7 @@ static CollectionDetails::DataType dataTypeFromString(const QString &value)
         }({boolIndex, colorIndex, integerIndex, realIndex});
 
     if (value.isEmpty())
-        return DataType::Unknown;
+        return DataType::String;
 
     const QString trimmedValue = value.trimmed();
     QRegularExpressionMatch match = validator.match(trimmedValue);
@@ -181,7 +163,7 @@ static CollectionProperty::DataType dataTypeFromJsonValue(const QJsonValue &valu
     switch (value.type()) {
     case JsonType::Null:
     case JsonType::Undefined:
-        return DataType::Unknown;
+        return DataType::String;
     case JsonType::Bool:
         return DataType::Boolean;
     case JsonType::Double: {
@@ -192,7 +174,7 @@ static CollectionProperty::DataType dataTypeFromJsonValue(const QJsonValue &valu
     case JsonType::String:
         return dataTypeFromString(value.toString());
     default:
-        return DataType::Unknown;
+        return DataType::String;
     }
 }
 
@@ -213,9 +195,7 @@ static QList<CollectionProperty> getColumnsFromImportedJsonArray(const QJsonArra
                 const QString propertyName = element.key();
                 if (resultSet.contains(propertyName)) {
                     CollectionProperty &property = result[resultSet.value(propertyName)];
-                    if (property.type == DataType::Unknown) {
-                        property.type = dataTypeFromJsonValue(element.value());
-                    } else if (property.type == DataType::Integer) {
+                    if (property.type == DataType::Integer) {
                         const DataType currentCellDataType = dataTypeFromJsonValue(element.value());
                         if (currentCellDataType == DataType::Real)
                             property.type = currentCellDataType;
@@ -248,14 +228,8 @@ static QVariant valueToVariant(const QJsonValue &value, CollectionDetails::DataT
         return variantValue.toBool();
     case DataType::Color:
         return variantValue.value<QColor>();
-    case DataType::Image: {
-        DataType type;
-        QUrl url;
-        if (getCustomUrl(variantValue.toString(), type, &url))
-            return url;
-        return variantValue.toString();
-    }
     case DataType::Url:
+    case DataType::Image:
         return variantValue.value<QUrl>();
     default:
         return variantValue;
@@ -263,21 +237,10 @@ static QVariant valueToVariant(const QJsonValue &value, CollectionDetails::DataT
 }
 
 static QJsonValue variantToJsonValue(
-    const QVariant &variant, CollectionDetails::DataType type = CollectionDetails::DataType::Unknown)
+    const QVariant &variant, CollectionDetails::DataType type = CollectionDetails::DataType::String)
 {
-    using VariantType = QVariant::Type;
     using DataType = CollectionDetails::DataType;
 
-    if (type == CollectionDetails::DataType::Unknown) {
-        static const QHash<VariantType, DataType> typeMap = {{VariantType::Bool, DataType::Boolean},
-                                                             {VariantType::Double, DataType::Real},
-                                                             {VariantType::Int, DataType::Integer},
-                                                             {VariantType::String, DataType::String},
-                                                             {VariantType::Color, DataType::Color},
-                                                             {VariantType::Url, DataType::Url}};
-        type = typeMap.value(variant.type(), DataType::Unknown);
-    }
-
     switch (type) {
     case DataType::Boolean:
         return variant.toBool();
@@ -285,12 +248,7 @@ static QJsonValue variantToJsonValue(
         return variant.toDouble();
     case DataType::Integer:
         return variant.toInt();
-    case DataType::Image: {
-        const QUrl url(variant.toUrl());
-        if (url.isValid())
-            return QString("image/xyz:%1").arg(url.toString());
-        return {};
-    }
+    case DataType::Image:
     case DataType::String:
     case DataType::Color:
     case DataType::Url:
@@ -569,13 +527,6 @@ QVariant CollectionDetails::data(int row, int column) const
 
     const QJsonValue cellValue = d->dataRecords.at(row).at(column);
 
-    if (typeAt(column) == DataType::Image) {
-        const QUrl imageUrl = valueToVariant(cellValue, DataType::Image).toUrl();
-
-        if (imageUrl.isValid())
-            return imageUrl;
-    }
-
     return cellValue.toVariant();
 }
 
@@ -611,10 +562,13 @@ DataTypeWarning::Warning CollectionDetails::cellWarningCheck(int row, int column
     const DataType columnType = typeAt(column);
     const DataType cellType = typeAt(row, column);
 
-    if (columnType == DataType::Unknown || isEmptyJsonValue(cellValue))
+    if (isEmptyJsonValue(cellValue))
+        return DataTypeWarning::Warning::None;
+
+    if ((columnType == DataType::String || columnType == DataType::Real) && cellType == DataType::Integer)
         return DataTypeWarning::Warning::None;
 
-    if (columnType == DataType::Real && cellType == DataType::Integer)
+    if ((columnType == DataType::Url || columnType == DataType::Image) && cellType == DataType::String)
         return DataTypeWarning::Warning::None;
 
     if (columnType != cellType)
diff --git a/src/plugins/qmldesigner/components/collectioneditor/collectiondetails.h b/src/plugins/qmldesigner/components/collectioneditor/collectiondetails.h
index b84c214570..7243c585c6 100644
--- a/src/plugins/qmldesigner/components/collectioneditor/collectiondetails.h
+++ b/src/plugins/qmldesigner/components/collectioneditor/collectiondetails.h
@@ -90,7 +90,7 @@ public:
     void insertColumn(const QString &propertyName,
                       int colIdx = -1,
                       const QVariant &defaultValue = {},
-                      DataType type = DataType::Unknown);
+                      DataType type = DataType::String);
     bool removeColumns(int colIdx, int count = 1);
 
     void insertEmptyRows(int row = 0, int count = 1);
diff --git a/src/plugins/qmldesigner/components/collectioneditor/collectiondetailsmodel.cpp b/src/plugins/qmldesigner/components/collectioneditor/collectiondetailsmodel.cpp
index b26b1a845e..fcd6d686ef 100644
--- a/src/plugins/qmldesigner/components/collectioneditor/collectiondetailsmodel.cpp
+++ b/src/plugins/qmldesigner/components/collectioneditor/collectiondetailsmodel.cpp
@@ -93,6 +93,7 @@ bool CollectionDetailsModel::setData(const QModelIndex &index, const QVariant &v
             if (prevWarning != m_currentCollection.cellWarningCheck(index.row(), index.column()))
                 roles << DataTypeWarningRole;
 
+            setHasUnsavedChanges(true);
             emit dataChanged(index, index, roles);
         }
 
@@ -128,11 +129,11 @@ bool CollectionDetailsModel::insertRows(int row, int count, [[maybe_unused]] con
 
     row = qBound(0, row, rowCount());
 
-    beginResetModel();
+    beginInsertRows({}, row, row + count - 1);
     m_currentCollection.insertEmptyRows(row, count);
-    endResetModel();
+    endInsertRows();
+    setHasUnsavedChanges(true);
 
-    selectRow(row);
     return true;
 }
 
@@ -151,12 +152,6 @@ bool CollectionDetailsModel::removeColumns(int column, int count, const QModelIn
     if (!columnCount(parent))
         removeRows(0, rowCount(parent), parent);
 
-    int nextColumn = column - 1;
-    if (nextColumn < 0 && columnCount(parent) > 0)
-        nextColumn = 0;
-
-    selectColumn(nextColumn);
-
     ensureSingleCell();
     return columnsRemoved;
 }
@@ -202,7 +197,7 @@ QVariant CollectionDetailsModel::headerData(int section, Qt::Orientation orienta
 
 CollectionDetails::DataType CollectionDetailsModel::propertyDataType(int column) const
 {
-    QTC_ASSERT(m_currentCollection.hasValidReference(), return CollectionDetails::DataType::Unknown);
+    QTC_ASSERT(m_currentCollection.hasValidReference(), return CollectionDetails::DataType::String);
 
     return m_currentCollection.typeAt(column);
 }
@@ -254,6 +249,7 @@ bool CollectionDetailsModel::addColumn(int column, const QString &name, const QS
                                      {},
                                      CollectionDataTypeModel::dataTypeFromString(propertyType));
     endInsertColumns();
+    setHasUnsavedChanges(true);
     return m_currentCollection.containsPropertyName(name);
 }
 
@@ -309,6 +305,7 @@ bool CollectionDetailsModel::setPropertyType(int column, const QString &newValue
             {Qt::DisplayRole, Qt::EditRole, DataTypeRole, DataTypeWarningRole, ColumnDataTypeRole});
     }
 
+    setHasUnsavedChanges(true);
     return changed;
 }
 
@@ -441,6 +438,7 @@ bool CollectionDetailsModel::saveDataStoreCollections()
                 if (reference != currentReference)
                     closeCollectionIfSaved(reference);
             }
+            setHasUnsavedChanges(false);
             return true;
         }
     }
@@ -618,4 +616,12 @@ QString CollectionDetailsModel::warningToString(DataTypeWarning::Warning warning
     return DataTypeWarning::getDataTypeWarningString(warning);
 }
 
+void CollectionDetailsModel::setHasUnsavedChanges(bool val)
+{
+    if (m_hasUnsavedChanges == val)
+        return;
+    m_hasUnsavedChanges = val;
+    emit hasUnsavedChangesChanged();
+}
+
 } // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/components/collectioneditor/collectiondetailsmodel.h b/src/plugins/qmldesigner/components/collectioneditor/collectiondetailsmodel.h
index 24a040cce6..8844ff4a3e 100644
--- a/src/plugins/qmldesigner/components/collectioneditor/collectiondetailsmodel.h
+++ b/src/plugins/qmldesigner/components/collectioneditor/collectiondetailsmodel.h
@@ -20,6 +20,7 @@ class CollectionDetailsModel : public QAbstractTableModel
     Q_PROPERTY(int selectedColumn READ selectedColumn WRITE selectColumn NOTIFY selectedColumnChanged)
     Q_PROPERTY(int selectedRow READ selectedRow WRITE selectRow NOTIFY selectedRowChanged)
     Q_PROPERTY(bool isEmpty MEMBER m_isEmpty NOTIFY isEmptyChanged)
+    Q_PROPERTY(bool hasUnsavedChanges MEMBER m_hasUnsavedChanges WRITE setHasUnsavedChanges NOTIFY hasUnsavedChangesChanged)
 
 public:
     enum DataRoles { SelectedRole = Qt::UserRole + 1, DataTypeRole, ColumnDataTypeRole, DataTypeWarningRole };
@@ -70,12 +71,14 @@ public:
     const CollectionDetails upToDateConstCollection(const CollectionReference &reference) const;
     bool collectionHasColumn(const CollectionReference &reference, const QString &columnName) const;
     QString getFirstColumnName(const CollectionReference &reference) const;
+    void setHasUnsavedChanges(bool val);
 
 signals:
     void collectionNameChanged(const QString &collectionName);
     void selectedColumnChanged(int);
     void selectedRowChanged(int);
     void isEmptyChanged(bool);
+    void hasUnsavedChangesChanged();
     void warning(const QString &title, const QString &body);
 
 private slots:
@@ -93,6 +96,7 @@ private:
     QHash<CollectionReference, CollectionDetails> m_openedCollections;
     CollectionDetails m_currentCollection;
     bool m_isEmpty = true;
+    bool m_hasUnsavedChanges = false;
     int m_selectedColumn = -1;
     int m_selectedRow = -1;
 
diff --git a/src/plugins/qmldesigner/components/collectioneditor/collectiondetailssortfiltermodel.cpp b/src/plugins/qmldesigner/components/collectioneditor/collectiondetailssortfiltermodel.cpp
index f56bb36e88..2cc6ac05a6 100644
--- a/src/plugins/qmldesigner/components/collectioneditor/collectiondetailssortfiltermodel.cpp
+++ b/src/plugins/qmldesigner/components/collectioneditor/collectiondetailssortfiltermodel.cpp
@@ -62,6 +62,12 @@ bool CollectionDetailsSortFilterModel::selectColumn(int column)
     return m_source->selectColumn(mapToSource(index(0, column)).column());
 }
 
+void CollectionDetailsSortFilterModel::deselectAll()
+{
+    QTC_ASSERT(m_source, return);
+    m_source->deselectAll();
+}
+
 CollectionDetailsSortFilterModel::~CollectionDetailsSortFilterModel() = default;
 
 bool CollectionDetailsSortFilterModel::filterAcceptsRow(int sourceRow,
diff --git a/src/plugins/qmldesigner/components/collectioneditor/collectiondetailssortfiltermodel.h b/src/plugins/qmldesigner/components/collectioneditor/collectiondetailssortfiltermodel.h
index 93305f3ca2..10f6e09b05 100644
--- a/src/plugins/qmldesigner/components/collectioneditor/collectiondetailssortfiltermodel.h
+++ b/src/plugins/qmldesigner/components/collectioneditor/collectiondetailssortfiltermodel.h
@@ -31,6 +31,7 @@ public:
 
     Q_INVOKABLE bool selectRow(int row);
     Q_INVOKABLE bool selectColumn(int column);
+    Q_INVOKABLE void deselectAll();
 
 signals:
     void selectedColumnChanged(int);
diff --git a/src/plugins/qmldesigner/components/collectioneditor/collectioneditorutils.cpp b/src/plugins/qmldesigner/components/collectioneditor/collectioneditorutils.cpp
index 4725987f12..29b833cc2c 100644
--- a/src/plugins/qmldesigner/components/collectioneditor/collectioneditorutils.cpp
+++ b/src/plugins/qmldesigner/components/collectioneditor/collectioneditorutils.cpp
@@ -3,6 +3,7 @@
 
 #include "collectioneditorutils.h"
 
+#include "collectiondatatypemodel.h"
 #include "model.h"
 #include "nodemetainfo.h"
 #include "propertymetainfo.h"
@@ -95,13 +96,17 @@ Utils::FilePath dataStoreDir()
     if (!currentProject)
         return {};
 
-    return currentProject->projectDirectory().pathAppended("/imports/"
-                                                           + currentProject->displayName());
+    FilePath oldImportDirectory = currentProject->projectDirectory().pathAppended(
+        "imports/" + currentProject->displayName());
+    if (oldImportDirectory.exists())
+        return oldImportDirectory;
+
+    return currentProject->projectDirectory().pathAppended(currentProject->displayName());
 }
 
 inline Utils::FilePath collectionPath(const QString &filePath)
 {
-    return dataStoreDir().pathAppended("/" + filePath);
+    return dataStoreDir().pathAppended(filePath);
 }
 
 inline Utils::FilePath qmlDirFilePath()
@@ -288,7 +293,7 @@ QJsonObject defaultCollection()
     QJsonArray columns;
     QJsonObject defaultColumn;
     defaultColumn.insert("name", "Column 1");
-    defaultColumn.insert("type", "string");
+    defaultColumn.insert("type", CollectionDataTypeModel::dataTypeToString(DataType::String));
     columns.append(defaultColumn);
 
     QJsonArray collectionData;
diff --git a/src/plugins/qmldesigner/components/collectioneditor/collectionview.cpp b/src/plugins/qmldesigner/components/collectioneditor/collectionview.cpp
index f6ec821fde..0c9a2eed94 100644
--- a/src/plugins/qmldesigner/components/collectioneditor/collectionview.cpp
+++ b/src/plugins/qmldesigner/components/collectioneditor/collectionview.cpp
@@ -35,6 +35,12 @@ bool isStudioCollectionModel(const QmlDesigner::ModelNode &node)
     return node.metaInfo().isQtQuickStudioUtilsJsonListModel();
 }
 
+inline bool isProjectImport(const QmlDesigner::Import &import)
+{
+    ProjectExplorer::Project *currentProject = ProjectExplorer::ProjectManager::startupProject();
+    return currentProject && import.toString() == currentProject->displayName();
+}
+
 inline void setVariantPropertyValue(const QmlDesigner::ModelNode &node,
                                     const QmlDesigner::PropertyName &propertyName,
                                     const QVariant &value)
@@ -60,14 +66,10 @@ CollectionView::CollectionView(ExternalDependenciesInterface &externalDependenci
     , m_dataStore(std::make_unique<DataStoreModelNode>())
 
 {
-    connect(ProjectExplorer::ProjectManager::instance(),
-            &ProjectExplorer::ProjectManager::startupProjectChanged, this, [this] {
-        resetDataStoreNode();
-        if (m_widget.get())
-            m_widget->collectionDetailsModel()->removeAllCollections();
-    });
 }
 
+CollectionView::~CollectionView() = default;
+
 bool CollectionView::hasWidget() const
 {
     return true;
@@ -75,11 +77,16 @@ bool CollectionView::hasWidget() const
 
 QmlDesigner::WidgetInfo CollectionView::widgetInfo()
 {
-    if (m_widget.isNull()) {
-        m_widget = new CollectionWidget(this);
+    if (!m_widget) {
+        m_widget = Utils::makeUniqueObjectPtr<CollectionWidget>(this);
         m_widget->setMinimumSize(m_widget->minimumSizeHint());
+        connect(ProjectExplorer::ProjectManager::instance(),
+                &ProjectExplorer::ProjectManager::startupProjectChanged, m_widget.get(), [&] {
+            resetDataStoreNode();
+            m_widget->collectionDetailsModel()->removeAllCollections();
+        });
 
-        auto collectionEditorContext = new Internal::CollectionEditorContext(m_widget.data());
+        auto collectionEditorContext = new Internal::CollectionEditorContext(m_widget.get());
         Core::ICore::addContextObject(collectionEditorContext);
         CollectionListModel *listModel = m_widget->listModel().data();
 
@@ -97,7 +104,7 @@ QmlDesigner::WidgetInfo CollectionView::widgetInfo()
 
         connect(listModel, &CollectionListModel::modelReset, this, [this] {
             CollectionListModel *listModel = m_widget->listModel().data();
-            if (listModel->sourceNode() == m_dataStore->modelNode())
+            if (listModel->sourceNode() == dataStoreNode())
                 m_dataStore->setCollectionNames(listModel->collections());
         });
 
@@ -128,7 +135,7 @@ QmlDesigner::WidgetInfo CollectionView::widgetInfo()
                 });
     }
 
-    return createWidgetInfo(m_widget.data(),
+    return createWidgetInfo(m_widget.get(),
                             "CollectionEditor",
                             WidgetInfo::LeftPane,
                             0,
@@ -139,23 +146,22 @@ QmlDesigner::WidgetInfo CollectionView::widgetInfo()
 void CollectionView::modelAttached(Model *model)
 {
     AbstractView::modelAttached(model);
+    m_widget->setProjectImportExists(Utils::anyOf(model->imports(), isProjectImport));
     resetDataStoreNode();
 }
 
 void CollectionView::modelAboutToBeDetached([[maybe_unused]] Model *model)
 {
-    m_libraryInfoIsUpdated = false;
-    m_reloadCounter = 0;
-    m_rewriterAmended = false;
-    m_dataStoreTypeFound = false;
-    disconnect(m_documentUpdateConnection);
-    QTC_ASSERT(m_delayedTasks.isEmpty(), m_delayedTasks.clear());
-    m_widget->listModel()->setDataStoreNode();
+    unloadDataStore();
+    m_widget->setProjectImportExists(false);
 }
 
 void CollectionView::selectedNodesChanged(const QList<ModelNode> &selectedNodeList,
                                           [[maybe_unused]] const QList<ModelNode> &lastSelectedNodeList)
 {
+    if (!m_widget)
+        return;
+
     QList<ModelNode> selectedCollectionNodes = Utils::filtered(selectedNodeList,
                                                                &isStudioCollectionModel);
 
@@ -170,10 +176,17 @@ void CollectionView::selectedNodesChanged(const QList<ModelNode> &selectedNodeLi
     }
 
     m_widget->setTargetNodeSelected(singleSelectedHasModelProperty);
+}
 
-    // More than one model is selected. So ignore them
-    if (selectedCollectionNodes.size() > 1)
-        return;
+void CollectionView::importsChanged(const Imports &addedImports, const Imports &removedImports)
+{
+    if (Utils::anyOf(addedImports, isProjectImport)) {
+        m_widget->setProjectImportExists(true);
+        resetDataStoreNode();
+    } else if (Utils::anyOf(removedImports, isProjectImport)) {
+        m_widget->setProjectImportExists(false);
+        unloadDataStore();
+    }
 }
 
 void CollectionView::customNotification(const AbstractView *,
@@ -181,6 +194,9 @@ void CollectionView::customNotification(const AbstractView *,
                                         const QList<ModelNode> &nodeList,
                                         const QList<QVariant> &data)
 {
+    if (!m_widget)
+        return;
+
     if (identifier == QLatin1String("item_library_created_by_drop") && !nodeList.isEmpty())
         onItemLibraryNodeCreated(nodeList.first());
     else if (identifier == QLatin1String("open_collection_by_id") && !data.isEmpty())
@@ -219,8 +235,27 @@ void CollectionView::addResource(const QUrl &url, const QString &name)
     });
 }
 
+void CollectionView::addProjectImport()
+{
+    if (!m_widget)
+        return;
+
+    ProjectExplorer::Project *currentProject = ProjectExplorer::ProjectManager::startupProject();
+    if (!currentProject)
+        return;
+
+    executeInTransaction(__FUNCTION__, [&] {
+        Import import = Import::createLibraryImport(currentProject->displayName());
+        if (!model()->hasImport(import, true, true))
+            model()->changeImports({import}, {});
+    });
+}
+
 void CollectionView::assignCollectionToNode(const QString &collectionName, const ModelNode &node)
 {
+    if (!m_widget)
+        return;
+
     using DataType = CollectionDetails::DataType;
     executeInTransaction("CollectionView::assignCollectionToNode", [&]() {
         m_dataStore->assignCollectionToNode(
@@ -279,12 +314,18 @@ void CollectionView::assignCollectionToSelectedNode(const QString &collectionNam
 
 void CollectionView::addNewCollection(const QString &collectionName, const QJsonObject &localCollection)
 {
+    if (!m_widget)
+        return;
+
     addTask(QSharedPointer<CollectionTask>(
         new AddCollectionTask(this, m_widget->listModel(), localCollection, collectionName)));
 }
 
 void CollectionView::openCollection(const QString &collectionName)
 {
+    if (!m_widget)
+        return;
+
     m_widget->openCollection(collectionName);
 }
 
@@ -296,9 +337,13 @@ void CollectionView::registerDeclarativeType()
 
 void CollectionView::resetDataStoreNode()
 {
+    if (!m_widget)
+        return;
+
     m_dataStore->reloadModel();
 
-    ModelNode dataStore = m_dataStore->modelNode();
+    ModelNode dataStore = dataStoreNode();
+    m_widget->setDataStoreExists(dataStore.isValid());
     if (!dataStore || m_widget->listModel()->sourceNode() == dataStore)
         return;
 
@@ -339,28 +384,11 @@ void CollectionView::ensureDataStoreExists()
 {
     bool filesJustCreated = false;
     bool filesExist = CollectionEditorUtils::ensureDataStoreExists(filesJustCreated);
-    if (filesExist) {
-        if (filesJustCreated) {
-            // Force code model reset to notice changes to existing module
-            auto modelManager = QmlJS::ModelManagerInterface::instance();
-            if (modelManager) {
-                m_libraryInfoIsUpdated = false;
-
-                m_expectedDocumentUpdates.clear();
-                m_expectedDocumentUpdates << CollectionEditorUtils::dataStoreQmlFilePath()
-                                          << CollectionEditorUtils::dataStoreJsonFilePath();
-
-                m_documentUpdateConnection = connect(modelManager,
-                                                     &QmlJS::ModelManagerInterface::documentUpdated,
-                                                     this,
-                                                     &CollectionView::onDocumentUpdated);
-
-                modelManager->resetCodeModel();
-            }
-            resetDataStoreNode();
-        } else {
-            m_libraryInfoIsUpdated = true;
-        }
+    if (filesExist && filesJustCreated) {
+        // Force code model reset to notice changes to existing module
+        if (auto modelManager = QmlJS::ModelManagerInterface::instance())
+            modelManager->resetCodeModel();
+        resetDataStoreNode();
     }
 }
 
@@ -380,6 +408,18 @@ NodeMetaInfo CollectionView::jsonCollectionMetaInfo() const
     return model()->metaInfo(CollectionEditorConstants::JSONCOLLECTIONMODEL_TYPENAME);
 }
 
+void CollectionView::unloadDataStore()
+{
+    m_reloadCounter = 0;
+    m_rewriterAmended = false;
+    m_dataStoreTypeFound = false;
+    QTC_ASSERT(m_delayedTasks.isEmpty(), m_delayedTasks.clear());
+    if (m_widget) {
+        m_widget->setDataStoreExists(dataStoreNode().isValid());
+        m_widget->listModel()->setDataStoreNode();
+    }
+}
+
 void CollectionView::ensureStudioModelImport()
 {
     executeInTransaction(__FUNCTION__, [&] {
@@ -395,29 +435,21 @@ void CollectionView::ensureStudioModelImport()
 
 void CollectionView::onItemLibraryNodeCreated(const ModelNode &node)
 {
+    if (!m_widget)
+        return;
+
     if (node.metaInfo().isQtQuickListView()) {
         addTask(QSharedPointer<CollectionTask>(
             new DropListViewTask(this, m_widget->listModel(), node)));
     }
 }
 
-void CollectionView::onDocumentUpdated(const QSharedPointer<const QmlJS::Document> &doc)
-{
-    if (m_expectedDocumentUpdates.contains(doc->fileName()))
-        m_expectedDocumentUpdates.remove(doc->fileName());
-
-    if (m_expectedDocumentUpdates.isEmpty()) {
-        disconnect(m_documentUpdateConnection);
-        m_libraryInfoIsUpdated = true;
-    }
-}
-
 void CollectionView::addTask(QSharedPointer<CollectionTask> task)
 {
     ensureDataStoreExists();
     if (m_dataStoreTypeFound)
         task->process();
-    else if (m_dataStore->modelNode())
+    else if (dataStoreNode())
         m_delayedTasks << task;
 }
 
diff --git a/src/plugins/qmldesigner/components/collectioneditor/collectionview.h b/src/plugins/qmldesigner/components/collectioneditor/collectionview.h
index a4b16c4c27..3de3bd7ae6 100644
--- a/src/plugins/qmldesigner/components/collectioneditor/collectionview.h
+++ b/src/plugins/qmldesigner/components/collectioneditor/collectionview.h
@@ -3,9 +3,12 @@
 
 #pragma once
 
-#include "abstractview.h"
 #include "datastoremodelnode.h"
-#include "modelnode.h"
+
+#include <abstractview.h>
+#include <modelnode.h>
+
+#include <utils/uniqueobjectptr.h>
 
 #include <QJsonObject>
 
@@ -27,6 +30,7 @@ class CollectionView : public AbstractView
 
 public:
     explicit CollectionView(ExternalDependenciesInterface &externalDependencies);
+    ~CollectionView();
 
     bool hasWidget() const override;
     WidgetInfo widgetInfo() override;
@@ -37,6 +41,8 @@ public:
     void selectedNodesChanged(const QList<ModelNode> &selectedNodeList,
                               const QList<ModelNode> &lastSelectedNodeList) override;
 
+    void importsChanged(const Imports &addedImports, const Imports &removedImports) override;
+
     void customNotification(const AbstractView *view,
                             const QString &identifier,
                             const QList<ModelNode> &nodeList,
@@ -44,6 +50,7 @@ public:
 
     void addResource(const QUrl &url, const QString &name);
 
+    void addProjectImport();
     void assignCollectionToNode(const QString &collectionName, const ModelNode &node);
     void assignCollectionToSelectedNode(const QString &collectionName);
     void addNewCollection(const QString &collectionName, const QJsonObject &localCollection);
@@ -61,17 +68,14 @@ private:
     friend class CollectionTask;
 
     NodeMetaInfo jsonCollectionMetaInfo() const;
+    void unloadDataStore();
     void ensureStudioModelImport();
     void onItemLibraryNodeCreated(const ModelNode &node);
-    void onDocumentUpdated(const QSharedPointer<const QmlJS::Document> &doc);
     void addTask(QSharedPointer<CollectionTask> task);
 
-    QPointer<CollectionWidget> m_widget;
     std::unique_ptr<DataStoreModelNode> m_dataStore;
-    QSet<Utils::FilePath> m_expectedDocumentUpdates;
+    Utils::UniqueObjectPtr<CollectionWidget> m_widget;
     QList<QSharedPointer<CollectionTask>> m_delayedTasks;
-    QMetaObject::Connection m_documentUpdateConnection;
-    bool m_libraryInfoIsUpdated = false;
     bool m_dataStoreTypeFound = false;
     bool m_rewriterAmended = false;
     int m_reloadCounter = 0;
diff --git a/src/plugins/qmldesigner/components/collectioneditor/collectionwidget.cpp b/src/plugins/qmldesigner/components/collectioneditor/collectionwidget.cpp
index 093729dc67..dd706145cf 100644
--- a/src/plugins/qmldesigner/components/collectioneditor/collectionwidget.cpp
+++ b/src/plugins/qmldesigner/components/collectioneditor/collectionwidget.cpp
@@ -54,8 +54,7 @@ QString getPreferredCollectionName(const QUrl &url, const QString &collectionNam
 
 namespace QmlDesigner {
 CollectionWidget::CollectionWidget(CollectionView *view)
-    : QFrame()
-    , m_view(view)
+    : m_view(view)
     , m_listModel(new CollectionListModel)
     , m_collectionDetailsModel(new CollectionDetailsModel)
     , m_collectionDetailsSortFilterModel(std::make_unique<CollectionDetailsSortFilterModel>())
@@ -104,6 +103,8 @@ CollectionWidget::CollectionWidget(CollectionView *view)
     QmlDesignerPlugin::trackWidgetFocusTime(this, Constants::EVENT_MODELEDITOR_TIME);
 }
 
+CollectionWidget::~CollectionWidget() = default;
+
 void CollectionWidget::contextHelp(const Core::IContext::HelpCallback &callback) const
 {
     if (m_view)
@@ -250,6 +251,11 @@ bool CollectionWidget::importFile(const QString &collectionName,
     return false;
 }
 
+void CollectionWidget::addProjectImport()
+{
+    m_view->addProjectImport();
+}
+
 void CollectionWidget::addCollectionToDataStore(const QString &collectionName)
 {
     m_view->addNewCollection(collectionName, CollectionEditorUtils::defaultCollection());
@@ -288,6 +294,24 @@ void CollectionWidget::setTargetNodeSelected(bool selected)
     emit targetNodeSelectedChanged(m_targetNodeSelected);
 }
 
+void CollectionWidget::setProjectImportExists(bool exists)
+{
+    if (m_projectImportExists == exists)
+        return;
+
+    m_projectImportExists = exists;
+    emit projectImportExistsChanged(m_projectImportExists);
+}
+
+void CollectionWidget::setDataStoreExists(bool exists)
+{
+    if (m_dataStoreExists == exists)
+        return;
+
+    m_dataStoreExists = exists;
+    emit dataStoreExistsChanged(m_dataStoreExists);
+}
+
 void CollectionWidget::deleteSelectedCollection()
 {
     QMetaObject::invokeMethod(m_quickWidget->quickWidget()->rootObject(), "deleteSelectedCollection");
diff --git a/src/plugins/qmldesigner/components/collectioneditor/collectionwidget.h b/src/plugins/qmldesigner/components/collectioneditor/collectionwidget.h
index 0957bd81e0..13c3566c78 100644
--- a/src/plugins/qmldesigner/components/collectioneditor/collectionwidget.h
+++ b/src/plugins/qmldesigner/components/collectioneditor/collectionwidget.h
@@ -22,9 +22,12 @@ class CollectionWidget : public QFrame
     Q_OBJECT
 
     Q_PROPERTY(bool targetNodeSelected MEMBER m_targetNodeSelected NOTIFY targetNodeSelectedChanged)
+    Q_PROPERTY(bool projectImportExists MEMBER m_projectImportExists NOTIFY projectImportExistsChanged)
+    Q_PROPERTY(bool dataStoreExists MEMBER m_dataStoreExists NOTIFY dataStoreExistsChanged)
 
 public:
     CollectionWidget(CollectionView *view);
+    ~CollectionWidget();
     void contextHelp(const Core::IContext::HelpCallback &callback) const;
 
     QPointer<CollectionListModel> listModel() const;
@@ -32,7 +35,7 @@ public:
 
     void reloadQmlSource();
 
-    virtual QSize minimumSizeHint() const;
+    QSize minimumSizeHint() const override;
 
     Q_INVOKABLE bool loadJsonFile(const QUrl &url, const QString &collectionName = {});
     Q_INVOKABLE bool loadCsvFile(const QUrl &url, const QString &collectionName = {});
@@ -44,6 +47,7 @@ public:
                                 const QUrl &url,
                                 const bool &firstRowIsHeader = true);
 
+    Q_INVOKABLE void addProjectImport();
     Q_INVOKABLE void addCollectionToDataStore(const QString &collectionName);
     Q_INVOKABLE void assignCollectionToSelectedNode(const QString collectionName);
     Q_INVOKABLE void openCollection(const QString &collectionName);
@@ -51,11 +55,15 @@ public:
 
     void warn(const QString &title, const QString &body);
     void setTargetNodeSelected(bool selected);
+    void setProjectImportExists(bool exists);
+    void setDataStoreExists(bool exists);
 
     void deleteSelectedCollection();
 
 signals:
     void targetNodeSelectedChanged(bool);
+    void projectImportExistsChanged(bool);
+    void dataStoreExistsChanged(bool);
 
 private:
     QString generateUniqueCollectionName(const ModelNode &node, const QString &name);
@@ -66,6 +74,8 @@ private:
     std::unique_ptr<CollectionDetailsSortFilterModel> m_collectionDetailsSortFilterModel;
     QScopedPointer<StudioQuickWidget> m_quickWidget;
     bool m_targetNodeSelected = false;
+    bool m_projectImportExists = false;
+    bool m_dataStoreExists = false;
 };
 
 } // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp
index 4e32237ee9..8d2b2c43c2 100644
--- a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp
+++ b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp
@@ -61,11 +61,6 @@ inline static QString captionForModelNode(const ModelNode &modelNode)
     return modelNode.id();
 }
 
-inline static bool contains(const QmlItemNode &node, const QPointF &position)
-{
-    return node.isValid() && node.instanceSceneTransform().mapRect(node.instanceBoundingRect()).contains(position);
-}
-
 DesignerActionManagerView *DesignerActionManager::view()
 {
     return m_designerActionManagerView;
@@ -438,8 +433,8 @@ public:
             }
             for (const ModelNode &node : selectionContext().view()->allModelNodes()) {
                 if (node != selectionContext().currentSingleSelectedNode() && node != parentNode
-                    && contains(node, selectionContext().scenePosition()) && !node.isRootNode()
-                    && !ModelUtils::isThisOrAncestorLocked(node)) {
+                    && SelectionContextHelpers::contains(node, selectionContext().scenePosition())
+                    && !node.isRootNode() && !ModelUtils::isThisOrAncestorLocked(node)) {
                     selectionContext().setTargetNode(node);
                     QString what = QString(QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Select: %1")).arg(captionForModelNode(node));
                     ActionTemplate *selectionAction = new ActionTemplate("SELECT", what, &ModelNodeOperations::select);
@@ -1971,7 +1966,7 @@ void DesignerActionManager::createDefaultDesignerActions()
                           QKeySequence(),
                           Priorities::ComponentActions + 1,
                           &editIn3dView,
-                          &singleSelectionView3D,
+                          &SelectionContextFunctors::always, // If action is visible, it is usable
                           &singleSelectionView3D));
 
     addDesignerAction(new ModelNodeContextMenuAction(
diff --git a/src/plugins/qmldesigner/components/componentcore/dialogutils.cpp b/src/plugins/qmldesigner/components/componentcore/dialogutils.cpp
new file mode 100644
index 0000000000..f882ae528d
--- /dev/null
+++ b/src/plugins/qmldesigner/components/componentcore/dialogutils.cpp
@@ -0,0 +1,32 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include <model.h>
+
+#include <coreplugin/messagebox.h>
+
+namespace QmlDesigner {
+
+namespace DialogUtils {
+
+void showWarningForInvalidId(const QString &id)
+{
+    constexpr char text[] = R"(
+The ID <b>'%1'</b> is invalid.
+
+Make sure the ID is:
+<ul>
+<li>Unique within the QML file.</li>
+<li>Beginning with a lowercase letter.</li>
+<li>Without any blank space or symbol.</li>
+<li>Not a reserved QML keyword. </li>
+</ul>
+)";
+
+    Core::AsynchronousMessageBox::warning(Model::tr("Invalid Id"),
+                                          Model::tr(text).arg(id));
+}
+
+} // namespace DialogUtils
+
+} //QmlDesigner
diff --git a/src/plugins/qmldesigner/components/componentcore/dialogutils.h b/src/plugins/qmldesigner/components/componentcore/dialogutils.h
new file mode 100644
index 0000000000..3ca98016dd
--- /dev/null
+++ b/src/plugins/qmldesigner/components/componentcore/dialogutils.h
@@ -0,0 +1,17 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include <qmldesignercomponents_global.h>
+
+#include <QString>
+
+namespace QmlDesigner {
+
+namespace DialogUtils {
+
+QMLDESIGNERCOMPONENTS_EXPORT void showWarningForInvalidId(const QString &id);
+
+} // namespace DialogUtils
+} //QmlDesigner
diff --git a/src/plugins/qmldesigner/components/componentcore/layoutingridlayout.cpp b/src/plugins/qmldesigner/components/componentcore/layoutingridlayout.cpp
index 8d3412e0e8..89b50c4d1a 100644
--- a/src/plugins/qmldesigner/components/componentcore/layoutingridlayout.cpp
+++ b/src/plugins/qmldesigner/components/componentcore/layoutingridlayout.cpp
@@ -452,7 +452,9 @@ void LayoutInGridLayout::removeSpacersBySpanning(QList<ModelNode> &nodes)
 {
     for (const ModelNode &node : std::as_const(m_spacerNodes)) {
         if (int index = nodes.indexOf(node)) {
-            ModelNode before = nodes.at(index -1);
+            ModelNode before;
+            if (index > 0)
+                before = nodes.at(index - 1);
             if (m_spacerNodes.contains(before)) {
                 m_spacerNodes.removeAll(node);
                 m_layoutedNodes.removeAll(node);
diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.cpp b/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.cpp
index f6e18458b2..4cbebd738d 100644
--- a/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.cpp
+++ b/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.cpp
@@ -105,8 +105,10 @@ bool selectionIsImported3DAsset(const SelectionContext &selectionState)
             // Node is not a file component, so we have to check if the current doc itself is
             fileName = node.model()->fileUrl().toLocalFile();
         }
-        if (fileName.contains(Constants::QUICK_3D_ASSETS_FOLDER))
+        if (QmlDesignerPlugin::instance()->documentManager()
+                .generatedComponentUtils().isImport3dPath(fileName)) {
             return true;
+        }
     }
     return false;
 }
diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.h b/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.h
index eb4915b1d0..aec14e9d04 100644
--- a/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.h
+++ b/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.h
@@ -25,6 +25,16 @@ namespace QmlDesigner {
 using SelectionContextPredicate = std::function<bool (const SelectionContext&)>;
 using SelectionContextOperation = std::function<void (const SelectionContext&)>;
 
+namespace SelectionContextHelpers {
+
+inline bool contains(const QmlItemNode &node, const QPointF &position)
+{
+    return node.isValid()
+           && node.instanceSceneTransform().mapRect(node.instanceBoundingRect()).contains(position);
+}
+
+} // namespace SelectionContextHelpers
+
 namespace SelectionContextFunctors {
 
 inline bool always(const SelectionContext &)
@@ -99,8 +109,22 @@ inline bool singleSelectionNotRoot(const SelectionContext &selectionState)
 
 inline bool singleSelectionView3D(const SelectionContext &selectionState)
 {
-    return selectionState.singleNodeIsSelected()
-           && selectionState.currentSingleSelectedNode().metaInfo().isQtQuick3DView3D();
+    if (selectionState.singleNodeIsSelected()
+        && selectionState.currentSingleSelectedNode().metaInfo().isQtQuick3DView3D()) {
+        return true;
+    }
+
+    // If currently selected node is not View3D, check if there is a View3D under the cursor.
+    if (!selectionState.scenePosition().isNull()) {
+        // Assumption is that last match in allModelNodes() list is the topmost one.
+        const QList<ModelNode> allNodes = selectionState.view()->allModelNodes();
+        for (int i = allNodes.size() - 1; i >= 0; --i) {
+            if (SelectionContextHelpers::contains(allNodes[i], selectionState.scenePosition()))
+                return allNodes[i].metaInfo().isQtQuick3DView3D();
+        }
+    }
+
+    return false;
 }
 
 inline bool selectionHasProperty(const SelectionContext &selectionState, const char *property)
diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
index cebe7d7c53..c24ec9aa3e 100644
--- a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
+++ b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
@@ -1138,18 +1138,12 @@ static QString getAssetDefaultDirectory(const QString &assetDir, const QString &
 {
     QString adjustedDefaultDirectory = defaultDirectory;
 
-    Utils::FilePath contentPath = QmlDesignerPlugin::instance()->documentManager().currentProjectDirPath();
-
-    if (contentPath.pathAppended("content").exists())
-        contentPath = contentPath.pathAppended("content");
+    Utils::FilePath contentPath = QmlDesignerPlugin::instance()->documentManager().currentResourcePath();
 
     Utils::FilePath assetPath = contentPath.pathAppended(assetDir);
 
-    if (!assetPath.exists()) {
-        // Create the default asset type directory if it doesn't exist
-        QDir dir(contentPath.toString());
-        dir.mkpath(assetDir);
-    }
+    if (!assetPath.exists())
+        assetPath.createDir();
 
     if (assetPath.exists() && assetPath.isDir())
         adjustedDefaultDirectory = assetPath.toString();
@@ -1691,10 +1685,38 @@ void updateImported3DAsset(const SelectionContext &selectionContext)
 
 void editIn3dView(const SelectionContext &selectionContext)
 {
-    if (selectionContext.view() && selectionContext.hasSingleSelectedModelNode()
+    if (!selectionContext.view())
+        return;
+
+    ModelNode targetNode;
+
+    if (selectionContext.hasSingleSelectedModelNode()
         && selectionContext.currentSingleSelectedNode().metaInfo().isQtQuick3DView3D()) {
+        targetNode = selectionContext.currentSingleSelectedNode();
+    }
+
+    const QPointF scenePos = selectionContext.scenePosition();
+    if (!targetNode.isValid() && !scenePos.isNull()) {
+        // If currently selected node is not View3D, check if there is a View3D under the cursor.
+        // Assumption is that last match in allModelNodes() list is the topmost one.
+        const QList<ModelNode> allNodes = selectionContext.view()->allModelNodes();
+        for (int i = allNodes.size() - 1; i >= 0; --i) {
+            if (SelectionContextHelpers::contains(allNodes[i], selectionContext.scenePosition())) {
+                if (allNodes[i].metaInfo().isQtQuick3DView3D())
+                    targetNode = allNodes[i];
+                break;
+            }
+        }
+    }
+
+    if (targetNode.isValid()) {
         QmlDesignerPlugin::instance()->mainWidget()->showDockWidget("Editor3D", true);
-        selectionContext.view()->emitView3DAction(View3DActionType::AlignViewToCamera, true);
+        if (scenePos.isNull()) {
+            selectionContext.view()->emitView3DAction(View3DActionType::AlignViewToCamera, true);
+        } else {
+            selectionContext.view()->emitCustomNotification("pick_3d_node_from_2d_scene",
+                                                            {targetNode}, {scenePos});
+        }
     }
 }
 
@@ -1727,13 +1749,12 @@ void openOldEffectMaker(const QString &filePath)
         return;
     }
 
-    Utils::FilePath projectPath = target->project()->projectDirectory();
-    QString effectName = QFileInfo(filePath).baseName();
-    QString effectResDir = QLatin1String(Constants::DEFAULT_EFFECTS_IMPORT_FOLDER)
-                           + "/" + effectName;
-    Utils::FilePath effectResPath = projectPath.pathAppended(effectResDir);
+    Utils::FilePath effectResPath = QmlDesignerPlugin::instance()->documentManager()
+                                        .generatedComponentUtils().composedEffectsBasePath()
+                                        .pathAppended(QFileInfo(filePath).baseName());
+
     if (!effectResPath.exists())
-        QDir().mkpath(effectResPath.toString());
+        effectResPath.createDir();
 
     const QtSupport::QtVersion *baseQtVersion = QtSupport::QtKitAspect::qtVersion(target->kit());
     if (baseQtVersion) {
@@ -1769,14 +1790,11 @@ void openOldEffectMaker(const QString &filePath)
 
 Utils::FilePath getEffectsImportDirectory()
 {
-    QString defaultDir = QLatin1String(Constants::DEFAULT_EFFECTS_IMPORT_FOLDER);
-    Utils::FilePath projectPath = QmlDesignerPlugin::instance()->documentManager().currentProjectDirPath();
-    Utils::FilePath effectsPath = projectPath.pathAppended(defaultDir);
+    Utils::FilePath effectsPath = QmlDesignerPlugin::instance()->documentManager()
+                                      .generatedComponentUtils().composedEffectsBasePath();
 
-    if (!effectsPath.exists()) {
-        QDir dir(projectPath.toString());
-        dir.mkpath(effectsPath.toString());
-    }
+    if (!effectsPath.exists())
+        effectsPath.createDir();
 
     return effectsPath;
 }
@@ -1794,12 +1812,9 @@ QString getEffectsDefaultDirectory(const QString &defaultDir)
 
 QString getEffectIcon(const QString &effectPath)
 {
-    Utils::FilePath projectPath = QmlDesignerPlugin::instance()->documentManager().currentProjectDirPath();
-    QString effectName = QFileInfo(effectPath).baseName();
-    QString effectResDir = "asset_imports/Effects/" + effectName;
-    Utils::FilePath effectResPath = projectPath.resolvePath(effectResDir + "/" + effectName + ".qml");
-
-    return effectResPath.exists() ? QString("effectExported") : QString("effectClass");
+    Utils::FilePath effectFile = QmlDesignerPlugin::instance()->documentManager()
+                                     .generatedComponentUtils().composedEffectPath(effectPath);
+    return effectFile.exists() ? QString("effectExported") : QString("effectClass");
 }
 
 bool useLayerEffect()
diff --git a/src/plugins/qmldesigner/components/componentcore/resourcegenerator.cpp b/src/plugins/qmldesigner/components/componentcore/resourcegenerator.cpp
index 4a229564c6..24047f650f 100644
--- a/src/plugins/qmldesigner/components/componentcore/resourcegenerator.cpp
+++ b/src/plugins/qmldesigner/components/componentcore/resourcegenerator.cpp
@@ -222,6 +222,10 @@ bool createQmlrcFile(const FilePath &qmlrcFilePath)
     rccProcess.setWorkingDirectory(project->projectDirectory());
 
     const QStringList arguments = {"--binary",
+                                   "--compress",
+                                   "9",
+                                   "--threshold",
+                                   "30",
                                    "--output",
                                    qmlrcFilePath.toString(),
                                    tempQrcFile.toString()};
diff --git a/src/plugins/qmldesigner/components/componentcore/theme.cpp b/src/plugins/qmldesigner/components/componentcore/theme.cpp
index af495fd3b5..ef618447e7 100644
--- a/src/plugins/qmldesigner/components/componentcore/theme.cpp
+++ b/src/plugins/qmldesigner/components/componentcore/theme.cpp
@@ -10,6 +10,7 @@
 
 #include <utils/stylehelper.h>
 
+#include <qqml.h>
 #include <QApplication>
 #include <QMainWindow>
 #include <QPointer>
@@ -18,7 +19,7 @@
 #include <QQmlProperty>
 #include <QRegularExpression>
 #include <QScreen>
-#include <qqml.h>
+#include <QWindow>
 
 static Q_LOGGING_CATEGORY(themeLog, "qtc.qmldesigner.theme", QtWarningMsg)
 
@@ -140,7 +141,9 @@ bool Theme::highPixelDensity() const
 
 QWindow *Theme::mainWindowHandle() const
 {
-    return Core::ICore::mainWindow()->windowHandle();
+    QWindow *handle = Core::ICore::mainWindow()->windowHandle();
+    QQmlEngine::setObjectOwnership(handle, QJSEngine::CppOwnership);
+    return handle;
 }
 
 QPixmap Theme::getPixmap(const QString &id)
diff --git a/src/plugins/qmldesigner/components/componentcore/theme.h b/src/plugins/qmldesigner/components/componentcore/theme.h
index 73184d391c..392f6c94f6 100644
--- a/src/plugins/qmldesigner/components/componentcore/theme.h
+++ b/src/plugins/qmldesigner/components/componentcore/theme.h
@@ -83,6 +83,7 @@ public:
         binding_medium,
         bounds_small,
         branch_medium,
+        cameraSpeed_medium,
         camera_medium,
         camera_small,
         centerHorizontal,
diff --git a/src/plugins/qmldesigner/components/componentcore/viewmanager.cpp b/src/plugins/qmldesigner/components/componentcore/viewmanager.cpp
index 05d6f5fdf0..b011d9fbbf 100644
--- a/src/plugins/qmldesigner/components/componentcore/viewmanager.cpp
+++ b/src/plugins/qmldesigner/components/componentcore/viewmanager.cpp
@@ -67,16 +67,20 @@ public:
         , collectionView{externalDependencies}
         , contentLibraryView{externalDependencies}
         , componentView{externalDependencies}
+#ifndef QTC_USE_QML_DESIGNER_LITE
         , edit3DView{externalDependencies}
+#endif
         , formEditorView{externalDependencies}
         , textEditorView{externalDependencies}
         , assetsLibraryView{externalDependencies}
         , itemLibraryView(imageCache, externalDependencies)
         , navigatorView{externalDependencies}
         , propertyEditorView(imageCache, externalDependencies)
+#ifndef QTC_USE_QML_DESIGNER_LITE
         , materialEditorView{externalDependencies}
         , materialBrowserView{imageCache, externalDependencies}
         , textureEditorView{imageCache, externalDependencies}
+#endif
         , statesEditorView{externalDependencies}
     {}
 
@@ -89,16 +93,20 @@ public:
     CollectionView collectionView;
     ContentLibraryView contentLibraryView;
     ComponentView componentView;
+#ifndef QTC_USE_QML_DESIGNER_LITE
     Edit3DView edit3DView;
+#endif
     FormEditorView formEditorView;
     TextEditorView textEditorView;
     AssetsLibraryView assetsLibraryView;
     ItemLibraryView itemLibraryView;
     NavigatorView navigatorView;
     PropertyEditorView propertyEditorView;
+#ifndef QTC_USE_QML_DESIGNER_LITE
     MaterialEditorView materialEditorView;
     MaterialBrowserView materialBrowserView;
     TextureEditorView textureEditorView;
+#endif
     StatesEditorView statesEditorView;
 
     std::vector<std::unique_ptr<AbstractView>> additionalViews;
@@ -203,6 +211,7 @@ QList<AbstractView *> ViewManager::views() const
 
 QList<AbstractView *> ViewManager::standardViews() const
 {
+#ifndef QTC_USE_QML_DESIGNER_LITE
     QList<AbstractView *> list = {&d->edit3DView,
                                   &d->formEditorView,
                                   &d->textEditorView,
@@ -215,6 +224,16 @@ QList<AbstractView *> ViewManager::standardViews() const
                                   &d->textureEditorView,
                                   &d->statesEditorView,
                                   &d->designerActionManagerView};
+#else
+    QList<AbstractView *> list = {&d->formEditorView,
+                                  &d->textEditorView,
+                                  &d->assetsLibraryView,
+                                  &d->itemLibraryView,
+                                  &d->navigatorView,
+                                  &d->propertyEditorView,
+                                  &d->statesEditorView,
+                                  &d->designerActionManagerView};
+#endif
 
     if (enableModelEditor())
         list.append(&d->collectionView);
@@ -384,16 +403,20 @@ QList<WidgetInfo> ViewManager::widgetInfos() const
 {
     QList<WidgetInfo> widgetInfoList;
 
+#ifndef QTC_USE_QML_DESIGNER_LITE
     widgetInfoList.append(d->edit3DView.widgetInfo());
+#endif
     widgetInfoList.append(d->formEditorView.widgetInfo());
     widgetInfoList.append(d->textEditorView.widgetInfo());
     widgetInfoList.append(d->assetsLibraryView.widgetInfo());
     widgetInfoList.append(d->itemLibraryView.widgetInfo());
     widgetInfoList.append(d->navigatorView.widgetInfo());
     widgetInfoList.append(d->propertyEditorView.widgetInfo());
+#ifndef QTC_USE_QML_DESIGNER_LITE
     widgetInfoList.append(d->materialEditorView.widgetInfo());
     widgetInfoList.append(d->materialBrowserView.widgetInfo());
     widgetInfoList.append(d->textureEditorView.widgetInfo());
+#endif
     widgetInfoList.append(d->statesEditorView.widgetInfo());
     if (enableModelEditor())
         widgetInfoList.append(d->collectionView.widgetInfo());
diff --git a/src/plugins/qmldesigner/components/contentlibrary/contentlibrarybundleimporter.cpp b/src/plugins/qmldesigner/components/contentlibrary/contentlibrarybundleimporter.cpp
index 9e6bdd03b9..5c8d42a306 100644
--- a/src/plugins/qmldesigner/components/contentlibrary/contentlibrarybundleimporter.cpp
+++ b/src/plugins/qmldesigner/components/contentlibrary/contentlibrarybundleimporter.cpp
@@ -32,9 +32,6 @@ ContentLibraryBundleImporter::ContentLibraryBundleImporter(const QString &bundle
 {
     m_importTimer.setInterval(200);
     connect(&m_importTimer, &QTimer::timeout, this, &ContentLibraryBundleImporter::handleImportTimer);
-    m_moduleName = QStringLiteral("%1.%2").arg(
-                QLatin1String(Constants::COMPONENT_BUNDLES_FOLDER),
-                m_bundleId).mid(1); // Chop leading slash
 }
 
 // Returns empty string on success or an error message on failure.
@@ -69,7 +66,7 @@ QString ContentLibraryBundleImporter::importComponent(const QString &qmlFile,
     QString qmldirContent = QString::fromUtf8(qmldirPath.fileContents().value_or(QByteArray()));
     if (qmldirContent.isEmpty()) {
         qmldirContent.append("module ");
-        qmldirContent.append(m_moduleName);
+        qmldirContent.append(moduleName());
         qmldirContent.append('\n');
     }
 
@@ -77,7 +74,9 @@ QString ContentLibraryBundleImporter::importComponent(const QString &qmlFile,
     const bool qmlFileExists = qmlSourceFile.exists();
     const QString qmlType = qmlSourceFile.baseName();
     const QString fullTypeName = QStringLiteral("%1.%2.%3")
-            .arg(QLatin1String(Constants::COMPONENT_BUNDLES_FOLDER).mid(1), m_bundleId, qmlType);
+                                     .arg(QmlDesignerPlugin::instance()->documentManager()
+                                              .generatedComponentUtils().componentBundlesTypePrefix(),
+                                          m_bundleId, qmlType);
     if (m_pendingTypes.contains(fullTypeName) && !m_pendingTypes[fullTypeName])
         return QStringLiteral("Unable to import while unimporting the same type: '%1'").arg(fullTypeName);
     if (!qmldirContent.contains(qmlFile)) {
@@ -126,7 +125,7 @@ QString ContentLibraryBundleImporter::importComponent(const QString &qmlFile,
     if (!model)
         return "Model not available, cannot add import statement or update code model";
 
-    Import import = Import::createLibraryImport(m_moduleName, "1.0");
+    Import import = Import::createLibraryImport(moduleName(), "1.0");
     if (!model->hasImport(import)) {
         if (model->possibleImports().contains(import)) {
             m_importAddPending = false;
@@ -134,7 +133,7 @@ QString ContentLibraryBundleImporter::importComponent(const QString &qmlFile,
                 model->changeImports({import}, {});
             } catch (const RewritingException &) {
                 // No point in trying to add import asynchronously either, so just fail out
-                return QStringLiteral("Failed to add import statement for: '%1'").arg(m_moduleName);
+                return QStringLiteral("Failed to add import statement for: '%1'").arg(moduleName());
             }
         } else {
             // If import is not yet possible, import statement needs to be added asynchronously to
@@ -188,7 +187,7 @@ void ContentLibraryBundleImporter::handleImportTimer()
 
     if (m_importAddPending) {
         try {
-            Import import = Import::createLibraryImport(m_moduleName, "1.0");
+            Import import = Import::createLibraryImport(moduleName(), "1.0");
             if (model->possibleImports().contains(import)) {
                 model->changeImports({import}, {});
                 m_importAddPending = false;
@@ -253,6 +252,13 @@ void ContentLibraryBundleImporter::writeAssetRefMap(const Utils::FilePath &bundl
     }
 }
 
+QString ContentLibraryBundleImporter::moduleName()
+{
+    return QStringLiteral("%1.%2").arg(QmlDesignerPlugin::instance()->documentManager()
+                                           .generatedComponentUtils().componentBundlesTypePrefix(),
+                                       m_bundleId);
+}
+
 QString ContentLibraryBundleImporter::unimportComponent(const QString &qmlFile)
 {
     FilePath bundleImportPath = resolveBundleImportPath();
@@ -275,7 +281,9 @@ QString ContentLibraryBundleImporter::unimportComponent(const QString &qmlFile)
 
     QString qmlType = qmlFilePath.baseName();
     const QString fullTypeName = QStringLiteral("%1.%2.%3")
-            .arg(QLatin1String(Constants::COMPONENT_BUNDLES_FOLDER).mid(1), m_bundleId, qmlType);
+                                     .arg(QmlDesignerPlugin::instance()->documentManager()
+                                              .generatedComponentUtils().componentBundlesTypePrefix(),
+                                          m_bundleId, qmlType);
     if (m_pendingTypes.contains(fullTypeName) && m_pendingTypes[fullTypeName])
         return QStringLiteral("Unable to unimport while importing the same type: '%1'").arg(fullTypeName);
 
@@ -327,7 +335,7 @@ QString ContentLibraryBundleImporter::unimportComponent(const QString &qmlFile)
         auto doc = QmlDesignerPlugin::instance()->currentDesignDocument();
         Model *model = doc ? doc->currentModel() : nullptr;
         if (model) {
-            Import import = Import::createLibraryImport(m_moduleName, "1.0");
+            Import import = Import::createLibraryImport(moduleName(), "1.0");
             if (model->imports().contains(import))
                 model->changeImports({}, {import});
         }
@@ -342,16 +350,12 @@ QString ContentLibraryBundleImporter::unimportComponent(const QString &qmlFile)
 
 FilePath ContentLibraryBundleImporter::resolveBundleImportPath()
 {
-    FilePath bundleImportPath = QmlDesignerPlugin::instance()->documentManager().currentProjectDirPath();
+    FilePath bundleImportPath = QmlDesignerPlugin::instance()->documentManager()
+                                    .generatedComponentUtils().componentBundlesBasePath();
     if (bundleImportPath.isEmpty())
         return bundleImportPath;
 
-    const QString projectBundlePath = QStringLiteral("%1%2/%3").arg(
-                QLatin1String(Constants::DEFAULT_ASSET_IMPORT_FOLDER),
-                QLatin1String(Constants::COMPONENT_BUNDLES_FOLDER),
-                m_bundleId).mid(1); // Chop leading slash
-
-    return bundleImportPath.resolvePath(projectBundlePath);
+    return bundleImportPath.resolvePath(m_bundleId);
 }
 
 } // namespace QmlDesigner::Internal
diff --git a/src/plugins/qmldesigner/components/contentlibrary/contentlibrarybundleimporter.h b/src/plugins/qmldesigner/components/contentlibrary/contentlibrarybundleimporter.h
index 3aff09fe34..7fb2a48886 100644
--- a/src/plugins/qmldesigner/components/contentlibrary/contentlibrarybundleimporter.h
+++ b/src/plugins/qmldesigner/components/contentlibrary/contentlibrarybundleimporter.h
@@ -46,10 +46,10 @@ private:
     void handleImportTimer();
     QVariantHash loadAssetRefMap(const Utils::FilePath &bundlePath);
     void writeAssetRefMap(const Utils::FilePath &bundlePath, const QVariantHash &assetRefMap);
+    QString moduleName();
 
     Utils::FilePath m_bundleDir;
     QString m_bundleId;
-    QString m_moduleName;
     QStringList m_sharedFiles;
     QTimer m_importTimer;
     int m_importTimerCount = 0;
diff --git a/src/plugins/qmldesigner/components/contentlibrary/contentlibraryeffectsmodel.cpp b/src/plugins/qmldesigner/components/contentlibrary/contentlibraryeffectsmodel.cpp
index 6b1de2d2a7..334c017116 100644
--- a/src/plugins/qmldesigner/components/contentlibrary/contentlibraryeffectsmodel.cpp
+++ b/src/plugins/qmldesigner/components/contentlibrary/contentlibraryeffectsmodel.cpp
@@ -7,8 +7,8 @@
 #include "contentlibraryeffect.h"
 #include "contentlibraryeffectscategory.h"
 #include "contentlibrarywidget.h"
-#include "qmldesignerconstants.h"
 
+#include <qmldesignerplugin.h>
 #include <utils/algorithm.h>
 #include <utils/qtcassert.h>
 #include <utils/hostosinfo.h>
@@ -187,10 +187,11 @@ void ContentLibraryEffectsModel::loadBundle()
 
             QUrl icon = QUrl::fromLocalFile(bundleDir.filePath(itemObj.value("icon").toString()));
             QString qml = itemObj.value("qml").toString();
-            TypeName type = QLatin1String("%1.%2.%3").arg(
-                                    QLatin1String(Constants::COMPONENT_BUNDLES_FOLDER).mid(1),
-                                    bundleId,
-                                    qml.chopped(4)).toLatin1(); // chopped(4): remove .qml
+            TypeName type = QLatin1String("%1.%2.%3")
+                                .arg(QmlDesignerPlugin::instance()->documentManager()
+                                         .generatedComponentUtils().componentBundlesTypePrefix(),
+                                     bundleId,
+                                     qml.chopped(4)).toLatin1(); // chopped(4): remove .qml
 
             auto bundleItem = new ContentLibraryEffect(category, item, qml, type, icon, files);
 
diff --git a/src/plugins/qmldesigner/components/contentlibrary/contentlibrarymaterial.h b/src/plugins/qmldesigner/components/contentlibrary/contentlibrarymaterial.h
index f546ea98cd..55af2accbd 100644
--- a/src/plugins/qmldesigner/components/contentlibrary/contentlibrarymaterial.h
+++ b/src/plugins/qmldesigner/components/contentlibrary/contentlibrarymaterial.h
@@ -3,9 +3,8 @@
 
 #pragma once
 
-#include "qmldesignercorelib_global.h"
+#include "nodeinstanceglobal.h"
 
-#include <QDataStream>
 #include <QObject>
 #include <QUrl>
 
@@ -22,6 +21,7 @@ class ContentLibraryMaterial : public QObject
     Q_PROPERTY(QString bundleMaterialBaseWebUrl MEMBER m_baseWebUrl CONSTANT)
     Q_PROPERTY(QString bundleMaterialParentPath READ parentDirPath CONSTANT)
     Q_PROPERTY(QStringList bundleMaterialFiles READ allFiles CONSTANT)
+    Q_PROPERTY(QString itemType MEMBER m_itemType CONSTANT)
 
 public:
     ContentLibraryMaterial(QObject *parent,
@@ -31,7 +31,7 @@ public:
                            const QUrl &icon,
                            const QStringList &files,
                            const QString &downloadPath,
-                           const QString &baseWebUrl);
+                           const QString &baseWebUrl = {});
 
     bool filter(const QString &searchText);
 
@@ -66,6 +66,7 @@ private:
     QString m_downloadPath;
     QString m_baseWebUrl;
     QStringList m_allFiles;
+    const QString m_itemType = "material";
 };
 
 } // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/components/contentlibrary/contentlibrarymaterialsmodel.cpp b/src/plugins/qmldesigner/components/contentlibrary/contentlibrarymaterialsmodel.cpp
index 7594c691b5..26747d359c 100644
--- a/src/plugins/qmldesigner/components/contentlibrary/contentlibrarymaterialsmodel.cpp
+++ b/src/plugins/qmldesigner/components/contentlibrary/contentlibrarymaterialsmodel.cpp
@@ -8,12 +8,12 @@
 #include "contentlibrarymaterialscategory.h"
 #include "contentlibrarywidget.h"
 
-#include <designerpaths.h>
+#include "designerpaths.h"
 #include "filedownloader.h"
 #include "fileextractor.h"
 #include "multifiledownloader.h"
-#include "qmldesignerconstants.h"
-#include "qmldesignerplugin.h"
+
+#include <qmldesignerplugin.h>
 
 #include <utils/algorithm.h>
 #include <utils/hostosinfo.h>
@@ -275,9 +275,9 @@ void ContentLibraryMaterialsModel::loadMaterialBundle(const QDir &matBundleDir)
         auto category = new ContentLibraryMaterialsCategory(this, cat);
 
         const QJsonObject matsObj = catsObj.value(cat).toObject();
-        const QStringList mats = matsObj.keys();
-        for (const QString &mat : mats) {
-            const QJsonObject matObj = matsObj.value(mat).toObject();
+        const QStringList matsNames = matsObj.keys();
+        for (const QString &matName : matsNames) {
+            const QJsonObject matObj = matsObj.value(matName).toObject();
 
             QStringList files;
             const QJsonArray assetsArr = matObj.value("files").toArray();
@@ -286,12 +286,13 @@ void ContentLibraryMaterialsModel::loadMaterialBundle(const QDir &matBundleDir)
 
             QUrl icon = QUrl::fromLocalFile(matBundleDir.filePath(matObj.value("icon").toString()));
             QString qml = matObj.value("qml").toString();
-            TypeName type = QLatin1String("%1.%2.%3").arg(
-                                    QLatin1String(Constants::COMPONENT_BUNDLES_FOLDER).mid(1),
-                                    bundleId,
-                                    qml.chopped(4)).toLatin1(); // chopped(4): remove .qml
+            TypeName type = QLatin1String("%1.%2.%3")
+                                .arg(QmlDesignerPlugin::instance()->documentManager()
+                                         .generatedComponentUtils().componentBundlesTypePrefix(),
+                                     bundleId,
+                                     qml.chopped(4)).toLatin1(); // chopped(4): remove .qml
 
-            auto bundleMat = new ContentLibraryMaterial(category, mat, qml, type, icon, files,
+            auto bundleMat = new ContentLibraryMaterial(category, matName, qml, type, icon, files,
                                                         m_downloadPath, m_baseUrl);
 
             category->addBundleMaterial(bundleMat);
diff --git a/src/plugins/qmldesigner/components/contentlibrary/contentlibrarytexture.cpp b/src/plugins/qmldesigner/components/contentlibrary/contentlibrarytexture.cpp
index 7ab239aab4..80dd7e816f 100644
--- a/src/plugins/qmldesigner/components/contentlibrary/contentlibrarytexture.cpp
+++ b/src/plugins/qmldesigner/components/contentlibrary/contentlibrarytexture.cpp
@@ -12,20 +12,19 @@
 namespace QmlDesigner {
 
 ContentLibraryTexture::ContentLibraryTexture(QObject *parent, const QFileInfo &iconFileInfo,
-                                             const QString &downloadPath, const QUrl &icon,
-                                             const QString &key, const QString &webTextureUrl,
-                                             const QString &webIconUrl, const QString &fileExt,
+                                             const QString &dirPath, const QString &suffix,
                                              const QSize &dimensions, const qint64 sizeInBytes,
-                                             bool hasUpdate, bool isNew)
+                                             const QString &key, const QString &textureUrl,
+                                             const QString &iconUrl, bool hasUpdate, bool isNew)
     : QObject(parent)
     , m_iconPath(iconFileInfo.filePath())
-    , m_downloadPath(downloadPath)
-    , m_webTextureUrl(webTextureUrl)
-    , m_webIconUrl(webIconUrl)
+    , m_dirPath(dirPath)
+    , m_textureUrl(textureUrl)
+    , m_iconUrl(iconUrl)
     , m_baseName{iconFileInfo.baseName()}
-    , m_fileExt(fileExt)
+    , m_suffix(suffix)
     , m_textureKey(key)
-    , m_icon(icon)
+    , m_icon(QUrl::fromLocalFile(iconFileInfo.absoluteFilePath()))
     , m_dimensions(dimensions)
     , m_sizeInBytes(sizeInBytes)
     , m_hasUpdate(hasUpdate)
@@ -54,9 +53,9 @@ QString ContentLibraryTexture::iconPath() const
     return m_iconPath;
 }
 
-QString ContentLibraryTexture::resolveFileExt()
+QString ContentLibraryTexture::resolveSuffix()
 {
-    const QFileInfoList files = QDir(m_downloadPath).entryInfoList(QDir::Files);
+    const QFileInfoList files = QDir(m_dirPath).entryInfoList(QDir::Files);
     const QFileInfoList textureFiles = Utils::filtered(files, [this](const QFileInfo &fi) {
         return fi.baseName() == m_baseName;
     });
@@ -76,22 +75,20 @@ QString ContentLibraryTexture::resolveFileExt()
 
 QString ContentLibraryTexture::resolveToolTipText()
 {
-    if (m_fileExt.isEmpty()) {
-        // No supplied or resolved extension means we have just the icon and no other data
-        return m_baseName;
-    }
+    if (m_suffix.isEmpty())
+        return m_baseName; // empty suffix means we have just the icon and no other data
 
-    QString fileName = m_baseName + m_fileExt;
+    QString fileName = m_baseName + m_suffix;
     QString imageInfo;
 
     if (!m_isDownloaded && m_sizeInBytes > 0 && !m_dimensions.isNull()) {
-        imageInfo = ImageUtils::imageInfo(m_dimensions, m_sizeInBytes);
+        imageInfo = ImageUtils::imageInfoString(m_dimensions, m_sizeInBytes);
     } else {
-        QString fullDownloadPath = m_downloadPath + '/' + fileName;
-        imageInfo = ImageUtils::imageInfo(fullDownloadPath);
+        QString fullDownloadPath = m_dirPath + '/' + fileName;
+        imageInfo = ImageUtils::imageInfoString(fullDownloadPath);
     }
 
-    return QStringLiteral("%1\n%2").arg(fileName, imageInfo);
+    return QString("%1\n%2").arg(fileName, imageInfo);
 }
 
 bool ContentLibraryTexture::isDownloaded() const
@@ -99,9 +96,9 @@ bool ContentLibraryTexture::isDownloaded() const
     return m_isDownloaded;
 }
 
-QString ContentLibraryTexture::downloadedTexturePath() const
+QString ContentLibraryTexture::texturePath() const
 {
-    return m_downloadPath + '/' + m_baseName + m_fileExt;
+    return m_dirPath + '/' + m_baseName + m_suffix;
 }
 
 void ContentLibraryTexture::setDownloaded()
@@ -116,16 +113,16 @@ void ContentLibraryTexture::setDownloaded()
 
 void ContentLibraryTexture::doSetDownloaded()
 {
-    if (m_fileExt.isEmpty())
-        m_fileExt = resolveFileExt();
+    if (m_suffix.isEmpty())
+        m_suffix = resolveSuffix();
 
-    m_isDownloaded = QFileInfo::exists(downloadedTexturePath());
+    m_isDownloaded = QFileInfo::exists(texturePath());
     m_toolTip = resolveToolTipText();
 }
 
 QString ContentLibraryTexture::parentDirPath() const
 {
-    return m_downloadPath;
+    return m_dirPath;
 }
 
 QString ContentLibraryTexture::textureKey() const
diff --git a/src/plugins/qmldesigner/components/contentlibrary/contentlibrarytexture.h b/src/plugins/qmldesigner/components/contentlibrary/contentlibrarytexture.h
index 9f5b46630f..8f7197bc72 100644
--- a/src/plugins/qmldesigner/components/contentlibrary/contentlibrarytexture.h
+++ b/src/plugins/qmldesigner/components/contentlibrary/contentlibrarytexture.h
@@ -19,17 +19,18 @@ class ContentLibraryTexture : public QObject
     Q_PROPERTY(QString textureToolTip MEMBER m_toolTip NOTIFY textureToolTipChanged)
     Q_PROPERTY(QUrl textureIcon MEMBER m_icon CONSTANT)
     Q_PROPERTY(bool textureVisible MEMBER m_visible NOTIFY textureVisibleChanged)
-    Q_PROPERTY(QString textureWebUrl MEMBER m_webTextureUrl CONSTANT)
-    Q_PROPERTY(QString textureWebIconUrl MEMBER m_webIconUrl CONSTANT)
+    Q_PROPERTY(QString textureUrl MEMBER m_textureUrl CONSTANT)
+    Q_PROPERTY(QString textureIconUrl MEMBER m_iconUrl CONSTANT)
     Q_PROPERTY(bool textureHasUpdate WRITE setHasUpdate READ hasUpdate NOTIFY hasUpdateChanged)
     Q_PROPERTY(bool textureIsNew MEMBER m_isNew CONSTANT)
     Q_PROPERTY(QString textureKey MEMBER m_textureKey CONSTANT)
+    Q_PROPERTY(QString itemType MEMBER m_itemType CONSTANT)
 
 public:
-    ContentLibraryTexture(QObject *parent, const QFileInfo &iconFileInfo, const QString &downloadPath,
-                          const QUrl &icon, const QString &key, const QString &webTextureUrl,
-                          const QString &webIconUrl, const QString &fileExt, const QSize &dimensions,
-                          const qint64 sizeInBytes, bool hasUpdate, bool isNew);
+    ContentLibraryTexture(QObject *parent, const QFileInfo &iconFileInfo, const QString &dirPath,
+                          const QString &suffix, const QSize &dimensions, const qint64 sizeInBytes,
+                          const QString &key = {}, const QString &textureUrl = {},
+                          const QString &iconUrl = {}, bool hasUpdate = false, bool isNew = false);
 
     Q_INVOKABLE bool isDownloaded() const;
     Q_INVOKABLE void setDownloaded();
@@ -38,7 +39,7 @@ public:
 
     QUrl icon() const;
     QString iconPath() const;
-    QString downloadedTexturePath() const;
+    QString texturePath() const;
     QString parentDirPath() const;
     QString textureKey() const;
 
@@ -51,17 +52,17 @@ signals:
     void hasUpdateChanged();
 
 private:
-    QString resolveFileExt();
+    QString resolveSuffix();
     QString resolveToolTipText();
     void doSetDownloaded();
 
     QString m_iconPath;
-    QString m_downloadPath;
-    QString m_webTextureUrl;
-    QString m_webIconUrl;
+    QString m_dirPath;
+    QString m_textureUrl;
+    QString m_iconUrl;
     QString m_toolTip;
     QString m_baseName;
-    QString m_fileExt;
+    QString m_suffix;
     QString m_textureKey;
     QUrl m_icon;
     QSize m_dimensions;
@@ -71,6 +72,7 @@ private:
     bool m_visible = true;
     bool m_hasUpdate = false;
     bool m_isNew = false;
+    const QString m_itemType = "texture";
 };
 
 } // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/components/contentlibrary/contentlibrarytexturescategory.cpp b/src/plugins/qmldesigner/components/contentlibrary/contentlibrarytexturescategory.cpp
index 77519ad88f..0cafe8d138 100644
--- a/src/plugins/qmldesigner/components/contentlibrary/contentlibrarytexturescategory.cpp
+++ b/src/plugins/qmldesigner/components/contentlibrary/contentlibrarytexturescategory.cpp
@@ -14,17 +14,15 @@ namespace QmlDesigner {
 ContentLibraryTexturesCategory::ContentLibraryTexturesCategory(QObject *parent, const QString &name)
     : QObject(parent), m_name(name) {}
 
-void ContentLibraryTexturesCategory::addTexture(const QFileInfo &tex, const QString &downloadPath,
+void ContentLibraryTexturesCategory::addTexture(const QFileInfo &texIcon, const QString &downloadPath,
                                                 const QString &key, const QString &webTextureUrl,
-                                                const QString &webIconUrl, const QString &fileExt,
+                                                const QString &iconUrl, const QString &suffix,
                                                 const QSize &dimensions, const qint64 sizeInBytes,
                                                 bool hasUpdate, bool isNew)
 {
-    QUrl icon = QUrl::fromLocalFile(tex.absoluteFilePath());
-
     m_categoryTextures.append(new ContentLibraryTexture(
-        this, tex, downloadPath, icon, key, webTextureUrl, webIconUrl,
-        fileExt, dimensions, sizeInBytes, hasUpdate, isNew));
+        this, texIcon, downloadPath, suffix, dimensions, sizeInBytes,
+        key, webTextureUrl, iconUrl, hasUpdate, isNew));
 }
 
 bool ContentLibraryTexturesCategory::filter(const QString &searchText)
diff --git a/src/plugins/qmldesigner/components/contentlibrary/contentlibrarytexturescategory.h b/src/plugins/qmldesigner/components/contentlibrary/contentlibrarytexturescategory.h
index 166528f05a..857346df06 100644
--- a/src/plugins/qmldesigner/components/contentlibrary/contentlibrarytexturescategory.h
+++ b/src/plugins/qmldesigner/components/contentlibrary/contentlibrarytexturescategory.h
@@ -28,7 +28,7 @@ public:
     ContentLibraryTexturesCategory(QObject *parent, const QString &name);
 
     void addTexture(const QFileInfo &tex, const QString &subPath, const QString &key,
-                    const QString &webTextureUrl, const QString &webIconUrl, const QString &fileExt,
+                    const QString &webTextureUrl, const QString &iconUrl, const QString &suffix,
                     const QSize &dimensions, const qint64 sizeInBytes, bool hasUpdate, bool isNew);
     bool filter(const QString &searchText);
 
diff --git a/src/plugins/qmldesigner/components/contentlibrary/contentlibrarytexturesmodel.cpp b/src/plugins/qmldesigner/components/contentlibrary/contentlibrarytexturesmodel.cpp
index 319ca2686f..b575b6b9b2 100644
--- a/src/plugins/qmldesigner/components/contentlibrary/contentlibrarytexturesmodel.cpp
+++ b/src/plugins/qmldesigner/components/contentlibrary/contentlibrarytexturesmodel.cpp
@@ -95,37 +95,37 @@ QHash<int, QByteArray> ContentLibraryTexturesModel::roleNames() const
 /**
  * @brief Load the bundle categorized icons. Actual textures are downloaded on demand
  *
- * @param bundlePath local path to the bundle folder and icons
- * @param metaData bundle textures metadata
+ * @param textureBundleUrl remote url to the texture bundle
+ * @param bundleIconPath local path to the texture bundle icons folder
+ * @param jsonData bundle textures information from the bundle json
  */
-void ContentLibraryTexturesModel::loadTextureBundle(const QString &remoteUrl, const QString &iconsUrl,
+void ContentLibraryTexturesModel::loadTextureBundle(const QString &textureBundleUrl,
                                                     const QString &bundleIconPath,
-                                                    const QVariantMap &metaData)
+                                                    const QVariantMap &jsonData)
 {
     if (!m_bundleCategories.isEmpty())
         return;
 
     QDir bundleDir = QString("%1/%2").arg(bundleIconPath, m_category);
-    if (!bundleDir.exists()) {
-        qWarning() << __FUNCTION__ << "textures bundle folder doesn't exist." << bundleDir.absolutePath();
-        return;
-    }
+    QTC_ASSERT(bundleDir.exists(), return);
 
-    const QVariantMap imageItems = metaData.value("image_items").toMap();
+    const QVariantMap imageItems = jsonData.value("image_items").toMap();
 
     const QFileInfoList dirs = bundleDir.entryInfoList(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot);
     for (const QFileInfo &dir : dirs) {
         auto category = new ContentLibraryTexturesCategory(this, dir.fileName());
-        const QFileInfoList texFiles = QDir(dir.filePath()).entryInfoList(QDir::Files);
-        for (const QFileInfo &tex : texFiles) {
-            QString textureUrl = QString("%1/%2/%3.zip").arg(remoteUrl, dir.fileName(), tex.baseName());
-            QString iconUrl = QString("%1/%2/%3.png").arg(iconsUrl, dir.fileName(), tex.baseName());
-
-            QString localDownloadPath = QString("%1/%2/%3")
+        const QFileInfoList texIconFiles = QDir(dir.filePath()).entryInfoList(QDir::Files);
+        for (const QFileInfo &texIcon : texIconFiles) {
+            QString textureUrl = QString("%1/%2/%3/%4.zip").arg(textureBundleUrl, m_category,
+                                                                dir.fileName(), texIcon.baseName());
+            QString iconUrl = QString("%1/icons/%2/%3/%4.png").arg(textureBundleUrl, m_category,
+                                                                   dir.fileName(), texIcon.baseName());
+
+            QString texturePath = QString("%1/%2/%3")
                                             .arg(Paths::bundlesPathSetting(),
                                                  m_category,
                                                  dir.fileName());
-            QString key = QString("%1/%2/%3").arg(m_category, dir.fileName(), tex.baseName());
+            QString key = QString("%1/%2/%3").arg(m_category, dir.fileName(), texIcon.baseName());
             QString fileExt;
             QSize dimensions;
             qint64 sizeInBytes = -1;
@@ -141,7 +141,7 @@ void ContentLibraryTexturesModel::loadTextureBundle(const QString &remoteUrl, co
                 isNew = m_newFiles.contains(key);
             }
 
-            category->addTexture(tex, localDownloadPath, key, textureUrl, iconUrl, fileExt,
+            category->addTexture(texIcon, texturePath, key, textureUrl, iconUrl, fileExt,
                                  dimensions, sizeInBytes, hasUpdate, isNew);
         }
         m_bundleCategories.append(category);
diff --git a/src/plugins/qmldesigner/components/contentlibrary/contentlibrarytexturesmodel.h b/src/plugins/qmldesigner/components/contentlibrary/contentlibrarytexturesmodel.h
index 92db4151a8..94e223a251 100644
--- a/src/plugins/qmldesigner/components/contentlibrary/contentlibrarytexturesmodel.h
+++ b/src/plugins/qmldesigner/components/contentlibrary/contentlibrarytexturesmodel.h
@@ -37,8 +37,8 @@ public:
     void setHasSceneEnv(bool b);
 
     void resetModel();
-    void loadTextureBundle(const QString &remoteUrl, const QString &iconsUrl,
-                           const QString &bundlePath, const QVariantMap &metaData);
+    void loadTextureBundle(const QString &textureBundleUrl, const QString &bundlePath,
+                           const QVariantMap &metaData);
 
 signals:
     void isEmptyChanged();
diff --git a/src/plugins/qmldesigner/components/contentlibrary/contentlibraryusermodel.cpp b/src/plugins/qmldesigner/components/contentlibrary/contentlibraryusermodel.cpp
new file mode 100644
index 0000000000..ed9723a151
--- /dev/null
+++ b/src/plugins/qmldesigner/components/contentlibrary/contentlibraryusermodel.cpp
@@ -0,0 +1,424 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "contentlibraryusermodel.h"
+
+#include "contentlibrarybundleimporter.h"
+#include "contentlibraryeffect.h"
+#include "contentlibrarymaterial.h"
+#include "contentlibrarymaterialscategory.h"
+#include "contentlibrarytexture.h"
+#include "contentlibrarywidget.h"
+
+#include <designerpaths.h>
+#include <imageutils.h>
+#include <qmldesignerplugin.h>
+
+#include <utils/algorithm.h>
+#include <utils/hostosinfo.h>
+#include <utils/qtcassert.h>
+
+#include <QCoreApplication>
+#include <QFileInfo>
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QQmlEngine>
+#include <QStandardPaths>
+#include <QUrl>
+
+namespace QmlDesigner {
+
+ContentLibraryUserModel::ContentLibraryUserModel(ContentLibraryWidget *parent)
+    : QAbstractListModel(parent)
+    , m_widget(parent)
+{
+    m_userCategories = {tr("Materials"), tr("Textures")/*, tr("3D"), tr("Effects"), tr("2D components")*/}; // TODO
+
+    loadMaterialBundle();
+    loadTextureBundle();
+}
+
+int ContentLibraryUserModel::rowCount(const QModelIndex &) const
+{
+    return m_userCategories.size();
+}
+
+QVariant ContentLibraryUserModel::data(const QModelIndex &index, int role) const
+{
+    QTC_ASSERT(index.isValid() && index.row() < m_userCategories.size(), return {});
+    QTC_ASSERT(roleNames().contains(role), return {});
+
+    if (role == NameRole)
+        return m_userCategories.at(index.row());
+
+    if (role == ItemsRole) {
+        if (index.row() == 0)
+            return QVariant::fromValue(m_userMaterials);
+        if (index.row() == 1)
+            return QVariant::fromValue(m_userTextures);
+        if (index.row() == 2)
+            return QVariant::fromValue(m_user3DItems);
+        if (index.row() == 3)
+            return QVariant::fromValue(m_userEffects);
+    }
+
+    if (role == VisibleRole)
+        return true; // TODO
+
+    return {};
+}
+
+bool ContentLibraryUserModel::isValidIndex(int idx) const
+{
+    return idx > -1 && idx < rowCount();
+}
+
+void ContentLibraryUserModel::updateIsEmpty()
+{
+    bool anyMatVisible = Utils::anyOf(m_userMaterials, [&](ContentLibraryMaterial *mat) {
+        return mat->visible();
+    });
+
+    bool newEmpty = !anyMatVisible || !m_widget->hasMaterialLibrary() || !hasRequiredQuick3DImport();
+
+    if (newEmpty != m_isEmpty) {
+        m_isEmpty = newEmpty;
+        emit isEmptyChanged();
+    }
+}
+
+void ContentLibraryUserModel::addMaterial(const QString &name, const QString &qml,
+                                          const QUrl &icon, const QStringList &files)
+{
+    auto libMat = new ContentLibraryMaterial(this, name, qml, qmlToModule(qml), icon, files,
+                                             Paths::bundlesPathSetting().append("/User/materials"));
+
+    m_userMaterials.append(libMat);
+    int matSectionIdx = 0;
+    emit dataChanged(index(matSectionIdx), index(matSectionIdx));
+}
+
+void ContentLibraryUserModel::addTextures(const QStringList &paths)
+{
+    QDir bundleDir{Paths::bundlesPathSetting() + "/User/textures"};
+    bundleDir.mkpath(".");
+    bundleDir.mkdir("icons");
+
+    for (const QString &path : paths) {
+        QFileInfo fileInfo(path);
+        QString suffix = '.' + fileInfo.suffix();
+        auto iconFileInfo = QFileInfo(fileInfo.path().append("/icons/").append(fileInfo.baseName() + ".png"));
+        QPair<QSize, qint64> info = ImageUtils::imageInfo(path);
+        QString dirPath = fileInfo.path();
+        QSize imgDims = info.first;
+        qint64 imgFileSize = info.second;
+
+        auto tex = new ContentLibraryTexture(this, iconFileInfo, dirPath, suffix, imgDims, imgFileSize);
+        m_userTextures.append(tex);
+    }
+
+    int texSectionIdx = 1;
+    emit dataChanged(index(texSectionIdx), index(texSectionIdx));
+}
+
+// returns unique library material's name and qml component
+QPair<QString, QString> ContentLibraryUserModel::getUniqueLibMaterialNameAndQml(const QString &matName) const
+{
+    QTC_ASSERT(!m_bundleObj.isEmpty(), return {});
+
+    const QJsonObject matsObj = m_bundleObj.value("materials").toObject();
+    const QStringList matNames = matsObj.keys();
+
+    QStringList matQmls;
+    for (const QString &matName : matNames)
+        matQmls.append(matsObj.value(matName).toObject().value("qml").toString().chopped(4)); // remove .qml
+
+    QString retName = matName.isEmpty() ? "Material" : matName;
+    retName = retName.trimmed();
+
+    QString retQml = retName;
+    retQml.remove(' ');
+    if (retQml.at(0).isLower())
+        retQml[0] = retQml.at(0).toUpper();
+    retQml.prepend("My");
+
+    int num = 1;
+    if (matNames.contains(retName) || matQmls.contains(retQml)) {
+        while (matNames.contains(retName + QString::number(num))
+             || matQmls.contains(retQml + QString::number(num))) {
+            ++num;
+        }
+
+        retName += QString::number(num);
+        retQml += QString::number(num);
+    }
+
+    return {retName, retQml + ".qml"};
+}
+
+TypeName ContentLibraryUserModel::qmlToModule(const QString &qmlName) const
+{
+    return QLatin1String("%1.%2.%3").arg(QmlDesignerPlugin::instance()->documentManager()
+                                             .generatedComponentUtils().componentBundlesTypePrefix(),
+                                         m_bundleId,
+                                         qmlName.chopped(4)).toLatin1(); // chopped(4): remove .qml
+}
+
+QHash<int, QByteArray> ContentLibraryUserModel::roleNames() const
+{
+    static const QHash<int, QByteArray> roles {
+        {NameRole, "categoryName"},
+        {VisibleRole, "categoryVisible"},
+        {ItemsRole, "categoryItems"}
+    };
+    return roles;
+}
+
+void ContentLibraryUserModel::createImporter(const QString &bundlePath, const QString &bundleId,
+                                             const QStringList &sharedFiles)
+{
+    m_importer = new Internal::ContentLibraryBundleImporter(bundlePath, bundleId, sharedFiles);
+#ifdef QDS_USE_PROJECTSTORAGE
+    connect(m_importer,
+            &Internal::ContentLibraryBundleImporter::importFinished,
+            this,
+            [&](const QmlDesigner::TypeName &typeName) {
+                m_importerRunning = false;
+                emit importerRunningChanged();
+                if (typeName.size())
+                    emit bundleMaterialImported(typeName);
+            });
+#else
+    connect(m_importer,
+            &Internal::ContentLibraryBundleImporter::importFinished,
+            this,
+            [&](const QmlDesigner::NodeMetaInfo &metaInfo) {
+                m_importerRunning = false;
+                emit importerRunningChanged();
+                if (metaInfo.isValid())
+                    emit bundleMaterialImported(metaInfo);
+            });
+#endif
+
+    connect(m_importer, &Internal::ContentLibraryBundleImporter::unimportFinished, this,
+            [&](const QmlDesigner::NodeMetaInfo &metaInfo) {
+                Q_UNUSED(metaInfo)
+                m_importerRunning = false;
+                emit importerRunningChanged();
+                emit bundleMaterialUnimported(metaInfo);
+            });
+
+    resetModel();
+    updateIsEmpty();
+}
+
+QJsonObject &ContentLibraryUserModel::bundleJsonObjectRef()
+{
+    return m_bundleObj;
+}
+
+void ContentLibraryUserModel::loadMaterialBundle()
+{
+    if (m_matBundleExists)
+        return;
+
+    QDir bundleDir{Paths::bundlesPathSetting() + "/User/materials"};
+    bundleDir.mkpath(".");
+
+    if (m_bundleObj.isEmpty()) {
+        auto jsonFilePath = Utils::FilePath::fromString(bundleDir.filePath("user_materials_bundle.json"));
+        if (!jsonFilePath.exists()) {
+            QString jsonContent = "{\n";
+            jsonContent += "    \"id\": \"UserMaterialBundle\",\n";
+            jsonContent += "    \"materials\": {\n";
+            jsonContent += "    }\n";
+            jsonContent += "}";
+            jsonFilePath.writeFileContents(jsonContent.toLatin1());
+        }
+
+        QFile jsonFile(jsonFilePath.path());
+        if (!jsonFile.open(QIODevice::ReadOnly)) {
+            qWarning("Couldn't open user_materials_bundle.json");
+            return;
+        }
+
+        QJsonDocument matBundleJsonDoc = QJsonDocument::fromJson(jsonFile.readAll());
+        if (matBundleJsonDoc.isNull()) {
+            qWarning("Invalid user_materials_bundle.json file");
+            return;
+        } else {
+            m_bundleObj = matBundleJsonDoc.object();
+        }
+    }
+
+    m_bundleId = m_bundleObj.value("id").toString();
+
+    // parse materials
+    const QJsonObject matsObj = m_bundleObj.value("materials").toObject();
+    const QStringList materialNames = matsObj.keys();
+    for (const QString &matName : materialNames) {
+        const QJsonObject matObj = matsObj.value(matName).toObject();
+
+        QStringList files;
+        const QJsonArray assetsArr = matObj.value("files").toArray();
+        for (const auto /*QJson{Const,}ValueRef*/ &asset : assetsArr)
+            files.append(asset.toString());
+
+        QUrl icon = QUrl::fromLocalFile(bundleDir.filePath(matObj.value("icon").toString()));
+        QString qml = matObj.value("qml").toString();
+
+        TypeName type = qmlToModule(qml);
+
+        auto userMat = new ContentLibraryMaterial(this, matName, qml, type, icon, files,
+                                                  bundleDir.path(), "");
+
+        m_userMaterials.append(userMat);
+    }
+
+    QStringList sharedFiles;
+    const QJsonArray sharedFilesArr = m_bundleObj.value("sharedFiles").toArray();
+    for (const auto /*QJson{Const,}ValueRef*/ &file : sharedFilesArr)
+        sharedFiles.append(file.toString());
+
+    createImporter(bundleDir.path(), m_bundleId, sharedFiles);
+
+    m_matBundleExists = true;
+    emit matBundleExistsChanged();
+}
+
+void ContentLibraryUserModel::loadTextureBundle()
+{
+    if (!m_userTextures.isEmpty())
+        return;
+
+    QDir bundleDir{Paths::bundlesPathSetting() + "/User/textures"};
+    bundleDir.mkpath(".");
+    bundleDir.mkdir("icons");
+
+    const QFileInfoList fileInfos = bundleDir.entryInfoList(QDir::Files);
+    for (const QFileInfo &fileInfo : fileInfos) {
+        QString suffix = '.' + fileInfo.suffix();
+        auto iconFileInfo = QFileInfo(fileInfo.path().append("/icons/").append(fileInfo.baseName() + ".png"));
+        QPair<QSize, qint64> info = ImageUtils::imageInfo(fileInfo.path());
+        QString dirPath = fileInfo.path();
+        QSize imgDims = info.first;
+        qint64 imgFileSize = info.second;
+
+        auto tex = new ContentLibraryTexture(this, iconFileInfo, dirPath, suffix, imgDims, imgFileSize);
+        m_userTextures.append(tex);
+    }
+
+    int texSectionIdx = 1;
+    emit dataChanged(index(texSectionIdx), index(texSectionIdx));
+}
+
+bool ContentLibraryUserModel::hasRequiredQuick3DImport() const
+{
+    return m_widget->hasQuick3DImport() && m_quick3dMajorVersion == 6 && m_quick3dMinorVersion >= 3;
+}
+
+bool ContentLibraryUserModel::matBundleExists() const
+{
+    return m_matBundleExists;
+}
+
+Internal::ContentLibraryBundleImporter *ContentLibraryUserModel::bundleImporter() const
+{
+    return m_importer;
+}
+
+void ContentLibraryUserModel::setSearchText(const QString &searchText)
+{
+    QString lowerSearchText = searchText.toLower();
+
+    if (m_searchText == lowerSearchText)
+        return;
+
+    m_searchText = lowerSearchText;
+
+    for (ContentLibraryMaterial *mat : std::as_const(m_userMaterials))
+        mat->filter(m_searchText);
+
+    updateIsEmpty();
+}
+
+void ContentLibraryUserModel::updateImportedState(const QStringList &importedMats)
+{
+    bool changed = false;
+
+    for (ContentLibraryMaterial *mat : std::as_const(m_userMaterials))
+        changed |= mat->setImported(importedMats.contains(mat->qml().chopped(4)));
+
+    if (changed)
+        resetModel();
+}
+
+void ContentLibraryUserModel::setQuick3DImportVersion(int major, int minor)
+{
+    bool oldRequiredImport = hasRequiredQuick3DImport();
+
+    m_quick3dMajorVersion = major;
+    m_quick3dMinorVersion = minor;
+
+    bool newRequiredImport = hasRequiredQuick3DImport();
+
+    if (oldRequiredImport == newRequiredImport)
+        return;
+
+    emit hasRequiredQuick3DImportChanged();
+
+    updateIsEmpty();
+}
+
+void ContentLibraryUserModel::resetModel()
+{
+    beginResetModel();
+    endResetModel();
+}
+
+void ContentLibraryUserModel::applyToSelected(ContentLibraryMaterial *mat, bool add)
+{
+    emit applyToSelectedTriggered(mat, add);
+}
+
+void ContentLibraryUserModel::addToProject(ContentLibraryMaterial *mat)
+{
+    QString err = m_importer->importComponent(mat->qml(), mat->files());
+
+    if (err.isEmpty()) {
+        m_importerRunning = true;
+        emit importerRunningChanged();
+    } else {
+        qWarning() << __FUNCTION__ << err;
+    }
+}
+
+void ContentLibraryUserModel::removeFromProject(ContentLibraryMaterial *mat)
+{
+    emit bundleMaterialAboutToUnimport(mat->type());
+
+     QString err = m_importer->unimportComponent(mat->qml());
+
+    if (err.isEmpty()) {
+        m_importerRunning = true;
+        emit importerRunningChanged();
+    } else {
+        qWarning() << __FUNCTION__ << err;
+    }
+}
+
+bool ContentLibraryUserModel::hasModelSelection() const
+{
+    return m_hasModelSelection;
+}
+
+void ContentLibraryUserModel::setHasModelSelection(bool b)
+{
+    if (b == m_hasModelSelection)
+        return;
+
+    m_hasModelSelection = b;
+    emit hasModelSelectionChanged();
+}
+
+} // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/components/contentlibrary/contentlibraryusermodel.h b/src/plugins/qmldesigner/components/contentlibrary/contentlibraryusermodel.h
new file mode 100644
index 0000000000..3e9a96fd9d
--- /dev/null
+++ b/src/plugins/qmldesigner/components/contentlibrary/contentlibraryusermodel.h
@@ -0,0 +1,132 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include "modelfwd.h"
+
+#include <QAbstractListModel>
+#include <QJsonObject>
+
+QT_FORWARD_DECLARE_CLASS(QUrl)
+
+namespace QmlDesigner {
+
+class ContentLibraryEffect;
+class ContentLibraryMaterial;
+class ContentLibraryTexture;
+class ContentLibraryWidget;
+class NodeMetaInfo;
+
+namespace Internal {
+class ContentLibraryBundleImporter;
+}
+
+class ContentLibraryUserModel : public QAbstractListModel
+{
+    Q_OBJECT
+
+    Q_PROPERTY(bool matBundleExists READ matBundleExists NOTIFY matBundleExistsChanged)
+    Q_PROPERTY(bool isEmpty MEMBER m_isEmpty NOTIFY isEmptyChanged)
+    Q_PROPERTY(bool hasRequiredQuick3DImport READ hasRequiredQuick3DImport NOTIFY hasRequiredQuick3DImportChanged)
+    Q_PROPERTY(bool hasModelSelection READ hasModelSelection NOTIFY hasModelSelectionChanged)
+    Q_PROPERTY(bool importerRunning MEMBER m_importerRunning NOTIFY importerRunningChanged)
+    Q_PROPERTY(QList<ContentLibraryMaterial *> userMaterials MEMBER m_userMaterials NOTIFY userMaterialsChanged)
+    Q_PROPERTY(QList<ContentLibraryTexture *> userTextures MEMBER m_userTextures NOTIFY userTexturesChanged)
+    Q_PROPERTY(QList<ContentLibraryEffect *> user3DItems MEMBER m_user3DItems NOTIFY user3DItemsChanged)
+    Q_PROPERTY(QList<ContentLibraryEffect *> userEffects MEMBER m_userEffects NOTIFY userEffectsChanged)
+
+public:
+    ContentLibraryUserModel(ContentLibraryWidget *parent = nullptr);
+
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+    QHash<int, QByteArray> roleNames() const override;
+
+    void setSearchText(const QString &searchText);
+    void updateImportedState(const QStringList &importedMats);
+
+    QPair<QString, QString> getUniqueLibMaterialNameAndQml(const QString &matName) const;
+    TypeName qmlToModule(const QString &qmlName) const;
+
+    void setQuick3DImportVersion(int major, int minor);
+
+    bool hasRequiredQuick3DImport() const;
+
+    bool matBundleExists() const;
+
+    bool hasModelSelection() const;
+    void setHasModelSelection(bool b);
+
+    void resetModel();
+    void updateIsEmpty();
+
+    void addMaterial(const QString &name, const QString &qml, const QUrl &icon, const QStringList &files);
+    void addTextures(const QStringList &paths);
+
+    void setBundleObj(const QJsonObject &newBundleObj);
+    QJsonObject &bundleJsonObjectRef();
+
+    Internal::ContentLibraryBundleImporter *bundleImporter() const;
+
+    Q_INVOKABLE void applyToSelected(QmlDesigner::ContentLibraryMaterial *mat, bool add = false);
+    Q_INVOKABLE void addToProject(QmlDesigner::ContentLibraryMaterial *mat);
+    Q_INVOKABLE void removeFromProject(QmlDesigner::ContentLibraryMaterial *mat);
+
+signals:
+    void isEmptyChanged();
+    void hasRequiredQuick3DImportChanged();
+    void hasModelSelectionChanged();
+    void userMaterialsChanged();
+    void userTexturesChanged();
+    void user3DItemsChanged();
+    void userEffectsChanged();
+
+    void applyToSelectedTriggered(QmlDesigner::ContentLibraryMaterial *mat, bool add = false);
+
+#ifdef QDS_USE_PROJECTSTORAGE
+    void bundleMaterialImported(const QmlDesigner::TypeName &typeName);
+#else
+    void bundleMaterialImported(const QmlDesigner::NodeMetaInfo &metaInfo);
+#endif
+    void bundleMaterialAboutToUnimport(const QmlDesigner::TypeName &type);
+    void bundleMaterialUnimported(const QmlDesigner::NodeMetaInfo &metaInfo);
+    void importerRunningChanged();
+    void matBundleExistsChanged();
+
+private:
+    void loadMaterialBundle();
+    void loadTextureBundle();
+    bool isValidIndex(int idx) const;
+    void createImporter(const QString &bundlePath, const QString &bundleId,
+                        const QStringList &sharedFiles);
+
+    ContentLibraryWidget *m_widget = nullptr;
+    QString m_searchText;
+    QString m_bundleId;
+
+    QList<ContentLibraryMaterial *> m_userMaterials;
+    QList<ContentLibraryTexture *> m_userTextures;
+    QList<ContentLibraryEffect *> m_userEffects;
+    QList<ContentLibraryEffect *> m_user3DItems;
+    QStringList m_userCategories;
+
+    QJsonObject m_bundleObj;
+    Internal::ContentLibraryBundleImporter *m_importer = nullptr;
+
+    bool m_isEmpty = true;
+    bool m_matBundleExists = false;
+    bool m_hasModelSelection = false;
+    bool m_importerRunning = false;
+
+    int m_quick3dMajorVersion = -1;
+    int m_quick3dMinorVersion = -1;
+
+    QString m_importerBundlePath;
+    QString m_importerBundleId;
+    QStringList m_importerSharedFiles;
+
+    enum Roles { NameRole = Qt::UserRole + 1, VisibleRole, ItemsRole };
+};
+
+} // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/components/contentlibrary/contentlibraryview.cpp b/src/plugins/qmldesigner/components/contentlibrary/contentlibraryview.cpp
index 61ae078ea8..dd8a4d9919 100644
--- a/src/plugins/qmldesigner/components/contentlibrary/contentlibraryview.cpp
+++ b/src/plugins/qmldesigner/components/contentlibrary/contentlibraryview.cpp
@@ -3,6 +3,8 @@
 
 #include "contentlibraryview.h"
 
+#include "asset.h"
+#include "bindingproperty.h"
 #include "contentlibrarybundleimporter.h"
 #include "contentlibraryeffect.h"
 #include "contentlibraryeffectsmodel.h"
@@ -10,13 +12,17 @@
 #include "contentlibrarymaterialsmodel.h"
 #include "contentlibrarytexture.h"
 #include "contentlibrarytexturesmodel.h"
+#include "contentlibraryusermodel.h"
 #include "contentlibrarywidget.h"
+#include "documentmanager.h"
 #include "externaldependenciesinterface.h"
 #include "nodelistproperty.h"
 #include "qmldesignerconstants.h"
 #include "qmlobjectnode.h"
 #include "variantproperty.h"
-#include <utils3d.h>
+#include "utils3d.h"
+
+#include <designerpaths.h>
 
 #include <coreplugin/messagebox.h>
 #include <enumeration.h>
@@ -30,6 +36,10 @@
 #include <qtsupport/qtkitaspect.h>
 #endif
 
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QPixmap>
 #include <QVector3D>
 
 namespace QmlDesigner {
@@ -204,6 +214,8 @@ WidgetInfo ContentLibraryView::widgetInfo()
 
         connect(effectsModel, &ContentLibraryEffectsModel::bundleItemUnimported, this,
                 &ContentLibraryView::updateBundleEffectsImportedState);
+
+        connectUserBundle();
     }
 
     return createWidgetInfo(m_widget.data(),
@@ -213,6 +225,64 @@ WidgetInfo ContentLibraryView::widgetInfo()
                             tr("Content Library"));
 }
 
+void ContentLibraryView::connectUserBundle()
+{
+    ContentLibraryUserModel *userModel = m_widget->userModel().data();
+
+    connect(userModel,
+            &ContentLibraryUserModel::applyToSelectedTriggered,
+            this,
+            [&](ContentLibraryMaterial *bundleMat, bool add) {
+                if (m_selectedModels.isEmpty())
+                    return;
+
+                m_bundleMaterialTargets = m_selectedModels;
+                m_bundleMaterialAddToSelected = add;
+
+                ModelNode defaultMat = getBundleMaterialDefaultInstance(bundleMat->type());
+                if (defaultMat.isValid())
+                    applyBundleMaterialToDropTarget(defaultMat);
+                else
+                    m_widget->userModel()->addToProject(bundleMat);
+            });
+
+#ifdef QDS_USE_PROJECTSTORAGE
+    connect(userModel,
+            &ContentLibraryUserModel::bundleMaterialImported,
+            this,
+            [&](const QmlDesigner::TypeName &typeName) {
+                applyBundleMaterialToDropTarget({}, typeName);
+                updateBundleUserMaterialsImportedState();
+            });
+#else
+    connect(userModel,
+            &ContentLibraryUserModel::bundleMaterialImported,
+            this,
+            [&](const QmlDesigner::NodeMetaInfo &metaInfo) {
+                applyBundleMaterialToDropTarget({}, metaInfo);
+                updateBundleUserMaterialsImportedState();
+            });
+#endif
+
+    connect(userModel, &ContentLibraryUserModel::bundleMaterialAboutToUnimport, this,
+            [&] (const QmlDesigner::TypeName &type) {
+                // delete instances of the bundle material that is about to be unimported
+                executeInTransaction("ContentLibraryView::connectUserModel", [&] {
+                    ModelNode matLib = Utils3D::materialLibraryNode(this);
+                    if (!matLib.isValid())
+                        return;
+
+                    Utils::reverseForeach(matLib.directSubModelNodes(), [&](const ModelNode &mat) {
+                        if (mat.isValid() && mat.type() == type)
+                            QmlObjectNode(mat).destroy();
+                    });
+                });
+            });
+
+    connect(userModel, &ContentLibraryUserModel::bundleMaterialUnimported, this,
+            &ContentLibraryView::updateBundleUserMaterialsImportedState);
+}
+
 void ContentLibraryView::modelAttached(Model *model)
 {
     AbstractView::modelAttached(model);
@@ -276,6 +346,7 @@ void ContentLibraryView::selectedNodesChanged(const QList<ModelNode> &selectedNo
     });
 
     m_widget->materialsModel()->setHasModelSelection(!m_selectedModels.isEmpty());
+    m_widget->userModel()->setHasModelSelection(!m_selectedModels.isEmpty());
 }
 
 void ContentLibraryView::customNotification(const AbstractView *view,
@@ -283,8 +354,6 @@ void ContentLibraryView::customNotification(const AbstractView *view,
                                             const QList<ModelNode> &nodeList,
                                             const QList<QVariant> &data)
 {
-    Q_UNUSED(data)
-
     if (view == this)
         return;
 
@@ -324,6 +393,12 @@ void ContentLibraryView::customNotification(const AbstractView *view,
         m_bundleEffectPos = data.size() == 1 ? data.first() : QVariant();
         m_widget->effectsModel()->addInstance(m_draggedBundleEffect);
         m_bundleEffectTarget = nodeList.first() ? nodeList.first() : Utils3D::active3DSceneNode(this);
+    } else if (identifier == "add_material_to_content_lib") {
+        QTC_ASSERT(nodeList.size() == 1 && data.size() == 1, return);
+
+        addLibMaterial(nodeList.first(), data.first().value<QPixmap>());
+    } else if (identifier == "add_assets_to_content_lib") {
+        addLibAssets(data.first().toStringList());
     }
 }
 
@@ -452,6 +527,163 @@ void ContentLibraryView::applyBundleMaterialToDropTarget(const ModelNode &bundle
 }
 #endif
 
+// Add a project material to Content Library's user tab
+void ContentLibraryView::addLibMaterial(const ModelNode &mat, const QPixmap &icon)
+{
+    auto bundlePath = Utils::FilePath::fromString(Paths::bundlesPathSetting() + "/User/materials/");
+
+    auto [name, qml] = m_widget->userModel()->getUniqueLibMaterialNameAndQml(
+                                    mat.variantProperty("objectName").value().toString());
+
+    bundlePath.pathAppended("icons").createDir();
+    bundlePath.pathAppended("images").createDir();
+    bundlePath.pathAppended("shaders").createDir();
+
+    QString iconPath = QLatin1String("icons/%1.png").arg(mat.id());
+    QString fullIconPath = bundlePath.pathAppended(iconPath).toString();
+
+    // save icon
+    bool iconSaved = icon.save(fullIconPath);
+    if (!iconSaved)
+        qWarning() << __FUNCTION__ << "icon save failed";
+
+    // generate and save material Qml file
+    const QStringList depAssets = writeLibMaterialQml(mat, qml);
+
+    // add the material to the bundle json
+    QJsonObject &jsonRef = m_widget->userModel()->bundleJsonObjectRef();
+    QJsonObject matsObj = jsonRef.value("materials").toObject();
+    QJsonObject matObj;
+    matObj.insert("qml", qml);
+    matObj.insert("icon", iconPath);
+    QJsonArray filesArr;
+    for (const QString &assetPath : depAssets)
+        filesArr.append(assetPath);
+    matObj.insert("files", filesArr);
+
+    matsObj.insert(name, matObj);
+    jsonRef.insert("materials", matsObj);
+    auto result = bundlePath.pathAppended("user_materials_bundle.json")
+                      .writeFileContents(QJsonDocument(jsonRef).toJson());
+    if (!result)
+        qWarning() << __FUNCTION__ << result.error();
+
+    // copy material assets to bundle folder
+    for (const QString &assetPath : depAssets) {
+        Asset asset(assetPath);
+        QString subDir;
+        if (asset.isImage())
+            subDir = "images";
+        else if (asset.isShader())
+            subDir = "shaders";
+
+        Utils::FilePath assetPathSource = DocumentManager::currentResourcePath().pathAppended(assetPath);
+        Utils::FilePath assetPathTarget = bundlePath.pathAppended(QString("%1/%2")
+                                                            .arg(subDir, "/" + asset.fileName()));
+
+        auto result = assetPathSource.copyFile(assetPathTarget);
+        if (!result)
+            qWarning() << __FUNCTION__ << result.error();
+    }
+
+    m_widget->userModel()->addMaterial(name, qml, QUrl::fromLocalFile(fullIconPath), depAssets);
+}
+
+QStringList ContentLibraryView::writeLibMaterialQml(const ModelNode &mat, const QString &qml)
+{
+    QStringList depListIds;
+    auto [qmlString, assets] = modelNodeToQmlString(mat, depListIds);
+
+    qmlString.prepend("import QtQuick\nimport QtQuick3D\n\n");
+
+    auto qmlPath = Utils::FilePath::fromString(Paths::bundlesPathSetting() + "/User/materials/" + qml);
+    auto result = qmlPath.writeFileContents(qmlString.toUtf8());
+    if (!result)
+        qWarning() << __FUNCTION__ << result.error();
+
+    return assets.values();
+}
+
+QPair<QString, QSet<QString>> ContentLibraryView::modelNodeToQmlString(const ModelNode &node,
+                                                                       QStringList &depListIds,
+                                                                       int depth)
+{
+    QString qml;
+    QSet<QString> assets;
+
+    QString indent = QString(" ").repeated(depth * 4);
+
+    qml += indent + node.simplifiedTypeName() + " {\n";
+
+    indent = QString(" ").repeated((depth + 1) * 4);
+
+    qml += indent + "id: " + (depth == 0 ? "root" : node.id()) + " \n\n";
+
+    const QList<AbstractProperty> matProps = node.properties();
+    for (const AbstractProperty &p : matProps) {
+        if (p.isVariantProperty()) {
+            QVariant pValue = p.toVariantProperty().value();
+            QString val;
+            if (strcmp(pValue.typeName(), "QString") == 0 || strcmp(pValue.typeName(), "QColor") == 0) {
+                val = QLatin1String("\"%1\"").arg(pValue.toString());
+            } else if (strcmp(pValue.typeName(), "QUrl") == 0) {
+                val = QLatin1String("\"%1\"").arg(pValue.toString());
+                assets.insert(pValue.toString());
+            } else if (strcmp(pValue.typeName(), "QmlDesigner::Enumeration") == 0) {
+                val = pValue.value<QmlDesigner::Enumeration>().toString();
+            } else {
+                val = pValue.toString();
+            }
+
+            qml += indent + p.name() + ": " + val + "\n";
+        } else if (p.isBindingProperty()) {
+            qml += indent + p.name() + ": " + p.toBindingProperty().expression() + "\n";
+
+            ModelNode depNode = modelNodeForId(p.toBindingProperty().expression());
+
+            if (depNode && !depListIds.contains(depNode.id())) {
+                depListIds.append(depNode.id());
+                auto [depQml, depAssets] = modelNodeToQmlString(depNode, depListIds, depth + 1);
+                qml += "\n" + depQml + "\n";
+                assets.unite(depAssets);
+            }
+        }
+    }
+
+    indent = QString(" ").repeated(depth * 4);
+
+    qml += indent + "}\n";
+
+    return {qml, assets};
+}
+
+void ContentLibraryView::addLibAssets(const QStringList &paths)
+{
+    auto bundlePath = Utils::FilePath::fromString(Paths::bundlesPathSetting() + "/User/textures");
+    QStringList pathsInBundle;
+
+    for (const QString &path : paths) {
+        Asset asset(path);
+        auto assetPath = Utils::FilePath::fromString(path);
+
+        // save icon
+        QString iconSavePath = bundlePath.pathAppended("icons/" + assetPath.baseName() + ".png").toString();
+        QPixmap icon = asset.pixmap({120, 120});
+        bool iconSaved = icon.save(iconSavePath);
+        if (!iconSaved)
+            qWarning() << __FUNCTION__ << "icon save failed";
+
+        // save asset
+        auto result = assetPath.copyFile(bundlePath.pathAppended(asset.fileName()));
+        if (!result)
+            qWarning() << __FUNCTION__ << result.error();
+
+        pathsInBundle.append(bundlePath.pathAppended(asset.fileName()).toString());
+    }
+
+    m_widget->userModel()->addTextures(pathsInBundle);
+}
+
 ModelNode ContentLibraryView::getBundleMaterialDefaultInstance(const TypeName &type)
 {
     ModelNode matLib = Utils3D::materialLibraryNode(this);
@@ -477,6 +709,7 @@ ModelNode ContentLibraryView::getBundleMaterialDefaultInstance(const TypeName &t
 
     return {};
 }
+
 #ifdef QDS_USE_PROJECTSTORAGE
 ModelNode ContentLibraryView::createMaterial(const TypeName &typeName)
 {
@@ -548,6 +781,25 @@ void ContentLibraryView::updateBundleMaterialsImportedState()
     m_widget->materialsModel()->updateImportedState(importedBundleMats);
 }
 
+void ContentLibraryView::updateBundleUserMaterialsImportedState()
+{
+    using namespace Utils;
+
+    if (!m_widget->userModel()->bundleImporter())
+        return;
+
+    QStringList importedBundleMats;
+
+    FilePath bundlePath = m_widget->userModel()->bundleImporter()->resolveBundleImportPath();
+
+    if (bundlePath.exists()) {
+        importedBundleMats = transform(bundlePath.dirEntries({{"*.qml"}, QDir::Files}),
+                                       [](const FilePath &f) { return f.fileName().chopped(4); });
+    }
+
+    m_widget->userModel()->updateImportedState(importedBundleMats);
+}
+
 void ContentLibraryView::updateBundleEffectsImportedState()
 {
     using namespace Utils;
diff --git a/src/plugins/qmldesigner/components/contentlibrary/contentlibraryview.h b/src/plugins/qmldesigner/components/contentlibrary/contentlibraryview.h
index 3b57b7a4ab..03d42fa8bc 100644
--- a/src/plugins/qmldesigner/components/contentlibrary/contentlibraryview.h
+++ b/src/plugins/qmldesigner/components/contentlibrary/contentlibraryview.h
@@ -10,6 +10,8 @@
 #include <QObject>
 #include <QPointer>
 
+QT_FORWARD_DECLARE_CLASS(QPixmap)
+
 namespace QmlDesigner {
 
 class ContentLibraryEffect;
@@ -46,10 +48,18 @@ public:
                               const QVariant &data) override;
 
 private:
+    void connectUserBundle();
     void active3DSceneChanged(qint32 sceneId);
     void updateBundleMaterialsImportedState();
+    void updateBundleUserMaterialsImportedState();
     void updateBundleEffectsImportedState();
     void updateBundlesQuick3DVersion();
+    void addLibMaterial(const ModelNode &mat, const QPixmap &icon);
+    void addLibAssets(const QStringList &paths);
+    QStringList writeLibMaterialQml(const ModelNode &mat, const QString &qml);
+    QPair<QString, QSet<QString>> modelNodeToQmlString(const ModelNode &node, QStringList &depListIds,
+                                                       int depth = 0);
+
 #ifdef QDS_USE_PROJECTSTORAGE
     void applyBundleMaterialToDropTarget(const ModelNode &bundleMat, const TypeName &typeName = {});
 #else
diff --git a/src/plugins/qmldesigner/components/contentlibrary/contentlibrarywidget.cpp b/src/plugins/qmldesigner/components/contentlibrary/contentlibrarywidget.cpp
index c885a76ba7..9375d43fd4 100644
--- a/src/plugins/qmldesigner/components/contentlibrary/contentlibrarywidget.cpp
+++ b/src/plugins/qmldesigner/components/contentlibrary/contentlibrarywidget.cpp
@@ -10,6 +10,7 @@
 #include "contentlibrarytexture.h"
 #include "contentlibrarytexturesmodel.h"
 #include "contentlibraryiconprovider.h"
+#include "contentlibraryusermodel.h"
 
 #include "utils/filedownloader.h"
 #include "utils/fileextractor.h"
@@ -100,10 +101,10 @@ bool ContentLibraryWidget::eventFilter(QObject *obj, QEvent *event)
                 && m_textureToDrag->isDownloaded()) {
                 QMimeData *mimeData = new QMimeData;
                 mimeData->setData(Constants::MIME_TYPE_BUNDLE_TEXTURE,
-                                  {m_textureToDrag->downloadedTexturePath().toUtf8()});
+                                  {m_textureToDrag->texturePath().toUtf8()});
 
                 // Allows standard file drag-n-drop. As of now needed to drop on Assets view
-                mimeData->setUrls({QUrl::fromLocalFile(m_textureToDrag->downloadedTexturePath())});
+                mimeData->setUrls({QUrl::fromLocalFile(m_textureToDrag->texturePath())});
 
                 emit bundleTextureDragStarted(m_textureToDrag);
                 model->startDrag(mimeData, m_textureToDrag->icon().toLocalFile());
@@ -126,6 +127,7 @@ ContentLibraryWidget::ContentLibraryWidget()
     , m_texturesModel(new ContentLibraryTexturesModel("Textures", this))
     , m_environmentsModel(new ContentLibraryTexturesModel("Environments", this))
     , m_effectsModel(new ContentLibraryEffectsModel(this))
+    , m_userModel(new ContentLibraryUserModel(this))
 {
     qmlRegisterType<QmlDesigner::FileDownloader>("WebFetcher", 1, 0, "FileDownloader");
     qmlRegisterType<QmlDesigner::FileExtractor>("WebFetcher", 1, 0, "FileExtractor");
@@ -140,18 +142,12 @@ ContentLibraryWidget::ContentLibraryWidget()
     m_quickWidget->engine()->addImportPath(propertyEditorResourcesPath() + "/imports");
     m_quickWidget->setClearColor(Theme::getColor(Theme::Color::DSpanelBackground));
 
-    m_baseUrl = QmlDesignerPlugin::settings()
-                    .value(DesignerSettingsKey::DOWNLOADABLE_BUNDLES_URL).toString()
-                + "/textures";
+    m_textureBundleUrl = QmlDesignerPlugin::settings()
+                    .value(DesignerSettingsKey::DOWNLOADABLE_BUNDLES_URL).toString() + "/textures";
 
-    m_texturesUrl = m_baseUrl + "/Textures";
-    m_textureIconsUrl = m_baseUrl + "/icons/Textures";
-    m_environmentIconsUrl = m_baseUrl + "/icons/Environments";
-    m_environmentsUrl = m_baseUrl + "/Environments";
+    m_bundlePath = Paths::bundlesPathSetting();
 
-    m_downloadPath = Paths::bundlesPathSetting();
-
-    loadTextureBundle();
+    loadTextureBundles();
 
     Theme::setupTheme(m_quickWidget->engine());
     m_quickWidget->quickWidget()->installEventFilter(this);
@@ -177,38 +173,34 @@ ContentLibraryWidget::ContentLibraryWidget()
                         {"materialsModel",    QVariant::fromValue(m_materialsModel.data())},
                         {"texturesModel",     QVariant::fromValue(m_texturesModel.data())},
                         {"environmentsModel", QVariant::fromValue(m_environmentsModel.data())},
-                        {"effectsModel",      QVariant::fromValue(m_effectsModel.data())}});
+                        {"effectsModel",      QVariant::fromValue(m_effectsModel.data())},
+                        {"userModel",         QVariant::fromValue(m_userModel.data())}});
 
     reloadQmlSource();
 }
 
-QVariantMap ContentLibraryWidget::readBundleMetadata()
+QVariantMap ContentLibraryWidget::readTextureBundleJson()
 {
-    QVariantMap metaData;
-    QFile jsonFile(m_downloadPath + "/texture_bundle.json");
+    QVariantMap jsonData;
+    QFile jsonFile(m_bundlePath + "/texture_bundle.json");
     if (jsonFile.open(QIODevice::ReadOnly | QIODevice::Text))
-        metaData = QJsonDocument::fromJson(jsonFile.readAll()).toVariant().toMap();
+        jsonData = QJsonDocument::fromJson(jsonFile.readAll()).toVariant().toMap();
 
-    int version = metaData["version"].toInt();
+    int version = jsonData["version"].toInt();
     if (version > TextureBundleMetadataVersion) {
         qWarning() << "Unrecognized texture metadata file version: " << version;
         return {};
     }
 
-    return metaData;
+    return jsonData;
 }
 
-void ContentLibraryWidget::loadTextureBundle()
+void ContentLibraryWidget::loadTextureBundles()
 {
-    QDir bundleDir{m_downloadPath};
+    QDir bundleDir{m_bundlePath};
 
-    if (fetchTextureBundleMetadata(bundleDir) && fetchTextureBundleIcons(bundleDir)) {
-        QString bundleIconPath = m_downloadPath + "/TextureBundleIcons";
-        QVariantMap metaData = readBundleMetadata();
-        m_texturesModel->loadTextureBundle(m_texturesUrl, m_textureIconsUrl, bundleIconPath, metaData);
-        m_environmentsModel->loadTextureBundle(m_environmentsUrl, m_environmentIconsUrl,
-                                               bundleIconPath, metaData);
-    }
+    if (fetchTextureBundleJson(bundleDir) && fetchTextureBundleIcons(bundleDir))
+        populateTextureBundleModels();
 }
 
 std::tuple<QVariantMap, QVariantMap, QVariantMap> ContentLibraryWidget::compareTextureMetaFiles(
@@ -272,9 +264,9 @@ void ContentLibraryWidget::fetchNewTextureIcons(const QVariantMap &existingFiles
     });
 
     auto multidownloader = new MultiFileDownloader(this);
-    multidownloader->setBaseUrl(QString(m_baseUrl + "/icons"));
+    multidownloader->setBaseUrl(QString(m_textureBundleUrl + "/icons"));
     multidownloader->setFiles(fileList);
-    multidownloader->setTargetDirPath(m_downloadPath + "/TextureBundleIcons");
+    multidownloader->setTargetDirPath(m_bundlePath + "/TextureBundleIcons");
 
     auto downloader = new FileDownloader(this);
     downloader->setDownloadEnabled(true);
@@ -314,15 +306,8 @@ void ContentLibraryWidget::fetchNewTextureIcons(const QVariantMap &existingFiles
             existingFile.flush();
         }
 
-        if (fetchTextureBundleIcons(bundleDir)) {
-            QString bundleIconPath = m_downloadPath + "/TextureBundleIcons";
-            QVariantMap metaData = readBundleMetadata();
-            m_texturesModel->loadTextureBundle(m_texturesUrl, m_textureIconsUrl, bundleIconPath,
-                                               metaData);
-            m_environmentsModel->loadTextureBundle(m_environmentsUrl, m_environmentIconsUrl,
-                                                   bundleIconPath, metaData);
-        }
-
+        if (fetchTextureBundleIcons(bundleDir))
+            populateTextureBundleModels();
     });
 
     multidownloader->start();
@@ -433,50 +418,45 @@ QStringList ContentLibraryWidget::saveNewTextures(const QDir &bundleDir, const Q
     }
 }
 
-bool ContentLibraryWidget::fetchTextureBundleMetadata(const QDir &bundleDir)
+bool ContentLibraryWidget::fetchTextureBundleJson(const QDir &bundleDir)
 {
     QString filePath = bundleDir.filePath("texture_bundle.json");
 
     QFileInfo fi(filePath);
-    bool metaFileExists = fi.exists() && fi.size() > 0;
+    bool jsonFileExists = fi.exists() && fi.size() > 0;
 
-    QString metaFileUrl = m_baseUrl + "/texture_bundle.zip";
+    QString bundleZipUrl = m_textureBundleUrl + "/texture_bundle.zip";
     FileDownloader *downloader = new FileDownloader(this);
-    downloader->setUrl(metaFileUrl);
+    downloader->setUrl(bundleZipUrl);
     downloader->setProbeUrl(false);
     downloader->setDownloadEnabled(true);
+    downloader->start();
 
     QObject::connect(downloader, &FileDownloader::downloadFailed, this,
-                     [this, metaFileExists, bundleDir] {
-        if (metaFileExists) {
-            if (fetchTextureBundleIcons(bundleDir)) {
-                QString bundleIconPath = m_downloadPath + "/TextureBundleIcons";
-                QVariantMap metaData = readBundleMetadata();
-                m_texturesModel->loadTextureBundle(m_texturesUrl, m_textureIconsUrl, bundleIconPath,
-                                                   metaData);
-                m_environmentsModel->loadTextureBundle(m_environmentsUrl, m_environmentIconsUrl,
-                                                       bundleIconPath, metaData);
-            }
+                     [this, jsonFileExists, bundleDir] {
+        if (jsonFileExists) {
+            if (fetchTextureBundleIcons(bundleDir))
+                populateTextureBundleModels();
         }
     });
 
     QObject::connect(downloader, &FileDownloader::finishedChanged, this,
-                     [this, downloader, bundleDir, metaFileExists, filePath] {
+                     [this, downloader, bundleDir, jsonFileExists, filePath] {
         FileExtractor *extractor = new FileExtractor(this);
         extractor->setArchiveName(downloader->completeBaseName());
         extractor->setSourceFile(downloader->outputFile());
-        if (!metaFileExists)
+        if (!jsonFileExists)
             extractor->setTargetPath(bundleDir.absolutePath());
 
         extractor->setAlwaysCreateDir(false);
         extractor->setClearTargetPathContents(false);
 
         QObject::connect(extractor, &FileExtractor::finishedChanged, this,
-                         [this, downloader, bundleDir, extractor, metaFileExists, filePath] {
+                         [this, downloader, bundleDir, extractor, jsonFileExists, filePath] {
             downloader->deleteLater();
             extractor->deleteLater();
 
-            if (metaFileExists) {
+            if (jsonFileExists) {
                 QVariantMap newFiles, existing;
                 QVariantMap modifiedFilesEntries;
 
@@ -498,32 +478,35 @@ bool ContentLibraryWidget::fetchTextureBundleMetadata(const QDir &bundleDir)
                 }
             }
 
-            if (fetchTextureBundleIcons(bundleDir)) {
-                QString bundleIconPath = m_downloadPath + "/TextureBundleIcons";
-                QVariantMap metaData = readBundleMetadata();
-                m_texturesModel->loadTextureBundle(m_texturesUrl, m_textureIconsUrl, bundleIconPath,
-                                                   metaData);
-                m_environmentsModel->loadTextureBundle(m_environmentsUrl, m_environmentIconsUrl,
-                                                       bundleIconPath, metaData);
-            }
+            if (fetchTextureBundleIcons(bundleDir))
+                populateTextureBundleModels();
         });
 
         extractor->extract();
     });
 
-    downloader->start();
     return false;
 }
 
+void ContentLibraryWidget::populateTextureBundleModels()
+{
+    QVariantMap jsonData = readTextureBundleJson();
+
+    QString bundleIconPath = m_bundlePath + "/TextureBundleIcons";
+
+    m_texturesModel->loadTextureBundle(m_textureBundleUrl, bundleIconPath, jsonData);
+    m_environmentsModel->loadTextureBundle(m_textureBundleUrl, bundleIconPath, jsonData);
+}
+
 bool ContentLibraryWidget::fetchTextureBundleIcons(const QDir &bundleDir)
 {
     QString iconsPath = bundleDir.filePath("TextureBundleIcons");
 
     QDir iconsDir(iconsPath);
-    if (iconsDir.exists() && iconsDir.entryList(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot).length() > 0)
+    if (iconsDir.exists() && !iconsDir.isEmpty())
         return true;
 
-    QString zipFileUrl = m_baseUrl + "/icons.zip";
+    QString zipFileUrl = m_textureBundleUrl + "/icons.zip";
 
     FileDownloader *downloader = new FileDownloader(this);
     downloader->setUrl(zipFileUrl);
@@ -543,13 +526,7 @@ bool ContentLibraryWidget::fetchTextureBundleIcons(const QDir &bundleDir)
                          [this, downloader, extractor] {
             downloader->deleteLater();
             extractor->deleteLater();
-
-            QString bundleIconPath = m_downloadPath + "/TextureBundleIcons";
-            QVariantMap metaData = readBundleMetadata();
-            m_texturesModel->loadTextureBundle(m_texturesUrl, m_textureIconsUrl, bundleIconPath,
-                                               metaData);
-            m_environmentsModel->loadTextureBundle(m_environmentsUrl, m_environmentIconsUrl,
-                                                   bundleIconPath, metaData);
+            populateTextureBundleModels();
         });
 
         extractor->extract();
@@ -572,7 +549,7 @@ void ContentLibraryWidget::markTextureUpdated(const QString &textureKey)
         checksumOnServer = m_environmentsModel->removeModifiedFileEntry(textureKey);
 
     QJsonObject metaDataObj;
-    QFile jsonFile(m_downloadPath + "/texture_bundle.json");
+    QFile jsonFile(m_bundlePath + "/texture_bundle.json");
     if (jsonFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
         metaDataObj = QJsonDocument::fromJson(jsonFile.readAll()).object();
         jsonFile.close();
@@ -589,7 +566,7 @@ void ContentLibraryWidget::markTextureUpdated(const QString &textureKey)
     QJsonDocument outDoc(metaDataObj);
     QByteArray data = outDoc.toJson();
 
-    QFile outFile(m_downloadPath + "/texture_bundle.json");
+    QFile outFile(m_bundlePath + "/texture_bundle.json");
     if (outFile.open(QIODeviceBase::WriteOnly | QIODeviceBase::Text)) {
         outFile.write(data);
         outFile.flush();
@@ -601,6 +578,12 @@ void ContentLibraryWidget::markTextureUpdated(const QString &textureKey)
         m_environmentsModel->markTextureHasNoUpdates(subcategory, textureKey);
 }
 
+bool ContentLibraryWidget::userBundleEnabled() const
+{
+    // TODO: this method is to be removed after user bundle implementation is complete
+    return Core::ICore::settings()->value("QML/Designer/UseExperimentalFeatures45", false).toBool();
+}
+
 QSize ContentLibraryWidget::sizeHint() const
 {
     return {420, 420};
@@ -715,6 +698,7 @@ void ContentLibraryWidget::updateSearch()
     m_effectsModel->setSearchText(m_filterText);
     m_texturesModel->setSearchText(m_filterText);
     m_environmentsModel->setSearchText(m_filterText);
+    m_userModel->setSearchText(m_filterText);
     m_quickWidget->update();
 }
 
@@ -777,7 +761,7 @@ void ContentLibraryWidget::addImage(ContentLibraryTexture *tex)
     if (!tex->isDownloaded())
         return;
 
-    emit addTextureRequested(tex->downloadedTexturePath(), AddTextureMode::Image);
+    emit addTextureRequested(tex->texturePath(), AddTextureMode::Image);
 }
 
 void ContentLibraryWidget::addTexture(ContentLibraryTexture *tex)
@@ -785,7 +769,7 @@ void ContentLibraryWidget::addTexture(ContentLibraryTexture *tex)
     if (!tex->isDownloaded())
         return;
 
-    emit addTextureRequested(tex->downloadedTexturePath(), AddTextureMode::Texture);
+    emit addTextureRequested(tex->texturePath(), AddTextureMode::Texture);
 }
 
 void ContentLibraryWidget::addLightProbe(ContentLibraryTexture *tex)
@@ -793,7 +777,7 @@ void ContentLibraryWidget::addLightProbe(ContentLibraryTexture *tex)
     if (!tex->isDownloaded())
         return;
 
-    emit addTextureRequested(tex->downloadedTexturePath(), AddTextureMode::LightProbe);
+    emit addTextureRequested(tex->texturePath(), AddTextureMode::LightProbe);
 }
 
 void ContentLibraryWidget::updateSceneEnvState()
@@ -821,4 +805,9 @@ QPointer<ContentLibraryEffectsModel> ContentLibraryWidget::effectsModel() const
     return m_effectsModel;
 }
 
+QPointer<ContentLibraryUserModel> ContentLibraryWidget::userModel() const
+{
+    return m_userModel;
+}
+
 } // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/components/contentlibrary/contentlibrarywidget.h b/src/plugins/qmldesigner/components/contentlibrary/contentlibrarywidget.h
index ab71a3dc79..c4d51d0362 100644
--- a/src/plugins/qmldesigner/components/contentlibrary/contentlibrarywidget.h
+++ b/src/plugins/qmldesigner/components/contentlibrary/contentlibrarywidget.h
@@ -24,6 +24,7 @@ class ContentLibraryMaterial;
 class ContentLibraryMaterialsModel;
 class ContentLibraryTexture;
 class ContentLibraryTexturesModel;
+class ContentLibraryUserModel;
 
 class ContentLibraryWidget : public QFrame
 {
@@ -65,6 +66,7 @@ public:
     QPointer<ContentLibraryTexturesModel> texturesModel() const;
     QPointer<ContentLibraryTexturesModel> environmentsModel() const;
     QPointer<ContentLibraryEffectsModel> effectsModel() const;
+    QPointer<ContentLibraryUserModel> userModel() const;
 
     Q_INVOKABLE void startDragEffect(QmlDesigner::ContentLibraryEffect *eff, const QPointF &mousePos);
     Q_INVOKABLE void startDragMaterial(QmlDesigner::ContentLibraryMaterial *mat, const QPointF &mousePos);
@@ -74,6 +76,7 @@ public:
     Q_INVOKABLE void addLightProbe(QmlDesigner::ContentLibraryTexture *tex);
     Q_INVOKABLE void updateSceneEnvState();
     Q_INVOKABLE void markTextureUpdated(const QString &textureKey);
+    Q_INVOKABLE bool userBundleEnabled() const;
 
     QSize sizeHint() const override;
 
@@ -97,21 +100,23 @@ private:
     void updateSearch();
     void setIsDragging(bool val);
     QString findTextureBundlePath();
-    void loadTextureBundle();
-    QVariantMap readBundleMetadata();
-    bool fetchTextureBundleMetadata(const QDir &bundleDir);
+    void loadTextureBundles();
+    QVariantMap readTextureBundleJson();
+    bool fetchTextureBundleJson(const QDir &bundleDir);
     bool fetchTextureBundleIcons(const QDir &bundleDir);
     void fetchNewTextureIcons(const QVariantMap &existingFiles, const QVariantMap &newFiles,
                               const QString &existingMetaFilePath, const QDir &bundleDir);
     std::tuple<QVariantMap, QVariantMap, QVariantMap> compareTextureMetaFiles(
         const QString &existingMetaFile, const QString downloadedMetaFile);
     QStringList saveNewTextures(const QDir &bundleDir, const QStringList &newFiles);
+    void populateTextureBundleModels();
 
     QScopedPointer<StudioQuickWidget> m_quickWidget;
     QPointer<ContentLibraryMaterialsModel> m_materialsModel;
     QPointer<ContentLibraryTexturesModel> m_texturesModel;
     QPointer<ContentLibraryTexturesModel> m_environmentsModel;
     QPointer<ContentLibraryEffectsModel> m_effectsModel;
+    QPointer<ContentLibraryUserModel> m_userModel;
 
     QShortcut *m_qmlSourceUpdateShortcut = nullptr;
 
@@ -127,12 +132,8 @@ private:
     bool m_hasQuick3DImport = false;
     bool m_isDragging = false;
     bool m_isQt6Project = false;
-    QString m_baseUrl;
-    QString m_texturesUrl;
-    QString m_textureIconsUrl;
-    QString m_environmentIconsUrl;
-    QString m_environmentsUrl;
-    QString m_downloadPath;
+    QString m_textureBundleUrl;
+    QString m_bundlePath;
 };
 
 } // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/components/createtexture.cpp b/src/plugins/qmldesigner/components/createtexture.cpp
index b6e99ae972..56056e3fd2 100644
--- a/src/plugins/qmldesigner/components/createtexture.cpp
+++ b/src/plugins/qmldesigner/components/createtexture.cpp
@@ -17,6 +17,7 @@
 #include <coreplugin/messagebox.h>
 
 #include <QTimer>
+#include <QUrl>
 
 namespace QmlDesigner {
 
@@ -94,7 +95,7 @@ ModelNode CreateTexture::createTextureFromImage(const  Utils::FilePath &assetPat
         newTexNode.setIdWithoutRefactoring(m_view->model()->generateNewId(assetPath.baseName()));
 
         VariantProperty sourceProp = newTexNode.variantProperty("source");
-        sourceProp.setValue(textureSource);
+        sourceProp.setValue(QUrl(textureSource));
         matLib.defaultNodeListProperty().reparentHere(newTexNode);
     }
 
diff --git a/src/plugins/qmldesigner/components/curveeditor/curveeditor.cpp b/src/plugins/qmldesigner/components/curveeditor/curveeditor.cpp
index e84623e26c..36ce3373e5 100644
--- a/src/plugins/qmldesigner/components/curveeditor/curveeditor.cpp
+++ b/src/plugins/qmldesigner/components/curveeditor/curveeditor.cpp
@@ -77,8 +77,8 @@ CurveEditor::CurveEditor(CurveEditorModel *model, QWidget *parent)
 
     connect(m_toolbar, &CurveEditorToolBar::currentFrameChanged, [this, model](int frame) {
         model->setCurrentFrame(frame);
+        m_view->setCurrentFrame(frame, false);
         updateStatusLine();
-        m_view->viewport()->update();
     });
 
     connect(m_toolbar, &CurveEditorToolBar::zoomChanged, [this](double zoom) {
diff --git a/src/plugins/qmldesigner/components/curveeditor/curveeditortoolbar.cpp b/src/plugins/qmldesigner/components/curveeditor/curveeditortoolbar.cpp
index 72410ffb07..8da87ce119 100644
--- a/src/plugins/qmldesigner/components/curveeditor/curveeditortoolbar.cpp
+++ b/src/plugins/qmldesigner/components/curveeditor/curveeditortoolbar.cpp
@@ -129,6 +129,8 @@ CurveEditorToolBar::CurveEditorToolBar(CurveEditorModel *model, QWidget* parent)
     m_currentSpin->setFrame(false);
 
     connect(m_currentSpin, &QSpinBox::valueChanged, this, &CurveEditorToolBar::currentFrameChanged);
+    connect(model, &CurveEditorModel::commitCurrentFrame,
+            this, [this](int frame) { m_currentSpin->setValue(frame); });
 
     addSpacer();
 
diff --git a/src/plugins/qmldesigner/components/edit3d/bakelightsdatamodel.cpp b/src/plugins/qmldesigner/components/edit3d/bakelightsdatamodel.cpp
index 95a260c26f..a1dfcc8f98 100644
--- a/src/plugins/qmldesigner/components/edit3d/bakelightsdatamodel.cpp
+++ b/src/plugins/qmldesigner/components/edit3d/bakelightsdatamodel.cpp
@@ -15,6 +15,8 @@
 #include "qmlobjectnode.h"
 #include "variantproperty.h"
 
+#include <model/modelutils.h>
+
 #include <utils3d.h>
 
 #include <utils/expected.h>
@@ -292,7 +294,7 @@ bool BakeLightsDataModel::reset()
 
             if (!hasExposedProps && node.metaInfo().isFileComponent()
                 && node.metaInfo().isQtQuick3DNode()) {
-                const QString compFile = node.metaInfo().componentFileName();
+                const QString compFile = ModelUtils::componentFilePath(node);
                 const QString projPath = m_view->externalDependencies().currentProjectDirPath();
                 if (compFile.startsWith(projPath)) {
                     // Quick and dirty scan of the component source to check if it potentially has
diff --git a/src/plugins/qmldesigner/components/edit3d/cameraspeedconfiguration.cpp b/src/plugins/qmldesigner/components/edit3d/cameraspeedconfiguration.cpp
index 76560ac192..f5a74ee864 100644
--- a/src/plugins/qmldesigner/components/edit3d/cameraspeedconfiguration.cpp
+++ b/src/plugins/qmldesigner/components/edit3d/cameraspeedconfiguration.cpp
@@ -66,9 +66,11 @@ void CameraSpeedConfiguration::resetDefaults()
 
 void CameraSpeedConfiguration::hideCursor()
 {
-    if (QGuiApplication::overrideCursor())
+    if (m_cursorHidden)
         return;
 
+    m_cursorHidden = true;
+
     QGuiApplication::setOverrideCursor(QCursor(Qt::BlankCursor));
 
     if (QWindow *w = QGuiApplication::focusWindow())
@@ -77,9 +79,11 @@ void CameraSpeedConfiguration::hideCursor()
 
 void CameraSpeedConfiguration::restoreCursor()
 {
-    if (!QGuiApplication::overrideCursor())
+    if (!m_cursorHidden)
         return;
 
+    m_cursorHidden = false;
+
     QGuiApplication::restoreOverrideCursor();
 
     if (QWindow *w = QGuiApplication::focusWindow())
@@ -88,7 +92,7 @@ void CameraSpeedConfiguration::restoreCursor()
 
 void CameraSpeedConfiguration::holdCursorInPlace()
 {
-    if (!QGuiApplication::overrideCursor())
+    if (!m_cursorHidden)
         return;
 
     if (QWindow *w = QGuiApplication::focusWindow())
diff --git a/src/plugins/qmldesigner/components/edit3d/cameraspeedconfiguration.h b/src/plugins/qmldesigner/components/edit3d/cameraspeedconfiguration.h
index 55256890cb..fef06efc49 100644
--- a/src/plugins/qmldesigner/components/edit3d/cameraspeedconfiguration.h
+++ b/src/plugins/qmldesigner/components/edit3d/cameraspeedconfiguration.h
@@ -71,6 +71,7 @@ private:
     double m_multiplier = 0.;
     bool m_changes = false;
     QPoint m_lastPos;
+    bool m_cursorHidden = false;
 };
 
 } // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp b/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp
index 911ee1fb15..4712b048b1 100644
--- a/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp
+++ b/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp
@@ -279,6 +279,14 @@ void Edit3DView::modelAttached(Model *model)
 {
     AbstractView::modelAttached(model);
 
+    QString currProjectPath = QmlDesigner::DocumentManager::currentProjectDirPath().toString();
+    if (m_currProjectPath != currProjectPath) {
+        // Opening a new project -> reset camera speeds
+        m_currProjectPath = currProjectPath;
+        m_previousCameraSpeed = -1.;
+        m_previousCameraMultiplier = -1.;
+    }
+
     syncSnapAuxPropsToSettings();
 
     rootModelNode().setAuxiliaryData(edit3dGridColorProperty,
@@ -356,7 +364,12 @@ void Edit3DView::handleEntriesChanged()
     append(model()->qtQuick3DOrthographicCameraMetaInfo(), EK_cameras);
     append(model()->qtQuick3DPerspectiveCameraMetaInfo(), EK_cameras);
 
-    auto assetsModule = model()->module("Quick3DAssets");
+    Utils::PathString import3dTypePrefix = QmlDesignerPlugin::instance()
+                                               ->documentManager()
+                                               .generatedComponentUtils()
+                                               .import3dTypePrefix();
+
+    auto assetsModule = model()->module(import3dTypePrefix);
 
     for (const auto &metaInfo : model()->metaInfosForModule(assetsModule))
         append(metaInfo, EK_importedModels);
@@ -373,7 +386,8 @@ void Edit3DView::handleEntriesChanged()
         } else if (entry.typeName() == "QtQuick3D.OrthographicCamera"
                    || entry.typeName() == "QtQuick3D.PerspectiveCamera") {
             entryKey = EK_cameras;
-        } else if (entry.typeName().startsWith("Quick3DAssets.")
+        } else if (entry.typeName().startsWith(QmlDesignerPlugin::instance()->documentManager()
+                                                   .generatedComponentUtils().import3dTypePrefix().toUtf8())
                    && NodeHints::fromItemLibraryEntry(entry).canBeDroppedInView3D()) {
             entryKey = EK_importedModels;
         } else {
@@ -448,6 +462,7 @@ void Edit3DView::customNotification([[maybe_unused]] const AbstractView *view,
             self->emitView3DAction(View3DActionType::GetNodeAtMainScenePos,
                                    QVariantList{data[0], nodeList[0].internalId()});
             self->m_nodeAtPosReqType = NodeAtPosReqType::MainScenePick;
+            self->m_pickView3dNode = nodeList[0];
         });
     }
 }
@@ -500,6 +515,8 @@ void Edit3DView::nodeAtPosReady(const ModelNode &modelNode, const QVector3D &pos
     } else if (m_nodeAtPosReqType == NodeAtPosReqType::MainScenePick) {
         if (modelNode.isValid())
             setSelectedModelNode(modelNode);
+        else if (m_pickView3dNode.isValid() && !m_pickView3dNode.isSelected())
+            setSelectedModelNode(m_pickView3dNode);
         emitView3DAction(View3DActionType::AlignViewToCamera, true);
     }
 
diff --git a/src/plugins/qmldesigner/components/edit3d/edit3dview.h b/src/plugins/qmldesigner/components/edit3d/edit3dview.h
index 781b26d8d8..ade2ef6a8f 100644
--- a/src/plugins/qmldesigner/components/edit3d/edit3dview.h
+++ b/src/plugins/qmldesigner/components/edit3d/edit3dview.h
@@ -189,9 +189,11 @@ private:
     QList<SplitToolState> m_splitToolStates;
     QList<Edit3DAction *> m_flyModeDisabledActions;
     ModelNode m_contextMenuPendingNode;
+    ModelNode m_pickView3dNode;
 
     double m_previousCameraSpeed = -1.;
     double m_previousCameraMultiplier = -1.;
+    QString m_currProjectPath;
 
     friend class Edit3DAction;
 };
diff --git a/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp b/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
index 07102ae893..6f1cf2e183 100644
--- a/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
+++ b/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
@@ -766,7 +766,11 @@ void Edit3DWidget::dropEvent(QDropEvent *dropEvent)
             QString fileName = QFileInfo(assetPath).baseName();
             fileName = fileName.at(0).toUpper() + fileName.mid(1); // capitalize first letter
             auto model = m_view->model();
-            auto metaInfo = model->metaInfo(model->module("Quick3DAssets"), fileName.toUtf8());
+            Utils::PathString import3dTypePrefix = QmlDesignerPlugin::instance()
+                                                       ->documentManager()
+                                                       .generatedComponentUtils()
+                                                       .import3dTypePrefix();
+            auto metaInfo = model->metaInfo(model->module(import3dTypePrefix), fileName.toUtf8());
             if (auto entries = metaInfo.itemLibrariesEntries(); entries.size()) {
                 auto entry = ItemLibraryEntry{entries.front(), *model->projectStorage()};
                 QmlVisualNode::createQml3DNode(view(), entry, m_canvas->activeScene(), {}, false);
@@ -780,7 +784,9 @@ void Edit3DWidget::dropEvent(QDropEvent *dropEvent)
         for (const QString &assetPath : added3DAssets) {
             QString fileName = QFileInfo(assetPath).baseName();
             fileName = fileName.at(0).toUpper() + fileName.mid(1); // capitalize first letter
-            QString type = QString("Quick3DAssets.%1.%1").arg(fileName);
+            QString type = QString("%1.%2.%2").arg(QmlDesignerPlugin::instance()->documentManager()
+                                                       .generatedComponentUtils().import3dTypePrefix(),
+                                                   fileName);
             QList<ItemLibraryEntry> entriesForType = itemLibInfo->entriesForType(type.toUtf8());
             if (!entriesForType.isEmpty()) { // should always be true, but just in case
                 QmlVisualNode::createQml3DNode(view(),
diff --git a/src/plugins/qmldesigner/components/edit3d/snapconfiguration.cpp b/src/plugins/qmldesigner/components/edit3d/snapconfiguration.cpp
index 26c5fe0eb2..8890ea8964 100644
--- a/src/plugins/qmldesigner/components/edit3d/snapconfiguration.cpp
+++ b/src/plugins/qmldesigner/components/edit3d/snapconfiguration.cpp
@@ -87,9 +87,11 @@ void SnapConfiguration::resetDefaults()
 
 void SnapConfiguration::hideCursor()
 {
-    if (QGuiApplication::overrideCursor())
+    if (m_cursorHidden)
         return;
 
+    m_cursorHidden = true;
+
     QGuiApplication::setOverrideCursor(QCursor(Qt::BlankCursor));
 
     if (QWindow *w = QGuiApplication::focusWindow())
@@ -98,9 +100,11 @@ void SnapConfiguration::hideCursor()
 
 void SnapConfiguration::restoreCursor()
 {
-    if (!QGuiApplication::overrideCursor())
+    if (!m_cursorHidden)
         return;
 
+    m_cursorHidden = false;
+
     QGuiApplication::restoreOverrideCursor();
 
     if (QWindow *w = QGuiApplication::focusWindow())
@@ -109,7 +113,7 @@ void SnapConfiguration::restoreCursor()
 
 void SnapConfiguration::holdCursorInPlace()
 {
-    if (!QGuiApplication::overrideCursor())
+    if (!m_cursorHidden)
         return;
 
     if (QWindow *w = QGuiApplication::focusWindow())
diff --git a/src/plugins/qmldesigner/components/edit3d/snapconfiguration.h b/src/plugins/qmldesigner/components/edit3d/snapconfiguration.h
index 729e6ce7d1..ae401f60f9 100644
--- a/src/plugins/qmldesigner/components/edit3d/snapconfiguration.h
+++ b/src/plugins/qmldesigner/components/edit3d/snapconfiguration.h
@@ -103,6 +103,7 @@ private:
     double m_scaleInterval = 0.;
     bool m_changes = false;
     QPoint m_lastPos;
+    bool m_cursorHidden = false;
 };
 
 } // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/components/integration/designdocument.cpp b/src/plugins/qmldesigner/components/integration/designdocument.cpp
index c0bebbb82b..804ac076e6 100644
--- a/src/plugins/qmldesigner/components/integration/designdocument.cpp
+++ b/src/plugins/qmldesigner/components/integration/designdocument.cpp
@@ -64,13 +64,14 @@ namespace QmlDesigner {
   DesignDocument acts as a facade to a model representing a qml document,
   and the different views/widgets accessing it.
   */
-DesignDocument::DesignDocument(ProjectStorageDependencies projectStorageDependencies,
+DesignDocument::DesignDocument([[maybe_unused]] const QUrl &filePath,
+                               ProjectStorageDependencies projectStorageDependencies,
                                ExternalDependenciesInterface &externalDependencies)
 #ifdef QDS_USE_PROJECTSTORAGE
     : m_documentModel(Model::create(projectStorageDependencies,
                                     "Item",
                                     {Import::createLibraryImport("QtQuick")},
-                                    {},
+                                    filePath,
                                     std::make_unique<ModelResourceManagement>()))
 #else
     : m_documentModel(
diff --git a/src/plugins/qmldesigner/components/integration/designdocument.h b/src/plugins/qmldesigner/components/integration/designdocument.h
index 0d75141205..52089d67c1 100644
--- a/src/plugins/qmldesigner/components/integration/designdocument.h
+++ b/src/plugins/qmldesigner/components/integration/designdocument.h
@@ -41,7 +41,8 @@ class QMLDESIGNERCOMPONENTS_EXPORT DesignDocument : public QObject
     Q_OBJECT
 
 public:
-    DesignDocument(ProjectStorageDependencies projectStorageDependencies,
+    DesignDocument(const QUrl &filePath,
+                   ProjectStorageDependencies projectStorageDependencies,
                    ExternalDependenciesInterface &externalDependencies);
     ~DesignDocument() override;
 
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp
index 29fff4b359..2c69072602 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp
@@ -12,6 +12,7 @@
 #include <variantproperty.h>
 
 #include <theme.h>
+#include <utils/filepath.h>
 #include <utils/outputformatter.h>
 
 #include <projectexplorer/project.h>
@@ -130,43 +131,8 @@ ItemLibraryAssetImportDialog::ItemLibraryAssetImportDialog(
     if (targetDir.isEmpty())
         targetDir = defaulTargetDirectory;
 
-    // Import is always done under known folder. The order of preference for folder is:
-    // 1) An existing QUICK_3D_ASSETS_FOLDER under DEFAULT_ASSET_IMPORT_FOLDER project import path
-    // 2) An existing QUICK_3D_ASSETS_FOLDER under any project import path
-    // 3) New QUICK_3D_ASSETS_FOLDER under DEFAULT_ASSET_IMPORT_FOLDER project import path
-    // 4) New QUICK_3D_ASSETS_FOLDER under any project import path
-    // 5) New QUICK_3D_ASSETS_FOLDER under new DEFAULT_ASSET_IMPORT_FOLDER under project
-    const QString defaultAssetFolder = QLatin1String(Constants::DEFAULT_ASSET_IMPORT_FOLDER);
-    const QString quick3DFolder = QLatin1String(Constants::QUICK_3D_ASSETS_FOLDER);
-    QString candidatePath = targetDir + defaultAssetFolder + quick3DFolder;
-    int candidatePriority = 5;
-
-    for (const auto &importPath : std::as_const(importPaths)) {
-        if (importPath.startsWith(targetDir)) {
-            const bool isDefaultFolder = importPath.endsWith(defaultAssetFolder);
-            const QString assetFolder = importPath + quick3DFolder;
-            const bool exists = QFileInfo::exists(assetFolder);
-            if (exists) {
-                if (isDefaultFolder) {
-                    // Priority one location, stop looking
-                    candidatePath = assetFolder;
-                    break;
-                } else if (candidatePriority > 2) {
-                    candidatePriority = 2;
-                    candidatePath = assetFolder;
-                }
-            } else {
-                if (candidatePriority > 3 && isDefaultFolder) {
-                    candidatePriority = 3;
-                    candidatePath = assetFolder;
-                } else if (candidatePriority > 4) {
-                    candidatePriority = 4;
-                    candidatePath = assetFolder;
-                }
-            }
-        }
-    }
-    m_quick3DImportPath = candidatePath;
+    m_quick3DImportPath = QmlDesignerPlugin::instance()->documentManager()
+                              .generatedComponentUtils().import3dBasePath().toString();
 
     if (!m_quick3DFiles.isEmpty()) {
         QVector<QJsonObject> groups;
@@ -294,11 +260,14 @@ void ItemLibraryAssetImportDialog::updateImport(const ModelNode &updateNode,
         QFileInfo compFileInfo{compFileName};
 
         // Find to top asset folder
-        const QString assetFolder = QLatin1String(Constants::QUICK_3D_ASSETS_FOLDER).mid(1);
+        const QString oldAssetFolder = QLatin1String(Constants::OLD_QUICK_3D_ASSETS_FOLDER);
+        QString assetFolder = QLatin1String(Constants::QUICK_3D_COMPONENTS_FOLDER);
         const QStringList parts = compFileName.split('/');
         int i = parts.size() - 1;
         int previousSize = 0;
         for (; i >= 0; --i) {
+            if (parts[i] == oldAssetFolder)
+                assetFolder = oldAssetFolder;
             if (parts[i] == assetFolder)
                 break;
             previousSize = parts[i].size();
@@ -733,8 +702,10 @@ QGridLayout *ItemLibraryAssetImportDialog::createOptionsGrid(
                 // and move the remaining member to ungrouped options
                 // Note: <= 2 instead of < 2 because each group has group label member
                 if (i != 0 && groupWidgets.size() <= 2) {
-                    widgets[0].prepend(groupWidgets[1]);
-                    groupWidgets[0].first->hide(); // hide group label
+                    if (groupWidgets.size() == 2)
+                        widgets[0].prepend(groupWidgets[1]);
+                    if (groupWidgets.size() >= 1)
+                        groupWidgets[0].first->hide(); // hide group label
                     groupWidgets.clear();
                 }
             }
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp
index 48958ceec9..ed1f8041e9 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp
@@ -1,6 +1,7 @@
 // Copyright (C) 2019 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 #include "itemlibraryassetimporter.h"
+
 #include "assetimportupdatedialog.h"
 #include "qmldesignerplugin.h"
 #include "qmldesignerconstants.h"
@@ -329,12 +330,15 @@ void ItemLibraryAssetImporter::postParseQuick3DAsset(ParseData &pd)
             if (qmldirFile.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
                 QString qmlInfo;
                 qmlInfo.append("module ");
-                qmlInfo.append(m_importPath.split('/').last());
+                qmlInfo.append(QmlDesignerPlugin::instance()->documentManager()
+                                   .generatedComponentUtils().import3dTypePrefix());
                 qmlInfo.append(".");
                 qmlInfo.append(pd.assetName);
                 qmlInfo.append('\n');
                 m_requiredImports.append(
-                    QStringLiteral("%1.%2").arg(pd.targetDir.dirName(), pd.assetName));
+                    QStringLiteral("%1.%2").arg(QmlDesignerPlugin::instance()->documentManager()
+                                                    .generatedComponentUtils().import3dTypePrefix(),
+                                                pd.assetName));
                 while (qmlIt.hasNext()) {
                     qmlIt.next();
                     QFileInfo fi = QFileInfo(qmlIt.filePath());
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp
index dbeacc7595..3bff210520 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp
@@ -296,15 +296,16 @@ void ItemLibraryModel::setSearchText(const QString &searchText)
 
 Import ItemLibraryModel::entryToImport(const ItemLibraryEntry &entry)
 {
+#ifndef QDS_USE_PROJECTSTORAGE
     if (entry.majorVersion() == -1 && entry.minorVersion() == -1)
         return Import::createFileImport(entry.requiredImport());
-
+#endif
     return Import::createLibraryImport(entry.requiredImport(), QString::number(entry.majorVersion()) + QLatin1Char('.') +
                                                                QString::number(entry.minorVersion()));
 
 }
 
-void ItemLibraryModel::update([[maybe_unused]] ItemLibraryInfo *itemLibraryInfo, Model *model)
+void ItemLibraryModel::update(Model *model)
 {
     if (!model)
         return;
@@ -312,9 +313,12 @@ void ItemLibraryModel::update([[maybe_unused]] ItemLibraryInfo *itemLibraryInfo,
     beginResetModel();
     clearSections();
 
+    GeneratedComponentUtils compUtils = QmlDesignerPlugin::instance()->documentManager()
+                                            .generatedComponentUtils();
+
     QStringList excludedImports {
-        QLatin1String(Constants::COMPONENT_BUNDLES_FOLDER).mid(1) + ".MaterialBundle",
-        QLatin1String(Constants::COMPONENT_BUNDLES_FOLDER).mid(1) + ".EffectBundle"
+        compUtils.componentBundlesTypePrefix() + ".MaterialBundle",
+        compUtils.componentBundlesTypePrefix() + ".EffectBundle"
     };
 
     // create import sections
@@ -323,10 +327,12 @@ void ItemLibraryModel::update([[maybe_unused]] ItemLibraryInfo *itemLibraryInfo,
     QHash<QString, ItemLibraryImport *> importHash;
     for (const Import &import : model->imports()) {
         if (import.url() != projectName) {
-            if (excludedImports.contains(import.url()) || import.url().startsWith("Effects."))
+            if (excludedImports.contains(import.url())
+                || import.url().startsWith(compUtils.composedEffectsTypePrefix())) {
                 continue;
+            }
             bool addNew = true;
-            bool isQuick3DAsset = import.url().startsWith("Quick3DAssets.");
+            bool isQuick3DAsset = import.url().startsWith(compUtils.import3dTypePrefix());
             QString importUrl = import.url();
             if (isQuick3DAsset)
                 importUrl = ItemLibraryImport::quick3DAssetsTitle();
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h
index 212ddf8e04..b04ea492d2 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h
@@ -37,7 +37,7 @@ public:
     QString searchText() const;
     ItemLibraryImport *importByUrl(const QString &importName) const;
 
-    void update(ItemLibraryInfo *itemLibraryInfo, Model *model);
+    void update(Model *model);
     void updateUsedImports(const Imports &usedImports);
 
     QMimeData *getMimeData(const ItemLibraryEntry &itemLibraryEntry);
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
index b710a8226f..ffefc43178 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
@@ -118,9 +118,9 @@ void ItemLibraryWidget::resizeEvent(QResizeEvent *event)
 
 ItemLibraryWidget::ItemLibraryWidget(AsynchronousImageCache &imageCache)
     : m_itemIconSize(24, 24)
-    , m_itemLibraryModel(new ItemLibraryModel(this))
-    , m_addModuleModel(new ItemLibraryAddImportModel(this))
-    , m_itemsWidget(new StudioQuickWidget(this))
+    , m_itemLibraryModel(std::make_unique<ItemLibraryModel>())
+    , m_addModuleModel(std::make_unique<ItemLibraryAddImportModel>())
+    , m_itemsWidget(Utils::makeUniqueObjectPtr<StudioQuickWidget>())
     , m_imageCache{imageCache}
 {
     m_compressionTimer.setInterval(1000);
@@ -146,7 +146,7 @@ ItemLibraryWidget::ItemLibraryWidget(AsynchronousImageCache &imageCache)
     auto layout = new QVBoxLayout(this);
     layout->setContentsMargins({});
     layout->setSpacing(0);
-    layout->addWidget(m_itemsWidget.data());
+    layout->addWidget(m_itemsWidget.get());
 
     updateSearch();
 
@@ -167,8 +167,8 @@ ItemLibraryWidget::ItemLibraryWidget(AsynchronousImageCache &imageCache)
 
     auto map = m_itemsWidget->registerPropertyMap("ItemLibraryBackend");
 
-    map->setProperties({{"itemLibraryModel", QVariant::fromValue(m_itemLibraryModel.data())},
-                        {"addModuleModel", QVariant::fromValue(m_addModuleModel.data())},
+    map->setProperties({{"itemLibraryModel", QVariant::fromValue(m_itemLibraryModel.get())},
+                        {"addModuleModel", QVariant::fromValue(m_addModuleModel.get())},
                         {"itemLibraryIconWidth", m_itemIconSize.width()},
                         {"itemLibraryIconHeight", m_itemIconSize.height()},
                         {"rootView", QVariant::fromValue(this)},
@@ -333,9 +333,7 @@ void ItemLibraryWidget::updateModel()
         m_compressionTimer.stop();
     }
 
-#ifndef QDS_USE_PROJECTSTORAGE
-    m_itemLibraryModel->update(m_itemLibraryInfo.data(), m_model.data());
-#endif
+    m_itemLibraryModel->update(m_model.data());
 
     if (m_itemLibraryModel->rowCount() == 0 && !m_updateRetry) {
         m_updateRetry = true; // Only retry once to avoid endless loops
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h
index b56532b218..2940db7a73 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h
@@ -10,9 +10,10 @@
 
 #include <studioquickwidget.h>
 
-#include <utils/fancylineedit.h>
-#include <utils/dropsupport.h>
 #include <previewtooltip/previewtooltipbackend.h>
+#include <utils/dropsupport.h>
+#include <utils/fancylineedit.h>
+#include <utils/uniqueobjectptr.h>
 
 #include <QFileIconProvider>
 #include <QFrame>
@@ -104,10 +105,10 @@ private:
 #ifndef QDS_USE_PROJECTSTORAGE
     QPointer<ItemLibraryInfo> m_itemLibraryInfo;
 #endif
-    QPointer<ItemLibraryModel> m_itemLibraryModel;
-    QPointer<ItemLibraryAddImportModel> m_addModuleModel;
+    std::unique_ptr<ItemLibraryModel> m_itemLibraryModel;
+    std::unique_ptr<ItemLibraryAddImportModel> m_addModuleModel;
 
-    QScopedPointer<StudioQuickWidget> m_itemsWidget;
+    Utils::UniqueObjectPtr<StudioQuickWidget> m_itemsWidget;
     std::unique_ptr<PreviewTooltipBackend> m_previewTooltipBackend;
 
     QShortcut *m_qmlSourceUpdateShortcut;
diff --git a/src/plugins/qmldesigner/components/materialbrowser/materialbrowsertexturesmodel.cpp b/src/plugins/qmldesigner/components/materialbrowser/materialbrowsertexturesmodel.cpp
index ec95f3e5d3..918956a04c 100644
--- a/src/plugins/qmldesigner/components/materialbrowser/materialbrowsertexturesmodel.cpp
+++ b/src/plugins/qmldesigner/components/materialbrowser/materialbrowsertexturesmodel.cpp
@@ -63,7 +63,7 @@ QVariant MaterialBrowserTexturesModel::data(const QModelIndex &index, int role)
             return tr("Texture has no source image.");
 
         ModelNode texNode = m_textureList.at(index.row());
-        QString info = ImageUtils::imageInfo(source);
+        QString info = ImageUtils::imageInfoString(source);
 
         if (info.isEmpty())
             return tr("Texture has no data.");
diff --git a/src/plugins/qmldesigner/components/materialbrowser/materialbrowserwidget.cpp b/src/plugins/qmldesigner/components/materialbrowser/materialbrowserwidget.cpp
index 47a1e8d293..7cf0a875bc 100644
--- a/src/plugins/qmldesigner/components/materialbrowser/materialbrowserwidget.cpp
+++ b/src/plugins/qmldesigner/components/materialbrowser/materialbrowserwidget.cpp
@@ -56,6 +56,13 @@ public:
         m_pixmaps.insert(node.internalId(), pixmap);
     }
 
+    QPixmap getPixmap(const ModelNode &node)
+    {
+        QTC_ASSERT(node, return {});
+
+        return m_pixmaps.value(node.internalId());
+    }
+
     void clearPixmapCache()
     {
         m_pixmaps.clear();
@@ -357,6 +364,13 @@ void MaterialBrowserWidget::focusMaterialSection(bool focusMatSec)
     }
 }
 
+void MaterialBrowserWidget::addMaterialToContentLibrary()
+{
+    ModelNode mat = m_materialBrowserModel->selectedMaterial();
+    m_materialBrowserView->emitCustomNotification("add_material_to_content_lib", {mat},
+                                                  {m_previewImageProvider->getPixmap(mat)});
+}
+
 QString MaterialBrowserWidget::qmlSourcesPath()
 {
 #ifdef SHARE_QML_PATH
@@ -420,4 +434,10 @@ QPointer<MaterialBrowserTexturesModel> MaterialBrowserWidget::materialBrowserTex
     return m_materialBrowserTexturesModel;
 }
 
+bool MaterialBrowserWidget::userBundleEnabled() const
+{
+    // TODO: this method is to be removed after user bundle implementation is complete
+    return Core::ICore::settings()->value("QML/Designer/UseExperimentalFeatures45", false).toBool();
+}
+
 } // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/components/materialbrowser/materialbrowserwidget.h b/src/plugins/qmldesigner/components/materialbrowser/materialbrowserwidget.h
index bfe7ace34d..97c994e565 100644
--- a/src/plugins/qmldesigner/components/materialbrowser/materialbrowserwidget.h
+++ b/src/plugins/qmldesigner/components/materialbrowser/materialbrowserwidget.h
@@ -60,6 +60,8 @@ public:
     Q_INVOKABLE void acceptAssetsDropOnMaterial(int matIndex, const QList<QUrl> &urls);
     Q_INVOKABLE void acceptTextureDropOnMaterial(int matIndex, const QString &texId);
     Q_INVOKABLE void focusMaterialSection(bool focusMatSec);
+    Q_INVOKABLE void addMaterialToContentLibrary();
+    Q_INVOKABLE bool userBundleEnabled() const;
 
     StudioQuickWidget *quickWidget() const;
 
diff --git a/src/plugins/qmldesigner/components/materialeditor/materialeditorqmlbackend.h b/src/plugins/qmldesigner/components/materialeditor/materialeditorqmlbackend.h
index 6f9d6014e9..0792a635ca 100644
--- a/src/plugins/qmldesigner/components/materialeditor/materialeditorqmlbackend.h
+++ b/src/plugins/qmldesigner/components/materialeditor/materialeditorqmlbackend.h
@@ -60,10 +60,13 @@ private:
                                    MaterialEditorView *materialEditor);
     PropertyName auxNamePostFix(const PropertyName &propertyName);
 
+    // to avoid a crash while destructing DesignerPropertyMap in the QQmlData
+    // this needs be destructed after m_quickWidget->engine() is destructed
+    DesignerPropertyMap m_backendValuesPropertyMap;
+
     Utils::UniqueObjectPtr<QQuickWidget> m_quickWidget = nullptr;
     QmlAnchorBindingProxy m_backendAnchorBinding;
     QmlModelNodeProxy m_backendModelNode;
-    DesignerPropertyMap m_backendValuesPropertyMap;
     QScopedPointer<MaterialEditorTransaction> m_materialEditorTransaction;
     QScopedPointer<MaterialEditorContextObject> m_contextObject;
     QPointer<MaterialEditorImageProvider> m_materialEditorImageProvider;
diff --git a/src/plugins/qmldesigner/components/navigator/choosefrompropertylistdialog.cpp b/src/plugins/qmldesigner/components/navigator/choosefrompropertylistdialog.cpp
index 58b4c42749..a3ab5f2cd7 100644
--- a/src/plugins/qmldesigner/components/navigator/choosefrompropertylistdialog.cpp
+++ b/src/plugins/qmldesigner/components/navigator/choosefrompropertylistdialog.cpp
@@ -5,6 +5,8 @@
 #include "nodemetainfo.h"
 #include "ui_choosefrompropertylistdialog.h"
 
+#include <qmldesignerplugin.h>
+
 namespace QmlDesigner {
 
 // This will filter and return possible properties that the given type can be bound to
@@ -100,7 +102,10 @@ ChooseFromPropertyListFilter::ChooseFromPropertyListFilter(const NodeMetaInfo &i
 #ifdef QDS_USE_PROJECTSTORAGE
 // TODO add the types here or use the module
 #else
-    } else if (insertInfo.typeName().startsWith("ComponentBundles.MaterialBundle")) {
+        } else if (insertInfo.typeName().startsWith(
+                   QString("%1.MaterialBundle").arg(QmlDesignerPlugin::instance()->documentManager()
+                                                        .generatedComponentUtils().componentBundlesTypePrefix())
+                       .toUtf8())) {
         if (parentInfo.isQtQuick3DModel())
             propertyList.append("materials");
 #endif
diff --git a/src/plugins/qmldesigner/components/navigator/nameitemdelegate.cpp b/src/plugins/qmldesigner/components/navigator/nameitemdelegate.cpp
index aacaf6dc0d..223e04fd96 100644
--- a/src/plugins/qmldesigner/components/navigator/nameitemdelegate.cpp
+++ b/src/plugins/qmldesigner/components/navigator/nameitemdelegate.cpp
@@ -9,9 +9,8 @@
 #include "navigatortreeview.h"
 #include "navigatorwidget.h"
 #include "choosefrompropertylistdialog.h"
-#include "qproxystyle.h"
-
 #include <model/modelutils.h>
+#include <dialogutils.h>
 #include <modelnodecontextmenu.h>
 #include <theme.h>
 #include <qmldesignerconstants.h>
@@ -169,8 +168,7 @@ static void setId(const QModelIndex &index, const QString &newId)
         return;
 
     if (!ModelNode::isValidId(newId)) {
-        Core::AsynchronousMessageBox::warning(NavigatorTreeView::tr("Invalid Id"),
-                                              NavigatorTreeView::tr("%1 is an invalid id.").arg(newId));
+        DialogUtils::showWarningForInvalidId(newId);
     } else if (modelNode.view()->hasId(newId)) {
         Core::AsynchronousMessageBox::warning(NavigatorTreeView::tr("Invalid Id"),
                                               NavigatorTreeView::tr("%1 already exists.").arg(newId));
diff --git a/src/plugins/qmldesigner/components/propertyeditor/dynamicpropertiesproxymodel.cpp b/src/plugins/qmldesigner/components/propertyeditor/dynamicpropertiesproxymodel.cpp
index 45f89ae339..4898366619 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/dynamicpropertiesproxymodel.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/dynamicpropertiesproxymodel.cpp
@@ -143,7 +143,7 @@ QString DynamicPropertiesProxyModel::newPropertyName() const
 {
     DynamicPropertiesModel *propsModel = dynamicPropertiesModel();
 
-    return QString::fromUtf8(uniquePropertyName("property", propsModel->singleSelectedNode()));
+    return QString::fromUtf8(uniquePropertyName("newName", propsModel->singleSelectedNode()));
 }
 
 void DynamicPropertiesProxyModel::createProperty(const QString &name, const QString &type)
@@ -167,6 +167,10 @@ void DynamicPropertiesProxyModel::createProperty(const QString &name, const QStr
                     QVariant value = defaultValueForType(typeName);
                     VariantProperty variantProp = modelNode.variantProperty(name.toUtf8());
                     variantProp.setDynamicTypeNameAndValue(typeName, value);
+                } else if (type == "signal") {
+                    SignalDeclarationProperty signalDeclarationProperty
+                        = modelNode.signalDeclarationProperty(name.toUtf8());
+                    signalDeclarationProperty.setSignature("()");
                 } else {
                     QString expression = defaultExpressionForType(typeName);
 
@@ -270,6 +274,8 @@ PropertyEditorValue *DynamicPropertyRow::createProxyBackendValue()
     auto *newValue = new PropertyEditorValue(this);
     m_proxyBackendValues.append(newValue);
 
+    QQmlEngine::setObjectOwnership(newValue, QJSEngine::CppOwnership);
+
     return newValue;
 }
 
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp
index 7f1ab00bb9..eea53c3f5a 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp
@@ -82,10 +82,10 @@ namespace QmlDesigner {
 
 PropertyEditorQmlBackend::PropertyEditorQmlBackend(PropertyEditorView *propertyEditor,
                                                    AsynchronousImageCache &imageCache)
-    : m_view(new Quick2PropertyEditorView(imageCache))
+    : m_view(Utils::makeUniqueObjectPtr<Quick2PropertyEditorView>(imageCache))
     , m_propertyEditorTransaction(new PropertyEditorTransaction(propertyEditor))
     , m_dummyPropertyEditorValue(new PropertyEditorValue())
-    , m_contextObject(new PropertyEditorContextObject(m_view))
+    , m_contextObject(new PropertyEditorContextObject(m_view.get()))
 {
     m_view->engine()->setOutputWarningsToStandardError(QmlDesignerPlugin::instance()
         ->settings().value(DesignerSettingsKey::SHOW_PROPERTYEDITOR_WARNINGS).toBool());
@@ -284,6 +284,27 @@ void PropertyEditorQmlBackend::setupAuxiliaryProperties(const QmlObjectNode &qml
     }
 }
 
+void PropertyEditorQmlBackend::handleInstancePropertyChangedInModelNodeProxy(
+    const ModelNode &modelNode, const PropertyName &propertyName)
+{
+    m_backendModelNode.handleInstancePropertyChanged(modelNode, propertyName);
+}
+
+void PropertyEditorQmlBackend::handleVariantPropertyChangedInModelNodeProxy(const VariantProperty &property)
+{
+    m_backendModelNode.handleVariantPropertyChanged(property);
+}
+
+void PropertyEditorQmlBackend::handleBindingPropertyChangedInModelNodeProxy(const BindingProperty &property)
+{
+    m_backendModelNode.handleBindingPropertyChanged(property);
+}
+
+void PropertyEditorQmlBackend::handlePropertiesRemovedInModelNodeProxy(const AbstractProperty &property)
+{
+    m_backendModelNode.handlePropertiesRemoved(property);
+}
+
 void PropertyEditorQmlBackend::createPropertyEditorValue(const QmlObjectNode &qmlObjectNode,
                                                          const PropertyName &name,
                                                          const QVariant &value,
@@ -386,7 +407,7 @@ PropertyEditorContextObject *PropertyEditorQmlBackend::contextObject()
 
 QQuickWidget *PropertyEditorQmlBackend::widget()
 {
-    return m_view;
+    return m_view.get();
 }
 
 void PropertyEditorQmlBackend::setSource(const QUrl &url)
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.h b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.h
index b677258488..120b7b4abc 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.h
@@ -3,13 +3,15 @@
 
 #pragma once
 
-#include "qmlanchorbindingproxy.h"
 #include "designerpropertymap.h"
-#include "propertyeditorvalue.h"
 #include "propertyeditorcontextobject.h"
+#include "propertyeditorvalue.h"
+#include "qmlanchorbindingproxy.h"
 #include "qmlmodelnodeproxy.h"
 #include "quick2propertyeditorview.h"
 
+#include <utils/uniqueobjectptr.h>
+
 #include <nodemetainfo.h>
 
 #include <QQmlPropertyMap>
@@ -71,7 +73,15 @@ public:
                                        PropertyEditorView *propertyEditor);
     void setupInsightAttachedProperties(const QmlObjectNode &qmlObjectNode,
                                         PropertyEditorView *propertyEditor);
-    void setupAuxiliaryProperties(const QmlObjectNode &qmlObjectNode, PropertyEditorView *propertyEditor);
+    void setupAuxiliaryProperties(const QmlObjectNode &qmlObjectNode,
+                                  PropertyEditorView *propertyEditor);
+
+    void handleInstancePropertyChangedInModelNodeProxy(const ModelNode &modelNode,
+                                                       const PropertyName &propertyName);
+
+    void handleVariantPropertyChangedInModelNodeProxy(const VariantProperty &property);
+    void handleBindingPropertyChangedInModelNodeProxy(const BindingProperty &property);
+    void handlePropertiesRemovedInModelNodeProxy(const AbstractProperty &property);
 
     static NodeMetaInfo findCommonAncestor(const ModelNode &node);
 
@@ -92,10 +102,13 @@ private:
     static TypeName fixTypeNameForPanes(const TypeName &typeName);
 
 private:
-    Quick2PropertyEditorView *m_view;
+    // to avoid a crash while destructing DesignerPropertyMap in the QQmlData
+    // this needs be destructed after m_quickWidget->engine() is destructed
+    DesignerPropertyMap m_backendValuesPropertyMap;
+
+    Utils::UniqueObjectPtr<Quick2PropertyEditorView> m_view = nullptr;
     QmlAnchorBindingProxy m_backendAnchorBinding;
     QmlModelNodeProxy m_backendModelNode;
-    DesignerPropertyMap m_backendValuesPropertyMap;
     QScopedPointer<PropertyEditorTransaction> m_propertyEditorTransaction;
     QScopedPointer<PropertyEditorValue> m_dummyPropertyEditorValue;
     QScopedPointer<PropertyEditorContextObject> m_contextObject;
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp
index 663ebafb65..70686f31ae 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp
@@ -10,9 +10,12 @@
 #include "designmodewidget.h"
 #include "nodemetainfo.h"
 #include "nodeproperty.h"
+#include "propertyeditorview.h"
+#include "qmldesignerplugin.h"
 #include "qmlitemnode.h"
 #include "qmlobjectnode.h"
-#include "qmldesignerplugin.h"
+#include "rewritertransaction.h"
+#include "rewritingexception.h"
 
 #include <enumeration.h>
 
@@ -153,7 +156,8 @@ void PropertyEditorValue::setExpressionWithEmit(const QString &expression)
     if (m_expression != expression) {
         setExpression(expression);
         m_value.clear();
-        emit expressionChanged(nameAsQString()); // Note that we set the name in this case
+        emit expressionChanged(nameAsQString());
+        emit expressionChangedQml();// Note that we set the name in this case
     }
 }
 
@@ -180,7 +184,7 @@ bool PropertyEditorValue::isInSubState() const
 bool PropertyEditorValue::isBound() const
 {
     const QmlObjectNode objectNode(modelNode());
-    return objectNode.isValid() && objectNode.hasBindingProperty(name());
+    return m_forceBound || (objectNode.isValid() && objectNode.hasBindingProperty(name()));
 }
 
 bool PropertyEditorValue::isInModel() const
@@ -334,6 +338,7 @@ void PropertyEditorValue::resetValue()
         m_expression = QString();
         emit valueChanged(nameAsQString(), QVariant());
         emit expressionChanged({});
+        emit expressionChangedQml();
     }
 }
 
@@ -425,6 +430,34 @@ QStringList PropertyEditorValue::getExpressionAsList() const
     return generateStringList(expression());
 }
 
+QVector<double> PropertyEditorValue::getExpressionAsVector() const
+{
+    const QRegularExpression rx(
+        QRegularExpression::anchoredPattern("Qt.vector(2|3|4)d\\((.*?)\\)"));
+    const QRegularExpressionMatch match = rx.match(expression());
+    if (!match.hasMatch())
+        return {};
+
+    const QStringList floats = match.captured(2).split(',', Qt::SkipEmptyParts);
+
+    bool ok;
+
+    const int num = match.captured(1).toInt();
+
+    if (num != floats.count())
+        return {};
+
+    QVector<double> ret;
+    for (const QString &number : floats) {
+        ret.append(number.toDouble(&ok));
+
+        if (!ok)
+            return {};
+    }
+
+    return ret;
+}
+
 bool PropertyEditorValue::idListAdd(const QString &value)
 {
     const QmlObjectNode objectNode(modelNode());
@@ -507,6 +540,15 @@ void PropertyEditorValue::openMaterialEditor(int idx)
     m_modelNode.view()->emitCustomNotification("select_material", {}, {idx});
 }
 
+void PropertyEditorValue::setForceBound(bool b)
+{
+    if (m_forceBound == b)
+        return;
+    m_forceBound = b;
+
+    emit isBoundChanged();
+}
+
 QStringList PropertyEditorValue::generateStringList(const QString &string) const
 {
     QString copy = string;
@@ -687,4 +729,260 @@ void PropertyEditorNodeWrapper::update()
     emit typeChanged();
 }
 
+QQmlPropertyMap *PropertyEditorSubSelectionWrapper::properties()
+{
+    return &m_valuesPropertyMap;
+}
+
+static QObject *variantToQObject(const QVariant &value)
+{
+    if (value.typeId() == QMetaType::QObjectStar || value.typeId() > QMetaType::User)
+        return *(QObject **)value.constData();
+
+    return nullptr;
+}
+
+void PropertyEditorSubSelectionWrapper::createPropertyEditorValue(const QmlObjectNode &qmlObjectNode,
+                                                                  const PropertyName &name,
+                                                                  const QVariant &value)
+{
+    PropertyName propertyName(name);
+    propertyName.replace('.', '_');
+    auto valueObject = qobject_cast<PropertyEditorValue*>(variantToQObject(m_valuesPropertyMap.value(QString::fromUtf8(propertyName))));
+    if (!valueObject) {
+        valueObject = new PropertyEditorValue(&m_valuesPropertyMap);
+        QObject::connect(valueObject, &PropertyEditorValue::valueChanged, this, &PropertyEditorSubSelectionWrapper::changeValue);
+        QObject::connect(valueObject, &PropertyEditorValue::expressionChanged, this, &PropertyEditorSubSelectionWrapper::changeExpression);
+        QObject::connect(valueObject, &PropertyEditorValue::exportPropertyAsAliasRequested, this, &PropertyEditorSubSelectionWrapper::exportPropertyAsAlias);
+        QObject::connect(valueObject, &PropertyEditorValue::removeAliasExportRequested, this, &PropertyEditorSubSelectionWrapper::removeAliasExport);
+        m_valuesPropertyMap.insert(QString::fromUtf8(propertyName), QVariant::fromValue(valueObject));
+    }
+    valueObject->setName(name);
+    valueObject->setModelNode(qmlObjectNode);
+
+    if (qmlObjectNode.propertyAffectedByCurrentState(name) && !(qmlObjectNode.modelNode().property(name).isBindingProperty()))
+        valueObject->setValue(qmlObjectNode.modelValue(name));
+
+    else
+        valueObject->setValue(value);
+
+    if (propertyName != "id" &&
+        qmlObjectNode.currentState().isBaseState() &&
+        qmlObjectNode.modelNode().property(propertyName).isBindingProperty()) {
+        valueObject->setExpression(qmlObjectNode.modelNode().bindingProperty(propertyName).expression());
+    } else {
+        if (qmlObjectNode.hasBindingProperty(name))
+            valueObject->setExpression(qmlObjectNode.expression(name));
+        else
+            valueObject->setExpression(qmlObjectNode.instanceValue(name).toString());
+    }
+}
+
+void PropertyEditorSubSelectionWrapper::exportPropertyAsAlias(const QString &name)
+{
+    if (name.isNull())
+        return;
+
+    if (locked())
+        return;
+
+    QTC_ASSERT(m_modelNode.isValid(), return);
+
+    view()->executeInTransaction("PropertyEditorView::exportPropertyAsAlias", [this, name](){
+        PropertyEditorView::generateAliasForProperty(m_modelNode, name);
+    });
+}
+
+void PropertyEditorSubSelectionWrapper::removeAliasExport(const QString &name)
+{
+    if (name.isNull())
+        return;
+
+    if (locked())
+        return;
+
+    QTC_ASSERT(m_modelNode.isValid(), return );
+
+    view()->executeInTransaction("PropertyEditorView::exportPropertyAsAlias", [this, name]() {
+        PropertyEditorView::removeAliasForProperty(m_modelNode, name);
+    });
+}
+
+bool PropertyEditorSubSelectionWrapper::locked() const
+{
+    return m_locked;
+}
+
+PropertyEditorSubSelectionWrapper::PropertyEditorSubSelectionWrapper(const ModelNode &modelNode)
+    : m_modelNode(modelNode)
+{
+    QmlObjectNode qmlObjectNode(modelNode);
+
+    QTC_ASSERT(qmlObjectNode.isValid(), return );
+
+    for (const auto &property : qmlObjectNode.modelNode().metaInfo().properties()) {
+        auto propertyName = property.name();
+        createPropertyEditorValue(qmlObjectNode,
+                                  propertyName,
+                                  qmlObjectNode.instanceValue(propertyName));
+    }
+}
+
+ModelNode PropertyEditorSubSelectionWrapper::modelNode() const
+{
+    return m_modelNode;
+}
+
+void PropertyEditorSubSelectionWrapper::deleteModelNode()
+{
+    QmlObjectNode objectNode(m_modelNode);
+
+    view()->executeInTransaction("PropertyEditorView::changeExpression", [&] {
+        if (objectNode.isValid())
+            objectNode.destroy();
+    });
+}
+
+void PropertyEditorSubSelectionWrapper::changeValue(const QString &name)
+{
+    QTC_ASSERT(m_modelNode.isValid(), return );
+
+    if (name.isNull())
+        return;
+
+    if (locked())
+        return;
+
+    const QScopeGuard cleanup([&] { m_locked = false; });
+    m_locked = true;
+
+    const NodeMetaInfo metaInfo = m_modelNode.metaInfo();
+    QVariant castedValue;
+    PropertyEditorValue *value = qobject_cast<PropertyEditorValue *>(
+        variantToQObject(m_valuesPropertyMap.value(name)));
+
+    if (auto property = metaInfo.property(name.toUtf8())) {
+        castedValue = property.castedValue(value->value());
+
+        if (castedValue.typeId() == QVariant::Color) {
+            QColor color = castedValue.value<QColor>();
+            QColor newColor = QColor(color.name());
+            newColor.setAlpha(color.alpha());
+            castedValue = QVariant(newColor);
+        }
+
+        if (!value->value().isValid()) { // reset
+            removePropertyFromModel(name.toUtf8());
+        } else {
+            if (castedValue.isValid())
+                commitVariantValueToModel(name.toUtf8(), castedValue);
+        }
+    }
+}
+
+void PropertyEditorSubSelectionWrapper::setValueFromModel(const PropertyName &name,
+                                                          const QVariant &value)
+{
+    m_locked = true;
+
+    QmlObjectNode qmlObjectNode(m_modelNode);
+
+    PropertyName propertyName = name;
+    propertyName.replace('.', '_');
+    auto propertyValue = qobject_cast<PropertyEditorValue *>(
+        variantToQObject(m_valuesPropertyMap.value(QString::fromUtf8(propertyName))));
+    if (propertyValue)
+        propertyValue->setValue(value);
+    m_locked = false;
+}
+
+void PropertyEditorSubSelectionWrapper::resetValue(const PropertyName &name)
+{
+    auto propertyValue = qobject_cast<PropertyEditorValue *>(
+        variantToQObject(m_valuesPropertyMap.value(QString::fromUtf8(name))));
+    if (propertyValue)
+        propertyValue->resetValue();
+}
+
+bool PropertyEditorSubSelectionWrapper::isRelevantModelNode(const ModelNode &modelNode) const
+{
+    QmlObjectNode objectNode(m_modelNode);
+    return modelNode == m_modelNode || objectNode.propertyChangeForCurrentState() == modelNode;
+}
+
+void PropertyEditorSubSelectionWrapper::changeExpression(const QString &propertyName)
+{
+    PropertyName name = propertyName.toUtf8();
+
+    QTC_ASSERT(m_modelNode.isValid(), return );
+
+    if (name.isNull())
+        return;
+
+    if (locked())
+        return;
+
+    const QScopeGuard cleanup([&] { m_locked = false; });
+    m_locked = true;
+
+    view()->executeInTransaction("PropertyEditorView::changeExpression", [this, name, propertyName] {
+        QmlObjectNode qmlObjectNode{m_modelNode};
+        PropertyEditorValue *value = qobject_cast<PropertyEditorValue *>(
+            variantToQObject(m_valuesPropertyMap.value(propertyName)));
+
+        if (!value) {
+            qWarning() << "PropertyEditor::changeExpression no value for " << propertyName;
+            return;
+        }
+
+        if (value->expression().isEmpty()) {
+            value->resetValue();
+            return;
+        }
+        PropertyEditorView::setExpressionOnObjectNode(qmlObjectNode, name, value->expression());
+    }); /* end of transaction */
+}
+
+void PropertyEditorSubSelectionWrapper::removePropertyFromModel(const PropertyName &propertyName)
+{
+    QTC_ASSERT(m_modelNode.isValid(), return );
+
+    m_locked = true;
+    try {
+        RewriterTransaction transaction = view()->beginRewriterTransaction(
+            "PropertyEditorView::removePropertyFromModel");
+
+        QmlObjectNode(m_modelNode).removeProperty(propertyName);
+
+        transaction.commit();
+    } catch (const RewritingException &e) {
+        e.showException();
+    }
+    m_locked = false;
+}
+
+void PropertyEditorSubSelectionWrapper::commitVariantValueToModel(const PropertyName &propertyName,
+                                                                  const QVariant &value)
+{
+    QTC_ASSERT(m_modelNode.isValid(), return );
+
+    try {
+        RewriterTransaction transaction = view()->beginRewriterTransaction(
+            "PropertyEditorView::commitVariantValueToMode");
+
+        QmlObjectNode(m_modelNode).setVariantProperty(propertyName, value);
+
+        transaction.commit();
+    } catch (const RewritingException &e) {
+        e.showException();
+    }
+}
+
+AbstractView *PropertyEditorSubSelectionWrapper::view() const
+{
+    QTC_CHECK(m_modelNode.isValid());
+
+    return m_modelNode.view();
+}
+
 } // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h
index 59236c4fe2..70a51fffc2 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h
@@ -14,6 +14,43 @@ namespace QmlDesigner {
 
 class PropertyEditorValue;
 
+class PropertyEditorSubSelectionWrapper : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QQmlPropertyMap *properties READ properties NOTIFY propertiesChanged)
+
+signals:
+    void propertiesChanged();
+
+public:
+    QQmlPropertyMap *properties();
+    PropertyEditorSubSelectionWrapper(const ModelNode &modelNode);
+    ModelNode modelNode() const;
+
+    Q_INVOKABLE void deleteModelNode();
+
+    void setValueFromModel(const PropertyName &name, const QVariant &value);
+    void resetValue(const PropertyName &name);
+
+    bool isRelevantModelNode(const ModelNode &modelNode) const;
+
+private:
+    void changeValue(const QString &name);
+    void changeExpression(const QString &propertyName);
+    void createPropertyEditorValue(const QmlObjectNode &qmlObjectNode, const PropertyName &name, const QVariant &value);
+    void exportPropertyAsAlias(const QString &name);
+    void removeAliasExport(const QString &name);
+    bool locked() const;
+
+    ModelNode m_modelNode;
+    QQmlPropertyMap m_valuesPropertyMap;
+    bool m_locked = false;
+    void removePropertyFromModel(const PropertyName &propertyName);
+    void commitVariantValueToModel(const PropertyName &propertyName, const QVariant &value);
+    AbstractView *view() const;
+};
+
 class PropertyEditorNodeWrapper : public QObject
 {
     Q_OBJECT
@@ -126,12 +163,15 @@ public:
     bool isIdList() const;
 
     Q_INVOKABLE QStringList getExpressionAsList() const;
+    Q_INVOKABLE QVector<double> getExpressionAsVector() const;
     Q_INVOKABLE bool idListAdd(const QString &value);
     Q_INVOKABLE bool idListRemove(int idx);
     Q_INVOKABLE bool idListReplace(int idx, const QString &value);
     Q_INVOKABLE void commitDrop(const QString &dropData);
     Q_INVOKABLE void openMaterialEditor(int idx);
 
+    Q_INVOKABLE void setForceBound(bool b);
+
 public slots:
     void resetValue();
     void setEnumeration(const QString &scope, const QString &name);
@@ -143,6 +183,8 @@ signals:
     void expressionChanged(const QString &name); // HACK - We use the same notifer for the backend and frontend.
                                                  // If name is empty the signal is used for QML.
 
+    void expressionChangedQml();
+
     void exportPropertyAsAliasRequested(const QString &name);
     void removeAliasExportRequested(const QString &name);
 
@@ -168,6 +210,7 @@ private:
     bool m_hasActiveDrag = false;
     bool m_isValid = false; // if the property value belongs to a non-existing complexProperty it is invalid
     PropertyEditorNodeWrapper *m_complexNode;
+    bool m_forceBound = false;
 };
 
 } // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp
index 1ff098f4ea..b22b39e238 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp
@@ -256,66 +256,19 @@ void PropertyEditorView::changeExpression(const QString &propertyName)
         underscoreName.replace('.', '_');
 
         QmlObjectNode qmlObjectNode{m_selectedNode};
-        PropertyEditorValue *value = m_qmlBackEndForCurrentType->propertyValueForName(QString::fromLatin1(underscoreName));
+        PropertyEditorValue *value = m_qmlBackEndForCurrentType->propertyValueForName(
+            QString::fromUtf8(underscoreName));
 
         if (!value) {
             qWarning() << "PropertyEditor::changeExpression no value for " << underscoreName;
             return;
         }
 
-        if (auto property = qmlObjectNode.modelNode().metaInfo().property(name)) {
-            const auto &propertType = property.propertyType();
-            if (propertType.isColor()) {
-                if (QColor(value->expression().remove('"')).isValid()) {
-                    qmlObjectNode.setVariantProperty(name, QColor(value->expression().remove('"')));
-                    return;
-                }
-            } else if (propertType.isBool()) {
-                if (isTrueFalseLiteral(value->expression())) {
-                    if (value->expression().compare("true", Qt::CaseInsensitive) == 0)
-                        qmlObjectNode.setVariantProperty(name, true);
-                    else
-                        qmlObjectNode.setVariantProperty(name, false);
-                    return;
-                }
-            } else if (propertType.isInteger()) {
-                bool ok;
-                int intValue = value->expression().toInt(&ok);
-                if (ok) {
-                    qmlObjectNode.setVariantProperty(name, intValue);
-                    return;
-                }
-            } else if (propertType.isFloat()) {
-                bool ok;
-                qreal realValue = value->expression().toDouble(&ok);
-                if (ok) {
-                    qmlObjectNode.setVariantProperty(name, realValue);
-                    return;
-                }
-            } else if (propertType.isVariant()) {
-                bool ok;
-                qreal realValue = value->expression().toDouble(&ok);
-                if (ok) {
-                    qmlObjectNode.setVariantProperty(name, realValue);
-                    return;
-                } else if (isTrueFalseLiteral(value->expression())) {
-                    if (value->expression().compare("true", Qt::CaseInsensitive) == 0)
-                        qmlObjectNode.setVariantProperty(name, true);
-                    else
-                        qmlObjectNode.setVariantProperty(name, false);
-                    return;
-                }
-            }
-        }
-
         if (value->expression().isEmpty()) {
             value->resetValue();
             return;
         }
-
-        if (qmlObjectNode.expression(name) != value->expression()
-            || !qmlObjectNode.propertyAffectedByCurrentState(name))
-            qmlObjectNode.setBindingProperty(name, value->expression());
+        setExpressionOnObjectNode(qmlObjectNode, name, value->expression());
     }); /* end of transaction */
 }
 
@@ -330,21 +283,8 @@ void PropertyEditorView::exportPropertyAsAlias(const QString &name)
     if (noValidSelection())
         return;
 
-    executeInTransaction("PropertyEditorView::exportPropertyAsAlias", [this, name](){
-        const QString id = m_selectedNode.validId();
-        QString upperCasePropertyName = name;
-        upperCasePropertyName.replace(0, 1, upperCasePropertyName.at(0).toUpper());
-        QString aliasName = id + upperCasePropertyName;
-        aliasName.replace(".", ""); //remove all dots
-
-        PropertyName propertyName = aliasName.toUtf8();
-        if (rootModelNode().hasProperty(propertyName)) {
-            Core::AsynchronousMessageBox::warning(tr("Cannot Export Property as Alias"),
-                                                  tr("Property %1 does already exist for root component.").arg(aliasName));
-            return;
-        }
-        rootModelNode().bindingProperty(propertyName).setDynamicTypeNameAndExpression("alias", id + "." + name);
-    });
+    executeInTransaction("PropertyEditorView::exportPropertyAsAlias",
+                         [this, name]() { generateAliasForProperty(m_selectedNode, name); });
 }
 
 void PropertyEditorView::removeAliasExport(const QString &name)
@@ -358,15 +298,8 @@ void PropertyEditorView::removeAliasExport(const QString &name)
     if (noValidSelection())
         return;
 
-    executeInTransaction("PropertyEditorView::exportPropertyAsAlias", [this, name](){
-        const QString id = m_selectedNode.validId();
-
-        for (const BindingProperty &property : rootModelNode().bindingProperties())
-            if (property.expression() == (id + "." + name)) {
-                rootModelNode().removeProperty(property.name());
-                break;
-            }
-    });
+    executeInTransaction("PropertyEditorView::exportPropertyAsAlias",
+                         [this, name]() { removeAliasForProperty(m_selectedNode, name); });
 }
 
 bool PropertyEditorView::locked() const
@@ -384,11 +317,113 @@ void PropertyEditorView::refreshMetaInfos(const TypeIds &deletedTypeIds)
     m_propertyComponentGenerator.refreshMetaInfos(deletedTypeIds);
 }
 
+void PropertyEditorView::setExpressionOnObjectNode(const QmlObjectNode &constObjectNode,
+                                                   const PropertyName &name,
+                                                   const QString &newExpression)
+{
+    auto qmlObjectNode = constObjectNode;
+    auto expression = newExpression;
+    if (auto property = qmlObjectNode.modelNode().metaInfo().property(name)) {
+        const auto &propertType = property.propertyType();
+        if (propertType.isColor()) {
+            if (QColor(expression.remove('"')).isValid()) {
+                qmlObjectNode.setVariantProperty(name, QColor(expression.remove('"')));
+                return;
+            }
+        } else if (propertType.isBool()) {
+            if (isTrueFalseLiteral(expression)) {
+                if (expression.compare("true", Qt::CaseInsensitive) == 0)
+                    qmlObjectNode.setVariantProperty(name, true);
+                else
+                    qmlObjectNode.setVariantProperty(name, false);
+                return;
+            }
+        } else if (propertType.isInteger()) {
+            bool ok;
+            int intValue = expression.toInt(&ok);
+            if (ok) {
+                qmlObjectNode.setVariantProperty(name, intValue);
+                return;
+            }
+        } else if (propertType.isFloat()) {
+            bool ok;
+            qreal realValue = expression.toDouble(&ok);
+            if (ok) {
+                qmlObjectNode.setVariantProperty(name, realValue);
+                return;
+            }
+        } else if (propertType.isVariant()) {
+            bool ok;
+            qreal realValue = expression.toDouble(&ok);
+            if (ok) {
+                qmlObjectNode.setVariantProperty(name, realValue);
+                return;
+            } else if (isTrueFalseLiteral(expression)) {
+                if (expression.compare("true", Qt::CaseInsensitive) == 0)
+                    qmlObjectNode.setVariantProperty(name, true);
+                else
+                    qmlObjectNode.setVariantProperty(name, false);
+                return;
+            }
+        }
+    }
+
+    if (qmlObjectNode.expression(name) != expression
+        || !qmlObjectNode.propertyAffectedByCurrentState(name))
+        qmlObjectNode.setBindingProperty(name, expression);
+}
+
+void PropertyEditorView::generateAliasForProperty(const ModelNode &modelNode, const QString &name)
+{
+    QTC_ASSERT(modelNode.isValid(), return );
+
+    auto view = modelNode.view();
+
+    auto rootNode = view->rootModelNode();
+
+    auto nonConstModelNode = modelNode;
+    const QString id = nonConstModelNode.validId();
+
+    QString upperCasePropertyName = name;
+    upperCasePropertyName.replace(0, 1, upperCasePropertyName.at(0).toUpper());
+    QString aliasName = id + upperCasePropertyName;
+    aliasName.replace(".", ""); //remove all dots
+
+    PropertyName propertyName = aliasName.toUtf8();
+    if (rootNode.hasProperty(propertyName)) {
+        Core::AsynchronousMessageBox::warning(
+            tr("Cannot Export Property as Alias"),
+            tr("Property %1 does already exist for root component.").arg(aliasName));
+        return;
+    }
+    rootNode.bindingProperty(propertyName).setDynamicTypeNameAndExpression("alias", id + "." + name);
+}
+
+void PropertyEditorView::removeAliasForProperty(const ModelNode &modelNode, const QString &propertyName)
+{
+    QTC_ASSERT(modelNode.isValid(), return );
+
+    auto view = modelNode.view();
+
+    auto rootNode = view->rootModelNode();
+
+    auto nonConstModelNode = modelNode;
+
+    const QString id = nonConstModelNode.validId();
+
+    for (const BindingProperty &property : rootNode.bindingProperties()) {
+        if (property.expression() == (id + "." + propertyName)) {
+            rootNode.removeProperty(property.name());
+            break;
+        }
+    }
+}
+
 void PropertyEditorView::updateSize()
 {
     if (!m_qmlBackEndForCurrentType)
         return;
-    auto frame = m_qmlBackEndForCurrentType->widget()->findChild<QWidget*>("propertyEditorFrame");
+    auto frame = m_qmlBackEndForCurrentType->widget()->findChild<QWidget *>("propertyEditorFrame");
     if (frame)
         frame->resize(m_stackedWidget->size());
 }
@@ -747,7 +782,11 @@ void PropertyEditorView::propertiesRemoved(const QList<AbstractProperty> &proper
     if (noValidSelection())
         return;
 
+    QTC_ASSERT(m_qmlBackEndForCurrentType, return );
+
     for (const AbstractProperty &property : propertyList) {
+        m_qmlBackEndForCurrentType->handlePropertiesRemovedInModelNodeProxy(property);
+
         ModelNode node(property.parentModelNode());
 
         if (node.isRootNode() && !m_selectedNode.isRootNode())
@@ -805,7 +844,11 @@ void PropertyEditorView::variantPropertiesChanged(const QList<VariantProperty>&
     if (noValidSelection())
         return;
 
+    QTC_ASSERT(m_qmlBackEndForCurrentType, return );
+
     for (const VariantProperty &property : propertyList) {
+        m_qmlBackEndForCurrentType->handleVariantPropertyChangedInModelNodeProxy(property);
+
         ModelNode node(property.parentModelNode());
 
         if (propertyIsAttachedLayoutProperty(property.name()))
@@ -830,7 +873,11 @@ void PropertyEditorView::bindingPropertiesChanged(const QList<BindingProperty> &
     if (locked() || noValidSelection())
         return;
 
+    QTC_ASSERT(m_qmlBackEndForCurrentType, return );
+
     for (const BindingProperty &property : propertyList) {
+        m_qmlBackEndForCurrentType->handleBindingPropertyChangedInModelNodeProxy(property);
+
         ModelNode node(property.parentModelNode());
 
         if (property.isAliasExport())
@@ -952,6 +999,9 @@ void PropertyEditorView::instancePropertyChanged(const QList<QPair<ModelNode, Pr
 {
     if (!m_selectedNode.isValid())
         return;
+
+    QTC_ASSERT(m_qmlBackEndForCurrentType, return );
+
     m_locked = true;
 
     using ModelNodePropertyPair = QPair<ModelNode, PropertyName>;
@@ -960,7 +1010,11 @@ void PropertyEditorView::instancePropertyChanged(const QList<QPair<ModelNode, Pr
         const QmlObjectNode qmlObjectNode(modelNode);
         const PropertyName propertyName = propertyPair.second;
 
-        if (qmlObjectNode.isValid() && m_qmlBackEndForCurrentType && modelNode == m_selectedNode && qmlObjectNode.currentState().isValid()) {
+        m_qmlBackEndForCurrentType->handleInstancePropertyChangedInModelNodeProxy(modelNode,
+                                                                                  propertyName);
+
+        if (qmlObjectNode.isValid() && m_qmlBackEndForCurrentType && modelNode == m_selectedNode
+            && qmlObjectNode.currentState().isValid()) {
             const AbstractProperty property = modelNode.property(propertyName);
             if (modelNode == m_selectedNode || qmlObjectNode.propertyChangeForCurrentState() == qmlObjectNode) {
                 if ( !modelNode.hasProperty(propertyName) || modelNode.property(property.name()).isBindingProperty() )
@@ -969,7 +1023,6 @@ void PropertyEditorView::instancePropertyChanged(const QList<QPair<ModelNode, Pr
                     setValue(modelNode, property.name(), qmlObjectNode.modelValue(property.name()));
             }
         }
-
     }
 
     m_locked = false;
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.h b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.h
index cc9b522839..ef2b71f558 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.h
@@ -84,6 +84,16 @@ public:
 
     void refreshMetaInfos(const TypeIds &deletedTypeIds) override;
 
+    static void setExpressionOnObjectNode(const QmlObjectNode &objectNode,
+                                          const PropertyName &name,
+                                          const QString &expression);
+
+    static void generateAliasForProperty(const ModelNode &modelNode,
+                                         const QString &propertyName);
+
+    static void removeAliasForProperty(const ModelNode &modelNode,
+                                         const QString &propertyName);
+
 protected:
     void timerEvent(QTimerEvent *event) override;
     void setupPane(const TypeName &typeName);
diff --git a/src/plugins/qmldesigner/components/propertyeditor/qmlmodelnodeproxy.cpp b/src/plugins/qmldesigner/components/propertyeditor/qmlmodelnodeproxy.cpp
index 96ec5f92e7..fc39b37137 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/qmlmodelnodeproxy.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/qmlmodelnodeproxy.cpp
@@ -4,6 +4,15 @@
 #include "abstractview.h"
 #include "qmlmodelnodeproxy.h"
 
+#include <nodemetainfo.h>
+
+#include <nodeabstractproperty.h>
+#include <nodelistproperty.h>
+#include <variantproperty.h>
+
+#include <utils/qtcassert.h>
+#include <utils/algorithm.h>
+
 #include <QtQml>
 
 namespace QmlDesigner {
@@ -17,6 +26,8 @@ void QmlModelNodeProxy::setup(const QmlObjectNode &objectNode)
 {
     m_qmlObjectNode = objectNode;
 
+    m_subselection.clear();
+
     emit modelNodeChanged();
 }
 
@@ -75,4 +86,227 @@ QString QmlModelNodeProxy::simplifiedTypeName() const
     return m_qmlObjectNode.simplifiedTypeName();
 }
 
+static QList<int> toInternalIdList(const QList<ModelNode> &nodes)
+{
+    return Utils::transform(nodes, [](const ModelNode &node) { return node.internalId(); });
+}
+
+QList<int> QmlModelNodeProxy::allChildren(int internalId) const
+{
+    ModelNode modelNode = m_qmlObjectNode.modelNode();
+
+    QTC_ASSERT(modelNode.isValid(), return {});
+
+    if (internalId >= 0)
+        modelNode = modelNode.view()->modelNodeForInternalId(internalId);
+
+    return allChildren(modelNode);
+}
+
+QList<int> QmlModelNodeProxy::allChildrenOfType(const QString &typeName, int internalId) const
+{
+    ModelNode modelNode = m_qmlObjectNode.modelNode();
+
+    QTC_ASSERT(modelNode.isValid(), return {});
+
+    if (internalId >= 0)
+        modelNode = modelNode.view()->modelNodeForInternalId(internalId);
+
+    return allChildrenOfType(modelNode, typeName);
+}
+
+QString QmlModelNodeProxy::simplifiedTypeName(int internalId) const
+{
+    ModelNode modelNode = m_qmlObjectNode.modelNode();
+
+    QTC_ASSERT(modelNode.isValid(), return {});
+
+    return modelNode.view()->modelNodeForInternalId(internalId).simplifiedTypeName();
+}
+
+PropertyEditorSubSelectionWrapper *QmlModelNodeProxy::findWrapper(int internalId) const
+{
+    for (const auto &item : qAsConst(m_subselection)) {
+        if (item->modelNode().internalId() == internalId)
+            return item.data();
+    }
+
+    return nullptr;
+}
+
+PropertyEditorSubSelectionWrapper *QmlModelNodeProxy::registerSubSelectionWrapper(int internalId)
+{
+    auto result = findWrapper(internalId);
+
+    if (result)
+        return result;
+
+    QTC_ASSERT(m_qmlObjectNode.isValid(), return nullptr);
+
+    ModelNode node = m_qmlObjectNode.view()->modelNodeForInternalId(internalId);
+
+    QTC_ASSERT(node.isValid(), return nullptr);
+
+    QSharedPointer<PropertyEditorSubSelectionWrapper> wrapper(
+        new PropertyEditorSubSelectionWrapper(node));
+    m_subselection.append(wrapper);
+
+    QJSEngine::setObjectOwnership(wrapper.data(), QJSEngine::CppOwnership);
+
+    return wrapper.data();
+}
+
+void QmlModelNodeProxy::createModelNode(int internalIdParent,
+                                        const QString &property,
+                                        const QString &typeName,
+                                        const QString &requiredImport)
+{
+    QTC_ASSERT(m_qmlObjectNode.isValid(), return );
+
+    auto modelNode = m_qmlObjectNode.modelNode();
+
+    AbstractView *view = modelNode.view();
+
+    auto parentModelNode = m_qmlObjectNode.modelNode();
+    if (internalIdParent >= 0)
+        parentModelNode = view->modelNodeForInternalId(internalIdParent);
+
+    QTC_ASSERT(parentModelNode.isValid(), return );
+
+    Import import;
+    Q_ASSERT(import.isEmpty());
+
+    if (!requiredImport.isEmpty() && !view->model()->hasImport(requiredImport))
+        import = Import::createLibraryImport(requiredImport);
+
+    view->executeInTransaction("QmlModelNodeProxy::createModelNode", [&] {
+        if (!import.isEmpty())
+            view->model()->changeImports({import}, {});
+
+#ifdef QDS_USE_PROJECTSTORAGE
+        ModelNode newNode = view->createModelNode(typeName.toUtf8());
+#else
+        NodeMetaInfo metaInfo = modelNode.model()->metaInfo(typeName.toUtf8());
+        ModelNode newNode = view->createModelNode(metaInfo.typeName(),
+                                                  metaInfo.majorVersion(),
+                                                  metaInfo.minorVersion());
+#endif
+        parentModelNode.nodeAbstractProperty(property.toUtf8()).reparentHere(newNode);
+    });
+}
+
+void QmlModelNodeProxy::moveNode(int internalIdParent,
+                                 const QString &propertyName,
+                                 int fromIndex,
+                                 int toIndex)
+{
+    QTC_ASSERT(m_qmlObjectNode.isValid(), return );
+
+    ModelNode node = m_qmlObjectNode.view()->modelNodeForInternalId(internalIdParent);
+
+    QTC_ASSERT(node.isValid(), return );
+    AbstractView *view = m_qmlObjectNode.view();
+    view->executeInTransaction("QmlModelNodeProxy::swapNode", [&] {
+        node.nodeListProperty(propertyName.toUtf8()).slide(fromIndex, toIndex);
+    });
+}
+
+bool QmlModelNodeProxy::isInstanceOf(const QString &typeName, int internalId) const
+{
+    ModelNode modelNode = m_qmlObjectNode.modelNode();
+
+    QTC_ASSERT(modelNode.isValid(), return {});
+
+    if (internalId >= 0)
+        modelNode = modelNode.view()->modelNodeForInternalId(internalId);
+
+    NodeMetaInfo metaInfo = modelNode.model()->metaInfo(typeName.toUtf8());
+
+    return modelNode.metaInfo().isBasedOn(metaInfo);
+}
+
+void QmlModelNodeProxy::changeType(int internalId, const QString &typeName)
+{
+    QTC_ASSERT(m_qmlObjectNode.isValid(), return );
+
+    ModelNode node = m_qmlObjectNode.view()->modelNodeForInternalId(internalId);
+
+    QTC_ASSERT(node.isValid(), return );
+
+    QTC_ASSERT(!node.isRootNode(), return );
+#ifdef QDS_USE_PROJECTSTORAGE
+    node.changeType(typeName.toUtf8(), -1, -1);
+#else
+    NodeMetaInfo metaInfo = node.model()->metaInfo(typeName.toUtf8());
+    node.changeType(metaInfo.typeName(), metaInfo.majorVersion(), metaInfo.minorVersion());
+#endif
+}
+
+void QmlModelNodeProxy::handleInstancePropertyChanged(const ModelNode &modelNode,
+                                                      const PropertyName &propertyName)
+{
+    const QmlObjectNode qmlObjectNode(modelNode);
+
+    for (const auto &item : qAsConst(m_subselection)) {
+        if (item && item->isRelevantModelNode(modelNode)) {
+            if (!modelNode.hasProperty(propertyName)
+                || modelNode.property(propertyName).isBindingProperty()) {
+                item->setValueFromModel(propertyName, qmlObjectNode.instanceValue(propertyName));
+            } else {
+                item->setValueFromModel(propertyName, qmlObjectNode.modelValue(propertyName));
+            }
+        }
+    }
+}
+
+void QmlModelNodeProxy::handleBindingPropertyChanged(const BindingProperty &property)
+{
+    for (const auto &item : qAsConst(m_subselection)) {
+        if (item && item->isRelevantModelNode(property.parentModelNode())) {
+            QmlObjectNode objectNode(item->modelNode());
+            if (objectNode.modelNode().property(property.name()).isBindingProperty())
+                item->setValueFromModel(property.name(), objectNode.instanceValue(property.name()));
+            else
+                item->setValueFromModel(property.name(), objectNode.modelValue(property.name()));
+        }
+    }
+}
+
+void QmlModelNodeProxy::handleVariantPropertyChanged(const VariantProperty &property)
+{
+    for (const auto &item : qAsConst(m_subselection)) {
+        if (item && item->isRelevantModelNode(property.parentModelNode())) {
+            QmlObjectNode objectNode(item->modelNode());
+            if (objectNode.modelNode().property(property.name()).isBindingProperty())
+                item->setValueFromModel(property.name(), objectNode.instanceValue(property.name()));
+            else
+                item->setValueFromModel(property.name(), objectNode.modelValue(property.name()));
+        }
+    }
+}
+
+void QmlModelNodeProxy::handlePropertiesRemoved(const AbstractProperty &property)
+{
+    for (const auto &item : qAsConst(m_subselection)) {
+        if (item && item->isRelevantModelNode(property.parentModelNode())) {
+            QmlObjectNode objectNode(item->modelNode());
+            item->resetValue(property.name());
+            item->setValueFromModel(property.name(), objectNode.instanceValue(property.name()));
+        }
+    }
+}
+
+QList<int> QmlModelNodeProxy::allChildren(const ModelNode &modelNode) const
+{
+    return toInternalIdList(modelNode.directSubModelNodes());
+}
+
+QList<int> QmlModelNodeProxy::allChildrenOfType(const ModelNode &modelNode, const QString &typeName) const
+{
+    QTC_ASSERT(modelNode.isValid(), return {});
+
+    NodeMetaInfo metaInfo = modelNode.model()->metaInfo(typeName.toUtf8());
+
+    return toInternalIdList(modelNode.directSubModelNodesOfType(metaInfo));
 }
+} // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/components/propertyeditor/qmlmodelnodeproxy.h b/src/plugins/qmldesigner/components/propertyeditor/qmlmodelnodeproxy.h
index 4740b01fbd..d8a49d7e10 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/qmlmodelnodeproxy.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/qmlmodelnodeproxy.h
@@ -3,6 +3,8 @@
 
 #pragma once
 
+#include "propertyeditorvalue.h"
+
 #include <qmlitemnode.h>
 
 #include <QObject>
@@ -16,6 +18,7 @@ class QMLDESIGNERCORE_EXPORT QmlModelNodeProxy : public QObject
     Q_PROPERTY(QmlDesigner::ModelNode modelNode READ modelNode NOTIFY modelNodeChanged)
     Q_PROPERTY(bool multiSelection READ multiSelection NOTIFY modelNodeChanged)
 
+
 public:
     explicit QmlModelNodeProxy(QObject *parent = nullptr);
 
@@ -36,13 +39,45 @@ public:
 
     QString simplifiedTypeName() const;
 
+    Q_INVOKABLE QList<int> allChildren(int internalId = -1) const;
+    Q_INVOKABLE QList<int> allChildrenOfType(const QString &typeName, int internalId = -1) const;
+
+    Q_INVOKABLE QString simplifiedTypeName(int internalId) const;
+
+    Q_INVOKABLE PropertyEditorSubSelectionWrapper *registerSubSelectionWrapper(int internalId);
+
+    Q_INVOKABLE void createModelNode(int internalIdParent,
+                                     const QString &property,
+                                     const QString &typeName,
+                                     const QString &requiredImport = {});
+
+    Q_INVOKABLE void moveNode(int internalIdParent,
+                              const QString &propertyName,
+                              int fromIndex,
+                              int toIndex);
+
+    Q_INVOKABLE bool isInstanceOf(const QString &typeName, int internalId = -1) const;
+
+    Q_INVOKABLE void changeType(int internalId, const QString &typeName);
+
+    void handleInstancePropertyChanged(const ModelNode &modelNode, const PropertyName &propertyName);
+
+    void handleBindingPropertyChanged(const BindingProperty &property);
+    void handleVariantPropertyChanged(const VariantProperty &property);
+    void handlePropertiesRemoved(const AbstractProperty &property);
+
 signals:
     void modelNodeChanged();
     void selectionToBeChanged();
     void selectionChanged();
 
 private:
+    QList<int> allChildren(const ModelNode &modelNode) const;
+    QList<int> allChildrenOfType(const ModelNode &modelNode, const QString &typeName) const;
+    PropertyEditorSubSelectionWrapper *findWrapper(int internalId) const;
+
     QmlObjectNode m_qmlObjectNode;
+    QList<QSharedPointer<PropertyEditorSubSelectionWrapper>> m_subselection;
 };
 
 } //QmlDesigner
diff --git a/src/plugins/qmldesigner/components/textureeditor/textureeditorqmlbackend.cpp b/src/plugins/qmldesigner/components/textureeditor/textureeditorqmlbackend.cpp
index 80cf5693d2..972574554b 100644
--- a/src/plugins/qmldesigner/components/textureeditor/textureeditorqmlbackend.cpp
+++ b/src/plugins/qmldesigner/components/textureeditor/textureeditorqmlbackend.cpp
@@ -43,17 +43,17 @@ static QObject *variantToQObject(const QVariant &value)
 namespace QmlDesigner {
 
 TextureEditorQmlBackend::TextureEditorQmlBackend(TextureEditorView *textureEditor, AsynchronousImageCache &imageCache)
-    : m_view(new QQuickWidget)
+    : m_quickWidget(new QQuickWidget)
     , m_textureEditorTransaction(new TextureEditorTransaction(textureEditor))
-    , m_contextObject(new TextureEditorContextObject(m_view->rootContext()))
+    , m_contextObject(new TextureEditorContextObject(m_quickWidget->rootContext()))
 {
     QImage defaultImage;
     defaultImage.load(Utils::StyleHelper::dpiSpecificImageFile(":/textureeditor/images/texture_default.png"));
     m_textureEditorImageProvider = new AssetImageProvider(imageCache, defaultImage);
-    m_view->setResizeMode(QQuickWidget::SizeRootObjectToView);
-    m_view->setObjectName(Constants::OBJECT_NAME_TEXTURE_EDITOR);
-    m_view->engine()->addImportPath(propertyEditorResourcesPath() + "/imports");
-    m_view->engine()->addImageProvider("qmldesigner_thumbnails", m_textureEditorImageProvider);
+    m_quickWidget->setResizeMode(QQuickWidget::SizeRootObjectToView);
+    m_quickWidget->setObjectName(Constants::OBJECT_NAME_TEXTURE_EDITOR);
+    m_quickWidget->engine()->addImportPath(propertyEditorResourcesPath() + "/imports");
+    m_quickWidget->engine()->addImageProvider("qmldesigner_thumbnails", m_textureEditorImageProvider);
     m_contextObject->setBackendValues(&m_backendValuesPropertyMap);
     m_contextObject->setModel(textureEditor->model());
     context()->setContextObject(m_contextObject.data());
@@ -154,7 +154,7 @@ void TextureEditorQmlBackend::setValue(const QmlObjectNode &, const PropertyName
 
 QQmlContext *TextureEditorQmlBackend::context() const
 {
-    return m_view->rootContext();
+    return m_quickWidget->rootContext();
 }
 
 TextureEditorContextObject *TextureEditorQmlBackend::contextObject() const
@@ -164,12 +164,12 @@ TextureEditorContextObject *TextureEditorQmlBackend::contextObject() const
 
 QQuickWidget *TextureEditorQmlBackend::widget() const
 {
-    return m_view;
+    return m_quickWidget.get();
 }
 
 void TextureEditorQmlBackend::setSource(const QUrl &url)
 {
-    m_view->setSource(url);
+    m_quickWidget->setSource(url);
 }
 
 QmlAnchorBindingProxy &TextureEditorQmlBackend::backendAnchorBinding()
diff --git a/src/plugins/qmldesigner/components/textureeditor/textureeditorqmlbackend.h b/src/plugins/qmldesigner/components/textureeditor/textureeditorqmlbackend.h
index b6d3fddf22..c8a113f7d3 100644
--- a/src/plugins/qmldesigner/components/textureeditor/textureeditorqmlbackend.h
+++ b/src/plugins/qmldesigner/components/textureeditor/textureeditorqmlbackend.h
@@ -7,6 +7,8 @@
 #include "qmlanchorbindingproxy.h"
 #include "qmlmodelnodeproxy.h"
 
+#include <utils/uniqueobjectptr.h>
+
 #include <nodemetainfo.h>
 
 class PropertyEditorValue;
@@ -58,10 +60,13 @@ private:
                                    TextureEditorView *textureEditor);
     PropertyName auxNamePostFix(const PropertyName &propertyName);
 
-    QQuickWidget *m_view = nullptr;
+    // to avoid a crash while destructing DesignerPropertyMap in the QQmlData
+    // this needs be destructed after m_quickWidget->engine() is destructed
+    DesignerPropertyMap m_backendValuesPropertyMap;
+
+    Utils::UniqueObjectPtr<QQuickWidget> m_quickWidget = nullptr;
     QmlAnchorBindingProxy m_backendAnchorBinding;
     QmlModelNodeProxy m_backendModelNode;
-    DesignerPropertyMap m_backendValuesPropertyMap;
     QScopedPointer<TextureEditorTransaction> m_textureEditorTransaction;
     QScopedPointer<TextureEditorContextObject> m_contextObject;
     AssetImageProvider *m_textureEditorImageProvider = nullptr;
diff --git a/src/plugins/qmldesigner/components/timelineeditor/setframevaluedialog.cpp b/src/plugins/qmldesigner/components/timelineeditor/setframevaluedialog.cpp
index 2d8998404a..f289583cc3 100644
--- a/src/plugins/qmldesigner/components/timelineeditor/setframevaluedialog.cpp
+++ b/src/plugins/qmldesigner/components/timelineeditor/setframevaluedialog.cpp
@@ -40,7 +40,7 @@ SetFrameValueDialog::SetFrameValueDialog(qreal frame, const QVariant &value,
     valueLabel->setAlignment(Qt::AlignRight);
     valueLabel->setFixedWidth(labelWidth);
 
-    m_frameControl->setRange(std::numeric_limits<int>::min(), std::numeric_limits<int>::max());
+    m_frameControl->setRange(std::numeric_limits<int>::lowest(), std::numeric_limits<int>::max());
     m_frameControl->setValue(static_cast<int>(frame));
     m_frameControl->setAlignment(Qt::AlignRight);
 
@@ -86,7 +86,6 @@ QWidget* SetFrameValueDialog::createValueControl(const QVariant& value)
 
     switch (value.metaType().id())
     {
-
     case QMetaType::QColor: {
         auto* widget = new ColorControl(value.value<QColor>());
         m_valueGetter = [widget]() { return widget->value(); };
@@ -102,7 +101,7 @@ QWidget* SetFrameValueDialog::createValueControl(const QVariant& value)
 
     case QMetaType::Int: {
         auto* widget = new QSpinBox;
-        widget->setRange(std::numeric_limits<int>::min(), std::numeric_limits<int>::max());
+        widget->setRange(std::numeric_limits<int>::lowest(), std::numeric_limits<int>::max());
         widget->setAlignment(Qt::AlignRight);
         widget->setValue(value.toInt());
         m_valueGetter = [widget]() { return widget->value(); };
@@ -120,7 +119,7 @@ QWidget* SetFrameValueDialog::createValueControl(const QVariant& value)
 
     case QMetaType::Float: {
         auto* widget = new QDoubleSpinBox;
-        widget->setRange(std::numeric_limits<float>::min(), std::numeric_limits<float>::max());
+        widget->setRange(std::numeric_limits<float>::lowest(), std::numeric_limits<float>::max());
         widget->setAlignment(Qt::AlignRight);
         widget->setValue(value.toFloat());
         m_valueGetter = [widget]() { return static_cast<float>(widget->value()); };
@@ -132,7 +131,7 @@ QWidget* SetFrameValueDialog::createValueControl(const QVariant& value)
 
     default: {
         auto* widget = new QDoubleSpinBox;
-        widget->setRange(std::numeric_limits<double>::min(), std::numeric_limits<double>::max());
+        widget->setRange(std::numeric_limits<double>::lowest(), std::numeric_limits<double>::max());
         widget->setAlignment(Qt::AlignRight);
         widget->setValue(value.toDouble());
         m_valueGetter = [widget]() { return widget->value(); };
diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelineanimationform.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelineanimationform.cpp
index 83551378ee..e65c05c39f 100644
--- a/src/plugins/qmldesigner/components/timelineeditor/timelineanimationform.cpp
+++ b/src/plugins/qmldesigner/components/timelineeditor/timelineanimationform.cpp
@@ -13,6 +13,7 @@
 #include <variantproperty.h>
 #include <qmlitemnode.h>
 #include <qmlobjectnode.h>
+#include <dialogutils.h>
 
 #include <coreplugin/messagebox.h>
 
@@ -141,8 +142,7 @@ TimelineAnimationForm::TimelineAnimationForm(QWidget *parent)
         bool error = false;
 
         if (!ModelNode::isValidId(newId)) {
-            Core::AsynchronousMessageBox::warning(tr("Invalid Id"),
-                                                  tr("%1 is an invalid id.").arg(newId));
+            DialogUtils::showWarningForInvalidId(newId);
             error = true;
         } else if (animation().view()->hasId(newId)) {
             Core::AsynchronousMessageBox::warning(tr("Invalid Id"),
diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelineform.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelineform.cpp
index b3d408dc0d..08915b6577 100644
--- a/src/plugins/qmldesigner/components/timelineeditor/timelineform.cpp
+++ b/src/plugins/qmldesigner/components/timelineeditor/timelineform.cpp
@@ -10,6 +10,7 @@
 #include <nodemetainfo.h>
 #include <rewritertransaction.h>
 #include <variantproperty.h>
+#include <dialogutils.h>
 
 #include <coreplugin/messagebox.h>
 
@@ -125,8 +126,7 @@ TimelineForm::TimelineForm(QWidget *parent)
         bool error = false;
 
         if (!ModelNode::isValidId(newId)) {
-            Core::AsynchronousMessageBox::warning(tr("Invalid Id"),
-                                                  tr("%1 is an invalid id.").arg(newId));
+            DialogUtils::showWarningForInvalidId(newId);
             error = true;
         } else if (m_timeline.view()->hasId(newId)) {
             Core::AsynchronousMessageBox::warning(tr("Invalid Id"),
diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelineview.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelineview.cpp
index 7905df68e9..8288e69316 100644
--- a/src/plugins/qmldesigner/components/timelineeditor/timelineview.cpp
+++ b/src/plugins/qmldesigner/components/timelineeditor/timelineview.cpp
@@ -644,11 +644,12 @@ void TimelineView::registerActions()
 
 TimelineWidget *TimelineView::createWidget()
 {
-    if (!m_timelineWidget)
+    if (!m_timelineWidget) {
         m_timelineWidget = new TimelineWidget(this);
 
-    auto *timelineContext = new TimelineContext(m_timelineWidget);
-    Core::ICore::addContextObject(timelineContext);
+        auto *timelineContext = new TimelineContext(m_timelineWidget);
+        Core::ICore::addContextObject(timelineContext);
+    }
 
     return m_timelineWidget;
 }
diff --git a/src/plugins/qmldesigner/components/toolbar/toolbarbackend.cpp b/src/plugins/qmldesigner/components/toolbar/toolbarbackend.cpp
index e9df928c96..cb84183f92 100644
--- a/src/plugins/qmldesigner/components/toolbar/toolbarbackend.cpp
+++ b/src/plugins/qmldesigner/components/toolbar/toolbarbackend.cpp
@@ -21,6 +21,9 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/modemanager.h>
+
+#include <texteditor/textdocument.h>
+
 #include <projectexplorer/kitmanager.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>
@@ -302,6 +305,20 @@ ToolBarBackend::ToolBarBackend(QObject *parent)
             this,
             &ToolBarBackend::documentIndexChanged);
 
+    connect(Core::EditorManager::instance(), &Core::EditorManager::currentEditorChanged, this, [this]() {
+        static QMetaObject::Connection *lastConnection = nullptr;
+        delete lastConnection;
+
+        if (auto textDocument = qobject_cast<TextEditor::TextDocument *>(
+                Core::EditorManager::currentDocument())) {
+            connect(textDocument->document(),
+                    &QTextDocument::modificationChanged,
+                    this,
+                    &ToolBarBackend::isDocumentDirtyChanged);
+            emit isDocumentDirtyChanged();
+        }
+    });
+
     connect(Core::EditorManager::instance(),
             &Core::EditorManager::currentEditorChanged,
             this,
@@ -740,6 +757,12 @@ bool ToolBarBackend::isSharingEnabled()
     return QmlDesigner::checkEnterpriseLicense();
 }
 
+bool ToolBarBackend::isDocumentDirty() const
+{
+    return Core::EditorManager::currentDocument()
+           && Core::EditorManager::currentDocument()->isModified();
+}
+
 void ToolBarBackend::launchGlobalAnnotations()
 {
     QmlDesignerPlugin::emitUsageStatistics(Constants::EVENT_TOOLBAR_EDIT_GLOBAL_ANNOTATION);
diff --git a/src/plugins/qmldesigner/components/toolbar/toolbarbackend.h b/src/plugins/qmldesigner/components/toolbar/toolbarbackend.h
index 5d0b0e712a..02bdae1717 100644
--- a/src/plugins/qmldesigner/components/toolbar/toolbarbackend.h
+++ b/src/plugins/qmldesigner/components/toolbar/toolbarbackend.h
@@ -97,6 +97,7 @@ class ToolBarBackend : public QObject
     Q_PROPERTY(bool isMCUs READ isMCUs NOTIFY isMCUsChanged)
     Q_PROPERTY(bool projectOpened READ projectOpened NOTIFY projectOpenedChanged)
     Q_PROPERTY(bool isSharingEnabled READ isSharingEnabled NOTIFY isSharingEnabledChanged)
+    Q_PROPERTY(bool isDocumentDirty READ isDocumentDirty NOTIFY isDocumentDirtyChanged)
 
 public:
     ToolBarBackend(QObject *parent  = nullptr);
@@ -147,6 +148,8 @@ public:
 
     bool isSharingEnabled();
 
+    bool isDocumentDirty() const;
+
     static void launchGlobalAnnotations();
 
 signals:
@@ -167,6 +170,7 @@ signals:
     void isMCUsChanged();
     void projectOpenedChanged();
     void isSharingEnabledChanged();
+    void isDocumentDirtyChanged();
 
 private:
     void setupWorkspaces();
diff --git a/src/plugins/qmldesigner/components/transitioneditor/transitioneditorview.cpp b/src/plugins/qmldesigner/components/transitioneditor/transitioneditorview.cpp
index 104127bd49..9f9e888823 100644
--- a/src/plugins/qmldesigner/components/transitioneditor/transitioneditorview.cpp
+++ b/src/plugins/qmldesigner/components/transitioneditor/transitioneditorview.cpp
@@ -318,11 +318,12 @@ ModelNode TransitionEditorView::addNewTransition()
 
 TransitionEditorWidget *TransitionEditorView::createWidget()
 {
-    if (!m_transitionEditorWidget)
+    if (!m_transitionEditorWidget) {
         m_transitionEditorWidget = new TransitionEditorWidget(this);
 
-    auto *transitionContext = new TransitionContext(m_transitionEditorWidget);
-    Core::ICore::addContextObject(transitionContext);
+        auto *transitionContext = new TransitionContext(m_transitionEditorWidget);
+        Core::ICore::addContextObject(transitionContext);
+    }
 
     return m_transitionEditorWidget;
 }
diff --git a/src/plugins/qmldesigner/components/transitioneditor/transitionform.cpp b/src/plugins/qmldesigner/components/transitioneditor/transitionform.cpp
index 1770ba63fc..dcbb0b23b3 100644
--- a/src/plugins/qmldesigner/components/transitioneditor/transitionform.cpp
+++ b/src/plugins/qmldesigner/components/transitioneditor/transitionform.cpp
@@ -13,6 +13,7 @@
 #include <rewritertransaction.h>
 #include <variantproperty.h>
 #include <qmlitemnode.h>
+#include <dialogutils.h>
 
 #include <coreplugin/messagebox.h>
 
@@ -45,8 +46,7 @@ TransitionForm::TransitionForm(QWidget *parent)
         bool error = false;
 
         if (!ModelNode::isValidId(newId)) {
-            Core::AsynchronousMessageBox::warning(tr("Invalid ID"),
-                                                  tr("%1 is an invalid ID.").arg(newId));
+            DialogUtils::showWarningForInvalidId(newId);
             error = true;
         } else if (m_transition.view()->hasId(newId)) {
             Core::AsynchronousMessageBox::warning(tr("Invalid ID"),
diff --git a/src/plugins/qmldesigner/componentsplugin/components.metainfo b/src/plugins/qmldesigner/componentsplugin/components.metainfo
index 8a1e365266..2e070aa322 100644
--- a/src/plugins/qmldesigner/componentsplugin/components.metainfo
+++ b/src/plugins/qmldesigner/componentsplugin/components.metainfo
@@ -12,6 +12,7 @@ MetaInfo {
 
             Property { name: "width"; type: "int"; value: 100; }
             Property { name: "height"; type: "int"; value: 100; }
+            toolTip: qsTr("Organizes items in a row.")
         }
     }
 
@@ -28,6 +29,7 @@ MetaInfo {
 
             Property { name: "width"; type: "int"; value: 100; }
             Property { name: "height"; type: "int"; value: 100; }
+            toolTip: qsTr("Organizes items in a column.")
         }
     }
 
@@ -44,6 +46,7 @@ MetaInfo {
 
             Property { name: "width"; type: "int"; value: 100; }
             Property { name: "height"; type: "int"; value: 100; }
+            toolTip: qsTr("Organizes items in a grid.")
         }
     }
 
@@ -57,7 +60,7 @@ MetaInfo {
         }
 
         ItemLibraryEntry {
-            name: "StackLayout"
+            name: "Stack Layout"
             category: "Qt Quick - Layouts"
             libraryIcon: ":/componentsplugin/images/stack-layouts-icon.png"
             version: "1.0"
@@ -65,6 +68,7 @@ MetaInfo {
 
             Property { name: "width"; type: "int"; value: 100; }
             Property { name: "height"; type: "int"; value: 100; }
+            toolTip: qsTr("Organizes items in a grid. Only the top item is visible.")
         }
     }
 }
diff --git a/src/plugins/qmldesigner/designercore/generatedcomponentutils.cpp b/src/plugins/qmldesigner/designercore/generatedcomponentutils.cpp
new file mode 100644
index 0000000000..5ee5790b53
--- /dev/null
+++ b/src/plugins/qmldesigner/designercore/generatedcomponentutils.cpp
@@ -0,0 +1,139 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "generatedcomponentutils.h"
+
+#include <qmldesignerconstants.h>
+
+namespace QmlDesigner {
+
+GeneratedComponentUtils::GeneratedComponentUtils(ExternalDependenciesInterface &externalDependencies)
+    : m_externalDependencies(externalDependencies)
+{
+}
+
+Utils::FilePath GeneratedComponentUtils::generatedComponentsPath() const
+{
+    Utils::FilePath projectPath = Utils::FilePath::fromString(m_externalDependencies.currentProjectDirPath());
+    if (projectPath.isEmpty())
+        return {};
+
+    Utils::FilePath assetImportsPath = projectPath.resolvePath(QLatin1String(Constants::OLD_ASSET_IMPORT_FOLDER));
+    if (assetImportsPath.exists())
+        return assetImportsPath;
+
+    Utils::FilePath componentsPath = projectPath.resolvePath(QLatin1String(Constants::GENERATED_COMPONENTS_FOLDER));
+    if (!componentsPath.exists())
+        componentsPath.createDir();
+
+    return componentsPath;
+}
+
+Utils::FilePath GeneratedComponentUtils::composedEffectsBasePath() const
+{
+    Utils::FilePath basePath = generatedComponentsPath();
+    if (basePath.isEmpty())
+        return {};
+
+    QString effectsImportPath;
+    if (basePath.endsWith(Constants::OLD_ASSET_IMPORT_FOLDER))
+        effectsImportPath = Constants::OLD_EFFECTS_FOLDER;
+    else
+        effectsImportPath = Constants::COMPOSED_EFFECTS_TYPE;
+
+    return basePath.resolvePath(effectsImportPath);
+}
+
+Utils::FilePath GeneratedComponentUtils::composedEffectPath(const QString &effectPath) const
+{
+    Utils::FilePath effectsBasePath = composedEffectsBasePath();
+
+    QString effectName = Utils::FilePath::fromString(effectPath).baseName();
+
+    return effectsBasePath.resolvePath(effectName + "/" + effectName + ".qml");
+}
+
+Utils::FilePath GeneratedComponentUtils::componentBundlesBasePath() const
+{
+    Utils::FilePath basePath = generatedComponentsPath();
+
+    if (basePath.isEmpty())
+        return {};
+
+    return basePath.resolvePath(QLatin1String(Constants::COMPONENT_BUNDLES_TYPE));
+}
+
+Utils::FilePath GeneratedComponentUtils::import3dBasePath() const
+{
+    Utils::FilePath basePath = generatedComponentsPath();
+
+    if (basePath.isEmpty())
+        return {};
+
+    Utils::FilePath import3dPath;
+    if (basePath.endsWith(Constants::OLD_ASSET_IMPORT_FOLDER))
+        return basePath.resolvePath(QLatin1String(Constants::OLD_QUICK_3D_ASSETS_FOLDER));
+
+    return basePath.resolvePath(QLatin1String(Constants::QUICK_3D_COMPONENTS_FOLDER));
+}
+
+bool GeneratedComponentUtils::isImport3dPath(const QString &path) const
+{
+    return path.contains('/' + QLatin1String(Constants::OLD_QUICK_3D_ASSETS_FOLDER))
+           || path.contains(QLatin1String(Constants::GENERATED_COMPONENTS_FOLDER) + '/'
+                            + QLatin1String(Constants::QUICK_3D_COMPONENTS_FOLDER));
+}
+
+bool GeneratedComponentUtils::isComposedEffectPath(const QString &path) const
+{
+    return path.contains(Constants::OLD_EFFECTS_IMPORT_FOLDER)
+           || path.contains('/' + QLatin1String(Constants::COMPOSED_EFFECTS_TYPE));
+}
+
+QString GeneratedComponentUtils::generatedComponentTypePrefix() const
+{
+    Utils::FilePath basePath = generatedComponentsPath();
+    if (basePath.isEmpty() || basePath.endsWith(Constants::OLD_ASSET_IMPORT_FOLDER))
+        return {};
+
+    return Constants::GENERATED_COMPONENTS_FOLDER;
+}
+
+QString GeneratedComponentUtils::import3dTypePrefix() const
+{
+    QString basePrefix = generatedComponentTypePrefix();
+
+    if (basePrefix == Constants::GENERATED_COMPONENTS_FOLDER)
+        return basePrefix + '.' + QLatin1String(Constants::QUICK_3D_COMPONENTS_FOLDER);
+
+    return Constants::OLD_QUICK_3D_ASSETS_FOLDER;
+}
+
+QString GeneratedComponentUtils::import3dTypePath() const
+{
+    QString prefix = import3dTypePrefix();
+    prefix.replace('.', '/');
+    return prefix;
+}
+
+QString GeneratedComponentUtils::componentBundlesTypePrefix() const
+{
+    QString basePrefix = generatedComponentTypePrefix();
+
+    if (basePrefix.endsWith(Constants::GENERATED_COMPONENTS_FOLDER))
+        return basePrefix + '.' + QLatin1String(Constants::COMPONENT_BUNDLES_TYPE);
+
+    return Constants::COMPONENT_BUNDLES_TYPE;
+}
+
+QString GeneratedComponentUtils::composedEffectsTypePrefix() const
+{
+    QString basePrefix = generatedComponentTypePrefix();
+
+    if (basePrefix == Constants::GENERATED_COMPONENTS_FOLDER)
+        return basePrefix + '.' + QLatin1String(Constants::COMPOSED_EFFECTS_TYPE);
+
+    return Constants::OLD_EFFECTS_FOLDER;
+}
+
+} // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/designercore/generatedcomponentutils.h b/src/plugins/qmldesigner/designercore/generatedcomponentutils.h
new file mode 100644
index 0000000000..e2e9baf3e7
--- /dev/null
+++ b/src/plugins/qmldesigner/designercore/generatedcomponentutils.h
@@ -0,0 +1,38 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include <externaldependenciesinterface.h>
+#include <qmldesignercorelib_exports.h>
+
+#include <utils/filepath.h>
+
+#include <QString>
+
+namespace QmlDesigner {
+
+class QMLDESIGNERCORE_EXPORT GeneratedComponentUtils {
+public:
+    GeneratedComponentUtils(ExternalDependenciesInterface &externalDependencies);
+
+    Utils::FilePath generatedComponentsPath() const;
+    Utils::FilePath composedEffectsBasePath() const;
+    Utils::FilePath composedEffectPath(const QString &effectPath) const;
+    Utils::FilePath componentBundlesBasePath() const;
+    Utils::FilePath import3dBasePath() const;
+
+    bool isImport3dPath(const QString &path) const;
+    bool isComposedEffectPath(const QString &path) const;
+
+    QString generatedComponentTypePrefix() const;
+    QString import3dTypePrefix() const;
+    QString import3dTypePath() const;
+    QString componentBundlesTypePrefix() const;
+    QString composedEffectsTypePrefix() const;
+
+private:
+    ExternalDependenciesInterface &m_externalDependencies;
+};
+
+} // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/designercore/imagecache/imagecachecollector.cpp b/src/plugins/qmldesigner/designercore/imagecache/imagecachecollector.cpp
index 955e676d3b..97148e664f 100644
--- a/src/plugins/qmldesigner/designercore/imagecache/imagecachecollector.cpp
+++ b/src/plugins/qmldesigner/designercore/imagecache/imagecachecollector.cpp
@@ -76,8 +76,10 @@ void ImageCacheCollector::start(Utils::SmallStringView name,
                                 AbortCallback abortCallback,
                                 ImageCache::TraceToken traceToken)
 {
+#ifdef QDS_USE_PROJECTSTORAGE
     if (!m_projectStorage || !m_pathCache)
         return;
+#endif
 
     using namespace NanotraceHR::Literals;
     auto [collectorTraceToken, flowtoken] = traceToken.beginDurationWithFlow(
diff --git a/src/plugins/qmldesigner/designercore/imagecache/imagecachecollector.h b/src/plugins/qmldesigner/designercore/imagecache/imagecachecollector.h
index c2a912cc3a..fec68c2894 100644
--- a/src/plugins/qmldesigner/designercore/imagecache/imagecachecollector.h
+++ b/src/plugins/qmldesigner/designercore/imagecache/imagecachecollector.h
@@ -64,8 +64,10 @@ private:
     QSize captureImageMaximumSize;
     ExternalDependenciesInterface &m_externalDependencies;
     ImageCacheCollectorNullImageHandling nullImageHandling{};
+#ifdef QDS_USE_PROJECTSTORAGE
     ProjectStorageType *m_projectStorage = nullptr;
     PathCacheType *m_pathCache = nullptr;
+#endif
 };
 
 } // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/designercore/imagecache/taskqueue.h b/src/plugins/qmldesigner/designercore/imagecache/taskqueue.h
index fac7e7d9bf..dc5ed3de23 100644
--- a/src/plugins/qmldesigner/designercore/imagecache/taskqueue.h
+++ b/src/plugins/qmldesigner/designercore/imagecache/taskqueue.h
@@ -31,7 +31,7 @@ public:
         {
             std::unique_lock lock{m_mutex};
 
-            ensureThreadIsRunning(std::move(traceToken));
+            ensureThreadIsRunning(lock, std::move(traceToken));
 
             m_tasks.emplace_back(std::forward<Arguments>(arguments)...);
         }
@@ -54,6 +54,15 @@ public:
         clearTasks(oldTasks);
     }
 
+    void putThreadToSleep()
+    {
+        {
+            std::unique_lock lock{m_mutex};
+            m_sleeping = true;
+        }
+        m_condition.notify_all();
+    }
+
 private:
     void destroy()
     {
@@ -66,19 +75,20 @@ private:
     {
         using namespace std::literals::chrono_literals;
         std::unique_lock lock{m_mutex};
-        if (m_finishing)
+
+        if (m_finishing || m_sleeping)
             return {std::move(lock), true};
+
         if (m_tasks.empty()) {
             auto timedOutWithoutEntriesOrFinishing = !m_condition.wait_for(lock, 10min, [&] {
-                return m_tasks.size() || m_finishing;
+                return m_tasks.size() || m_finishing || m_sleeping;
             });
 
-            if (timedOutWithoutEntriesOrFinishing || m_finishing) {
+            if (timedOutWithoutEntriesOrFinishing)
                 m_sleeping = true;
-                return {std::move(lock), true};
-            }
         }
-        return {std::move(lock), false};
+
+        return {std::move(lock), m_finishing || m_sleeping};
     }
 
     [[nodiscard]] std::optional<Task> getTask(std::unique_lock<std::mutex> lock)
@@ -94,29 +104,38 @@ private:
         return {std::move(task)};
     }
 
-    template<typename TraceToken>
-    void ensureThreadIsRunning(TraceToken traceToken)
+    template<typename Lock, typename TraceToken>
+    void ensureThreadIsRunning(Lock &lock, TraceToken traceToken)
     {
         using namespace NanotraceHR::Literals;
 
         if (m_finishing || !m_sleeping)
             return;
 
+        if (m_sleeping) {
+            lock.unlock();
+            joinThread();
+            lock.lock();
+
+            m_sleeping = false;
+        }
+
         if (m_backgroundThread.joinable())
             return;
 
-        m_sleeping = false;
-
         auto [threadCreateToken, flowToken] = traceToken.beginDurationWithFlow(
             "thread is created in the task queue"_t);
         m_backgroundThread = std::thread{[this](auto traceToken) {
                                              auto duration = traceToken.beginDuration(
                                                  "thread is ready"_t);
+
                                              while (true) {
                                                  auto [lock, abort] = waitForTasks();
                                                  duration.end();
+
                                                  if (abort)
                                                      return;
+
                                                  auto getTaskToken = duration.beginDuration(
                                                      "get task from queue"_t);
                                                  if (auto task = getTask(std::move(lock)); task) {
diff --git a/src/plugins/qmldesigner/designercore/include/model.h b/src/plugins/qmldesigner/designercore/include/model.h
index b907e6c5d8..85f129cdbc 100644
--- a/src/plugins/qmldesigner/designercore/include/model.h
+++ b/src/plugins/qmldesigner/designercore/include/model.h
@@ -166,6 +166,7 @@ public:
     NodeMetaInfo qtQmlConnectionsMetaInfo() const;
     NodeMetaInfo qtQmlModelsListModelMetaInfo() const;
     NodeMetaInfo qtQmlModelsListElementMetaInfo() const;
+    NodeMetaInfo qtQmlXmlListModelXmlListModelRoleMetaInfo() const;
     NodeMetaInfo qtQuick3DBakedLightmapMetaInfo() const;
     NodeMetaInfo qtQuick3DDefaultMaterialMetaInfo() const;
     NodeMetaInfo qtQuick3DDirectionalLightMetaInfo() const;
@@ -218,14 +219,17 @@ public:
 
     // Imports:
     const Imports &imports() const;
-    const Imports &possibleImports() const;
-    const Imports &usedImports() const;
+    Imports possibleImports() const;
+    Imports usedImports() const;
     void changeImports(Imports importsToBeAdded, Imports importsToBeRemoved);
+#ifndef QDS_USE_PROJECTSTORAGE
     void setPossibleImports(Imports possibleImports);
+#endif
+#ifndef QDS_USE_PROJECTSTORAGE
     void setUsedImports(Imports usedImports);
+#endif
     bool hasImport(const Import &import, bool ignoreAlias = true, bool allowHigherVersion = false) const;
     bool isImportPossible(const Import &import, bool ignoreAlias = true, bool allowHigherVersion = false) const;
-    QString pathForImport(const Import &import);
     QStringList importPaths() const;
     Import highestPossibleImport(const QString &importPath);
 
diff --git a/src/plugins/qmldesigner/designercore/include/modelfwd.h b/src/plugins/qmldesigner/designercore/include/modelfwd.h
index 0a062289fd..91c533fe7b 100644
--- a/src/plugins/qmldesigner/designercore/include/modelfwd.h
+++ b/src/plugins/qmldesigner/designercore/include/modelfwd.h
@@ -77,7 +77,7 @@ constexpr bool useProjectStorage()
 using ProjectStorageType = ProjectStorageInterface;
 using PathCacheType = SourcePathCacheInterface;
 #else
-using ProjectStorageType = ProjectStorage<Sqlite::Database>;
+using ProjectStorageType = ProjectStorage;
 using PathCacheType = SourcePathCache<ProjectStorageType, NonLockingMutex>;
 #endif
 
diff --git a/src/plugins/qmldesigner/designercore/include/nodemetainfo.h b/src/plugins/qmldesigner/designercore/include/nodemetainfo.h
index 53c755ddc8..ba2e2cda65 100644
--- a/src/plugins/qmldesigner/designercore/include/nodemetainfo.h
+++ b/src/plugins/qmldesigner/designercore/include/nodemetainfo.h
@@ -27,9 +27,11 @@ QT_END_NAMESPACE
 #  define DEPRECATED_VERSION_NUMBER \
       [[deprecated( \
           "In most cases you don't need them anymore because the import is setting them!")]]
+#  define DEPRECATED_COMPONENT_FILE_NAME [[deprecated("Use sourceId() instead.")]]
 #else
 #  define DEPRECATED_TYPENAME
 #  define DEPRECATED_VERSION_NUMBER
+#  define DEPRECATED_COMPONENT_FILE_NAME
 #endif
 
 namespace QmlDesigner {
@@ -116,7 +118,7 @@ public:
     Storage::Info::ItemLibraryEntries itemLibrariesEntries() const;
 
     SourceId sourceId() const;
-    QString componentFileName() const;
+    DEPRECATED_COMPONENT_FILE_NAME QString componentFileName() const;
 
     bool isBasedOn(const NodeMetaInfo &metaInfo) const;
     bool isBasedOn(const NodeMetaInfo &metaInfo1, const NodeMetaInfo &metaInfo2) const;
@@ -167,6 +169,7 @@ public:
     bool isQtMultimediaSoundEffect() const;
     bool isQtObject() const;
     bool isQtQmlConnections() const;
+    bool isQtQmlModelsListElement() const;
     bool isQtQuick3DBakedLightmap() const;
     bool isQtQuick3DBuffer() const;
     bool isQtQuick3DCamera() const;
@@ -176,7 +179,6 @@ public:
     bool isQtQuick3DInstanceList() const;
     bool isQtQuick3DInstanceListEntry() const;
     bool isQtQuick3DLight() const;
-    bool isQtQuickListElement() const;
     bool isQtQuickListModel() const;
     bool isQtQuickListView() const;
     bool isQtQuick3DMaterial() const;
@@ -265,12 +267,14 @@ public:
 
 private:
     const Storage::Info::Type &typeData() const;
+    PropertyDeclarationId defaultPropertyDeclarationId() const;
     bool isSubclassOf(const TypeName &type, int majorVersion = -1, int minorVersion = -1) const;
 
 private:
     TypeId m_typeId;
     NotNullPointer<const ProjectStorageType> m_projectStorage = {};
     mutable std::optional<Storage::Info::Type> m_typeData;
+    mutable std::optional<PropertyDeclarationId> m_defaultPropertyId;
     std::shared_ptr<NodeMetaInfoPrivate> m_privateData;
 };
 
diff --git a/src/plugins/qmldesigner/designercore/include/projectstorageids.h b/src/plugins/qmldesigner/designercore/include/projectstorageids.h
index bc66e0d2b2..0b157e55e7 100644
--- a/src/plugins/qmldesigner/designercore/include/projectstorageids.h
+++ b/src/plugins/qmldesigner/designercore/include/projectstorageids.h
@@ -7,6 +7,8 @@
 
 #include <utils/span.h>
 
+#include <QVarLengthArray>
+
 namespace QmlDesigner {
 
 enum class BasicIdType {
@@ -29,6 +31,8 @@ enum class BasicIdType {
 
 using TypeId = Sqlite::BasicId<BasicIdType::Type>;
 using TypeIds = std::vector<TypeId>;
+template<std::size_t size>
+using SmallTypeIds = QVarLengthArray<TypeId, size>;
 
 using PropertyDeclarationId = Sqlite::BasicId<BasicIdType::PropertyDeclaration>;
 using PropertyDeclarationIds = std::vector<PropertyDeclarationId>;
@@ -47,6 +51,8 @@ using SourceContextIds = std::vector<SourceContextId>;
 
 using SourceId = Sqlite::BasicId<BasicIdType::Source, int>;
 using SourceIds = std::vector<SourceId>;
+template<std::size_t size>
+using SmallSourceIds = QVarLengthArray<SourceId, size>;
 
 using ModuleId = Sqlite::BasicId<BasicIdType::Module, int>;
 using ModuleIds = std::vector<ModuleId>;
diff --git a/src/plugins/qmldesigner/designercore/include/qmlitemnode.h b/src/plugins/qmldesigner/designercore/include/qmlitemnode.h
index dde5515a5a..e11f201cdb 100644
--- a/src/plugins/qmldesigner/designercore/include/qmlitemnode.h
+++ b/src/plugins/qmldesigner/designercore/include/qmlitemnode.h
@@ -174,6 +174,7 @@ public:
     ModelNode targetTransition() const;
     void assignTargetFlowItem(const QmlFlowTargetNode &flowItem);
     QmlFlowItemNode flowItemParent() const;
+private:
     void destroyTarget();
 };
 
diff --git a/src/plugins/qmldesigner/designercore/include/rewriterview.h b/src/plugins/qmldesigner/designercore/include/rewriterview.h
index 23841accda..0134349682 100644
--- a/src/plugins/qmldesigner/designercore/include/rewriterview.h
+++ b/src/plugins/qmldesigner/designercore/include/rewriterview.h
@@ -123,7 +123,10 @@ public:
     bool renameId(const QString& oldId, const QString& newId);
 
     const QmlJS::Document *document() const;
+
+#ifndef QDS_USE_PROJECTSTORAGE
     const QmlJS::ScopeChain *scopeChain() const;
+#endif
 
     QString convertTypeToImportAlias(const QString &type) const;
 
@@ -135,8 +138,6 @@ public:
 
     void setCheckLinkErrors(bool b) { m_checkLinkErrors = b; }
 
-    QString pathForImport(const Import &import);
-
     QStringList importDirectories() const;
 
     QSet<QPair<QString, QString> > qrcMapping() const;
diff --git a/src/plugins/qmldesigner/designercore/include/subcomponentmanager.h b/src/plugins/qmldesigner/designercore/include/subcomponentmanager.h
index 7fa2348854..a42164d1bd 100644
--- a/src/plugins/qmldesigner/designercore/include/subcomponentmanager.h
+++ b/src/plugins/qmldesigner/designercore/include/subcomponentmanager.h
@@ -7,6 +7,7 @@
 
 #  include "qmldesignercorelib_global.h"
 
+#  include <generatedcomponentutils.h>
 #  include <import.h>
 
 #  include <QObject>
@@ -62,6 +63,7 @@ private: // variables
     QDir m_filePathDir;
     QPointer<Model> m_model;
     ExternalDependenciesInterface &m_externalDependencies;
+    GeneratedComponentUtils m_componentUtils;
 };
 
 } // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
index 33a100f7b2..1b965db66a 100644
--- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
@@ -64,6 +64,8 @@
 #include <qmlitemnode.h>
 #include <rewriterview.h>
 
+#include <projectstorage/projectstorage.h>
+
 #include <utils/hdrimage.h>
 
 #include <coreplugin/messagemanager.h>
@@ -205,22 +207,17 @@ NodeInstanceView::~NodeInstanceView()
 
 static bool isSkippedRootNode(const ModelNode &node)
 {
-    static const PropertyNameList skipList({"Qt.ListModel", "QtQuick.ListModel", "Qt.ListModel", "QtQuick.ListModel"});
-
-    if (skipList.contains(node.type()))
-        return true;
-
-    return false;
+    return node.metaInfo().isQtQuickListModel();
 }
 
 static bool isSkippedNode(const ModelNode &node)
 {
-    static const PropertyNameList skipList({"QtQuick.XmlRole", "Qt.XmlRole", "QtQuick.ListElement", "Qt.ListElement"});
+    auto model = node.model();
 
-    if (skipList.contains(node.type()))
-        return true;
+    auto listElement = model->qtQmlModelsListElementMetaInfo();
+    auto xmlRole = model->qtQmlXmlListModelXmlListModelRoleMetaInfo();
 
-    return false;
+    return node.metaInfo().isBasedOn(listElement, xmlRole);
 }
 
 static bool parentTakesOverRendering(const ModelNode &modelNode)
@@ -644,7 +641,7 @@ void NodeInstanceView::auxiliaryDataChanged(const ModelNode &node,
                                              TypeName(),
                                              key.type};
             m_nodeInstanceServer->changeAuxiliaryValues({{container}});
-        };
+        }
         break;
 
     case AuxiliaryDataType::NodeInstanceAuxiliary:
@@ -656,7 +653,7 @@ void NodeInstanceView::auxiliaryDataChanged(const ModelNode &node,
                                              TypeName(),
                                              key.type};
             m_nodeInstanceServer->changeAuxiliaryValues({{container}});
-        };
+        }
         break;
 
     case AuxiliaryDataType::NodeInstancePropertyOverwrite:
@@ -991,6 +988,8 @@ QRectF NodeInstanceView::sceneRect() const
     return {};
 }
 
+namespace {
+
 QList<ModelNode> filterNodesForSkipItems(const QList<ModelNode> &nodeList)
 {
     QList<ModelNode> filteredNodeList;
@@ -1003,14 +1002,12 @@ QList<ModelNode> filterNodesForSkipItems(const QList<ModelNode> &nodeList)
 
     return filteredNodeList;
 }
-namespace {
 bool shouldSendAuxiliary(const AuxiliaryDataKey &key)
 {
     return key.type == AuxiliaryDataType::NodeInstancePropertyOverwrite
            || key.type == AuxiliaryDataType::NodeInstanceAuxiliary || key == invisibleProperty
            || key == lockedProperty;
 }
-} // namespace
 
 bool parentIsBehavior(ModelNode node)
 {
@@ -1024,6 +1021,31 @@ bool parentIsBehavior(ModelNode node)
     return false;
 }
 
+TypeName createQualifiedTypeName(const ModelNode &node)
+{
+    if (!node)
+        return {};
+
+#ifdef QDS_USE_PROJECTSTORAGE
+    auto model = node.model();
+    auto exportedTypes = node.metaInfo().exportedTypeNamesForSourceId(model->fileUrlSourceId());
+    if (exportedTypes.size()) {
+        const auto &exportedType = exportedTypes.front();
+        Utils::PathString typeName = model->projectStorage()->moduleName(exportedType.moduleId);
+        typeName += '/';
+        typeName += exportedType.name;
+
+        return typeName.toQByteArray();
+    }
+
+    return {};
+#else
+    return node.type();
+#endif
+}
+
+} // namespace
+
 CreateSceneCommand NodeInstanceView::createCreateSceneCommand()
 {
     QList<ModelNode> nodeList = allModelNodes();
@@ -1079,8 +1101,9 @@ CreateSceneCommand NodeInstanceView::createCreateSceneCommand()
             nodeFlags |= InstanceContainer::ParentTakesOverRendering;
 
         const auto modelNode = instance.modelNode();
+
         InstanceContainer container(instance.instanceId(),
-                                    modelNode.type(),
+                                    createQualifiedTypeName(modelNode),
                                     modelNode.majorVersion(),
                                     modelNode.minorVersion(),
                                     ModelUtils::componentFilePath(modelNode),
@@ -1243,7 +1266,7 @@ CreateInstancesCommand NodeInstanceView::createCreateInstancesCommand(const QLis
 
         const auto modelNode = instance.modelNode();
         InstanceContainer container(instance.instanceId(),
-                                    modelNode.type(),
+                                    createQualifiedTypeName(modelNode),
                                     modelNode.majorVersion(),
                                     modelNode.minorVersion(),
                                     ModelUtils::componentFilePath(modelNode),
@@ -1850,7 +1873,7 @@ QVariant NodeInstanceView::previewImageDataForImageNode(const ModelNode &modelNo
 
     ModelNodePreviewImageData imageData;
     imageData.id = modelNode.id();
-    imageData.type = QString::fromLatin1(modelNode.type());
+    imageData.type = QString::fromUtf8(createQualifiedTypeName(modelNode));
     const double ratio = m_externalDependencies.formEditorDevicePixelRatio();
 
     if (imageSource.isEmpty() && modelNode.metaInfo().isQtQuick3DTexture()) {
@@ -1923,7 +1946,7 @@ QVariant NodeInstanceView::previewImageDataForImageNode(const ModelNode &modelNo
                 imageData.pixmap = originalPixmap.scaled(dim, dim, Qt::KeepAspectRatio);
                 imageData.pixmap.setDevicePixelRatio(ratio);
                 imageData.time = modified;
-                imageData.info = ImageUtils::imageInfo(imageSource);
+                imageData.info = ImageUtils::imageInfoString(imageSource);
                 m_imageDataMap.insert(imageData.id, imageData);
             }
         }
@@ -1958,7 +1981,7 @@ QVariant NodeInstanceView::previewImageDataForGenericNode(const ModelNode &model
     if (m_imageDataMap.contains(id)) {
         imageData = m_imageDataMap[id];
     } else {
-        imageData.type = QString::fromLatin1(modelNode.type());
+        imageData.type = QString::fromLatin1(createQualifiedTypeName(modelNode));
         imageData.id = id;
         m_imageDataMap.insert(id, imageData);
     }
diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
index 85f904666c..b8c3e610be 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
@@ -919,8 +919,11 @@ const ObjectValue *NodeMetaInfoPrivate::getObjectValue() const
 
 ContextPtr NodeMetaInfoPrivate::context() const
 {
+#ifndef QDS_USE_PROJECTSTORAGE
     if (m_model && m_model->rewriterView() && m_model->rewriterView()->scopeChain())
         return m_model->rewriterView()->scopeChain()->context();
+#endif
+
     return ContextPtr(nullptr);
 }
 
@@ -1832,7 +1835,7 @@ PropertyName NodeMetaInfo::defaultPropertyName() const
 {
     if constexpr (useProjectStorage()) {
         if (isValid()) {
-            if (auto name = m_projectStorage->propertyName(typeData().defaultPropertyId)) {
+            if (auto name = m_projectStorage->propertyName(defaultPropertyDeclarationId())) {
                 return name->toQByteArray();
             }
         }
@@ -1848,7 +1851,7 @@ PropertyMetaInfo NodeMetaInfo::defaultProperty() const
 {
     if constexpr (useProjectStorage()) {
         if (isValid()) {
-            return PropertyMetaInfo(typeData().defaultPropertyId, m_projectStorage);
+            return PropertyMetaInfo(defaultPropertyDeclarationId(), m_projectStorage);
         }
     } else {
         return property(defaultPropertyName());
@@ -1859,7 +1862,7 @@ PropertyMetaInfo NodeMetaInfo::defaultProperty() const
 bool NodeMetaInfo::hasDefaultProperty() const
 {
     if constexpr (useProjectStorage())
-        return isValid() && bool(typeData().defaultPropertyId);
+        return isValid() && bool(defaultPropertyDeclarationId());
     else
         return !defaultPropertyName().isEmpty();
 }
@@ -2086,6 +2089,14 @@ const Storage::Info::Type &NodeMetaInfo::typeData() const
     return *m_typeData;
 }
 
+PropertyDeclarationId NodeMetaInfo::defaultPropertyDeclarationId() const
+{
+    if (!m_defaultPropertyId)
+        m_defaultPropertyId.emplace(m_projectStorage->defaultPropertyDeclarationId(m_typeId));
+
+    return *m_defaultPropertyId;
+}
+
 bool NodeMetaInfo::isSubclassOf(const TypeName &type, int majorVersion, int minorVersion) const
 {
     if (!isValid()) {
@@ -2444,12 +2455,9 @@ bool NodeMetaInfo::usesCustomParser() const
         if (!isValid())
             return false;
 
-        auto type = typeName();
-        return type == "QtQuick.VisualItemModel" || type == "Qt.VisualItemModel"
-               || type == "QtQuick.VisualDataModel" || type == "Qt.VisualDataModel"
-               || type == "QtQuick.ListModel" || type == "Qt.ListModel"
-               || type == "QtQml.Models.ListModel" || type == "QtQuick.XmlListModel"
-               || type == "Qt.XmlListModel" || type == "QtQml.XmlListModel.XmlListModel";
+        auto type = simplifiedTypeName();
+        return type == "VisualItemModel" || type == "VisualDataModel" || type == "ListModel"
+               || type == "XmlListModel";
     }
 }
 
@@ -2763,7 +2771,7 @@ bool NodeMetaInfo::isQtQuick3DLight() const
     }
 }
 
-bool NodeMetaInfo::isQtQuickListElement() const
+bool NodeMetaInfo::isQtQmlModelsListElement() const
 {
     if constexpr (useProjectStorage()) {
         using namespace Storage::Info;
diff --git a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
index 403731d1c4..16d9217f6a 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
@@ -44,6 +44,7 @@ SubComponentManager::SubComponentManager(Model *model,
                                          ExternalDependenciesInterface &externalDependencies)
     : m_model(model)
     , m_externalDependencies{externalDependencies}
+    , m_componentUtils{externalDependencies}
 {
     connect(&m_watcher, &QFileSystemWatcher::directoryChanged,
             this, [this](const QString &path) { parseDirectory(path); });
@@ -192,7 +193,7 @@ void SubComponentManager::parseDirectory(const QString &canonicalDirPath, bool a
     if (!model() || !model()->rewriterView())
         return;
 
-    if (canonicalDirPath.endsWith(QLatin1String(Constants::QUICK_3D_ASSETS_FOLDER))) {
+    if (m_componentUtils.isImport3dPath(canonicalDirPath)) {
         parseQuick3DAssetsDir(canonicalDirPath);
         return;
     }
@@ -345,8 +346,8 @@ void SubComponentManager::registerQmlFile(const QFileInfo &fileInfo, const QStri
                                           bool addToLibrary)
 {
     if (!addToLibrary || !model()
-        || fileInfo.path().contains(QLatin1String(Constants::QUICK_3D_ASSETS_FOLDER))
-        || fileInfo.path().contains(QLatin1String(Constants::DEFAULT_EFFECTS_IMPORT_FOLDER))) {
+        || m_componentUtils.isImport3dPath(fileInfo.path())
+        || m_componentUtils.isComposedEffectPath(fileInfo.path())) {
         return;
     }
 
@@ -395,7 +396,7 @@ void SubComponentManager::parseQuick3DAssetsDir(const QString &quick3DAssetsPath
     QDir quick3DAssetsDir(quick3DAssetsPath);
     QStringList assets = quick3DAssetsDir.entryList(QDir::Dirs | QDir::NoDot | QDir::NoDotDot);
     for (QString &asset : assets)
-        asset.prepend(QString(Constants::QUICK_3D_ASSETS_FOLDER).mid(1) + '.');
+        asset.prepend(m_componentUtils.import3dTypePrefix() + '.');
 
     // Create item library entries for Quick3D assets that are imported by document
     for (auto &import : std::as_const(m_imports)) {
@@ -460,7 +461,8 @@ QStringList SubComponentManager::quick3DAssetPaths() const
     const auto impPaths = importPaths();
     QStringList retPaths;
     for (const auto &impPath : impPaths) {
-        const QString assetPath = impPath + QLatin1String(Constants::QUICK_3D_ASSETS_FOLDER);
+        QString path3d = m_componentUtils.import3dTypePath();
+        const QString assetPath = impPath + '/' + path3d;
         if (QFileInfo::exists(assetPath))
             retPaths << assetPath;
     }
@@ -520,7 +522,7 @@ void SubComponentManager::update(const QUrl &filePath, const Imports &imports)
 
             // Remove old watched asset paths
             const QStringList watchPaths = m_watcher.directories();
-            const QString &quick3DAssetFolder = QLatin1String(Constants::QUICK_3D_ASSETS_FOLDER);
+            const QString &quick3DAssetFolder = m_componentUtils.import3dTypePath();
             for (const auto &watchPath : watchPaths) {
                 if (watchPath.endsWith(quick3DAssetFolder))
                     m_watcher.removePath(watchPath);
@@ -580,7 +582,7 @@ void SubComponentManager::addAndParseImport(const Import &import)
     } else {
         QString url = import.url();
 
-        if (url.startsWith(QString(Constants::QUICK_3D_ASSETS_FOLDER).mid(1))) {
+        if (url.startsWith(m_componentUtils.import3dTypePrefix())) {
             parseQuick3DAssetsItem(import.url());
             return;
         }
diff --git a/src/plugins/qmldesigner/designercore/model/abstractview.cpp b/src/plugins/qmldesigner/designercore/model/abstractview.cpp
index 061ab8ae2b..125c7195a8 100644
--- a/src/plugins/qmldesigner/designercore/model/abstractview.cpp
+++ b/src/plugins/qmldesigner/designercore/model/abstractview.cpp
@@ -567,8 +567,10 @@ void AbstractView::disableWidget()
 
 void AbstractView::enableWidget()
 {
-    if (hasWidget() && widgetInfo().widgetFlags == DesignerWidgetFlags::DisableOnError)
-        widgetInfo().widget->setEnabled(true);
+    if (hasWidget()) {
+        if (auto info = widgetInfo(); info.widgetFlags == DesignerWidgetFlags::DisableOnError)
+            info.widget->setEnabled(true);
+    }
 }
 
 QString AbstractView::contextHelpId() const
diff --git a/src/plugins/qmldesigner/designercore/model/bindingproperty.cpp b/src/plugins/qmldesigner/designercore/model/bindingproperty.cpp
index 141548047e..23c17dc61a 100644
--- a/src/plugins/qmldesigner/designercore/model/bindingproperty.cpp
+++ b/src/plugins/qmldesigner/designercore/model/bindingproperty.cpp
@@ -37,10 +37,11 @@ BindingProperty::BindingProperty(const PropertyName &propertyName, const Interna
 
 void BindingProperty::setExpression(const QString &expression)
 {
-    Internal::WriteLocker locker(model());
     if (!isValid())
         return;
 
+    Internal::WriteLocker locker(model());
+
     if (isDynamic())
         qWarning() << "Calling BindingProperty::setExpression on dynamic property.";
 
diff --git a/src/plugins/qmldesigner/designercore/model/model.cpp b/src/plugins/qmldesigner/designercore/model/model.cpp
index a4cd31b2a8..4f0bfba1ce 100644
--- a/src/plugins/qmldesigner/designercore/model/model.cpp
+++ b/src/plugins/qmldesigner/designercore/model/model.cpp
@@ -1758,14 +1758,22 @@ Storage::Info::ExportedTypeName Model::exportedTypeNameForMetaInfo(const NodeMet
     return {};
 }
 
-const Imports &Model::possibleImports() const
+Imports Model::possibleImports() const
 {
+#ifdef QDS_USE_PROJECTSTORAGE
+    return {};
+#else
     return d->m_possibleImportList;
+#endif
 }
 
-const Imports &Model::usedImports() const
+Imports Model::usedImports() const
 {
+#ifdef QDS_USE_PROJECTSTORAGE
+    return {};
+#else
     return d->m_usedImportList;
+#endif
 }
 
 void Model::changeImports(Imports importsToBeAdded, Imports importsToBeRemoved)
@@ -1773,6 +1781,7 @@ void Model::changeImports(Imports importsToBeAdded, Imports importsToBeRemoved)
     d->changeImports(std::move(importsToBeAdded), std::move(importsToBeRemoved));
 }
 
+#ifndef QDS_USE_PROJECTSTORAGE
 void Model::setPossibleImports(Imports possibleImports)
 {
     auto tracer = d->traceToken.begin("possible imports"_t);
@@ -1784,7 +1793,9 @@ void Model::setPossibleImports(Imports possibleImports)
         d->notifyPossibleImportsChanged(d->m_possibleImportList);
     }
 }
+#endif
 
+#ifndef QDS_USE_PROJECTSTORAGE
 void Model::setUsedImports(Imports usedImports)
 {
     auto tracer = d->traceToken.begin("used imports"_t);
@@ -1796,6 +1807,7 @@ void Model::setUsedImports(Imports usedImports)
         d->notifyUsedImportsChanged(d->m_usedImportList);
     }
 }
+#endif
 
 static bool compareVersions(const Import &import1, const Import &import2, bool allowHigherVersion)
 {
@@ -1869,8 +1881,9 @@ QString Model::generateNewId(const QString &prefixName,
 
     int counter = 0;
 
-    QString newBaseId = QStringView(u"%1").arg(firstCharToLower(prefixName));
-    newBaseId.remove(QRegularExpression(QStringLiteral("[^a-zA-Z0-9_]")));
+    static const QRegularExpression nonWordCharsRegex("\\W");
+    QString newBaseId = firstCharToLower(prefixName);
+    newBaseId.remove(nonWordCharsRegex);
 
     if (!newBaseId.isEmpty()) {
         QChar firstChar = newBaseId.at(0);
@@ -2021,14 +2034,6 @@ bool Model::isImportPossible(const Import &import, bool ignoreAlias, bool allowH
     return false;
 }
 
-QString Model::pathForImport(const Import &import)
-{
-    if (!rewriterView())
-        return QString();
-
-    return rewriterView()->pathForImport(import);
-}
-
 QStringList Model::importPaths() const
 {
     if (rewriterView())
@@ -2205,6 +2210,16 @@ NodeMetaInfo Model::qtQmlModelsListElementMetaInfo() const
     }
 }
 
+NodeMetaInfo Model::qtQmlXmlListModelXmlListModelRoleMetaInfo() const
+{
+    if constexpr (useProjectStorage()) {
+        using namespace Storage::Info;
+        return createNodeMetaInfo<QtQml_XmlListModel, XmlListModelRole>();
+    } else {
+        return metaInfo("QtQml.XmlListModel.XmlListModelRole");
+    }
+}
+
 NodeMetaInfo Model::qmlQtObjectMetaInfo() const
 {
     if constexpr (useProjectStorage()) {
diff --git a/src/plugins/qmldesigner/designercore/model/modelresourcemanagement.cpp b/src/plugins/qmldesigner/designercore/model/modelresourcemanagement.cpp
index a61f1001f9..27ac2e67ab 100644
--- a/src/plugins/qmldesigner/designercore/model/modelresourcemanagement.cpp
+++ b/src/plugins/qmldesigner/designercore/model/modelresourcemanagement.cpp
@@ -515,8 +515,7 @@ struct BindingFilter
 struct TargetFilter
 {
     TargetFilter(NodeDependencies &dependencies, Model *model)
-        : flowViewFlowActionAreaMetaInfo{model->flowViewFlowActionAreaMetaInfo()}
-        , flowViewFlowTransitionMetaInfo{model->flowViewFlowTransitionMetaInfo()}
+        : flowViewFlowTransitionMetaInfo{model->flowViewFlowTransitionMetaInfo()}
         , qtQuickPropertyChangesMetaInfo{model->qtQuickPropertyChangesMetaInfo()}
         , qtQuickTimelineKeyframeGroupMetaInfo{model->qtQuickTimelineKeyframeGroupMetaInfo()}
         , qtQuickPropertyAnimationMetaInfo{model->qtQuickPropertyAnimationMetaInfo()}
diff --git a/src/plugins/qmldesigner/designercore/model/modelutils.cpp b/src/plugins/qmldesigner/designercore/model/modelutils.cpp
index cb3f482289..6c3e1ea50f 100644
--- a/src/plugins/qmldesigner/designercore/model/modelutils.cpp
+++ b/src/plugins/qmldesigner/designercore/model/modelutils.cpp
@@ -9,6 +9,8 @@
 #include <projectstorage/projectstorage.h>
 #include <projectstorage/sourcepathcache.h>
 
+#include <coreplugin/messagebox.h>
+
 #include <utils/expected.h>
 #include <utils/ranges.h>
 
@@ -107,19 +109,19 @@ PropertyMetaInfo metainfo(const ModelNode &node, const PropertyName &propertyNam
     return node.metaInfo().property(propertyName);
 }
 
-QString componentFilePath(const PathCacheType &pathCache, const NodeMetaInfo &metaInfo)
+QString componentFilePath([[maybe_unused]] const PathCacheType &pathCache, const NodeMetaInfo &metaInfo)
 {
-    if constexpr (useProjectStorage()) {
-        auto typeSourceId = metaInfo.sourceId();
+#ifdef QDS_USE_PROJECTSTORAGE
+    auto typeSourceId = metaInfo.sourceId();
 
-        if (typeSourceId && metaInfo.isFileComponent()) {
-            return pathCache.sourcePath(typeSourceId).toQString();
-        }
-    } else {
-        return metaInfo.componentFileName();
+    if (typeSourceId && metaInfo.isFileComponent()) {
+        return pathCache.sourcePath(typeSourceId).toQString();
     }
 
     return {};
+#else
+    return metaInfo.componentFileName();
+#endif
 }
 
 QString componentFilePath(const ModelNode &node)
diff --git a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
index 826856428b..6e3b739096 100644
--- a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
+++ b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
@@ -9,8 +9,9 @@
 #include "bindingproperty.h"
 #include "qmlanchors.h"
 
-#include <model.h>
 #include <abstractview.h>
+#include <generatedcomponentutils.h>
+#include <model.h>
 
 #include <coreplugin/icore.h>
 
@@ -196,7 +197,9 @@ QmlItemNode QmlItemNode::createQmlItemNodeForEffect(AbstractView *view,
 
     auto createEffectNode = [=, &newQmlItemNode, &parentProperty]() {
         const QString effectName = QFileInfo(effectPath).baseName();
-        Import import = Import::createLibraryImport("Effects." + effectName, "1.0");
+        Import import = Import::createLibraryImport(GeneratedComponentUtils(view->externalDependencies())
+                                                            .composedEffectsTypePrefix()
+                                                        + '.' + effectName, "1.0");
         try {
             if (!view->model()->hasImport(import, true, true))
                 view->model()->changeImports({import}, {});
@@ -748,7 +751,6 @@ void QmlFlowActionAreaNode::assignTargetFlowItem(const QmlFlowTargetNode &flowIt
 
      ModelNode transition = flowView.addTransition(flowParent.modelNode(),
                                                    flowItem.modelNode());
-
      modelNode().bindingProperty("target").setExpression(transition.validId());
 }
 
diff --git a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp
index 4ae2261e60..17d40daca3 100644
--- a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp
+++ b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp
@@ -933,10 +933,12 @@ bool RewriterView::renameId(const QString& oldId, const QString& newId)
     return false;
 }
 
+#ifndef QDS_USE_PROJECTSTORAGE
 const QmlJS::ScopeChain *RewriterView::scopeChain() const
 {
     return textToModelMerger()->scopeChain();
 }
+#endif
 
 const QmlJS::Document *RewriterView::document() const
 {
@@ -989,25 +991,6 @@ QString RewriterView::convertTypeToImportAlias(const QString &type) const
     return result;
 }
 
-QString RewriterView::pathForImport(const Import &import)
-{
-    if (scopeChain() && scopeChain()->context() && document()) {
-        const QString importStr = import.isFileImport() ? import.file() : import.url();
-        const QmlJS::Imports *imports = scopeChain()->context()->imports(document());
-
-        QmlJS::ImportInfo importInfo;
-
-        for (const QmlJS::Import &qmljsImport : imports->all()) {
-            if (qmljsImport.info.name() == importStr)
-                importInfo = qmljsImport.info;
-        }
-        const QString importPath = importInfo.path();
-        return importPath;
-    }
-
-    return QString();
-}
-
 QStringList RewriterView::importDirectories() const
 {
     const QList<Utils::FilePath> list(m_textToModelMerger->vContext().paths.begin(),
diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
index f7be6cf5e4..1c1aba5feb 100644
--- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
+++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
@@ -57,7 +57,7 @@ using namespace QmlJS;
 using namespace Qt::StringLiterals;
 
 static Q_LOGGING_CATEGORY(rewriterBenchmark, "qtc.rewriter.load", QtWarningMsg)
-static Q_LOGGING_CATEGORY(texttomodelMergerDebug, "qtc.texttomodelmerger.debug", QtDebugMsg)
+static Q_LOGGING_CATEGORY(texttomodelMergerLog, "qtc.texttomodelmerger", QtWarningMsg)
 
 namespace {
 
@@ -67,17 +67,6 @@ bool isSupportedAttachedProperties(const QString &propertyName)
            || propertyName.startsWith(QLatin1String("InsightCategory."));
 }
 
-bool isSupportedVersion(QmlDesigner::Version version)
-{
-    if (version.major == 2)
-        return version.minor <= 15;
-
-    if (version.major == 6)
-        return version.minor <= 6;
-
-    return false;
-}
-
 bool isGlobalQtEnums(QStringView value)
 {
     static constexpr auto list = Utils::to_array<std::u16string_view>(
@@ -95,6 +84,9 @@ bool isGlobalQtEnums(QStringView value)
          u"TopToBottom",     u"UpArrowCursor",  u"Vertical",           u"WaitCursor",
          u"WhatsThisCursor", u"WheelFocus"});
 
+    if (value.toString().startsWith("Key_"))
+        return true;
+
     return std::binary_search(std::begin(list),
                               std::end(list),
                               QmlDesigner::ModelUtils::toStdStringView(value));
@@ -122,12 +114,6 @@ bool isKnownEnumScopes(QStringView value)
            != std::end(list);
 }
 
-bool supportedQtQuickVersion(const QmlDesigner::Import &import)
-{
-    auto version = import.toVersion();
-    return version.isEmpty() || isSupportedVersion(version);
-}
-
 QString stripQuotes(const QString &str)
 {
     if ((str.startsWith(QLatin1Char('"')) && str.endsWith(QLatin1Char('"')))
@@ -431,14 +417,19 @@ namespace Internal {
 class ReadingContext
 {
 public:
-    ReadingContext(const Snapshot &snapshot, const Document::Ptr &doc,
-                   const ViewerContext &vContext, Model *model)
+    ReadingContext([[maybe_unused]] const Snapshot &snapshot,
+                   [[maybe_unused]] const Document::Ptr &doc,
+                   [[maybe_unused]] const ViewerContext &vContext,
+                   Model *model)
         : m_doc(doc)
+#ifndef QDS_USE_PROJECTSTORAGE
         , m_context(
-              Link(snapshot, vContext, ModelManagerInterface::instance()->builtins(doc))
-              (doc, &m_diagnosticLinkMessages))
+              Link(snapshot,
+                   vContext,
+                   ModelManagerInterface::instance()->builtins(doc))(doc, &m_diagnosticLinkMessages))
         , m_scopeChain(doc, m_context)
         , m_scopeBuilder(&m_scopeChain)
+#endif
         , m_model(model)
     {
     }
@@ -446,12 +437,19 @@ public:
     ~ReadingContext() = default;
 
     Document::Ptr doc() const
-    { return m_doc; }
+    {
+        return m_doc;
+    }
 
+#ifndef QDS_USE_PROJECTSTORAGE
     void enterScope(AST::Node *node)
     { m_scopeBuilder.push(node); }
 
-    void leaveScope() { m_scopeBuilder.pop(); }
+    void leaveScope()
+    {
+        m_scopeBuilder.pop();
+    }
+#endif
 
     std::tuple<NodeMetaInfo, TypeName> lookup(AST::UiQualifiedId *astTypeNode)
     {
@@ -481,113 +479,6 @@ public:
         return node.metaInfo().hasProperty(propertyName.toUtf8());
     }
 
-    /// When something is changed here, also change Check::checkScopeObjectMember in
-    /// qmljscheck.cpp
-    /// ### Maybe put this into the context as a helper function.
-    ///
-    bool lookupProperty(const QString &prefix,
-                        const AST::UiQualifiedId *id,
-                        const Value **property = nullptr,
-                        const ObjectValue **parentObject = nullptr,
-                        QString *name = nullptr)
-    {
-        QList<const ObjectValue *> scopeObjects = m_scopeChain.qmlScopeObjects();
-        if (scopeObjects.isEmpty())
-            return false;
-
-        if (!id)
-            return false; // ### error?
-
-        if (id->name.isEmpty()) // possible after error recovery
-            return false;
-
-        QString propertyName;
-        if (prefix.isEmpty())
-            propertyName = id->name.toString();
-        else
-            propertyName = prefix;
-
-        if (name)
-            *name = propertyName;
-
-        if (propertyName == u"id" && !id->next)
-            return false; // ### should probably be a special value
-
-        // attached properties
-        bool isAttachedProperty = false;
-        if (! propertyName.isEmpty() && propertyName[0].isUpper()) {
-            isAttachedProperty = true;
-            if (const ObjectValue *qmlTypes = m_scopeChain.qmlTypes())
-                scopeObjects += qmlTypes;
-        }
-
-        if (scopeObjects.isEmpty())
-            return false;
-
-        // global lookup for first part of id
-        const ObjectValue *objectValue = nullptr;
-        const Value *value = nullptr;
-        for (int i = scopeObjects.size() - 1; i >= 0; --i) {
-            objectValue = scopeObjects[i];
-            value = objectValue->lookupMember(propertyName, m_context);
-            if (value)
-                break;
-        }
-        if (parentObject)
-            *parentObject = objectValue;
-        if (!value) {
-            qCInfo(texttomodelMergerDebug) << Q_FUNC_INFO << "Skipping invalid property name" << propertyName;
-            return false;
-        }
-
-        // can't look up members for attached properties
-        if (isAttachedProperty)
-            return false;
-
-        // resolve references
-        if (const Reference *ref = value->asReference())
-            value = m_context->lookupReference(ref);
-
-        // member lookup
-        const AST::UiQualifiedId *idPart = id;
-        if (prefix.isEmpty())
-            idPart = idPart->next;
-        for (; idPart; idPart = idPart->next) {
-            objectValue = value_cast<ObjectValue>(value);
-            if (! objectValue) {
-//                if (idPart->name)
-//                    qDebug() << idPart->name->asString() << "has no property named"
-//                             << propertyName;
-                return false;
-            }
-            if (parentObject)
-                *parentObject = objectValue;
-
-            if (idPart->name.isEmpty()) {
-                // somebody typed "id." and error recovery still gave us a valid tree,
-                // so just bail out here.
-                return false;
-            }
-
-            propertyName = idPart->name.toString();
-            if (name)
-                *name = propertyName;
-
-            value = objectValue->lookupMember(propertyName, m_context);
-            if (! value) {
-//                if (idPart->name)
-//                    qDebug() << "In" << idPart->name->asString() << ":"
-//                             << objectValue->className() << "has no property named"
-//                             << propertyName;
-                return false;
-            }
-        }
-
-        if (property)
-            *property = value;
-        return true;
-    }
-
     bool isArrayProperty(const AbstractProperty &property)
     {
         return ModelUtils::metainfo(property).isListProperty();
@@ -610,9 +501,9 @@ public:
         if (!propertyMetaInfo.isValid()) {
             const bool isAttached = !propertyName.isEmpty() && propertyName[0].isUpper();
             // Only list elements might have unknown properties.
-            if (!node.metaInfo().isQtQuickListElement() && !isAttached) {
-                qCInfo(texttomodelMergerDebug)
-                    << Q_FUNC_INFO << "Unknown property"
+            if (!node.metaInfo().isQtQmlModelsListElement() && !isAttached) {
+                qCInfo(texttomodelMergerLog)
+                    << Q_FUNC_INFO << "\nUnknown property"
                     << propertyPrefix + QLatin1Char('.') + toString(propertyId) << "on line"
                     << propertyId->identifierToken.startLine << "column"
                     << propertyId->identifierToken.startColumn;
@@ -685,9 +576,12 @@ public:
             return QVariant();
     }
 
-
+#ifndef QDS_USE_PROJECTSTORAGE
     const ScopeChain &scopeChain() const
-    { return m_scopeChain; }
+    {
+        return m_scopeChain;
+    }
+#endif
 
     QList<DiagnosticMessage> diagnosticLinkMessages() const
     { return m_diagnosticLinkMessages; }
@@ -695,9 +589,11 @@ public:
 private:
     Document::Ptr m_doc;
     QList<DiagnosticMessage> m_diagnosticLinkMessages;
+#ifndef QDS_USE_PROJECTSTORAGE
     ContextPtr m_context;
     ScopeChain m_scopeChain;
     ScopeBuilder m_scopeBuilder;
+#endif
     Model *m_model;
 };
 
@@ -841,6 +737,7 @@ constexpr auto skipModules = std::make_tuple(EndsWith(u".impl"),
                                              Equals(u"QtQuick.Controls.NativeStyle"),
                                              Equals(u"QtQuick.Controls.Universal"),
                                              Equals(u"QtQuick.Controls.Windows"),
+                                             Equals(u"QtQuick3D.MaterialEditor"),
                                              StartsWith(u"QtQuick.LocalStorage"),
                                              StartsWith(u"QtQuick.NativeStyle"),
                                              StartsWith(u"QtQuick.Pdf"),
@@ -866,6 +763,7 @@ constexpr auto skipModules = std::make_tuple(EndsWith(u".impl"),
                                              StartsWith(u"QtWebSockets"),
                                              StartsWith(u"QtWebView"));
 
+#ifndef QDS_USE_PROJECTSTORAGE
 bool skipModule(QStringView moduleName)
 {
     return std::apply([=](const auto &...skipModule) { return (skipModule(moduleName) || ...); },
@@ -931,9 +829,11 @@ QmlDesigner::Imports createQt5Modules()
             QmlDesigner::Import::createLibraryImport("QtQuick.Studio.MultiText", "1.0"),
             QmlDesigner::Import::createLibraryImport("Qt.SafeRenderer", "2.0")};
 }
+#endif
 
 } // namespace
 
+#ifndef QDS_USE_PROJECTSTORAGE
 void TextToModelMerger::setupPossibleImports()
 {
     if (!m_rewriterView->possibleImportsEnabled())
@@ -942,10 +842,10 @@ void TextToModelMerger::setupPossibleImports()
     static QUrl lastProjectUrl;
     auto &externalDependencies = m_rewriterView->externalDependencies();
     auto projectUrl = externalDependencies.projectUrl();
+
     auto allUsedImports = m_scopeChain->context()->imports(m_document.data())->all();
 
     if (m_possibleModules.isEmpty() || projectUrl != lastProjectUrl) {
-
         auto &externalDependencies = m_rewriterView->externalDependencies();
         if (externalDependencies.isQt6Project()) {
             ModuleScanner moduleScanner{[&](QStringView moduleName) {
@@ -975,7 +875,9 @@ void TextToModelMerger::setupPossibleImports()
     if (m_rewriterView->isAttached())
         m_rewriterView->model()->setPossibleImports(modules);
 }
+#endif
 
+#ifndef QDS_USE_PROJECTSTORAGE
 void TextToModelMerger::setupUsedImports()
 {
      const QmlJS::Imports *imports = m_scopeChain->context()->imports(m_document.data());
@@ -1010,6 +912,7 @@ void TextToModelMerger::setupUsedImports()
     if (m_rewriterView->isAttached())
         m_rewriterView->model()->setUsedImports(usedImports);
 }
+#endif
 
 Document::MutablePtr TextToModelMerger::createParsedDocument(const QUrl &url, const QString &data, QList<DocumentMessage> *errors)
 {
@@ -1100,15 +1003,16 @@ bool TextToModelMerger::load(const QString &data, DifferenceHandler &differenceH
 
         m_vContext = ModelManagerInterface::instance()->projectVContext(Dialect::Qml, m_document);
         ReadingContext ctxt(snapshot, m_document, m_vContext, m_rewriterView->model());
-        m_scopeChain = QSharedPointer<const ScopeChain>(
-                    new ScopeChain(ctxt.scopeChain()));
+
+#ifndef QDS_USE_PROJECTSTORAGE
+        m_scopeChain = QSharedPointer<const ScopeChain>(new ScopeChain(ctxt.scopeChain()));
 
         if (view()->checkLinkErrors()) {
             qCInfo(rewriterBenchmark) << "linked:" << time.elapsed();
             collectLinkErrors(&errors, ctxt);
         }
-
         setupPossibleImports();
+#endif
 
         qCInfo(rewriterBenchmark) << "possible imports:" << time.elapsed();
 
@@ -1142,7 +1046,9 @@ bool TextToModelMerger::load(const QString &data, DifferenceHandler &differenceH
 
         qCInfo(rewriterBenchmark) << "synced nodes:" << time.elapsed();
 
+#ifndef QDS_USE_PROJECTSTORAGE
         setupUsedImports();
+#endif
 
         setActive(false);
 
@@ -1239,8 +1145,9 @@ void TextToModelMerger::syncNode(ModelNode &modelNode,
     else if (!modelNode.nodeSource().isEmpty() || modelNode.nodeSourceType() != ModelNode::NodeWithoutSource)
         clearImplicitComponentDelayed(modelNode, differenceHandler.isAmender());
 
-
+#ifndef QDS_USE_PROJECTSTORAGE
     context->enterScope(astNode);
+#endif
 
     QSet<PropertyName> modelPropertyNames = Utils::toSet(modelNode.propertyNames());
     if (!modelNode.id().isEmpty())
@@ -1254,7 +1161,8 @@ void TextToModelMerger::syncNode(ModelNode &modelNode,
 
         if (auto array = AST::cast<AST::UiArrayBinding *>(member)) {
             const QString astPropertyName = toString(array->qualifiedId);
-            if (isPropertyChangesType(typeName) || isConnectionsType(typeName) || context->lookupProperty(QString(), array->qualifiedId)) {
+            if (isPropertyChangesType(typeName) || isConnectionsType(typeName)
+                || modelNode.metaInfo().hasProperty(astPropertyName.toUtf8())) {
                 AbstractProperty modelProperty = modelNode.property(astPropertyName.toUtf8());
                 QList<AST::UiObjectMember *> arrayMembers;
                 for (AST::UiArrayMemberList *iter = array->members; iter; iter = iter->next)
@@ -1286,13 +1194,8 @@ void TextToModelMerger::syncNode(ModelNode &modelNode,
                 // Store Behaviours in the default property
                 defaultPropertyItems.append(member);
             } else {
-                const Value *propertyType = nullptr;
-                const ObjectValue *containingObject = nullptr;
-                if (context->lookupProperty({},
-                                            binding->qualifiedId,
-                                            &propertyType,
-                                            &containingObject)
-                    || isPropertyChangesType(typeName) || isConnectionsType(typeName)) {
+                if (isPropertyChangesType(typeName) || isConnectionsType(typeName)
+                    || modelNode.metaInfo().hasProperty(astPropertyName.toUtf8())) {
                     AbstractProperty modelProperty = modelNode.property(astPropertyName.toUtf8());
                     if (context->isArrayProperty(modelProperty))
                         syncArrayProperty(modelProperty, {member}, context, differenceHandler);
@@ -1396,7 +1299,9 @@ void TextToModelMerger::syncNode(ModelNode &modelNode,
             differenceHandler.propertyAbsentFromQml(modelProperty);
     }
 
+#ifndef QDS_USE_PROJECTSTORAGE
     context->leaveScope();
+#endif
 }
 
 static QVariant parsePropertyExpression(AST::ExpressionNode *expressionNode)
@@ -1476,9 +1381,8 @@ QmlDesigner::PropertyName TextToModelMerger::syncScriptBinding(ModelNode &modelN
     }
 
     if (isLiteralValue(script)) {
-        if (isPropertyChangesType(modelNode.type())
-                || isConnectionsType(modelNode.type())
-                || isListElementType(modelNode.type())) {
+        if (isPropertyChangesType(modelNode.type()) || isConnectionsType(modelNode.type())
+            || isListElementType(modelNode.type())) {
             AbstractProperty modelProperty = modelNode.property(astPropertyName.toUtf8());
             QVariant variantValue = parsePropertyScriptBinding(script);
             if (!variantValue.isValid())
@@ -1512,15 +1416,14 @@ QmlDesigner::PropertyName TextToModelMerger::syncScriptBinding(ModelNode &modelN
         syncVariantProperty(modelProperty, enumValue, TypeName(), differenceHandler); // TODO: parse type
         return astPropertyName.toUtf8();
     } else { // Not an enum, so:
-        if (isPropertyChangesType(modelNode.type())
-                || isConnectionsType(modelNode.type())
-                || context->lookupProperty(prefix, script->qualifiedId)
-                || isSupportedAttachedProperties(astPropertyName)) {
+        if (isPropertyChangesType(modelNode.type()) || isConnectionsType(modelNode.type())
+            || isSupportedAttachedProperties(astPropertyName)
+            || modelNode.metaInfo().hasProperty(astPropertyName.toUtf8())) {
             AbstractProperty modelProperty = modelNode.property(astPropertyName.toUtf8());
             syncExpressionProperty(modelProperty, astValue, TypeName(), differenceHandler); // TODO: parse type
             return astPropertyName.toUtf8();
         } else {
-            qWarning() << Q_FUNC_INFO << "Skipping invalid expression property" << astPropertyName
+            qCInfo(texttomodelMergerLog) << Q_FUNC_INFO << "\nSkipping invalid expression property" << astPropertyName
                     << "for node type" << modelNode.type();
             return PropertyName();
         }
@@ -2232,42 +2135,31 @@ void TextToModelMerger::collectImportErrors(QList<DocumentMessage> *errors)
     bool hasQtQuick = false;
     for (const QmlDesigner::Import &import : m_rewriterView->model()->imports()) {
         if (import.isLibraryImport() && import.url() == u"QtQuick") {
-            if (supportedQtQuickVersion(import)) {
-                hasQtQuick = true;
-
-                auto &externalDependencies = m_rewriterView->externalDependencies();
-                if (externalDependencies.hasStartupTarget()) {
-                    const bool qt6import = !import.hasVersion() || import.majorVersion() == 6;
-
-                    if (!externalDependencies.isQt6Import() && (m_hasVersionlessImport || qt6import)) {
-                        const QmlJS::DiagnosticMessage diagnosticMessage(
-                            QmlJS::Severity::Error,
-                            SourceLocation(0, 0, 0, 0),
-                            QCoreApplication::translate(
-                                "QmlDesigner::TextToModelMerger",
-                                "Qt Quick 6 is not supported with a Qt 5 kit."));
-                        errors->prepend(
-                            DocumentMessage(diagnosticMessage,
-                                            QUrl::fromLocalFile(m_document->fileName().path())));
-                    }
-                } else {
+            hasQtQuick = true;
+
+            auto &externalDependencies = m_rewriterView->externalDependencies();
+            if (externalDependencies.hasStartupTarget()) {
+                const bool qt6import = !import.hasVersion() || import.majorVersion() == 6;
+
+                if (!externalDependencies.isQt6Import() && (m_hasVersionlessImport || qt6import)) {
                     const QmlJS::DiagnosticMessage diagnosticMessage(
                         QmlJS::Severity::Error,
                         SourceLocation(0, 0, 0, 0),
-                        QCoreApplication::translate("QmlDesigner::TextToModelMerger",
-                                                    "The Design Mode requires a valid Qt kit."));
+                        QCoreApplication::translate(
+                            "QmlDesigner::TextToModelMerger",
+                            "Qt Quick 6 is not supported with a Qt 5 kit."));
                     errors->prepend(
                         DocumentMessage(diagnosticMessage,
                                         QUrl::fromLocalFile(m_document->fileName().path())));
                 }
             } else {
-                const QmlJS::DiagnosticMessage
-                    diagnosticMessage(QmlJS::Severity::Error,
-                                      SourceLocation(0, 0, 0, 0),
-                                      QCoreApplication::translate("QmlDesigner::TextToModelMerger",
-                                                                  "Unsupported Qt Quick version."));
-                errors->append(DocumentMessage(diagnosticMessage,
-                                               QUrl::fromLocalFile(m_document->fileName().path())));
+                const QmlJS::DiagnosticMessage diagnosticMessage(
+                    QmlJS::Severity::Error,
+                    SourceLocation(0, 0, 0, 0),
+                    QCoreApplication::translate("QmlDesigner::TextToModelMerger",
+                                                "The Design Mode requires a valid Qt kit."));
+                errors->prepend(DocumentMessage(diagnosticMessage,
+                                                QUrl::fromLocalFile(m_document->fileName().path())));
             }
         }
     }
@@ -2276,8 +2168,10 @@ void TextToModelMerger::collectImportErrors(QList<DocumentMessage> *errors)
         errors->append(DocumentMessage(QCoreApplication::translate("QmlDesigner::TextToModelMerger", "No import for Qt Quick found.")));
 }
 
-void TextToModelMerger::collectSemanticErrorsAndWarnings(QList<DocumentMessage> *errors, QList<DocumentMessage> *warnings)
+void TextToModelMerger::collectSemanticErrorsAndWarnings(
+    [[maybe_unused]] QList<DocumentMessage> *errors, [[maybe_unused]] QList<DocumentMessage> *warnings)
 {
+#ifndef QDS_USE_PROJECTSTORAGE
     Check check(m_document, m_scopeChain->context());
     check.disableMessage(StaticAnalysis::ErrPrototypeCycle);
     check.disableMessage(StaticAnalysis::ErrCouldNotResolvePrototype);
@@ -2306,6 +2200,7 @@ void TextToModelMerger::collectSemanticErrorsAndWarnings(QList<DocumentMessage>
         if (message.severity == Severity::Warning)
             warnings->append(DocumentMessage(message.toDiagnosticMessage(), fileNameUrl));
     }
+#endif
 }
 
 void TextToModelMerger::populateQrcMapping(const QString &filePath)
@@ -2410,6 +2305,9 @@ QSet<QPair<QString, QString> > TextToModelMerger::qrcMapping() const
 
 QList<QmlTypeData> TextToModelMerger::getQMLSingletons() const
 {
+#ifdef QDS_USE_PROJECTSTORAGE
+    return {};
+#else
     QList<QmlTypeData> list;
     if (!m_scopeChain || !m_scopeChain->document())
         return list;
@@ -2440,6 +2338,7 @@ QList<QmlTypeData> TextToModelMerger::getQMLSingletons() const
         }
     }
     return list;
+#endif
 }
 
 void TextToModelMerger::clearPossibleImportKeys()
diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h
index f511906040..e22f747718 100644
--- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h
+++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h
@@ -37,15 +37,19 @@ public:
     bool isActive() const;
 
     void setupImports(const QmlJS::Document::Ptr &doc, DifferenceHandler &differenceHandler);
+#ifndef QDS_USE_PROJECTSTORAGE
     void setupPossibleImports();
+#endif
     void setupUsedImports();
     bool load(const QString &data, DifferenceHandler &differenceHandler);
 
     RewriterView *view() const
     { return m_rewriterView; }
 
+#ifndef QDS_USE_PROJECTSTORAGE
     const QmlJS::ScopeChain *scopeChain() const
     { return m_scopeChain.data(); }
+#endif
 
     const QmlJS::Document *document() const
     { return m_document.data(); }
@@ -141,7 +145,9 @@ private:
 private:
     RewriterView *m_rewriterView;
     bool m_isActive;
+#ifndef QDS_USE_PROJECTSTORAGE
     QSharedPointer<const QmlJS::ScopeChain> m_scopeChain;
+#endif
     QmlJS::Document::Ptr m_document;
     QTimer m_setupTimer;
     QSet<ModelNode> m_setupComponentList;
diff --git a/src/plugins/qmldesigner/designercore/projectstorage/commontypecache.h b/src/plugins/qmldesigner/designercore/projectstorage/commontypecache.h
index 03c25dfac7..35658c005f 100644
--- a/src/plugins/qmldesigner/designercore/projectstorage/commontypecache.h
+++ b/src/plugins/qmldesigner/designercore/projectstorage/commontypecache.h
@@ -91,6 +91,7 @@ inline constexpr char QtMultimedia[] = "QtMultimedia";
 inline constexpr char QtObject[] = "QtObject";
 inline constexpr char QtQml[] = "QtQml";
 inline constexpr char QtQml_Models[] = "QtQml.Models";
+inline constexpr char QtQml_XmlListModel[] = "QtQml.XmlListModel";
 inline constexpr char QtQuick3D[] = "QtQuick3D";
 inline constexpr char QtQuick3D_Particles3D[] = "QtQuick3D.Particles3D";
 inline constexpr char QtQuick3D_Particles3D_cppnative[] = "QtQuick3D.Particles3D-cppnative";
@@ -131,6 +132,7 @@ inline constexpr char Transition[] = "Transition";
 inline constexpr char UIntType[] = "uint";
 inline constexpr char View3D[] = "View3D";
 inline constexpr char Window[] = "Window";
+inline constexpr char XmlListModelRole[] = "XmlListModelRole";
 inline constexpr char color[] = "color";
 inline constexpr char date[] = "date";
 inline constexpr char font[] = "font";
@@ -176,6 +178,7 @@ class CommonTypeCache
                                    CacheType<QtMultimedia, SoundEffect>,
                                    CacheType<QtQml_Models, ListElement>,
                                    CacheType<QtQml_Models, ListModel>,
+                                   CacheType<QtQml_XmlListModel, XmlListModelRole>,
                                    CacheType<QtQuick, BorderImage>,
                                    CacheType<QtQuick, GridView>,
                                    CacheType<QtQuick, Image>,
diff --git a/src/plugins/qmldesigner/designercore/projectstorage/filestatus.h b/src/plugins/qmldesigner/designercore/projectstorage/filestatus.h
index f3e275b8f3..48b3ba2700 100644
--- a/src/plugins/qmldesigner/designercore/projectstorage/filestatus.h
+++ b/src/plugins/qmldesigner/designercore/projectstorage/filestatus.h
@@ -50,6 +50,18 @@ public:
 
     explicit operator bool() const { return isValid(); }
 
+    template<typename String>
+    friend void convertToString(String &string, const FileStatus &fileStatus)
+    {
+        using NanotraceHR::dictonary;
+        using NanotraceHR::keyValue;
+        auto dict = dictonary(keyValue("source id", fileStatus.sourceId),
+                              keyValue("size", fileStatus.size),
+                              keyValue("last modified", fileStatus.lastModified));
+
+        convertToString(string, dict);
+    }
+
 public:
     SourceId sourceId;
     long long size = -1;
diff --git a/src/plugins/qmldesigner/designercore/projectstorage/filesystem.h b/src/plugins/qmldesigner/designercore/projectstorage/filesystem.h
index 078fd1ee98..28754a8560 100644
--- a/src/plugins/qmldesigner/designercore/projectstorage/filesystem.h
+++ b/src/plugins/qmldesigner/designercore/projectstorage/filesystem.h
@@ -6,6 +6,7 @@
 #include "filestatuscache.h"
 #include "filesysteminterface.h"
 #include "nonlockingmutex.h"
+#include "projectstoragefwd.h"
 
 namespace Sqlite {
 class Database;
@@ -16,12 +17,9 @@ namespace QmlDesigner {
 template<typename ProjectStorage, typename Mutex>
 class SourcePathCache;
 
-template<typename Database>
-class ProjectStorage;
-
 class FileSystem : public FileSystemInterface
 {
-    using PathCache = SourcePathCache<ProjectStorage<Sqlite::Database>, NonLockingMutex>;
+    using PathCache = SourcePathCache<ProjectStorage, NonLockingMutex>;
 
 public:
     FileSystem(PathCache &sourcePathCache)
diff --git a/src/plugins/qmldesigner/designercore/projectstorage/projectstorage.cpp b/src/plugins/qmldesigner/designercore/projectstorage/projectstorage.cpp
index 3e493e8772..a7577d3ab7 100644
--- a/src/plugins/qmldesigner/designercore/projectstorage/projectstorage.cpp
+++ b/src/plugins/qmldesigner/designercore/projectstorage/projectstorage.cpp
@@ -3,20 +3,4542 @@
 
 #include "projectstorage.h"
 
-#include <tracing/qmldesignertracing.h>
-
 #include <sqlitedatabase.h>
 
 namespace QmlDesigner {
 
-NanotraceHR::StringViewCategory<projectStorageTracingStatus()> &projectStorageCategory()
+struct ProjectStorage::Statements
+{
+    Statements(Sqlite::Database &database)
+        : database{database}
+    {}
+
+    Sqlite::Database &database;
+    Sqlite::ReadWriteStatement<1, 2> insertTypeStatement{
+        "INSERT OR IGNORE INTO types(sourceId, name) VALUES(?1, ?2) RETURNING typeId", database};
+    Sqlite::WriteStatement<5> updatePrototypeAndExtensionStatement{
+        "UPDATE types SET prototypeId=?2, prototypeNameId=?3, extensionId=?4, extensionNameId=?5 "
+        "WHERE typeId=?1 AND (prototypeId IS NOT ?2 OR extensionId IS NOT ?3 AND prototypeId "
+        "IS NOT ?4 OR extensionNameId IS NOT ?5)",
+        database};
+    mutable Sqlite::ReadStatement<1, 1> selectTypeIdByExportedNameStatement{
+        "SELECT typeId FROM exportedTypeNames WHERE name=?1", database};
+    mutable Sqlite::ReadStatement<1, 2> selectTypeIdByModuleIdAndExportedNameStatement{
+        "SELECT typeId FROM exportedTypeNames "
+        "WHERE moduleId=?1 AND name=?2 "
+        "ORDER BY majorVersion DESC, minorVersion DESC "
+        "LIMIT 1",
+        database};
+    mutable Sqlite::ReadStatement<1, 3> selectTypeIdByModuleIdAndExportedNameAndMajorVersionStatement{
+        "SELECT typeId FROM exportedTypeNames "
+        "WHERE moduleId=?1 AND name=?2 AND majorVersion=?3"
+        "ORDER BY minorVersion DESC "
+        "LIMIT 1",
+        database};
+    mutable Sqlite::ReadStatement<1, 4> selectTypeIdByModuleIdAndExportedNameAndVersionStatement{
+        "SELECT typeId FROM exportedTypeNames "
+        "WHERE moduleId=?1 AND name=?2 AND majorVersion=?3 AND minorVersion<=?4"
+        "ORDER BY minorVersion DESC "
+        "LIMIT 1",
+        database};
+    mutable Sqlite::ReadStatement<3, 1> selectPropertyDeclarationResultByPropertyDeclarationIdStatement{
+        "SELECT propertyTypeId, propertyDeclarationId, propertyTraits "
+        "FROM propertyDeclarations "
+        "WHERE propertyDeclarationId=?1 "
+        "LIMIT 1",
+        database};
+    mutable Sqlite::ReadStatement<1, 1> selectSourceContextIdFromSourceContextsBySourceContextPathStatement{
+        "SELECT sourceContextId FROM sourceContexts WHERE sourceContextPath = ?", database};
+    mutable Sqlite::ReadStatement<1, 1> selectSourceContextPathFromSourceContextsBySourceContextIdStatement{
+        "SELECT sourceContextPath FROM sourceContexts WHERE sourceContextId = ?", database};
+    mutable Sqlite::ReadStatement<2> selectAllSourceContextsStatement{
+        "SELECT sourceContextPath, sourceContextId FROM sourceContexts", database};
+    Sqlite::WriteStatement<1> insertIntoSourceContextsStatement{
+        "INSERT INTO sourceContexts(sourceContextPath) VALUES (?)", database};
+    mutable Sqlite::ReadStatement<1, 2> selectSourceIdFromSourcesBySourceContextIdAndSourceNameStatement{
+        "SELECT sourceId FROM sources WHERE sourceContextId = ? AND sourceName = ?", database};
+    mutable Sqlite::ReadStatement<2, 1> selectSourceNameAndSourceContextIdFromSourcesBySourceIdStatement{
+        "SELECT sourceName, sourceContextId FROM sources WHERE sourceId = ?", database};
+    mutable Sqlite::ReadStatement<1, 1> selectSourceContextIdFromSourcesBySourceIdStatement{
+        "SELECT sourceContextId FROM sources WHERE sourceId = ?", database};
+    Sqlite::WriteStatement<2> insertIntoSourcesStatement{
+        "INSERT INTO sources(sourceContextId, sourceName) VALUES (?,?)", database};
+    mutable Sqlite::ReadStatement<3> selectAllSourcesStatement{
+        "SELECT sourceName, sourceContextId, sourceId  FROM sources", database};
+    mutable Sqlite::ReadStatement<8, 1> selectTypeByTypeIdStatement{
+        "SELECT sourceId, t.name, t.typeId, prototypeId, extensionId, traits, annotationTraits, "
+        "pd.name "
+        "FROM types AS t LEFT JOIN propertyDeclarations AS pd ON "
+        "defaultPropertyId=propertyDeclarationId "
+        "WHERE t.typeId=?",
+        database};
+    mutable Sqlite::ReadStatement<4, 1> selectExportedTypesByTypeIdStatement{
+        "SELECT moduleId, name, ifnull(majorVersion, -1), ifnull(minorVersion, -1) FROM "
+        "exportedTypeNames WHERE typeId=?",
+        database};
+    mutable Sqlite::ReadStatement<4, 2> selectExportedTypesByTypeIdAndSourceIdStatement{
+        "SELECT etn.moduleId, name, ifnull(etn.majorVersion, -1), ifnull(etn.minorVersion, -1) "
+        "FROM exportedTypeNames AS etn JOIN documentImports USING(moduleId) WHERE typeId=?1 AND "
+        "sourceId=?2",
+        database};
+    mutable Sqlite::ReadStatement<8> selectTypesStatement{
+        "SELECT sourceId, t.name, t.typeId, prototypeId, extensionId, traits, annotationTraits, "
+        "pd.name "
+        "FROM types AS t LEFT JOIN propertyDeclarations AS pd ON "
+        "defaultPropertyId=propertyDeclarationId",
+        database};
+    Sqlite::WriteStatement<2> updateTypeTraitStatement{
+        "UPDATE types SET traits = ?2 WHERE typeId=?1", database};
+    Sqlite::WriteStatement<2> updateTypeAnnotationTraitStatement{
+        "UPDATE types SET annotationTraits = ?2 WHERE typeId=?1", database};
+    Sqlite::ReadStatement<1, 2> selectNotUpdatedTypesInSourcesStatement{
+        "SELECT DISTINCT typeId FROM types WHERE (sourceId IN carray(?1) AND typeId NOT IN "
+        "carray(?2))",
+        database};
+    Sqlite::WriteStatement<1> deleteTypeNamesByTypeIdStatement{
+        "DELETE FROM exportedTypeNames WHERE typeId=?", database};
+    Sqlite::WriteStatement<1> deleteEnumerationDeclarationByTypeIdStatement{
+        "DELETE FROM enumerationDeclarations WHERE typeId=?", database};
+    Sqlite::WriteStatement<1> deletePropertyDeclarationByTypeIdStatement{
+        "DELETE FROM propertyDeclarations WHERE typeId=?", database};
+    Sqlite::WriteStatement<1> deleteFunctionDeclarationByTypeIdStatement{
+        "DELETE FROM functionDeclarations WHERE typeId=?", database};
+    Sqlite::WriteStatement<1> deleteSignalDeclarationByTypeIdStatement{
+        "DELETE FROM signalDeclarations WHERE typeId=?", database};
+    Sqlite::WriteStatement<1> deleteTypeStatement{"DELETE FROM types  WHERE typeId=?", database};
+    mutable Sqlite::ReadStatement<4, 1> selectPropertyDeclarationsByTypeIdStatement{
+        "SELECT name, propertyTypeId, propertyTraits, (SELECT name FROM "
+        "propertyDeclarations WHERE propertyDeclarationId=pd.aliasPropertyDeclarationId) FROM "
+        "propertyDeclarations AS pd WHERE typeId=?",
+        database};
+    Sqlite::ReadStatement<6, 1> selectPropertyDeclarationsForTypeIdStatement{
+        "SELECT name, propertyTraits, propertyTypeId, propertyImportedTypeNameId, "
+        "propertyDeclarationId, aliasPropertyDeclarationId FROM propertyDeclarations "
+        "WHERE typeId=? ORDER BY name",
+        database};
+    Sqlite::ReadWriteStatement<1, 5> insertPropertyDeclarationStatement{
+        "INSERT INTO propertyDeclarations(typeId, name, propertyTypeId, propertyTraits, "
+        "propertyImportedTypeNameId, aliasPropertyDeclarationId) VALUES(?1, ?2, ?3, ?4, ?5, NULL) "
+        "RETURNING propertyDeclarationId",
+        database};
+    Sqlite::WriteStatement<4> updatePropertyDeclarationStatement{
+        "UPDATE propertyDeclarations SET propertyTypeId=?2, propertyTraits=?3, "
+        "propertyImportedTypeNameId=?4, aliasPropertyDeclarationId=NULL WHERE "
+        "propertyDeclarationId=?1",
+        database};
+    Sqlite::WriteStatement<3> updatePropertyAliasDeclarationRecursivelyWithTypeAndTraitsStatement{
+        "WITH RECURSIVE "
+        "  properties(aliasPropertyDeclarationId) AS ( "
+        "    SELECT propertyDeclarationId FROM propertyDeclarations WHERE "
+        "      aliasPropertyDeclarationId=?1 "
+        "   UNION ALL "
+        "     SELECT pd.propertyDeclarationId FROM "
+        "       propertyDeclarations AS pd JOIN properties USING(aliasPropertyDeclarationId)) "
+        "UPDATE propertyDeclarations AS pd "
+        "SET propertyTypeId=?2, propertyTraits=?3 "
+        "FROM properties AS p "
+        "WHERE pd.propertyDeclarationId=p.aliasPropertyDeclarationId",
+        database};
+    Sqlite::WriteStatement<1> updatePropertyAliasDeclarationRecursivelyStatement{
+        "WITH RECURSIVE "
+        "  propertyValues(propertyTypeId, propertyTraits) AS ("
+        "    SELECT propertyTypeId, propertyTraits FROM propertyDeclarations "
+        "      WHERE propertyDeclarationId=?1), "
+        "  properties(aliasPropertyDeclarationId) AS ( "
+        "    SELECT propertyDeclarationId FROM propertyDeclarations WHERE "
+        "      aliasPropertyDeclarationId=?1 "
+        "   UNION ALL "
+        "     SELECT pd.propertyDeclarationId FROM "
+        "       propertyDeclarations AS pd JOIN properties USING(aliasPropertyDeclarationId)) "
+        "UPDATE propertyDeclarations AS pd "
+        "SET propertyTypeId=pv.propertyTypeId, propertyTraits=pv.propertyTraits "
+        "FROM properties AS p, propertyValues AS pv "
+        "WHERE pd.propertyDeclarationId=p.aliasPropertyDeclarationId",
+        database};
+    Sqlite::WriteStatement<1> deletePropertyDeclarationStatement{
+        "DELETE FROM propertyDeclarations WHERE propertyDeclarationId=?", database};
+    Sqlite::ReadStatement<3, 1> selectPropertyDeclarationsWithAliasForTypeIdStatement{
+        "SELECT name, propertyDeclarationId, aliasPropertyDeclarationId FROM propertyDeclarations "
+        "WHERE typeId=? AND aliasPropertyDeclarationId IS NOT NULL ORDER BY name",
+        database};
+    Sqlite::WriteStatement<5> updatePropertyDeclarationWithAliasAndTypeStatement{
+        "UPDATE propertyDeclarations SET propertyTypeId=?2, propertyTraits=?3, "
+        "propertyImportedTypeNameId=?4, aliasPropertyDeclarationId=?5 WHERE "
+        "propertyDeclarationId=?1",
+        database};
+    Sqlite::ReadWriteStatement<1, 2> insertAliasPropertyDeclarationStatement{
+        "INSERT INTO propertyDeclarations(typeId, name) VALUES(?1, ?2) RETURNING "
+        "propertyDeclarationId",
+        database};
+    mutable Sqlite::ReadStatement<4, 1> selectFunctionDeclarationsForTypeIdStatement{
+        "SELECT name, returnTypeName, signature, functionDeclarationId FROM "
+        "functionDeclarations WHERE typeId=? ORDER BY name, signature",
+        database};
+    mutable Sqlite::ReadStatement<3, 1> selectFunctionDeclarationsForTypeIdWithoutSignatureStatement{
+        "SELECT name, returnTypeName, functionDeclarationId FROM "
+        "functionDeclarations WHERE typeId=? ORDER BY name",
+        database};
+    mutable Sqlite::ReadStatement<3, 1> selectFunctionParameterDeclarationsStatement{
+        "SELECT json_extract(json_each.value, '$.n'), json_extract(json_each.value, '$.tn'), "
+        "json_extract(json_each.value, '$.tr') FROM functionDeclarations, "
+        "json_each(functionDeclarations.signature) WHERE functionDeclarationId=?",
+        database};
+    Sqlite::WriteStatement<4> insertFunctionDeclarationStatement{
+        "INSERT INTO functionDeclarations(typeId, name, returnTypeName, signature) VALUES(?1, ?2, "
+        "?3, ?4)",
+        database};
+    Sqlite::WriteStatement<3> updateFunctionDeclarationStatement{
+        "UPDATE functionDeclarations "
+        "SET returnTypeName=?2, signature=?3 "
+        "WHERE functionDeclarationId=?1",
+        database};
+    Sqlite::WriteStatement<1> deleteFunctionDeclarationStatement{
+        "DELETE FROM functionDeclarations WHERE functionDeclarationId=?", database};
+    mutable Sqlite::ReadStatement<3, 1> selectSignalDeclarationsForTypeIdStatement{
+        "SELECT name, signature, signalDeclarationId FROM signalDeclarations WHERE typeId=? ORDER "
+        "BY name, signature",
+        database};
+    mutable Sqlite::ReadStatement<2, 1> selectSignalDeclarationsForTypeIdWithoutSignatureStatement{
+        "SELECT name, signalDeclarationId FROM signalDeclarations WHERE typeId=? ORDER BY name",
+        database};
+    mutable Sqlite::ReadStatement<3, 1> selectSignalParameterDeclarationsStatement{
+        "SELECT json_extract(json_each.value, '$.n'), json_extract(json_each.value, '$.tn'), "
+        "json_extract(json_each.value, '$.tr') FROM signalDeclarations, "
+        "json_each(signalDeclarations.signature) WHERE signalDeclarationId=?",
+        database};
+    Sqlite::WriteStatement<3> insertSignalDeclarationStatement{
+        "INSERT INTO signalDeclarations(typeId, name, signature) VALUES(?1, ?2, ?3)", database};
+    Sqlite::WriteStatement<2> updateSignalDeclarationStatement{
+        "UPDATE signalDeclarations SET  signature=?2 WHERE signalDeclarationId=?1", database};
+    Sqlite::WriteStatement<1> deleteSignalDeclarationStatement{
+        "DELETE FROM signalDeclarations WHERE signalDeclarationId=?", database};
+    mutable Sqlite::ReadStatement<3, 1> selectEnumerationDeclarationsForTypeIdStatement{
+        "SELECT name, enumeratorDeclarations, enumerationDeclarationId FROM "
+        "enumerationDeclarations WHERE typeId=? ORDER BY name",
+        database};
+    mutable Sqlite::ReadStatement<2, 1> selectEnumerationDeclarationsForTypeIdWithoutEnumeratorDeclarationsStatement{
+        "SELECT name, enumerationDeclarationId FROM enumerationDeclarations WHERE typeId=? ORDER "
+        "BY name",
+        database};
+    mutable Sqlite::ReadStatement<3, 1> selectEnumeratorDeclarationStatement{
+        "SELECT json_each.key, json_each.value, json_each.type!='null' FROM "
+        "enumerationDeclarations, json_each(enumerationDeclarations.enumeratorDeclarations) WHERE "
+        "enumerationDeclarationId=?",
+        database};
+    Sqlite::WriteStatement<3> insertEnumerationDeclarationStatement{
+        "INSERT INTO enumerationDeclarations(typeId, name, enumeratorDeclarations) VALUES(?1, ?2, "
+        "?3)",
+        database};
+    Sqlite::WriteStatement<2> updateEnumerationDeclarationStatement{
+        "UPDATE enumerationDeclarations SET  enumeratorDeclarations=?2 WHERE "
+        "enumerationDeclarationId=?1",
+        database};
+    Sqlite::WriteStatement<1> deleteEnumerationDeclarationStatement{
+        "DELETE FROM enumerationDeclarations WHERE enumerationDeclarationId=?", database};
+    mutable Sqlite::ReadStatement<1, 1> selectModuleIdByNameStatement{
+        "SELECT moduleId FROM modules WHERE name=? LIMIT 1", database};
+    mutable Sqlite::ReadWriteStatement<1, 1> insertModuleNameStatement{
+        "INSERT INTO modules(name) VALUES(?1) RETURNING moduleId", database};
+    mutable Sqlite::ReadStatement<1, 1> selectModuleNameStatement{
+        "SELECT name FROM modules WHERE moduleId =?1", database};
+    mutable Sqlite::ReadStatement<2> selectAllModulesStatement{"SELECT name, moduleId FROM modules",
+                                                               database};
+    mutable Sqlite::ReadStatement<1, 2> selectTypeIdBySourceIdAndNameStatement{
+        "SELECT typeId FROM types WHERE sourceId=?1 and name=?2", database};
+    mutable Sqlite::ReadStatement<1, 3> selectTypeIdByModuleIdsAndExportedNameStatement{
+        "SELECT typeId FROM exportedTypeNames WHERE moduleId IN carray(?1, ?2, 'int32') AND "
+        "name=?3",
+        database};
+    mutable Sqlite::ReadStatement<4> selectAllDocumentImportForSourceIdStatement{
+        "SELECT moduleId, majorVersion, minorVersion, sourceId "
+        "FROM documentImports ",
+        database};
+    mutable Sqlite::ReadStatement<5, 2> selectDocumentImportForSourceIdStatement{
+        "SELECT importId, sourceId, moduleId, majorVersion, minorVersion "
+        "FROM documentImports WHERE sourceId IN carray(?1) AND kind=?2 ORDER BY sourceId, "
+        "moduleId, majorVersion, minorVersion",
+        database};
+    Sqlite::ReadWriteStatement<1, 5> insertDocumentImportWithoutVersionStatement{
+        "INSERT INTO documentImports(sourceId, moduleId, sourceModuleId, kind, "
+        "parentImportId) VALUES (?1, ?2, ?3, ?4, ?5) RETURNING importId",
+        database};
+    Sqlite::ReadWriteStatement<1, 6> insertDocumentImportWithMajorVersionStatement{
+        "INSERT INTO documentImports(sourceId, moduleId, sourceModuleId, kind, majorVersion, "
+        "parentImportId) VALUES (?1, ?2, ?3, ?4, ?5, ?6) RETURNING importId",
+        database};
+    Sqlite::ReadWriteStatement<1, 7> insertDocumentImportWithVersionStatement{
+        "INSERT INTO documentImports(sourceId, moduleId, sourceModuleId, kind, majorVersion, "
+        "minorVersion, parentImportId) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7) RETURNING "
+        "importId",
+        database};
+    Sqlite::WriteStatement<1> deleteDocumentImportStatement{
+        "DELETE FROM documentImports WHERE importId=?1", database};
+    Sqlite::WriteStatement<2> deleteDocumentImportsWithParentImportIdStatement{
+        "DELETE FROM documentImports WHERE sourceId=?1 AND parentImportId=?2", database};
+    Sqlite::WriteStatement<1> deleteDocumentImportsWithSourceIdsStatement{
+        "DELETE FROM documentImports WHERE sourceId IN carray(?1)", database};
+    mutable Sqlite::ReadStatement<1, 2> selectPropertyDeclarationIdByTypeIdAndNameStatement{
+        "SELECT propertyDeclarationId "
+        "FROM propertyDeclarations "
+        "WHERE typeId=?1 AND name=?2 "
+        "LIMIT 1",
+        database};
+    Sqlite::WriteStatement<2> updateAliasIdPropertyDeclarationStatement{
+        "UPDATE propertyDeclarations SET aliasPropertyDeclarationId=?2  WHERE "
+        "aliasPropertyDeclarationId=?1",
+        database};
+    Sqlite::WriteStatement<2> updateAliasPropertyDeclarationByAliasPropertyDeclarationIdStatement{
+        "UPDATE propertyDeclarations SET propertyTypeId=new.propertyTypeId, "
+        "propertyTraits=new.propertyTraits, aliasPropertyDeclarationId=?1 FROM (SELECT "
+        "propertyTypeId, propertyTraits FROM propertyDeclarations WHERE propertyDeclarationId=?1) "
+        "AS new WHERE aliasPropertyDeclarationId=?2",
+        database};
+    Sqlite::WriteStatement<1> updateAliasPropertyDeclarationToNullStatement{
+        "UPDATE propertyDeclarations SET aliasPropertyDeclarationId=NULL, propertyTypeId=NULL, "
+        "propertyTraits=NULL WHERE propertyDeclarationId=? AND (aliasPropertyDeclarationId IS NOT "
+        "NULL OR propertyTypeId IS NOT NULL OR propertyTraits IS NOT NULL)",
+        database};
+    Sqlite::ReadStatement<5, 1> selectAliasPropertiesDeclarationForPropertiesWithTypeIdStatement{
+        "SELECT alias.typeId, alias.propertyDeclarationId, alias.propertyImportedTypeNameId, "
+        "  alias.aliasPropertyDeclarationId, alias.aliasPropertyDeclarationTailId "
+        "FROM propertyDeclarations AS alias JOIN propertyDeclarations AS target "
+        "  ON alias.aliasPropertyDeclarationId=target.propertyDeclarationId OR "
+        "    alias.aliasPropertyDeclarationTailId=target.propertyDeclarationId "
+        "WHERE alias.propertyTypeId=?1 "
+        "UNION ALL "
+        "SELECT alias.typeId, alias.propertyDeclarationId, alias.propertyImportedTypeNameId, "
+        "  alias.aliasPropertyDeclarationId, alias.aliasPropertyDeclarationTailId "
+        "FROM propertyDeclarations AS alias JOIN propertyDeclarations AS target "
+        "  ON alias.aliasPropertyDeclarationId=target.propertyDeclarationId OR "
+        "    alias.aliasPropertyDeclarationTailId=target.propertyDeclarationId "
+        "WHERE target.typeId=?1 "
+        "UNION ALL "
+        "SELECT alias.typeId, alias.propertyDeclarationId, alias.propertyImportedTypeNameId, "
+        "  alias.aliasPropertyDeclarationId, alias.aliasPropertyDeclarationTailId "
+        "FROM propertyDeclarations AS alias JOIN propertyDeclarations AS target "
+        "  ON alias.aliasPropertyDeclarationId=target.propertyDeclarationId OR "
+        "    alias.aliasPropertyDeclarationTailId=target.propertyDeclarationId "
+        "WHERE  alias.propertyImportedTypeNameId IN "
+        "  (SELECT importedTypeNameId FROM exportedTypeNames JOIN importedTypeNames USING(name) "
+        "   WHERE typeId=?1)",
+        database};
+    Sqlite::ReadStatement<3, 1> selectAliasPropertiesDeclarationForPropertiesWithAliasIdStatement{
+        "WITH RECURSIVE "
+        "  properties(propertyDeclarationId, propertyImportedTypeNameId, typeId, "
+        "    aliasPropertyDeclarationId) AS ("
+        "      SELECT propertyDeclarationId, propertyImportedTypeNameId, typeId, "
+        "        aliasPropertyDeclarationId FROM propertyDeclarations WHERE "
+        "        aliasPropertyDeclarationId=?1"
+        "    UNION ALL "
+        "      SELECT pd.propertyDeclarationId, pd.propertyImportedTypeNameId, pd.typeId, "
+        "        pd.aliasPropertyDeclarationId FROM propertyDeclarations AS pd JOIN properties AS "
+        "        p ON pd.aliasPropertyDeclarationId=p.propertyDeclarationId)"
+        "SELECT propertyDeclarationId, propertyImportedTypeNameId, aliasPropertyDeclarationId "
+        "  FROM properties",
+        database};
+    Sqlite::ReadWriteStatement<3, 1> updatesPropertyDeclarationPropertyTypeToNullStatement{
+        "UPDATE propertyDeclarations SET propertyTypeId=NULL WHERE propertyTypeId=?1 AND "
+        "aliasPropertyDeclarationId IS NULL RETURNING typeId, propertyDeclarationId, "
+        "propertyImportedTypeNameId",
+        database};
+    mutable Sqlite::ReadStatement<1, 1> selectPropertyNameStatement{
+        "SELECT name FROM propertyDeclarations WHERE propertyDeclarationId=?", database};
+    Sqlite::WriteStatement<2> updatePropertyDeclarationTypeStatement{
+        "UPDATE propertyDeclarations SET propertyTypeId=?2 WHERE propertyDeclarationId=?1", database};
+    Sqlite::ReadWriteStatement<2, 1> updatePrototypeIdToNullStatement{
+        "UPDATE types SET prototypeId=NULL WHERE prototypeId=?1 RETURNING "
+        "typeId, prototypeNameId",
+        database};
+    Sqlite::ReadWriteStatement<2, 1> updateExtensionIdToNullStatement{
+        "UPDATE types SET extensionId=NULL WHERE extensionId=?1 RETURNING "
+        "typeId, extensionNameId",
+        database};
+    Sqlite::WriteStatement<2> updateTypePrototypeStatement{
+        "UPDATE types SET prototypeId=?2 WHERE typeId=?1", database};
+    Sqlite::WriteStatement<2> updateTypeExtensionStatement{
+        "UPDATE types SET extensionId=?2 WHERE typeId=?1", database};
+    mutable Sqlite::ReadStatement<1, 1> selectPrototypeAndExtensionIdsStatement{
+        "WITH RECURSIVE "
+        "  prototypes(typeId) AS (  "
+        "      SELECT prototypeId FROM types WHERE typeId=?1 "
+        "    UNION ALL "
+        "      SELECT extensionId FROM types WHERE typeId=?1 "
+        "    UNION ALL "
+        "      SELECT prototypeId FROM types JOIN prototypes USING(typeId) "
+        "    UNION ALL "
+        "      SELECT extensionId FROM types JOIN prototypes USING(typeId)) "
+        "SELECT typeId FROM prototypes WHERE typeId IS NOT NULL",
+        database};
+    Sqlite::WriteStatement<3> updatePropertyDeclarationAliasIdAndTypeNameIdStatement{
+        "UPDATE propertyDeclarations SET aliasPropertyDeclarationId=?2, "
+        "propertyImportedTypeNameId=?3 WHERE propertyDeclarationId=?1 AND "
+        "(aliasPropertyDeclarationId IS NOT ?2 OR propertyImportedTypeNameId IS NOT ?3)",
+        database};
+    Sqlite::WriteStatement<1> updatetPropertiesDeclarationValuesOfAliasStatement{
+        "WITH RECURSIVE "
+        "  properties(propertyDeclarationId, propertyTypeId, propertyTraits) AS ( "
+        "      SELECT aliasPropertyDeclarationId, propertyTypeId, propertyTraits FROM "
+        "       propertyDeclarations WHERE propertyDeclarationId=?1 "
+        "   UNION ALL "
+        "      SELECT pd.aliasPropertyDeclarationId, pd.propertyTypeId, pd.propertyTraits FROM "
+        "        propertyDeclarations AS pd JOIN properties USING(propertyDeclarationId)) "
+        "UPDATE propertyDeclarations AS pd SET propertyTypeId=p.propertyTypeId, "
+        "  propertyTraits=p.propertyTraits "
+        "FROM properties AS p "
+        "WHERE pd.propertyDeclarationId=?1 AND p.propertyDeclarationId IS NULL AND "
+        "  (pd.propertyTypeId IS NOT p.propertyTypeId OR pd.propertyTraits IS NOT "
+        "  p.propertyTraits)",
+        database};
+    Sqlite::WriteStatement<1> updatePropertyDeclarationAliasIdToNullStatement{
+        "UPDATE propertyDeclarations SET aliasPropertyDeclarationId=NULL  WHERE "
+        "propertyDeclarationId=?1",
+        database};
+    mutable Sqlite::ReadStatement<1, 1> selectPropertyDeclarationIdsForAliasChainStatement{
+        "WITH RECURSIVE "
+        "  properties(propertyDeclarationId) AS ( "
+        "    SELECT aliasPropertyDeclarationId FROM propertyDeclarations WHERE "
+        "     propertyDeclarationId=?1 "
+        "   UNION ALL "
+        "     SELECT aliasPropertyDeclarationId FROM propertyDeclarations JOIN properties "
+        "       USING(propertyDeclarationId)) "
+        "SELECT propertyDeclarationId FROM properties",
+        database};
+    mutable Sqlite::ReadStatement<3> selectAllFileStatusesStatement{
+        "SELECT sourceId, size, lastModified FROM fileStatuses ORDER BY sourceId", database};
+    mutable Sqlite::ReadStatement<3, 1> selectFileStatusesForSourceIdsStatement{
+        "SELECT sourceId, size, lastModified FROM fileStatuses WHERE sourceId IN carray(?1) ORDER "
+        "BY sourceId",
+        database};
+    mutable Sqlite::ReadStatement<3, 1> selectFileStatusesForSourceIdStatement{
+        "SELECT sourceId, size, lastModified FROM fileStatuses WHERE sourceId=?1 ORDER BY sourceId",
+        database};
+    Sqlite::WriteStatement<3> insertFileStatusStatement{
+        "INSERT INTO fileStatuses(sourceId, size, lastModified) VALUES(?1, ?2, ?3)", database};
+    Sqlite::WriteStatement<1> deleteFileStatusStatement{
+        "DELETE FROM fileStatuses WHERE sourceId=?1", database};
+    Sqlite::WriteStatement<3> updateFileStatusStatement{
+        "UPDATE fileStatuses SET size=?2, lastModified=?3 WHERE sourceId=?1", database};
+    Sqlite::ReadStatement<1, 1> selectTypeIdBySourceIdStatement{
+        "SELECT typeId FROM types WHERE sourceId=?", database};
+    mutable Sqlite::ReadStatement<1, 3> selectImportedTypeNameIdStatement{
+        "SELECT importedTypeNameId FROM importedTypeNames WHERE kind=?1 AND importOrSourceId=?2 "
+        "AND name=?3 LIMIT 1",
+        database};
+    mutable Sqlite::ReadWriteStatement<1, 3> insertImportedTypeNameIdStatement{
+        "INSERT INTO importedTypeNames(kind, importOrSourceId, name) VALUES (?1, ?2, ?3) "
+        "RETURNING importedTypeNameId",
+        database};
+    mutable Sqlite::ReadStatement<1, 2> selectImportIdBySourceIdAndModuleIdStatement{
+        "SELECT importId FROM documentImports WHERE sourceId=?1 AND moduleId=?2 AND majorVersion "
+        "IS NULL AND minorVersion IS NULL LIMIT 1",
+        database};
+    mutable Sqlite::ReadStatement<1, 3> selectImportIdBySourceIdAndModuleIdAndMajorVersionStatement{
+        "SELECT importId FROM documentImports WHERE sourceId=?1 AND moduleId=?2 AND "
+        "majorVersion=?3 AND minorVersion IS NULL LIMIT 1",
+        database};
+    mutable Sqlite::ReadStatement<1, 4> selectImportIdBySourceIdAndModuleIdAndVersionStatement{
+        "SELECT importId FROM documentImports WHERE sourceId=?1 AND moduleId=?2 AND "
+        "majorVersion=?3 AND minorVersion=?4 LIMIT 1",
+        database};
+    mutable Sqlite::ReadStatement<1, 1> selectKindFromImportedTypeNamesStatement{
+        "SELECT kind FROM importedTypeNames WHERE importedTypeNameId=?1", database};
+    mutable Sqlite::ReadStatement<1, 1> selectNameFromImportedTypeNamesStatement{
+        "SELECT name FROM importedTypeNames WHERE importedTypeNameId=?1", database};
+    mutable Sqlite::ReadStatement<1, 1> selectTypeIdForQualifiedImportedTypeNameNamesStatement{
+        "SELECT typeId FROM importedTypeNames AS itn JOIN documentImports AS di ON "
+        "importOrSourceId=di.importId JOIN documentImports AS di2 ON di.sourceId=di2.sourceId AND "
+        "di.moduleId=di2.sourceModuleId "
+        "JOIN exportedTypeNames AS etn ON di2.moduleId=etn.moduleId WHERE "
+        "itn.kind=2 AND importedTypeNameId=?1 AND itn.name=etn.name AND "
+        "(di.majorVersion IS NULL OR (di.majorVersion=etn.majorVersion AND (di.minorVersion IS "
+        "NULL OR di.minorVersion>=etn.minorVersion))) ORDER BY etn.majorVersion DESC NULLS FIRST, "
+        "etn.minorVersion DESC NULLS FIRST LIMIT 1",
+        database};
+    mutable Sqlite::ReadStatement<1, 1> selectTypeIdForImportedTypeNameNamesStatement{
+        "WITH "
+        "  importTypeNames(moduleId, name, kind, majorVersion, minorVersion) AS ( "
+        "    SELECT moduleId, name, di.kind, majorVersion, minorVersion "
+        "    FROM importedTypeNames AS itn JOIN documentImports AS di ON "
+        "      importOrSourceId=sourceId "
+        "    WHERE "
+        "      importedTypeNameId=?1 AND itn.kind=1) "
+        "SELECT typeId FROM importTypeNames AS itn "
+        "  JOIN exportedTypeNames AS etn USING(moduleId, name) "
+        "WHERE (itn.majorVersion IS NULL OR (itn.majorVersion=etn.majorVersion "
+        "  AND (itn.minorVersion IS NULL OR itn.minorVersion>=etn.minorVersion))) "
+        "ORDER BY itn.kind, etn.majorVersion DESC NULLS FIRST, etn.minorVersion DESC NULLS FIRST "
+        "LIMIT 1",
+        database};
+    Sqlite::WriteStatement<0> deleteAllSourcesStatement{"DELETE FROM sources", database};
+    Sqlite::WriteStatement<0> deleteAllSourceContextsStatement{"DELETE FROM sourceContexts", database};
+    mutable Sqlite::ReadStatement<6, 1> selectExportedTypesForSourceIdsStatement{
+        "SELECT moduleId, name, ifnull(majorVersion, -1), ifnull(minorVersion, -1), typeId, "
+        "exportedTypeNameId FROM exportedTypeNames WHERE typeId in carray(?1) ORDER BY moduleId, "
+        "name, majorVersion, minorVersion",
+        database};
+    Sqlite::WriteStatement<5> insertExportedTypeNamesWithVersionStatement{
+        "INSERT INTO exportedTypeNames(moduleId, name, majorVersion, minorVersion, typeId) "
+        "VALUES(?1, ?2, ?3, ?4, ?5)",
+        database};
+    Sqlite::WriteStatement<4> insertExportedTypeNamesWithMajorVersionStatement{
+        "INSERT INTO exportedTypeNames(moduleId, name, majorVersion, typeId) "
+        "VALUES(?1, ?2, ?3, ?4)",
+        database};
+    Sqlite::WriteStatement<3> insertExportedTypeNamesWithoutVersionStatement{
+        "INSERT INTO exportedTypeNames(moduleId, name, typeId) VALUES(?1, ?2, ?3)", database};
+    Sqlite::WriteStatement<1> deleteExportedTypeNameStatement{
+        "DELETE FROM exportedTypeNames WHERE exportedTypeNameId=?", database};
+    Sqlite::WriteStatement<2> updateExportedTypeNameTypeIdStatement{
+        "UPDATE exportedTypeNames SET typeId=?2 WHERE exportedTypeNameId=?1", database};
+    mutable Sqlite::ReadStatement<4, 1> selectProjectDatasForSourceIdsStatement{
+        "SELECT projectSourceId, sourceId, moduleId, fileType FROM projectDatas WHERE "
+        "projectSourceId IN carray(?1) ORDER BY projectSourceId, sourceId",
+        database};
+    Sqlite::WriteStatement<4> insertProjectDataStatement{
+        "INSERT INTO projectDatas(projectSourceId, sourceId, "
+        "moduleId, fileType) VALUES(?1, ?2, ?3, ?4)",
+        database};
+    Sqlite::WriteStatement<2> deleteProjectDataStatement{
+        "DELETE FROM projectDatas WHERE projectSourceId=?1 AND sourceId=?2", database};
+    Sqlite::WriteStatement<4> updateProjectDataStatement{
+        "UPDATE projectDatas SET moduleId=?3, fileType=?4 WHERE projectSourceId=?1 AND sourceId=?2",
+        database};
+    mutable Sqlite::ReadStatement<4, 1> selectProjectDatasForSourceIdStatement{
+        "SELECT projectSourceId, sourceId, moduleId, fileType FROM projectDatas WHERE "
+        "projectSourceId=?1",
+        database};
+    mutable Sqlite::ReadStatement<4, 1> selectProjectDataForSourceIdStatement{
+        "SELECT projectSourceId, sourceId, moduleId, fileType FROM projectDatas WHERE "
+        "sourceId=?1 LIMIT 1",
+        database};
+    mutable Sqlite::ReadStatement<1, 1> selectTypeIdsForSourceIdsStatement{
+        "SELECT typeId FROM types WHERE sourceId IN carray(?1)", database};
+    mutable Sqlite::ReadStatement<6, 1> selectModuleExportedImportsForSourceIdStatement{
+        "SELECT moduleExportedImportId, moduleId, exportedModuleId, ifnull(majorVersion, -1), "
+        "ifnull(minorVersion, -1), isAutoVersion FROM moduleExportedImports WHERE moduleId IN "
+        "carray(?1) ORDER BY moduleId, exportedModuleId",
+        database};
+    Sqlite::WriteStatement<3> insertModuleExportedImportWithoutVersionStatement{
+        "INSERT INTO moduleExportedImports(moduleId, exportedModuleId, isAutoVersion) "
+        "VALUES (?1, ?2, ?3)",
+        database};
+    Sqlite::WriteStatement<4> insertModuleExportedImportWithMajorVersionStatement{
+        "INSERT INTO moduleExportedImports(moduleId, exportedModuleId, isAutoVersion, "
+        "majorVersion) VALUES (?1, ?2, ?3, ?4)",
+        database};
+    Sqlite::WriteStatement<5> insertModuleExportedImportWithVersionStatement{
+        "INSERT INTO moduleExportedImports(moduleId, exportedModuleId, isAutoVersion, "
+        "majorVersion, minorVersion) VALUES (?1, ?2, ?3, ?4, ?5)",
+        database};
+    Sqlite::WriteStatement<1> deleteModuleExportedImportStatement{
+        "DELETE FROM moduleExportedImports WHERE moduleExportedImportId=?1", database};
+    mutable Sqlite::ReadStatement<3, 3> selectModuleExportedImportsForModuleIdStatement{
+        "WITH RECURSIVE "
+        "  imports(moduleId, majorVersion, minorVersion, moduleExportedImportId) AS ( "
+        "      SELECT exportedModuleId, "
+        "             iif(isAutoVersion=1, ?2, majorVersion), "
+        "             iif(isAutoVersion=1, ?3, minorVersion), "
+        "             moduleExportedImportId "
+        "        FROM moduleExportedImports WHERE moduleId=?1 "
+        "    UNION ALL "
+        "      SELECT exportedModuleId, "
+        "             iif(mei.isAutoVersion=1, i.majorVersion, mei.majorVersion), "
+        "             iif(mei.isAutoVersion=1, i.minorVersion, mei.minorVersion), "
+        "             mei.moduleExportedImportId "
+        "        FROM moduleExportedImports AS mei JOIN imports AS i USING(moduleId)) "
+        "SELECT DISTINCT moduleId, ifnull(majorVersion, -1), ifnull(minorVersion, -1) "
+        "FROM imports",
+        database};
+    mutable Sqlite::ReadStatement<1, 1> selectLocalPropertyDeclarationIdsForTypeStatement{
+        "SELECT propertyDeclarationId "
+        "FROM propertyDeclarations "
+        "WHERE typeId=? "
+        "ORDER BY propertyDeclarationId",
+        database};
+    mutable Sqlite::ReadStatement<1, 2> selectLocalPropertyDeclarationIdForTypeAndPropertyNameStatement{
+        "SELECT propertyDeclarationId "
+        "FROM propertyDeclarations "
+        "WHERE typeId=?1 AND name=?2 LIMIT 1",
+        database};
+    mutable Sqlite::ReadStatement<4, 1> selectPropertyDeclarationForPropertyDeclarationIdStatement{
+        "SELECT typeId, name, propertyTraits, propertyTypeId "
+        "FROM propertyDeclarations "
+        "WHERE propertyDeclarationId=?1 LIMIT 1",
+        database};
+    mutable Sqlite::ReadStatement<1, 1> selectSignalDeclarationNamesForTypeStatement{
+        "WITH RECURSIVE "
+        "  all_prototype_and_extension(typeId, prototypeId) AS ("
+        "       SELECT typeId, prototypeId FROM types WHERE prototypeId IS NOT NULL"
+        "    UNION ALL "
+        "       SELECT typeId, extensionId FROM types WHERE extensionId IS NOT NULL),"
+        "  typeChain(typeId) AS ("
+        "      VALUES(?1)"
+        "    UNION ALL "
+        "      SELECT prototypeId FROM all_prototype_and_extension JOIN typeChain "
+        "        USING(typeId)) "
+        "SELECT name FROM typeChain JOIN signalDeclarations "
+        "  USING(typeId) ORDER BY name",
+        database};
+    mutable Sqlite::ReadStatement<1, 1> selectFuncionDeclarationNamesForTypeStatement{
+        "WITH RECURSIVE "
+        "  all_prototype_and_extension(typeId, prototypeId) AS ("
+        "       SELECT typeId, prototypeId FROM types WHERE prototypeId IS NOT NULL"
+        "    UNION ALL "
+        "       SELECT typeId, extensionId FROM types WHERE extensionId IS NOT NULL),"
+        "  typeChain(typeId) AS ("
+        "      VALUES(?1)"
+        "    UNION ALL "
+        "      SELECT prototypeId FROM all_prototype_and_extension JOIN typeChain "
+        "        USING(typeId))"
+        "SELECT name FROM typeChain JOIN functionDeclarations "
+        "  USING(typeId) ORDER BY name",
+        database};
+    mutable Sqlite::ReadStatement<2> selectTypesWithDefaultPropertyStatement{
+        "SELECT typeId, defaultPropertyId FROM types ORDER BY typeId", database};
+    Sqlite::WriteStatement<2> updateDefaultPropertyIdStatement{
+        "UPDATE types SET defaultPropertyId=?2 WHERE typeId=?1", database};
+    Sqlite::WriteStatement<1> updateDefaultPropertyIdToNullStatement{
+        "UPDATE types SET defaultPropertyId=NULL WHERE defaultPropertyId=?1", database};
+    mutable Sqlite::ReadStatement<3, 1> selectInfoTypeByTypeIdStatement{
+        "SELECT sourceId, traits, annotationTraits FROM types WHERE typeId=?", database};
+    mutable Sqlite::ReadStatement<1, 1> selectDefaultPropertyDeclarationIdStatement{
+        "SELECT defaultPropertyId FROM types WHERE typeId=?", database};
+    mutable Sqlite::ReadStatement<1, 1> selectPrototypeIdsForTypeIdInOrderStatement{
+        "WITH RECURSIVE "
+        "  all_prototype_and_extension(typeId, prototypeId) AS ("
+        "       SELECT typeId, prototypeId FROM types WHERE prototypeId IS NOT NULL"
+        "    UNION ALL "
+        "       SELECT typeId, extensionId FROM types WHERE extensionId IS NOT NULL),"
+        "  prototypes(typeId, level) AS ("
+        "       SELECT prototypeId, 0 FROM all_prototype_and_extension WHERE typeId=?"
+        "    UNION ALL "
+        "      SELECT prototypeId, p.level+1 FROM all_prototype_and_extension JOIN "
+        "        prototypes AS p USING(typeId)) "
+        "SELECT typeId FROM prototypes ORDER BY level",
+        database};
+    Sqlite::WriteStatement<2> upsertPropertyEditorPathIdStatement{
+        "INSERT INTO propertyEditorPaths(typeId, pathSourceId) VALUES(?1, ?2) ON CONFLICT DO "
+        "UPDATE SET pathSourceId=excluded.pathSourceId WHERE pathSourceId IS NOT "
+        "excluded.pathSourceId",
+        database};
+    mutable Sqlite::ReadStatement<1, 1> selectPropertyEditorPathIdStatement{
+        "SELECT pathSourceId FROM propertyEditorPaths WHERE typeId=?", database};
+    mutable Sqlite::ReadStatement<3, 1> selectPropertyEditorPathsForForSourceIdsStatement{
+        "SELECT typeId, pathSourceId, directoryId "
+        "FROM propertyEditorPaths "
+        "WHERE directoryId IN carray(?1) "
+        "ORDER BY typeId",
+        database};
+    Sqlite::WriteStatement<3> insertPropertyEditorPathStatement{
+        "INSERT INTO propertyEditorPaths(typeId, pathSourceId, directoryId) VALUES (?1, ?2, ?3)",
+        database};
+    Sqlite::WriteStatement<3> updatePropertyEditorPathsStatement{
+        "UPDATE propertyEditorPaths "
+        "SET pathSourceId=?2, directoryId=?3 "
+        "WHERE typeId=?1",
+        database};
+    Sqlite::WriteStatement<1> deletePropertyEditorPathStatement{
+        "DELETE FROM propertyEditorPaths WHERE typeId=?1", database};
+    mutable Sqlite::ReadStatement<4, 1> selectTypeAnnotationsForSourceIdsStatement{
+        "SELECT typeId, iconPath, itemLibrary, hints FROM typeAnnotations WHERE "
+        "sourceId IN carray(?1) ORDER BY typeId",
+        database};
+    Sqlite::WriteStatement<6> insertTypeAnnotationStatement{
+        "INSERT INTO "
+        "  typeAnnotations(typeId, sourceId, directorySourceId, iconPath, itemLibrary, hints) "
+        "VALUES(?1, ?2, ?3, ?4, ?5, ?6)",
+        database};
+    Sqlite::WriteStatement<4> updateTypeAnnotationStatement{
+        "UPDATE typeAnnotations SET iconPath=?2, itemLibrary=?3, hints=?4 WHERE typeId=?1", database};
+    Sqlite::WriteStatement<1> deleteTypeAnnotationStatement{
+        "DELETE FROM typeAnnotations WHERE typeId=?1", database};
+    mutable Sqlite::ReadStatement<1, 1> selectTypeIconPathStatement{
+        "SELECT iconPath FROM typeAnnotations WHERE typeId=?1", database};
+    mutable Sqlite::ReadStatement<2, 1> selectTypeHintsStatement{
+        "SELECT hints.key, hints.value "
+        "FROM typeAnnotations, json_each(typeAnnotations.hints) AS hints "
+        "WHERE typeId=?1 AND hints IS NOT NULL",
+        database};
+    mutable Sqlite::ReadStatement<1, 1> selectTypeAnnotationSourceIdsStatement{
+        "SELECT sourceId FROM typeAnnotations WHERE directorySourceId=?1 ORDER BY sourceId", database};
+    mutable Sqlite::ReadStatement<1, 0> selectTypeAnnotationDirectorySourceIdsStatement{
+        "SELECT DISTINCT directorySourceId FROM typeAnnotations ORDER BY directorySourceId", database};
+    mutable Sqlite::ReadStatement<9> selectItemLibraryEntriesStatement{
+        "SELECT typeId, i.value->>'$.name', i.value->>'$.iconPath', i.value->>'$.category', "
+        "  i.value->>'$.import', i.value->>'$.toolTip', i.value->>'$.properties', "
+        "  i.value->>'$.extraFilePaths', i.value->>'$.templatePath' "
+        "FROM typeAnnotations AS ta , json_each(ta.itemLibrary) AS i "
+        "WHERE ta.itemLibrary IS NOT NULL",
+        database};
+    mutable Sqlite::ReadStatement<9, 1> selectItemLibraryEntriesByTypeIdStatement{
+        "SELECT typeId, i.value->>'$.name', i.value->>'$.iconPath', i.value->>'$.category', "
+        "  i.value->>'$.import', i.value->>'$.toolTip', i.value->>'$.properties', "
+        "  i.value->>'$.extraFilePaths', i.value->>'$.templatePath' "
+        "FROM typeAnnotations AS ta, json_each(ta.itemLibrary) AS i "
+        "WHERE typeId=?1 AND ta.itemLibrary IS NOT NULL",
+        database};
+    mutable Sqlite::ReadStatement<9, 1> selectItemLibraryEntriesBySourceIdStatement{
+        "SELECT typeId, i.value->>'$.name', i.value->>'$.iconPath', "
+        "i.value->>'$.category', "
+        "  i.value->>'$.import', i.value->>'$.toolTip', i.value->>'$.properties', "
+        "  i.value->>'$.extraFilePaths', i.value->>'$.templatePath' "
+        "FROM typeAnnotations, json_each(typeAnnotations.itemLibrary) AS i "
+        "WHERE typeId IN (SELECT DISTINCT typeId "
+        "                 FROM documentImports AS di JOIN exportedTypeNames "
+        "                   USING(moduleId) "
+        "                 WHERE di.sourceId=?)",
+        database};
+    mutable Sqlite::ReadStatement<3, 1> selectItemLibraryPropertiesStatement{
+        "SELECT p.value->>0, p.value->>1, p.value->>2 FROM json_each(?1) AS p", database};
+    mutable Sqlite::ReadStatement<1, 1> selectItemLibraryExtraFilePathsStatement{
+        "SELECT p.value FROM json_each(?1) AS p", database};
+    mutable Sqlite::ReadStatement<1, 1> selectTypeIdsByModuleIdStatement{
+        "SELECT DISTINCT typeId FROM exportedTypeNames WHERE moduleId=?", database};
+    mutable Sqlite::ReadStatement<1, 1> selectHeirTypeIdsStatement{
+        "WITH RECURSIVE "
+        "  typeSelection(typeId) AS ("
+        "      SELECT typeId FROM types WHERE prototypeId=?1 OR extensionId=?1"
+        "    UNION ALL "
+        "      SELECT t.typeId "
+        "      FROM types AS t JOIN typeSelection AS ts "
+        "      WHERE prototypeId=ts.typeId OR extensionId=ts.typeId)"
+        "SELECT typeId FROM typeSelection",
+        database};
+};
+
+class ProjectStorage::Initializer
+{
+public:
+    Initializer(Database &database, bool isInitialized)
+    {
+        if (!isInitialized) {
+            auto moduleIdColumn = createModulesTable(database);
+            createSourceContextsTable(database);
+            createSourcesTable(database);
+            createTypesAndePropertyDeclarationsTables(database, moduleIdColumn);
+            createExportedTypeNamesTable(database, moduleIdColumn);
+            createImportedTypeNamesTable(database);
+            createEnumerationsTable(database);
+            createFunctionsTable(database);
+            createSignalsTable(database);
+            createModuleExportedImportsTable(database, moduleIdColumn);
+            createDocumentImportsTable(database, moduleIdColumn);
+            createFileStatusesTable(database);
+            createProjectDatasTable(database);
+            createPropertyEditorPathsTable(database);
+            createTypeAnnotionsTable(database);
+        }
+        database.setIsInitialized(true);
+    }
+
+    void createSourceContextsTable(Database &database)
+    {
+        Sqlite::Table table;
+        table.setUseIfNotExists(true);
+        table.setName("sourceContexts");
+        table.addColumn("sourceContextId", Sqlite::ColumnType::Integer, {Sqlite::PrimaryKey{}});
+        const Sqlite::Column &sourceContextPathColumn = table.addColumn("sourceContextPath");
+
+        table.addUniqueIndex({sourceContextPathColumn});
+
+        table.initialize(database);
+    }
+
+    void createSourcesTable(Database &database)
+    {
+        Sqlite::StrictTable table;
+        table.setUseIfNotExists(true);
+        table.setName("sources");
+        table.addColumn("sourceId", Sqlite::StrictColumnType::Integer, {Sqlite::PrimaryKey{}});
+        const auto &sourceContextIdColumn = table.addColumn(
+            "sourceContextId",
+            Sqlite::StrictColumnType::Integer,
+            {Sqlite::NotNull{},
+             Sqlite::ForeignKey{"sourceContexts",
+                                "sourceContextId",
+                                Sqlite::ForeignKeyAction::NoAction,
+                                Sqlite::ForeignKeyAction::Cascade}});
+        const auto &sourceNameColumn = table.addColumn("sourceName", Sqlite::StrictColumnType::Text);
+        table.addUniqueIndex({sourceContextIdColumn, sourceNameColumn});
+
+        table.initialize(database);
+    }
+
+    void createTypesAndePropertyDeclarationsTables(
+        Database &database, [[maybe_unused]] const Sqlite::StrictColumn &foreignModuleIdColumn)
+    {
+        Sqlite::StrictTable typesTable;
+        typesTable.setUseIfNotExists(true);
+        typesTable.setName("types");
+        typesTable.addColumn("typeId", Sqlite::StrictColumnType::Integer, {Sqlite::PrimaryKey{}});
+        auto &sourceIdColumn = typesTable.addColumn("sourceId", Sqlite::StrictColumnType::Integer);
+        auto &typesNameColumn = typesTable.addColumn("name", Sqlite::StrictColumnType::Text);
+        typesTable.addColumn("traits", Sqlite::StrictColumnType::Integer);
+        auto &prototypeIdColumn = typesTable.addForeignKeyColumn("prototypeId",
+                                                                 typesTable,
+                                                                 Sqlite::ForeignKeyAction::NoAction,
+                                                                 Sqlite::ForeignKeyAction::Restrict);
+        typesTable.addColumn("prototypeNameId", Sqlite::StrictColumnType::Integer);
+        auto &extensionIdColumn = typesTable.addForeignKeyColumn("extensionId",
+                                                                 typesTable,
+                                                                 Sqlite::ForeignKeyAction::NoAction,
+                                                                 Sqlite::ForeignKeyAction::Restrict);
+        typesTable.addColumn("extensionNameId", Sqlite::StrictColumnType::Integer);
+        auto &defaultPropertyIdColumn = typesTable.addColumn("defaultPropertyId",
+                                                             Sqlite::StrictColumnType::Integer);
+        typesTable.addColumn("annotationTraits", Sqlite::StrictColumnType::Integer);
+        typesTable.addUniqueIndex({sourceIdColumn, typesNameColumn});
+        typesTable.addIndex({defaultPropertyIdColumn});
+        typesTable.addIndex({prototypeIdColumn});
+        typesTable.addIndex({extensionIdColumn});
+
+        typesTable.initialize(database);
+
+        {
+            Sqlite::StrictTable propertyDeclarationTable;
+            propertyDeclarationTable.setUseIfNotExists(true);
+            propertyDeclarationTable.setName("propertyDeclarations");
+            propertyDeclarationTable.addColumn("propertyDeclarationId",
+                                               Sqlite::StrictColumnType::Integer,
+                                               {Sqlite::PrimaryKey{}});
+            auto &typeIdColumn = propertyDeclarationTable.addColumn("typeId");
+            auto &nameColumn = propertyDeclarationTable.addColumn("name");
+            auto &propertyTypeIdColumn = propertyDeclarationTable.addForeignKeyColumn(
+                "propertyTypeId",
+                typesTable,
+                Sqlite::ForeignKeyAction::NoAction,
+                Sqlite::ForeignKeyAction::Restrict);
+            propertyDeclarationTable.addColumn("propertyTraits", Sqlite::StrictColumnType::Integer);
+            propertyDeclarationTable.addColumn("propertyImportedTypeNameId",
+                                               Sqlite::StrictColumnType::Integer);
+            auto &aliasPropertyDeclarationIdColumn = propertyDeclarationTable.addForeignKeyColumn(
+                "aliasPropertyDeclarationId",
+                propertyDeclarationTable,
+                Sqlite::ForeignKeyAction::NoAction,
+                Sqlite::ForeignKeyAction::Restrict);
+            auto &aliasPropertyDeclarationTailIdColumn = propertyDeclarationTable.addForeignKeyColumn(
+                "aliasPropertyDeclarationTailId",
+                propertyDeclarationTable,
+                Sqlite::ForeignKeyAction::NoAction,
+                Sqlite::ForeignKeyAction::Restrict);
+
+            propertyDeclarationTable.addUniqueIndex({typeIdColumn, nameColumn});
+            propertyDeclarationTable.addIndex({propertyTypeIdColumn});
+            propertyDeclarationTable.addIndex({aliasPropertyDeclarationIdColumn},
+                                              "aliasPropertyDeclarationId IS NOT NULL");
+            propertyDeclarationTable.addIndex({aliasPropertyDeclarationTailIdColumn},
+                                              "aliasPropertyDeclarationTailId IS NOT NULL");
+
+            propertyDeclarationTable.initialize(database);
+        }
+    }
+
+    void createExportedTypeNamesTable(Database &database,
+                                      const Sqlite::StrictColumn &foreignModuleIdColumn)
+    {
+        Sqlite::StrictTable table;
+        table.setUseIfNotExists(true);
+        table.setName("exportedTypeNames");
+        table.addColumn("exportedTypeNameId",
+                        Sqlite::StrictColumnType::Integer,
+                        {Sqlite::PrimaryKey{}});
+        auto &moduleIdColumn = table.addForeignKeyColumn("moduleId",
+                                                         foreignModuleIdColumn,
+                                                         Sqlite::ForeignKeyAction::NoAction,
+                                                         Sqlite::ForeignKeyAction::NoAction);
+        auto &nameColumn = table.addColumn("name", Sqlite::StrictColumnType::Text);
+        auto &typeIdColumn = table.addColumn("typeId", Sqlite::StrictColumnType::Integer);
+        auto &majorVersionColumn = table.addColumn("majorVersion", Sqlite::StrictColumnType::Integer);
+        auto &minorVersionColumn = table.addColumn("minorVersion", Sqlite::StrictColumnType::Integer);
+
+        table.addUniqueIndex({moduleIdColumn, nameColumn},
+                             "majorVersion IS NULL AND minorVersion IS NULL");
+        table.addUniqueIndex({moduleIdColumn, nameColumn, majorVersionColumn},
+                             "majorVersion IS NOT NULL AND minorVersion IS NULL");
+        table.addUniqueIndex({moduleIdColumn, nameColumn, majorVersionColumn, minorVersionColumn},
+                             "majorVersion IS NOT NULL AND minorVersion IS NOT NULL");
+
+        table.addIndex({typeIdColumn});
+        table.addIndex({moduleIdColumn, nameColumn});
+
+        table.initialize(database);
+    }
+
+    void createImportedTypeNamesTable(Database &database)
+    {
+        Sqlite::StrictTable table;
+        table.setUseIfNotExists(true);
+        table.setName("importedTypeNames");
+        table.addColumn("importedTypeNameId",
+                        Sqlite::StrictColumnType::Integer,
+                        {Sqlite::PrimaryKey{}});
+        auto &importOrSourceIdColumn = table.addColumn("importOrSourceId");
+        auto &nameColumn = table.addColumn("name", Sqlite::StrictColumnType::Text);
+        auto &kindColumn = table.addColumn("kind", Sqlite::StrictColumnType::Integer);
+
+        table.addUniqueIndex({kindColumn, importOrSourceIdColumn, nameColumn});
+        table.addIndex({nameColumn});
+
+        table.initialize(database);
+    }
+
+    void createEnumerationsTable(Database &database)
+    {
+        Sqlite::StrictTable table;
+        table.setUseIfNotExists(true);
+        table.setName("enumerationDeclarations");
+        table.addColumn("enumerationDeclarationId",
+                        Sqlite::StrictColumnType::Integer,
+                        {Sqlite::PrimaryKey{}});
+        auto &typeIdColumn = table.addColumn("typeId", Sqlite::StrictColumnType::Integer);
+        auto &nameColumn = table.addColumn("name", Sqlite::StrictColumnType::Text);
+        table.addColumn("enumeratorDeclarations", Sqlite::StrictColumnType::Text);
+
+        table.addUniqueIndex({typeIdColumn, nameColumn});
+
+        table.initialize(database);
+    }
+
+    void createFunctionsTable(Database &database)
+    {
+        Sqlite::StrictTable table;
+        table.setUseIfNotExists(true);
+        table.setName("functionDeclarations");
+        table.addColumn("functionDeclarationId",
+                        Sqlite::StrictColumnType::Integer,
+                        {Sqlite::PrimaryKey{}});
+        auto &typeIdColumn = table.addColumn("typeId", Sqlite::StrictColumnType::Integer);
+        auto &nameColumn = table.addColumn("name", Sqlite::StrictColumnType::Text);
+        auto &signatureColumn = table.addColumn("signature", Sqlite::StrictColumnType::Text);
+        table.addColumn("returnTypeName");
+
+        table.addUniqueIndex({typeIdColumn, nameColumn, signatureColumn});
+
+        table.initialize(database);
+    }
+
+    void createSignalsTable(Database &database)
+    {
+        Sqlite::StrictTable table;
+        table.setUseIfNotExists(true);
+        table.setName("signalDeclarations");
+        table.addColumn("signalDeclarationId",
+                        Sqlite::StrictColumnType::Integer,
+                        {Sqlite::PrimaryKey{}});
+        auto &typeIdColumn = table.addColumn("typeId", Sqlite::StrictColumnType::Integer);
+        auto &nameColumn = table.addColumn("name", Sqlite::StrictColumnType::Text);
+        auto &signatureColumn = table.addColumn("signature", Sqlite::StrictColumnType::Text);
+
+        table.addUniqueIndex({typeIdColumn, nameColumn, signatureColumn});
+
+        table.initialize(database);
+    }
+
+    Sqlite::StrictColumn createModulesTable(Database &database)
+    {
+        Sqlite::StrictTable table;
+        table.setUseIfNotExists(true);
+        table.setName("modules");
+        auto &modelIdColumn = table.addColumn("moduleId",
+                                              Sqlite::StrictColumnType::Integer,
+                                              {Sqlite::PrimaryKey{}});
+        auto &nameColumn = table.addColumn("name", Sqlite::StrictColumnType::Text);
+
+        table.addUniqueIndex({nameColumn});
+
+        table.initialize(database);
+
+        return std::move(modelIdColumn);
+    }
+
+    void createModuleExportedImportsTable(Database &database,
+                                          const Sqlite::StrictColumn &foreignModuleIdColumn)
+    {
+        Sqlite::StrictTable table;
+        table.setUseIfNotExists(true);
+        table.setName("moduleExportedImports");
+        table.addColumn("moduleExportedImportId",
+                        Sqlite::StrictColumnType::Integer,
+                        {Sqlite::PrimaryKey{}});
+        auto &moduleIdColumn = table.addForeignKeyColumn("moduleId",
+                                                         foreignModuleIdColumn,
+                                                         Sqlite::ForeignKeyAction::NoAction,
+                                                         Sqlite::ForeignKeyAction::Cascade,
+                                                         Sqlite::Enforment::Immediate);
+        auto &sourceIdColumn = table.addColumn("exportedModuleId", Sqlite::StrictColumnType::Integer);
+        table.addColumn("isAutoVersion", Sqlite::StrictColumnType::Integer);
+        table.addColumn("majorVersion", Sqlite::StrictColumnType::Integer);
+        table.addColumn("minorVersion", Sqlite::StrictColumnType::Integer);
+
+        table.addUniqueIndex({sourceIdColumn, moduleIdColumn});
+
+        table.initialize(database);
+    }
+
+    void createDocumentImportsTable(Database &database,
+                                    const Sqlite::StrictColumn &foreignModuleIdColumn)
+    {
+        Sqlite::StrictTable table;
+        table.setUseIfNotExists(true);
+        table.setName("documentImports");
+        table.addColumn("importId", Sqlite::StrictColumnType::Integer, {Sqlite::PrimaryKey{}});
+        auto &sourceIdColumn = table.addColumn("sourceId", Sqlite::StrictColumnType::Integer);
+        auto &moduleIdColumn = table.addForeignKeyColumn("moduleId",
+                                                         foreignModuleIdColumn,
+                                                         Sqlite::ForeignKeyAction::NoAction,
+                                                         Sqlite::ForeignKeyAction::Cascade,
+                                                         Sqlite::Enforment::Immediate);
+        auto &sourceModuleIdColumn = table.addForeignKeyColumn("sourceModuleId",
+                                                               foreignModuleIdColumn,
+                                                               Sqlite::ForeignKeyAction::NoAction,
+                                                               Sqlite::ForeignKeyAction::Cascade,
+                                                               Sqlite::Enforment::Immediate);
+        auto &kindColumn = table.addColumn("kind", Sqlite::StrictColumnType::Integer);
+        auto &majorVersionColumn = table.addColumn("majorVersion", Sqlite::StrictColumnType::Integer);
+        auto &minorVersionColumn = table.addColumn("minorVersion", Sqlite::StrictColumnType::Integer);
+        auto &parentImportIdColumn = table.addColumn("parentImportId",
+                                                     Sqlite::StrictColumnType::Integer);
+
+        table.addUniqueIndex(
+            {sourceIdColumn, moduleIdColumn, kindColumn, sourceModuleIdColumn, parentImportIdColumn},
+            "majorVersion IS NULL AND minorVersion IS NULL");
+        table.addUniqueIndex({sourceIdColumn,
+                              moduleIdColumn,
+                              kindColumn,
+                              sourceModuleIdColumn,
+                              majorVersionColumn,
+                              parentImportIdColumn},
+                             "majorVersion IS NOT NULL AND minorVersion IS NULL");
+        table.addUniqueIndex({sourceIdColumn,
+                              moduleIdColumn,
+                              kindColumn,
+                              sourceModuleIdColumn,
+                              majorVersionColumn,
+                              minorVersionColumn,
+                              parentImportIdColumn},
+                             "majorVersion IS NOT NULL AND minorVersion IS NOT NULL");
+
+        table.addIndex({sourceIdColumn, kindColumn});
+
+        table.initialize(database);
+    }
+
+    void createFileStatusesTable(Database &database)
+    {
+        Sqlite::StrictTable table;
+        table.setUseIfNotExists(true);
+        table.setName("fileStatuses");
+        table.addColumn("sourceId",
+                        Sqlite::StrictColumnType::Integer,
+                        {Sqlite::PrimaryKey{},
+                         Sqlite::ForeignKey{"sources",
+                                            "sourceId",
+                                            Sqlite::ForeignKeyAction::NoAction,
+                                            Sqlite::ForeignKeyAction::Cascade}});
+        table.addColumn("size", Sqlite::StrictColumnType::Integer);
+        table.addColumn("lastModified", Sqlite::StrictColumnType::Integer);
+
+        table.initialize(database);
+    }
+
+    void createProjectDatasTable(Database &database)
+    {
+        Sqlite::StrictTable table;
+        table.setUseIfNotExists(true);
+        table.setUseWithoutRowId(true);
+        table.setName("projectDatas");
+        auto &projectSourceIdColumn = table.addColumn("projectSourceId",
+                                                      Sqlite::StrictColumnType::Integer);
+        auto &sourceIdColumn = table.addColumn("sourceId", Sqlite::StrictColumnType::Integer);
+        table.addColumn("moduleId", Sqlite::StrictColumnType::Integer);
+        table.addColumn("fileType", Sqlite::StrictColumnType::Integer);
+
+        table.addPrimaryKeyContraint({projectSourceIdColumn, sourceIdColumn});
+        table.addUniqueIndex({sourceIdColumn});
+
+        table.initialize(database);
+    }
+
+    void createPropertyEditorPathsTable(Database &database)
+    {
+        Sqlite::StrictTable table;
+        table.setUseIfNotExists(true);
+        table.setUseWithoutRowId(true);
+        table.setName("propertyEditorPaths");
+        table.addColumn("typeId", Sqlite::StrictColumnType::Integer, {Sqlite::PrimaryKey{}});
+        table.addColumn("pathSourceId", Sqlite::StrictColumnType::Integer);
+        auto &directoryIdColumn = table.addColumn("directoryId", Sqlite::StrictColumnType::Integer);
+
+        table.addIndex({directoryIdColumn});
+
+        table.initialize(database);
+    }
+
+    void createTypeAnnotionsTable(Database &database)
+    {
+        Sqlite::StrictTable table;
+        table.setUseIfNotExists(true);
+        table.setUseWithoutRowId(true);
+        table.setName("typeAnnotations");
+        auto &typeIdColumn = table.addColumn("typeId",
+                                             Sqlite::StrictColumnType::Integer,
+                                             {Sqlite::PrimaryKey{}});
+        auto &sourceIdColumn = table.addColumn("sourceId", Sqlite::StrictColumnType::Integer);
+        auto &directorySourceIdColumn = table.addColumn("directorySourceId",
+                                                        Sqlite::StrictColumnType::Integer);
+
+        table.addColumn("iconPath", Sqlite::StrictColumnType::Text);
+        table.addColumn("itemLibrary", Sqlite::StrictColumnType::Text);
+        table.addColumn("hints", Sqlite::StrictColumnType::Text);
+
+        table.addUniqueIndex({sourceIdColumn, typeIdColumn});
+        table.addIndex({directorySourceIdColumn});
+
+        table.initialize(database);
+    }
+};
+
+ProjectStorage::ProjectStorage(Database &database, bool isInitialized)
+    : database{database}
+    , exclusiveTransaction{database}
+    , initializer{std::make_unique<ProjectStorage::Initializer>(database, isInitialized)}
+    , moduleCache{ModuleStorageAdapter{*this}}
+    , s{std::make_unique<ProjectStorage::Statements>(database)}
 {
-    thread_local NanotraceHR::StringViewCategory<projectStorageTracingStatus()>
-        projectStorageCategory_{"project storage"_t, Tracing::eventQueue(), projectStorageCategory};
+    NanotraceHR::Tracer tracer{"initialize"_t, projectStorageCategory()};
+
+    exclusiveTransaction.commit();
 
-    return projectStorageCategory_;
+    database.walCheckpointFull();
+
+    moduleCache.populate();
 }
 
-} // namespace QmlDesigner
+ProjectStorage::~ProjectStorage() = default;
+
+void ProjectStorage::synchronize(Storage::Synchronization::SynchronizationPackage package)
+{
+    NanotraceHR::Tracer tracer{"synchronize"_t, projectStorageCategory()};
+
+    TypeIds deletedTypeIds;
+    Sqlite::withImmediateTransaction(database, [&] {
+        AliasPropertyDeclarations insertedAliasPropertyDeclarations;
+        AliasPropertyDeclarations updatedAliasPropertyDeclarations;
+
+        AliasPropertyDeclarations relinkableAliasPropertyDeclarations;
+        PropertyDeclarations relinkablePropertyDeclarations;
+        Prototypes relinkablePrototypes;
+        Prototypes relinkableExtensions;
+
+        TypeIds updatedTypeIds;
+        updatedTypeIds.reserve(package.types.size());
+
+        TypeIds typeIdsToBeDeleted;
+
+        std::sort(package.updatedSourceIds.begin(), package.updatedSourceIds.end());
+
+        synchronizeFileStatuses(package.fileStatuses, package.updatedFileStatusSourceIds);
+        synchronizeImports(package.imports,
+                           package.updatedSourceIds,
+                           package.moduleDependencies,
+                           package.updatedModuleDependencySourceIds,
+                           package.moduleExportedImports,
+                           package.updatedModuleIds);
+        synchronizeTypes(package.types,
+                         updatedTypeIds,
+                         insertedAliasPropertyDeclarations,
+                         updatedAliasPropertyDeclarations,
+                         relinkableAliasPropertyDeclarations,
+                         relinkablePropertyDeclarations,
+                         relinkablePrototypes,
+                         relinkableExtensions,
+                         package.updatedSourceIds);
+        synchronizeTypeAnnotations(package.typeAnnotations, package.updatedTypeAnnotationSourceIds);
+        synchronizePropertyEditorQmlPaths(package.propertyEditorQmlPaths,
+                                          package.updatedPropertyEditorQmlPathSourceIds);
+
+        deleteNotUpdatedTypes(updatedTypeIds,
+                              package.updatedSourceIds,
+                              typeIdsToBeDeleted,
+                              relinkableAliasPropertyDeclarations,
+                              relinkablePropertyDeclarations,
+                              relinkablePrototypes,
+                              relinkableExtensions,
+                              deletedTypeIds);
+
+        relink(relinkableAliasPropertyDeclarations,
+               relinkablePropertyDeclarations,
+               relinkablePrototypes,
+               relinkableExtensions,
+               deletedTypeIds);
+
+        linkAliases(insertedAliasPropertyDeclarations, updatedAliasPropertyDeclarations);
+
+        synchronizeProjectDatas(package.projectDatas, package.updatedProjectSourceIds);
+
+        commonTypeCache_.resetTypeIds();
+    });
+
+    callRefreshMetaInfoCallback(deletedTypeIds);
+}
+
+void ProjectStorage::synchronizeDocumentImports(Storage::Imports imports, SourceId sourceId)
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"synchronize document imports"_t,
+                               projectStorageCategory(),
+                               keyValue("imports", imports),
+                               keyValue("source id", sourceId)};
+
+    Sqlite::withImmediateTransaction(database, [&] {
+        synchronizeDocumentImports(imports, {sourceId}, Storage::Synchronization::ImportKind::Import);
+    });
+}
+
+void ProjectStorage::addObserver(ProjectStorageObserver *observer)
+{
+    NanotraceHR::Tracer tracer{"add observer"_t, projectStorageCategory()};
+    observers.push_back(observer);
+}
+
+void ProjectStorage::removeObserver(ProjectStorageObserver *observer)
+{
+    NanotraceHR::Tracer tracer{"remove observer"_t, projectStorageCategory()};
+    observers.removeOne(observer);
+}
+
+ModuleId ProjectStorage::moduleId(Utils::SmallStringView moduleName) const
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"get module id"_t,
+                               projectStorageCategory(),
+                               keyValue("module name", moduleName)};
+
+    auto moduleId = moduleCache.id(moduleName);
+
+    tracer.end(keyValue("module id", moduleId));
+
+    return moduleId;
+}
+
+Utils::SmallString ProjectStorage::moduleName(ModuleId moduleId) const
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"get module name"_t,
+                               projectStorageCategory(),
+                               keyValue("module id", moduleId)};
+
+    if (!moduleId)
+        throw ModuleDoesNotExists{};
+
+    auto moduleName = moduleCache.value(moduleId);
+
+    tracer.end(keyValue("module name", moduleName));
+
+    return moduleName;
+}
+
+TypeId ProjectStorage::typeId(ModuleId moduleId,
+                              Utils::SmallStringView exportedTypeName,
+                              Storage::Version version) const
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"get type id by exported name"_t,
+                               projectStorageCategory(),
+                               keyValue("module id", moduleId),
+                               keyValue("exported type name", exportedTypeName),
+                               keyValue("version", version)};
+
+    TypeId typeId;
+
+    if (version.minor) {
+        typeId = s->selectTypeIdByModuleIdAndExportedNameAndVersionStatement.valueWithTransaction<TypeId>(
+            moduleId, exportedTypeName, version.major.value, version.minor.value);
+
+    } else if (version.major) {
+        typeId = s->selectTypeIdByModuleIdAndExportedNameAndMajorVersionStatement
+                     .valueWithTransaction<TypeId>(moduleId, exportedTypeName, version.major.value);
+
+    } else {
+        typeId = s->selectTypeIdByModuleIdAndExportedNameStatement
+                     .valueWithTransaction<TypeId>(moduleId, exportedTypeName);
+    }
+
+    tracer.end(keyValue("type id", typeId));
+
+    return typeId;
+}
+
+TypeId ProjectStorage::typeId(ImportedTypeNameId typeNameId) const
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"get type id by imported type name"_t,
+                               projectStorageCategory(),
+                               keyValue("imported type name id", typeNameId)};
+
+    auto typeId = Sqlite::withDeferredTransaction(database, [&] { return fetchTypeId(typeNameId); });
+
+    tracer.end(keyValue("type id", typeId));
+
+    return typeId;
+}
+
+QVarLengthArray<TypeId, 256> ProjectStorage::typeIds(ModuleId moduleId) const
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"get type ids by module id"_t,
+                               projectStorageCategory(),
+                               keyValue("module id", moduleId)};
+
+    auto typeIds = s->selectTypeIdsByModuleIdStatement
+                       .valuesWithTransaction<QVarLengthArray<TypeId, 256>>(moduleId);
+
+    tracer.end(keyValue("type ids", typeIds));
+
+    return typeIds;
+}
+
+Storage::Info::ExportedTypeNames ProjectStorage::exportedTypeNames(TypeId typeId) const
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"get exported type names by type id"_t,
+                               projectStorageCategory(),
+                               keyValue("type id", typeId)};
+
+    auto exportedTypenames = s->selectExportedTypesByTypeIdStatement
+                                 .valuesWithTransaction<Storage::Info::ExportedTypeName, 4>(typeId);
+
+    tracer.end(keyValue("exported type names", exportedTypenames));
+
+    return exportedTypenames;
+}
+
+Storage::Info::ExportedTypeNames ProjectStorage::exportedTypeNames(TypeId typeId, SourceId sourceId) const
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"get exported type names by source id"_t,
+                               projectStorageCategory(),
+                               keyValue("type id", typeId),
+                               keyValue("source id", sourceId)};
+
+    auto exportedTypenames = s->selectExportedTypesByTypeIdAndSourceIdStatement
+                                 .valuesWithTransaction<Storage::Info::ExportedTypeName, 4>(typeId,
+                                                                                            sourceId);
+
+    tracer.end(keyValue("exported type names", exportedTypenames));
+
+    return exportedTypenames;
+}
+
+ImportId ProjectStorage::importId(const Storage::Import &import) const
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"get import id by import"_t,
+                               projectStorageCategory(),
+                               keyValue("import", import)};
+
+    auto importId = Sqlite::withDeferredTransaction(database, [&] {
+        return fetchImportId(import.sourceId, import);
+    });
+
+    tracer.end(keyValue("import id", importId));
+
+    return importId;
+}
+
+ImportedTypeNameId ProjectStorage::importedTypeNameId(ImportId importId,
+                                                      Utils::SmallStringView typeName)
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"get imported type name id by import id"_t,
+                               projectStorageCategory(),
+                               keyValue("import id", importId),
+                               keyValue("imported type name", typeName)};
+
+    auto importedTypeNameId = Sqlite::withDeferredTransaction(database, [&] {
+        return fetchImportedTypeNameId(Storage::Synchronization::TypeNameKind::QualifiedExported,
+                                       importId,
+                                       typeName);
+    });
+
+    tracer.end(keyValue("imported type name id", importedTypeNameId));
+
+    return importedTypeNameId;
+}
+
+ImportedTypeNameId ProjectStorage::importedTypeNameId(SourceId sourceId,
+                                                      Utils::SmallStringView typeName)
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"get imported type name id by source id"_t,
+                               projectStorageCategory(),
+                               keyValue("source id", sourceId),
+                               keyValue("imported type name", typeName)};
+
+    auto importedTypeNameId = Sqlite::withDeferredTransaction(database, [&] {
+        return fetchImportedTypeNameId(Storage::Synchronization::TypeNameKind::Exported,
+                                       sourceId,
+                                       typeName);
+    });
+
+    tracer.end(keyValue("imported type name id", importedTypeNameId));
+
+    return importedTypeNameId;
+}
+
+QVarLengthArray<PropertyDeclarationId, 128> ProjectStorage::propertyDeclarationIds(TypeId typeId) const
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"get property declaration ids"_t,
+                               projectStorageCategory(),
+                               keyValue("type id", typeId)};
+
+    auto propertyDeclarationIds = Sqlite::withDeferredTransaction(database, [&] {
+        return fetchPropertyDeclarationIds(typeId);
+    });
+
+    std::sort(propertyDeclarationIds.begin(), propertyDeclarationIds.end());
+
+    tracer.end(keyValue("property declaration ids", propertyDeclarationIds));
+
+    return propertyDeclarationIds;
+}
+
+QVarLengthArray<PropertyDeclarationId, 128> ProjectStorage::localPropertyDeclarationIds(TypeId typeId) const
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"get local property declaration ids"_t,
+                               projectStorageCategory(),
+                               keyValue("type id", typeId)};
+
+    auto propertyDeclarationIds = s->selectLocalPropertyDeclarationIdsForTypeStatement
+                                      .valuesWithTransaction<QVarLengthArray<PropertyDeclarationId, 128>>(
+                                          typeId);
+
+    tracer.end(keyValue("property declaration ids", propertyDeclarationIds));
+
+    return propertyDeclarationIds;
+}
+
+PropertyDeclarationId ProjectStorage::propertyDeclarationId(TypeId typeId,
+                                                            Utils::SmallStringView propertyName) const
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"get property declaration id"_t,
+                               projectStorageCategory(),
+                               keyValue("type id", typeId),
+                               keyValue("property name", propertyName)};
+
+    auto propertyDeclarationId = Sqlite::withDeferredTransaction(database, [&] {
+        return fetchPropertyDeclarationId(typeId, propertyName);
+    });
+
+    tracer.end(keyValue("property declaration id", propertyDeclarationId));
+
+    return propertyDeclarationId;
+}
+
+PropertyDeclarationId ProjectStorage::localPropertyDeclarationId(TypeId typeId,
+                                                                 Utils::SmallStringView propertyName) const
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"get local property declaration id"_t,
+                               projectStorageCategory(),
+                               keyValue("type id", typeId),
+                               keyValue("property name", propertyName)};
+
+    auto propertyDeclarationId = s->selectLocalPropertyDeclarationIdForTypeAndPropertyNameStatement
+                                     .valueWithTransaction<PropertyDeclarationId>(typeId,
+                                                                                  propertyName);
+
+    tracer.end(keyValue("property declaration id", propertyDeclarationId));
+
+    return propertyDeclarationId;
+}
+
+PropertyDeclarationId ProjectStorage::defaultPropertyDeclarationId(TypeId typeId) const
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"get default property declaration id"_t,
+                               projectStorageCategory(),
+                               keyValue("type id", typeId)};
+
+    auto propertyDeclarationId = Sqlite::withDeferredTransaction(database, [&] {
+        return fetchDefaultPropertyDeclarationId(typeId);
+    });
+
+    tracer.end(keyValue("property declaration id", propertyDeclarationId));
+
+    return propertyDeclarationId;
+}
+
+std::optional<Storage::Info::PropertyDeclaration> ProjectStorage::propertyDeclaration(
+    PropertyDeclarationId propertyDeclarationId) const
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"get property declaration"_t,
+                               projectStorageCategory(),
+                               keyValue("property declaration id", propertyDeclarationId)};
+
+    auto propertyDeclaration = s->selectPropertyDeclarationForPropertyDeclarationIdStatement
+                                   .optionalValueWithTransaction<Storage::Info::PropertyDeclaration>(
+                                       propertyDeclarationId);
+
+    tracer.end(keyValue("property declaration", propertyDeclaration));
+
+    return propertyDeclaration;
+}
+
+std::optional<Storage::Info::Type> ProjectStorage::type(TypeId typeId) const
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"get type"_t, projectStorageCategory(), keyValue("type id", typeId)};
+
+    auto type = s->selectInfoTypeByTypeIdStatement.optionalValueWithTransaction<Storage::Info::Type>(
+        typeId);
+
+    tracer.end(keyValue("type", type));
+
+    return type;
+}
+
+Utils::PathString ProjectStorage::typeIconPath(TypeId typeId) const
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"get type icon path"_t,
+                               projectStorageCategory(),
+                               keyValue("type id", typeId)};
+
+    auto typeIconPath = s->selectTypeIconPathStatement.valueWithTransaction<Utils::PathString>(typeId);
+
+    tracer.end(keyValue("type icon path", typeIconPath));
+
+    return typeIconPath;
+}
+
+Storage::Info::TypeHints ProjectStorage::typeHints(TypeId typeId) const
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"get type hints"_t,
+                               projectStorageCategory(),
+                               keyValue("type id", typeId)};
+
+    auto typeHints = s->selectTypeHintsStatement.valuesWithTransaction<Storage::Info::TypeHints, 4>(
+        typeId);
+
+    tracer.end(keyValue("type hints", typeHints));
+
+    return typeHints;
+}
+
+SmallSourceIds<4> ProjectStorage::typeAnnotationSourceIds(SourceId directoryId) const
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"get type annotaion source ids"_t,
+                               projectStorageCategory(),
+                               keyValue("source id", directoryId)};
+
+    auto sourceIds = s->selectTypeAnnotationSourceIdsStatement.valuesWithTransaction<SmallSourceIds<4>>(
+        directoryId);
+
+    tracer.end(keyValue("source ids", sourceIds));
+
+    return sourceIds;
+}
+
+SmallSourceIds<64> ProjectStorage::typeAnnotationDirectorySourceIds() const
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"get type annotaion source ids"_t, projectStorageCategory()};
+
+    auto sourceIds = s->selectTypeAnnotationDirectorySourceIdsStatement
+                         .valuesWithTransaction<SmallSourceIds<64>>();
+
+    tracer.end(keyValue("source ids", sourceIds));
+
+    return sourceIds;
+}
+
+Storage::Info::ItemLibraryEntries ProjectStorage::itemLibraryEntries(TypeId typeId) const
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"get item library entries  by type id"_t,
+                               projectStorageCategory(),
+                               keyValue("type id", typeId)};
+
+    using Storage::Info::ItemLibraryProperties;
+    Storage::Info::ItemLibraryEntries entries;
+
+    auto callback = [&](TypeId typeId_,
+                        Utils::SmallStringView name,
+                        Utils::SmallStringView iconPath,
+                        Utils::SmallStringView category,
+                        Utils::SmallStringView import,
+                        Utils::SmallStringView toolTip,
+                        Utils::SmallStringView properties,
+                        Utils::SmallStringView extraFilePaths,
+                        Utils::SmallStringView templatePath) {
+        auto &last = entries.emplace_back(typeId_, name, iconPath, category, import, toolTip, templatePath);
+        if (properties.size())
+            s->selectItemLibraryPropertiesStatement.readTo(last.properties, properties);
+        if (extraFilePaths.size())
+            s->selectItemLibraryExtraFilePathsStatement.readTo(last.extraFilePaths, extraFilePaths);
+    };
+
+    s->selectItemLibraryEntriesByTypeIdStatement.readCallbackWithTransaction(callback, typeId);
+
+    tracer.end(keyValue("item library entries", entries));
+
+    return entries;
+}
+
+Storage::Info::ItemLibraryEntries ProjectStorage::itemLibraryEntries(ImportId importId) const
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"get item library entries  by import id"_t,
+                               projectStorageCategory(),
+                               keyValue("import id", importId)};
+
+    using Storage::Info::ItemLibraryProperties;
+    Storage::Info::ItemLibraryEntries entries;
+
+    auto callback = [&](TypeId typeId_,
+                        Utils::SmallStringView name,
+                        Utils::SmallStringView iconPath,
+                        Utils::SmallStringView category,
+                        Utils::SmallStringView import,
+                        Utils::SmallStringView toolTip,
+                        Utils::SmallStringView properties,
+                        Utils::SmallStringView extraFilePaths,
+                        Utils::SmallStringView templatePath) {
+        auto &last = entries.emplace_back(typeId_, name, iconPath, category, import, toolTip, templatePath);
+        if (properties.size())
+            s->selectItemLibraryPropertiesStatement.readTo(last.properties, properties);
+        if (extraFilePaths.size())
+            s->selectItemLibraryExtraFilePathsStatement.readTo(last.extraFilePaths, extraFilePaths);
+    };
+
+    s->selectItemLibraryEntriesByTypeIdStatement.readCallbackWithTransaction(callback, importId);
+
+    tracer.end(keyValue("item library entries", entries));
+
+    return entries;
+}
+
+Storage::Info::ItemLibraryEntries ProjectStorage::itemLibraryEntries(SourceId sourceId) const
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"get item library entries by source id"_t,
+                               projectStorageCategory(),
+                               keyValue("source id", sourceId)};
+
+    using Storage::Info::ItemLibraryProperties;
+    Storage::Info::ItemLibraryEntries entries;
+
+    auto callback = [&](TypeId typeId,
+                        Utils::SmallStringView name,
+                        Utils::SmallStringView iconPath,
+                        Utils::SmallStringView category,
+                        Utils::SmallStringView import,
+                        Utils::SmallStringView toolTip,
+                        Utils::SmallStringView properties,
+                        Utils::SmallStringView extraFilePaths,
+                        Utils::SmallStringView templatePath) {
+        auto &last = entries.emplace_back(typeId, name, iconPath, category, import, toolTip, templatePath);
+        if (properties.size())
+            s->selectItemLibraryPropertiesStatement.readTo(last.properties, properties);
+        if (extraFilePaths.size())
+            s->selectItemLibraryExtraFilePathsStatement.readTo(last.extraFilePaths, extraFilePaths);
+    };
+
+    s->selectItemLibraryEntriesBySourceIdStatement.readCallbackWithTransaction(callback, sourceId);
+
+    tracer.end(keyValue("item library entries", entries));
+
+    return entries;
+}
+
+Storage::Info::ItemLibraryEntries ProjectStorage::allItemLibraryEntries() const
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"get all item library entries"_t, projectStorageCategory()};
+
+    using Storage::Info::ItemLibraryProperties;
+    Storage::Info::ItemLibraryEntries entries;
+
+    auto callback = [&](TypeId typeId,
+                        Utils::SmallStringView name,
+                        Utils::SmallStringView iconPath,
+                        Utils::SmallStringView category,
+                        Utils::SmallStringView import,
+                        Utils::SmallStringView toolTip,
+                        Utils::SmallStringView properties,
+                        Utils::SmallStringView extraFilePaths,
+                        Utils::SmallStringView templatePath) {
+        auto &last = entries.emplace_back(typeId, name, iconPath, category, import, toolTip, templatePath);
+        if (properties.size())
+            s->selectItemLibraryPropertiesStatement.readTo(last.properties, properties);
+        if (extraFilePaths.size())
+            s->selectItemLibraryExtraFilePathsStatement.readTo(last.extraFilePaths, extraFilePaths);
+    };
+
+    s->selectItemLibraryEntriesStatement.readCallbackWithTransaction(callback);
+
+    tracer.end(keyValue("item library entries", entries));
+
+    return entries;
+}
+
+std::vector<Utils::SmallString> ProjectStorage::signalDeclarationNames(TypeId typeId) const
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"get signal names"_t,
+                               projectStorageCategory(),
+                               keyValue("type id", typeId)};
+
+    auto signalDeclarationNames = s->selectSignalDeclarationNamesForTypeStatement
+                                      .valuesWithTransaction<Utils::SmallString, 32>(typeId);
+
+    tracer.end(keyValue("signal names", signalDeclarationNames));
+
+    return signalDeclarationNames;
+}
+
+std::vector<Utils::SmallString> ProjectStorage::functionDeclarationNames(TypeId typeId) const
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"get function names"_t,
+                               projectStorageCategory(),
+                               keyValue("type id", typeId)};
+
+    auto functionDeclarationNames = s->selectFuncionDeclarationNamesForTypeStatement
+                                        .valuesWithTransaction<Utils::SmallString, 32>(typeId);
+
+    tracer.end(keyValue("function names", functionDeclarationNames));
+
+    return functionDeclarationNames;
+}
+
+std::optional<Utils::SmallString> ProjectStorage::propertyName(
+    PropertyDeclarationId propertyDeclarationId) const
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"get property name"_t,
+                               projectStorageCategory(),
+                               keyValue("property declaration id", propertyDeclarationId)};
+
+    auto propertyName = s->selectPropertyNameStatement.optionalValueWithTransaction<Utils::SmallString>(
+        propertyDeclarationId);
+
+    tracer.end(keyValue("property name", propertyName));
+
+    return propertyName;
+}
+
+SmallTypeIds<16> ProjectStorage::prototypeIds(TypeId type) const
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"get prototypes"_t, projectStorageCategory(), keyValue("type id", type)};
+
+    auto prototypeIds = s->selectPrototypeAndExtensionIdsStatement
+                            .valuesWithTransaction<SmallTypeIds<16>>(type);
+
+    tracer.end(keyValue("type ids", prototypeIds));
+
+    return prototypeIds;
+}
+
+SmallTypeIds<16> ProjectStorage::prototypeAndSelfIds(TypeId typeId) const
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"get prototypes and self"_t, projectStorageCategory()};
+
+    SmallTypeIds<16> prototypeAndSelfIds;
+    prototypeAndSelfIds.push_back(typeId);
+
+    s->selectPrototypeAndExtensionIdsStatement.readToWithTransaction(prototypeAndSelfIds, typeId);
+
+    tracer.end(keyValue("type ids", prototypeAndSelfIds));
+
+    return prototypeAndSelfIds;
+}
+
+SmallTypeIds<64> ProjectStorage::heirIds(TypeId typeId) const
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"get heirs"_t, projectStorageCategory()};
+
+    auto heirIds = s->selectHeirTypeIdsStatement.valuesWithTransaction<SmallTypeIds<64>>(typeId);
+
+    tracer.end(keyValue("type ids", heirIds));
+
+    return heirIds;
+}
+
+bool ProjectStorage::isBasedOn(TypeId) const
+{
+    return false;
+}
+
+bool ProjectStorage::isBasedOn(TypeId typeId, TypeId id1) const
+{
+    return isBasedOn_(typeId, id1);
+}
+
+bool ProjectStorage::isBasedOn(TypeId typeId, TypeId id1, TypeId id2) const
+{
+    return isBasedOn_(typeId, id1, id2);
+}
+
+bool ProjectStorage::isBasedOn(TypeId typeId, TypeId id1, TypeId id2, TypeId id3) const
+{
+    return isBasedOn_(typeId, id1, id2, id3);
+}
+
+bool ProjectStorage::isBasedOn(TypeId typeId, TypeId id1, TypeId id2, TypeId id3, TypeId id4) const
+{
+    return isBasedOn_(typeId, id1, id2, id3, id4);
+}
+
+bool ProjectStorage::isBasedOn(TypeId typeId, TypeId id1, TypeId id2, TypeId id3, TypeId id4, TypeId id5) const
+{
+    return isBasedOn_(typeId, id1, id2, id3, id4, id5);
+}
+
+bool ProjectStorage::isBasedOn(
+    TypeId typeId, TypeId id1, TypeId id2, TypeId id3, TypeId id4, TypeId id5, TypeId id6) const
+{
+    return isBasedOn_(typeId, id1, id2, id3, id4, id5, id6);
+}
+
+bool ProjectStorage::isBasedOn(
+    TypeId typeId, TypeId id1, TypeId id2, TypeId id3, TypeId id4, TypeId id5, TypeId id6, TypeId id7) const
+{
+    return isBasedOn_(typeId, id1, id2, id3, id4, id5, id6, id7);
+}
+
+TypeId ProjectStorage::fetchTypeIdByExportedName(Utils::SmallStringView name) const
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"is based on"_t,
+                               projectStorageCategory(),
+                               keyValue("exported type name", name)};
+
+    auto typeId = s->selectTypeIdByExportedNameStatement.valueWithTransaction<TypeId>(name);
+
+    tracer.end(keyValue("type id", typeId));
+
+    return typeId;
+}
+
+TypeId ProjectStorage::fetchTypeIdByModuleIdsAndExportedName(ModuleIds moduleIds,
+                                                             Utils::SmallStringView name) const
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"fetch type id by module ids and exported name"_t,
+                               projectStorageCategory(),
+                               keyValue("module ids", NanotraceHR::array(moduleIds)),
+                               keyValue("exported type name", name)};
+    auto typeId = s->selectTypeIdByModuleIdsAndExportedNameStatement.valueWithTransaction<TypeId>(
+        static_cast<void *>(moduleIds.data()), static_cast<long long>(moduleIds.size()), name);
+
+    tracer.end(keyValue("type id", typeId));
+
+    return typeId;
+}
+
+TypeId ProjectStorage::fetchTypeIdByName(SourceId sourceId, Utils::SmallStringView name)
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"fetch type id by name"_t,
+                               projectStorageCategory(),
+                               keyValue("source id", sourceId),
+                               keyValue("internal type name", name)};
+
+    auto typeId = s->selectTypeIdBySourceIdAndNameStatement.valueWithTransaction<TypeId>(sourceId,
+                                                                                         name);
+
+    tracer.end(keyValue("type id", typeId));
+
+    return typeId;
+}
+
+Storage::Synchronization::Type ProjectStorage::fetchTypeByTypeId(TypeId typeId)
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"fetch type by type id"_t,
+                               projectStorageCategory(),
+                               keyValue("type id", typeId)};
+
+    auto type = Sqlite::withDeferredTransaction(database, [&] {
+        auto type = s->selectTypeByTypeIdStatement.value<Storage::Synchronization::Type>(typeId);
+
+        type.exportedTypes = fetchExportedTypes(typeId);
+        type.propertyDeclarations = fetchPropertyDeclarations(type.typeId);
+        type.functionDeclarations = fetchFunctionDeclarations(type.typeId);
+        type.signalDeclarations = fetchSignalDeclarations(type.typeId);
+        type.enumerationDeclarations = fetchEnumerationDeclarations(type.typeId);
+
+        return type;
+    });
+
+    tracer.end(keyValue("type", type));
+
+    return type;
+}
+
+Storage::Synchronization::Types ProjectStorage::fetchTypes()
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"fetch types"_t, projectStorageCategory()};
+
+    auto types = Sqlite::withDeferredTransaction(database, [&] {
+        auto types = s->selectTypesStatement.values<Storage::Synchronization::Type, 64>();
+
+        for (Storage::Synchronization::Type &type : types) {
+            type.exportedTypes = fetchExportedTypes(type.typeId);
+            type.propertyDeclarations = fetchPropertyDeclarations(type.typeId);
+            type.functionDeclarations = fetchFunctionDeclarations(type.typeId);
+            type.signalDeclarations = fetchSignalDeclarations(type.typeId);
+            type.enumerationDeclarations = fetchEnumerationDeclarations(type.typeId);
+        }
+
+        return types;
+    });
+
+    tracer.end(keyValue("type", types));
+
+    return types;
+}
+
+SourceContextId ProjectStorage::fetchSourceContextIdUnguarded(Utils::SmallStringView sourceContextPath)
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"fetch source context id unguarded"_t, projectStorageCategory()};
+
+    auto sourceContextId = readSourceContextId(sourceContextPath);
+
+    return sourceContextId ? sourceContextId : writeSourceContextId(sourceContextPath);
+}
+
+SourceContextId ProjectStorage::fetchSourceContextId(Utils::SmallStringView sourceContextPath)
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"fetch source context id"_t,
+                               projectStorageCategory(),
+                               keyValue("source context path", sourceContextPath)};
+
+    SourceContextId sourceContextId;
+    try {
+        sourceContextId = Sqlite::withDeferredTransaction(database, [&] {
+            return fetchSourceContextIdUnguarded(sourceContextPath);
+        });
+    } catch (const Sqlite::ConstraintPreventsModification &) {
+        sourceContextId = fetchSourceContextId(sourceContextPath);
+    }
+
+    tracer.end(keyValue("source context id", sourceContextId));
+
+    return sourceContextId;
+}
+
+Utils::PathString ProjectStorage::fetchSourceContextPath(SourceContextId sourceContextId) const
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"fetch source context path"_t,
+                               projectStorageCategory(),
+                               keyValue("source context id", sourceContextId)};
+
+    auto path = Sqlite::withDeferredTransaction(database, [&] {
+        auto optionalSourceContextPath = s->selectSourceContextPathFromSourceContextsBySourceContextIdStatement
+                                             .optionalValue<Utils::PathString>(sourceContextId);
+
+        if (!optionalSourceContextPath)
+            throw SourceContextIdDoesNotExists();
+
+        return std::move(*optionalSourceContextPath);
+    });
+
+    tracer.end(keyValue("source context path", path));
+
+    return path;
+}
+
+Cache::SourceContexts ProjectStorage::fetchAllSourceContexts() const
+{
+    NanotraceHR::Tracer tracer{"fetch all source contexts"_t, projectStorageCategory()};
+
+    return s->selectAllSourceContextsStatement.valuesWithTransaction<Cache::SourceContext, 128>();
+}
+
+SourceId ProjectStorage::fetchSourceId(SourceContextId sourceContextId,
+                                       Utils::SmallStringView sourceName)
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"fetch source id"_t,
+                               projectStorageCategory(),
+                               keyValue("source context id", sourceContextId),
+                               keyValue("source name", sourceName)};
+
+    auto sourceId = Sqlite::withDeferredTransaction(database, [&] {
+        return fetchSourceIdUnguarded(sourceContextId, sourceName);
+    });
+
+    tracer.end(keyValue("source id", sourceId));
+
+    return sourceId;
+}
+
+Cache::SourceNameAndSourceContextId ProjectStorage::fetchSourceNameAndSourceContextId(SourceId sourceId) const
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"fetch source name and source context id"_t,
+                               projectStorageCategory(),
+                               keyValue("source id", sourceId)};
+
+    auto value = s->selectSourceNameAndSourceContextIdFromSourcesBySourceIdStatement
+                     .valueWithTransaction<Cache::SourceNameAndSourceContextId>(sourceId);
+
+    if (!value.sourceContextId)
+        throw SourceIdDoesNotExists();
+
+    tracer.end(keyValue("source name", value.sourceName),
+               keyValue("source context id", value.sourceContextId));
+
+    return value;
+}
+
+void ProjectStorage::clearSources()
+{
+    Sqlite::withImmediateTransaction(database, [&] {
+        s->deleteAllSourceContextsStatement.execute();
+        s->deleteAllSourcesStatement.execute();
+    });
+}
+
+SourceContextId ProjectStorage::fetchSourceContextId(SourceId sourceId) const
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"fetch source context id"_t,
+                               projectStorageCategory(),
+                               keyValue("source id", sourceId)};
+
+    auto sourceContextId = s->selectSourceContextIdFromSourcesBySourceIdStatement
+                               .valueWithTransaction<SourceContextId>(sourceId);
+
+    if (!sourceContextId)
+        throw SourceIdDoesNotExists();
+
+    tracer.end(keyValue("source context id", sourceContextId));
+
+    return sourceContextId;
+}
+
+Cache::Sources ProjectStorage::fetchAllSources() const
+{
+    NanotraceHR::Tracer tracer{"fetch all sources"_t, projectStorageCategory()};
+
+    return s->selectAllSourcesStatement.valuesWithTransaction<Cache::Source, 1024>();
+}
+
+SourceId ProjectStorage::fetchSourceIdUnguarded(SourceContextId sourceContextId,
+                                                Utils::SmallStringView sourceName)
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"fetch source id unguarded"_t,
+                               projectStorageCategory(),
+                               keyValue("source context id", sourceContextId),
+                               keyValue("source name", sourceName)};
+
+    auto sourceId = readSourceId(sourceContextId, sourceName);
+
+    if (!sourceId)
+        sourceId = writeSourceId(sourceContextId, sourceName);
+
+    tracer.end(keyValue("source id", sourceId));
+
+    return sourceId;
+}
+
+FileStatuses ProjectStorage::fetchAllFileStatuses() const
+{
+    NanotraceHR::Tracer tracer{"fetch all file statuses"_t, projectStorageCategory()};
+
+    return s->selectAllFileStatusesStatement.valuesWithTransaction<FileStatus>();
+}
+
+FileStatus ProjectStorage::fetchFileStatus(SourceId sourceId) const
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"fetch file status"_t,
+                               projectStorageCategory(),
+                               keyValue("source id", sourceId)};
+
+    auto fileStatus = s->selectFileStatusesForSourceIdStatement.valueWithTransaction<FileStatus>(
+        sourceId);
+
+    tracer.end(keyValue("file status", fileStatus));
+
+    return fileStatus;
+}
+
+std::optional<Storage::Synchronization::ProjectData> ProjectStorage::fetchProjectData(SourceId sourceId) const
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"fetch project data"_t,
+                               projectStorageCategory(),
+                               keyValue("source id", sourceId)};
+
+    auto projectData = s->selectProjectDataForSourceIdStatement
+                           .optionalValueWithTransaction<Storage::Synchronization::ProjectData>(
+                               sourceId);
+
+    tracer.end(keyValue("project data", projectData));
+
+    return projectData;
+}
+
+Storage::Synchronization::ProjectDatas ProjectStorage::fetchProjectDatas(SourceId projectSourceId) const
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"fetch project datas by source id"_t,
+                               projectStorageCategory(),
+                               keyValue("source id", projectSourceId)};
+
+    auto projectDatas = s->selectProjectDatasForSourceIdStatement
+                            .valuesWithTransaction<Storage::Synchronization::ProjectData, 1024>(
+                                projectSourceId);
+
+    tracer.end(keyValue("project datas", projectDatas));
+
+    return projectDatas;
+}
+
+Storage::Synchronization::ProjectDatas ProjectStorage::fetchProjectDatas(
+    const SourceIds &projectSourceIds) const
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"fetch project datas by source ids"_t,
+                               projectStorageCategory(),
+                               keyValue("source ids", projectSourceIds)};
+
+    auto projectDatas = s->selectProjectDatasForSourceIdsStatement
+                            .valuesWithTransaction<Storage::Synchronization::ProjectData, 64>(
+                                toIntegers(projectSourceIds));
+
+    tracer.end(keyValue("project datas", projectDatas));
+
+    return projectDatas;
+}
+
+void ProjectStorage::setPropertyEditorPathId(TypeId typeId, SourceId pathId)
+{
+    Sqlite::ImmediateSessionTransaction transaction{database};
+
+    s->upsertPropertyEditorPathIdStatement.write(typeId, pathId);
+
+    transaction.commit();
+}
+
+SourceId ProjectStorage::propertyEditorPathId(TypeId typeId) const
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"property editor path id"_t,
+                               projectStorageCategory(),
+                               keyValue("type id", typeId)};
+
+    auto sourceId = s->selectPropertyEditorPathIdStatement.valueWithTransaction<SourceId>(typeId);
+
+    tracer.end(keyValue("source id", sourceId));
+
+    return sourceId;
+}
+
+Storage::Imports ProjectStorage::fetchDocumentImports() const
+{
+    NanotraceHR::Tracer tracer{"fetch document imports"_t, projectStorageCategory()};
+
+    return s->selectAllDocumentImportForSourceIdStatement.valuesWithTransaction<Storage::Imports>();
+}
+
+void ProjectStorage::resetForTestsOnly()
+{
+    database.clearAllTablesForTestsOnly();
+    commonTypeCache_.clearForTestsOnly();
+    moduleCache.clearForTestOnly();
+}
+
+bool ProjectStorage::moduleNameLess(Utils::SmallStringView first, Utils::SmallStringView second) noexcept
+{
+    return first < second;
+}
+
+ModuleId ProjectStorage::fetchModuleId(Utils::SmallStringView moduleName)
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"fetch module id"_t,
+                               projectStorageCategory(),
+                               keyValue("module name", moduleName)};
+
+    auto moduleId = Sqlite::withDeferredTransaction(database, [&] {
+        return fetchModuleIdUnguarded(moduleName);
+    });
+
+    tracer.end(keyValue("module id", moduleId));
+
+    return moduleId;
+}
+
+Utils::PathString ProjectStorage::fetchModuleName(ModuleId id)
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"fetch module name"_t,
+                               projectStorageCategory(),
+                               keyValue("module id", id)};
+
+    auto moduleName = Sqlite::withDeferredTransaction(database,
+                                                      [&] { return fetchModuleNameUnguarded(id); });
+
+    tracer.end(keyValue("module name", moduleName));
+
+    return moduleName;
+}
+
+ProjectStorage::Modules ProjectStorage::fetchAllModules() const
+{
+    NanotraceHR::Tracer tracer{"fetch all modules"_t, projectStorageCategory()};
+
+    return s->selectAllModulesStatement.valuesWithTransaction<Module, 128>();
+}
+
+void ProjectStorage::callRefreshMetaInfoCallback(const TypeIds &deletedTypeIds)
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"call refresh meta info callback"_t,
+                               projectStorageCategory(),
+                               keyValue("type ids", deletedTypeIds)};
+
+    if (deletedTypeIds.size()) {
+        for (ProjectStorageObserver *observer : observers)
+            observer->removedTypeIds(deletedTypeIds);
+    }
+}
+
+SourceIds ProjectStorage::filterSourceIdsWithoutType(const SourceIds &updatedSourceIds,
+                                                     SourceIds &sourceIdsOfTypes)
+{
+    std::sort(sourceIdsOfTypes.begin(), sourceIdsOfTypes.end());
+
+    SourceIds sourceIdsWithoutTypeSourceIds;
+    sourceIdsWithoutTypeSourceIds.reserve(updatedSourceIds.size());
+    std::set_difference(updatedSourceIds.begin(),
+                        updatedSourceIds.end(),
+                        sourceIdsOfTypes.begin(),
+                        sourceIdsOfTypes.end(),
+                        std::back_inserter(sourceIdsWithoutTypeSourceIds));
+
+    return sourceIdsWithoutTypeSourceIds;
+}
+
+TypeIds ProjectStorage::fetchTypeIds(const SourceIds &sourceIds)
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"fetch type ids"_t,
+                               projectStorageCategory(),
+                               keyValue("source ids", sourceIds)};
+
+    return s->selectTypeIdsForSourceIdsStatement.values<TypeId, 128>(toIntegers(sourceIds));
+}
+
+void ProjectStorage::unique(SourceIds &sourceIds)
+{
+    std::sort(sourceIds.begin(), sourceIds.end());
+    auto newEnd = std::unique(sourceIds.begin(), sourceIds.end());
+    sourceIds.erase(newEnd, sourceIds.end());
+}
+
+void ProjectStorage::synchronizeTypeTraits(TypeId typeId, Storage::TypeTraits traits)
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"synchronize type traits"_t,
+                               projectStorageCategory(),
+                               keyValue("type id", typeId),
+                               keyValue("type traits", traits)};
+
+    s->updateTypeAnnotationTraitStatement.write(typeId, traits.annotation);
+}
+
+void ProjectStorage::updateTypeIdInTypeAnnotations(Storage::Synchronization::TypeAnnotations &typeAnnotations)
+{
+    NanotraceHR::Tracer tracer{"update type id in type annotations"_t, projectStorageCategory()};
+
+    for (auto &annotation : typeAnnotations) {
+        annotation.typeId = fetchTypeIdByModuleIdAndExportedName(annotation.moduleId,
+                                                                 annotation.typeName);
+    }
+
+    for (auto &annotation : typeAnnotations) {
+        if (!annotation.typeId)
+            qWarning() << moduleName(annotation.moduleId).toQString()
+                       << annotation.typeName.toQString();
+    }
+
+    typeAnnotations.erase(std::remove_if(typeAnnotations.begin(),
+                                         typeAnnotations.end(),
+                                         [](const auto &annotation) { return !annotation.typeId; }),
+                          typeAnnotations.end());
+}
+
+void ProjectStorage::synchronizeTypeAnnotations(Storage::Synchronization::TypeAnnotations &typeAnnotations,
+                                                const SourceIds &updatedTypeAnnotationSourceIds)
+{
+    NanotraceHR::Tracer tracer{"synchronize type annotations"_t, projectStorageCategory()};
+
+    using Storage::Synchronization::TypeAnnotation;
+
+    updateTypeIdInTypeAnnotations(typeAnnotations);
+
+    auto compareKey = [](auto &&first, auto &&second) { return first.typeId - second.typeId; };
+
+    std::sort(typeAnnotations.begin(), typeAnnotations.end(), [&](auto &&first, auto &&second) {
+        return first.typeId < second.typeId;
+    });
+
+    auto range = s->selectTypeAnnotationsForSourceIdsStatement.range<TypeAnnotationView>(
+        toIntegers(updatedTypeAnnotationSourceIds));
+
+    auto insert = [&](const TypeAnnotation &annotation) {
+        if (!annotation.sourceId)
+            throw TypeAnnotationHasInvalidSourceId{};
+
+        synchronizeTypeTraits(annotation.typeId, annotation.traits);
+
+        using NanotraceHR::keyValue;
+        NanotraceHR::Tracer tracer{"insert type annotations"_t,
+                                   projectStorageCategory(),
+                                   keyValue("type annotation", annotation)};
+
+        s->insertTypeAnnotationStatement.write(annotation.typeId,
+                                               annotation.sourceId,
+                                               annotation.directorySourceId,
+                                               annotation.iconPath,
+                                               createEmptyAsNull(annotation.itemLibraryJson),
+                                               createEmptyAsNull(annotation.hintsJson));
+    };
+
+    auto update = [&](const TypeAnnotationView &annotationFromDatabase,
+                      const TypeAnnotation &annotation) {
+        synchronizeTypeTraits(annotation.typeId, annotation.traits);
+
+        if (annotationFromDatabase.iconPath != annotation.iconPath
+            || annotationFromDatabase.itemLibraryJson != annotation.itemLibraryJson
+            || annotationFromDatabase.hintsJson != annotation.hintsJson) {
+            using NanotraceHR::keyValue;
+            NanotraceHR::Tracer tracer{"update type annotations"_t,
+                                       projectStorageCategory(),
+                                       keyValue("type annotation from database",
+                                                annotationFromDatabase),
+                                       keyValue("type annotation", annotation)};
+
+            s->updateTypeAnnotationStatement.write(annotation.typeId,
+                                                   annotation.iconPath,
+                                                   createEmptyAsNull(annotation.itemLibraryJson),
+                                                   createEmptyAsNull(annotation.hintsJson));
+            return Sqlite::UpdateChange::Update;
+        }
+
+        return Sqlite::UpdateChange::No;
+    };
+
+    auto remove = [&](const TypeAnnotationView &annotationFromDatabase) {
+        synchronizeTypeTraits(annotationFromDatabase.typeId, Storage::TypeTraits{});
+
+        using NanotraceHR::keyValue;
+        NanotraceHR::Tracer tracer{"remove type annotations"_t,
+                                   projectStorageCategory(),
+                                   keyValue("type annotation", annotationFromDatabase)};
+
+        s->deleteTypeAnnotationStatement.write(annotationFromDatabase.typeId);
+    };
+
+    Sqlite::insertUpdateDelete(range, typeAnnotations, compareKey, insert, update, remove);
+}
+
+void ProjectStorage::synchronizeTypeTrait(const Storage::Synchronization::Type &type)
+{
+    s->updateTypeTraitStatement.write(type.typeId, type.traits.type);
+}
+
+void ProjectStorage::synchronizeTypes(Storage::Synchronization::Types &types,
+                                      TypeIds &updatedTypeIds,
+                                      AliasPropertyDeclarations &insertedAliasPropertyDeclarations,
+                                      AliasPropertyDeclarations &updatedAliasPropertyDeclarations,
+                                      AliasPropertyDeclarations &relinkableAliasPropertyDeclarations,
+                                      PropertyDeclarations &relinkablePropertyDeclarations,
+                                      Prototypes &relinkablePrototypes,
+                                      Prototypes &relinkableExtensions,
+                                      const SourceIds &updatedSourceIds)
+{
+    NanotraceHR::Tracer tracer{"synchronize types"_t, projectStorageCategory()};
+
+    Storage::Synchronization::ExportedTypes exportedTypes;
+    exportedTypes.reserve(types.size() * 3);
+    SourceIds sourceIdsOfTypes;
+    sourceIdsOfTypes.reserve(updatedSourceIds.size());
+    SourceIds notUpdatedExportedSourceIds;
+    notUpdatedExportedSourceIds.reserve(updatedSourceIds.size());
+    SourceIds exportedSourceIds;
+    exportedSourceIds.reserve(types.size());
+
+    for (auto &type : types) {
+        if (!type.sourceId)
+            throw TypeHasInvalidSourceId{};
+
+        TypeId typeId = declareType(type);
+        synchronizeTypeTrait(type);
+        sourceIdsOfTypes.push_back(type.sourceId);
+        updatedTypeIds.push_back(typeId);
+        if (type.changeLevel != Storage::Synchronization::ChangeLevel::ExcludeExportedTypes) {
+            exportedSourceIds.push_back(type.sourceId);
+            extractExportedTypes(typeId, type, exportedTypes);
+        }
+    }
+
+    std::sort(types.begin(), types.end(), [](const auto &first, const auto &second) {
+        return first.typeId < second.typeId;
+    });
+
+    unique(exportedSourceIds);
+
+    SourceIds sourceIdsWithoutType = filterSourceIdsWithoutType(updatedSourceIds, sourceIdsOfTypes);
+    exportedSourceIds.insert(exportedSourceIds.end(),
+                             sourceIdsWithoutType.begin(),
+                             sourceIdsWithoutType.end());
+    TypeIds exportedTypeIds = fetchTypeIds(exportedSourceIds);
+    synchronizeExportedTypes(exportedTypeIds,
+                             exportedTypes,
+                             relinkableAliasPropertyDeclarations,
+                             relinkablePropertyDeclarations,
+                             relinkablePrototypes,
+                             relinkableExtensions);
+
+    syncPrototypesAndExtensions(types, relinkablePrototypes, relinkableExtensions);
+    resetDefaultPropertiesIfChanged(types);
+    resetRemovedAliasPropertyDeclarationsToNull(types, relinkableAliasPropertyDeclarations);
+    syncDeclarations(types,
+                     insertedAliasPropertyDeclarations,
+                     updatedAliasPropertyDeclarations,
+                     relinkablePropertyDeclarations);
+    syncDefaultProperties(types);
+}
+
+void ProjectStorage::synchronizeProjectDatas(Storage::Synchronization::ProjectDatas &projectDatas,
+                                             const SourceIds &updatedProjectSourceIds)
+{
+    NanotraceHR::Tracer tracer{"synchronize project datas"_t, projectStorageCategory()};
+
+    auto compareKey = [](auto &&first, auto &&second) {
+        auto projectSourceIdDifference = first.projectSourceId - second.projectSourceId;
+        if (projectSourceIdDifference != 0)
+            return projectSourceIdDifference;
+
+        return first.sourceId - second.sourceId;
+    };
+
+    std::sort(projectDatas.begin(), projectDatas.end(), [&](auto &&first, auto &&second) {
+        return std::tie(first.projectSourceId, first.sourceId)
+               < std::tie(second.projectSourceId, second.sourceId);
+    });
+
+    auto range = s->selectProjectDatasForSourceIdsStatement.range<Storage::Synchronization::ProjectData>(
+        toIntegers(updatedProjectSourceIds));
+
+    auto insert = [&](const Storage::Synchronization::ProjectData &projectData) {
+        using NanotraceHR::keyValue;
+        NanotraceHR::Tracer tracer{"insert project data"_t,
+                                   projectStorageCategory(),
+                                   keyValue("project data", projectData)};
+
+        if (!projectData.projectSourceId)
+            throw ProjectDataHasInvalidProjectSourceId{};
+        if (!projectData.sourceId)
+            throw ProjectDataHasInvalidSourceId{};
+
+        s->insertProjectDataStatement.write(projectData.projectSourceId,
+                                            projectData.sourceId,
+                                            projectData.moduleId,
+                                            projectData.fileType);
+    };
+
+    auto update = [&](const Storage::Synchronization::ProjectData &projectDataFromDatabase,
+                      const Storage::Synchronization::ProjectData &projectData) {
+        if (projectDataFromDatabase.fileType != projectData.fileType
+            || !compareInvalidAreTrue(projectDataFromDatabase.moduleId, projectData.moduleId)) {
+            using NanotraceHR::keyValue;
+            NanotraceHR::Tracer tracer{"update project data"_t,
+                                       projectStorageCategory(),
+                                       keyValue("project data", projectData),
+                                       keyValue("project data from database", projectDataFromDatabase)};
+
+            s->updateProjectDataStatement.write(projectData.projectSourceId,
+                                                projectData.sourceId,
+                                                projectData.moduleId,
+                                                projectData.fileType);
+            return Sqlite::UpdateChange::Update;
+        }
+
+        return Sqlite::UpdateChange::No;
+    };
+
+    auto remove = [&](const Storage::Synchronization::ProjectData &projectData) {
+        using NanotraceHR::keyValue;
+        NanotraceHR::Tracer tracer{"remove project data"_t,
+                                   projectStorageCategory(),
+                                   keyValue("project data", projectData)};
+
+        s->deleteProjectDataStatement.write(projectData.projectSourceId, projectData.sourceId);
+    };
+
+    Sqlite::insertUpdateDelete(range, projectDatas, compareKey, insert, update, remove);
+}
+
+void ProjectStorage::synchronizeFileStatuses(FileStatuses &fileStatuses,
+                                             const SourceIds &updatedSourceIds)
+{
+    NanotraceHR::Tracer tracer{"synchronize file statuses"_t, projectStorageCategory()};
+
+    auto compareKey = [](auto &&first, auto &&second) { return first.sourceId - second.sourceId; };
+
+    std::sort(fileStatuses.begin(), fileStatuses.end(), [&](auto &&first, auto &&second) {
+        return first.sourceId < second.sourceId;
+    });
+
+    auto range = s->selectFileStatusesForSourceIdsStatement.range<FileStatus>(
+        toIntegers(updatedSourceIds));
+
+    auto insert = [&](const FileStatus &fileStatus) {
+        using NanotraceHR::keyValue;
+        NanotraceHR::Tracer tracer{"insert file status"_t,
+                                   projectStorageCategory(),
+                                   keyValue("file status", fileStatus)};
+
+        if (!fileStatus.sourceId)
+            throw FileStatusHasInvalidSourceId{};
+        s->insertFileStatusStatement.write(fileStatus.sourceId,
+                                           fileStatus.size,
+                                           fileStatus.lastModified);
+    };
+
+    auto update = [&](const FileStatus &fileStatusFromDatabase, const FileStatus &fileStatus) {
+        if (fileStatusFromDatabase.lastModified != fileStatus.lastModified
+            || fileStatusFromDatabase.size != fileStatus.size) {
+            using NanotraceHR::keyValue;
+            NanotraceHR::Tracer tracer{"update file status"_t,
+                                       projectStorageCategory(),
+                                       keyValue("file status", fileStatus),
+                                       keyValue("file status from database", fileStatusFromDatabase)};
+
+            s->updateFileStatusStatement.write(fileStatus.sourceId,
+                                               fileStatus.size,
+                                               fileStatus.lastModified);
+            return Sqlite::UpdateChange::Update;
+        }
+
+        return Sqlite::UpdateChange::No;
+    };
+
+    auto remove = [&](const FileStatus &fileStatus) {
+        using NanotraceHR::keyValue;
+        NanotraceHR::Tracer tracer{"remove file status"_t,
+                                   projectStorageCategory(),
+                                   keyValue("file status", fileStatus)};
+
+        s->deleteFileStatusStatement.write(fileStatus.sourceId);
+    };
+
+    Sqlite::insertUpdateDelete(range, fileStatuses, compareKey, insert, update, remove);
+}
+
+void ProjectStorage::synchronizeImports(Storage::Imports &imports,
+                                        const SourceIds &updatedSourceIds,
+                                        Storage::Imports &moduleDependencies,
+                                        const SourceIds &updatedModuleDependencySourceIds,
+                                        Storage::Synchronization::ModuleExportedImports &moduleExportedImports,
+                                        const ModuleIds &updatedModuleIds)
+{
+    NanotraceHR::Tracer tracer{"synchronize imports"_t, projectStorageCategory()};
 
-template class QmlDesigner::ProjectStorage<Sqlite::Database>;
+    synchromizeModuleExportedImports(moduleExportedImports, updatedModuleIds);
+    NanotraceHR::Tracer importTracer{"synchronize qml document imports"_t, projectStorageCategory()};
+    synchronizeDocumentImports(imports, updatedSourceIds, Storage::Synchronization::ImportKind::Import);
+    importTracer.end();
+    NanotraceHR::Tracer moduleDependenciesTracer{"synchronize module depdencies"_t,
+                                                 projectStorageCategory()};
+    synchronizeDocumentImports(moduleDependencies,
+                               updatedModuleDependencySourceIds,
+                               Storage::Synchronization::ImportKind::ModuleDependency);
+    moduleDependenciesTracer.end();
+}
+
+void ProjectStorage::synchromizeModuleExportedImports(
+    Storage::Synchronization::ModuleExportedImports &moduleExportedImports,
+    const ModuleIds &updatedModuleIds)
+{
+    NanotraceHR::Tracer tracer{"synchronize module exported imports"_t, projectStorageCategory()};
+    std::sort(moduleExportedImports.begin(),
+              moduleExportedImports.end(),
+              [](auto &&first, auto &&second) {
+                  return std::tie(first.moduleId, first.exportedModuleId)
+                         < std::tie(second.moduleId, second.exportedModuleId);
+              });
+
+    auto range = s->selectModuleExportedImportsForSourceIdStatement
+                     .range<Storage::Synchronization::ModuleExportedImportView>(
+                         toIntegers(updatedModuleIds));
+
+    auto compareKey = [](const Storage::Synchronization::ModuleExportedImportView &view,
+                         const Storage::Synchronization::ModuleExportedImport &import) -> long long {
+        auto moduleIdDifference = view.moduleId - import.moduleId;
+        if (moduleIdDifference != 0)
+            return moduleIdDifference;
+
+        return view.exportedModuleId - import.exportedModuleId;
+    };
+
+    auto insert = [&](const Storage::Synchronization::ModuleExportedImport &import) {
+        using NanotraceHR::keyValue;
+        NanotraceHR::Tracer tracer{"insert module exported import"_t,
+                                   projectStorageCategory(),
+                                   keyValue("module exported import", import),
+                                   keyValue("module id", import.moduleId)};
+        tracer.tick("exported module"_t, keyValue("module id", import.exportedModuleId));
+
+        if (import.version.minor) {
+            s->insertModuleExportedImportWithVersionStatement.write(import.moduleId,
+                                                                    import.exportedModuleId,
+                                                                    import.isAutoVersion,
+                                                                    import.version.major.value,
+                                                                    import.version.minor.value);
+        } else if (import.version.major) {
+            s->insertModuleExportedImportWithMajorVersionStatement.write(import.moduleId,
+                                                                         import.exportedModuleId,
+                                                                         import.isAutoVersion,
+                                                                         import.version.major.value);
+        } else {
+            s->insertModuleExportedImportWithoutVersionStatement.write(import.moduleId,
+                                                                       import.exportedModuleId,
+                                                                       import.isAutoVersion);
+        }
+    };
+
+    auto update = [](const Storage::Synchronization::ModuleExportedImportView &,
+                     const Storage::Synchronization::ModuleExportedImport &) {
+        return Sqlite::UpdateChange::No;
+    };
+
+    auto remove = [&](const Storage::Synchronization::ModuleExportedImportView &view) {
+        using NanotraceHR::keyValue;
+        NanotraceHR::Tracer tracer{"remove module exported import"_t,
+                                   projectStorageCategory(),
+                                   keyValue("module exported import view", view),
+                                   keyValue("module id", view.moduleId)};
+        tracer.tick("exported module"_t, keyValue("module id", view.exportedModuleId));
+
+        s->deleteModuleExportedImportStatement.write(view.moduleExportedImportId);
+    };
+
+    Sqlite::insertUpdateDelete(range, moduleExportedImports, compareKey, insert, update, remove);
+}
+
+ModuleId ProjectStorage::fetchModuleIdUnguarded(Utils::SmallStringView name) const
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"fetch module id ungarded"_t,
+                               projectStorageCategory(),
+                               keyValue("module name", name)};
+
+    auto moduleId = s->selectModuleIdByNameStatement.value<ModuleId>(name);
+
+    if (!moduleId)
+        moduleId = s->insertModuleNameStatement.value<ModuleId>(name);
+
+    tracer.end(keyValue("module id", moduleId));
+
+    return moduleId;
+}
+
+Utils::PathString ProjectStorage::fetchModuleNameUnguarded(ModuleId id) const
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"fetch module name ungarded"_t,
+                               projectStorageCategory(),
+                               keyValue("module id", id)};
+
+    auto moduleName = s->selectModuleNameStatement.value<Utils::PathString>(id);
+
+    if (moduleName.empty())
+        throw ModuleDoesNotExists{};
+
+    tracer.end(keyValue("module name", moduleName));
+
+    return moduleName;
+}
+
+void ProjectStorage::handleAliasPropertyDeclarationsWithPropertyType(
+    TypeId typeId, AliasPropertyDeclarations &relinkableAliasPropertyDeclarations)
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"handle alias property declarations with property type"_t,
+                               projectStorageCategory(),
+                               keyValue("type id", typeId),
+                               keyValue("relinkable alias property declarations",
+                                        relinkableAliasPropertyDeclarations)};
+
+    auto callback = [&](TypeId typeId_,
+                        PropertyDeclarationId propertyDeclarationId,
+                        ImportedTypeNameId propertyImportedTypeNameId,
+                        PropertyDeclarationId aliasPropertyDeclarationId,
+                        PropertyDeclarationId aliasPropertyDeclarationTailId) {
+        auto aliasPropertyName = s->selectPropertyNameStatement.value<Utils::SmallString>(
+            aliasPropertyDeclarationId);
+        Utils::SmallString aliasPropertyNameTail;
+        if (aliasPropertyDeclarationTailId)
+            aliasPropertyNameTail = s->selectPropertyNameStatement.value<Utils::SmallString>(
+                aliasPropertyDeclarationTailId);
+
+        relinkableAliasPropertyDeclarations.emplace_back(TypeId{typeId_},
+                                                         PropertyDeclarationId{propertyDeclarationId},
+                                                         ImportedTypeNameId{propertyImportedTypeNameId},
+                                                         std::move(aliasPropertyName),
+                                                         std::move(aliasPropertyNameTail));
+
+        s->updateAliasPropertyDeclarationToNullStatement.write(propertyDeclarationId);
+    };
+
+    s->selectAliasPropertiesDeclarationForPropertiesWithTypeIdStatement.readCallback(callback, typeId);
+}
+
+void ProjectStorage::handlePropertyDeclarationWithPropertyType(
+    TypeId typeId, PropertyDeclarations &relinkablePropertyDeclarations)
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"handle property declarations with property type"_t,
+                               projectStorageCategory(),
+                               keyValue("type id", typeId),
+                               keyValue("relinkable property declarations",
+                                        relinkablePropertyDeclarations)};
+
+    s->updatesPropertyDeclarationPropertyTypeToNullStatement.readTo(relinkablePropertyDeclarations,
+                                                                    typeId);
+}
+
+void ProjectStorage::handlePrototypes(TypeId prototypeId, Prototypes &relinkablePrototypes)
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"handle prototypes"_t,
+                               projectStorageCategory(),
+                               keyValue("type id", prototypeId),
+                               keyValue("relinkable prototypes", relinkablePrototypes)};
+
+    auto callback = [&](TypeId typeId, ImportedTypeNameId prototypeNameId) {
+        relinkablePrototypes.emplace_back(typeId, prototypeNameId);
+    };
+
+    s->updatePrototypeIdToNullStatement.readCallback(callback, prototypeId);
+}
+
+void ProjectStorage::handleExtensions(TypeId extensionId, Prototypes &relinkableExtensions)
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"handle extension"_t,
+                               projectStorageCategory(),
+                               keyValue("type id", extensionId),
+                               keyValue("relinkable extensions", relinkableExtensions)};
+
+    auto callback = [&](TypeId typeId, ImportedTypeNameId extensionNameId) {
+        relinkableExtensions.emplace_back(typeId, extensionNameId);
+    };
+
+    s->updateExtensionIdToNullStatement.readCallback(callback, extensionId);
+}
+
+void ProjectStorage::deleteType(TypeId typeId,
+                                AliasPropertyDeclarations &relinkableAliasPropertyDeclarations,
+                                PropertyDeclarations &relinkablePropertyDeclarations,
+                                Prototypes &relinkablePrototypes,
+                                Prototypes &relinkableExtensions)
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"delete type"_t, projectStorageCategory(), keyValue("type id", typeId)};
+
+    handlePropertyDeclarationWithPropertyType(typeId, relinkablePropertyDeclarations);
+    handleAliasPropertyDeclarationsWithPropertyType(typeId, relinkableAliasPropertyDeclarations);
+    handlePrototypes(typeId, relinkablePrototypes);
+    handleExtensions(typeId, relinkableExtensions);
+    s->deleteTypeNamesByTypeIdStatement.write(typeId);
+    s->deleteEnumerationDeclarationByTypeIdStatement.write(typeId);
+    s->deletePropertyDeclarationByTypeIdStatement.write(typeId);
+    s->deleteFunctionDeclarationByTypeIdStatement.write(typeId);
+    s->deleteSignalDeclarationByTypeIdStatement.write(typeId);
+    s->deleteTypeStatement.write(typeId);
+}
+
+void ProjectStorage::relinkAliasPropertyDeclarations(AliasPropertyDeclarations &aliasPropertyDeclarations,
+                                                     const TypeIds &deletedTypeIds)
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"relink alias properties"_t,
+                               projectStorageCategory(),
+                               keyValue("alias property declarations", aliasPropertyDeclarations),
+                               keyValue("deleted type ids", deletedTypeIds)};
+
+    std::sort(aliasPropertyDeclarations.begin(), aliasPropertyDeclarations.end());
+
+    Utils::set_greedy_difference(
+        aliasPropertyDeclarations.cbegin(),
+        aliasPropertyDeclarations.cend(),
+        deletedTypeIds.begin(),
+        deletedTypeIds.end(),
+        [&](const AliasPropertyDeclaration &alias) {
+            auto typeId = fetchTypeId(alias.aliasImportedTypeNameId);
+
+            if (!typeId)
+                throw TypeNameDoesNotExists{fetchImportedTypeName(alias.aliasImportedTypeNameId)};
+
+            auto [propertyTypeId, aliasId, propertyTraits] = fetchPropertyDeclarationByTypeIdAndNameUngarded(
+                typeId, alias.aliasPropertyName);
+
+            s->updatePropertyDeclarationWithAliasAndTypeStatement.write(alias.propertyDeclarationId,
+                                                                        propertyTypeId,
+                                                                        propertyTraits,
+                                                                        alias.aliasImportedTypeNameId,
+                                                                        aliasId);
+        },
+        TypeCompare<AliasPropertyDeclaration>{});
+}
+
+void ProjectStorage::relinkPropertyDeclarations(PropertyDeclarations &relinkablePropertyDeclaration,
+                                                const TypeIds &deletedTypeIds)
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"relink property declarations"_t,
+                               projectStorageCategory(),
+                               keyValue("relinkable property declarations",
+                                        relinkablePropertyDeclaration),
+                               keyValue("deleted type ids", deletedTypeIds)};
+
+    std::sort(relinkablePropertyDeclaration.begin(), relinkablePropertyDeclaration.end());
+
+    Utils::set_greedy_difference(
+        relinkablePropertyDeclaration.cbegin(),
+        relinkablePropertyDeclaration.cend(),
+        deletedTypeIds.begin(),
+        deletedTypeIds.end(),
+        [&](const PropertyDeclaration &property) {
+            TypeId propertyTypeId = fetchTypeId(property.importedTypeNameId);
+
+            if (!propertyTypeId)
+                throw TypeNameDoesNotExists{fetchImportedTypeName(property.importedTypeNameId)};
+
+            s->updatePropertyDeclarationTypeStatement.write(property.propertyDeclarationId,
+                                                            propertyTypeId);
+        },
+        TypeCompare<PropertyDeclaration>{});
+}
+
+void ProjectStorage::deleteNotUpdatedTypes(const TypeIds &updatedTypeIds,
+                                           const SourceIds &updatedSourceIds,
+                                           const TypeIds &typeIdsToBeDeleted,
+                                           AliasPropertyDeclarations &relinkableAliasPropertyDeclarations,
+                                           PropertyDeclarations &relinkablePropertyDeclarations,
+                                           Prototypes &relinkablePrototypes,
+                                           Prototypes &relinkableExtensions,
+                                           TypeIds &deletedTypeIds)
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"delete not updated types"_t,
+                               projectStorageCategory(),
+                               keyValue("updated type ids", updatedTypeIds),
+                               keyValue("updated source ids", updatedSourceIds),
+                               keyValue("type ids to be deleted", typeIdsToBeDeleted)};
+
+    auto callback = [&](TypeId typeId) {
+        deletedTypeIds.push_back(typeId);
+        deleteType(typeId,
+                   relinkableAliasPropertyDeclarations,
+                   relinkablePropertyDeclarations,
+                   relinkablePrototypes,
+                   relinkableExtensions);
+    };
+
+    s->selectNotUpdatedTypesInSourcesStatement.readCallback(callback,
+                                                            toIntegers(updatedSourceIds),
+                                                            toIntegers(updatedTypeIds));
+    for (TypeId typeIdToBeDeleted : typeIdsToBeDeleted)
+        callback(typeIdToBeDeleted);
+}
+
+void ProjectStorage::relink(AliasPropertyDeclarations &relinkableAliasPropertyDeclarations,
+                            PropertyDeclarations &relinkablePropertyDeclarations,
+                            Prototypes &relinkablePrototypes,
+                            Prototypes &relinkableExtensions,
+                            TypeIds &deletedTypeIds)
+{
+    NanotraceHR::Tracer tracer{"relink"_t, projectStorageCategory()};
+
+    std::sort(deletedTypeIds.begin(), deletedTypeIds.end());
+
+    relinkPrototypes(relinkablePrototypes, deletedTypeIds, [&](TypeId typeId, TypeId prototypeId) {
+        s->updateTypePrototypeStatement.write(typeId, prototypeId);
+    });
+    relinkPrototypes(relinkableExtensions, deletedTypeIds, [&](TypeId typeId, TypeId prototypeId) {
+        s->updateTypeExtensionStatement.write(typeId, prototypeId);
+    });
+    relinkPropertyDeclarations(relinkablePropertyDeclarations, deletedTypeIds);
+    relinkAliasPropertyDeclarations(relinkableAliasPropertyDeclarations, deletedTypeIds);
+}
+
+PropertyDeclarationId ProjectStorage::fetchAliasId(TypeId aliasTypeId,
+                                                   Utils::SmallStringView aliasPropertyName,
+                                                   Utils::SmallStringView aliasPropertyNameTail)
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"fetch alias id"_t,
+                               projectStorageCategory(),
+                               keyValue("alias type id", aliasTypeId),
+                               keyValue("alias property name", aliasPropertyName),
+                               keyValue("alias property name tail", aliasPropertyNameTail)};
+
+    if (aliasPropertyNameTail.empty())
+        return fetchPropertyDeclarationIdByTypeIdAndNameUngarded(aliasTypeId, aliasPropertyName);
+
+    auto stemAlias = fetchPropertyDeclarationByTypeIdAndNameUngarded(aliasTypeId, aliasPropertyName);
+
+    return fetchPropertyDeclarationIdByTypeIdAndNameUngarded(stemAlias.propertyTypeId,
+                                                             aliasPropertyNameTail);
+}
+
+void ProjectStorage::linkAliasPropertyDeclarationAliasIds(const AliasPropertyDeclarations &aliasDeclarations)
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"link alias property declarations alias ids"_t,
+                               projectStorageCategory(),
+                               keyValue("alias property declarations", aliasDeclarations)};
+
+    for (const auto &aliasDeclaration : aliasDeclarations) {
+        auto aliasTypeId = fetchTypeId(aliasDeclaration.aliasImportedTypeNameId);
+
+        if (!aliasTypeId) {
+            throw TypeNameDoesNotExists{
+                fetchImportedTypeName(aliasDeclaration.aliasImportedTypeNameId)};
+        }
+
+        auto aliasId = fetchAliasId(aliasTypeId,
+                                    aliasDeclaration.aliasPropertyName,
+                                    aliasDeclaration.aliasPropertyNameTail);
+
+        s->updatePropertyDeclarationAliasIdAndTypeNameIdStatement.write(
+            aliasDeclaration.propertyDeclarationId, aliasId, aliasDeclaration.aliasImportedTypeNameId);
+    }
+}
+
+void ProjectStorage::updateAliasPropertyDeclarationValues(const AliasPropertyDeclarations &aliasDeclarations)
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"update alias property declarations"_t,
+                               projectStorageCategory(),
+                               keyValue("alias property declarations", aliasDeclarations)};
+
+    for (const auto &aliasDeclaration : aliasDeclarations) {
+        s->updatetPropertiesDeclarationValuesOfAliasStatement.write(
+            aliasDeclaration.propertyDeclarationId);
+        s->updatePropertyAliasDeclarationRecursivelyStatement.write(
+            aliasDeclaration.propertyDeclarationId);
+    }
+}
+
+void ProjectStorage::checkAliasPropertyDeclarationCycles(const AliasPropertyDeclarations &aliasDeclarations)
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"check alias property declarations cycles"_t,
+                               projectStorageCategory(),
+                               keyValue("alias property declarations", aliasDeclarations)};
+    for (const auto &aliasDeclaration : aliasDeclarations)
+        checkForAliasChainCycle(aliasDeclaration.propertyDeclarationId);
+}
+
+void ProjectStorage::linkAliases(const AliasPropertyDeclarations &insertedAliasPropertyDeclarations,
+                                 const AliasPropertyDeclarations &updatedAliasPropertyDeclarations)
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"link aliases"_t, projectStorageCategory()};
+
+    linkAliasPropertyDeclarationAliasIds(insertedAliasPropertyDeclarations);
+    linkAliasPropertyDeclarationAliasIds(updatedAliasPropertyDeclarations);
+
+    checkAliasPropertyDeclarationCycles(insertedAliasPropertyDeclarations);
+    checkAliasPropertyDeclarationCycles(updatedAliasPropertyDeclarations);
+
+    updateAliasPropertyDeclarationValues(insertedAliasPropertyDeclarations);
+    updateAliasPropertyDeclarationValues(updatedAliasPropertyDeclarations);
+}
+
+void ProjectStorage::synchronizeExportedTypes(const TypeIds &updatedTypeIds,
+                                              Storage::Synchronization::ExportedTypes &exportedTypes,
+                                              AliasPropertyDeclarations &relinkableAliasPropertyDeclarations,
+                                              PropertyDeclarations &relinkablePropertyDeclarations,
+                                              Prototypes &relinkablePrototypes,
+                                              Prototypes &relinkableExtensions)
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"synchronize exported types"_t, projectStorageCategory()};
+
+    std::sort(exportedTypes.begin(), exportedTypes.end(), [](auto &&first, auto &&second) {
+        if (first.moduleId < second.moduleId)
+            return true;
+        else if (first.moduleId > second.moduleId)
+            return false;
+
+        auto nameCompare = Sqlite::compare(first.name, second.name);
+
+        if (nameCompare < 0)
+            return true;
+        else if (nameCompare > 0)
+            return false;
+
+        return first.version < second.version;
+    });
+
+    auto range = s->selectExportedTypesForSourceIdsStatement
+                     .range<Storage::Synchronization::ExportedTypeView>(toIntegers(updatedTypeIds));
+
+    auto compareKey = [](const Storage::Synchronization::ExportedTypeView &view,
+                         const Storage::Synchronization::ExportedType &type) -> long long {
+        auto moduleIdDifference = view.moduleId - type.moduleId;
+        if (moduleIdDifference != 0)
+            return moduleIdDifference;
+
+        auto nameDifference = Sqlite::compare(view.name, type.name);
+        if (nameDifference != 0)
+            return nameDifference;
+
+        auto versionDifference = view.version.major.value - type.version.major.value;
+        if (versionDifference != 0)
+            return versionDifference;
+
+        return view.version.minor.value - type.version.minor.value;
+    };
+
+    auto insert = [&](const Storage::Synchronization::ExportedType &type) {
+        using NanotraceHR::keyValue;
+        NanotraceHR::Tracer tracer{"insert exported type"_t,
+                                   projectStorageCategory(),
+                                   keyValue("exported type", type),
+                                   keyValue("type id", type.typeId),
+                                   keyValue("module id", type.moduleId)};
+        if (!type.moduleId)
+            throw QmlDesigner::ModuleDoesNotExists{};
+
+        try {
+            if (type.version) {
+                s->insertExportedTypeNamesWithVersionStatement.write(type.moduleId,
+                                                                     type.name,
+                                                                     type.version.major.value,
+                                                                     type.version.minor.value,
+                                                                     type.typeId);
+
+            } else if (type.version.major) {
+                s->insertExportedTypeNamesWithMajorVersionStatement.write(type.moduleId,
+                                                                          type.name,
+                                                                          type.version.major.value,
+                                                                          type.typeId);
+            } else {
+                s->insertExportedTypeNamesWithoutVersionStatement.write(type.moduleId,
+                                                                        type.name,
+                                                                        type.typeId);
+            }
+        } catch (const Sqlite::ConstraintPreventsModification &) {
+            throw QmlDesigner::ExportedTypeCannotBeInserted{type.name};
+        }
+    };
+
+    auto update = [&](const Storage::Synchronization::ExportedTypeView &view,
+                      const Storage::Synchronization::ExportedType &type) {
+        if (view.typeId != type.typeId) {
+            NanotraceHR::Tracer tracer{"update exported type"_t,
+                                       projectStorageCategory(),
+                                       keyValue("exported type", type),
+                                       keyValue("exported type view", view),
+                                       keyValue("type id", type.typeId),
+                                       keyValue("module id", type.typeId)};
+
+            handlePropertyDeclarationWithPropertyType(view.typeId, relinkablePropertyDeclarations);
+            handleAliasPropertyDeclarationsWithPropertyType(view.typeId,
+                                                            relinkableAliasPropertyDeclarations);
+            handlePrototypes(view.typeId, relinkablePrototypes);
+            handleExtensions(view.typeId, relinkableExtensions);
+            s->updateExportedTypeNameTypeIdStatement.write(view.exportedTypeNameId, type.typeId);
+            return Sqlite::UpdateChange::Update;
+        }
+        return Sqlite::UpdateChange::No;
+    };
+
+    auto remove = [&](const Storage::Synchronization::ExportedTypeView &view) {
+        NanotraceHR::Tracer tracer{"remove exported type"_t,
+                                   projectStorageCategory(),
+                                   keyValue("exported type", view),
+                                   keyValue("type id", view.typeId),
+                                   keyValue("module id", view.moduleId)};
+
+        handlePropertyDeclarationWithPropertyType(view.typeId, relinkablePropertyDeclarations);
+        handleAliasPropertyDeclarationsWithPropertyType(view.typeId,
+                                                        relinkableAliasPropertyDeclarations);
+        handlePrototypes(view.typeId, relinkablePrototypes);
+        handleExtensions(view.typeId, relinkableExtensions);
+        s->deleteExportedTypeNameStatement.write(view.exportedTypeNameId);
+    };
+
+    Sqlite::insertUpdateDelete(range, exportedTypes, compareKey, insert, update, remove);
+}
+
+void ProjectStorage::synchronizePropertyDeclarationsInsertAlias(
+    AliasPropertyDeclarations &insertedAliasPropertyDeclarations,
+    const Storage::Synchronization::PropertyDeclaration &value,
+    SourceId sourceId,
+    TypeId typeId)
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"insert property declaration to alias"_t,
+                               projectStorageCategory(),
+                               keyValue("property declaration", value)};
+
+    auto callback = [&](PropertyDeclarationId propertyDeclarationId) {
+        insertedAliasPropertyDeclarations.emplace_back(typeId,
+                                                       propertyDeclarationId,
+                                                       fetchImportedTypeNameId(value.typeName,
+                                                                               sourceId),
+                                                       value.aliasPropertyName,
+                                                       value.aliasPropertyNameTail);
+        return Sqlite::CallbackControl::Abort;
+    };
+
+    s->insertAliasPropertyDeclarationStatement.readCallback(callback, typeId, value.name);
+}
+
+QVarLengthArray<PropertyDeclarationId, 128> ProjectStorage::fetchPropertyDeclarationIds(
+    TypeId baseTypeId) const
+{
+    QVarLengthArray<PropertyDeclarationId, 128> propertyDeclarationIds;
+
+    s->selectLocalPropertyDeclarationIdsForTypeStatement.readTo(propertyDeclarationIds, baseTypeId);
+
+    auto range = s->selectPrototypeAndExtensionIdsStatement.range<TypeId>(baseTypeId);
+
+    for (TypeId prototype : range) {
+        s->selectLocalPropertyDeclarationIdsForTypeStatement.readTo(propertyDeclarationIds, prototype);
+    }
+
+    return propertyDeclarationIds;
+}
+
+PropertyDeclarationId ProjectStorage::fetchNextPropertyDeclarationId(
+    TypeId baseTypeId, Utils::SmallStringView propertyName) const
+{
+    auto range = s->selectPrototypeAndExtensionIdsStatement.range<TypeId>(baseTypeId);
+
+    for (TypeId prototype : range) {
+        auto propertyDeclarationId = s->selectPropertyDeclarationIdByTypeIdAndNameStatement
+                                         .value<PropertyDeclarationId>(prototype, propertyName);
+
+        if (propertyDeclarationId)
+            return propertyDeclarationId;
+    }
+
+    return PropertyDeclarationId{};
+}
+
+PropertyDeclarationId ProjectStorage::fetchPropertyDeclarationId(TypeId typeId,
+                                                                 Utils::SmallStringView propertyName) const
+{
+    auto propertyDeclarationId = s->selectPropertyDeclarationIdByTypeIdAndNameStatement
+                                     .value<PropertyDeclarationId>(typeId, propertyName);
+
+    if (propertyDeclarationId)
+        return propertyDeclarationId;
+
+    return fetchNextPropertyDeclarationId(typeId, propertyName);
+}
+
+PropertyDeclarationId ProjectStorage::fetchNextDefaultPropertyDeclarationId(TypeId baseTypeId) const
+{
+    auto range = s->selectPrototypeAndExtensionIdsStatement.range<TypeId>(baseTypeId);
+
+    for (TypeId prototype : range) {
+        auto propertyDeclarationId = s->selectDefaultPropertyDeclarationIdStatement
+                                         .value<PropertyDeclarationId>(prototype);
+
+        if (propertyDeclarationId)
+            return propertyDeclarationId;
+    }
+
+    return PropertyDeclarationId{};
+}
+
+PropertyDeclarationId ProjectStorage::fetchDefaultPropertyDeclarationId(TypeId typeId) const
+{
+    auto propertyDeclarationId = s->selectDefaultPropertyDeclarationIdStatement
+                                     .value<PropertyDeclarationId>(typeId);
+
+    if (propertyDeclarationId)
+        return propertyDeclarationId;
+
+    return fetchNextDefaultPropertyDeclarationId(typeId);
+}
+
+void ProjectStorage::synchronizePropertyDeclarationsInsertProperty(
+    const Storage::Synchronization::PropertyDeclaration &value, SourceId sourceId, TypeId typeId)
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"insert property declaration"_t,
+                               projectStorageCategory(),
+                               keyValue("property declaration", value)};
+
+    auto propertyImportedTypeNameId = fetchImportedTypeNameId(value.typeName, sourceId);
+    auto propertyTypeId = fetchTypeId(propertyImportedTypeNameId);
+
+    if (!propertyTypeId)
+        throw TypeNameDoesNotExists{fetchImportedTypeName(propertyImportedTypeNameId), sourceId};
+
+    auto propertyDeclarationId = s->insertPropertyDeclarationStatement.value<PropertyDeclarationId>(
+        typeId, value.name, propertyTypeId, value.traits, propertyImportedTypeNameId);
+
+    auto nextPropertyDeclarationId = fetchNextPropertyDeclarationId(typeId, value.name);
+    if (nextPropertyDeclarationId) {
+        s->updateAliasIdPropertyDeclarationStatement.write(nextPropertyDeclarationId,
+                                                           propertyDeclarationId);
+        s->updatePropertyAliasDeclarationRecursivelyWithTypeAndTraitsStatement
+            .write(propertyDeclarationId, propertyTypeId, value.traits);
+    }
+}
+
+void ProjectStorage::synchronizePropertyDeclarationsUpdateAlias(
+    AliasPropertyDeclarations &updatedAliasPropertyDeclarations,
+    const Storage::Synchronization::PropertyDeclarationView &view,
+    const Storage::Synchronization::PropertyDeclaration &value,
+    SourceId sourceId)
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"update property declaration to alias"_t,
+                               projectStorageCategory(),
+                               keyValue("property declaration", value),
+                               keyValue("property declaration view", view)};
+
+    updatedAliasPropertyDeclarations.emplace_back(view.typeId,
+                                                  view.id,
+                                                  fetchImportedTypeNameId(value.typeName, sourceId),
+                                                  value.aliasPropertyName,
+                                                  value.aliasPropertyNameTail,
+                                                  view.aliasId);
+}
+
+Sqlite::UpdateChange ProjectStorage::synchronizePropertyDeclarationsUpdateProperty(
+    const Storage::Synchronization::PropertyDeclarationView &view,
+    const Storage::Synchronization::PropertyDeclaration &value,
+    SourceId sourceId,
+    PropertyDeclarationIds &propertyDeclarationIds)
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"update property declaration"_t,
+                               projectStorageCategory(),
+                               keyValue("property declaration", value),
+                               keyValue("property declaration view", view)};
+
+    auto propertyImportedTypeNameId = fetchImportedTypeNameId(value.typeName, sourceId);
+
+    auto propertyTypeId = fetchTypeId(propertyImportedTypeNameId);
+
+    if (!propertyTypeId)
+        throw TypeNameDoesNotExists{fetchImportedTypeName(propertyImportedTypeNameId), sourceId};
+
+    if (view.traits == value.traits && propertyTypeId == view.typeId
+        && propertyImportedTypeNameId == view.typeNameId)
+        return Sqlite::UpdateChange::No;
+
+    s->updatePropertyDeclarationStatement.write(view.id,
+                                                propertyTypeId,
+                                                value.traits,
+                                                propertyImportedTypeNameId);
+    s->updatePropertyAliasDeclarationRecursivelyWithTypeAndTraitsStatement.write(view.id,
+                                                                                 propertyTypeId,
+                                                                                 value.traits);
+    propertyDeclarationIds.push_back(view.id);
+
+    tracer.end(keyValue("updated", "yes"));
+
+    return Sqlite::UpdateChange::Update;
+}
+
+void ProjectStorage::synchronizePropertyDeclarations(
+    TypeId typeId,
+    Storage::Synchronization::PropertyDeclarations &propertyDeclarations,
+    SourceId sourceId,
+    AliasPropertyDeclarations &insertedAliasPropertyDeclarations,
+    AliasPropertyDeclarations &updatedAliasPropertyDeclarations,
+    PropertyDeclarationIds &propertyDeclarationIds)
+{
+    NanotraceHR::Tracer tracer{"synchronize property declaration"_t, projectStorageCategory()};
+
+    std::sort(propertyDeclarations.begin(), propertyDeclarations.end(), [](auto &&first, auto &&second) {
+        return Sqlite::compare(first.name, second.name) < 0;
+    });
+
+    auto range = s->selectPropertyDeclarationsForTypeIdStatement
+                     .range<Storage::Synchronization::PropertyDeclarationView>(typeId);
+
+    auto compareKey = [](const Storage::Synchronization::PropertyDeclarationView &view,
+                         const Storage::Synchronization::PropertyDeclaration &value) {
+        return Sqlite::compare(view.name, value.name);
+    };
+
+    auto insert = [&](const Storage::Synchronization::PropertyDeclaration &value) {
+        if (value.kind == Storage::Synchronization::PropertyKind::Alias) {
+            synchronizePropertyDeclarationsInsertAlias(insertedAliasPropertyDeclarations,
+                                                       value,
+                                                       sourceId,
+                                                       typeId);
+        } else {
+            synchronizePropertyDeclarationsInsertProperty(value, sourceId, typeId);
+        }
+    };
+
+    auto update = [&](const Storage::Synchronization::PropertyDeclarationView &view,
+                      const Storage::Synchronization::PropertyDeclaration &value) {
+        if (value.kind == Storage::Synchronization::PropertyKind::Alias) {
+            synchronizePropertyDeclarationsUpdateAlias(updatedAliasPropertyDeclarations,
+                                                       view,
+                                                       value,
+                                                       sourceId);
+            propertyDeclarationIds.push_back(view.id);
+        } else {
+            return synchronizePropertyDeclarationsUpdateProperty(view,
+                                                                 value,
+                                                                 sourceId,
+                                                                 propertyDeclarationIds);
+        }
+
+        return Sqlite::UpdateChange::No;
+    };
+
+    auto remove = [&](const Storage::Synchronization::PropertyDeclarationView &view) {
+        using NanotraceHR::keyValue;
+        NanotraceHR::Tracer tracer{"remove property declaration"_t,
+                                   projectStorageCategory(),
+                                   keyValue("property declaratio viewn", view)};
+
+        auto nextPropertyDeclarationId = fetchNextPropertyDeclarationId(typeId, view.name);
+
+        if (nextPropertyDeclarationId) {
+            s->updateAliasPropertyDeclarationByAliasPropertyDeclarationIdStatement
+                .write(nextPropertyDeclarationId, view.id);
+        }
+
+        s->updateDefaultPropertyIdToNullStatement.write(view.id);
+        s->deletePropertyDeclarationStatement.write(view.id);
+        propertyDeclarationIds.push_back(view.id);
+    };
+
+    Sqlite::insertUpdateDelete(range, propertyDeclarations, compareKey, insert, update, remove);
+}
+
+void ProjectStorage::resetRemovedAliasPropertyDeclarationsToNull(
+    Storage::Synchronization::Type &type, PropertyDeclarationIds &propertyDeclarationIds)
+{
+    NanotraceHR::Tracer tracer{"reset removed alias property declaration to null"_t,
+                               projectStorageCategory()};
+
+    if (type.changeLevel == Storage::Synchronization::ChangeLevel::Minimal)
+        return;
+
+    Storage::Synchronization::PropertyDeclarations &aliasDeclarations = type.propertyDeclarations;
+
+    std::sort(aliasDeclarations.begin(), aliasDeclarations.end(), [](auto &&first, auto &&second) {
+        return Sqlite::compare(first.name, second.name) < 0;
+    });
+
+    auto range = s->selectPropertyDeclarationsWithAliasForTypeIdStatement
+                     .range<AliasPropertyDeclarationView>(type.typeId);
+
+    auto compareKey = [](const AliasPropertyDeclarationView &view,
+                         const Storage::Synchronization::PropertyDeclaration &value) {
+        return Sqlite::compare(view.name, value.name);
+    };
+
+    auto insert = [&](const Storage::Synchronization::PropertyDeclaration &) {};
+
+    auto update = [&](const AliasPropertyDeclarationView &,
+                      const Storage::Synchronization::PropertyDeclaration &) {
+        return Sqlite::UpdateChange::No;
+    };
+
+    auto remove = [&](const AliasPropertyDeclarationView &view) {
+        using NanotraceHR::keyValue;
+        NanotraceHR::Tracer tracer{"reset removed alias property declaration to null"_t,
+                                   projectStorageCategory(),
+                                   keyValue("alias property declaration view", view)};
+
+        s->updatePropertyDeclarationAliasIdToNullStatement.write(view.id);
+        propertyDeclarationIds.push_back(view.id);
+    };
+
+    Sqlite::insertUpdateDelete(range, aliasDeclarations, compareKey, insert, update, remove);
+}
+
+void ProjectStorage::resetRemovedAliasPropertyDeclarationsToNull(
+    Storage::Synchronization::Types &types,
+    AliasPropertyDeclarations &relinkableAliasPropertyDeclarations)
+{
+    NanotraceHR::Tracer tracer{"reset removed alias properties to null"_t, projectStorageCategory()};
+
+    PropertyDeclarationIds propertyDeclarationIds;
+    propertyDeclarationIds.reserve(types.size());
+
+    for (auto &&type : types)
+        resetRemovedAliasPropertyDeclarationsToNull(type, propertyDeclarationIds);
+
+    removeRelinkableEntries(relinkableAliasPropertyDeclarations,
+                            propertyDeclarationIds,
+                            PropertyCompare<AliasPropertyDeclaration>{});
+}
+
+ImportId ProjectStorage::insertDocumentImport(const Storage::Import &import,
+                                              Storage::Synchronization::ImportKind importKind,
+                                              ModuleId sourceModuleId,
+                                              ImportId parentImportId)
+{
+    if (import.version.minor) {
+        return s->insertDocumentImportWithVersionStatement.value<ImportId>(import.sourceId,
+                                                                           import.moduleId,
+                                                                           sourceModuleId,
+                                                                           importKind,
+                                                                           import.version.major.value,
+                                                                           import.version.minor.value,
+                                                                           parentImportId);
+    } else if (import.version.major) {
+        return s->insertDocumentImportWithMajorVersionStatement.value<ImportId>(import.sourceId,
+                                                                                import.moduleId,
+                                                                                sourceModuleId,
+                                                                                importKind,
+                                                                                import.version.major.value,
+                                                                                parentImportId);
+    } else {
+        return s->insertDocumentImportWithoutVersionStatement.value<ImportId>(import.sourceId,
+                                                                              import.moduleId,
+                                                                              sourceModuleId,
+                                                                              importKind,
+                                                                              parentImportId);
+    }
+}
+
+void ProjectStorage::synchronizeDocumentImports(Storage::Imports &imports,
+                                                const SourceIds &updatedSourceIds,
+                                                Storage::Synchronization::ImportKind importKind)
+{
+    std::sort(imports.begin(), imports.end(), [](auto &&first, auto &&second) {
+        return std::tie(first.sourceId, first.moduleId, first.version)
+               < std::tie(second.sourceId, second.moduleId, second.version);
+    });
+
+    auto range = s->selectDocumentImportForSourceIdStatement
+                     .range<Storage::Synchronization::ImportView>(toIntegers(updatedSourceIds),
+                                                                  importKind);
+
+    auto compareKey = [](const Storage::Synchronization::ImportView &view,
+                         const Storage::Import &import) -> long long {
+        auto sourceIdDifference = view.sourceId - import.sourceId;
+        if (sourceIdDifference != 0)
+            return sourceIdDifference;
+
+        auto moduleIdDifference = view.moduleId - import.moduleId;
+        if (moduleIdDifference != 0)
+            return moduleIdDifference;
+
+        auto versionDifference = view.version.major.value - import.version.major.value;
+        if (versionDifference != 0)
+            return versionDifference;
+
+        return view.version.minor.value - import.version.minor.value;
+    };
+
+    auto insert = [&](const Storage::Import &import) {
+        using NanotraceHR::keyValue;
+        NanotraceHR::Tracer tracer{"insert import"_t,
+                                   projectStorageCategory(),
+                                   keyValue("import", import),
+                                   keyValue("import kind", importKind),
+                                   keyValue("source id", import.sourceId),
+                                   keyValue("module id", import.moduleId)};
+
+        auto importId = insertDocumentImport(import, importKind, import.moduleId, ImportId{});
+        auto callback = [&](ModuleId exportedModuleId, int majorVersion, int minorVersion) {
+            Storage::Import additionImport{exportedModuleId,
+                                           Storage::Version{majorVersion, minorVersion},
+                                           import.sourceId};
+
+            auto exportedImportKind = importKind == Storage::Synchronization::ImportKind::Import
+                                          ? Storage::Synchronization::ImportKind::ModuleExportedImport
+                                          : Storage::Synchronization::ImportKind::ModuleExportedModuleDependency;
+
+            NanotraceHR::Tracer tracer{"insert indirect import"_t,
+                                       projectStorageCategory(),
+                                       keyValue("import", import),
+                                       keyValue("import kind", exportedImportKind),
+                                       keyValue("source id", import.sourceId),
+                                       keyValue("module id", import.moduleId)};
+
+            auto indirectImportId = insertDocumentImport(additionImport,
+                                                         exportedImportKind,
+                                                         import.moduleId,
+                                                         importId);
+
+            tracer.end(keyValue("import id", indirectImportId));
+        };
+
+        s->selectModuleExportedImportsForModuleIdStatement.readCallback(callback,
+                                                                        import.moduleId,
+                                                                        import.version.major.value,
+                                                                        import.version.minor.value);
+        tracer.end(keyValue("import id", importId));
+    };
+
+    auto update = [](const Storage::Synchronization::ImportView &, const Storage::Import &) {
+        return Sqlite::UpdateChange::No;
+    };
+
+    auto remove = [&](const Storage::Synchronization::ImportView &view) {
+        using NanotraceHR::keyValue;
+        NanotraceHR::Tracer tracer{"remove import"_t,
+                                   projectStorageCategory(),
+                                   keyValue("import", view),
+                                   keyValue("import id", view.importId),
+                                   keyValue("source id", view.sourceId),
+                                   keyValue("module id", view.moduleId)};
+
+        s->deleteDocumentImportStatement.write(view.importId);
+        s->deleteDocumentImportsWithParentImportIdStatement.write(view.sourceId, view.importId);
+    };
+
+    Sqlite::insertUpdateDelete(range, imports, compareKey, insert, update, remove);
+}
+
+Utils::PathString ProjectStorage::createJson(const Storage::Synchronization::ParameterDeclarations &parameters)
+{
+    NanotraceHR::Tracer tracer{"create json from parameter declarations"_t, projectStorageCategory()};
+
+    Utils::PathString json;
+    json.append("[");
+
+    Utils::SmallStringView comma{""};
+
+    for (const auto &parameter : parameters) {
+        json.append(comma);
+        comma = ",";
+        json.append(R"({"n":")");
+        json.append(parameter.name);
+        json.append(R"(","tn":")");
+        json.append(parameter.typeName);
+        if (parameter.traits == Storage::PropertyDeclarationTraits::None) {
+            json.append("\"}");
+        } else {
+            json.append(R"(","tr":)");
+            json.append(Utils::SmallString::number(to_underlying(parameter.traits)));
+            json.append("}");
+        }
+    }
+
+    json.append("]");
+
+    return json;
+}
+
+TypeId ProjectStorage::fetchTypeIdByModuleIdAndExportedName(ModuleId moduleId,
+                                                            Utils::SmallStringView name) const
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"fetch type id by module id and exported name"_t,
+                               projectStorageCategory(),
+                               keyValue("module id", moduleId),
+                               keyValue("exported name", name)};
+
+    return s->selectTypeIdByModuleIdAndExportedNameStatement.value<TypeId>(moduleId, name);
+}
+
+void ProjectStorage::addTypeIdToPropertyEditorQmlPaths(
+    Storage::Synchronization::PropertyEditorQmlPaths &paths)
+{
+    NanotraceHR::Tracer tracer{"add type id to property editor qml paths"_t, projectStorageCategory()};
+
+    for (auto &path : paths)
+        path.typeId = fetchTypeIdByModuleIdAndExportedName(path.moduleId, path.typeName);
+}
+
+void ProjectStorage::synchronizePropertyEditorPaths(Storage::Synchronization::PropertyEditorQmlPaths &paths,
+                                                    SourceIds updatedPropertyEditorQmlPathsSourceIds)
+{
+    using Storage::Synchronization::PropertyEditorQmlPath;
+    std::sort(paths.begin(), paths.end(), [](auto &&first, auto &&second) {
+        return first.typeId < second.typeId;
+    });
+
+    auto range = s->selectPropertyEditorPathsForForSourceIdsStatement.range<PropertyEditorQmlPathView>(
+        toIntegers(updatedPropertyEditorQmlPathsSourceIds));
+
+    auto compareKey = [](const PropertyEditorQmlPathView &view,
+                         const PropertyEditorQmlPath &value) -> long long {
+        return view.typeId - value.typeId;
+    };
+
+    auto insert = [&](const PropertyEditorQmlPath &path) {
+        using NanotraceHR::keyValue;
+        NanotraceHR::Tracer tracer{"insert property editor paths"_t,
+                                   projectStorageCategory(),
+                                   keyValue("property editor qml path", path)};
+
+        if (path.typeId)
+            s->insertPropertyEditorPathStatement.write(path.typeId, path.pathId, path.directoryId);
+    };
+
+    auto update = [&](const PropertyEditorQmlPathView &view, const PropertyEditorQmlPath &value) {
+        using NanotraceHR::keyValue;
+        NanotraceHR::Tracer tracer{"update property editor paths"_t,
+                                   projectStorageCategory(),
+                                   keyValue("property editor qml path", value),
+                                   keyValue("property editor qml path view", view)};
+
+        if (value.pathId != view.pathId || value.directoryId != view.directoryId) {
+            s->updatePropertyEditorPathsStatement.write(value.typeId, value.pathId, value.directoryId);
+
+            tracer.end(keyValue("updated", "yes"));
+
+            return Sqlite::UpdateChange::Update;
+        }
+        return Sqlite::UpdateChange::No;
+    };
+
+    auto remove = [&](const PropertyEditorQmlPathView &view) {
+        using NanotraceHR::keyValue;
+        NanotraceHR::Tracer tracer{"remove property editor paths"_t,
+                                   projectStorageCategory(),
+                                   keyValue("property editor qml path view", view)};
+
+        s->deletePropertyEditorPathStatement.write(view.typeId);
+    };
+
+    Sqlite::insertUpdateDelete(range, paths, compareKey, insert, update, remove);
+}
+
+void ProjectStorage::synchronizePropertyEditorQmlPaths(
+    Storage::Synchronization::PropertyEditorQmlPaths &paths,
+    SourceIds updatedPropertyEditorQmlPathsSourceIds)
+{
+    NanotraceHR::Tracer tracer{"synchronize property editor qml paths"_t, projectStorageCategory()};
+
+    addTypeIdToPropertyEditorQmlPaths(paths);
+    synchronizePropertyEditorPaths(paths, updatedPropertyEditorQmlPathsSourceIds);
+}
+
+void ProjectStorage::synchronizeFunctionDeclarations(
+    TypeId typeId, Storage::Synchronization::FunctionDeclarations &functionsDeclarations)
+{
+    NanotraceHR::Tracer tracer{"synchronize function declaration"_t, projectStorageCategory()};
+
+    std::sort(functionsDeclarations.begin(),
+              functionsDeclarations.end(),
+              [](auto &&first, auto &&second) {
+                  auto compare = Sqlite::compare(first.name, second.name);
+
+                  if (compare == 0) {
+                      Utils::PathString firstSignature{createJson(first.parameters)};
+                      Utils::PathString secondSignature{createJson(second.parameters)};
+
+                      return Sqlite::compare(firstSignature, secondSignature) < 0;
+                  }
+
+                  return compare < 0;
+              });
+
+    auto range = s->selectFunctionDeclarationsForTypeIdStatement
+                     .range<Storage::Synchronization::FunctionDeclarationView>(typeId);
+
+    auto compareKey = [](const Storage::Synchronization::FunctionDeclarationView &view,
+                         const Storage::Synchronization::FunctionDeclaration &value) {
+        auto nameKey = Sqlite::compare(view.name, value.name);
+        if (nameKey != 0)
+            return nameKey;
+
+        Utils::PathString valueSignature{createJson(value.parameters)};
+
+        return Sqlite::compare(view.signature, valueSignature);
+    };
+
+    auto insert = [&](const Storage::Synchronization::FunctionDeclaration &value) {
+        using NanotraceHR::keyValue;
+        NanotraceHR::Tracer tracer{"insert function declaration"_t,
+                                   projectStorageCategory(),
+                                   keyValue("function declaration", value)};
+
+        Utils::PathString signature{createJson(value.parameters)};
+
+        s->insertFunctionDeclarationStatement.write(typeId, value.name, value.returnTypeName, signature);
+    };
+
+    auto update = [&](const Storage::Synchronization::FunctionDeclarationView &view,
+                      const Storage::Synchronization::FunctionDeclaration &value) {
+        using NanotraceHR::keyValue;
+        NanotraceHR::Tracer tracer{"update function declaration"_t,
+                                   projectStorageCategory(),
+                                   keyValue("function declaration", value),
+                                   keyValue("function declaration view", view)};
+
+        Utils::PathString signature{createJson(value.parameters)};
+
+        if (value.returnTypeName == view.returnTypeName && signature == view.signature)
+            return Sqlite::UpdateChange::No;
+
+        s->updateFunctionDeclarationStatement.write(view.id, value.returnTypeName, signature);
+
+        tracer.end(keyValue("updated", "yes"));
+
+        return Sqlite::UpdateChange::Update;
+    };
+
+    auto remove = [&](const Storage::Synchronization::FunctionDeclarationView &view) {
+        using NanotraceHR::keyValue;
+        NanotraceHR::Tracer tracer{"remove function declaration"_t,
+                                   projectStorageCategory(),
+                                   keyValue("function declaration view", view)};
+
+        s->deleteFunctionDeclarationStatement.write(view.id);
+    };
+
+    Sqlite::insertUpdateDelete(range, functionsDeclarations, compareKey, insert, update, remove);
+}
+
+void ProjectStorage::synchronizeSignalDeclarations(
+    TypeId typeId, Storage::Synchronization::SignalDeclarations &signalDeclarations)
+{
+    NanotraceHR::Tracer tracer{"synchronize signal declaration"_t, projectStorageCategory()};
+
+    std::sort(signalDeclarations.begin(), signalDeclarations.end(), [](auto &&first, auto &&second) {
+        auto compare = Sqlite::compare(first.name, second.name);
+
+        if (compare == 0) {
+            Utils::PathString firstSignature{createJson(first.parameters)};
+            Utils::PathString secondSignature{createJson(second.parameters)};
+
+            return Sqlite::compare(firstSignature, secondSignature) < 0;
+        }
+
+        return compare < 0;
+    });
+
+    auto range = s->selectSignalDeclarationsForTypeIdStatement
+                     .range<Storage::Synchronization::SignalDeclarationView>(typeId);
+
+    auto compareKey = [](const Storage::Synchronization::SignalDeclarationView &view,
+                         const Storage::Synchronization::SignalDeclaration &value) {
+        auto nameKey = Sqlite::compare(view.name, value.name);
+        if (nameKey != 0)
+            return nameKey;
+
+        Utils::PathString valueSignature{createJson(value.parameters)};
+
+        return Sqlite::compare(view.signature, valueSignature);
+    };
+
+    auto insert = [&](const Storage::Synchronization::SignalDeclaration &value) {
+        using NanotraceHR::keyValue;
+        NanotraceHR::Tracer tracer{"insert signal declaration"_t,
+                                   projectStorageCategory(),
+                                   keyValue("signal declaration", value)};
+
+        Utils::PathString signature{createJson(value.parameters)};
+
+        s->insertSignalDeclarationStatement.write(typeId, value.name, signature);
+    };
+
+    auto update = [&]([[maybe_unused]] const Storage::Synchronization::SignalDeclarationView &view,
+                      [[maybe_unused]] const Storage::Synchronization::SignalDeclaration &value) {
+        return Sqlite::UpdateChange::No;
+    };
+
+    auto remove = [&](const Storage::Synchronization::SignalDeclarationView &view) {
+        using NanotraceHR::keyValue;
+        NanotraceHR::Tracer tracer{"remove signal declaration"_t,
+                                   projectStorageCategory(),
+                                   keyValue("signal declaration view", view)};
+
+        s->deleteSignalDeclarationStatement.write(view.id);
+    };
+
+    Sqlite::insertUpdateDelete(range, signalDeclarations, compareKey, insert, update, remove);
+}
+
+Utils::PathString ProjectStorage::createJson(
+    const Storage::Synchronization::EnumeratorDeclarations &enumeratorDeclarations)
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"create json from enumerator declarations"_t, projectStorageCategory()};
+
+    Utils::PathString json;
+    json.append("{");
+
+    Utils::SmallStringView comma{"\""};
+
+    for (const auto &enumerator : enumeratorDeclarations) {
+        json.append(comma);
+        comma = ",\"";
+        json.append(enumerator.name);
+        if (enumerator.hasValue) {
+            json.append("\":\"");
+            json.append(Utils::SmallString::number(enumerator.value));
+            json.append("\"");
+        } else {
+            json.append("\":null");
+        }
+    }
+
+    json.append("}");
+
+    return json;
+}
+
+void ProjectStorage::synchronizeEnumerationDeclarations(
+    TypeId typeId, Storage::Synchronization::EnumerationDeclarations &enumerationDeclarations)
+{
+    NanotraceHR::Tracer tracer{"synchronize enumeration declaration"_t, projectStorageCategory()};
+
+    std::sort(enumerationDeclarations.begin(),
+              enumerationDeclarations.end(),
+              [](auto &&first, auto &&second) {
+                  return Sqlite::compare(first.name, second.name) < 0;
+              });
+
+    auto range = s->selectEnumerationDeclarationsForTypeIdStatement
+                     .range<Storage::Synchronization::EnumerationDeclarationView>(typeId);
+
+    auto compareKey = [](const Storage::Synchronization::EnumerationDeclarationView &view,
+                         const Storage::Synchronization::EnumerationDeclaration &value) {
+        return Sqlite::compare(view.name, value.name);
+    };
+
+    auto insert = [&](const Storage::Synchronization::EnumerationDeclaration &value) {
+        using NanotraceHR::keyValue;
+        NanotraceHR::Tracer tracer{"insert enumeration declaration"_t,
+                                   projectStorageCategory(),
+                                   keyValue("enumeration declaration", value)};
+
+        Utils::PathString signature{createJson(value.enumeratorDeclarations)};
+
+        s->insertEnumerationDeclarationStatement.write(typeId, value.name, signature);
+    };
+
+    auto update = [&](const Storage::Synchronization::EnumerationDeclarationView &view,
+                      const Storage::Synchronization::EnumerationDeclaration &value) {
+        using NanotraceHR::keyValue;
+        NanotraceHR::Tracer tracer{"update enumeration declaration"_t,
+                                   projectStorageCategory(),
+                                   keyValue("enumeration declaration", value),
+                                   keyValue("enumeration declaration view", view)};
+
+        Utils::PathString enumeratorDeclarations{createJson(value.enumeratorDeclarations)};
+
+        if (enumeratorDeclarations == view.enumeratorDeclarations)
+            return Sqlite::UpdateChange::No;
+
+        s->updateEnumerationDeclarationStatement.write(view.id, enumeratorDeclarations);
+
+        tracer.end(keyValue("updated", "yes"));
+
+        return Sqlite::UpdateChange::Update;
+    };
+
+    auto remove = [&](const Storage::Synchronization::EnumerationDeclarationView &view) {
+        using NanotraceHR::keyValue;
+        NanotraceHR::Tracer tracer{"remove enumeration declaration"_t,
+                                   projectStorageCategory(),
+                                   keyValue("enumeration declaration view", view)};
+
+        s->deleteEnumerationDeclarationStatement.write(view.id);
+    };
+
+    Sqlite::insertUpdateDelete(range, enumerationDeclarations, compareKey, insert, update, remove);
+}
+
+void ProjectStorage::extractExportedTypes(TypeId typeId,
+                                          const Storage::Synchronization::Type &type,
+                                          Storage::Synchronization::ExportedTypes &exportedTypes)
+{
+    for (const auto &exportedType : type.exportedTypes)
+        exportedTypes.emplace_back(exportedType.name, exportedType.version, typeId, exportedType.moduleId);
+}
+
+TypeId ProjectStorage::declareType(Storage::Synchronization::Type &type)
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"declare type"_t,
+                               projectStorageCategory(),
+                               keyValue("source id", type.sourceId),
+                               keyValue("type name", type.typeName)};
+
+    if (type.typeName.isEmpty()) {
+        type.typeId = s->selectTypeIdBySourceIdStatement.value<TypeId>(type.sourceId);
+
+        tracer.end(keyValue("type id", type.typeId));
+
+        return type.typeId;
+    }
+
+    type.typeId = s->insertTypeStatement.value<TypeId>(type.sourceId, type.typeName);
+
+    if (!type.typeId)
+        type.typeId = s->selectTypeIdBySourceIdAndNameStatement.value<TypeId>(type.sourceId,
+                                                                              type.typeName);
+
+    tracer.end(keyValue("type id", type.typeId));
+
+    return type.typeId;
+}
+
+void ProjectStorage::syncDeclarations(Storage::Synchronization::Type &type,
+                                      AliasPropertyDeclarations &insertedAliasPropertyDeclarations,
+                                      AliasPropertyDeclarations &updatedAliasPropertyDeclarations,
+                                      PropertyDeclarationIds &propertyDeclarationIds)
+{
+    NanotraceHR::Tracer tracer{"synchronize declaration per type"_t, projectStorageCategory()};
+
+    if (type.changeLevel == Storage::Synchronization::ChangeLevel::Minimal)
+        return;
+
+    synchronizePropertyDeclarations(type.typeId,
+                                    type.propertyDeclarations,
+                                    type.sourceId,
+                                    insertedAliasPropertyDeclarations,
+                                    updatedAliasPropertyDeclarations,
+                                    propertyDeclarationIds);
+    synchronizeFunctionDeclarations(type.typeId, type.functionDeclarations);
+    synchronizeSignalDeclarations(type.typeId, type.signalDeclarations);
+    synchronizeEnumerationDeclarations(type.typeId, type.enumerationDeclarations);
+}
+
+void ProjectStorage::syncDeclarations(Storage::Synchronization::Types &types,
+                                      AliasPropertyDeclarations &insertedAliasPropertyDeclarations,
+                                      AliasPropertyDeclarations &updatedAliasPropertyDeclarations,
+                                      PropertyDeclarations &relinkablePropertyDeclarations)
+{
+    NanotraceHR::Tracer tracer{"synchronize declaration"_t, projectStorageCategory()};
+
+    PropertyDeclarationIds propertyDeclarationIds;
+    propertyDeclarationIds.reserve(types.size() * 10);
+
+    for (auto &&type : types)
+        syncDeclarations(type,
+                         insertedAliasPropertyDeclarations,
+                         updatedAliasPropertyDeclarations,
+                         propertyDeclarationIds);
+
+    removeRelinkableEntries(relinkablePropertyDeclarations,
+                            propertyDeclarationIds,
+                            PropertyCompare<PropertyDeclaration>{});
+}
+
+void ProjectStorage::syncDefaultProperties(Storage::Synchronization::Types &types)
+{
+    NanotraceHR::Tracer tracer{"synchronize default properties"_t, projectStorageCategory()};
+
+    auto range = s->selectTypesWithDefaultPropertyStatement.range<TypeWithDefaultPropertyView>();
+
+    auto compareKey = [](const TypeWithDefaultPropertyView &view,
+                         const Storage::Synchronization::Type &value) {
+        return view.typeId - value.typeId;
+    };
+
+    auto insert = [&](const Storage::Synchronization::Type &) {
+
+    };
+
+    auto update = [&](const TypeWithDefaultPropertyView &view,
+                      const Storage::Synchronization::Type &value) {
+        using NanotraceHR::keyValue;
+        NanotraceHR::Tracer tracer{"synchronize default properties by update"_t,
+                                   projectStorageCategory(),
+                                   keyValue("type id", value.typeId),
+                                   keyValue("value", value),
+                                   keyValue("view", view)};
+
+        PropertyDeclarationId valueDefaultPropertyId;
+        if (value.defaultPropertyName.size())
+            valueDefaultPropertyId = fetchPropertyDeclarationByTypeIdAndNameUngarded(value.typeId,
+                                                                                     value.defaultPropertyName)
+                                         .propertyDeclarationId;
+
+        if (compareInvalidAreTrue(valueDefaultPropertyId, view.defaultPropertyId))
+            return Sqlite::UpdateChange::No;
+
+        s->updateDefaultPropertyIdStatement.write(value.typeId, valueDefaultPropertyId);
+
+        tracer.end(keyValue("updated", "yes"),
+                   keyValue("default property id", valueDefaultPropertyId));
+
+        return Sqlite::UpdateChange::Update;
+    };
+
+    auto remove = [&](const TypeWithDefaultPropertyView &) {};
+
+    Sqlite::insertUpdateDelete(range, types, compareKey, insert, update, remove);
+}
+
+void ProjectStorage::resetDefaultPropertiesIfChanged(Storage::Synchronization::Types &types)
+{
+    NanotraceHR::Tracer tracer{"reset changed default properties"_t, projectStorageCategory()};
+
+    auto range = s->selectTypesWithDefaultPropertyStatement.range<TypeWithDefaultPropertyView>();
+
+    auto compareKey = [](const TypeWithDefaultPropertyView &view,
+                         const Storage::Synchronization::Type &value) {
+        return view.typeId - value.typeId;
+    };
+
+    auto insert = [&](const Storage::Synchronization::Type &) {
+
+    };
+
+    auto update = [&](const TypeWithDefaultPropertyView &view,
+                      const Storage::Synchronization::Type &value) {
+        using NanotraceHR::keyValue;
+        NanotraceHR::Tracer tracer{"reset changed default properties by update"_t,
+                                   projectStorageCategory(),
+                                   keyValue("type id", value.typeId),
+                                   keyValue("value", value),
+                                   keyValue("view", view)};
+
+        PropertyDeclarationId valueDefaultPropertyId;
+        if (value.defaultPropertyName.size()) {
+            auto optionalValueDefaultPropertyId = fetchOptionalPropertyDeclarationByTypeIdAndNameUngarded(
+                value.typeId, value.defaultPropertyName);
+            if (optionalValueDefaultPropertyId)
+                valueDefaultPropertyId = optionalValueDefaultPropertyId->propertyDeclarationId;
+        }
+
+        if (compareInvalidAreTrue(valueDefaultPropertyId, view.defaultPropertyId))
+            return Sqlite::UpdateChange::No;
+
+        s->updateDefaultPropertyIdStatement.write(value.typeId, Sqlite::NullValue{});
+
+        tracer.end(keyValue("updated", "yes"));
+
+        return Sqlite::UpdateChange::Update;
+    };
+
+    auto remove = [&](const TypeWithDefaultPropertyView &) {};
+
+    Sqlite::insertUpdateDelete(range, types, compareKey, insert, update, remove);
+}
+
+void ProjectStorage::checkForPrototypeChainCycle(TypeId typeId) const
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"check for prototype chain cycle"_t,
+                               projectStorageCategory(),
+                               keyValue("type id", typeId)};
+
+    auto callback = [=](TypeId currentTypeId) {
+        if (typeId == currentTypeId)
+            throw PrototypeChainCycle{};
+    };
+
+    s->selectPrototypeAndExtensionIdsStatement.readCallback(callback, typeId);
+}
+
+void ProjectStorage::checkForAliasChainCycle(PropertyDeclarationId propertyDeclarationId) const
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"check for alias chain cycle"_t,
+                               projectStorageCategory(),
+                               keyValue("property declaration id", propertyDeclarationId)};
+    auto callback = [=](PropertyDeclarationId currentPropertyDeclarationId) {
+        if (propertyDeclarationId == currentPropertyDeclarationId)
+            throw AliasChainCycle{};
+    };
+
+    s->selectPropertyDeclarationIdsForAliasChainStatement.readCallback(callback,
+                                                                       propertyDeclarationId);
+}
+
+std::pair<TypeId, ImportedTypeNameId> ProjectStorage::fetchImportedTypeNameIdAndTypeId(
+    const Storage::Synchronization::ImportedTypeName &typeName, SourceId sourceId)
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"fetch imported type name id and type id"_t,
+                               projectStorageCategory(),
+                               keyValue("imported type name", typeName),
+                               keyValue("source id", sourceId)};
+
+    TypeId typeId;
+    ImportedTypeNameId typeNameId;
+    if (!std::visit([](auto &&typeName_) -> bool { return typeName_.name.isEmpty(); }, typeName)) {
+        typeNameId = fetchImportedTypeNameId(typeName, sourceId);
+
+        typeId = fetchTypeId(typeNameId);
+
+        tracer.end(keyValue("type id", typeId), keyValue("type name id", typeNameId));
+
+        if (!typeId)
+            throw TypeNameDoesNotExists{fetchImportedTypeName(typeNameId), sourceId};
+    }
+
+    return {typeId, typeNameId};
+}
+
+void ProjectStorage::syncPrototypeAndExtension(Storage::Synchronization::Type &type, TypeIds &typeIds)
+{
+    if (type.changeLevel == Storage::Synchronization::ChangeLevel::Minimal)
+        return;
+
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"synchronize prototype and extension"_t,
+                               projectStorageCategory(),
+                               keyValue("prototype", type.prototype),
+                               keyValue("extension", type.extension),
+                               keyValue("type id", type.typeId),
+                               keyValue("source id", type.sourceId)};
+
+    auto [prototypeId, prototypeTypeNameId] = fetchImportedTypeNameIdAndTypeId(type.prototype,
+                                                                               type.sourceId);
+    auto [extensionId, extensionTypeNameId] = fetchImportedTypeNameIdAndTypeId(type.extension,
+                                                                               type.sourceId);
+
+    s->updatePrototypeAndExtensionStatement.write(type.typeId,
+                                                  prototypeId,
+                                                  prototypeTypeNameId,
+                                                  extensionId,
+                                                  extensionTypeNameId);
+
+    if (prototypeId || extensionId)
+        checkForPrototypeChainCycle(type.typeId);
+
+    typeIds.push_back(type.typeId);
+
+    tracer.end(keyValue("prototype id", prototypeId),
+               keyValue("prototype type name id", prototypeTypeNameId),
+               keyValue("extension id", extensionId),
+               keyValue("extension type name id", extensionTypeNameId));
+}
+
+void ProjectStorage::syncPrototypesAndExtensions(Storage::Synchronization::Types &types,
+                                                 Prototypes &relinkablePrototypes,
+                                                 Prototypes &relinkableExtensions)
+{
+    NanotraceHR::Tracer tracer{"synchronize prototypes and extensions"_t, projectStorageCategory()};
+
+    TypeIds typeIds;
+    typeIds.reserve(types.size());
+
+    for (auto &type : types)
+        syncPrototypeAndExtension(type, typeIds);
+
+    removeRelinkableEntries(relinkablePrototypes, typeIds, TypeCompare<Prototype>{});
+    removeRelinkableEntries(relinkableExtensions, typeIds, TypeCompare<Prototype>{});
+}
+
+ImportId ProjectStorage::fetchImportId(SourceId sourceId, const Storage::Import &import) const
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"fetch imported type name id"_t,
+                               projectStorageCategory(),
+                               keyValue("import", import),
+                               keyValue("source id", sourceId)};
+
+    ImportId importId;
+    if (import.version) {
+        importId = s->selectImportIdBySourceIdAndModuleIdAndVersionStatement.value<ImportId>(
+            sourceId, import.moduleId, import.version.major.value, import.version.minor.value);
+    } else if (import.version.major) {
+        importId = s->selectImportIdBySourceIdAndModuleIdAndMajorVersionStatement
+                       .value<ImportId>(sourceId, import.moduleId, import.version.major.value);
+    } else {
+        importId = s->selectImportIdBySourceIdAndModuleIdStatement.value<ImportId>(sourceId,
+                                                                                   import.moduleId);
+    }
+
+    tracer.end(keyValue("import id", importId));
+
+    return importId;
+}
+
+ImportedTypeNameId ProjectStorage::fetchImportedTypeNameId(
+    const Storage::Synchronization::ImportedTypeName &name, SourceId sourceId)
+{
+    struct Inspect
+    {
+        auto operator()(const Storage::Synchronization::ImportedType &importedType)
+        {
+            using NanotraceHR::keyValue;
+            NanotraceHR::Tracer tracer{"fetch imported type name id"_t,
+                                       projectStorageCategory(),
+                                       keyValue("imported type name", importedType.name),
+                                       keyValue("source id", sourceId),
+                                       keyValue("type name kind", "exported"sv)};
+
+            return storage.fetchImportedTypeNameId(Storage::Synchronization::TypeNameKind::Exported,
+                                                   sourceId,
+                                                   importedType.name);
+        }
+
+        auto operator()(const Storage::Synchronization::QualifiedImportedType &importedType)
+        {
+            using NanotraceHR::keyValue;
+            NanotraceHR::Tracer tracer{"fetch imported type name id"_t,
+                                       projectStorageCategory(),
+                                       keyValue("imported type name", importedType.name),
+                                       keyValue("import", importedType.import),
+                                       keyValue("type name kind", "qualified exported"sv)};
+
+            ImportId importId = storage.fetchImportId(sourceId, importedType.import);
+
+            auto importedTypeNameId = storage.fetchImportedTypeNameId(
+                Storage::Synchronization::TypeNameKind::QualifiedExported, importId, importedType.name);
+
+            tracer.end(keyValue("import id", importId), keyValue("source id", sourceId));
+
+            return importedTypeNameId;
+        }
+
+        ProjectStorage &storage;
+        SourceId sourceId;
+    };
+
+    return std::visit(Inspect{*this, sourceId}, name);
+}
+
+TypeId ProjectStorage::fetchTypeId(ImportedTypeNameId typeNameId) const
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"fetch type id with type name kind"_t,
+                               projectStorageCategory(),
+                               keyValue("type name id", typeNameId)};
+
+    auto kind = s->selectKindFromImportedTypeNamesStatement.value<Storage::Synchronization::TypeNameKind>(
+        typeNameId);
+
+    auto typeId = fetchTypeId(typeNameId, kind);
+
+    tracer.end(keyValue("type id", typeId), keyValue("type name kind", kind));
+
+    return typeId;
+}
+
+Utils::SmallString ProjectStorage::fetchImportedTypeName(ImportedTypeNameId typeNameId) const
+{
+    return s->selectNameFromImportedTypeNamesStatement.value<Utils::SmallString>(typeNameId);
+}
+
+TypeId ProjectStorage::fetchTypeId(ImportedTypeNameId typeNameId,
+                                   Storage::Synchronization::TypeNameKind kind) const
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"fetch type id"_t,
+                               projectStorageCategory(),
+                               keyValue("type name id", typeNameId),
+                               keyValue("type name kind", kind)};
+
+    TypeId typeId;
+    if (kind == Storage::Synchronization::TypeNameKind::Exported) {
+        typeId = s->selectTypeIdForImportedTypeNameNamesStatement.value<TypeId>(typeNameId);
+    } else {
+        typeId = s->selectTypeIdForQualifiedImportedTypeNameNamesStatement.value<TypeId>(typeNameId);
+    }
+
+    tracer.end(keyValue("type id", typeId));
+
+    return typeId;
+}
+
+std::optional<ProjectStorage::FetchPropertyDeclarationResult>
+ProjectStorage::fetchOptionalPropertyDeclarationByTypeIdAndNameUngarded(TypeId typeId,
+                                                                        Utils::SmallStringView name)
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"fetch optional property declaration by type id and name ungarded"_t,
+                               projectStorageCategory(),
+                               keyValue("type id", typeId),
+                               keyValue("property name", name)};
+
+    auto propertyDeclarationId = fetchPropertyDeclarationId(typeId, name);
+    auto propertyDeclaration = s->selectPropertyDeclarationResultByPropertyDeclarationIdStatement
+                                   .optionalValue<FetchPropertyDeclarationResult>(
+                                       propertyDeclarationId);
+
+    tracer.end(keyValue("property declaration", propertyDeclaration));
+
+    return propertyDeclaration;
+}
+
+ProjectStorage::FetchPropertyDeclarationResult ProjectStorage::fetchPropertyDeclarationByTypeIdAndNameUngarded(
+    TypeId typeId, Utils::SmallStringView name)
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"fetch property declaration by type id and name ungarded"_t,
+                               projectStorageCategory(),
+                               keyValue("type id", typeId),
+                               keyValue("property name", name)};
+
+    auto propertyDeclaration = fetchOptionalPropertyDeclarationByTypeIdAndNameUngarded(typeId, name);
+    tracer.end(keyValue("property declaration", propertyDeclaration));
+
+    if (propertyDeclaration)
+        return *propertyDeclaration;
+
+    throw PropertyNameDoesNotExists{};
+}
+
+PropertyDeclarationId ProjectStorage::fetchPropertyDeclarationIdByTypeIdAndNameUngarded(
+    TypeId typeId, Utils::SmallStringView name)
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"fetch property declaration id by type id and name ungarded"_t,
+                               projectStorageCategory(),
+                               keyValue("type id", typeId),
+                               keyValue("property name", name)};
+
+    auto propertyDeclarationId = fetchPropertyDeclarationId(typeId, name);
+
+    tracer.end(keyValue("property declaration id", propertyDeclarationId));
+
+    if (propertyDeclarationId)
+        return propertyDeclarationId;
+
+    throw PropertyNameDoesNotExists{};
+}
+
+SourceContextId ProjectStorage::readSourceContextId(Utils::SmallStringView sourceContextPath)
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"read source context id"_t,
+                               projectStorageCategory(),
+                               keyValue("source context path", sourceContextPath)};
+
+    auto sourceContextId = s->selectSourceContextIdFromSourceContextsBySourceContextPathStatement
+                               .value<SourceContextId>(sourceContextPath);
+
+    tracer.end(keyValue("source context id", sourceContextId));
+
+    return sourceContextId;
+}
+
+SourceContextId ProjectStorage::writeSourceContextId(Utils::SmallStringView sourceContextPath)
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"write source context id"_t,
+                               projectStorageCategory(),
+                               keyValue("source context path", sourceContextPath)};
+
+    s->insertIntoSourceContextsStatement.write(sourceContextPath);
+
+    auto sourceContextId = SourceContextId::create(static_cast<int>(database.lastInsertedRowId()));
+
+    tracer.end(keyValue("source context id", sourceContextId));
+
+    return sourceContextId;
+}
+
+SourceId ProjectStorage::writeSourceId(SourceContextId sourceContextId,
+                                       Utils::SmallStringView sourceName)
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"write source id"_t,
+                               projectStorageCategory(),
+                               keyValue("source context id", sourceContextId),
+                               keyValue("source name", sourceName)};
+
+    s->insertIntoSourcesStatement.write(sourceContextId, sourceName);
+
+    auto sourceId = SourceId::create(static_cast<int>(database.lastInsertedRowId()));
+
+    tracer.end(keyValue("source id", sourceId));
+
+    return sourceId;
+}
+
+SourceId ProjectStorage::readSourceId(SourceContextId sourceContextId,
+                                      Utils::SmallStringView sourceName)
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"read source id"_t,
+                               projectStorageCategory(),
+                               keyValue("source context id", sourceContextId),
+                               keyValue("source name", sourceName)};
+
+    auto sourceId = s->selectSourceIdFromSourcesBySourceContextIdAndSourceNameStatement
+                        .value<SourceId>(sourceContextId, sourceName);
+
+    tracer.end(keyValue("source id", sourceId));
+
+    return sourceId;
+}
+
+Storage::Synchronization::ExportedTypes ProjectStorage::fetchExportedTypes(TypeId typeId)
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"fetch exported type"_t,
+                               projectStorageCategory(),
+                               keyValue("type id", typeId)};
+
+    auto exportedTypes = s->selectExportedTypesByTypeIdStatement
+                             .values<Storage::Synchronization::ExportedType, 12>(typeId);
+
+    tracer.end(keyValue("exported types", exportedTypes));
+
+    return exportedTypes;
+}
+
+Storage::Synchronization::PropertyDeclarations ProjectStorage::fetchPropertyDeclarations(TypeId typeId)
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"fetch property declarations"_t,
+                               projectStorageCategory(),
+                               keyValue("type id", typeId)};
+
+    auto propertyDeclarations = s->selectPropertyDeclarationsByTypeIdStatement
+                                    .values<Storage::Synchronization::PropertyDeclaration, 24>(typeId);
+
+    tracer.end(keyValue("property declarations", propertyDeclarations));
+
+    return propertyDeclarations;
+}
+
+Storage::Synchronization::FunctionDeclarations ProjectStorage::fetchFunctionDeclarations(TypeId typeId)
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"fetch signal declarations"_t,
+                               projectStorageCategory(),
+                               keyValue("type id", typeId)};
+
+    Storage::Synchronization::FunctionDeclarations functionDeclarations;
+
+    auto callback = [&](Utils::SmallStringView name,
+                        Utils::SmallStringView returnType,
+                        FunctionDeclarationId functionDeclarationId) {
+        auto &functionDeclaration = functionDeclarations.emplace_back(name, returnType);
+        functionDeclaration.parameters = s->selectFunctionParameterDeclarationsStatement
+                                             .values<Storage::Synchronization::ParameterDeclaration, 8>(
+                                                 functionDeclarationId);
+    };
+
+    s->selectFunctionDeclarationsForTypeIdWithoutSignatureStatement.readCallback(callback, typeId);
+
+    tracer.end(keyValue("function declarations", functionDeclarations));
+
+    return functionDeclarations;
+}
+
+Storage::Synchronization::SignalDeclarations ProjectStorage::fetchSignalDeclarations(TypeId typeId)
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"fetch signal declarations"_t,
+                               projectStorageCategory(),
+                               keyValue("type id", typeId)};
+
+    Storage::Synchronization::SignalDeclarations signalDeclarations;
+
+    auto callback = [&](Utils::SmallStringView name, SignalDeclarationId signalDeclarationId) {
+        auto &signalDeclaration = signalDeclarations.emplace_back(name);
+        signalDeclaration.parameters = s->selectSignalParameterDeclarationsStatement
+                                           .values<Storage::Synchronization::ParameterDeclaration, 8>(
+                                               signalDeclarationId);
+    };
+
+    s->selectSignalDeclarationsForTypeIdWithoutSignatureStatement.readCallback(callback, typeId);
+
+    tracer.end(keyValue("signal declarations", signalDeclarations));
+
+    return signalDeclarations;
+}
+
+Storage::Synchronization::EnumerationDeclarations ProjectStorage::fetchEnumerationDeclarations(TypeId typeId)
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"fetch enumeration declarations"_t,
+                               projectStorageCategory(),
+                               keyValue("type id", typeId)};
+
+    Storage::Synchronization::EnumerationDeclarations enumerationDeclarations;
+
+    auto callback = [&](Utils::SmallStringView name,
+                        EnumerationDeclarationId enumerationDeclarationId) {
+        enumerationDeclarations.emplace_back(
+            name,
+            s->selectEnumeratorDeclarationStatement
+                .values<Storage::Synchronization::EnumeratorDeclaration, 8>(enumerationDeclarationId));
+    };
+
+    s->selectEnumerationDeclarationsForTypeIdWithoutEnumeratorDeclarationsStatement
+        .readCallback(callback, typeId);
+
+    tracer.end(keyValue("enumeration declarations", enumerationDeclarations));
+
+    return enumerationDeclarations;
+}
+
+template<typename... TypeIds>
+bool ProjectStorage::isBasedOn_(TypeId typeId, TypeIds... baseTypeIds) const
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"is based on"_t,
+                               projectStorageCategory(),
+                               keyValue("type id", typeId),
+                               keyValue("base type ids", NanotraceHR::array(baseTypeIds...))};
+
+    static_assert(((std::is_same_v<TypeId, TypeIds>) &&...), "Parameter must be a TypeId!");
+
+    if (((typeId == baseTypeIds) || ...)) {
+        tracer.end(keyValue("is based on", true));
+        return true;
+    }
+
+    auto range = s->selectPrototypeAndExtensionIdsStatement.rangeWithTransaction<TypeId>(typeId);
+
+    auto isBasedOn = std::any_of(range.begin(), range.end(), [&](TypeId currentTypeId) {
+        return ((currentTypeId == baseTypeIds) || ...);
+    });
+
+    tracer.end(keyValue("is based on", isBasedOn));
+
+    return isBasedOn;
+}
+
+template<typename Id>
+ImportedTypeNameId ProjectStorage::fetchImportedTypeNameId(Storage::Synchronization::TypeNameKind kind,
+                                                           Id id,
+                                                           Utils::SmallStringView typeName)
+{
+    using NanotraceHR::keyValue;
+    NanotraceHR::Tracer tracer{"fetch imported type name id"_t,
+                               projectStorageCategory(),
+                               keyValue("imported type name", typeName),
+                               keyValue("kind", kind)};
+
+    auto importedTypeNameId = s->selectImportedTypeNameIdStatement.value<ImportedTypeNameId>(kind,
+                                                                                             id,
+                                                                                             typeName);
+
+    if (!importedTypeNameId)
+        importedTypeNameId = s->insertImportedTypeNameIdStatement.value<ImportedTypeNameId>(kind,
+                                                                                            id,
+                                                                                            typeName);
+
+    tracer.end(keyValue("imported type name id", importedTypeNameId));
+
+    return importedTypeNameId;
+}
+
+} // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/designercore/projectstorage/projectstorage.h b/src/plugins/qmldesigner/designercore/projectstorage/projectstorage.h
index a770577a65..e7826f531b 100644
--- a/src/plugins/qmldesigner/designercore/projectstorage/projectstorage.h
+++ b/src/plugins/qmldesigner/designercore/projectstorage/projectstorage.h
@@ -6,9 +6,12 @@
 #include "commontypecache.h"
 #include "projectstorageexceptions.h"
 #include "projectstorageinterface.h"
+#include "projectstoragetypes.h"
 #include "sourcepathcachetypes.h"
 #include "storagecache.h"
 
+#include <tracing/qmldesignertracing.h>
+
 #include <sqlitealgorithms.h>
 #include <sqlitedatabase.h>
 #include <sqlitetable.h>
@@ -28,414 +31,87 @@ namespace QmlDesigner {
 
 using namespace NanotraceHR::Literals;
 
-constexpr NanotraceHR::Tracing projectStorageTracingStatus()
-{
-#ifdef ENABLE_PROJECT_STORAGE_TRACING
-    return NanotraceHR::Tracing::IsEnabled;
-#else
-    return NanotraceHR::Tracing::IsDisabled;
-#endif
-}
-
-[[gnu::pure]] NanotraceHR::StringViewCategory<projectStorageTracingStatus()> &projectStorageCategory();
+using ProjectStorageTracing::projectStorageCategory;
 
-template<typename Database>
 class ProjectStorage final : public ProjectStorageInterface
 {
-    friend Storage::Info::CommonTypeCache<Database>;
+    using Database = Sqlite::Database;
+    friend Storage::Info::CommonTypeCache<ProjectStorageType>;
 
 public:
-    template<int ResultCount, int BindParameterCount = 0>
-    using ReadStatement = typename Database::template ReadStatement<ResultCount, BindParameterCount>;
-    template<int ResultCount, int BindParameterCount = 0>
-    using ReadWriteStatement = typename Database::template ReadWriteStatement<ResultCount, BindParameterCount>;
-    template<int BindParameterCount>
-    using WriteStatement = typename Database::template WriteStatement<BindParameterCount>;
-
-    ProjectStorage(Database &database, bool isInitialized)
-        : database{database}
-        , exclusiveTransaction{database}
-        , initializer{database, isInitialized}
-    {
-        NanotraceHR::Tracer tracer{"initialize"_t, projectStorageCategory()};
-
-        exclusiveTransaction.commit();
-
-        database.walCheckpointFull();
-
-        moduleCache.populate();
-    }
-
-    void synchronize(Storage::Synchronization::SynchronizationPackage package) override
-    {
-        NanotraceHR::Tracer tracer{"synchronize"_t, projectStorageCategory()};
-
-        TypeIds deletedTypeIds;
-        Sqlite::withImmediateTransaction(database, [&] {
-            AliasPropertyDeclarations insertedAliasPropertyDeclarations;
-            AliasPropertyDeclarations updatedAliasPropertyDeclarations;
-
-            AliasPropertyDeclarations relinkableAliasPropertyDeclarations;
-            PropertyDeclarations relinkablePropertyDeclarations;
-            Prototypes relinkablePrototypes;
-            Prototypes relinkableExtensions;
-
-            TypeIds updatedTypeIds;
-            updatedTypeIds.reserve(package.types.size());
-
-            TypeIds typeIdsToBeDeleted;
-
-            std::sort(package.updatedSourceIds.begin(), package.updatedSourceIds.end());
-
-            synchronizeFileStatuses(package.fileStatuses, package.updatedFileStatusSourceIds);
-            synchronizeImports(package.imports,
-                               package.updatedSourceIds,
-                               package.moduleDependencies,
-                               package.updatedModuleDependencySourceIds,
-                               package.moduleExportedImports,
-                               package.updatedModuleIds);
-            synchronizeTypes(package.types,
-                             updatedTypeIds,
-                             insertedAliasPropertyDeclarations,
-                             updatedAliasPropertyDeclarations,
-                             relinkableAliasPropertyDeclarations,
-                             relinkablePropertyDeclarations,
-                             relinkablePrototypes,
-                             relinkableExtensions,
-                             package.updatedSourceIds);
-            synchronizeTypeAnnotations(package.typeAnnotations,
-                                       package.updatedTypeAnnotationSourceIds);
-            synchronizePropertyEditorQmlPaths(package.propertyEditorQmlPaths,
-                                              package.updatedPropertyEditorQmlPathSourceIds);
-
-            deleteNotUpdatedTypes(updatedTypeIds,
-                                  package.updatedSourceIds,
-                                  typeIdsToBeDeleted,
-                                  relinkableAliasPropertyDeclarations,
-                                  relinkablePropertyDeclarations,
-                                  relinkablePrototypes,
-                                  relinkableExtensions,
-                                  deletedTypeIds);
-
-            relink(relinkableAliasPropertyDeclarations,
-                   relinkablePropertyDeclarations,
-                   relinkablePrototypes,
-                   relinkableExtensions,
-                   deletedTypeIds);
-
-            linkAliases(insertedAliasPropertyDeclarations, updatedAliasPropertyDeclarations);
-
-            synchronizeProjectDatas(package.projectDatas, package.updatedProjectSourceIds);
-
-            commonTypeCache_.resetTypeIds();
-        });
-
-        callRefreshMetaInfoCallback(deletedTypeIds);
-    }
-
-    void synchronizeDocumentImports(Storage::Imports imports, SourceId sourceId) override
-    {
-        NanotraceHR::Tracer tracer{"synchronize document imports"_t, projectStorageCategory()};
-
-        Sqlite::withImmediateTransaction(database, [&] {
-            synchronizeDocumentImports(imports,
-                                       {sourceId},
-                                       Storage::Synchronization::ImportKind::Import);
-        });
-    }
+    ProjectStorage(Database &database, bool isInitialized);
+    ~ProjectStorage();
 
-    void addObserver(ProjectStorageObserver *observer) override { observers.push_back(observer); }
+    void synchronize(Storage::Synchronization::SynchronizationPackage package) override;
 
-    void removeObserver(ProjectStorageObserver *observer) override
-    {
-        observers.removeOne(observer);
-    }
+    void synchronizeDocumentImports(Storage::Imports imports, SourceId sourceId) override;
 
-    ModuleId moduleId(Utils::SmallStringView moduleName) const override
-    {
-        NanotraceHR::Tracer tracer{"get module id"_t, projectStorageCategory()};
-
-        return moduleCache.id(moduleName);
-    }
+    void addObserver(ProjectStorageObserver *observer) override;
 
-    Utils::SmallString moduleName(ModuleId moduleId) const
-    {
-        NanotraceHR::Tracer tracer{"get module name"_t, projectStorageCategory()};
+    void removeObserver(ProjectStorageObserver *observer) override;
 
-        if (!moduleId)
-            throw ModuleDoesNotExists{};
+    ModuleId moduleId(Utils::SmallStringView moduleName) const override;
 
-        return moduleCache.value(moduleId);
-    }
+    Utils::SmallString moduleName(ModuleId moduleId) const override;
 
     TypeId typeId(ModuleId moduleId,
                   Utils::SmallStringView exportedTypeName,
-                  Storage::Version version) const override
-    {
-        NanotraceHR::Tracer tracer{"get type id by exported name"_t, projectStorageCategory()};
-
-        if (version.minor)
-            return selectTypeIdByModuleIdAndExportedNameAndVersionStatement
-                .template valueWithTransaction<TypeId>(moduleId,
-                                                       exportedTypeName,
-                                                       version.major.value,
-                                                       version.minor.value);
-
-        if (version.major)
-            return selectTypeIdByModuleIdAndExportedNameAndMajorVersionStatement
-                .template valueWithTransaction<TypeId>(moduleId, exportedTypeName, version.major.value);
+                  Storage::Version version) const override;
 
-        return selectTypeIdByModuleIdAndExportedNameStatement
-            .template valueWithTransaction<TypeId>(moduleId, exportedTypeName);
-    }
-
-    TypeId typeId(ImportedTypeNameId typeNameId) const override
-    {
-        NanotraceHR::Tracer tracer{"get type id by imported type name"_t, projectStorageCategory()};
-
-        return Sqlite::withDeferredTransaction(database, [&] { return fetchTypeId(typeNameId); });
-    }
+    TypeId typeId(ImportedTypeNameId typeNameId) const override;
 
-    QVarLengthArray<TypeId, 256> typeIds(ModuleId moduleId) const override
-    {
-        NanotraceHR::Tracer tracer{"get type ids by module id"_t, projectStorageCategory()};
+    QVarLengthArray<TypeId, 256> typeIds(ModuleId moduleId) const override;
 
-        return selectTypeIdsByModuleIdStatement
-            .template valuesWithTransaction<QVarLengthArray<TypeId, 256>>(moduleId);
-    }
+    Storage::Info::ExportedTypeNames exportedTypeNames(TypeId typeId) const override;
 
-    Storage::Info::ExportedTypeNames exportedTypeNames(TypeId typeId) const override
-    {
-        NanotraceHR::Tracer tracer{"get exported type names by type id"_t, projectStorageCategory()};
+    Storage::Info::ExportedTypeNames exportedTypeNames(TypeId typeId, SourceId sourceId) const override;
 
-        return selectExportedTypesByTypeIdStatement
-            .template valuesWithTransaction<Storage::Info::ExportedTypeName, 4>(typeId);
-    }
+    ImportId importId(const Storage::Import &import) const override;
 
-    Storage::Info::ExportedTypeNames exportedTypeNames(TypeId typeId,
-                                                       SourceId sourceId) const override
-    {
-        NanotraceHR::Tracer tracer{"get exported type names by source id"_t, projectStorageCategory()};
+    ImportedTypeNameId importedTypeNameId(ImportId importId, Utils::SmallStringView typeName) override;
 
-        return selectExportedTypesByTypeIdAndSourceIdStatement
-            .template valuesWithTransaction<Storage::Info::ExportedTypeName, 4>(typeId, sourceId);
-    }
+    ImportedTypeNameId importedTypeNameId(SourceId sourceId, Utils::SmallStringView typeName) override;
 
-    ImportId importId(const Storage::Import &import) const override
-    {
-        NanotraceHR::Tracer tracer{"get import id by import"_t, projectStorageCategory()};
+    QVarLengthArray<PropertyDeclarationId, 128> propertyDeclarationIds(TypeId typeId) const override;
 
-        return Sqlite::withDeferredTransaction(database, [&] {
-            return fetchImportId(import.sourceId, import);
-        });
-    }
-
-    ImportedTypeNameId importedTypeNameId(ImportId importId,
-                                          Utils::SmallStringView typeName) override
-    {
-        NanotraceHR::Tracer tracer{"get imported type name id by import id"_t,
-                                   projectStorageCategory()};
-
-        return Sqlite::withDeferredTransaction(database, [&] {
-            return fetchImportedTypeNameId(Storage::Synchronization::TypeNameKind::QualifiedExported,
-                                           importId,
-                                           typeName);
-        });
-    }
-
-    ImportedTypeNameId importedTypeNameId(SourceId sourceId,
-                                          Utils::SmallStringView typeName) override
-    {
-        NanotraceHR::Tracer tracer{"get imported type name id by source id"_t,
-                                   projectStorageCategory()};
-
-        return Sqlite::withDeferredTransaction(database, [&] {
-            return fetchImportedTypeNameId(Storage::Synchronization::TypeNameKind::Exported,
-                                           sourceId,
-                                           typeName);
-        });
-    }
-
-    QVarLengthArray<PropertyDeclarationId, 128> propertyDeclarationIds(TypeId typeId) const override
-    {
-        NanotraceHR::Tracer tracer{"get property declaration ids"_t, projectStorageCategory()};
-
-        return selectPropertyDeclarationIdsForTypeStatement
-            .template valuesWithTransaction<QVarLengthArray<PropertyDeclarationId, 128>>(typeId);
-    }
-
-    QVarLengthArray<PropertyDeclarationId, 128> localPropertyDeclarationIds(TypeId typeId) const override
-    {
-        NanotraceHR::Tracer tracer{"get local property declaration ids"_t, projectStorageCategory()};
-
-        return selectLocalPropertyDeclarationIdsForTypeStatement
-            .template valuesWithTransaction<QVarLengthArray<PropertyDeclarationId, 128>>(typeId);
-    }
+    QVarLengthArray<PropertyDeclarationId, 128> localPropertyDeclarationIds(TypeId typeId) const override;
 
     PropertyDeclarationId propertyDeclarationId(TypeId typeId,
-                                                Utils::SmallStringView propertyName) const override
-    {
-        NanotraceHR::Tracer tracer{"get property declaration id"_t, projectStorageCategory()};
-
-        return selectPropertyDeclarationIdForTypeAndPropertyNameStatement
-            .template valueWithTransaction<PropertyDeclarationId>(typeId, propertyName);
-    }
+                                                Utils::SmallStringView propertyName) const override;
 
     PropertyDeclarationId localPropertyDeclarationId(TypeId typeId,
-                                                     Utils::SmallStringView propertyName) const
-    {
-        NanotraceHR::Tracer tracer{"get local property declaration id"_t, projectStorageCategory()};
+                                                     Utils::SmallStringView propertyName) const;
 
-        return selectLocalPropertyDeclarationIdForTypeAndPropertyNameStatement
-            .template valueWithTransaction<PropertyDeclarationId>(typeId, propertyName);
-    }
+    PropertyDeclarationId defaultPropertyDeclarationId(TypeId typeId) const override;
 
     std::optional<Storage::Info::PropertyDeclaration> propertyDeclaration(
-        PropertyDeclarationId propertyDeclarationId) const override
-    {
-        NanotraceHR::Tracer tracer{"get property declaration"_t, projectStorageCategory()};
-
-        return selectPropertyDeclarationForPropertyDeclarationIdStatement
-            .template optionalValueWithTransaction<Storage::Info::PropertyDeclaration>(
-                propertyDeclarationId);
-    }
-
-    std::optional<Storage::Info::Type> type(TypeId typeId) const override
-    {
-        NanotraceHR::Tracer tracer{"get type"_t, projectStorageCategory()};
+        PropertyDeclarationId propertyDeclarationId) const override;
 
-        return selectInfoTypeByTypeIdStatement.template optionalValueWithTransaction<Storage::Info::Type>(
-            typeId);
-    }
+    std::optional<Storage::Info::Type> type(TypeId typeId) const override;
 
-    Utils::PathString typeIconPath(TypeId typeId) const override
-    {
-        NanotraceHR::Tracer tracer{"get type icon path"_t, projectStorageCategory()};
+    Utils::PathString typeIconPath(TypeId typeId) const override;
 
-        return selectTypeIconPathStatement.template valueWithTransaction<Utils::PathString>(typeId);
-    }
+    Storage::Info::TypeHints typeHints(TypeId typeId) const override;
 
-    Storage::Info::TypeHints typeHints(TypeId typeId) const override
-    {
-        NanotraceHR::Tracer tracer{"get type hints"_t, projectStorageCategory()};
+    SmallSourceIds<4> typeAnnotationSourceIds(SourceId directoryId) const override;
 
-        return selectTypeHintsStatement.template valuesWithTransaction<Storage::Info::TypeHints, 4>(
-            typeId);
-    }
-
-    Storage::Info::ItemLibraryEntries itemLibraryEntries(TypeId typeId) const override
-    {
-        NanotraceHR::Tracer tracer{"get item library entries  by type id"_t, projectStorageCategory()};
-
-        using Storage::Info::ItemLibraryProperties;
-        Storage::Info::ItemLibraryEntries entries;
-
-        auto callback = [&](TypeId typeId_,
-                            Utils::SmallStringView name,
-                            Utils::SmallStringView iconPath,
-                            Utils::SmallStringView category,
-                            Utils::SmallStringView import,
-                            Utils::SmallStringView toolTip,
-                            Utils::SmallStringView properties,
-                            Utils::SmallStringView extraFilePaths,
-                            Utils::SmallStringView templatePath) {
-            auto &last = entries.emplace_back(
-                typeId_, name, iconPath, category, import, toolTip, templatePath);
-            if (properties.size())
-                selectItemLibraryPropertiesStatement.readTo(last.properties, properties);
-            if (extraFilePaths.size())
-                selectItemLibraryExtraFilePathsStatement.readTo(last.extraFilePaths, extraFilePaths);
-        };
-
-        selectItemLibraryEntriesByTypeIdStatement.readCallbackWithTransaction(callback, typeId);
-
-        return entries;
-    }
-
-    Storage::Info::ItemLibraryEntries itemLibraryEntries(SourceId sourceId) const override
-    {
-        NanotraceHR::Tracer tracer{"get item library entries by source id"_t,
-                                   projectStorageCategory()};
-
-        using Storage::Info::ItemLibraryProperties;
-        Storage::Info::ItemLibraryEntries entries;
-
-        auto callback = [&](TypeId typeId,
-                            Utils::SmallStringView name,
-                            Utils::SmallStringView iconPath,
-                            Utils::SmallStringView category,
-                            Utils::SmallStringView import,
-                            Utils::SmallStringView toolTip,
-                            Utils::SmallStringView properties,
-                            Utils::SmallStringView extraFilePaths,
-                            Utils::SmallStringView templatePath) {
-            auto &last = entries.emplace_back(
-                typeId, name, iconPath, category, import, toolTip, templatePath);
-            if (properties.size())
-                selectItemLibraryPropertiesStatement.readTo(last.properties, properties);
-            if (extraFilePaths.size())
-                selectItemLibraryExtraFilePathsStatement.readTo(last.extraFilePaths, extraFilePaths);
-        };
-
-        selectItemLibraryEntriesBySourceIdStatement.readCallbackWithTransaction(callback, sourceId);
-
-        return entries;
-    }
+    SmallSourceIds<64> typeAnnotationDirectorySourceIds() const override;
 
-    Storage::Info::ItemLibraryEntries allItemLibraryEntries() const override
-    {
-        NanotraceHR::Tracer tracer{"get all item library entries"_t, projectStorageCategory()};
-
-        using Storage::Info::ItemLibraryProperties;
-        Storage::Info::ItemLibraryEntries entries;
-
-        auto callback = [&](TypeId typeId,
-                            Utils::SmallStringView name,
-                            Utils::SmallStringView iconPath,
-                            Utils::SmallStringView category,
-                            Utils::SmallStringView import,
-                            Utils::SmallStringView toolTip,
-                            Utils::SmallStringView properties,
-                            Utils::SmallStringView extraFilePaths,
-                            Utils::SmallStringView templatePath) {
-            auto &last = entries.emplace_back(
-                typeId, name, iconPath, category, import, toolTip, templatePath);
-            if (properties.size())
-                selectItemLibraryPropertiesStatement.readTo(last.properties, properties);
-            if (extraFilePaths.size())
-                selectItemLibraryExtraFilePathsStatement.readTo(last.extraFilePaths, extraFilePaths);
-        };
-
-        selectItemLibraryEntriesStatement.readCallbackWithTransaction(callback);
-
-        return entries;
-    }
+    Storage::Info::ItemLibraryEntries itemLibraryEntries(TypeId typeId) const override;
 
-    std::vector<Utils::SmallString> signalDeclarationNames(TypeId typeId) const override
-    {
-        NanotraceHR::Tracer tracer{"get signal names"_t, projectStorageCategory()};
+    Storage::Info::ItemLibraryEntries itemLibraryEntries(ImportId importId) const;
 
-        return selectSignalDeclarationNamesForTypeStatement
-            .template valuesWithTransaction<Utils::SmallString, 32>(typeId);
-    }
+    Storage::Info::ItemLibraryEntries itemLibraryEntries(SourceId sourceId) const override;
 
-    std::vector<Utils::SmallString> functionDeclarationNames(TypeId typeId) const override
-    {
-        NanotraceHR::Tracer tracer{"get function names"_t, projectStorageCategory()};
+    Storage::Info::ItemLibraryEntries allItemLibraryEntries() const override;
 
-        return selectFuncionDeclarationNamesForTypeStatement
-            .template valuesWithTransaction<Utils::SmallString, 32>(typeId);
-    }
+    std::vector<Utils::SmallString> signalDeclarationNames(TypeId typeId) const override;
 
-    std::optional<Utils::SmallString> propertyName(PropertyDeclarationId propertyDeclarationId) const override
-    {
-        NanotraceHR::Tracer tracer{"get property name"_t, projectStorageCategory()};
+    std::vector<Utils::SmallString> functionDeclarationNames(TypeId typeId) const override;
 
-        return selectPropertyNameStatement.template optionalValueWithTransaction<Utils::SmallString>(
-            propertyDeclarationId);
-    }
+    std::optional<Utils::SmallString> propertyName(PropertyDeclarationId propertyDeclarationId) const override;
 
-    const Storage::Info::CommonTypeCache<ProjectStorageInterface> &commonTypeCache() const override
+    const Storage::Info::CommonTypeCache<ProjectStorageType> &commonTypeCache() const override
     {
         return commonTypeCache_;
     }
@@ -443,101 +119,70 @@ public:
     template<const char *moduleName, const char *typeName>
     TypeId commonTypeId() const
     {
-        NanotraceHR::Tracer tracer{"get type id from common type cache"_t, projectStorageCategory()};
+        using NanotraceHR::keyValue;
+        NanotraceHR::Tracer tracer{"get type id from common type cache"_t,
+                                   projectStorageCategory(),
+                                   keyValue("module name", std::string_view{moduleName}),
+                                   keyValue("type name", std::string_view{typeName})};
+
+        auto typeId = commonTypeCache_.typeId<moduleName, typeName>();
+
+        tracer.end(keyValue("type id", typeId));
 
-        return commonTypeCache_.template typeId<moduleName, typeName>();
+        return typeId;
     }
 
     template<typename BuiltinType>
     TypeId builtinTypeId() const
     {
+        using NanotraceHR::keyValue;
         NanotraceHR::Tracer tracer{"get builtin type id from common type cache"_t,
                                    projectStorageCategory()};
 
-        return commonTypeCache_.template builtinTypeId<BuiltinType>();
+        auto typeId = commonTypeCache_.builtinTypeId<BuiltinType>();
+
+        tracer.end(keyValue("type id", typeId));
+
+        return typeId;
     }
 
     template<const char *builtinType>
     TypeId builtinTypeId() const
     {
+        using NanotraceHR::keyValue;
         NanotraceHR::Tracer tracer{"get builtin type id from common type cache"_t,
                                    projectStorageCategory()};
 
-        return commonTypeCache_.template builtinTypeId<builtinType>();
-    }
+        auto typeId = commonTypeCache_.builtinTypeId<builtinType>();
 
-    TypeIds prototypeIds(TypeId type) const override
-    {
-        NanotraceHR::Tracer tracer{"get prototypes"_t, projectStorageCategory()};
+        tracer.end(keyValue("type id", typeId));
 
-        return selectPrototypeIdsForTypeIdInOrderStatement.template valuesWithTransaction<TypeId, 16>(
-            type);
+        return typeId;
     }
 
-    TypeIds prototypeAndSelfIds(TypeId type) const override
-    {
-        NanotraceHR::Tracer tracer{"get prototypes and self"_t, projectStorageCategory()};
-
-        return selectPrototypeAndSelfIdsForTypeIdInOrderStatement
-            .template valuesWithTransaction<TypeId, 16>(type);
-    }
+    SmallTypeIds<16> prototypeIds(TypeId type) const override;
 
-    TypeIds heirIds(TypeId typeId) const override
-    {
-        NanotraceHR::Tracer tracer{"get heirs"_t, projectStorageCategory()};
+    SmallTypeIds<16> prototypeAndSelfIds(TypeId typeId) const override;
 
-        return selectHeirTypeIdsStatement.template valuesWithTransaction<TypeId, 64>(typeId);
-    }
+    SmallTypeIds<64> heirIds(TypeId typeId) const override;
 
     template<typename... TypeIds>
-    bool isBasedOn_(TypeId typeId, TypeIds... baseTypeIds) const
-    {
-        NanotraceHR::Tracer tracer{"is based on"_t, projectStorageCategory()};
+    bool isBasedOn_(TypeId typeId, TypeIds... baseTypeIds) const;
 
-        static_assert(((std::is_same_v<TypeId, TypeIds>) &&...), "Parameter must be a TypeId!");
+    bool isBasedOn(TypeId) const;
 
-        if (((typeId == baseTypeIds) || ...))
-            return true;
+    bool isBasedOn(TypeId typeId, TypeId id1) const override;
 
-        auto range = selectPrototypeIdsStatement.template rangeWithTransaction<TypeId>(typeId);
+    bool isBasedOn(TypeId typeId, TypeId id1, TypeId id2) const override;
 
-        for ([[maybe_unused]] TypeId currentTypeId : range) {
-            if (((currentTypeId == baseTypeIds) || ...))
-                return true;
-        }
-
-        return false;
-    }
-
-    bool isBasedOn(TypeId typeId) const { return isBasedOn_(typeId); }
-
-    bool isBasedOn(TypeId typeId, TypeId id1) const override { return isBasedOn_(typeId, id1); }
-
-    bool isBasedOn(TypeId typeId, TypeId id1, TypeId id2) const override
-    {
-        return isBasedOn_(typeId, id1, id2);
-    }
-
-    bool isBasedOn(TypeId typeId, TypeId id1, TypeId id2, TypeId id3) const override
-    {
-        return isBasedOn_(typeId, id1, id2, id3);
-    }
+    bool isBasedOn(TypeId typeId, TypeId id1, TypeId id2, TypeId id3) const override;
 
-    bool isBasedOn(TypeId typeId, TypeId id1, TypeId id2, TypeId id3, TypeId id4) const override
-    {
-        return isBasedOn_(typeId, id1, id2, id3, id4);
-    }
+    bool isBasedOn(TypeId typeId, TypeId id1, TypeId id2, TypeId id3, TypeId id4) const override;
 
-    bool isBasedOn(TypeId typeId, TypeId id1, TypeId id2, TypeId id3, TypeId id4, TypeId id5) const override
-    {
-        return isBasedOn_(typeId, id1, id2, id3, id4, id5);
-    }
+    bool isBasedOn(TypeId typeId, TypeId id1, TypeId id2, TypeId id3, TypeId id4, TypeId id5) const override;
 
-    bool isBasedOn(
-        TypeId typeId, TypeId id1, TypeId id2, TypeId id3, TypeId id4, TypeId id5, TypeId id6) const override
-    {
-        return isBasedOn_(typeId, id1, id2, id3, id4, id5, id6);
-    }
+    bool isBasedOn(TypeId typeId, TypeId id1, TypeId id2, TypeId id3, TypeId id4, TypeId id5, TypeId id6)
+        const override;
 
     bool isBasedOn(TypeId typeId,
                    TypeId id1,
@@ -546,251 +191,57 @@ public:
                    TypeId id4,
                    TypeId id5,
                    TypeId id6,
-                   TypeId id7) const override
-    {
-        return isBasedOn_(typeId, id1, id2, id3, id4, id5, id6, id7);
-    }
-
-    TypeId fetchTypeIdByExportedName(Utils::SmallStringView name) const
-    {
-        NanotraceHR::Tracer tracer{"is based on"_t, projectStorageCategory()};
-
-        return selectTypeIdByExportedNameStatement.template valueWithTransaction<TypeId>(name);
-    }
-
-    TypeId fetchTypeIdByModuleIdsAndExportedName(ModuleIds moduleIds, Utils::SmallStringView name) const
-    {
-        return selectTypeIdByModuleIdsAndExportedNameStatement.template valueWithTransaction<TypeId>(
-            static_cast<void *>(moduleIds.data()), static_cast<long long>(moduleIds.size()), name);
-    }
-
-    TypeId fetchTypeIdByName(SourceId sourceId, Utils::SmallStringView name)
-    {
-        return selectTypeIdBySourceIdAndNameStatement.template valueWithTransaction<TypeId>(sourceId,
-                                                                                            name);
-    }
-
-    Storage::Synchronization::Type fetchTypeByTypeId(TypeId typeId)
-    {
-        return Sqlite::withDeferredTransaction(database, [&] {
-            auto type = selectTypeByTypeIdStatement.template value<Storage::Synchronization::Type>(
-                typeId);
-
-            type.exportedTypes = fetchExportedTypes(typeId);
-            type.propertyDeclarations = fetchPropertyDeclarations(type.typeId);
-            type.functionDeclarations = fetchFunctionDeclarations(type.typeId);
-            type.signalDeclarations = fetchSignalDeclarations(type.typeId);
-            type.enumerationDeclarations = fetchEnumerationDeclarations(type.typeId);
-
-            return type;
-        });
-    }
-
-    Storage::Synchronization::Types fetchTypes()
-    {
-        return Sqlite::withDeferredTransaction(database, [&] {
-            auto types = selectTypesStatement.template values<Storage::Synchronization::Type, 64>();
-
-            for (Storage::Synchronization::Type &type : types) {
-                type.exportedTypes = fetchExportedTypes(type.typeId);
-                type.propertyDeclarations = fetchPropertyDeclarations(type.typeId);
-                type.functionDeclarations = fetchFunctionDeclarations(type.typeId);
-                type.signalDeclarations = fetchSignalDeclarations(type.typeId);
-                type.enumerationDeclarations = fetchEnumerationDeclarations(type.typeId);
-            }
-
-            return types;
-        });
-    }
-
-    bool fetchIsProtype(TypeId type, TypeId prototype)
-    {
-        return bool(selectPrototypeIdStatement.template valueWithTransaction<TypeId>(type, prototype));
-    }
-
-    auto fetchPrototypes(TypeId type)
-    {
-        return selectPrototypeIdsInOrderStatement.template rangeWithTransaction<TypeId>(type);
-    }
-
-    SourceContextId fetchSourceContextIdUnguarded(Utils::SmallStringView sourceContextPath)
-    {
-        NanotraceHR::Tracer tracer{"fetch source context id unguarded"_t, projectStorageCategory()};
-
-        auto sourceContextId = readSourceContextId(sourceContextPath);
-
-        return sourceContextId ? sourceContextId : writeSourceContextId(sourceContextPath);
-    }
-
-    SourceContextId fetchSourceContextId(Utils::SmallStringView sourceContextPath)
-    {
-        NanotraceHR::Tracer tracer{"fetch source context id"_t, projectStorageCategory()};
-
-        try {
-            return Sqlite::withDeferredTransaction(database, [&] {
-                return fetchSourceContextIdUnguarded(sourceContextPath);
-            });
-        } catch (const Sqlite::ConstraintPreventsModification &) {
-            return fetchSourceContextId(sourceContextPath);
-        }
-    }
-
-    Utils::PathString fetchSourceContextPath(SourceContextId sourceContextId) const
-    {
-        NanotraceHR::Tracer tracer{"fetch source context path"_t, projectStorageCategory()};
-
-        return Sqlite::withDeferredTransaction(database, [&] {
-            auto optionalSourceContextPath = selectSourceContextPathFromSourceContextsBySourceContextIdStatement
-                                                 .template optionalValue<Utils::PathString>(
-                                                     sourceContextId);
-
-            if (!optionalSourceContextPath)
-                throw SourceContextIdDoesNotExists();
-
-            return std::move(*optionalSourceContextPath);
-        });
-    }
-
-    auto fetchAllSourceContexts() const
-    {
-        NanotraceHR::Tracer tracer{"fetch all source contexts"_t, projectStorageCategory()};
-
-        return selectAllSourceContextsStatement
-            .template valuesWithTransaction<Cache::SourceContext, 128>();
-    }
-
-    SourceId fetchSourceId(SourceContextId sourceContextId, Utils::SmallStringView sourceName)
-    {
-        NanotraceHR::Tracer tracer{"fetch source id"_t, projectStorageCategory()};
-
-        return Sqlite::withDeferredTransaction(database, [&] {
-            return fetchSourceIdUnguarded(sourceContextId, sourceName);
-        });
-    }
-
-    auto fetchSourceNameAndSourceContextId(SourceId sourceId) const
-    {
-        NanotraceHR::Tracer tracer{"fetch source name and source context id"_t,
-                                   projectStorageCategory()};
-
-        auto value = selectSourceNameAndSourceContextIdFromSourcesBySourceIdStatement
-                         .template valueWithTransaction<Cache::SourceNameAndSourceContextId>(sourceId);
-
-        if (!value.sourceContextId)
-            throw SourceIdDoesNotExists();
+                   TypeId id7) const override;
 
-        return value;
-    }
-
-    void clearSources()
-    {
-        Sqlite::withImmediateTransaction(database, [&] {
-            deleteAllSourceContextsStatement.execute();
-            deleteAllSourcesStatement.execute();
-        });
-    }
-
-    SourceContextId fetchSourceContextId(SourceId sourceId) const
-    {
-        NanotraceHR::Tracer tracer{"fetch source context id"_t, projectStorageCategory()};
-
-        auto sourceContextId = selectSourceContextIdFromSourcesBySourceIdStatement
-                                   .template valueWithTransaction<SourceContextId>(sourceId);
+    TypeId fetchTypeIdByExportedName(Utils::SmallStringView name) const;
 
-        if (!sourceContextId)
-            throw SourceIdDoesNotExists();
+    TypeId fetchTypeIdByModuleIdsAndExportedName(ModuleIds moduleIds,
+                                                 Utils::SmallStringView name) const;
 
-        return sourceContextId;
-    }
-
-    auto fetchAllSources() const
-    {
-        NanotraceHR::Tracer tracer{"fetch all sources"_t, projectStorageCategory()};
+    TypeId fetchTypeIdByName(SourceId sourceId, Utils::SmallStringView name);
 
-        return selectAllSourcesStatement.template valuesWithTransaction<Cache::Source, 1024>();
-    }
+    Storage::Synchronization::Type fetchTypeByTypeId(TypeId typeId);
 
-    SourceId fetchSourceIdUnguarded(SourceContextId sourceContextId, Utils::SmallStringView sourceName)
-    {
-        NanotraceHR::Tracer tracer{"fetch source id unguarded"_t, projectStorageCategory()};
+    Storage::Synchronization::Types fetchTypes();
 
-        auto sourceId = readSourceId(sourceContextId, sourceName);
+    SourceContextId fetchSourceContextIdUnguarded(Utils::SmallStringView sourceContextPath);
 
-        if (sourceId)
-            return sourceId;
+    SourceContextId fetchSourceContextId(Utils::SmallStringView sourceContextPath);
 
-        return writeSourceId(sourceContextId, sourceName);
-    }
+    Utils::PathString fetchSourceContextPath(SourceContextId sourceContextId) const;
 
-    auto fetchAllFileStatuses() const
-    {
-        NanotraceHR::Tracer tracer{"fetch all file statuses"_t, projectStorageCategory()};
+    Cache::SourceContexts fetchAllSourceContexts() const;
 
-        return selectAllFileStatusesStatement.template rangeWithTransaction<FileStatus>();
-    }
+    SourceId fetchSourceId(SourceContextId sourceContextId, Utils::SmallStringView sourceName);
 
-    FileStatus fetchFileStatus(SourceId sourceId) const override
-    {
-        NanotraceHR::Tracer tracer{"fetch file status"_t, projectStorageCategory()};
+    Cache::SourceNameAndSourceContextId fetchSourceNameAndSourceContextId(SourceId sourceId) const;
 
-        return selectFileStatusesForSourceIdStatement.template valueWithTransaction<FileStatus>(
-            sourceId);
-    }
+    void clearSources();
 
-    std::optional<Storage::Synchronization::ProjectData> fetchProjectData(SourceId sourceId) const override
-    {
-        NanotraceHR::Tracer tracer{"fetch project data"_t, projectStorageCategory()};
+    SourceContextId fetchSourceContextId(SourceId sourceId) const;
 
-        return selectProjectDataForSourceIdStatement
-            .template optionalValueWithTransaction<Storage::Synchronization::ProjectData>(sourceId);
-    }
+    Cache::Sources fetchAllSources() const;
 
-    Storage::Synchronization::ProjectDatas fetchProjectDatas(SourceId projectSourceId) const override
-    {
-        NanotraceHR::Tracer tracer{"fetch project datas by source id"_t, projectStorageCategory()};
+    SourceId fetchSourceIdUnguarded(SourceContextId sourceContextId,
+                                    Utils::SmallStringView sourceName);
 
-        return selectProjectDatasForSourceIdStatement
-            .template valuesWithTransaction<Storage::Synchronization::ProjectData, 1024>(
-                projectSourceId);
-    }
+    FileStatuses fetchAllFileStatuses() const;
 
-    Storage::Synchronization::ProjectDatas fetchProjectDatas(const SourceIds &projectSourceIds) const
-    {
-        NanotraceHR::Tracer tracer{"fetch project datas by source ids"_t, projectStorageCategory()};
+    FileStatus fetchFileStatus(SourceId sourceId) const override;
 
-        return selectProjectDatasForSourceIdsStatement
-            .template valuesWithTransaction<Storage::Synchronization::ProjectData, 64>(
-                toIntegers(projectSourceIds));
-    }
+    std::optional<Storage::Synchronization::ProjectData> fetchProjectData(SourceId sourceId) const override;
 
-    void setPropertyEditorPathId(TypeId typeId, SourceId pathId)
-    {
-        Sqlite::ImmediateSessionTransaction transaction{database};
+    Storage::Synchronization::ProjectDatas fetchProjectDatas(SourceId projectSourceId) const override;
 
-        upsertPropertyEditorPathIdStatement.write(typeId, pathId);
+    Storage::Synchronization::ProjectDatas fetchProjectDatas(const SourceIds &projectSourceIds) const;
 
-        transaction.commit();
-    }
+    void setPropertyEditorPathId(TypeId typeId, SourceId pathId);
 
-    SourceId propertyEditorPathId(TypeId typeId) const override
-    {
-        return selectPropertyEditorPathIdStatement.template valueWithTransaction<SourceId>(typeId);
-    }
+    SourceId propertyEditorPathId(TypeId typeId) const override;
 
-    Storage::Imports fetchDocumentImports() const
-    {
-        NanotraceHR::Tracer tracer{"fetch document imports"_t, projectStorageCategory()};
+    Storage::Imports fetchDocumentImports() const;
 
-        return selectAllDocumentImportForSourceIdStatement
-            .template valuesWithTransaction<Storage::Imports>();
-    }
-
-    void resetForTestsOnly()
-    {
-        database.clearAllTablesForTestsOnly();
-        commonTypeCache_.clearForTestsOnly();
-        moduleCache.clearForTestOnly();
-    }
+    void resetForTestsOnly();
 
 private:
     class ModuleStorageAdapter
@@ -818,12 +269,11 @@ private:
         }
     };
 
+    using Modules = std::vector<Module>;
+
     friend ModuleStorageAdapter;
 
-    static bool moduleNameLess(Utils::SmallStringView first, Utils::SmallStringView second) noexcept
-    {
-        return first < second;
-    }
+    static bool moduleNameLess(Utils::SmallStringView first, Utils::SmallStringView second) noexcept;
 
     using ModuleCache = StorageCache<Utils::PathString,
                                      Utils::SmallStringView,
@@ -833,29 +283,13 @@ private:
                                      moduleNameLess,
                                      Module>;
 
-    ModuleId fetchModuleId(Utils::SmallStringView moduleName)
-    {
-        return Sqlite::withDeferredTransaction(database,
-                                               [&] { return fetchModuleIdUnguarded(moduleName); });
-    }
+    ModuleId fetchModuleId(Utils::SmallStringView moduleName);
 
-    auto fetchModuleName(ModuleId id)
-    {
-        return Sqlite::withDeferredTransaction(database, [&] { return fetchModuleNameUnguarded(id); });
-    }
+    Utils::PathString fetchModuleName(ModuleId id);
 
-    auto fetchAllModules() const
-    {
-        return selectAllModulesStatement.template valuesWithTransaction<Module, 128>();
-    }
+    Modules fetchAllModules() const;
 
-    void callRefreshMetaInfoCallback(const TypeIds &deletedTypeIds)
-    {
-        if (deletedTypeIds.size()) {
-            for (ProjectStorageObserver *observer : observers)
-                observer->removedTypeIds(deletedTypeIds);
-        }
-    }
+    void callRefreshMetaInfoCallback(const TypeIds &deletedTypeIds);
 
     class AliasPropertyDeclaration
     {
@@ -882,6 +316,25 @@ private:
                    < std::tie(second.typeId, second.propertyDeclarationId);
         }
 
+        template<typename String>
+        friend void convertToString(String &string,
+                                    const AliasPropertyDeclaration &aliasPropertyDeclaration)
+        {
+            using NanotraceHR::dictonary;
+            using NanotraceHR::keyValue;
+            auto dict = dictonary(
+                keyValue("type id", aliasPropertyDeclaration.typeId),
+                keyValue("property declaration id", aliasPropertyDeclaration.propertyDeclarationId),
+                keyValue("alias imported type name id",
+                         aliasPropertyDeclaration.aliasImportedTypeNameId),
+                keyValue("alias property name", aliasPropertyDeclaration.aliasPropertyName),
+                keyValue("alias property name tail", aliasPropertyDeclaration.aliasPropertyNameTail),
+                keyValue("alias property declaration id",
+                         aliasPropertyDeclaration.aliasPropertyDeclarationId));
+
+            convertToString(string, dict);
+        }
+
     public:
         TypeId typeId;
         PropertyDeclarationId propertyDeclarationId;
@@ -910,6 +363,20 @@ private:
                    < std::tie(second.typeId, second.propertyDeclarationId);
         }
 
+        template<typename String>
+        friend void convertToString(String &string, const PropertyDeclaration &propertyDeclaration)
+        {
+            using NanotraceHR::dictonary;
+            using NanotraceHR::keyValue;
+            auto dict = dictonary(keyValue("type id", propertyDeclaration.typeId),
+                                  keyValue("property declaration id",
+                                           propertyDeclaration.propertyDeclarationId),
+                                  keyValue("imported type name id",
+                                           propertyDeclaration.importedTypeNameId));
+
+            convertToString(string, dict);
+        }
+
     public:
         TypeId typeId;
         PropertyDeclarationId propertyDeclarationId;
@@ -931,6 +398,17 @@ private:
             return first.typeId < second.typeId;
         }
 
+        template<typename String>
+        friend void convertToString(String &string, const Prototype &prototype)
+        {
+            using NanotraceHR::dictonary;
+            using NanotraceHR::keyValue;
+            auto dict = dictonary(keyValue("type id", prototype.typeId),
+                                  keyValue("prototype name id", prototype.prototypeNameId));
+
+            convertToString(string, dict);
+        }
+
     public:
         TypeId typeId;
         ImportedTypeNameId prototypeNameId;
@@ -970,37 +448,14 @@ private:
         }
     };
 
-    SourceIds filterSourceIdsWithoutType(const SourceIds &updatedSourceIds, SourceIds &sourceIdsOfTypes)
-    {
-        std::sort(sourceIdsOfTypes.begin(), sourceIdsOfTypes.end());
+    SourceIds filterSourceIdsWithoutType(const SourceIds &updatedSourceIds,
+                                         SourceIds &sourceIdsOfTypes);
 
-        SourceIds sourceIdsWithoutTypeSourceIds;
-        sourceIdsWithoutTypeSourceIds.reserve(updatedSourceIds.size());
-        std::set_difference(updatedSourceIds.begin(),
-                            updatedSourceIds.end(),
-                            sourceIdsOfTypes.begin(),
-                            sourceIdsOfTypes.end(),
-                            std::back_inserter(sourceIdsWithoutTypeSourceIds));
+    TypeIds fetchTypeIds(const SourceIds &sourceIds);
 
-        return sourceIdsWithoutTypeSourceIds;
-    }
+    void unique(SourceIds &sourceIds);
 
-    TypeIds fetchTypeIds(const SourceIds &sourceIds)
-    {
-        return selectTypeIdsForSourceIdsStatement.template values<TypeId, 128>(toIntegers(sourceIds));
-    }
-
-    void unique(SourceIds &sourceIds)
-    {
-        std::sort(sourceIds.begin(), sourceIds.end());
-        auto newEnd = std::unique(sourceIds.begin(), sourceIds.end());
-        sourceIds.erase(newEnd, sourceIds.end());
-    }
-
-    void synchronizeTypeTraits(TypeId typeId, Storage::TypeTraits traits)
-    {
-        updateTypeAnnotationTraitStatement.write(typeId, traits.annotation);
-    }
+    void synchronizeTypeTraits(TypeId typeId, Storage::TypeTraits traits);
 
     class TypeAnnotationView
     {
@@ -1015,6 +470,19 @@ private:
             , hintsJson{hintsJson}
         {}
 
+        template<typename String>
+        friend void convertToString(String &string, const TypeAnnotationView &typeAnnotationView)
+        {
+            using NanotraceHR::dictonary;
+            using NanotraceHR::keyValue;
+            auto dict = dictonary(keyValue("type id", typeAnnotationView.typeId),
+                                  keyValue("icon path", typeAnnotationView.iconPath),
+                                  keyValue("item library json", typeAnnotationView.itemLibraryJson),
+                                  keyValue("hints json", typeAnnotationView.hintsJson));
+
+            convertToString(string, dict);
+        }
+
     public:
         TypeId typeId;
         Utils::SmallStringView iconPath;
@@ -1022,75 +490,21 @@ private:
         Utils::PathString hintsJson;
     };
 
-    void updateTypeIdInTypeAnnotations(Storage::Synchronization::TypeAnnotations &typeAnnotations)
-    {
-        for (auto &annotation : typeAnnotations) {
-            annotation.typeId = fetchTypeIdByModuleIdAndExportedName(annotation.moduleId,
-                                                                     annotation.typeName);
-        }
-    }
+    void updateTypeIdInTypeAnnotations(Storage::Synchronization::TypeAnnotations &typeAnnotations);
 
-    void synchronizeTypeAnnotations(Storage::Synchronization::TypeAnnotations &typeAnnotations,
-                                    const SourceIds &updatedTypeAnnotationSourceIds)
+    template<typename Value>
+    static Sqlite::ValueView createEmptyAsNull(const Value &value)
     {
-        NanotraceHR::Tracer tracer{"synchronize type annotations"_t, projectStorageCategory()};
-
-        using Storage::Synchronization::TypeAnnotation;
-
-        updateTypeIdInTypeAnnotations(typeAnnotations);
-
-        auto compareKey = [](auto &&first, auto &&second) { return first.typeId - second.typeId; };
-
-        std::sort(typeAnnotations.begin(), typeAnnotations.end(), [&](auto &&first, auto &&second) {
-            return first.typeId < second.typeId;
-        });
+        if (value.size())
+            return Sqlite::ValueView::create(value);
 
-        auto range = selectTypeAnnotationsForSourceIdsStatement.template range<TypeAnnotationView>(
-            toIntegers(updatedTypeAnnotationSourceIds));
-
-        auto insert = [&](const TypeAnnotation &annotation) {
-            if (!annotation.sourceId)
-                throw TypeAnnotationHasInvalidSourceId{};
-
-            synchronizeTypeTraits(annotation.typeId, annotation.traits);
-
-            insertTypeAnnotationStatement.write(annotation.typeId,
-                                                annotation.sourceId,
-                                                annotation.iconPath,
-                                                annotation.itemLibraryJson,
-                                                annotation.hintsJson);
-        };
-
-        auto update = [&](const TypeAnnotationView &annotationFromDatabase,
-                          const TypeAnnotation &annotation) {
-            synchronizeTypeTraits(annotation.typeId, annotation.traits);
-
-            if (annotationFromDatabase.iconPath != annotation.iconPath
-                || annotationFromDatabase.itemLibraryJson != annotation.itemLibraryJson
-                || annotationFromDatabase.hintsJson != annotation.hintsJson) {
-                updateTypeAnnotationStatement.write(annotation.typeId,
-                                                    annotation.iconPath,
-                                                    annotation.itemLibraryJson,
-                                                    annotation.hintsJson);
-                return Sqlite::UpdateChange::Update;
-            }
-
-            return Sqlite::UpdateChange::No;
-        };
-
-        auto remove = [&](const TypeAnnotationView &annotationFromDatabase) {
-            synchronizeTypeTraits(annotationFromDatabase.typeId, Storage::TypeTraits{});
-
-            deleteTypeAnnotationStatement.write(annotationFromDatabase.typeId);
-        };
-
-        Sqlite::insertUpdateDelete(range, typeAnnotations, compareKey, insert, update, remove);
+        return Sqlite::ValueView{};
     }
 
-    void synchronizeTypeTrait(const Storage::Synchronization::Type &type)
-    {
-        updateTypeTraitStatement.write(type.typeId, type.traits.type);
-    }
+    void synchronizeTypeAnnotations(Storage::Synchronization::TypeAnnotations &typeAnnotations,
+                                    const SourceIds &updatedTypeAnnotationSourceIds);
+
+    void synchronizeTypeTrait(const Storage::Synchronization::Type &type);
 
     void synchronizeTypes(Storage::Synchronization::Types &types,
                           TypeIds &updatedTypeIds,
@@ -1100,384 +514,60 @@ private:
                           PropertyDeclarations &relinkablePropertyDeclarations,
                           Prototypes &relinkablePrototypes,
                           Prototypes &relinkableExtensions,
-                          const SourceIds &updatedSourceIds)
-    {
-        NanotraceHR::Tracer tracer{"synchronize types"_t, projectStorageCategory()};
-
-        Storage::Synchronization::ExportedTypes exportedTypes;
-        exportedTypes.reserve(types.size() * 3);
-        SourceIds sourceIdsOfTypes;
-        sourceIdsOfTypes.reserve(updatedSourceIds.size());
-        SourceIds notUpdatedExportedSourceIds;
-        notUpdatedExportedSourceIds.reserve(updatedSourceIds.size());
-        SourceIds exportedSourceIds;
-        exportedSourceIds.reserve(types.size());
-
-        for (auto &type : types) {
-            if (!type.sourceId)
-                throw TypeHasInvalidSourceId{};
-
-            TypeId typeId = declareType(type);
-            synchronizeTypeTrait(type);
-            sourceIdsOfTypes.push_back(type.sourceId);
-            updatedTypeIds.push_back(typeId);
-            if (type.changeLevel != Storage::Synchronization::ChangeLevel::ExcludeExportedTypes) {
-                exportedSourceIds.push_back(type.sourceId);
-                extractExportedTypes(typeId, type, exportedTypes);
-            }
-        }
-
-        std::sort(types.begin(), types.end(), [](const auto &first, const auto &second) {
-            return first.typeId < second.typeId;
-        });
-
-        unique(exportedSourceIds);
-
-        SourceIds sourceIdsWithoutType = filterSourceIdsWithoutType(updatedSourceIds,
-                                                                    sourceIdsOfTypes);
-        exportedSourceIds.insert(exportedSourceIds.end(),
-                                 sourceIdsWithoutType.begin(),
-                                 sourceIdsWithoutType.end());
-        TypeIds exportedTypeIds = fetchTypeIds(exportedSourceIds);
-        synchronizeExportedTypes(exportedTypeIds,
-                                 exportedTypes,
-                                 relinkableAliasPropertyDeclarations,
-                                 relinkablePropertyDeclarations,
-                                 relinkablePrototypes,
-                                 relinkableExtensions);
-
-        syncPrototypesAndExtensions(types, relinkablePrototypes, relinkableExtensions);
-        resetDefaultPropertiesIfChanged(types);
-        resetRemovedAliasPropertyDeclarationsToNull(types, relinkableAliasPropertyDeclarations);
-        syncDeclarations(types,
-                         insertedAliasPropertyDeclarations,
-                         updatedAliasPropertyDeclarations,
-                         relinkablePropertyDeclarations);
-        syncDefaultProperties(types);
-    }
+                          const SourceIds &updatedSourceIds);
 
     void synchronizeProjectDatas(Storage::Synchronization::ProjectDatas &projectDatas,
-                                 const SourceIds &updatedProjectSourceIds)
-    {
-        NanotraceHR::Tracer tracer{"synchronize project datas"_t, projectStorageCategory()};
-
-        auto compareKey = [](auto &&first, auto &&second) {
-            auto projectSourceIdDifference = first.projectSourceId - second.projectSourceId;
-            if (projectSourceIdDifference != 0)
-                return projectSourceIdDifference;
-
-            return first.sourceId - second.sourceId;
-        };
-
-        std::sort(projectDatas.begin(), projectDatas.end(), [&](auto &&first, auto &&second) {
-            return std::tie(first.projectSourceId, first.sourceId)
-                   < std::tie(second.projectSourceId, second.sourceId);
-        });
-
-        auto range = selectProjectDatasForSourceIdsStatement
-                         .template range<Storage::Synchronization::ProjectData>(
-                             toIntegers(updatedProjectSourceIds));
-
-        auto insert = [&](const Storage::Synchronization::ProjectData &projectData) {
-            if (!projectData.projectSourceId)
-                throw ProjectDataHasInvalidProjectSourceId{};
-            if (!projectData.sourceId)
-                throw ProjectDataHasInvalidSourceId{};
-
-            insertProjectDataStatement.write(projectData.projectSourceId,
-                                             projectData.sourceId,
-                                             projectData.moduleId,
-                                             projectData.fileType);
-        };
-
-        auto update = [&](const Storage::Synchronization::ProjectData &projectDataFromDatabase,
-                          const Storage::Synchronization::ProjectData &projectData) {
-            if (projectDataFromDatabase.fileType != projectData.fileType
-                || !compareInvalidAreTrue(projectDataFromDatabase.moduleId, projectData.moduleId)) {
-                updateProjectDataStatement.write(projectData.projectSourceId,
-                                                 projectData.sourceId,
-                                                 projectData.moduleId,
-                                                 projectData.fileType);
-                return Sqlite::UpdateChange::Update;
-            }
-
-            return Sqlite::UpdateChange::No;
-        };
-
-        auto remove = [&](const Storage::Synchronization::ProjectData &projectData) {
-            deleteProjectDataStatement.write(projectData.projectSourceId, projectData.sourceId);
-        };
-
-        Sqlite::insertUpdateDelete(range, projectDatas, compareKey, insert, update, remove);
-    }
+                                 const SourceIds &updatedProjectSourceIds);
 
-    void synchronizeFileStatuses(FileStatuses &fileStatuses, const SourceIds &updatedSourceIds)
-    {
-        NanotraceHR::Tracer tracer{"synchronize file statuses"_t, projectStorageCategory()};
-
-        auto compareKey = [](auto &&first, auto &&second) {
-            return first.sourceId - second.sourceId;
-        };
-
-        std::sort(fileStatuses.begin(), fileStatuses.end(), [&](auto &&first, auto &&second) {
-            return first.sourceId < second.sourceId;
-        });
-
-        auto range = selectFileStatusesForSourceIdsStatement.template range<FileStatus>(
-            toIntegers(updatedSourceIds));
-
-        auto insert = [&](const FileStatus &fileStatus) {
-            if (!fileStatus.sourceId)
-                throw FileStatusHasInvalidSourceId{};
-            insertFileStatusStatement.write(fileStatus.sourceId,
-                                            fileStatus.size,
-                                            fileStatus.lastModified);
-        };
-
-        auto update = [&](const FileStatus &fileStatusFromDatabase, const FileStatus &fileStatus) {
-            if (fileStatusFromDatabase.lastModified != fileStatus.lastModified
-                || fileStatusFromDatabase.size != fileStatus.size) {
-                updateFileStatusStatement.write(fileStatus.sourceId,
-                                                fileStatus.size,
-                                                fileStatus.lastModified);
-                return Sqlite::UpdateChange::Update;
-            }
-
-            return Sqlite::UpdateChange::No;
-        };
-
-        auto remove = [&](const FileStatus &fileStatus) {
-            deleteFileStatusStatement.write(fileStatus.sourceId);
-        };
-
-        Sqlite::insertUpdateDelete(range, fileStatuses, compareKey, insert, update, remove);
-    }
+    void synchronizeFileStatuses(FileStatuses &fileStatuses, const SourceIds &updatedSourceIds);
 
     void synchronizeImports(Storage::Imports &imports,
                             const SourceIds &updatedSourceIds,
                             Storage::Imports &moduleDependencies,
                             const SourceIds &updatedModuleDependencySourceIds,
                             Storage::Synchronization::ModuleExportedImports &moduleExportedImports,
-                            const ModuleIds &updatedModuleIds)
-    {
-        NanotraceHR::Tracer tracer{"synchronize imports"_t, projectStorageCategory()};
-
-        synchromizeModuleExportedImports(moduleExportedImports, updatedModuleIds);
-        synchronizeDocumentImports(imports,
-                                   updatedSourceIds,
-                                   Storage::Synchronization::ImportKind::Import);
-        synchronizeDocumentImports(moduleDependencies,
-                                   updatedModuleDependencySourceIds,
-                                   Storage::Synchronization::ImportKind::ModuleDependency);
-    }
+                            const ModuleIds &updatedModuleIds);
 
     void synchromizeModuleExportedImports(
         Storage::Synchronization::ModuleExportedImports &moduleExportedImports,
-        const ModuleIds &updatedModuleIds)
-    {
-        std::sort(moduleExportedImports.begin(),
-                  moduleExportedImports.end(),
-                  [](auto &&first, auto &&second) {
-                      return std::tie(first.moduleId, first.exportedModuleId)
-                             < std::tie(second.moduleId, second.exportedModuleId);
-                  });
-
-        auto range = selectModuleExportedImportsForSourceIdStatement
-                         .template range<Storage::Synchronization::ModuleExportedImportView>(
-                             toIntegers(updatedModuleIds));
-
-        auto compareKey = [](const Storage::Synchronization::ModuleExportedImportView &view,
-                             const Storage::Synchronization::ModuleExportedImport &import) -> long long {
-            auto moduleIdDifference = view.moduleId - import.moduleId;
-            if (moduleIdDifference != 0)
-                return moduleIdDifference;
-
-            return view.exportedModuleId - import.exportedModuleId;
-        };
-
-        auto insert = [&](const Storage::Synchronization::ModuleExportedImport &import) {
-            if (import.version.minor) {
-                insertModuleExportedImportWithVersionStatement.write(import.moduleId,
-                                                                     import.exportedModuleId,
-                                                                     import.isAutoVersion,
-                                                                     import.version.major.value,
-                                                                     import.version.minor.value);
-            } else if (import.version.major) {
-                insertModuleExportedImportWithMajorVersionStatement.write(import.moduleId,
-                                                                          import.exportedModuleId,
-                                                                          import.isAutoVersion,
-                                                                          import.version.major.value);
-            } else {
-                insertModuleExportedImportWithoutVersionStatement.write(import.moduleId,
-                                                                        import.exportedModuleId,
-                                                                        import.isAutoVersion);
-            }
-        };
-
-        auto update = [](const Storage::Synchronization::ModuleExportedImportView &,
-                         const Storage::Synchronization::ModuleExportedImport &) {
-            return Sqlite::UpdateChange::No;
-        };
-
-        auto remove = [&](const Storage::Synchronization::ModuleExportedImportView &view) {
-            deleteModuleExportedImportStatement.write(view.moduleExportedImportId);
-        };
-
-        Sqlite::insertUpdateDelete(range, moduleExportedImports, compareKey, insert, update, remove);
-    }
+        const ModuleIds &updatedModuleIds);
 
-    ModuleId fetchModuleIdUnguarded(Utils::SmallStringView name) const override
-    {
-        auto moduleId = selectModuleIdByNameStatement.template value<ModuleId>(name);
+    ModuleId fetchModuleIdUnguarded(Utils::SmallStringView name) const override;
 
-        if (moduleId)
-            return moduleId;
-
-        return insertModuleNameStatement.template value<ModuleId>(name);
-    }
-
-    auto fetchModuleNameUnguarded(ModuleId id) const
-    {
-        auto moduleName = selectModuleNameStatement.template value<Utils::PathString>(id);
-
-        if (moduleName.empty())
-            throw ModuleDoesNotExists{};
-
-        return moduleName;
-    }
+    Utils::PathString fetchModuleNameUnguarded(ModuleId id) const;
 
     void handleAliasPropertyDeclarationsWithPropertyType(
-        TypeId typeId, AliasPropertyDeclarations &relinkableAliasPropertyDeclarations)
-    {
-        auto callback = [&](TypeId typeId_,
-                            PropertyDeclarationId propertyDeclarationId,
-                            ImportedTypeNameId propertyImportedTypeNameId,
-                            PropertyDeclarationId aliasPropertyDeclarationId,
-                            PropertyDeclarationId aliasPropertyDeclarationTailId) {
-            auto aliasPropertyName = selectPropertyNameStatement.template value<Utils::SmallString>(
-                aliasPropertyDeclarationId);
-            Utils::SmallString aliasPropertyNameTail;
-            if (aliasPropertyDeclarationTailId)
-                aliasPropertyNameTail = selectPropertyNameStatement.template value<Utils::SmallString>(
-                    aliasPropertyDeclarationTailId);
-
-            relinkableAliasPropertyDeclarations
-                .emplace_back(TypeId{typeId_},
-                              PropertyDeclarationId{propertyDeclarationId},
-                              ImportedTypeNameId{propertyImportedTypeNameId},
-                              std::move(aliasPropertyName),
-                              std::move(aliasPropertyNameTail));
-
-            updateAliasPropertyDeclarationToNullStatement.write(propertyDeclarationId);
-        };
-
-        selectAliasPropertiesDeclarationForPropertiesWithTypeIdStatement.readCallback(callback,
-                                                                                      typeId);
-    }
+        TypeId typeId, AliasPropertyDeclarations &relinkableAliasPropertyDeclarations);
 
     void handlePropertyDeclarationWithPropertyType(TypeId typeId,
-                                                   PropertyDeclarations &relinkablePropertyDeclarations)
-    {
-        updatesPropertyDeclarationPropertyTypeToNullStatement.readTo(relinkablePropertyDeclarations,
-                                                                     typeId);
-    }
-
-    void handlePrototypes(TypeId prototypeId, Prototypes &relinkablePrototypes)
-    {
-        auto callback = [&](TypeId typeId, ImportedTypeNameId prototypeNameId) {
-            relinkablePrototypes.emplace_back(typeId, prototypeNameId);
-        };
+                                                   PropertyDeclarations &relinkablePropertyDeclarations);
 
-        updatePrototypeIdToNullStatement.readCallback(callback, prototypeId);
-    }
+    void handlePrototypes(TypeId prototypeId, Prototypes &relinkablePrototypes);
 
-    void handleExtensions(TypeId extensionId, Prototypes &relinkableExtensions)
-    {
-        auto callback = [&](TypeId typeId, ImportedTypeNameId extensionNameId) {
-            relinkableExtensions.emplace_back(typeId, extensionNameId);
-        };
-
-        updateExtensionIdToNullStatement.readCallback(callback, extensionId);
-    }
+    void handleExtensions(TypeId extensionId, Prototypes &relinkableExtensions);
 
     void deleteType(TypeId typeId,
                     AliasPropertyDeclarations &relinkableAliasPropertyDeclarations,
                     PropertyDeclarations &relinkablePropertyDeclarations,
                     Prototypes &relinkablePrototypes,
-                    Prototypes &relinkableExtensions)
-    {
-        handlePropertyDeclarationWithPropertyType(typeId, relinkablePropertyDeclarations);
-        handleAliasPropertyDeclarationsWithPropertyType(typeId, relinkableAliasPropertyDeclarations);
-        handlePrototypes(typeId, relinkablePrototypes);
-        handleExtensions(typeId, relinkableExtensions);
-        deleteTypeNamesByTypeIdStatement.write(typeId);
-        deleteEnumerationDeclarationByTypeIdStatement.write(typeId);
-        deletePropertyDeclarationByTypeIdStatement.write(typeId);
-        deleteFunctionDeclarationByTypeIdStatement.write(typeId);
-        deleteSignalDeclarationByTypeIdStatement.write(typeId);
-        deleteTypeStatement.write(typeId);
-    }
+                    Prototypes &relinkableExtensions);
 
     void relinkAliasPropertyDeclarations(AliasPropertyDeclarations &aliasPropertyDeclarations,
-                                         const TypeIds &deletedTypeIds)
-    {
-        NanotraceHR::Tracer tracer{"relink alias properties"_t, projectStorageCategory()};
-
-        std::sort(aliasPropertyDeclarations.begin(), aliasPropertyDeclarations.end());
-
-        Utils::set_greedy_difference(
-            aliasPropertyDeclarations.cbegin(),
-            aliasPropertyDeclarations.cend(),
-            deletedTypeIds.begin(),
-            deletedTypeIds.end(),
-            [&](const AliasPropertyDeclaration &alias) {
-                auto typeId = fetchTypeId(alias.aliasImportedTypeNameId);
-
-                if (!typeId)
-                    throw TypeNameDoesNotExists{fetchImportedTypeName(alias.aliasImportedTypeNameId)};
-
-                auto [propertyTypeId, aliasId, propertyTraits] = fetchPropertyDeclarationByTypeIdAndNameUngarded(
-                    typeId, alias.aliasPropertyName);
-
-                updatePropertyDeclarationWithAliasAndTypeStatement.write(alias.propertyDeclarationId,
-                                                                         propertyTypeId,
-                                                                         propertyTraits,
-                                                                         alias.aliasImportedTypeNameId,
-                                                                         aliasId);
-            },
-            TypeCompare<AliasPropertyDeclaration>{});
-    }
+                                         const TypeIds &deletedTypeIds);
 
     void relinkPropertyDeclarations(PropertyDeclarations &relinkablePropertyDeclaration,
-                                    const TypeIds &deletedTypeIds)
-    {
-        NanotraceHR::Tracer tracer{"relink properties"_t, projectStorageCategory()};
-
-        std::sort(relinkablePropertyDeclaration.begin(), relinkablePropertyDeclaration.end());
-
-        Utils::set_greedy_difference(
-            relinkablePropertyDeclaration.cbegin(),
-            relinkablePropertyDeclaration.cend(),
-            deletedTypeIds.begin(),
-            deletedTypeIds.end(),
-            [&](const PropertyDeclaration &property) {
-                TypeId propertyTypeId = fetchTypeId(property.importedTypeNameId);
-
-                if (!propertyTypeId)
-                    throw TypeNameDoesNotExists{fetchImportedTypeName(property.importedTypeNameId)};
-
-                updatePropertyDeclarationTypeStatement.write(property.propertyDeclarationId,
-                                                             propertyTypeId);
-            },
-            TypeCompare<PropertyDeclaration>{});
-    }
+                                    const TypeIds &deletedTypeIds);
 
     template<typename Callable>
     void relinkPrototypes(Prototypes &relinkablePrototypes,
                           const TypeIds &deletedTypeIds,
                           Callable updateStatement)
     {
-        NanotraceHR::Tracer tracer{"relink prototypes"_t, projectStorageCategory()};
+        using NanotraceHR::keyValue;
+        NanotraceHR::Tracer tracer{"relink prototypes"_t,
+                                   projectStorageCategory(),
+                                   keyValue("relinkable prototypes", relinkablePrototypes),
+                                   keyValue("deleted type ids", deletedTypeIds)};
 
         std::sort(relinkablePrototypes.begin(), relinkablePrototypes.end());
 
@@ -1505,295 +595,66 @@ private:
                                PropertyDeclarations &relinkablePropertyDeclarations,
                                Prototypes &relinkablePrototypes,
                                Prototypes &relinkableExtensions,
-                               TypeIds &deletedTypeIds)
-    {
-        NanotraceHR::Tracer tracer{"delete not updated types"_t, projectStorageCategory()};
-
-        auto callback = [&](TypeId typeId) {
-            deletedTypeIds.push_back(typeId);
-            deleteType(typeId,
-                       relinkableAliasPropertyDeclarations,
-                       relinkablePropertyDeclarations,
-                       relinkablePrototypes,
-                       relinkableExtensions);
-        };
-
-        selectNotUpdatedTypesInSourcesStatement.readCallback(callback,
-                                                             toIntegers(updatedSourceIds),
-                                                             toIntegers(updatedTypeIds));
-        for (TypeId typeIdToBeDeleted : typeIdsToBeDeleted)
-            callback(typeIdToBeDeleted);
-    }
+                               TypeIds &deletedTypeIds);
 
     void relink(AliasPropertyDeclarations &relinkableAliasPropertyDeclarations,
                 PropertyDeclarations &relinkablePropertyDeclarations,
                 Prototypes &relinkablePrototypes,
                 Prototypes &relinkableExtensions,
-                TypeIds &deletedTypeIds)
-    {
-        NanotraceHR::Tracer tracer{"relink"_t, projectStorageCategory()};
-
-        std::sort(deletedTypeIds.begin(), deletedTypeIds.end());
-
-        relinkPrototypes(relinkablePrototypes, deletedTypeIds, [&](TypeId typeId, TypeId prototypeId) {
-            updateTypePrototypeStatement.write(typeId, prototypeId);
-        });
-        relinkPrototypes(relinkableExtensions, deletedTypeIds, [&](TypeId typeId, TypeId prototypeId) {
-            updateTypeExtensionStatement.write(typeId, prototypeId);
-        });
-        relinkPropertyDeclarations(relinkablePropertyDeclarations, deletedTypeIds);
-        relinkAliasPropertyDeclarations(relinkableAliasPropertyDeclarations, deletedTypeIds);
-    }
+                TypeIds &deletedTypeIds);
 
     PropertyDeclarationId fetchAliasId(TypeId aliasTypeId,
                                        Utils::SmallStringView aliasPropertyName,
-                                       Utils::SmallStringView aliasPropertyNameTail)
-    {
-        if (aliasPropertyNameTail.empty())
-            return fetchPropertyDeclarationIdByTypeIdAndNameUngarded(aliasTypeId, aliasPropertyName);
-
-        auto stemAlias = fetchPropertyDeclarationByTypeIdAndNameUngarded(aliasTypeId,
-                                                                         aliasPropertyName);
-
-        return fetchPropertyDeclarationIdByTypeIdAndNameUngarded(stemAlias.propertyTypeId,
-                                                                 aliasPropertyNameTail);
-    }
+                                       Utils::SmallStringView aliasPropertyNameTail);
 
-    void linkAliasPropertyDeclarationAliasIds(const AliasPropertyDeclarations &aliasDeclarations)
-    {
-        for (const auto &aliasDeclaration : aliasDeclarations) {
-            auto aliasTypeId = fetchTypeId(aliasDeclaration.aliasImportedTypeNameId);
-
-            if (!aliasTypeId) {
-                throw TypeNameDoesNotExists{
-                    fetchImportedTypeName(aliasDeclaration.aliasImportedTypeNameId)};
-            }
-
-            auto aliasId = fetchAliasId(aliasTypeId,
-                                        aliasDeclaration.aliasPropertyName,
-                                        aliasDeclaration.aliasPropertyNameTail);
-
-            updatePropertyDeclarationAliasIdAndTypeNameIdStatement
-                .write(aliasDeclaration.propertyDeclarationId,
-                       aliasId,
-                       aliasDeclaration.aliasImportedTypeNameId);
-        }
-    }
+    void linkAliasPropertyDeclarationAliasIds(const AliasPropertyDeclarations &aliasDeclarations);
 
-    void updateAliasPropertyDeclarationValues(const AliasPropertyDeclarations &aliasDeclarations)
-    {
-        for (const auto &aliasDeclaration : aliasDeclarations) {
-            updatetPropertiesDeclarationValuesOfAliasStatement.write(
-                aliasDeclaration.propertyDeclarationId);
-            updatePropertyAliasDeclarationRecursivelyStatement.write(
-                aliasDeclaration.propertyDeclarationId);
-        }
-    }
+    void updateAliasPropertyDeclarationValues(const AliasPropertyDeclarations &aliasDeclarations);
 
-    void checkAliasPropertyDeclarationCycles(const AliasPropertyDeclarations &aliasDeclarations)
-    {
-        for (const auto &aliasDeclaration : aliasDeclarations)
-            checkForAliasChainCycle(aliasDeclaration.propertyDeclarationId);
-    }
+    void checkAliasPropertyDeclarationCycles(const AliasPropertyDeclarations &aliasDeclarations);
 
     void linkAliases(const AliasPropertyDeclarations &insertedAliasPropertyDeclarations,
-                     const AliasPropertyDeclarations &updatedAliasPropertyDeclarations)
-    {
-        NanotraceHR::Tracer tracer{"link aliases"_t, projectStorageCategory()};
-
-        linkAliasPropertyDeclarationAliasIds(insertedAliasPropertyDeclarations);
-        linkAliasPropertyDeclarationAliasIds(updatedAliasPropertyDeclarations);
-
-        checkAliasPropertyDeclarationCycles(insertedAliasPropertyDeclarations);
-        checkAliasPropertyDeclarationCycles(updatedAliasPropertyDeclarations);
-
-        updateAliasPropertyDeclarationValues(insertedAliasPropertyDeclarations);
-        updateAliasPropertyDeclarationValues(updatedAliasPropertyDeclarations);
-    }
+                     const AliasPropertyDeclarations &updatedAliasPropertyDeclarations);
 
     void synchronizeExportedTypes(const TypeIds &updatedTypeIds,
                                   Storage::Synchronization::ExportedTypes &exportedTypes,
                                   AliasPropertyDeclarations &relinkableAliasPropertyDeclarations,
                                   PropertyDeclarations &relinkablePropertyDeclarations,
                                   Prototypes &relinkablePrototypes,
-                                  Prototypes &relinkableExtensions)
-    {
-        NanotraceHR::Tracer tracer{"synchronize exported types"_t, projectStorageCategory()};
-
-        std::sort(exportedTypes.begin(), exportedTypes.end(), [](auto &&first, auto &&second) {
-            if (first.moduleId < second.moduleId)
-                return true;
-            else if (first.moduleId > second.moduleId)
-                return false;
-
-            auto nameCompare = Sqlite::compare(first.name, second.name);
-
-            if (nameCompare < 0)
-                return true;
-            else if (nameCompare > 0)
-                return false;
-
-            return first.version < second.version;
-        });
-
-        auto range = selectExportedTypesForSourceIdsStatement
-                         .template range<Storage::Synchronization::ExportedTypeView>(
-                             toIntegers(updatedTypeIds));
-
-        auto compareKey = [](const Storage::Synchronization::ExportedTypeView &view,
-                             const Storage::Synchronization::ExportedType &type) -> long long {
-            auto moduleIdDifference = view.moduleId - type.moduleId;
-            if (moduleIdDifference != 0)
-                return moduleIdDifference;
-
-            auto nameDifference = Sqlite::compare(view.name, type.name);
-            if (nameDifference != 0)
-                return nameDifference;
-
-            auto versionDifference = view.version.major.value - type.version.major.value;
-            if (versionDifference != 0)
-                return versionDifference;
-
-            return view.version.minor.value - type.version.minor.value;
-        };
-
-        auto insert = [&](const Storage::Synchronization::ExportedType &type) {
-            if (!type.moduleId)
-                throw QmlDesigner::ModuleDoesNotExists{};
-
-            try {
-                if (type.version) {
-                    insertExportedTypeNamesWithVersionStatement.write(type.moduleId,
-                                                                      type.name,
-                                                                      type.version.major.value,
-                                                                      type.version.minor.value,
-                                                                      type.typeId);
-
-                } else if (type.version.major) {
-                    insertExportedTypeNamesWithMajorVersionStatement.write(type.moduleId,
-                                                                           type.name,
-                                                                           type.version.major.value,
-                                                                           type.typeId);
-                } else {
-                    insertExportedTypeNamesWithoutVersionStatement.write(type.moduleId,
-                                                                         type.name,
-                                                                         type.typeId);
-                }
-            } catch (const Sqlite::ConstraintPreventsModification &) {
-                throw QmlDesigner::ExportedTypeCannotBeInserted{type.name};
-            }
-        };
-
-        auto update = [&](const Storage::Synchronization::ExportedTypeView &view,
-                          const Storage::Synchronization::ExportedType &type) {
-            if (view.typeId != type.typeId) {
-                handlePropertyDeclarationWithPropertyType(view.typeId, relinkablePropertyDeclarations);
-                handleAliasPropertyDeclarationsWithPropertyType(view.typeId,
-                                                                relinkableAliasPropertyDeclarations);
-                handlePrototypes(view.typeId, relinkablePrototypes);
-                handleExtensions(view.typeId, relinkableExtensions);
-                updateExportedTypeNameTypeIdStatement.write(view.exportedTypeNameId, type.typeId);
-                return Sqlite::UpdateChange::Update;
-            }
-            return Sqlite::UpdateChange::No;
-        };
-
-        auto remove = [&](const Storage::Synchronization::ExportedTypeView &view) {
-            handlePropertyDeclarationWithPropertyType(view.typeId, relinkablePropertyDeclarations);
-            handleAliasPropertyDeclarationsWithPropertyType(view.typeId,
-                                                            relinkableAliasPropertyDeclarations);
-            handlePrototypes(view.typeId, relinkablePrototypes);
-            handleExtensions(view.typeId, relinkableExtensions);
-            deleteExportedTypeNameStatement.write(view.exportedTypeNameId);
-        };
-
-        Sqlite::insertUpdateDelete(range, exportedTypes, compareKey, insert, update, remove);
-    }
+                                  Prototypes &relinkableExtensions);
 
     void synchronizePropertyDeclarationsInsertAlias(
         AliasPropertyDeclarations &insertedAliasPropertyDeclarations,
         const Storage::Synchronization::PropertyDeclaration &value,
         SourceId sourceId,
-        TypeId typeId)
-    {
-        auto callback = [&](PropertyDeclarationId propertyDeclarationId) {
-            insertedAliasPropertyDeclarations.emplace_back(typeId,
-                                                           propertyDeclarationId,
-                                                           fetchImportedTypeNameId(value.typeName,
-                                                                                   sourceId),
-                                                           value.aliasPropertyName,
-                                                           value.aliasPropertyNameTail);
-            return Sqlite::CallbackControl::Abort;
-        };
-
-        insertAliasPropertyDeclarationStatement.readCallback(callback, typeId, value.name);
-    }
+        TypeId typeId);
+
+    QVarLengthArray<PropertyDeclarationId, 128> fetchPropertyDeclarationIds(TypeId baseTypeId) const;
+
+    PropertyDeclarationId fetchNextPropertyDeclarationId(TypeId baseTypeId,
+                                                         Utils::SmallStringView propertyName) const;
+
+    PropertyDeclarationId fetchPropertyDeclarationId(TypeId typeId,
+                                                     Utils::SmallStringView propertyName) const;
+
+    PropertyDeclarationId fetchNextDefaultPropertyDeclarationId(TypeId baseTypeId) const;
+
+    PropertyDeclarationId fetchDefaultPropertyDeclarationId(TypeId typeId) const;
 
     void synchronizePropertyDeclarationsInsertProperty(
-        const Storage::Synchronization::PropertyDeclaration &value, SourceId sourceId, TypeId typeId)
-    {
-        auto propertyImportedTypeNameId = fetchImportedTypeNameId(value.typeName, sourceId);
-        auto propertyTypeId = fetchTypeId(propertyImportedTypeNameId);
-
-        if (!propertyTypeId)
-            throw TypeNameDoesNotExists{fetchImportedTypeName(propertyImportedTypeNameId)};
-
-        auto propertyDeclarationId = insertPropertyDeclarationStatement.template value<PropertyDeclarationId>(
-            typeId, value.name, propertyTypeId, value.traits, propertyImportedTypeNameId);
-
-        auto nextPropertyDeclarationId = selectPropertyDeclarationIdPrototypeChainDownStatement
-                                             .template value<PropertyDeclarationId>(typeId,
-                                                                                    value.name);
-        if (nextPropertyDeclarationId) {
-            updateAliasIdPropertyDeclarationStatement.write(nextPropertyDeclarationId,
-                                                            propertyDeclarationId);
-            updatePropertyAliasDeclarationRecursivelyWithTypeAndTraitsStatement
-                .write(propertyDeclarationId, propertyTypeId, value.traits);
-        }
-    }
+        const Storage::Synchronization::PropertyDeclaration &value, SourceId sourceId, TypeId typeId);
 
     void synchronizePropertyDeclarationsUpdateAlias(
         AliasPropertyDeclarations &updatedAliasPropertyDeclarations,
         const Storage::Synchronization::PropertyDeclarationView &view,
         const Storage::Synchronization::PropertyDeclaration &value,
-        SourceId sourceId)
-    {
-        auto last = updatedAliasPropertyDeclarations.emplace_back(view.typeId,
-                                                                  view.id,
-                                                                  fetchImportedTypeNameId(value.typeName,
-                                                                                          sourceId),
-                                                                  value.aliasPropertyName,
-                                                                  value.aliasPropertyNameTail,
-                                                                  view.aliasId);
-    }
+        SourceId sourceId);
 
-    auto synchronizePropertyDeclarationsUpdateProperty(
+    Sqlite::UpdateChange synchronizePropertyDeclarationsUpdateProperty(
         const Storage::Synchronization::PropertyDeclarationView &view,
         const Storage::Synchronization::PropertyDeclaration &value,
         SourceId sourceId,
-        PropertyDeclarationIds &propertyDeclarationIds)
-    {
-        auto propertyImportedTypeNameId = fetchImportedTypeNameId(value.typeName, sourceId);
-
-        auto propertyTypeId = fetchTypeId(propertyImportedTypeNameId);
-
-        if (!propertyTypeId)
-            throw TypeNameDoesNotExists{fetchImportedTypeName(propertyImportedTypeNameId)};
-
-        if (view.traits == value.traits && propertyTypeId == view.typeId
-            && propertyImportedTypeNameId == view.typeNameId)
-            return Sqlite::UpdateChange::No;
-
-        updatePropertyDeclarationStatement.write(view.id,
-                                                 propertyTypeId,
-                                                 value.traits,
-                                                 propertyImportedTypeNameId);
-        updatePropertyAliasDeclarationRecursivelyWithTypeAndTraitsStatement.write(view.id,
-                                                                                  propertyTypeId,
-                                                                                  value.traits);
-        propertyDeclarationIds.push_back(view.id);
-        return Sqlite::UpdateChange::Update;
-    }
+        PropertyDeclarationIds &propertyDeclarationIds);
 
     void synchronizePropertyDeclarations(
         TypeId typeId,
@@ -1801,270 +662,60 @@ private:
         SourceId sourceId,
         AliasPropertyDeclarations &insertedAliasPropertyDeclarations,
         AliasPropertyDeclarations &updatedAliasPropertyDeclarations,
-        PropertyDeclarationIds &propertyDeclarationIds)
-    {
-        NanotraceHR::Tracer tracer{"synchronize property declaration"_t, projectStorageCategory()};
-
-        std::sort(propertyDeclarations.begin(),
-                  propertyDeclarations.end(),
-                  [](auto &&first, auto &&second) {
-                      return Sqlite::compare(first.name, second.name) < 0;
-                  });
-
-        auto range = selectPropertyDeclarationsForTypeIdStatement
-                         .template range<Storage::Synchronization::PropertyDeclarationView>(typeId);
-
-        auto compareKey = [](const Storage::Synchronization::PropertyDeclarationView &view,
-                             const Storage::Synchronization::PropertyDeclaration &value) {
-            return Sqlite::compare(view.name, value.name);
-        };
-
-        auto insert = [&](const Storage::Synchronization::PropertyDeclaration &value) {
-            if (value.kind == Storage::Synchronization::PropertyKind::Alias) {
-                synchronizePropertyDeclarationsInsertAlias(insertedAliasPropertyDeclarations,
-                                                           value,
-                                                           sourceId,
-                                                           typeId);
-            } else {
-                synchronizePropertyDeclarationsInsertProperty(value, sourceId, typeId);
-            }
-        };
-
-        auto update = [&](const Storage::Synchronization::PropertyDeclarationView &view,
-                          const Storage::Synchronization::PropertyDeclaration &value) {
-            if (value.kind == Storage::Synchronization::PropertyKind::Alias) {
-                synchronizePropertyDeclarationsUpdateAlias(updatedAliasPropertyDeclarations,
-                                                           view,
-                                                           value,
-                                                           sourceId);
-                propertyDeclarationIds.push_back(view.id);
-            } else {
-                return synchronizePropertyDeclarationsUpdateProperty(view,
-                                                                     value,
-                                                                     sourceId,
-                                                                     propertyDeclarationIds);
-            }
-
-            return Sqlite::UpdateChange::No;
-        };
-
-        auto remove = [&](const Storage::Synchronization::PropertyDeclarationView &view) {
-            auto nextPropertyDeclarationId = selectPropertyDeclarationIdPrototypeChainDownStatement
-                                                 .template value<PropertyDeclarationId>(typeId,
-                                                                                        view.name);
-            if (nextPropertyDeclarationId) {
-                updateAliasPropertyDeclarationByAliasPropertyDeclarationIdStatement
-                    .write(nextPropertyDeclarationId, view.id);
-            }
-
-            updateDefaultPropertyIdToNullStatement.write(view.id);
-            deletePropertyDeclarationStatement.write(view.id);
-            propertyDeclarationIds.push_back(view.id);
-        };
-
-        Sqlite::insertUpdateDelete(range, propertyDeclarations, compareKey, insert, update, remove);
-    }
+        PropertyDeclarationIds &propertyDeclarationIds);
 
-    void resetRemovedAliasPropertyDeclarationsToNull(Storage::Synchronization::Type &type,
-                                                     PropertyDeclarationIds &propertyDeclarationIds)
+    class AliasPropertyDeclarationView
     {
-        if (type.changeLevel == Storage::Synchronization::ChangeLevel::Minimal)
-            return;
-
-        Storage::Synchronization::PropertyDeclarations &aliasDeclarations = type.propertyDeclarations;
+    public:
+        explicit AliasPropertyDeclarationView(Utils::SmallStringView name,
+                                              PropertyDeclarationId id,
+                                              PropertyDeclarationId aliasId)
+            : name{name}
+            , id{id}
+            , aliasId{aliasId}
+        {}
 
-        class AliasPropertyDeclarationView
+        template<typename String>
+        friend void convertToString(String &string,
+                                    const AliasPropertyDeclarationView &aliasPropertyDeclarationView)
         {
-        public:
-            explicit AliasPropertyDeclarationView(Utils::SmallStringView name,
-                                                  PropertyDeclarationId id,
-                                                  PropertyDeclarationId aliasId)
-                : name{name}
-                , id{id}
-                , aliasId{aliasId}
-            {}
-
-        public:
-            Utils::SmallStringView name;
-            PropertyDeclarationId id;
-            PropertyDeclarationId aliasId;
-        };
-
-        std::sort(aliasDeclarations.begin(), aliasDeclarations.end(), [](auto &&first, auto &&second) {
-            return Sqlite::compare(first.name, second.name) < 0;
-        });
-
-        auto range = selectPropertyDeclarationsWithAliasForTypeIdStatement
-                         .template range<AliasPropertyDeclarationView>(type.typeId);
-
-        auto compareKey = [](const AliasPropertyDeclarationView &view,
-                             const Storage::Synchronization::PropertyDeclaration &value) {
-            return Sqlite::compare(view.name, value.name);
-        };
-
-        auto insert = [&](const Storage::Synchronization::PropertyDeclaration &) {};
-
-        auto update = [&](const AliasPropertyDeclarationView &,
-                          const Storage::Synchronization::PropertyDeclaration &) {
-            return Sqlite::UpdateChange::No;
-        };
-
-        auto remove = [&](const AliasPropertyDeclarationView &view) {
-            updatePropertyDeclarationAliasIdToNullStatement.write(view.id);
-            propertyDeclarationIds.push_back(view.id);
-        };
-
-        Sqlite::insertUpdateDelete(range, aliasDeclarations, compareKey, insert, update, remove);
-    }
+            using NanotraceHR::dictonary;
+            using NanotraceHR::keyValue;
+            auto dict = dictonary(keyValue("name", aliasPropertyDeclarationView.name),
+                                  keyValue("id", aliasPropertyDeclarationView.id),
+                                  keyValue("alias id", aliasPropertyDeclarationView.aliasId));
 
-    void resetRemovedAliasPropertyDeclarationsToNull(
-        Storage::Synchronization::Types &types,
-        AliasPropertyDeclarations &relinkableAliasPropertyDeclarations)
-    {
-        NanotraceHR::Tracer tracer{"reset removed alias properties to null"_t,
-                                   projectStorageCategory()};
+            convertToString(string, dict);
+        }
 
-        PropertyDeclarationIds propertyDeclarationIds;
-        propertyDeclarationIds.reserve(types.size());
+    public:
+        Utils::SmallStringView name;
+        PropertyDeclarationId id;
+        PropertyDeclarationId aliasId;
+    };
 
-        for (auto &&type : types)
-            resetRemovedAliasPropertyDeclarationsToNull(type, propertyDeclarationIds);
+    void resetRemovedAliasPropertyDeclarationsToNull(Storage::Synchronization::Type &type,
+                                                     PropertyDeclarationIds &propertyDeclarationIds);
 
-        removeRelinkableEntries(relinkableAliasPropertyDeclarations,
-                                propertyDeclarationIds,
-                                PropertyCompare<AliasPropertyDeclaration>{});
-    }
+    void resetRemovedAliasPropertyDeclarationsToNull(
+        Storage::Synchronization::Types &types,
+        AliasPropertyDeclarations &relinkableAliasPropertyDeclarations);
 
     ImportId insertDocumentImport(const Storage::Import &import,
                                   Storage::Synchronization::ImportKind importKind,
                                   ModuleId sourceModuleId,
-                                  ImportId parentImportId)
-    {
-        if (import.version.minor) {
-            return insertDocumentImportWithVersionStatement
-                .template value<ImportId>(import.sourceId,
-                                          import.moduleId,
-                                          sourceModuleId,
-                                          importKind,
-                                          import.version.major.value,
-                                          import.version.minor.value,
-                                          parentImportId);
-        } else if (import.version.major) {
-            return insertDocumentImportWithMajorVersionStatement
-                .template value<ImportId>(import.sourceId,
-                                          import.moduleId,
-                                          sourceModuleId,
-                                          importKind,
-                                          import.version.major.value,
-                                          parentImportId);
-        } else {
-            return insertDocumentImportWithoutVersionStatement.template value<ImportId>(
-                import.sourceId, import.moduleId, sourceModuleId, importKind, parentImportId);
-        }
-    }
+                                  ImportId parentImportId);
 
     void synchronizeDocumentImports(Storage::Imports &imports,
                                     const SourceIds &updatedSourceIds,
-                                    Storage::Synchronization::ImportKind importKind)
-    {
-        std::sort(imports.begin(), imports.end(), [](auto &&first, auto &&second) {
-            return std::tie(first.sourceId, first.moduleId, first.version)
-                   < std::tie(second.sourceId, second.moduleId, second.version);
-        });
-
-        auto range = selectDocumentImportForSourceIdStatement
-                         .template range<Storage::Synchronization::ImportView>(toIntegers(
-                                                                                   updatedSourceIds),
-                                                                               importKind);
-
-        auto compareKey = [](const Storage::Synchronization::ImportView &view,
-                             const Storage::Import &import) -> long long {
-            auto sourceIdDifference = view.sourceId - import.sourceId;
-            if (sourceIdDifference != 0)
-                return sourceIdDifference;
-
-            auto moduleIdDifference = view.moduleId - import.moduleId;
-            if (moduleIdDifference != 0)
-                return moduleIdDifference;
-
-            auto versionDifference = view.version.major.value - import.version.major.value;
-            if (versionDifference != 0)
-                return versionDifference;
-
-            return view.version.minor.value - import.version.minor.value;
-        };
-
-        auto insert = [&](const Storage::Import &import) {
-            auto importId = insertDocumentImport(import, importKind, import.moduleId, ImportId{});
-            auto callback = [&](ModuleId exportedModuleId, int majorVersion, int minorVersion) {
-                Storage::Import additionImport{exportedModuleId,
-                                               Storage::Version{majorVersion, minorVersion},
-                                               import.sourceId};
-
-                auto exportedImportKind = importKind == Storage::Synchronization::ImportKind::Import
-                                              ? Storage::Synchronization::ImportKind::ModuleExportedImport
-                                              : Storage::Synchronization::ImportKind::ModuleExportedModuleDependency;
-
-                insertDocumentImport(additionImport, exportedImportKind, import.moduleId, importId);
-            };
-
-            selectModuleExportedImportsForModuleIdStatement.readCallback(callback,
-                                                                         import.moduleId,
-                                                                         import.version.major.value,
-                                                                         import.version.minor.value);
-        };
-
-        auto update = [](const Storage::Synchronization::ImportView &, const Storage::Import &) {
-            return Sqlite::UpdateChange::No;
-        };
-
-        auto remove = [&](const Storage::Synchronization::ImportView &view) {
-            deleteDocumentImportStatement.write(view.importId);
-            deleteDocumentImportsWithParentImportIdStatement.write(view.sourceId, view.importId);
-        };
-
-        Sqlite::insertUpdateDelete(range, imports, compareKey, insert, update, remove);
-    }
+                                    Storage::Synchronization::ImportKind importKind);
 
-    static Utils::PathString createJson(const Storage::Synchronization::ParameterDeclarations &parameters)
-    {
-        Utils::PathString json;
-        json.append("[");
-
-        Utils::SmallStringView comma{""};
-
-        for (const auto &parameter : parameters) {
-            json.append(comma);
-            comma = ",";
-            json.append(R"({"n":")");
-            json.append(parameter.name);
-            json.append(R"(","tn":")");
-            json.append(parameter.typeName);
-            if (parameter.traits == Storage::PropertyDeclarationTraits::None) {
-                json.append("\"}");
-            } else {
-                json.append(R"(","tr":)");
-                json.append(Utils::SmallString::number(to_underlying(parameter.traits)));
-                json.append("}");
-            }
-        }
-
-        json.append("]");
-
-        return json;
-    }
+    static Utils::PathString createJson(const Storage::Synchronization::ParameterDeclarations &parameters);
 
     TypeId fetchTypeIdByModuleIdAndExportedName(ModuleId moduleId,
-                                                Utils::SmallStringView name) const override
-    {
-        return selectTypeIdByModuleIdAndExportedNameStatement.template value<TypeId>(moduleId, name);
-    }
+                                                Utils::SmallStringView name) const override;
 
-    void addTypeIdToPropertyEditorQmlPaths(Storage::Synchronization::PropertyEditorQmlPaths &paths)
-    {
-        for (auto &path : paths)
-            path.typeId = fetchTypeIdByModuleIdAndExportedName(path.moduleId, path.typeName);
-    }
+    void addTypeIdToPropertyEditorQmlPaths(Storage::Synchronization::PropertyEditorQmlPaths &paths);
 
     class PropertyEditorQmlPathView
     {
@@ -2075,6 +726,19 @@ private:
             , directoryId{directoryId}
         {}
 
+        template<typename String>
+        friend void convertToString(String &string,
+                                    const PropertyEditorQmlPathView &propertyEditorQmlPathView)
+        {
+            using NanotraceHR::dictonary;
+            using NanotraceHR::keyValue;
+            auto dict = dictonary(keyValue("type id", propertyEditorQmlPathView.typeId),
+                                  keyValue("source id", propertyEditorQmlPathView.pathId),
+                                  keyValue("directory id", propertyEditorQmlPathView.directoryId));
+
+            convertToString(string, dict);
+        }
+
     public:
         TypeId typeId;
         SourceId pathId;
@@ -2082,279 +746,33 @@ private:
     };
 
     void synchronizePropertyEditorPaths(Storage::Synchronization::PropertyEditorQmlPaths &paths,
-                                        SourceIds updatedPropertyEditorQmlPathsSourceIds)
-    {
-        using Storage::Synchronization::PropertyEditorQmlPath;
-        std::sort(paths.begin(), paths.end(), [](auto &&first, auto &&second) {
-            return first.typeId < second.typeId;
-        });
-
-        auto range = selectPropertyEditorPathsForForSourceIdsStatement
-                         .template range<PropertyEditorQmlPathView>(
-                             toIntegers(updatedPropertyEditorQmlPathsSourceIds));
-
-        auto compareKey = [](const PropertyEditorQmlPathView &view,
-                             const PropertyEditorQmlPath &value) -> long long {
-            return view.typeId - value.typeId;
-        };
-
-        auto insert = [&](const PropertyEditorQmlPath &path) {
-            if (path.typeId)
-                insertPropertyEditorPathStatement.write(path.typeId, path.pathId, path.directoryId);
-        };
-
-        auto update = [&](const PropertyEditorQmlPathView &view, const PropertyEditorQmlPath &value) {
-            if (value.pathId != view.pathId || value.directoryId != view.directoryId) {
-                updatePropertyEditorPathsStatement.write(value.typeId, value.pathId, value.directoryId);
-                return Sqlite::UpdateChange::Update;
-            }
-            return Sqlite::UpdateChange::No;
-        };
-
-        auto remove = [&](const PropertyEditorQmlPathView &view) {
-            deletePropertyEditorPathStatement.write(view.typeId);
-        };
-
-        Sqlite::insertUpdateDelete(range, paths, compareKey, insert, update, remove);
-    }
+                                        SourceIds updatedPropertyEditorQmlPathsSourceIds);
 
     void synchronizePropertyEditorQmlPaths(Storage::Synchronization::PropertyEditorQmlPaths &paths,
-                                           SourceIds updatedPropertyEditorQmlPathsSourceIds)
-    {
-        NanotraceHR::Tracer tracer{"synchronize property editor qml paths"_t,
-                                   projectStorageCategory()};
-
-        addTypeIdToPropertyEditorQmlPaths(paths);
-        synchronizePropertyEditorPaths(paths, updatedPropertyEditorQmlPathsSourceIds);
-    }
+                                           SourceIds updatedPropertyEditorQmlPathsSourceIds);
 
     void synchronizeFunctionDeclarations(
-        TypeId typeId, Storage::Synchronization::FunctionDeclarations &functionsDeclarations)
-    {
-        NanotraceHR::Tracer tracer{"synchronize function declaration"_t, projectStorageCategory()};
-
-        std::sort(functionsDeclarations.begin(),
-                  functionsDeclarations.end(),
-                  [](auto &&first, auto &&second) {
-                      auto compare = Sqlite::compare(first.name, second.name);
-
-                      if (compare == 0) {
-                          Utils::PathString firstSignature{createJson(first.parameters)};
-                          Utils::PathString secondSignature{createJson(second.parameters)};
-
-                          return Sqlite::compare(firstSignature, secondSignature) < 0;
-                      }
-
-                      return compare < 0;
-                  });
-
-        auto range = selectFunctionDeclarationsForTypeIdStatement
-                         .template range<Storage::Synchronization::FunctionDeclarationView>(typeId);
-
-        auto compareKey = [](const Storage::Synchronization::FunctionDeclarationView &view,
-                             const Storage::Synchronization::FunctionDeclaration &value) {
-            auto nameKey = Sqlite::compare(view.name, value.name);
-            if (nameKey != 0)
-                return nameKey;
-
-            Utils::PathString valueSignature{createJson(value.parameters)};
-
-            return Sqlite::compare(view.signature, valueSignature);
-        };
-
-        auto insert = [&](const Storage::Synchronization::FunctionDeclaration &value) {
-            Utils::PathString signature{createJson(value.parameters)};
-
-            insertFunctionDeclarationStatement.write(typeId, value.name, value.returnTypeName, signature);
-        };
-
-        auto update = [&](const Storage::Synchronization::FunctionDeclarationView &view,
-                          const Storage::Synchronization::FunctionDeclaration &value) {
-            Utils::PathString signature{createJson(value.parameters)};
-
-            if (value.returnTypeName == view.returnTypeName)
-                return Sqlite::UpdateChange::No;
-
-            updateFunctionDeclarationStatement.write(view.id, value.returnTypeName);
-
-            return Sqlite::UpdateChange::Update;
-        };
-
-        auto remove = [&](const Storage::Synchronization::FunctionDeclarationView &view) {
-            deleteFunctionDeclarationStatement.write(view.id);
-        };
-
-        Sqlite::insertUpdateDelete(range, functionsDeclarations, compareKey, insert, update, remove);
-    }
+        TypeId typeId, Storage::Synchronization::FunctionDeclarations &functionsDeclarations);
 
     void synchronizeSignalDeclarations(TypeId typeId,
-                                       Storage::Synchronization::SignalDeclarations &signalDeclarations)
-    {
-        NanotraceHR::Tracer tracer{"synchronize signal declaration"_t, projectStorageCategory()};
-
-        std::sort(signalDeclarations.begin(), signalDeclarations.end(), [](auto &&first, auto &&second) {
-            auto compare = Sqlite::compare(first.name, second.name);
-
-            if (compare == 0) {
-                Utils::PathString firstSignature{createJson(first.parameters)};
-                Utils::PathString secondSignature{createJson(second.parameters)};
-
-                return Sqlite::compare(firstSignature, secondSignature) < 0;
-            }
-
-            return compare < 0;
-        });
-
-        auto range = selectSignalDeclarationsForTypeIdStatement
-                         .template range<Storage::Synchronization::SignalDeclarationView>(typeId);
-
-        auto compareKey = [](const Storage::Synchronization::SignalDeclarationView &view,
-                             const Storage::Synchronization::SignalDeclaration &value) {
-            auto nameKey = Sqlite::compare(view.name, value.name);
-            if (nameKey != 0)
-                return nameKey;
-
-            Utils::PathString valueSignature{createJson(value.parameters)};
-
-            return Sqlite::compare(view.signature, valueSignature);
-        };
-
-        auto insert = [&](const Storage::Synchronization::SignalDeclaration &value) {
-            Utils::PathString signature{createJson(value.parameters)};
-
-            insertSignalDeclarationStatement.write(typeId, value.name, signature);
-        };
-
-        auto update = [&]([[maybe_unused]] const Storage::Synchronization::SignalDeclarationView &view,
-                          [[maybe_unused]] const Storage::Synchronization::SignalDeclaration &value) {
-            return Sqlite::UpdateChange::No;
-        };
-
-        auto remove = [&](const Storage::Synchronization::SignalDeclarationView &view) {
-            deleteSignalDeclarationStatement.write(view.id);
-        };
-
-        Sqlite::insertUpdateDelete(range, signalDeclarations, compareKey, insert, update, remove);
-    }
+                                       Storage::Synchronization::SignalDeclarations &signalDeclarations);
 
     static Utils::PathString createJson(
-        const Storage::Synchronization::EnumeratorDeclarations &enumeratorDeclarations)
-    {
-        Utils::PathString json;
-        json.append("{");
-
-        Utils::SmallStringView comma{"\""};
-
-        for (const auto &enumerator : enumeratorDeclarations) {
-            json.append(comma);
-            comma = ",\"";
-            json.append(enumerator.name);
-            if (enumerator.hasValue) {
-                json.append("\":\"");
-                json.append(Utils::SmallString::number(enumerator.value));
-                json.append("\"");
-            } else {
-                json.append("\":null");
-            }
-        }
-
-        json.append("}");
-
-        return json;
-    }
+        const Storage::Synchronization::EnumeratorDeclarations &enumeratorDeclarations);
 
     void synchronizeEnumerationDeclarations(
-        TypeId typeId, Storage::Synchronization::EnumerationDeclarations &enumerationDeclarations)
-    {
-        NanotraceHR::Tracer tracer{"synchronize enumeation declaration"_t, projectStorageCategory()};
-
-        std::sort(enumerationDeclarations.begin(),
-                  enumerationDeclarations.end(),
-                  [](auto &&first, auto &&second) {
-                      return Sqlite::compare(first.name, second.name) < 0;
-                  });
-
-        auto range = selectEnumerationDeclarationsForTypeIdStatement
-                         .template range<Storage::Synchronization::EnumerationDeclarationView>(typeId);
-
-        auto compareKey = [](const Storage::Synchronization::EnumerationDeclarationView &view,
-                             const Storage::Synchronization::EnumerationDeclaration &value) {
-            return Sqlite::compare(view.name, value.name);
-        };
-
-        auto insert = [&](const Storage::Synchronization::EnumerationDeclaration &value) {
-            Utils::PathString signature{createJson(value.enumeratorDeclarations)};
-
-            insertEnumerationDeclarationStatement.write(typeId, value.name, signature);
-        };
-
-        auto update = [&](const Storage::Synchronization::EnumerationDeclarationView &view,
-                          const Storage::Synchronization::EnumerationDeclaration &value) {
-            Utils::PathString enumeratorDeclarations{createJson(value.enumeratorDeclarations)};
-
-            if (enumeratorDeclarations == view.enumeratorDeclarations)
-                return Sqlite::UpdateChange::No;
-
-            updateEnumerationDeclarationStatement.write(view.id, enumeratorDeclarations);
-
-            return Sqlite::UpdateChange::Update;
-        };
-
-        auto remove = [&](const Storage::Synchronization::EnumerationDeclarationView &view) {
-            deleteEnumerationDeclarationStatement.write(view.id);
-        };
-
-        Sqlite::insertUpdateDelete(range, enumerationDeclarations, compareKey, insert, update, remove);
-    }
+        TypeId typeId, Storage::Synchronization::EnumerationDeclarations &enumerationDeclarations);
 
     void extractExportedTypes(TypeId typeId,
                               const Storage::Synchronization::Type &type,
-                              Storage::Synchronization::ExportedTypes &exportedTypes)
-    {
-        for (const auto &exportedType : type.exportedTypes)
-            exportedTypes.emplace_back(exportedType.name,
-                                       exportedType.version,
-                                       typeId,
-                                       exportedType.moduleId);
-    }
-
-    TypeId declareType(Storage::Synchronization::Type &type)
-    {
-        if (type.typeName.isEmpty()) {
-            type.typeId = selectTypeIdBySourceIdStatement.template value<TypeId>(type.sourceId);
-
-            return type.typeId;
-        }
-
-        type.typeId = insertTypeStatement.template value<TypeId>(type.sourceId, type.typeName);
+                              Storage::Synchronization::ExportedTypes &exportedTypes);
 
-        if (!type.typeId)
-            type.typeId = selectTypeIdBySourceIdAndNameStatement.template value<TypeId>(type.sourceId,
-                                                                                        type.typeName);
-
-        return type.typeId;
-    }
+    TypeId declareType(Storage::Synchronization::Type &type);
 
     void syncDeclarations(Storage::Synchronization::Type &type,
                           AliasPropertyDeclarations &insertedAliasPropertyDeclarations,
                           AliasPropertyDeclarations &updatedAliasPropertyDeclarations,
-                          PropertyDeclarationIds &propertyDeclarationIds)
-    {
-        NanotraceHR::Tracer tracer{"synchronize declaration per type"_t, projectStorageCategory()};
-
-        if (type.changeLevel == Storage::Synchronization::ChangeLevel::Minimal)
-            return;
-
-        synchronizePropertyDeclarations(type.typeId,
-                                        type.propertyDeclarations,
-                                        type.sourceId,
-                                        insertedAliasPropertyDeclarations,
-                                        updatedAliasPropertyDeclarations,
-                                        propertyDeclarationIds);
-        synchronizeFunctionDeclarations(type.typeId, type.functionDeclarations);
-        synchronizeSignalDeclarations(type.typeId, type.signalDeclarations);
-        synchronizeEnumerationDeclarations(type.typeId, type.enumerationDeclarations);
-    }
+                          PropertyDeclarationIds &propertyDeclarationIds);
 
     template<typename Relinkable, typename Ids, typename Compare>
     void removeRelinkableEntries(std::vector<Relinkable> &relinkables, Ids &ids, Compare compare)
@@ -2381,23 +799,7 @@ private:
     void syncDeclarations(Storage::Synchronization::Types &types,
                           AliasPropertyDeclarations &insertedAliasPropertyDeclarations,
                           AliasPropertyDeclarations &updatedAliasPropertyDeclarations,
-                          PropertyDeclarations &relinkablePropertyDeclarations)
-    {
-        NanotraceHR::Tracer tracer{"synchronize declaration"_t, projectStorageCategory()};
-
-        PropertyDeclarationIds propertyDeclarationIds;
-        propertyDeclarationIds.reserve(types.size() * 10);
-
-        for (auto &&type : types)
-            syncDeclarations(type,
-                             insertedAliasPropertyDeclarations,
-                             updatedAliasPropertyDeclarations,
-                             propertyDeclarationIds);
-
-        removeRelinkableEntries(relinkablePropertyDeclarations,
-                                propertyDeclarationIds,
-                                PropertyCompare<PropertyDeclaration>{});
-    }
+                          PropertyDeclarations &relinkablePropertyDeclarations);
 
     class TypeWithDefaultPropertyView
     {
@@ -2407,240 +809,54 @@ private:
             , defaultPropertyId{defaultPropertyId}
         {}
 
+        template<typename String>
+        friend void convertToString(String &string, const TypeWithDefaultPropertyView &view)
+        {
+            using NanotraceHR::dictonary;
+            using NanotraceHR::keyValue;
+            auto dict = dictonary(keyValue("type id", view.typeId),
+                                  keyValue("property id", view.defaultPropertyId));
+
+            convertToString(string, dict);
+        }
+
         TypeId typeId;
         PropertyDeclarationId defaultPropertyId;
     };
 
-    void syncDefaultProperties(Storage::Synchronization::Types &types)
-    {
-        NanotraceHR::Tracer tracer{"synchronize default properties"_t, projectStorageCategory()};
-
-        auto range = selectTypesWithDefaultPropertyStatement.template range<TypeWithDefaultPropertyView>();
-
-        auto compareKey = [](const TypeWithDefaultPropertyView &view,
-                             const Storage::Synchronization::Type &value) {
-            return view.typeId - value.typeId;
-        };
-
-        auto insert = [&](const Storage::Synchronization::Type &) {
-
-        };
-
-        auto update = [&](const TypeWithDefaultPropertyView &view,
-                          const Storage::Synchronization::Type &value) {
-            PropertyDeclarationId valueDefaultPropertyId;
-            if (value.defaultPropertyName.size())
-                valueDefaultPropertyId = fetchPropertyDeclarationByTypeIdAndNameUngarded(
-                                             value.typeId, value.defaultPropertyName)
-                                             .propertyDeclarationId;
-
-            if (compareInvalidAreTrue(valueDefaultPropertyId, view.defaultPropertyId))
-                return Sqlite::UpdateChange::No;
-
-            updateDefaultPropertyIdStatement.write(value.typeId, valueDefaultPropertyId);
-
-            return Sqlite::UpdateChange::Update;
-        };
+    void syncDefaultProperties(Storage::Synchronization::Types &types);
 
-        auto remove = [&](const TypeWithDefaultPropertyView &) {};
+    void resetDefaultPropertiesIfChanged(Storage::Synchronization::Types &types);
 
-        Sqlite::insertUpdateDelete(range, types, compareKey, insert, update, remove);
-    }
-
-    void resetDefaultPropertiesIfChanged(Storage::Synchronization::Types &types)
-    {
-        NanotraceHR::Tracer tracer{"reset changed default properties"_t, projectStorageCategory()};
-
-        auto range = selectTypesWithDefaultPropertyStatement.template range<TypeWithDefaultPropertyView>();
-
-        auto compareKey = [](const TypeWithDefaultPropertyView &view,
-                             const Storage::Synchronization::Type &value) {
-            return view.typeId - value.typeId;
-        };
-
-        auto insert = [&](const Storage::Synchronization::Type &) {
-
-        };
-
-        auto update = [&](const TypeWithDefaultPropertyView &view,
-                          const Storage::Synchronization::Type &value) {
-            PropertyDeclarationId valueDefaultPropertyId;
-            if (value.defaultPropertyName.size()) {
-                auto optionalValueDefaultPropertyId = fetchOptionalPropertyDeclarationByTypeIdAndNameUngarded(
-                    value.typeId, value.defaultPropertyName);
-                if (optionalValueDefaultPropertyId)
-                    valueDefaultPropertyId = optionalValueDefaultPropertyId->propertyDeclarationId;
-            }
-
-            if (compareInvalidAreTrue(valueDefaultPropertyId, view.defaultPropertyId))
-                return Sqlite::UpdateChange::No;
-
-            updateDefaultPropertyIdStatement.write(value.typeId, Sqlite::NullValue{});
-
-            return Sqlite::UpdateChange::Update;
-        };
-
-        auto remove = [&](const TypeWithDefaultPropertyView &) {};
-
-        Sqlite::insertUpdateDelete(range, types, compareKey, insert, update, remove);
-    }
-
-    void checkForPrototypeChainCycle(TypeId typeId) const
-    {
-        auto callback = [=](TypeId currentTypeId) {
-            if (typeId == currentTypeId)
-                throw PrototypeChainCycle{};
-        };
-
-        selectTypeIdsForPrototypeChainIdStatement.readCallback(callback, typeId);
-    }
-
-    void checkForAliasChainCycle(PropertyDeclarationId propertyDeclarationId) const
-    {
-        auto callback = [=](PropertyDeclarationId currentPropertyDeclarationId) {
-            if (propertyDeclarationId == currentPropertyDeclarationId)
-                throw AliasChainCycle{};
-        };
+    void checkForPrototypeChainCycle(TypeId typeId) const;
 
-        selectPropertyDeclarationIdsForAliasChainStatement.readCallback(callback,
-                                                                        propertyDeclarationId);
-    }
+    void checkForAliasChainCycle(PropertyDeclarationId propertyDeclarationId) const;
 
     std::pair<TypeId, ImportedTypeNameId> fetchImportedTypeNameIdAndTypeId(
-        const Storage::Synchronization::ImportedTypeName &typeName, SourceId sourceId)
-    {
-        TypeId typeId;
-        ImportedTypeNameId typeNameId;
-        if (!std::visit([](auto &&typeName_) -> bool { return typeName_.name.isEmpty(); }, typeName)) {
-            typeNameId = fetchImportedTypeNameId(typeName, sourceId);
-
-            typeId = fetchTypeId(typeNameId);
-
-            if (!typeId)
-                throw TypeNameDoesNotExists{fetchImportedTypeName(typeNameId)};
-        }
-
-        return {typeId, typeNameId};
-    }
-
-    void syncPrototypeAndExtension(Storage::Synchronization::Type &type, TypeIds &typeIds)
-    {
-        if (type.changeLevel == Storage::Synchronization::ChangeLevel::Minimal)
-            return;
+        const Storage::Synchronization::ImportedTypeName &typeName, SourceId sourceId);
 
-        auto [prototypeId, prototypeTypeNameId] = fetchImportedTypeNameIdAndTypeId(type.prototype,
-                                                                                   type.sourceId);
-        auto [extensionId, extensionTypeNameId] = fetchImportedTypeNameIdAndTypeId(type.extension,
-                                                                                   type.sourceId);
-
-        updatePrototypeAndExtensionStatement.write(type.typeId,
-                                                   prototypeId,
-                                                   prototypeTypeNameId,
-                                                   extensionId,
-                                                   extensionTypeNameId);
-
-        if (prototypeId || extensionId)
-            checkForPrototypeChainCycle(type.typeId);
-
-        typeIds.push_back(type.typeId);
-    }
+    void syncPrototypeAndExtension(Storage::Synchronization::Type &type, TypeIds &typeIds);
 
     void syncPrototypesAndExtensions(Storage::Synchronization::Types &types,
                                      Prototypes &relinkablePrototypes,
-                                     Prototypes &relinkableExtensions)
-    {
-        NanotraceHR::Tracer tracer{"synchronize prototypes"_t, projectStorageCategory()};
+                                     Prototypes &relinkableExtensions);
 
-        TypeIds typeIds;
-        typeIds.reserve(types.size());
-
-        for (auto &type : types)
-            syncPrototypeAndExtension(type, typeIds);
-
-        removeRelinkableEntries(relinkablePrototypes, typeIds, TypeCompare<Prototype>{});
-        removeRelinkableEntries(relinkableExtensions, typeIds, TypeCompare<Prototype>{});
-    }
-
-    ImportId fetchImportId(SourceId sourceId, const Storage::Import &import) const
-    {
-        if (import.version) {
-            return selectImportIdBySourceIdAndModuleIdAndVersionStatement.template value<ImportId>(
-                sourceId, import.moduleId, import.version.major.value, import.version.minor.value);
-        }
-
-        if (import.version.major) {
-            return selectImportIdBySourceIdAndModuleIdAndMajorVersionStatement
-                .template value<ImportId>(sourceId, import.moduleId, import.version.major.value);
-        }
-
-        return selectImportIdBySourceIdAndModuleIdStatement.template value<ImportId>(sourceId,
-                                                                                     import.moduleId);
-    }
+    ImportId fetchImportId(SourceId sourceId, const Storage::Import &import) const;
 
     ImportedTypeNameId fetchImportedTypeNameId(const Storage::Synchronization::ImportedTypeName &name,
-                                               SourceId sourceId)
-    {
-        struct Inspect
-        {
-            auto operator()(const Storage::Synchronization::ImportedType &importedType)
-            {
-                return storage.fetchImportedTypeNameId(Storage::Synchronization::TypeNameKind::Exported,
-                                                       sourceId,
-                                                       importedType.name);
-            }
-
-            auto operator()(const Storage::Synchronization::QualifiedImportedType &importedType)
-            {
-                ImportId importId = storage.fetchImportId(sourceId, importedType.import);
-
-                return storage.fetchImportedTypeNameId(Storage::Synchronization::TypeNameKind::QualifiedExported,
-                                                       importId,
-                                                       importedType.name);
-            }
-
-            ProjectStorage &storage;
-            SourceId sourceId;
-        };
-
-        return std::visit(Inspect{*this, sourceId}, name);
-    }
+                                               SourceId sourceId);
 
     template<typename Id>
     ImportedTypeNameId fetchImportedTypeNameId(Storage::Synchronization::TypeNameKind kind,
                                                Id id,
-                                               Utils::SmallStringView typeName)
-    {
-        auto importedTypeNameId = selectImportedTypeNameIdStatement
-                                      .template value<ImportedTypeNameId>(kind, id, typeName);
-
-        if (importedTypeNameId)
-            return importedTypeNameId;
+                                               Utils::SmallStringView typeName);
 
-        return insertImportedTypeNameIdStatement.template value<ImportedTypeNameId>(kind, id, typeName);
-    }
-
-    TypeId fetchTypeId(ImportedTypeNameId typeNameId) const
-    {
-        auto kind = selectKindFromImportedTypeNamesStatement
-                        .template value<Storage::Synchronization::TypeNameKind>(typeNameId);
-
-        return fetchTypeId(typeNameId, kind);
-    }
+    TypeId fetchTypeId(ImportedTypeNameId typeNameId) const;
 
-    Utils::SmallString fetchImportedTypeName(ImportedTypeNameId typeNameId) const
-    {
-        return selectNameFromImportedTypeNamesStatement.template value<Utils::SmallString>(typeNameId);
-    }
+    Utils::SmallString fetchImportedTypeName(ImportedTypeNameId typeNameId) const;
 
-    TypeId fetchTypeId(ImportedTypeNameId typeNameId, Storage::Synchronization::TypeNameKind kind) const
-    {
-        if (kind == Storage::Synchronization::TypeNameKind::QualifiedExported) {
-            return selectTypeIdForQualifiedImportedTypeNameNamesStatement.template value<TypeId>(
-                typeNameId);
-        }
-
-        return selectTypeIdForImportedTypeNameNamesStatement.template value<TypeId>(typeNameId);
-    }
+    TypeId fetchTypeId(ImportedTypeNameId typeNameId,
+                       Storage::Synchronization::TypeNameKind kind) const;
 
     class FetchPropertyDeclarationResult
     {
@@ -2653,1303 +869,64 @@ private:
             , propertyTraits{propertyTraits}
         {}
 
+        template<typename String>
+        friend void convertToString(String &string, const FetchPropertyDeclarationResult &result)
+        {
+            using NanotraceHR::dictonary;
+            using NanotraceHR::keyValue;
+            auto dict = dictonary(keyValue("property type id", result.propertyTypeId),
+                                  keyValue("property declaration id", result.propertyDeclarationId),
+                                  keyValue("property traits", result.propertyTraits));
+
+            convertToString(string, dict);
+        }
+
     public:
         TypeId propertyTypeId;
         PropertyDeclarationId propertyDeclarationId;
         Storage::PropertyDeclarationTraits propertyTraits;
     };
 
-    auto fetchOptionalPropertyDeclarationByTypeIdAndNameUngarded(TypeId typeId,
-                                                                 Utils::SmallStringView name)
-    {
-        return selectPropertyDeclarationByTypeIdAndNameStatement
-            .template optionalValue<FetchPropertyDeclarationResult>(typeId, name);
-    }
+    std::optional<FetchPropertyDeclarationResult> fetchOptionalPropertyDeclarationByTypeIdAndNameUngarded(
+        TypeId typeId, Utils::SmallStringView name);
 
     FetchPropertyDeclarationResult fetchPropertyDeclarationByTypeIdAndNameUngarded(
-        TypeId typeId, Utils::SmallStringView name)
-    {
-        auto propertyDeclaration = fetchOptionalPropertyDeclarationByTypeIdAndNameUngarded(typeId,
-                                                                                           name);
-
-        if (propertyDeclaration)
-            return *propertyDeclaration;
-
-        throw PropertyNameDoesNotExists{};
-    }
+        TypeId typeId, Utils::SmallStringView name);
 
     PropertyDeclarationId fetchPropertyDeclarationIdByTypeIdAndNameUngarded(TypeId typeId,
-                                                                            Utils::SmallStringView name)
-    {
-        auto propertyDeclarationId = selectPropertyDeclarationIdByTypeIdAndNameStatement
-                                         .template value<PropertyDeclarationId>(typeId, name);
-
-        if (propertyDeclarationId)
-            return propertyDeclarationId;
-
-        throw PropertyNameDoesNotExists{};
-    }
-
-    SourceContextId readSourceContextId(Utils::SmallStringView sourceContextPath)
-    {
-        return selectSourceContextIdFromSourceContextsBySourceContextPathStatement
-            .template value<SourceContextId>(sourceContextPath);
-    }
-
-    SourceContextId writeSourceContextId(Utils::SmallStringView sourceContextPath)
-    {
-        insertIntoSourceContextsStatement.write(sourceContextPath);
-
-        return SourceContextId::create(database.lastInsertedRowId());
-    }
-
-    SourceId writeSourceId(SourceContextId sourceContextId, Utils::SmallStringView sourceName)
-    {
-        insertIntoSourcesStatement.write(sourceContextId, sourceName);
-
-        return SourceId::create(database.lastInsertedRowId());
-    }
-
-    SourceId readSourceId(SourceContextId sourceContextId, Utils::SmallStringView sourceName)
-    {
-        return selectSourceIdFromSourcesBySourceContextIdAndSourceNameStatement
-            .template value<SourceId>(sourceContextId, sourceName);
-    }
-
-    auto fetchExportedTypes(TypeId typeId)
-    {
-        return selectExportedTypesByTypeIdStatement
-            .template values<Storage::Synchronization::ExportedType, 12>(typeId);
-    }
-
-    auto fetchPropertyDeclarations(TypeId typeId)
-    {
-        return selectPropertyDeclarationsByTypeIdStatement
-            .template values<Storage::Synchronization::PropertyDeclaration, 24>(typeId);
-    }
-
-    auto fetchFunctionDeclarations(TypeId typeId)
-    {
-        Storage::Synchronization::FunctionDeclarations functionDeclarations;
-
-        auto callback = [&](Utils::SmallStringView name,
-                            Utils::SmallStringView returnType,
-                            FunctionDeclarationId functionDeclarationId) {
-            auto &functionDeclaration = functionDeclarations.emplace_back(name, returnType);
-            functionDeclaration.parameters = selectFunctionParameterDeclarationsStatement
-                                                 .template values<Storage::Synchronization::ParameterDeclaration,
-                                                                  8>(functionDeclarationId);
-        };
-
-        selectFunctionDeclarationsForTypeIdWithoutSignatureStatement.readCallback(callback, typeId);
+                                                                            Utils::SmallStringView name);
 
-        return functionDeclarations;
-    }
-
-    auto fetchSignalDeclarations(TypeId typeId)
-    {
-        Storage::Synchronization::SignalDeclarations signalDeclarations;
-
-        auto callback = [&](Utils::SmallStringView name, SignalDeclarationId signalDeclarationId) {
-            auto &signalDeclaration = signalDeclarations.emplace_back(name);
-            signalDeclaration.parameters = selectSignalParameterDeclarationsStatement
-                                               .template values<Storage::Synchronization::ParameterDeclaration,
-                                                                8>(signalDeclarationId);
-        };
-
-        selectSignalDeclarationsForTypeIdWithoutSignatureStatement.readCallback(callback, typeId);
+    SourceContextId readSourceContextId(Utils::SmallStringView sourceContextPath);
 
-        return signalDeclarations;
-    }
-
-    auto fetchEnumerationDeclarations(TypeId typeId)
-    {
-        Storage::Synchronization::EnumerationDeclarations enumerationDeclarations;
+    SourceContextId writeSourceContextId(Utils::SmallStringView sourceContextPath);
 
-        auto callback = [&](Utils::SmallStringView name,
-                            EnumerationDeclarationId enumerationDeclarationId) {
-            enumerationDeclarations.emplace_back(
-                name,
-                selectEnumeratorDeclarationStatement
-                    .template values<Storage::Synchronization::EnumeratorDeclaration, 8>(
-                        enumerationDeclarationId));
-        };
+    SourceId writeSourceId(SourceContextId sourceContextId, Utils::SmallStringView sourceName);
 
-        selectEnumerationDeclarationsForTypeIdWithoutEnumeratorDeclarationsStatement
-            .readCallback(callback, typeId);
-
-        return enumerationDeclarations;
-    }
+    SourceId readSourceId(SourceContextId sourceContextId, Utils::SmallStringView sourceName);
 
-    class Initializer
-    {
-    public:
-        Initializer(Database &database, bool isInitialized)
-        {
-            if (!isInitialized) {
-                auto moduleIdColumn = createModulesTable(database);
-                createSourceContextsTable(database);
-                createSourcesTable(database);
-                createTypesAndePropertyDeclarationsTables(database, moduleIdColumn);
-                createExportedTypeNamesTable(database, moduleIdColumn);
-                createImportedTypeNamesTable(database);
-                createEnumerationsTable(database);
-                createFunctionsTable(database);
-                createSignalsTable(database);
-                createModuleExportedImportsTable(database, moduleIdColumn);
-                createDocumentImportsTable(database, moduleIdColumn);
-                createFileStatusesTable(database);
-                createProjectDatasTable(database);
-                createPropertyEditorPathsTable(database);
-                createTypeAnnotionsTable(database);
-            }
-            database.setIsInitialized(true);
-        }
+    Storage::Synchronization::ExportedTypes fetchExportedTypes(TypeId typeId);
 
-        void createSourceContextsTable(Database &database)
-        {
-            Sqlite::Table table;
-            table.setUseIfNotExists(true);
-            table.setName("sourceContexts");
-            table.addColumn("sourceContextId", Sqlite::ColumnType::Integer, {Sqlite::PrimaryKey{}});
-            const Sqlite::Column &sourceContextPathColumn = table.addColumn("sourceContextPath");
+    Storage::Synchronization::PropertyDeclarations fetchPropertyDeclarations(TypeId typeId);
 
-            table.addUniqueIndex({sourceContextPathColumn});
+    Storage::Synchronization::FunctionDeclarations fetchFunctionDeclarations(TypeId typeId);
 
-            table.initialize(database);
-        }
+    Storage::Synchronization::SignalDeclarations fetchSignalDeclarations(TypeId typeId);
 
-        void createSourcesTable(Database &database)
-        {
-            Sqlite::StrictTable table;
-            table.setUseIfNotExists(true);
-            table.setName("sources");
-            table.addColumn("sourceId", Sqlite::StrictColumnType::Integer, {Sqlite::PrimaryKey{}});
-            const auto &sourceContextIdColumn = table.addColumn(
-                "sourceContextId",
-                Sqlite::StrictColumnType::Integer,
-                {Sqlite::NotNull{},
-                 Sqlite::ForeignKey{"sourceContexts",
-                                    "sourceContextId",
-                                    Sqlite::ForeignKeyAction::NoAction,
-                                    Sqlite::ForeignKeyAction::Cascade}});
-            const auto &sourceNameColumn = table.addColumn("sourceName",
-                                                           Sqlite::StrictColumnType::Text);
-            table.addUniqueIndex({sourceContextIdColumn, sourceNameColumn});
-
-            table.initialize(database);
-        }
+    Storage::Synchronization::EnumerationDeclarations fetchEnumerationDeclarations(TypeId typeId);
 
-        void createTypesAndePropertyDeclarationsTables(
-            Database &database, [[maybe_unused]] const Sqlite::StrictColumn &foreignModuleIdColumn)
-        {
-            Sqlite::StrictTable typesTable;
-            typesTable.setUseIfNotExists(true);
-            typesTable.setName("types");
-            typesTable.addColumn("typeId", Sqlite::StrictColumnType::Integer, {Sqlite::PrimaryKey{}});
-            auto &sourceIdColumn = typesTable.addColumn("sourceId", Sqlite::StrictColumnType::Integer);
-            auto &typesNameColumn = typesTable.addColumn("name", Sqlite::StrictColumnType::Text);
-            typesTable.addColumn("traits", Sqlite::StrictColumnType::Integer);
-            auto &prototypeIdColumn = typesTable.addForeignKeyColumn("prototypeId",
-                                                                     typesTable,
-                                                                     Sqlite::ForeignKeyAction::NoAction,
-                                                                     Sqlite::ForeignKeyAction::Restrict);
-            typesTable.addColumn("prototypeNameId", Sqlite::StrictColumnType::Integer);
-            auto &extensionIdColumn = typesTable.addForeignKeyColumn("extensionId",
-                                                                     typesTable,
-                                                                     Sqlite::ForeignKeyAction::NoAction,
-                                                                     Sqlite::ForeignKeyAction::Restrict);
-            typesTable.addColumn("extensionNameId", Sqlite::StrictColumnType::Integer);
-            auto &defaultPropertyIdColumn = typesTable.addColumn("defaultPropertyId",
-                                                                 Sqlite::StrictColumnType::Integer);
-            typesTable.addColumn("annotationTraits", Sqlite::StrictColumnType::Integer);
-            typesTable.addUniqueIndex({sourceIdColumn, typesNameColumn});
-            typesTable.addIndex({defaultPropertyIdColumn});
-            typesTable.addIndex({prototypeIdColumn});
-            typesTable.addIndex({extensionIdColumn});
-
-            typesTable.initialize(database);
-
-            {
-                Sqlite::StrictTable propertyDeclarationTable;
-                propertyDeclarationTable.setUseIfNotExists(true);
-                propertyDeclarationTable.setName("propertyDeclarations");
-                propertyDeclarationTable.addColumn("propertyDeclarationId",
-                                                   Sqlite::StrictColumnType::Integer,
-                                                   {Sqlite::PrimaryKey{}});
-                auto &typeIdColumn = propertyDeclarationTable.addColumn("typeId");
-                auto &nameColumn = propertyDeclarationTable.addColumn("name");
-                propertyDeclarationTable.addForeignKeyColumn("propertyTypeId",
-                                                             typesTable,
-                                                             Sqlite::ForeignKeyAction::NoAction,
-                                                             Sqlite::ForeignKeyAction::Restrict);
-                propertyDeclarationTable.addColumn("propertyTraits",
-                                                   Sqlite::StrictColumnType::Integer);
-                propertyDeclarationTable.addColumn("propertyImportedTypeNameId",
-                                                   Sqlite::StrictColumnType::Integer);
-                auto &aliasPropertyDeclarationIdColumn = propertyDeclarationTable.addForeignKeyColumn(
-                    "aliasPropertyDeclarationId",
-                    propertyDeclarationTable,
-                    Sqlite::ForeignKeyAction::NoAction,
-                    Sqlite::ForeignKeyAction::Restrict);
-                auto &aliasPropertyDeclarationTailIdColumn = propertyDeclarationTable.addForeignKeyColumn(
-                    "aliasPropertyDeclarationTailId",
-                    propertyDeclarationTable,
-                    Sqlite::ForeignKeyAction::NoAction,
-                    Sqlite::ForeignKeyAction::Restrict);
-
-                propertyDeclarationTable.addUniqueIndex({typeIdColumn, nameColumn});
-                propertyDeclarationTable.addIndex({aliasPropertyDeclarationIdColumn},
-                                                  "aliasPropertyDeclarationId IS NOT NULL");
-                propertyDeclarationTable.addIndex({aliasPropertyDeclarationTailIdColumn},
-                                                  "aliasPropertyDeclarationTailId IS NOT NULL");
-
-                propertyDeclarationTable.initialize(database);
-            }
-        }
+    class Initializer;
 
-        void createExportedTypeNamesTable(Database &database,
-                                          const Sqlite::StrictColumn &foreignModuleIdColumn)
-        {
-            Sqlite::StrictTable table;
-            table.setUseIfNotExists(true);
-            table.setName("exportedTypeNames");
-            table.addColumn("exportedTypeNameId",
-                            Sqlite::StrictColumnType::Integer,
-                            {Sqlite::PrimaryKey{}});
-            auto &moduleIdColumn = table.addForeignKeyColumn("moduleId",
-                                                             foreignModuleIdColumn,
-                                                             Sqlite::ForeignKeyAction::NoAction,
-                                                             Sqlite::ForeignKeyAction::NoAction);
-            auto &nameColumn = table.addColumn("name", Sqlite::StrictColumnType::Text);
-            auto &typeIdColumn = table.addColumn("typeId", Sqlite::StrictColumnType::Integer);
-            auto &majorVersionColumn = table.addColumn("majorVersion",
-                                                       Sqlite::StrictColumnType::Integer);
-            auto &minorVersionColumn = table.addColumn("minorVersion",
-                                                       Sqlite::StrictColumnType::Integer);
-
-            table.addUniqueIndex({moduleIdColumn, nameColumn},
-                                 "majorVersion IS NULL AND minorVersion IS NULL");
-            table.addUniqueIndex({moduleIdColumn, nameColumn, majorVersionColumn},
-                                 "majorVersion IS NOT NULL AND minorVersion IS NULL");
-            table.addUniqueIndex({moduleIdColumn, nameColumn, majorVersionColumn, minorVersionColumn},
-                                 "majorVersion IS NOT NULL AND minorVersion IS NOT NULL");
-
-            table.addIndex({typeIdColumn});
-
-            table.initialize(database);
-        }
-
-        void createImportedTypeNamesTable(Database &database)
-        {
-            Sqlite::StrictTable table;
-            table.setUseIfNotExists(true);
-            table.setName("importedTypeNames");
-            table.addColumn("importedTypeNameId",
-                            Sqlite::StrictColumnType::Integer,
-                            {Sqlite::PrimaryKey{}});
-            auto &importOrSourceIdColumn = table.addColumn("importOrSourceId");
-            auto &nameColumn = table.addColumn("name", Sqlite::StrictColumnType::Text);
-            auto &kindColumn = table.addColumn("kind", Sqlite::StrictColumnType::Integer);
-
-            table.addUniqueIndex({kindColumn, importOrSourceIdColumn, nameColumn});
-
-            table.initialize(database);
-        }
-
-        void createEnumerationsTable(Database &database)
-        {
-            Sqlite::StrictTable table;
-            table.setUseIfNotExists(true);
-            table.setName("enumerationDeclarations");
-            table.addColumn("enumerationDeclarationId",
-                            Sqlite::StrictColumnType::Integer,
-                            {Sqlite::PrimaryKey{}});
-            auto &typeIdColumn = table.addColumn("typeId", Sqlite::StrictColumnType::Integer);
-            auto &nameColumn = table.addColumn("name", Sqlite::StrictColumnType::Text);
-            table.addColumn("enumeratorDeclarations", Sqlite::StrictColumnType::Text);
-
-            table.addUniqueIndex({typeIdColumn, nameColumn});
-
-            table.initialize(database);
-        }
-
-        void createFunctionsTable(Database &database)
-        {
-            Sqlite::StrictTable table;
-            table.setUseIfNotExists(true);
-            table.setName("functionDeclarations");
-            table.addColumn("functionDeclarationId",
-                            Sqlite::StrictColumnType::Integer,
-                            {Sqlite::PrimaryKey{}});
-            auto &typeIdColumn = table.addColumn("typeId", Sqlite::StrictColumnType::Integer);
-            auto &nameColumn = table.addColumn("name", Sqlite::StrictColumnType::Text);
-            auto &signatureColumn = table.addColumn("signature", Sqlite::StrictColumnType::Text);
-            table.addColumn("returnTypeName");
-
-            table.addUniqueIndex({typeIdColumn, nameColumn, signatureColumn});
-
-            table.initialize(database);
-        }
-
-        void createSignalsTable(Database &database)
-        {
-            Sqlite::StrictTable table;
-            table.setUseIfNotExists(true);
-            table.setName("signalDeclarations");
-            table.addColumn("signalDeclarationId",
-                            Sqlite::StrictColumnType::Integer,
-                            {Sqlite::PrimaryKey{}});
-            auto &typeIdColumn = table.addColumn("typeId", Sqlite::StrictColumnType::Integer);
-            auto &nameColumn = table.addColumn("name", Sqlite::StrictColumnType::Text);
-            auto &signatureColumn = table.addColumn("signature", Sqlite::StrictColumnType::Text);
-
-            table.addUniqueIndex({typeIdColumn, nameColumn, signatureColumn});
-
-            table.initialize(database);
-        }
-
-        Sqlite::StrictColumn createModulesTable(Database &database)
-        {
-            Sqlite::StrictTable table;
-            table.setUseIfNotExists(true);
-            table.setName("modules");
-            auto &modelIdColumn = table.addColumn("moduleId",
-                                                  Sqlite::StrictColumnType::Integer,
-                                                  {Sqlite::PrimaryKey{}});
-            auto &nameColumn = table.addColumn("name", Sqlite::StrictColumnType::Text);
-
-            table.addUniqueIndex({nameColumn});
-
-            table.initialize(database);
-
-            return std::move(modelIdColumn);
-        }
-
-        void createModuleExportedImportsTable(Database &database,
-                                              const Sqlite::StrictColumn &foreignModuleIdColumn)
-        {
-            Sqlite::StrictTable table;
-            table.setUseIfNotExists(true);
-            table.setName("moduleExportedImports");
-            table.addColumn("moduleExportedImportId",
-                            Sqlite::StrictColumnType::Integer,
-                            {Sqlite::PrimaryKey{}});
-            auto &moduleIdColumn = table.addForeignKeyColumn("moduleId",
-                                                             foreignModuleIdColumn,
-                                                             Sqlite::ForeignKeyAction::NoAction,
-                                                             Sqlite::ForeignKeyAction::Cascade,
-                                                             Sqlite::Enforment::Immediate);
-            auto &sourceIdColumn = table.addColumn("exportedModuleId",
-                                                   Sqlite::StrictColumnType::Integer);
-            table.addColumn("isAutoVersion", Sqlite::StrictColumnType::Integer);
-            table.addColumn("majorVersion", Sqlite::StrictColumnType::Integer);
-            table.addColumn("minorVersion", Sqlite::StrictColumnType::Integer);
-
-            table.addUniqueIndex({sourceIdColumn, moduleIdColumn});
-
-            table.initialize(database);
-        }
-
-        void createDocumentImportsTable(Database &database,
-                                        const Sqlite::StrictColumn &foreignModuleIdColumn)
-        {
-            Sqlite::StrictTable table;
-            table.setUseIfNotExists(true);
-            table.setName("documentImports");
-            table.addColumn("importId", Sqlite::StrictColumnType::Integer, {Sqlite::PrimaryKey{}});
-            auto &sourceIdColumn = table.addColumn("sourceId", Sqlite::StrictColumnType::Integer);
-            auto &moduleIdColumn = table.addForeignKeyColumn("moduleId",
-                                                             foreignModuleIdColumn,
-                                                             Sqlite::ForeignKeyAction::NoAction,
-                                                             Sqlite::ForeignKeyAction::Cascade,
-                                                             Sqlite::Enforment::Immediate);
-            auto &sourceModuleIdColumn = table.addForeignKeyColumn("sourceModuleId",
-                                                                   foreignModuleIdColumn,
-                                                                   Sqlite::ForeignKeyAction::NoAction,
-                                                                   Sqlite::ForeignKeyAction::Cascade,
-                                                                   Sqlite::Enforment::Immediate);
-            auto &kindColumn = table.addColumn("kind", Sqlite::StrictColumnType::Integer);
-            auto &majorVersionColumn = table.addColumn("majorVersion",
-                                                       Sqlite::StrictColumnType::Integer);
-            auto &minorVersionColumn = table.addColumn("minorVersion",
-                                                       Sqlite::StrictColumnType::Integer);
-            auto &parentImportIdColumn = table.addColumn("parentImportId",
-                                                         Sqlite::StrictColumnType::Integer);
-
-            table.addUniqueIndex({sourceIdColumn,
-                                  moduleIdColumn,
-                                  kindColumn,
-                                  sourceModuleIdColumn,
-                                  parentImportIdColumn},
-                                 "majorVersion IS NULL AND minorVersion IS NULL");
-            table.addUniqueIndex({sourceIdColumn,
-                                  moduleIdColumn,
-                                  kindColumn,
-                                  sourceModuleIdColumn,
-                                  majorVersionColumn,
-                                  parentImportIdColumn},
-                                 "majorVersion IS NOT NULL AND minorVersion IS NULL");
-            table.addUniqueIndex({sourceIdColumn,
-                                  moduleIdColumn,
-                                  kindColumn,
-                                  sourceModuleIdColumn,
-                                  majorVersionColumn,
-                                  minorVersionColumn,
-                                  parentImportIdColumn},
-                                 "majorVersion IS NOT NULL AND minorVersion IS NOT NULL");
-
-            table.initialize(database);
-        }
-
-        void createFileStatusesTable(Database &database)
-        {
-            Sqlite::StrictTable table;
-            table.setUseIfNotExists(true);
-            table.setName("fileStatuses");
-            table.addColumn("sourceId",
-                            Sqlite::StrictColumnType::Integer,
-                            {Sqlite::PrimaryKey{},
-                             Sqlite::ForeignKey{"sources",
-                                                "sourceId",
-                                                Sqlite::ForeignKeyAction::NoAction,
-                                                Sqlite::ForeignKeyAction::Cascade}});
-            table.addColumn("size", Sqlite::StrictColumnType::Integer);
-            table.addColumn("lastModified", Sqlite::StrictColumnType::Integer);
-
-            table.initialize(database);
-        }
-
-        void createProjectDatasTable(Database &database)
-        {
-            Sqlite::StrictTable table;
-            table.setUseIfNotExists(true);
-            table.setUseWithoutRowId(true);
-            table.setName("projectDatas");
-            auto &projectSourceIdColumn = table.addColumn("projectSourceId",
-                                                          Sqlite::StrictColumnType::Integer);
-            auto &sourceIdColumn = table.addColumn("sourceId", Sqlite::StrictColumnType::Integer);
-            table.addColumn("moduleId", Sqlite::StrictColumnType::Integer);
-            table.addColumn("fileType", Sqlite::StrictColumnType::Integer);
-
-            table.addPrimaryKeyContraint({projectSourceIdColumn, sourceIdColumn});
-            table.addUniqueIndex({sourceIdColumn});
-
-            table.initialize(database);
-        }
-
-        void createPropertyEditorPathsTable(Database &database)
-        {
-            Sqlite::StrictTable table;
-            table.setUseIfNotExists(true);
-            table.setUseWithoutRowId(true);
-            table.setName("propertyEditorPaths");
-            table.addColumn("typeId", Sqlite::StrictColumnType::Integer, {Sqlite::PrimaryKey{}});
-            table.addColumn("pathSourceId", Sqlite::StrictColumnType::Integer);
-            auto &directoryIdColumn = table.addColumn("directoryId",
-                                                      Sqlite::StrictColumnType::Integer);
-
-            table.addIndex({directoryIdColumn});
-
-            table.initialize(database);
-        }
-
-        void createTypeAnnotionsTable(Database &database)
-        {
-            Sqlite::StrictTable table;
-            table.setUseIfNotExists(true);
-            table.setUseWithoutRowId(true);
-            table.setName("typeAnnotations");
-            auto &typeIdColumn = table.addColumn("typeId",
-                                                 Sqlite::StrictColumnType::Integer,
-                                                 {Sqlite::PrimaryKey{}});
-            auto &sourceIdColumn = table.addColumn("sourceId", Sqlite::StrictColumnType::Integer);
-            table.addColumn("iconPath", Sqlite::StrictColumnType::Text);
-            table.addColumn("itemLibrary", Sqlite::StrictColumnType::Text);
-            table.addColumn("hints", Sqlite::StrictColumnType::Text);
-
-            table.addUniqueIndex({sourceIdColumn, typeIdColumn});
-
-            table.initialize(database);
-        }
-    };
+    struct Statements;
 
 public:
     Database &database;
     Sqlite::ExclusiveNonThrowingDestructorTransaction<Database> exclusiveTransaction;
-    Initializer initializer;
+    std::unique_ptr<Initializer> initializer;
     mutable ModuleCache moduleCache{ModuleStorageAdapter{*this}};
-    Storage::Info::CommonTypeCache<ProjectStorageInterface> commonTypeCache_{*this};
+    Storage::Info::CommonTypeCache<ProjectStorageType> commonTypeCache_{*this};
     QVarLengthArray<ProjectStorageObserver *, 24> observers;
-    ReadWriteStatement<1, 2> insertTypeStatement{
-        "INSERT OR IGNORE INTO types(sourceId, name) VALUES(?1, ?2) RETURNING typeId", database};
-    WriteStatement<5> updatePrototypeAndExtensionStatement{
-        "UPDATE types SET prototypeId=?2, prototypeNameId=?3, extensionId=?4, extensionNameId=?5 "
-        "WHERE typeId=?1 AND (prototypeId IS NOT ?2 OR extensionId IS NOT ?3 AND prototypeId "
-        "IS NOT ?4 OR extensionNameId IS NOT ?5)",
-        database};
-    mutable ReadStatement<1, 1> selectTypeIdByExportedNameStatement{
-        "SELECT typeId FROM exportedTypeNames WHERE name=?1", database};
-    mutable ReadStatement<1, 2> selectTypeIdByModuleIdAndExportedNameStatement{
-        "SELECT typeId FROM exportedTypeNames "
-        "WHERE moduleId=?1 AND name=?2 "
-        "ORDER BY majorVersion DESC, minorVersion DESC "
-        "LIMIT 1",
-        database};
-    mutable ReadStatement<1, 3> selectTypeIdByModuleIdAndExportedNameAndMajorVersionStatement{
-        "SELECT typeId FROM exportedTypeNames "
-        "WHERE moduleId=?1 AND name=?2 AND majorVersion=?3"
-        "ORDER BY minorVersion DESC "
-        "LIMIT 1",
-        database};
-    mutable ReadStatement<1, 4> selectTypeIdByModuleIdAndExportedNameAndVersionStatement{
-        "SELECT typeId FROM exportedTypeNames "
-        "WHERE moduleId=?1 AND name=?2 AND majorVersion=?3 AND minorVersion<=?4"
-        "ORDER BY minorVersion DESC "
-        "LIMIT 1",
-        database};
-    mutable ReadStatement<1, 2> selectPrototypeIdStatement{
-        "WITH RECURSIVE "
-        "  all_prototype_and_extension(typeId, prototypeId) AS ("
-        "       SELECT typeId, prototypeId FROM types WHERE prototypeId IS NOT NULL"
-        "    UNION ALL "
-        "       SELECT typeId, extensionId FROM types WHERE extensionId IS NOT NULL),"
-        "  typeSelection(typeId) AS ("
-        "      VALUES(?1) "
-        "    UNION ALL "
-        "      SELECT prototypeId FROM all_prototype_and_extension JOIN typeSelection "
-        "        USING(typeId))"
-        "SELECT typeId FROM typeSelection WHERE typeId=?2 LIMIT 1",
-        database};
-    mutable ReadStatement<1, 2> selectPropertyDeclarationIdByTypeIdAndNameStatement{
-        "WITH RECURSIVE "
-        "  all_prototype_and_extension(typeId, prototypeId) AS ("
-        "       SELECT typeId, prototypeId FROM types WHERE prototypeId IS NOT NULL"
-        "    UNION ALL "
-        "       SELECT typeId, extensionId FROM types WHERE extensionId IS NOT NULL),"
-        "  typeSelection(typeId, level) AS ("
-        "      VALUES(?1, 0) "
-        "    UNION ALL "
-        "      SELECT prototypeId, typeSelection.level+1 FROM all_prototype_and_extension JOIN "
-        "        typeSelection USING(typeId)) "
-        "SELECT propertyDeclarationId FROM propertyDeclarations JOIN typeSelection USING(typeId) "
-        "  WHERE name=?2 ORDER BY level LIMIT 1",
-        database};
-    mutable ReadStatement<3, 2> selectPropertyDeclarationByTypeIdAndNameStatement{
-        "WITH RECURSIVE "
-        "  all_prototype_and_extension(typeId, prototypeId) AS ("
-        "       SELECT typeId, prototypeId FROM types WHERE prototypeId IS NOT NULL"
-        "    UNION ALL "
-        "       SELECT typeId, extensionId FROM types WHERE extensionId IS NOT NULL),"
-        "  typeSelection(typeId, level) AS ("
-        "      VALUES(?1, 0) "
-        "    UNION ALL "
-        "      SELECT prototypeId, typeSelection.level+1 FROM all_prototype_and_extension JOIN "
-        "        typeSelection USING(typeId))"
-        "SELECT propertyTypeId, propertyDeclarationId, propertyTraits "
-        "  FROM propertyDeclarations JOIN typeSelection USING(typeId) "
-        "  WHERE name=?2 ORDER BY level LIMIT 1",
-        database};
-    mutable ReadStatement<1, 1> selectPrototypeIdsInOrderStatement{
-        "WITH RECURSIVE "
-        "  all_prototype_and_extension(typeId, prototypeId) AS ("
-        "       SELECT typeId, prototypeId FROM types WHERE prototypeId IS NOT NULL"
-        "    UNION ALL "
-        "       SELECT typeId, extensionId FROM types WHERE extensionId IS NOT NULL),"
-        "  typeSelection(typeId, level) AS ("
-        "      VALUES(?1, 0) "
-        "    UNION ALL "
-        "      SELECT prototypeId, typeSelection.level+1 FROM all_prototype_and_extension JOIN "
-        "        typeSelection USING(typeId) WHERE prototypeId IS NOT NULL) "
-        "SELECT typeId FROM typeSelection ORDER BY level DESC",
-        database};
-    mutable ReadStatement<1, 1> selectSourceContextIdFromSourceContextsBySourceContextPathStatement{
-        "SELECT sourceContextId FROM sourceContexts WHERE sourceContextPath = ?", database};
-    mutable ReadStatement<1, 1> selectSourceContextPathFromSourceContextsBySourceContextIdStatement{
-        "SELECT sourceContextPath FROM sourceContexts WHERE sourceContextId = ?", database};
-    mutable ReadStatement<2> selectAllSourceContextsStatement{
-        "SELECT sourceContextPath, sourceContextId FROM sourceContexts", database};
-    WriteStatement<1> insertIntoSourceContextsStatement{
-        "INSERT INTO sourceContexts(sourceContextPath) VALUES (?)", database};
-    mutable ReadStatement<1, 2> selectSourceIdFromSourcesBySourceContextIdAndSourceNameStatement{
-        "SELECT sourceId FROM sources WHERE sourceContextId = ? AND sourceName = ?", database};
-    mutable ReadStatement<2, 1> selectSourceNameAndSourceContextIdFromSourcesBySourceIdStatement{
-        "SELECT sourceName, sourceContextId FROM sources WHERE sourceId = ?", database};
-    mutable ReadStatement<1, 1> selectSourceContextIdFromSourcesBySourceIdStatement{
-        "SELECT sourceContextId FROM sources WHERE sourceId = ?", database};
-    WriteStatement<2> insertIntoSourcesStatement{
-        "INSERT INTO sources(sourceContextId, sourceName) VALUES (?,?)", database};
-    mutable ReadStatement<3> selectAllSourcesStatement{
-        "SELECT sourceName, sourceContextId, sourceId  FROM sources", database};
-    mutable ReadStatement<8, 1> selectTypeByTypeIdStatement{
-        "SELECT sourceId, t.name, t.typeId, prototypeId, extensionId, traits, annotationTraits, "
-        "pd.name "
-        "FROM types AS t LEFT JOIN propertyDeclarations AS pd ON "
-        "defaultPropertyId=propertyDeclarationId "
-        "WHERE t.typeId=?",
-        database};
-    mutable ReadStatement<4, 1> selectExportedTypesByTypeIdStatement{
-        "SELECT moduleId, name, ifnull(majorVersion, -1), ifnull(minorVersion, -1) FROM "
-        "exportedTypeNames WHERE typeId=?",
-        database};
-    mutable ReadStatement<4, 2> selectExportedTypesByTypeIdAndSourceIdStatement{
-        "SELECT etn.moduleId, name, ifnull(etn.majorVersion, -1), ifnull(etn.minorVersion, -1) "
-        "FROM exportedTypeNames AS etn JOIN documentImports USING(moduleId) WHERE typeId=?1 AND "
-        "sourceId=?2",
-        database};
-    mutable ReadStatement<8> selectTypesStatement{
-        "SELECT sourceId, t.name, t.typeId, prototypeId, extensionId, traits, annotationTraits, "
-        "pd.name "
-        "FROM types AS t LEFT JOIN propertyDeclarations AS pd ON "
-        "defaultPropertyId=propertyDeclarationId",
-        database};
-    WriteStatement<2> updateTypeTraitStatement{"UPDATE types SET traits = ?2 WHERE typeId=?1",
-                                               database};
-    WriteStatement<2> updateTypeAnnotationTraitStatement{
-        "UPDATE types SET annotationTraits = ?2 WHERE typeId=?1", database};
-    ReadStatement<1, 2> selectNotUpdatedTypesInSourcesStatement{
-        "SELECT DISTINCT typeId FROM types WHERE (sourceId IN carray(?1) AND typeId NOT IN "
-        "carray(?2))",
-        database};
-    WriteStatement<1> deleteTypeNamesByTypeIdStatement{
-        "DELETE FROM exportedTypeNames WHERE typeId=?", database};
-    WriteStatement<1> deleteEnumerationDeclarationByTypeIdStatement{
-        "DELETE FROM enumerationDeclarations WHERE typeId=?", database};
-    WriteStatement<1> deletePropertyDeclarationByTypeIdStatement{
-        "DELETE FROM propertyDeclarations WHERE typeId=?", database};
-    WriteStatement<1> deleteFunctionDeclarationByTypeIdStatement{
-        "DELETE FROM functionDeclarations WHERE typeId=?", database};
-    WriteStatement<1> deleteSignalDeclarationByTypeIdStatement{
-        "DELETE FROM signalDeclarations WHERE typeId=?", database};
-    WriteStatement<1> deleteTypeStatement{"DELETE FROM types  WHERE typeId=?", database};
-    mutable ReadStatement<4, 1> selectPropertyDeclarationsByTypeIdStatement{
-        "SELECT name, propertyTypeId, propertyTraits, (SELECT name FROM "
-        "propertyDeclarations WHERE propertyDeclarationId=pd.aliasPropertyDeclarationId) FROM "
-        "propertyDeclarations AS pd WHERE typeId=?",
-        database};
-    ReadStatement<6, 1> selectPropertyDeclarationsForTypeIdStatement{
-        "SELECT name, propertyTraits, propertyTypeId, propertyImportedTypeNameId, "
-        "propertyDeclarationId, aliasPropertyDeclarationId FROM propertyDeclarations "
-        "WHERE typeId=? ORDER BY name",
-        database};
-    ReadWriteStatement<1, 5> insertPropertyDeclarationStatement{
-        "INSERT INTO propertyDeclarations(typeId, name, propertyTypeId, propertyTraits, "
-        "propertyImportedTypeNameId, aliasPropertyDeclarationId) VALUES(?1, ?2, ?3, ?4, ?5, NULL) "
-        "RETURNING propertyDeclarationId",
-        database};
-    WriteStatement<4> updatePropertyDeclarationStatement{
-        "UPDATE propertyDeclarations SET propertyTypeId=?2, propertyTraits=?3, "
-        "propertyImportedTypeNameId=?4, aliasPropertyDeclarationId=NULL WHERE "
-        "propertyDeclarationId=?1",
-        database};
-    WriteStatement<3> updatePropertyAliasDeclarationRecursivelyWithTypeAndTraitsStatement{
-        "WITH RECURSIVE "
-        "  properties(aliasPropertyDeclarationId) AS ( "
-        "    SELECT propertyDeclarationId FROM propertyDeclarations WHERE "
-        "      aliasPropertyDeclarationId=?1 "
-        "   UNION ALL "
-        "     SELECT pd.propertyDeclarationId FROM "
-        "       propertyDeclarations AS pd JOIN properties USING(aliasPropertyDeclarationId)) "
-        "UPDATE propertyDeclarations AS pd "
-        "SET propertyTypeId=?2, propertyTraits=?3 "
-        "FROM properties AS p "
-        "WHERE pd.propertyDeclarationId=p.aliasPropertyDeclarationId",
-        database};
-    WriteStatement<1> updatePropertyAliasDeclarationRecursivelyStatement{
-        "WITH RECURSIVE "
-        "  propertyValues(propertyTypeId, propertyTraits) AS ("
-        "    SELECT propertyTypeId, propertyTraits FROM propertyDeclarations "
-        "      WHERE propertyDeclarationId=?1), "
-        "  properties(aliasPropertyDeclarationId) AS ( "
-        "    SELECT propertyDeclarationId FROM propertyDeclarations WHERE "
-        "      aliasPropertyDeclarationId=?1 "
-        "   UNION ALL "
-        "     SELECT pd.propertyDeclarationId FROM "
-        "       propertyDeclarations AS pd JOIN properties USING(aliasPropertyDeclarationId)) "
-        "UPDATE propertyDeclarations AS pd "
-        "SET propertyTypeId=pv.propertyTypeId, propertyTraits=pv.propertyTraits "
-        "FROM properties AS p, propertyValues AS pv "
-        "WHERE pd.propertyDeclarationId=p.aliasPropertyDeclarationId",
-        database};
-    WriteStatement<1> deletePropertyDeclarationStatement{
-        "DELETE FROM propertyDeclarations WHERE propertyDeclarationId=?", database};
-    ReadStatement<3, 1> selectPropertyDeclarationsWithAliasForTypeIdStatement{
-        "SELECT name, propertyDeclarationId, aliasPropertyDeclarationId FROM propertyDeclarations "
-        "WHERE typeId=? AND aliasPropertyDeclarationId IS NOT NULL ORDER BY name",
-        database};
-    WriteStatement<5> updatePropertyDeclarationWithAliasAndTypeStatement{
-        "UPDATE propertyDeclarations SET propertyTypeId=?2, propertyTraits=?3, "
-        "propertyImportedTypeNameId=?4, aliasPropertyDeclarationId=?5 WHERE "
-        "propertyDeclarationId=?1",
-        database};
-    ReadWriteStatement<1, 2> insertAliasPropertyDeclarationStatement{
-        "INSERT INTO propertyDeclarations(typeId, name) VALUES(?1, ?2) RETURNING "
-        "propertyDeclarationId",
-        database};
-    mutable ReadStatement<4, 1> selectFunctionDeclarationsForTypeIdStatement{
-        "SELECT name, returnTypeName, signature, functionDeclarationId FROM "
-        "functionDeclarations WHERE typeId=? ORDER BY name, signature",
-        database};
-    mutable ReadStatement<3, 1> selectFunctionDeclarationsForTypeIdWithoutSignatureStatement{
-        "SELECT name, returnTypeName, functionDeclarationId FROM "
-        "functionDeclarations WHERE typeId=? ORDER BY name",
-        database};
-    mutable ReadStatement<3, 1> selectFunctionParameterDeclarationsStatement{
-        "SELECT json_extract(json_each.value, '$.n'), json_extract(json_each.value, '$.tn'), "
-        "json_extract(json_each.value, '$.tr') FROM functionDeclarations, "
-        "json_each(functionDeclarations.signature) WHERE functionDeclarationId=?",
-        database};
-    WriteStatement<4> insertFunctionDeclarationStatement{
-        "INSERT INTO functionDeclarations(typeId, name, returnTypeName, signature) VALUES(?1, ?2, "
-        "?3, ?4)",
-        database};
-    WriteStatement<2> updateFunctionDeclarationStatement{
-        "UPDATE functionDeclarations SET returnTypeName=?2 WHERE functionDeclarationId=?1", database};
-    WriteStatement<1> deleteFunctionDeclarationStatement{
-        "DELETE FROM functionDeclarations WHERE functionDeclarationId=?", database};
-    mutable ReadStatement<3, 1> selectSignalDeclarationsForTypeIdStatement{
-        "SELECT name, signature, signalDeclarationId FROM signalDeclarations WHERE typeId=? ORDER "
-        "BY name, signature",
-        database};
-    mutable ReadStatement<2, 1> selectSignalDeclarationsForTypeIdWithoutSignatureStatement{
-        "SELECT name, signalDeclarationId FROM signalDeclarations WHERE typeId=? ORDER BY name",
-        database};
-    mutable ReadStatement<3, 1> selectSignalParameterDeclarationsStatement{
-        "SELECT json_extract(json_each.value, '$.n'), json_extract(json_each.value, '$.tn'), "
-        "json_extract(json_each.value, '$.tr') FROM signalDeclarations, "
-        "json_each(signalDeclarations.signature) WHERE signalDeclarationId=?",
-        database};
-    WriteStatement<3> insertSignalDeclarationStatement{
-        "INSERT INTO signalDeclarations(typeId, name, signature) VALUES(?1, ?2, ?3)", database};
-    WriteStatement<2> updateSignalDeclarationStatement{
-        "UPDATE signalDeclarations SET  signature=?2 WHERE signalDeclarationId=?1", database};
-    WriteStatement<1> deleteSignalDeclarationStatement{
-        "DELETE FROM signalDeclarations WHERE signalDeclarationId=?", database};
-    mutable ReadStatement<3, 1> selectEnumerationDeclarationsForTypeIdStatement{
-        "SELECT name, enumeratorDeclarations, enumerationDeclarationId FROM "
-        "enumerationDeclarations WHERE typeId=? ORDER BY name",
-        database};
-    mutable ReadStatement<2, 1> selectEnumerationDeclarationsForTypeIdWithoutEnumeratorDeclarationsStatement{
-        "SELECT name, enumerationDeclarationId FROM enumerationDeclarations WHERE typeId=? ORDER "
-        "BY name",
-        database};
-    mutable ReadStatement<3, 1> selectEnumeratorDeclarationStatement{
-        "SELECT json_each.key, json_each.value, json_each.type!='null' FROM "
-        "enumerationDeclarations, json_each(enumerationDeclarations.enumeratorDeclarations) WHERE "
-        "enumerationDeclarationId=?",
-        database};
-    WriteStatement<3> insertEnumerationDeclarationStatement{
-        "INSERT INTO enumerationDeclarations(typeId, name, enumeratorDeclarations) VALUES(?1, ?2, "
-        "?3)",
-        database};
-    WriteStatement<2> updateEnumerationDeclarationStatement{
-        "UPDATE enumerationDeclarations SET  enumeratorDeclarations=?2 WHERE "
-        "enumerationDeclarationId=?1",
-        database};
-    WriteStatement<1> deleteEnumerationDeclarationStatement{
-        "DELETE FROM enumerationDeclarations WHERE enumerationDeclarationId=?", database};
-    mutable ReadStatement<1, 1> selectModuleIdByNameStatement{
-        "SELECT moduleId FROM modules WHERE name=? LIMIT 1", database};
-    mutable ReadWriteStatement<1, 1> insertModuleNameStatement{
-        "INSERT INTO modules(name) VALUES(?1) RETURNING moduleId", database};
-    mutable ReadStatement<1, 1> selectModuleNameStatement{
-        "SELECT name FROM modules WHERE moduleId =?1", database};
-    mutable ReadStatement<2> selectAllModulesStatement{"SELECT name, moduleId FROM modules", database};
-    mutable ReadStatement<1, 2> selectTypeIdBySourceIdAndNameStatement{
-        "SELECT typeId FROM types WHERE sourceId=?1 and name=?2", database};
-    mutable ReadStatement<1, 3> selectTypeIdByModuleIdsAndExportedNameStatement{
-        "SELECT typeId FROM exportedTypeNames WHERE moduleId IN carray(?1, ?2, 'int32') AND "
-        "name=?3",
-        database};
-    mutable ReadStatement<4> selectAllDocumentImportForSourceIdStatement{
-        "SELECT moduleId, majorVersion, minorVersion, sourceId "
-        "FROM documentImports ",
-        database};
-    mutable ReadStatement<5, 2> selectDocumentImportForSourceIdStatement{
-        "SELECT importId, sourceId, moduleId, majorVersion, minorVersion "
-        "FROM documentImports WHERE sourceId IN carray(?1) AND kind=?2 ORDER BY sourceId, "
-        "moduleId, majorVersion, minorVersion",
-        database};
-    ReadWriteStatement<1, 5> insertDocumentImportWithoutVersionStatement{
-        "INSERT INTO documentImports(sourceId, moduleId, sourceModuleId, kind, "
-        "parentImportId) VALUES (?1, ?2, ?3, ?4, ?5) RETURNING importId",
-        database};
-    ReadWriteStatement<1, 6> insertDocumentImportWithMajorVersionStatement{
-        "INSERT INTO documentImports(sourceId, moduleId, sourceModuleId, kind, majorVersion, "
-        "parentImportId) VALUES (?1, ?2, ?3, ?4, ?5, ?6) RETURNING importId",
-        database};
-    ReadWriteStatement<1, 7> insertDocumentImportWithVersionStatement{
-        "INSERT INTO documentImports(sourceId, moduleId, sourceModuleId, kind, majorVersion, "
-        "minorVersion, parentImportId) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7) RETURNING "
-        "importId",
-        database};
-    WriteStatement<1> deleteDocumentImportStatement{"DELETE FROM documentImports WHERE importId=?1",
-                                                    database};
-    WriteStatement<2> deleteDocumentImportsWithParentImportIdStatement{
-        "DELETE FROM documentImports WHERE sourceId=?1 AND parentImportId=?2", database};
-    WriteStatement<1> deleteDocumentImportsWithSourceIdsStatement{
-        "DELETE FROM documentImports WHERE sourceId IN carray(?1)", database};
-    ReadStatement<1, 2> selectPropertyDeclarationIdPrototypeChainDownStatement{
-        "WITH RECURSIVE "
-        "  all_prototype_and_extension(typeId, prototypeId) AS ("
-        "       SELECT typeId, prototypeId FROM types WHERE prototypeId IS NOT NULL"
-        "    UNION ALL "
-        "       SELECT typeId, extensionId FROM types WHERE extensionId IS NOT NULL),"
-        "  typeSelection(typeId, level) AS ("
-        "      SELECT prototypeId, 0 FROM types WHERE typeId=?1 AND prototypeId IS NOT NULL"
-        "    UNION ALL "
-        "      SELECT prototypeId, typeSelection.level+1 FROM all_prototype_and_extension JOIN "
-        "        typeSelection USING(typeId))"
-        "SELECT propertyDeclarationId FROM typeSelection JOIN propertyDeclarations "
-        "  USING(typeId) WHERE name=?2 ORDER BY level LIMIT 1",
-        database};
-    WriteStatement<2> updateAliasIdPropertyDeclarationStatement{
-        "UPDATE propertyDeclarations SET aliasPropertyDeclarationId=?2  WHERE "
-        "aliasPropertyDeclarationId=?1",
-        database};
-    WriteStatement<2> updateAliasPropertyDeclarationByAliasPropertyDeclarationIdStatement{
-        "UPDATE propertyDeclarations SET propertyTypeId=new.propertyTypeId, "
-        "propertyTraits=new.propertyTraits, aliasPropertyDeclarationId=?1 FROM (SELECT "
-        "propertyTypeId, propertyTraits FROM propertyDeclarations WHERE propertyDeclarationId=?1) "
-        "AS new WHERE aliasPropertyDeclarationId=?2",
-        database};
-    WriteStatement<1> updateAliasPropertyDeclarationToNullStatement{
-        "UPDATE propertyDeclarations SET aliasPropertyDeclarationId=NULL, propertyTypeId=NULL, "
-        "propertyTraits=NULL WHERE propertyDeclarationId=? AND (aliasPropertyDeclarationId IS NOT "
-        "NULL OR propertyTypeId IS NOT NULL OR propertyTraits IS NOT NULL)",
-        database};
-    ReadStatement<5, 1> selectAliasPropertiesDeclarationForPropertiesWithTypeIdStatement{
-        "SELECT alias.typeId, alias.propertyDeclarationId, alias.propertyImportedTypeNameId, "
-        "alias.aliasPropertyDeclarationId, alias.aliasPropertyDeclarationTailId FROM "
-        "propertyDeclarations AS alias JOIN propertyDeclarations AS target ON "
-        "alias.aliasPropertyDeclarationId=target.propertyDeclarationId OR "
-        "alias.aliasPropertyDeclarationTailId=target.propertyDeclarationId WHERE "
-        "alias.propertyTypeId=?1 OR target.typeId=?1 OR alias.propertyImportedTypeNameId IN "
-        "(SELECT importedTypeNameId FROM exportedTypeNames JOIN importedTypeNames USING(name) "
-        "WHERE typeId=?1)",
-        database};
-    ReadStatement<3, 1> selectAliasPropertiesDeclarationForPropertiesWithAliasIdStatement{
-        "WITH RECURSIVE "
-        "  properties(propertyDeclarationId, propertyImportedTypeNameId, typeId, "
-        "    aliasPropertyDeclarationId) AS ("
-        "      SELECT propertyDeclarationId, propertyImportedTypeNameId, typeId, "
-        "        aliasPropertyDeclarationId FROM propertyDeclarations WHERE "
-        "        aliasPropertyDeclarationId=?1"
-        "    UNION ALL "
-        "      SELECT pd.propertyDeclarationId, pd.propertyImportedTypeNameId, pd.typeId, "
-        "        pd.aliasPropertyDeclarationId FROM propertyDeclarations AS pd JOIN properties AS "
-        "        p ON pd.aliasPropertyDeclarationId=p.propertyDeclarationId)"
-        "SELECT propertyDeclarationId, propertyImportedTypeNameId, aliasPropertyDeclarationId "
-        "  FROM properties",
-        database};
-    ReadWriteStatement<3, 1> updatesPropertyDeclarationPropertyTypeToNullStatement{
-        "UPDATE propertyDeclarations SET propertyTypeId=NULL WHERE propertyTypeId=?1 AND "
-        "aliasPropertyDeclarationId IS NULL RETURNING typeId, propertyDeclarationId, "
-        "propertyImportedTypeNameId",
-        database};
-    mutable ReadStatement<1, 1> selectPropertyNameStatement{
-        "SELECT name FROM propertyDeclarations WHERE propertyDeclarationId=?", database};
-    WriteStatement<2> updatePropertyDeclarationTypeStatement{
-        "UPDATE propertyDeclarations SET propertyTypeId=?2 WHERE propertyDeclarationId=?1", database};
-    ReadWriteStatement<2, 1> updatePrototypeIdToNullStatement{
-        "UPDATE types SET prototypeId=NULL WHERE prototypeId=?1 RETURNING "
-        "typeId, prototypeNameId",
-        database};
-    ReadWriteStatement<2, 1> updateExtensionIdToNullStatement{
-        "UPDATE types SET extensionId=NULL WHERE extensionId=?1 RETURNING "
-        "typeId, extensionNameId",
-        database};
-    WriteStatement<2> updateTypePrototypeStatement{
-        "UPDATE types SET prototypeId=?2 WHERE typeId=?1", database};
-    WriteStatement<2> updateTypeExtensionStatement{
-        "UPDATE types SET extensionId=?2 WHERE typeId=?1", database};
-    mutable ReadStatement<1, 1> selectTypeIdsForPrototypeChainIdStatement{
-        "WITH RECURSIVE "
-        "  all_prototype_and_extension(typeId, prototypeId) AS ("
-        "       SELECT typeId, prototypeId FROM types WHERE prototypeId IS NOT NULL"
-        "    UNION ALL "
-        "       SELECT typeId, extensionId FROM types WHERE extensionId IS NOT NULL),"
-        "  prototypes(typeId) AS ("
-        "       SELECT prototypeId FROM all_prototype_and_extension WHERE typeId=?"
-        "    UNION ALL "
-        "       SELECT prototypeId FROM all_prototype_and_extension JOIN "
-        "         prototypes USING(typeId)) "
-        "SELECT typeId FROM prototypes",
-        database};
-    WriteStatement<3> updatePropertyDeclarationAliasIdAndTypeNameIdStatement{
-        "UPDATE propertyDeclarations SET aliasPropertyDeclarationId=?2, "
-        "propertyImportedTypeNameId=?3 WHERE propertyDeclarationId=?1 AND "
-        "(aliasPropertyDeclarationId IS NOT ?2 OR propertyImportedTypeNameId IS NOT ?3)",
-        database};
-    WriteStatement<1> updatetPropertiesDeclarationValuesOfAliasStatement{
-        "WITH RECURSIVE "
-        "  properties(propertyDeclarationId, propertyTypeId, propertyTraits) AS ( "
-        "      SELECT aliasPropertyDeclarationId, propertyTypeId, propertyTraits FROM "
-        "       propertyDeclarations WHERE propertyDeclarationId=?1 "
-        "   UNION ALL "
-        "      SELECT pd.aliasPropertyDeclarationId, pd.propertyTypeId, pd.propertyTraits FROM "
-        "        propertyDeclarations AS pd JOIN properties USING(propertyDeclarationId)) "
-        "UPDATE propertyDeclarations AS pd SET propertyTypeId=p.propertyTypeId, "
-        "  propertyTraits=p.propertyTraits "
-        "FROM properties AS p "
-        "WHERE pd.propertyDeclarationId=?1 AND p.propertyDeclarationId IS NULL AND "
-        "  (pd.propertyTypeId IS NOT p.propertyTypeId OR pd.propertyTraits IS NOT "
-        "  p.propertyTraits)",
-        database};
-    WriteStatement<1> updatePropertyDeclarationAliasIdToNullStatement{
-        "UPDATE propertyDeclarations SET aliasPropertyDeclarationId=NULL  WHERE "
-        "propertyDeclarationId=?1",
-        database};
-    mutable ReadStatement<1, 1> selectPropertyDeclarationIdsForAliasChainStatement{
-        "WITH RECURSIVE "
-        "  properties(propertyDeclarationId) AS ( "
-        "    SELECT aliasPropertyDeclarationId FROM propertyDeclarations WHERE "
-        "     propertyDeclarationId=?1 "
-        "   UNION ALL "
-        "     SELECT aliasPropertyDeclarationId FROM propertyDeclarations JOIN properties "
-        "       USING(propertyDeclarationId)) "
-        "SELECT propertyDeclarationId FROM properties",
-        database};
-    mutable ReadStatement<3> selectAllFileStatusesStatement{
-        "SELECT sourceId, size, lastModified FROM fileStatuses ORDER BY sourceId", database};
-    mutable ReadStatement<3, 1> selectFileStatusesForSourceIdsStatement{
-        "SELECT sourceId, size, lastModified FROM fileStatuses WHERE sourceId IN carray(?1) ORDER "
-        "BY sourceId",
-        database};
-    mutable ReadStatement<3, 1> selectFileStatusesForSourceIdStatement{
-        "SELECT sourceId, size, lastModified FROM fileStatuses WHERE sourceId=?1 ORDER BY sourceId",
-        database};
-    WriteStatement<3> insertFileStatusStatement{
-        "INSERT INTO fileStatuses(sourceId, size, lastModified) VALUES(?1, ?2, ?3)", database};
-    WriteStatement<1> deleteFileStatusStatement{"DELETE FROM fileStatuses WHERE sourceId=?1",
-                                                database};
-    WriteStatement<3> updateFileStatusStatement{
-        "UPDATE fileStatuses SET size=?2, lastModified=?3 WHERE sourceId=?1", database};
-    ReadStatement<1, 1> selectTypeIdBySourceIdStatement{"SELECT typeId FROM types WHERE sourceId=?",
-                                                        database};
-    mutable ReadStatement<1, 3> selectImportedTypeNameIdStatement{
-        "SELECT importedTypeNameId FROM importedTypeNames WHERE kind=?1 AND importOrSourceId=?2 "
-        "AND name=?3 LIMIT 1",
-        database};
-    mutable ReadWriteStatement<1, 3> insertImportedTypeNameIdStatement{
-        "INSERT INTO importedTypeNames(kind, importOrSourceId, name) VALUES (?1, ?2, ?3) "
-        "RETURNING importedTypeNameId",
-        database};
-    mutable ReadStatement<1, 2> selectImportIdBySourceIdAndModuleIdStatement{
-        "SELECT importId FROM documentImports WHERE sourceId=?1 AND moduleId=?2 AND majorVersion "
-        "IS NULL AND minorVersion IS NULL LIMIT 1",
-        database};
-    mutable ReadStatement<1, 3> selectImportIdBySourceIdAndModuleIdAndMajorVersionStatement{
-        "SELECT importId FROM documentImports WHERE sourceId=?1 AND moduleId=?2 AND "
-        "majorVersion=?3 AND minorVersion IS NULL LIMIT 1",
-        database};
-    mutable ReadStatement<1, 4> selectImportIdBySourceIdAndModuleIdAndVersionStatement{
-        "SELECT importId FROM documentImports WHERE sourceId=?1 AND moduleId=?2 AND "
-        "majorVersion=?3 AND minorVersion=?4 LIMIT 1",
-        database};
-    mutable ReadStatement<1, 1> selectKindFromImportedTypeNamesStatement{
-        "SELECT kind FROM importedTypeNames WHERE importedTypeNameId=?1", database};
-    mutable ReadStatement<1, 1> selectNameFromImportedTypeNamesStatement{
-        "SELECT name FROM importedTypeNames WHERE importedTypeNameId=?1", database};
-    mutable ReadStatement<1, 1> selectTypeIdForQualifiedImportedTypeNameNamesStatement{
-        "SELECT typeId FROM importedTypeNames AS itn JOIN documentImports AS di ON "
-        "importOrSourceId=di.importId JOIN documentImports AS di2 ON di.sourceId=di2.sourceId AND "
-        "di.moduleId=di2.sourceModuleId "
-        "JOIN exportedTypeNames AS etn ON di2.moduleId=etn.moduleId WHERE "
-        "itn.kind=2 AND importedTypeNameId=?1 AND itn.name=etn.name AND "
-        "(di.majorVersion IS NULL OR (di.majorVersion=etn.majorVersion AND (di.minorVersion IS "
-        "NULL OR di.minorVersion>=etn.minorVersion))) ORDER BY etn.majorVersion DESC NULLS FIRST, "
-        "etn.minorVersion DESC NULLS FIRST LIMIT 1",
-        database};
-    mutable ReadStatement<1, 1> selectTypeIdForImportedTypeNameNamesStatement{
-        "SELECT typeId FROM importedTypeNames AS itn JOIN documentImports AS di ON "
-        "importOrSourceId=sourceId JOIN exportedTypeNames AS etn USING(moduleId) WHERE "
-        "itn.kind=1 AND importedTypeNameId=?1 AND itn.name=etn.name AND "
-        "(di.majorVersion IS NULL OR (di.majorVersion=etn.majorVersion AND (di.minorVersion IS "
-        "NULL OR di.minorVersion>=etn.minorVersion))) ORDER BY di.kind, etn.majorVersion DESC "
-        "NULLS FIRST, etn.minorVersion DESC NULLS FIRST LIMIT 1",
-        database};
-    WriteStatement<0> deleteAllSourcesStatement{"DELETE FROM sources", database};
-    WriteStatement<0> deleteAllSourceContextsStatement{"DELETE FROM sourceContexts", database};
-    mutable ReadStatement<6, 1> selectExportedTypesForSourceIdsStatement{
-        "SELECT moduleId, name, ifnull(majorVersion, -1), ifnull(minorVersion, -1), typeId, "
-        "exportedTypeNameId FROM exportedTypeNames WHERE typeId in carray(?1) ORDER BY moduleId, "
-        "name, majorVersion, minorVersion",
-        database};
-    WriteStatement<5> insertExportedTypeNamesWithVersionStatement{
-        "INSERT INTO exportedTypeNames(moduleId, name, majorVersion, minorVersion, typeId) "
-        "VALUES(?1, ?2, ?3, ?4, ?5)",
-        database};
-    WriteStatement<4> insertExportedTypeNamesWithMajorVersionStatement{
-        "INSERT INTO exportedTypeNames(moduleId, name, majorVersion, typeId) "
-        "VALUES(?1, ?2, ?3, ?4)",
-        database};
-    WriteStatement<3> insertExportedTypeNamesWithoutVersionStatement{
-        "INSERT INTO exportedTypeNames(moduleId, name, typeId) VALUES(?1, ?2, ?3)", database};
-    WriteStatement<1> deleteExportedTypeNameStatement{
-        "DELETE FROM exportedTypeNames WHERE exportedTypeNameId=?", database};
-    WriteStatement<2> updateExportedTypeNameTypeIdStatement{
-        "UPDATE exportedTypeNames SET typeId=?2 WHERE exportedTypeNameId=?1", database};
-    mutable ReadStatement<4, 1> selectProjectDatasForSourceIdsStatement{
-        "SELECT projectSourceId, sourceId, moduleId, fileType FROM projectDatas WHERE "
-        "projectSourceId IN carray(?1) ORDER BY projectSourceId, sourceId",
-        database};
-    WriteStatement<4> insertProjectDataStatement{
-        "INSERT INTO projectDatas(projectSourceId, sourceId, "
-        "moduleId, fileType) VALUES(?1, ?2, ?3, ?4)",
-        database};
-    WriteStatement<2> deleteProjectDataStatement{
-        "DELETE FROM projectDatas WHERE projectSourceId=?1 AND sourceId=?2", database};
-    WriteStatement<4> updateProjectDataStatement{
-        "UPDATE projectDatas SET moduleId=?3, fileType=?4 WHERE projectSourceId=?1 AND sourceId=?2",
-        database};
-    mutable ReadStatement<4, 1> selectProjectDatasForSourceIdStatement{
-        "SELECT projectSourceId, sourceId, moduleId, fileType FROM projectDatas WHERE "
-        "projectSourceId=?1",
-        database};
-    mutable ReadStatement<4, 1> selectProjectDataForSourceIdStatement{
-        "SELECT projectSourceId, sourceId, moduleId, fileType FROM projectDatas WHERE "
-        "sourceId=?1 LIMIT 1",
-        database};
-    mutable ReadStatement<1, 1> selectTypeIdsForSourceIdsStatement{
-        "SELECT typeId FROM types WHERE sourceId IN carray(?1)", database};
-    mutable ReadStatement<6, 1> selectModuleExportedImportsForSourceIdStatement{
-        "SELECT moduleExportedImportId, moduleId, exportedModuleId, ifnull(majorVersion, -1), "
-        "ifnull(minorVersion, -1), isAutoVersion FROM moduleExportedImports WHERE moduleId IN "
-        "carray(?1) ORDER BY moduleId, exportedModuleId",
-        database};
-    WriteStatement<3> insertModuleExportedImportWithoutVersionStatement{
-        "INSERT INTO moduleExportedImports(moduleId, exportedModuleId, isAutoVersion) "
-        "VALUES (?1, ?2, ?3)",
-        database};
-    WriteStatement<4> insertModuleExportedImportWithMajorVersionStatement{
-        "INSERT INTO moduleExportedImports(moduleId, exportedModuleId, isAutoVersion, "
-        "majorVersion) VALUES (?1, ?2, ?3, ?4)",
-        database};
-    WriteStatement<5> insertModuleExportedImportWithVersionStatement{
-        "INSERT INTO moduleExportedImports(moduleId, exportedModuleId, isAutoVersion, "
-        "majorVersion, minorVersion) VALUES (?1, ?2, ?3, ?4, ?5)",
-        database};
-    WriteStatement<1> deleteModuleExportedImportStatement{
-        "DELETE FROM moduleExportedImports WHERE moduleExportedImportId=?1", database};
-    mutable ReadStatement<3, 3> selectModuleExportedImportsForModuleIdStatement{
-        "WITH RECURSIVE "
-        "  imports(moduleId, majorVersion, minorVersion, moduleExportedImportId) AS ( "
-        "      SELECT exportedModuleId, "
-        "             iif(isAutoVersion=1, ?2, majorVersion), "
-        "             iif(isAutoVersion=1, ?3, minorVersion), "
-        "             moduleExportedImportId "
-        "        FROM moduleExportedImports WHERE moduleId=?1 "
-        "    UNION ALL "
-        "      SELECT exportedModuleId, "
-        "             iif(mei.isAutoVersion=1, i.majorVersion, mei.majorVersion), "
-        "             iif(mei.isAutoVersion=1, i.minorVersion, mei.minorVersion), "
-        "             mei.moduleExportedImportId "
-        "        FROM moduleExportedImports AS mei JOIN imports AS i USING(moduleId)) "
-        "SELECT DISTINCT moduleId, ifnull(majorVersion, -1), ifnull(minorVersion, -1) "
-        "FROM imports",
-        database};
-    mutable ReadStatement<1, 1> selectPropertyDeclarationIdsForTypeStatement{
-        "WITH RECURSIVE "
-        "  all_prototype_and_extension(typeId, prototypeId) AS ("
-        "       SELECT typeId, prototypeId FROM types WHERE prototypeId IS NOT NULL"
-        "    UNION ALL "
-        "       SELECT typeId, extensionId FROM types WHERE extensionId IS NOT NULL),"
-        "  typeChain(typeId) AS ("
-        "      VALUES(?1)"
-        "    UNION ALL "
-        "      SELECT prototypeId FROM all_prototype_and_extension JOIN typeChain "
-        "        USING(typeId))"
-        "SELECT propertyDeclarationId FROM typeChain JOIN propertyDeclarations "
-        "  USING(typeId) ORDER BY propertyDeclarationId",
-        database};
-    mutable ReadStatement<1, 1> selectLocalPropertyDeclarationIdsForTypeStatement{
-        "SELECT propertyDeclarationId "
-        "FROM propertyDeclarations "
-        "WHERE typeId=? "
-        "ORDER BY propertyDeclarationId",
-        database};
-    mutable ReadStatement<1, 2> selectPropertyDeclarationIdForTypeAndPropertyNameStatement{
-        "WITH RECURSIVE "
-        "  all_prototype_and_extension(typeId, prototypeId) AS ("
-        "       SELECT typeId, prototypeId FROM types WHERE prototypeId IS NOT NULL"
-        "    UNION ALL "
-        "       SELECT typeId, extensionId FROM types WHERE extensionId IS NOT NULL),"
-        "  typeChain(typeId, level) AS ("
-        "      VALUES(?1, 0)"
-        "    UNION ALL "
-        "      SELECT prototypeId, typeChain.level + 1 FROM all_prototype_and_extension JOIN "
-        "        typeChain USING(typeId))"
-        "SELECT propertyDeclarationId FROM typeChain JOIN propertyDeclarations "
-        "  USING(typeId) WHERE name=?2 ORDER BY level LIMIT 1",
-        database};
-    mutable ReadStatement<1, 2> selectLocalPropertyDeclarationIdForTypeAndPropertyNameStatement{
-        "SELECT propertyDeclarationId "
-        "FROM propertyDeclarations "
-        "WHERE typeId=?1 AND name=?2 LIMIT 1",
-        database};
-    mutable ReadStatement<4, 1> selectPropertyDeclarationForPropertyDeclarationIdStatement{
-        "SELECT typeId, name, propertyTraits, propertyTypeId "
-        "FROM propertyDeclarations "
-        "WHERE propertyDeclarationId=?1 LIMIT 1",
-        database};
-    mutable ReadStatement<1, 1> selectSignalDeclarationNamesForTypeStatement{
-        "WITH RECURSIVE "
-        "  all_prototype_and_extension(typeId, prototypeId) AS ("
-        "       SELECT typeId, prototypeId FROM types WHERE prototypeId IS NOT NULL"
-        "    UNION ALL "
-        "       SELECT typeId, extensionId FROM types WHERE extensionId IS NOT NULL),"
-        "  typeChain(typeId) AS ("
-        "      VALUES(?1)"
-        "    UNION ALL "
-        "      SELECT prototypeId FROM all_prototype_and_extension JOIN typeChain "
-        "        USING(typeId)) "
-        "SELECT name FROM typeChain JOIN signalDeclarations "
-        "  USING(typeId) ORDER BY name",
-        database};
-    mutable ReadStatement<1, 1> selectFuncionDeclarationNamesForTypeStatement{
-        "WITH RECURSIVE "
-        "  all_prototype_and_extension(typeId, prototypeId) AS ("
-        "       SELECT typeId, prototypeId FROM types WHERE prototypeId IS NOT NULL"
-        "    UNION ALL "
-        "       SELECT typeId, extensionId FROM types WHERE extensionId IS NOT NULL),"
-        "  typeChain(typeId) AS ("
-        "      VALUES(?1)"
-        "    UNION ALL "
-        "      SELECT prototypeId FROM all_prototype_and_extension JOIN typeChain "
-        "        USING(typeId))"
-        "SELECT name FROM typeChain JOIN functionDeclarations "
-        "  USING(typeId) ORDER BY name",
-        database};
-    mutable ReadStatement<2> selectTypesWithDefaultPropertyStatement{
-        "SELECT typeId, defaultPropertyId FROM types ORDER BY typeId", database};
-    WriteStatement<2> updateDefaultPropertyIdStatement{
-        "UPDATE types SET defaultPropertyId=?2 WHERE typeId=?1", database};
-    WriteStatement<1> updateDefaultPropertyIdToNullStatement{
-        "UPDATE types SET defaultPropertyId=NULL WHERE defaultPropertyId=?1", database};
-    mutable ReadStatement<4, 1> selectInfoTypeByTypeIdStatement{
-        "SELECT defaultPropertyId, sourceId, traits, annotationTraits FROM types WHERE typeId=?",
-        database};
-    mutable ReadStatement<1, 1> selectPrototypeIdsForTypeIdInOrderStatement{
-        "WITH RECURSIVE "
-        "  all_prototype_and_extension(typeId, prototypeId) AS ("
-        "       SELECT typeId, prototypeId FROM types WHERE prototypeId IS NOT NULL"
-        "    UNION ALL "
-        "       SELECT typeId, extensionId FROM types WHERE extensionId IS NOT NULL),"
-        "  prototypes(typeId, level) AS ("
-        "       SELECT prototypeId, 0 FROM all_prototype_and_extension WHERE typeId=?"
-        "    UNION ALL "
-        "      SELECT prototypeId, p.level+1 FROM all_prototype_and_extension JOIN "
-        "        prototypes AS p USING(typeId)) "
-        "SELECT typeId FROM prototypes ORDER BY level",
-        database};
-    mutable ReadStatement<1, 1> selectPrototypeAndSelfIdsForTypeIdInOrderStatement{
-        "WITH RECURSIVE "
-        "  all_prototype_and_extension(typeId, prototypeId) AS ("
-        "       SELECT typeId, prototypeId FROM types WHERE prototypeId IS NOT NULL"
-        "    UNION ALL "
-        "       SELECT typeId, extensionId FROM types WHERE extensionId IS NOT NULL),"
-        "  typeChain(typeId, level) AS ("
-        "       VALUES(?1, 0)"
-        "    UNION ALL "
-        "      SELECT prototypeId, tc.level+1 FROM all_prototype_and_extension JOIN "
-        "        typeChain AS tc USING(typeId)) "
-        "SELECT typeId FROM typeChain ORDER BY level",
-        database};
-    mutable ReadStatement<1, 1> selectPrototypeIdsStatement{
-        "WITH RECURSIVE "
-        "  all_prototype_and_extension(typeId, prototypeId) AS ("
-        "       SELECT typeId, prototypeId FROM types WHERE prototypeId IS NOT NULL"
-        "    UNION ALL "
-        "       SELECT typeId, extensionId FROM types WHERE extensionId IS NOT NULL),"
-        "  typeSelection(typeId) AS ("
-        "      SELECT prototypeId FROM all_prototype_and_extension WHERE typeId=?1 "
-        "    UNION ALL "
-        "      SELECT prototypeId FROM all_prototype_and_extension JOIN typeSelection "
-        "        USING(typeId))"
-        "SELECT typeId FROM typeSelection",
-        database};
-    WriteStatement<2> upsertPropertyEditorPathIdStatement{
-        "INSERT INTO propertyEditorPaths(typeId, pathSourceId) VALUES(?1, ?2) ON CONFLICT DO "
-        "UPDATE SET pathSourceId=excluded.pathSourceId WHERE pathSourceId IS NOT "
-        "excluded.pathSourceId",
-        database};
-    mutable ReadStatement<1, 1> selectPropertyEditorPathIdStatement{
-        "SELECT pathSourceId FROM propertyEditorPaths WHERE typeId=?", database};
-    mutable ReadStatement<3, 1> selectPropertyEditorPathsForForSourceIdsStatement{
-        "SELECT typeId, pathSourceId, directoryId "
-        "FROM propertyEditorPaths "
-        "WHERE directoryId IN carray(?1) "
-        "ORDER BY typeId",
-        database};
-    WriteStatement<3> insertPropertyEditorPathStatement{
-        "INSERT INTO propertyEditorPaths(typeId, pathSourceId, directoryId) VALUES (?1, ?2, ?3)",
-        database};
-    WriteStatement<3> updatePropertyEditorPathsStatement{"UPDATE propertyEditorPaths "
-                                                         "SET pathSourceId=?2, directoryId=?3 "
-                                                         "WHERE typeId=?1",
-                                                         database};
-    WriteStatement<1> deletePropertyEditorPathStatement{
-        "DELETE FROM propertyEditorPaths WHERE typeId=?1", database};
-    mutable ReadStatement<4, 1> selectTypeAnnotationsForSourceIdsStatement{
-        "SELECT typeId, iconPath, itemLibrary, hints FROM typeAnnotations WHERE "
-        "sourceId IN carray(?1) ORDER BY typeId",
-        database};
-    WriteStatement<5> insertTypeAnnotationStatement{
-        "INSERT INTO typeAnnotations(typeId, sourceId, iconPath, itemLibrary, hints) VALUES(?1, "
-        "?2, ?3, ?4, ?5)",
-        database};
-    WriteStatement<4> updateTypeAnnotationStatement{
-        "UPDATE typeAnnotations SET iconPath=?2, itemLibrary=?3, hints=?4 WHERE typeId=?1", database};
-    WriteStatement<1> deleteTypeAnnotationStatement{"DELETE FROM typeAnnotations WHERE typeId=?1",
-                                                    database};
-    mutable ReadStatement<1, 1> selectTypeIconPathStatement{
-        "SELECT iconPath FROM typeAnnotations WHERE typeId=?1", database};
-    mutable ReadStatement<2, 1> selectTypeHintsStatement{
-        "SELECT hints.key, hints.value "
-        "FROM typeAnnotations, json_each(typeAnnotations.hints) AS hints "
-        "WHERE typeId=?1",
-        database};
-    mutable ReadStatement<9> selectItemLibraryEntriesStatement{
-        "SELECT typeId, i.value->>'$.name', i.value->>'$.iconPath', i.value->>'$.category', "
-        "  i.value->>'$.import', i.value->>'$.toolTip', i.value->>'$.properties', "
-        "  i.value->>'$.extraFilePaths', i.value->>'$.templatePath' "
-        "FROM typeAnnotations, json_each(typeAnnotations.itemLibrary) AS i",
-        database};
-    mutable ReadStatement<9, 1> selectItemLibraryEntriesByTypeIdStatement{
-        "SELECT typeId, i.value->>'$.name', i.value->>'$.iconPath', i.value->>'$.category', "
-        "  i.value->>'$.import', i.value->>'$.toolTip', i.value->>'$.properties', "
-        "  i.value->>'$.extraFilePaths', i.value->>'$.templatePath' "
-        "FROM typeAnnotations, json_each(typeAnnotations.itemLibrary) AS i "
-        "WHERE typeId=?1",
-        database};
-    mutable ReadStatement<9, 1> selectItemLibraryEntriesBySourceIdStatement{
-        "SELECT typeId, i.value->>'$.name', i.value->>'$.iconPath', i.value->>'$.category', "
-        "  i.value->>'$.import', i.value->>'$.toolTip', i.value->>'$.properties', "
-        "  i.value->>'$.extraFilePaths', i.value->>'$.templatePath' "
-        "FROM typeAnnotations, json_each(typeAnnotations.itemLibrary) AS i "
-        "WHERE typeId IN (SELECT DISTINCT typeId "
-        "                 FROM documentImports AS di JOIN exportedTypeNames USING(moduleId) "
-        "                 WHERE di.sourceId=?)",
-        database};
-    mutable ReadStatement<3, 1> selectItemLibraryPropertiesStatement{
-        "SELECT p.value->>0, p.value->>1, p.value->>2 FROM json_each(?1) AS p", database};
-    mutable ReadStatement<1, 1> selectItemLibraryExtraFilePathsStatement{
-        "SELECT p.value FROM json_each(?1) AS p", database};
-    mutable ReadStatement<1, 1> selectTypeIdsByModuleIdStatement{
-        "SELECT DISTINCT typeId FROM exportedTypeNames WHERE moduleId=?", database};
-    mutable ReadStatement<1, 1> selectHeirTypeIdsStatement{
-        "WITH RECURSIVE "
-        "  typeSelection(typeId) AS ("
-        "      SELECT typeId FROM types WHERE prototypeId=?1 OR extensionId=?1"
-        "    UNION ALL "
-        "      SELECT t.typeId "
-        "      FROM types AS t JOIN typeSelection AS ts "
-        "      WHERE prototypeId=ts.typeId OR extensionId=ts.typeId)"
-        "SELECT typeId FROM typeSelection",
-        database};
+    std::unique_ptr<Statements> s;
 };
 
-extern template class ProjectStorage<Sqlite::Database>;
 
 } // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/designercore/projectstorage/projectstorageexceptions.cpp b/src/plugins/qmldesigner/designercore/projectstorage/projectstorageexceptions.cpp
index efe9bc58f5..a5dc60c4fa 100644
--- a/src/plugins/qmldesigner/designercore/projectstorage/projectstorageexceptions.cpp
+++ b/src/plugins/qmldesigner/designercore/projectstorage/projectstorageexceptions.cpp
@@ -3,87 +3,186 @@
 
 #include "projectstorageexceptions.h"
 
+#include <tracing/qmldesignertracing.h>
+
 namespace QmlDesigner {
 
+using namespace NanotraceHR::Literals;
+using NanotraceHR::keyValue;
+
+namespace {
+auto &category()
+{
+    return ProjectStorageTracing::projectStorageCategory();
+}
+} // namespace
+
+NoSourcePathForInvalidSourceId::NoSourcePathForInvalidSourceId()
+{
+    category().threadEvent("NoSourcePathForInvalidSourceId"_t);
+}
+
 const char *NoSourcePathForInvalidSourceId::what() const noexcept
 {
     return "You cannot get a file path for an invalid file path id!";
 }
 
+NoSourceContextPathForInvalidSourceContextId::NoSourceContextPathForInvalidSourceContextId()
+{
+    category().threadEvent("NoSourceContextPathForInvalidSourceContextId"_t);
+}
+
 const char *NoSourceContextPathForInvalidSourceContextId::what() const noexcept
 {
     return "You cannot get a directory path for an invalid directory path id!";
 }
 
+SourceContextIdDoesNotExists::SourceContextIdDoesNotExists()
+{
+    category().threadEvent("SourceContextIdDoesNotExists"_t);
+}
+
 const char *SourceContextIdDoesNotExists::what() const noexcept
 {
     return "The source context id does not exist in the database!";
 }
 
+SourceIdDoesNotExists::SourceIdDoesNotExists()
+{
+    category().threadEvent("SourceIdDoesNotExists"_t);
+}
+
 const char *SourceIdDoesNotExists::what() const noexcept
 {
     return "The source id does not exist in the database!";
 }
 
+TypeHasInvalidSourceId::TypeHasInvalidSourceId()
+{
+    category().threadEvent("TypeHasInvalidSourceId"_t);
+}
+
 const char *TypeHasInvalidSourceId::what() const noexcept
 {
     return "The source id is invalid!";
 }
 
+ModuleDoesNotExists::ModuleDoesNotExists()
+{
+    category().threadEvent("ModuleDoesNotExists"_t);
+}
+
 const char *ModuleDoesNotExists::what() const noexcept
 {
     return "The module does not exist!";
 }
 
+ModuleAlreadyExists::ModuleAlreadyExists()
+{
+    category().threadEvent("ModuleAlreadyExists"_t);
+}
+
 const char *ModuleAlreadyExists::what() const noexcept
 {
     return "The module does already exist!";
 }
 
-TypeNameDoesNotExists::TypeNameDoesNotExists(std::string_view errorMessage)
-    : ProjectStorageErrorWithMessage{"TypeNameDoesNotExists"sv, errorMessage}
-{}
+TypeNameDoesNotExists::TypeNameDoesNotExists(std::string_view typeName, SourceId sourceId)
+    : ProjectStorageErrorWithMessage{
+        "TypeNameDoesNotExists"sv,
+        Utils::SmallString::join(
+            {"type: ", typeName, ", source id: ", Utils::SmallString::number(sourceId.internalId())})}
+{
+    category().threadEvent("TypeNameDoesNotExists"_t,
+                           keyValue("type name", typeName),
+                           keyValue("source id", sourceId));
+}
+
+PropertyNameDoesNotExists::PropertyNameDoesNotExists()
+{
+    category().threadEvent("PropertyNameDoesNotExists"_t);
+}
 
 const char *PropertyNameDoesNotExists::what() const noexcept
 {
     return "The property name does not exist!";
 }
 
+PrototypeChainCycle::PrototypeChainCycle()
+{
+    category().threadEvent("PrototypeChainCycle"_t);
+}
+
 const char *PrototypeChainCycle::what() const noexcept
 {
     return "There is a prototype chain cycle!";
 }
 
+AliasChainCycle::AliasChainCycle()
+{
+    category().threadEvent("AliasChainCycle"_t);
+}
+
 const char *AliasChainCycle::what() const noexcept
 {
     return "There is a prototype chain cycle!";
 }
 
+CannotParseQmlTypesFile::CannotParseQmlTypesFile()
+{
+    category().threadEvent("CannotParseQmlTypesFile"_t);
+}
+
 const char *CannotParseQmlTypesFile::what() const noexcept
 {
     return "Cannot parse qml types file!";
 }
 
+CannotParseQmlDocumentFile::CannotParseQmlDocumentFile()
+{
+    category().threadEvent("CannotParseQmlDocumentFile"_t);
+}
+
 const char *CannotParseQmlDocumentFile::what() const noexcept
 {
     return "Cannot parse qml types file!";
 }
 
+ProjectDataHasInvalidProjectSourceId::ProjectDataHasInvalidProjectSourceId()
+{
+    category().threadEvent("ProjectDataHasInvalidProjectSourceId"_t);
+}
+
 const char *ProjectDataHasInvalidProjectSourceId::what() const noexcept
 {
     return "The project source id is invalid!";
 }
 
+ProjectDataHasInvalidSourceId::ProjectDataHasInvalidSourceId()
+{
+    category().threadEvent("ProjectDataHasInvalidSourceId"_t);
+}
+
 const char *ProjectDataHasInvalidSourceId::what() const noexcept
 {
     return "The source id is invalid!";
 }
 
+ProjectDataHasInvalidModuleId::ProjectDataHasInvalidModuleId()
+{
+    category().threadEvent("ProjectDataHasInvalidModuleId"_t);
+}
+
 const char *ProjectDataHasInvalidModuleId::what() const noexcept
 {
     return "The module id is invalid!";
 }
 
+FileStatusHasInvalidSourceId::FileStatusHasInvalidSourceId()
+{
+    category().threadEvent("FileStatusHasInvalidSourceId"_t);
+}
+
 const char *FileStatusHasInvalidSourceId::what() const noexcept
 {
     return "The source id in file status is invalid!";
@@ -110,7 +209,14 @@ const char *ProjectStorageErrorWithMessage::what() const noexcept
 
 ExportedTypeCannotBeInserted::ExportedTypeCannotBeInserted(std::string_view errorMessage)
     : ProjectStorageErrorWithMessage{"ExportedTypeCannotBeInserted"sv, errorMessage}
-{}
+{
+    category().threadEvent("ExportedTypeCannotBeInserted"_t, keyValue("error message", errorMessage));
+}
+
+TypeAnnotationHasInvalidSourceId::TypeAnnotationHasInvalidSourceId()
+{
+    category().threadEvent("TypeAnnotationHasInvalidSourceId"_t);
+}
 
 const char *TypeAnnotationHasInvalidSourceId::what() const noexcept
 {
diff --git a/src/plugins/qmldesigner/designercore/projectstorage/projectstorageexceptions.h b/src/plugins/qmldesigner/designercore/projectstorage/projectstorageexceptions.h
index 412dd4a9ff..d85f1f7f9e 100644
--- a/src/plugins/qmldesigner/designercore/projectstorage/projectstorageexceptions.h
+++ b/src/plugins/qmldesigner/designercore/projectstorage/projectstorageexceptions.h
@@ -5,6 +5,8 @@
 
 #include "../include/qmldesignercorelib_global.h"
 
+#include "projectstorageids.h"
+
 #include <exception>
 
 namespace QmlDesigner {
@@ -13,15 +15,19 @@ using namespace std::literals::string_view_literals;
 
 class QMLDESIGNERCORE_EXPORT ProjectStorageError : public std::exception
 {
+protected:
+    ProjectStorageError() = default;
+
 public:
     const char *what() const noexcept override;
 };
 
 class ProjectStorageErrorWithMessage : public ProjectStorageError
 {
-public:
+protected:
     ProjectStorageErrorWithMessage(std::string_view error, std::string_view errorMessage);
 
+public:
     const char *what() const noexcept override;
 
 public:
@@ -31,42 +37,49 @@ public:
 class QMLDESIGNERCORE_EXPORT NoSourcePathForInvalidSourceId : public ProjectStorageError
 {
 public:
+    NoSourcePathForInvalidSourceId();
     const char *what() const noexcept override;
 };
 
 class QMLDESIGNERCORE_EXPORT NoSourceContextPathForInvalidSourceContextId : public ProjectStorageError
 {
 public:
+    NoSourceContextPathForInvalidSourceContextId();
     const char *what() const noexcept override;
 };
 
 class QMLDESIGNERCORE_EXPORT SourceContextIdDoesNotExists : public ProjectStorageError
 {
 public:
+    SourceContextIdDoesNotExists();
     const char *what() const noexcept override;
 };
 
 class QMLDESIGNERCORE_EXPORT SourceIdDoesNotExists : public ProjectStorageError
 {
 public:
+    SourceIdDoesNotExists();
     const char *what() const noexcept override;
 };
 
 class QMLDESIGNERCORE_EXPORT TypeHasInvalidSourceId : public ProjectStorageError
 {
 public:
+    TypeHasInvalidSourceId();
     const char *what() const noexcept override;
 };
 
 class QMLDESIGNERCORE_EXPORT ModuleDoesNotExists : public ProjectStorageError
 {
 public:
+    ModuleDoesNotExists();
     const char *what() const noexcept override;
 };
 
 class QMLDESIGNERCORE_EXPORT ModuleAlreadyExists : public ProjectStorageError
 {
 public:
+    ModuleAlreadyExists();
     const char *what() const noexcept override;
 };
 
@@ -79,66 +92,76 @@ public:
 class QMLDESIGNERCORE_EXPORT TypeNameDoesNotExists : public ProjectStorageErrorWithMessage
 {
 public:
-    TypeNameDoesNotExists(std::string_view errorMessage);
+    TypeNameDoesNotExists(std::string_view typeName, SourceId sourceId = SourceId{});
 };
 
 class QMLDESIGNERCORE_EXPORT PropertyNameDoesNotExists : public ProjectStorageError
 {
 public:
+    PropertyNameDoesNotExists();
     const char *what() const noexcept override;
 };
 
 class QMLDESIGNERCORE_EXPORT PrototypeChainCycle : public ProjectStorageError
 {
 public:
+    PrototypeChainCycle();
     const char *what() const noexcept override;
 };
 
 class QMLDESIGNERCORE_EXPORT AliasChainCycle : public ProjectStorageError
 {
 public:
+    AliasChainCycle();
     const char *what() const noexcept override;
 };
 
 class QMLDESIGNERCORE_EXPORT CannotParseQmlTypesFile : public ProjectStorageError
 {
 public:
+    CannotParseQmlTypesFile();
     const char *what() const noexcept override;
 };
 
 class QMLDESIGNERCORE_EXPORT CannotParseQmlDocumentFile : public ProjectStorageError
 {
 public:
+    CannotParseQmlDocumentFile();
     const char *what() const noexcept override;
 };
 
 class QMLDESIGNERCORE_EXPORT ProjectDataHasInvalidProjectSourceId : public ProjectStorageError
 {
 public:
+    ProjectDataHasInvalidProjectSourceId();
     const char *what() const noexcept override;
 };
 
 class QMLDESIGNERCORE_EXPORT ProjectDataHasInvalidSourceId : public ProjectStorageError
 {
 public:
+    ProjectDataHasInvalidSourceId();
     const char *what() const noexcept override;
 };
 
 class QMLDESIGNERCORE_EXPORT ProjectDataHasInvalidModuleId : public ProjectStorageError
 {
 public:
+    ProjectDataHasInvalidModuleId();
     const char *what() const noexcept override;
 };
 
 class QMLDESIGNERCORE_EXPORT FileStatusHasInvalidSourceId : public ProjectStorageError
 {
 public:
+    FileStatusHasInvalidSourceId();
     const char *what() const noexcept override;
 };
 
 class QMLDESIGNERCORE_EXPORT TypeAnnotationHasInvalidSourceId : public ProjectStorageError
 {
 public:
+    TypeAnnotationHasInvalidSourceId();
     const char *what() const noexcept override;
 };
 
diff --git a/src/plugins/qmldesigner/designercore/projectstorage/projectstoragefwd.h b/src/plugins/qmldesigner/designercore/projectstorage/projectstoragefwd.h
index b33c609509..cbb7d4265a 100644
--- a/src/plugins/qmldesigner/designercore/projectstorage/projectstoragefwd.h
+++ b/src/plugins/qmldesigner/designercore/projectstorage/projectstoragefwd.h
@@ -11,7 +11,6 @@ namespace QmlDesigner {
 class ProjectStorageInterface;
 class SourcePathCacheInterface;
 
-template<typename Database>
 class ProjectStorage;
 
 template<typename Type>
diff --git a/src/plugins/qmldesigner/designercore/projectstorage/projectstorageinfotypes.h b/src/plugins/qmldesigner/designercore/projectstorage/projectstorageinfotypes.h
index 427c0ff8d6..9f0c134ed3 100644
--- a/src/plugins/qmldesigner/designercore/projectstorage/projectstorageinfotypes.h
+++ b/src/plugins/qmldesigner/designercore/projectstorage/projectstorageinfotypes.h
@@ -24,6 +24,20 @@ constexpr std::underlying_type_t<Enumeration> to_underlying(Enumeration enumerat
 
 enum class FlagIs : unsigned int { False, Set, True };
 
+template<typename String>
+void convertToString(String &string, const FlagIs &flagIs)
+{
+    using NanotraceHR::dictonary;
+    using NanotraceHR::keyValue;
+
+    if (flagIs == FlagIs::False)
+        convertToString(string, false);
+    else if (flagIs == FlagIs::True)
+        convertToString(string, true);
+    else
+        convertToString(string, "is set");
+}
+
 } // namespace QmlDesigner
 
 namespace QmlDesigner::Storage {
@@ -46,6 +60,18 @@ constexpr bool operator&(PropertyDeclarationTraits first, PropertyDeclarationTra
     return static_cast<int>(first) & static_cast<int>(second);
 }
 
+template<typename String>
+void convertToString(String &string, const PropertyDeclarationTraits &traits)
+{
+    using NanotraceHR::dictonary;
+    using NanotraceHR::keyValue;
+    auto dict = dictonary(keyValue("is read only", traits & PropertyDeclarationTraits::IsReadOnly),
+                          keyValue("is pointer", traits & PropertyDeclarationTraits::IsPointer),
+                          keyValue("is list", traits & PropertyDeclarationTraits::IsList));
+
+    convertToString(string, dict);
+}
+
 enum class TypeTraitsKind : unsigned int {
     None,
     Reference,
@@ -53,6 +79,25 @@ enum class TypeTraitsKind : unsigned int {
     Sequence,
 };
 
+template<typename String>
+void convertToString(String &string, const TypeTraitsKind &kind)
+{
+    switch (kind) {
+    case TypeTraitsKind::None:
+        convertToString(string, "None");
+        break;
+    case TypeTraitsKind::Reference:
+        convertToString(string, "Reference");
+        break;
+    case TypeTraitsKind::Value:
+        convertToString(string, "Value");
+        break;
+    case TypeTraitsKind::Sequence:
+        convertToString(string, "Sequence");
+        break;
+    }
+}
+
 struct TypeTraits
 {
     constexpr TypeTraits()
@@ -100,6 +145,35 @@ struct TypeTraits
         return first.type == second.type && first.annotation == second.annotation;
     }
 
+    template<typename String>
+    friend void convertToString(String &string, const TypeTraits &typeTraits)
+    {
+        using NanotraceHR::dictonary;
+        using NanotraceHR::keyValue;
+        auto dict = dictonary(
+            keyValue("kind", typeTraits.kind),
+            keyValue("is enum", typeTraits.isEnum),
+            keyValue("is file component", typeTraits.isFileComponent),
+            keyValue("is project component", typeTraits.isProjectComponent),
+            keyValue("is in project module", typeTraits.isInProjectModule),
+            keyValue("uses custom parser", typeTraits.usesCustomParser),
+            keyValue("can be container", typeTraits.canBeContainer),
+            keyValue("force clip", typeTraits.forceClip),
+            keyValue("does layout children", typeTraits.doesLayoutChildren),
+            keyValue("can be dropped in form editor", typeTraits.canBeDroppedInFormEditor),
+            keyValue("can be dropped in navigator", typeTraits.canBeDroppedInNavigator),
+            keyValue("can be dropped in view 3D", typeTraits.canBeDroppedInView3D),
+            keyValue("is movable", typeTraits.isMovable),
+            keyValue("is resizable", typeTraits.isResizable),
+            keyValue("has form editor item", typeTraits.hasFormEditorItem),
+            keyValue("is stacked container", typeTraits.isStackedContainer),
+            keyValue("takes over rendering of children", typeTraits.takesOverRenderingOfChildren),
+            keyValue("visible in navigator", typeTraits.visibleInNavigator),
+            keyValue("visible in library", typeTraits.visibleInLibrary));
+
+        convertToString(string, dict);
+    }
+
     union {
         struct
         {
@@ -202,10 +276,22 @@ public:
 
     explicit operator bool() const { return major && minor; }
 
+    template<typename String>
+    friend void convertToString(String &string, const Version &version)
+    {
+        using NanotraceHR::dictonary;
+        using NanotraceHR::keyValue;
+        auto dict = dictonary(keyValue("major version", version.major.value),
+                              keyValue("minor version", version.minor.value));
+
+        convertToString(string, dict);
+    }
+
 public:
     VersionNumber major;
     VersionNumber minor;
 };
+
 } // namespace QmlDesigner::Storage
 
 namespace QmlDesigner::Storage::Info {
@@ -217,6 +303,17 @@ struct TypeHint
         , expression{expression}
     {}
 
+    template<typename String>
+    friend void convertToString(String &string, const TypeHint &typeHint)
+    {
+        using NanotraceHR::dictonary;
+        using NanotraceHR::keyValue;
+        auto dict = dictonary(keyValue("name", typeHint.name),
+                              keyValue("expression", typeHint.expression));
+
+        convertToString(string, dict);
+    }
+
     Utils::SmallString name;
     Utils::PathString expression;
 };
@@ -231,6 +328,18 @@ struct ItemLibraryProperty
         , value{value}
     {}
 
+    template<typename String>
+    friend void convertToString(String &string, const ItemLibraryProperty &property)
+    {
+        using NanotraceHR::dictonary;
+        using NanotraceHR::keyValue;
+        auto dict = dictonary(keyValue("name", property.name),
+                              keyValue("type", property.type),
+                              keyValue("value", property.value));
+
+        convertToString(string, dict);
+    }
+
     Utils::SmallString name;
     Utils::SmallString type;
     Sqlite::Value value;
@@ -274,6 +383,24 @@ struct ItemLibraryEntry
         , properties{std::move(properties)}
     {}
 
+    template<typename String>
+    friend void convertToString(String &string, const ItemLibraryEntry &entry)
+    {
+        using NanotraceHR::dictonary;
+        using NanotraceHR::keyValue;
+        auto dict = dictonary(keyValue("type id", entry.typeId),
+                              keyValue("name", entry.name),
+                              keyValue("icon path", entry.iconPath),
+                              keyValue("category", entry.category),
+                              keyValue("import", entry.import),
+                              keyValue("tool tip", entry.toolTip),
+                              keyValue("template path", entry.templatePath),
+                              keyValue("properties", entry.properties),
+                              keyValue("extra file paths", entry.extraFilePaths));
+
+        convertToString(string, dict);
+    }
+
     TypeId typeId;
     Utils::SmallString name;
     Utils::PathString iconPath;
@@ -321,6 +448,18 @@ public:
                < std::tie(second.moduleId, second.name, second.version);
     }
 
+    template<typename String>
+    friend void convertToString(String &string, const ExportedTypeName &exportedTypeName)
+    {
+        using NanotraceHR::dictonary;
+        using NanotraceHR::keyValue;
+        auto dict = dictonary(keyValue("name", exportedTypeName.name),
+                              keyValue("version", exportedTypeName.version),
+                              keyValue("module id", exportedTypeName.moduleId));
+
+        convertToString(string, dict);
+    }
+
 public:
     ::Utils::SmallString name;
     Storage::Version version;
@@ -342,6 +481,19 @@ public:
         , propertyTypeId{propertyTypeId}
     {}
 
+    template<typename String>
+    friend void convertToString(String &string, const PropertyDeclaration &propertyDeclaration)
+    {
+        using NanotraceHR::dictonary;
+        using NanotraceHR::keyValue;
+        auto dict = dictonary(keyValue("type id", propertyDeclaration.typeId),
+                              keyValue("name", propertyDeclaration.name),
+                              keyValue("traits", propertyDeclaration.traits),
+                              keyValue("property type id", propertyDeclaration.propertyTypeId));
+
+        convertToString(string, dict);
+    }
+
     TypeId typeId;
     ::Utils::SmallString name;
     PropertyDeclarationTraits traits;
@@ -351,22 +503,26 @@ public:
 class Type
 {
 public:
-    Type(PropertyDeclarationId defaultPropertyId,
-         SourceId sourceId,
-         long long typeTraits,
-         long long typeAnnotationTraits)
-        : defaultPropertyId{defaultPropertyId}
-        , sourceId{sourceId}
+    Type(SourceId sourceId, long long typeTraits, long long typeAnnotationTraits)
+        : sourceId{sourceId}
         , traits{typeTraits, typeAnnotationTraits}
     {}
 
-    Type(PropertyDeclarationId defaultPropertyId, SourceId sourceId, TypeTraits traits)
-        : defaultPropertyId{defaultPropertyId}
-        , sourceId{sourceId}
+    Type(SourceId sourceId, TypeTraits traits)
+        : sourceId{sourceId}
         , traits{traits}
     {}
 
-    PropertyDeclarationId defaultPropertyId;
+    template<typename String>
+    friend void convertToString(String &string, const Type &type)
+    {
+        using NanotraceHR::dictonary;
+        using NanotraceHR::keyValue;
+        auto dict = dictonary(keyValue("source id", type.sourceId), keyValue("traits", type.traits));
+
+        convertToString(string, dict);
+    }
+
     SourceId sourceId;
     TypeTraits traits;
 };
diff --git a/src/plugins/qmldesigner/designercore/projectstorage/projectstorageinterface.h b/src/plugins/qmldesigner/designercore/projectstorage/projectstorageinterface.h
index 266c6ee7ca..971e635517 100644
--- a/src/plugins/qmldesigner/designercore/projectstorage/projectstorageinterface.h
+++ b/src/plugins/qmldesigner/designercore/projectstorage/projectstorageinterface.h
@@ -32,6 +32,7 @@ public:
     virtual void removeObserver(ProjectStorageObserver *observer) = 0;
 
     virtual ModuleId moduleId(::Utils::SmallStringView name) const = 0;
+    virtual Utils::SmallString moduleName(ModuleId moduleId) const = 0;
     virtual std::optional<Storage::Info::PropertyDeclaration>
     propertyDeclaration(PropertyDeclarationId propertyDeclarationId) const = 0;
     virtual TypeId typeId(ModuleId moduleId,
@@ -54,7 +55,10 @@ public:
     virtual PropertyDeclarationId propertyDeclarationId(TypeId typeId,
                                                         ::Utils::SmallStringView propertyName) const
         = 0;
+    virtual PropertyDeclarationId defaultPropertyDeclarationId(TypeId typeId) const = 0;
     virtual std::optional<Storage::Info::Type> type(TypeId typeId) const = 0;
+    virtual SmallSourceIds<4> typeAnnotationSourceIds(SourceId directoryId) const = 0;
+    virtual SmallSourceIds<64> typeAnnotationDirectorySourceIds() const = 0;
     virtual Utils::PathString typeIconPath(TypeId typeId) const = 0;
     virtual Storage::Info::TypeHints typeHints(TypeId typeId) const = 0;
     virtual Storage::Info::ItemLibraryEntries itemLibraryEntries(TypeId typeId) const = 0;
@@ -64,9 +68,9 @@ public:
     virtual std::vector<::Utils::SmallString> functionDeclarationNames(TypeId typeId) const = 0;
     virtual std::optional<::Utils::SmallString>
     propertyName(PropertyDeclarationId propertyDeclarationId) const = 0;
-    virtual TypeIds prototypeAndSelfIds(TypeId type) const = 0;
-    virtual TypeIds prototypeIds(TypeId type) const = 0;
-    virtual TypeIds heirIds(TypeId typeId) const = 0;
+    virtual SmallTypeIds<16> prototypeAndSelfIds(TypeId type) const = 0;
+    virtual SmallTypeIds<16> prototypeIds(TypeId type) const = 0;
+    virtual SmallTypeIds<64> heirIds(TypeId typeId) const = 0;
     virtual bool isBasedOn(TypeId, TypeId) const = 0;
     virtual bool isBasedOn(TypeId, TypeId, TypeId) const = 0;
     virtual bool isBasedOn(TypeId, TypeId, TypeId, TypeId) const = 0;
@@ -80,7 +84,7 @@ public:
     virtual std::optional<Storage::Synchronization::ProjectData> fetchProjectData(SourceId sourceId) const = 0;
 
     virtual SourceId propertyEditorPathId(TypeId typeId) const = 0;
-    virtual const Storage::Info::CommonTypeCache<ProjectStorageInterface> &commonTypeCache() const = 0;
+    virtual const Storage::Info::CommonTypeCache<ProjectStorageType> &commonTypeCache() const = 0;
 
     template<const char *moduleName, const char *typeName>
     TypeId commonTypeId() const
diff --git a/src/plugins/qmldesigner/designercore/projectstorage/projectstoragepathwatchertypes.h b/src/plugins/qmldesigner/designercore/projectstorage/projectstoragepathwatchertypes.h
index a9185d91e8..04f11096bd 100644
--- a/src/plugins/qmldesigner/designercore/projectstorage/projectstoragepathwatchertypes.h
+++ b/src/plugins/qmldesigner/designercore/projectstorage/projectstoragepathwatchertypes.h
@@ -12,6 +12,28 @@ namespace QmlDesigner {
 
 enum class SourceType : int { Qml, QmlUi, QmlTypes, QmlDir, Directory };
 
+template<typename String>
+void convertToString(String &string, SourceType sourceType)
+{
+    switch (sourceType) {
+    case SourceType::Qml:
+        convertToString(string, "Qml");
+        break;
+    case SourceType::QmlUi:
+        convertToString(string, "QmlUi");
+        break;
+    case SourceType::QmlTypes:
+        convertToString(string, "QmlTypes");
+        break;
+    case SourceType::QmlDir:
+        convertToString(string, "QmlDir");
+        break;
+    case SourceType::Directory:
+        convertToString(string, "Directory");
+        break;
+    }
+}
+
 class ProjectChunkId
 {
 public:
@@ -46,6 +68,17 @@ public:
     friend bool operator<(ProjectChunkId first, ProjectPartId second) { return first.id < second; }
 
     friend bool operator<(ProjectPartId first, ProjectChunkId second) { return first < second.id; }
+
+    template<typename String>
+    friend void convertToString(String &string, const ProjectChunkId &id)
+    {
+        using NanotraceHR::dictonary;
+        using NanotraceHR::keyValue;
+        auto dict = dictonary(keyValue("project part id", id.id),
+                              keyValue("source type", id.sourceType));
+
+        convertToString(string, dict);
+    }
 };
 
 using ProjectChunkIds = std::vector<ProjectChunkId>;
@@ -67,6 +100,16 @@ public:
         return first.id == second.id && first.sourceIds == second.sourceIds;
     }
 
+    template<typename String>
+    friend void convertToString(String &string, const IdPaths &idPaths)
+    {
+        using NanotraceHR::dictonary;
+        using NanotraceHR::keyValue;
+        auto dict = dictonary(keyValue("id", idPaths.id), keyValue("source ids", idPaths.sourceIds));
+
+        convertToString(string, dict);
+    }
+
 public:
     ProjectChunkId id;
     SourceIds sourceIds;
diff --git a/src/plugins/qmldesigner/designercore/projectstorage/projectstoragetypes.h b/src/plugins/qmldesigner/designercore/projectstorage/projectstoragetypes.h
index 18c3931249..8d810d94bd 100644
--- a/src/plugins/qmldesigner/designercore/projectstorage/projectstoragetypes.h
+++ b/src/plugins/qmldesigner/designercore/projectstorage/projectstoragetypes.h
@@ -7,6 +7,7 @@
 #include "projectstorageids.h"
 #include "projectstorageinfotypes.h"
 
+#include <nanotrace/nanotracehr.h>
 #include <sqlite/sqlitevalue.h>
 #include <utils/smallstring.h>
 
@@ -45,6 +46,17 @@ public:
                < std::tie(second.sourceId, second.moduleId, second.version);
     }
 
+    template<typename String>
+    friend void convertToString(String &string, const Import &import)
+    {
+        using NanotraceHR::dictonary;
+        using NanotraceHR::keyValue;
+        auto dict = dictonary(keyValue("module id", import.moduleId),
+                              keyValue("source id", import.sourceId),
+                              keyValue("version", import.version));
+        convertToString(string, dict);
+    }
+
 public:
     Storage::Version version;
     ModuleId moduleId;
@@ -57,11 +69,50 @@ namespace Synchronization {
 
 enum class TypeNameKind { Exported = 1, QualifiedExported = 2 };
 
+template<typename String>
+void convertToString(String &string, const TypeNameKind &kind)
+{
+    switch (kind) {
+    case TypeNameKind::Exported:
+        convertToString(string, "Exported");
+        break;
+    case TypeNameKind::QualifiedExported:
+        convertToString(string, "QualifiedExported");
+        break;
+    }
+}
+
 enum class FileType : char { QmlTypes, QmlDocument };
 
+template<typename String>
+void convertToString(String &string, const FileType &type)
+{
+    switch (type) {
+    case FileType::QmlTypes:
+        convertToString(string, "QmlTypes");
+        break;
+    case FileType::QmlDocument:
+        convertToString(string, "QmlDocument");
+        break;
+    }
+}
+
 enum class IsQualified : int { No, Yes };
 
-inline int operator-(IsQualified first, IsQualified second)
+template<typename String>
+void convertToString(String &string, const IsQualified &isQualified)
+{
+    switch (isQualified) {
+    case IsQualified::No:
+        convertToString(string, "No");
+        break;
+    case IsQualified::Yes:
+        convertToString(string, "Yes");
+        break;
+    }
+}
+
+inline int operator-(IsQualified first, const IsQualified &second)
 {
     return static_cast<int>(first) - static_cast<int>(second);
 }
@@ -78,6 +129,25 @@ enum class ImportKind : char {
     ModuleExportedModuleDependency
 };
 
+template<typename String>
+void convertToString(String &string, const ImportKind &kind)
+{
+    switch (kind) {
+    case ImportKind::Import:
+        convertToString(string, "Import");
+        break;
+    case ImportKind::ModuleDependency:
+        convertToString(string, "ModuleDependency");
+        break;
+    case ImportKind::ModuleExportedImport:
+        convertToString(string, "ModuleExportedImport");
+        break;
+    case ImportKind::ModuleExportedModuleDependency:
+        convertToString(string, "ModuleExportedModuleDependency");
+        break;
+    }
+}
+
 class ImportView
 {
 public:
@@ -97,6 +167,19 @@ public:
                && first.version == second.version;
     }
 
+    template<typename String>
+    friend void convertToString(String &string, const ImportView &import)
+    {
+        using NanotraceHR::dictonary;
+        using NanotraceHR::keyValue;
+        auto dict = dictonary(keyValue("import id", import.importId),
+                              keyValue("source id", import.sourceId),
+                              keyValue("module id", import.moduleId),
+                              keyValue("version", import.version));
+
+        convertToString(string, dict);
+    }
+
 public:
     ImportId importId;
     SourceId sourceId;
@@ -106,6 +189,19 @@ public:
 
 enum class IsAutoVersion : char { No, Yes };
 
+template<typename String>
+void convertToString(String &string, const IsAutoVersion &isAutoVersion)
+{
+    switch (isAutoVersion) {
+    case IsAutoVersion::No:
+        convertToString(string, "No");
+        break;
+    case IsAutoVersion::Yes:
+        convertToString(string, "Yes");
+        break;
+    }
+}
+
 constexpr bool operator<(IsAutoVersion first, IsAutoVersion second)
 {
     return to_underlying(first) < to_underlying(second);
@@ -137,6 +233,19 @@ public:
                < std::tie(second.moduleId, second.exportedModuleId, second.isAutoVersion, second.version);
     }
 
+    template<typename String>
+    friend void convertToString(String &string, const ModuleExportedImport &import)
+    {
+        using NanotraceHR::dictonary;
+        using NanotraceHR::keyValue;
+        auto dict = dictonary(keyValue("module id", import.moduleId),
+                              keyValue("exported module id", import.exportedModuleId),
+                              keyValue("version", import.version),
+                              keyValue("is auto version", import.isAutoVersion));
+
+        convertToString(string, dict);
+    }
+
 public:
     Storage::Version version;
     ModuleId moduleId;
@@ -171,6 +280,20 @@ public:
                && first.version == second.version && first.isAutoVersion == second.isAutoVersion;
     }
 
+    template<typename String>
+    friend void convertToString(String &string, const ModuleExportedImportView &import)
+    {
+        using NanotraceHR::dictonary;
+        using NanotraceHR::keyValue;
+        auto dict = dictonary(keyValue("module exported import id", import.moduleExportedImportId),
+                              keyValue("module id", import.moduleId),
+                              keyValue("exported module id", import.exportedModuleId),
+                              keyValue("version", import.version),
+                              keyValue("is auto version", import.isAutoVersion));
+
+        convertToString(string, dict);
+    }
+
 public:
     ModuleExportedImportId moduleExportedImportId;
     Storage::Version version;
@@ -192,6 +315,16 @@ public:
         return first.name == second.name;
     }
 
+    template<typename String>
+    friend void convertToString(String &string, const ImportedType &importedType)
+    {
+        using NanotraceHR::dictonary;
+        using NanotraceHR::keyValue;
+        auto dict = dictonary(keyValue("name", importedType.name));
+
+        convertToString(string, dict);
+    }
+
 public:
     TypeNameString name;
 };
@@ -210,6 +343,17 @@ public:
         return first.name == second.name && first.import == second.import;
     }
 
+    template<typename String>
+    friend void convertToString(String &string, const QualifiedImportedType &importedType)
+    {
+        using NanotraceHR::dictonary;
+        using NanotraceHR::keyValue;
+        auto dict = dictonary(keyValue("name", importedType.name),
+                              keyValue("import", importedType.import));
+
+        convertToString(string, dict);
+    }
+
 public:
     TypeNameString name;
     Import import;
@@ -264,6 +408,19 @@ public:
                < std::tie(second.moduleId, second.name, second.version);
     }
 
+    template<typename String>
+    friend void convertToString(String &string, const ExportedType &exportedType)
+    {
+        using NanotraceHR::dictonary;
+        using NanotraceHR::keyValue;
+        auto dict = dictonary(keyValue("name", exportedType.name),
+                              keyValue("module id", exportedType.moduleId),
+                              keyValue("type id", exportedType.typeId),
+                              keyValue("version", exportedType.version));
+
+        convertToString(string, dict);
+    }
+
 public:
     ::Utils::SmallString name;
     Storage::Version version;
@@ -295,6 +452,20 @@ public:
         , exportedTypeNameId{exportedTypeNameId}
     {}
 
+    template<typename String>
+    friend void convertToString(String &string, const ExportedTypeView &exportedType)
+    {
+        using NanotraceHR::dictonary;
+        using NanotraceHR::keyValue;
+        auto dict = dictonary(keyValue("name", exportedType.name),
+                              keyValue("module id", exportedType.moduleId),
+                              keyValue("type id", exportedType.typeId),
+                              keyValue("version", exportedType.version),
+                              keyValue("version", exportedType.exportedTypeNameId));
+
+        convertToString(string, dict);
+    }
+
 public:
     ::Utils::SmallStringView name;
     Storage::Version version;
@@ -305,6 +476,43 @@ public:
 
 using ImportedTypeName = std::variant<ImportedType, QualifiedImportedType>;
 
+template<typename String>
+void convertToString(String &string, const ImportedTypeName &typeName)
+{
+    using NanotraceHR::dictonary;
+    using NanotraceHR::keyValue;
+
+    struct Dispatcher
+    {
+        static const QmlDesigner::Storage::Import &nullImport()
+        {
+            static QmlDesigner::Storage::Import import;
+
+            return import;
+        }
+
+        void operator()(const QmlDesigner::Storage::Synchronization::ImportedType &importedType) const
+        {
+            auto dict = dictonary(keyValue("name", importedType.name));
+
+            convertToString(string, dict);
+        }
+
+        void operator()(
+            const QmlDesigner::Storage::Synchronization::QualifiedImportedType &qualifiedImportedType) const
+        {
+            auto dict = dictonary(keyValue("name", qualifiedImportedType.name),
+                                  keyValue("import", qualifiedImportedType.import));
+
+            convertToString(string, dict);
+        }
+
+        String &string;
+    };
+
+    std::visit(Dispatcher{string}, typeName);
+}
+
 class EnumeratorDeclaration
 {
 public:
@@ -325,6 +533,18 @@ public:
                && first.hasValue == second.hasValue;
     }
 
+    template<typename String>
+    friend void convertToString(String &string, const EnumeratorDeclaration &enumeratorDeclaration)
+    {
+        using NanotraceHR::dictonary;
+        using NanotraceHR::keyValue;
+        auto dict = dictonary(keyValue("name", enumeratorDeclaration.name),
+                              keyValue("value", enumeratorDeclaration.value),
+                              keyValue("has value", enumeratorDeclaration.hasValue));
+
+        convertToString(string, dict);
+    }
+
 public:
     ::Utils::SmallString name;
     long long value = 0;
@@ -349,6 +569,18 @@ public:
                && first.enumeratorDeclarations == second.enumeratorDeclarations;
     }
 
+    template<typename String>
+    friend void convertToString(String &string, const EnumerationDeclaration &enumerationDeclaration)
+    {
+        using NanotraceHR::dictonary;
+        using NanotraceHR::keyValue;
+        auto dict = dictonary(keyValue("name", enumerationDeclaration.name),
+                              keyValue("enumerator declarations",
+                                       enumerationDeclaration.enumeratorDeclarations));
+
+        convertToString(string, dict);
+    }
+
 public:
     TypeNameString name;
     EnumeratorDeclarations enumeratorDeclarations;
@@ -368,6 +600,20 @@ public:
         , id{id}
     {}
 
+    template<typename String>
+    friend void convertToString(String &string,
+                                const EnumerationDeclarationView &enumerationDeclaration)
+    {
+        using NanotraceHR::dictonary;
+        using NanotraceHR::keyValue;
+        auto dict = dictonary(keyValue("name", enumerationDeclaration.name),
+                              keyValue("enumerator declarations",
+                                       enumerationDeclaration.enumeratorDeclarations),
+                              keyValue("id", enumerationDeclaration.id));
+
+        convertToString(string, dict);
+    }
+
 public:
     ::Utils::SmallStringView name;
     ::Utils::SmallStringView enumeratorDeclarations;
@@ -392,6 +638,18 @@ public:
                && first.traits == second.traits;
     }
 
+    template<typename String>
+    friend void convertToString(String &string, const ParameterDeclaration &parameterDeclaration)
+    {
+        using NanotraceHR::dictonary;
+        using NanotraceHR::keyValue;
+        auto dict = dictonary(keyValue("name", parameterDeclaration.name),
+                              keyValue("type name", parameterDeclaration.typeName),
+                              keyValue("traits", parameterDeclaration.traits));
+
+        convertToString(string, dict);
+    }
+
 public:
     ::Utils::SmallString name;
     TypeNameString typeName;
@@ -418,6 +676,17 @@ public:
         return first.name == second.name && first.parameters == second.parameters;
     }
 
+    template<typename String>
+    friend void convertToString(String &string, const SignalDeclaration &signalDeclaration)
+    {
+        using NanotraceHR::dictonary;
+        using NanotraceHR::keyValue;
+        auto dict = dictonary(keyValue("name", signalDeclaration.name),
+                              keyValue("parameters", signalDeclaration.parameters));
+
+        convertToString(string, dict);
+    }
+
 public:
     ::Utils::SmallString name;
     ParameterDeclarations parameters;
@@ -437,6 +706,18 @@ public:
         , id{id}
     {}
 
+    template<typename String>
+    friend void convertToString(String &string, const SignalDeclarationView &signalDeclaration)
+    {
+        using NanotraceHR::dictonary;
+        using NanotraceHR::keyValue;
+        auto dict = dictonary(keyValue("name", signalDeclaration.name),
+                              keyValue("signature", signalDeclaration.signature),
+                              keyValue("id", signalDeclaration.id));
+
+        convertToString(string, dict);
+    }
+
 public:
     ::Utils::SmallStringView name;
     ::Utils::SmallStringView signature;
@@ -467,6 +748,18 @@ public:
                && first.parameters == second.parameters;
     }
 
+    template<typename String>
+    friend void convertToString(String &string, const FunctionDeclaration &functionDeclaration)
+    {
+        using NanotraceHR::dictonary;
+        using NanotraceHR::keyValue;
+        auto dict = dictonary(keyValue("name", functionDeclaration.name),
+                              keyValue("return type name", functionDeclaration.returnTypeName),
+                              keyValue("parameters", functionDeclaration.parameters));
+
+        convertToString(string, dict);
+    }
+
 public:
     ::Utils::SmallString name;
     TypeNameString returnTypeName;
@@ -489,6 +782,19 @@ public:
         , id{id}
     {}
 
+    template<typename String>
+    friend void convertToString(String &string, const FunctionDeclarationView &functionDeclaration)
+    {
+        using NanotraceHR::dictonary;
+        using NanotraceHR::keyValue;
+        auto dict = dictonary(keyValue("name", functionDeclaration.name),
+                              keyValue("return type name", functionDeclaration.returnTypeName),
+                              keyValue("signature", functionDeclaration.signature),
+                              keyValue("id", functionDeclaration.id));
+
+        convertToString(string, dict);
+    }
+
 public:
     ::Utils::SmallStringView name;
     ::Utils::SmallStringView returnTypeName;
@@ -498,6 +804,19 @@ public:
 
 enum class PropertyKind { Property, Alias };
 
+template<typename String>
+void convertToString(String &string, const PropertyKind &kind)
+{
+    switch (kind) {
+    case PropertyKind::Property:
+        convertToString(string, "Property");
+        break;
+    case PropertyKind::Alias:
+        convertToString(string, "Alias");
+        break;
+    }
+}
+
 class PropertyDeclaration
 {
 public:
@@ -567,6 +886,24 @@ public:
                && first.traits == second.traits && first.kind == second.kind;
     }
 
+    template<typename String>
+    friend void convertToString(String &string, const PropertyDeclaration &propertyDeclaration)
+    {
+        using NanotraceHR::dictonary;
+        using NanotraceHR::keyValue;
+        auto dict = dictonary(keyValue("name", propertyDeclaration.name),
+                              keyValue("type name", propertyDeclaration.typeName),
+                              keyValue("alias property name", propertyDeclaration.aliasPropertyName),
+                              keyValue("alias property name tail",
+                                       propertyDeclaration.aliasPropertyNameTail),
+                              keyValue("traits", propertyDeclaration.traits),
+                              keyValue("type id", propertyDeclaration.typeId),
+                              keyValue("property type id", propertyDeclaration.propertyTypeId),
+                              keyValue("kind", propertyDeclaration.kind));
+
+        convertToString(string, dict);
+    }
+
 public:
     ::Utils::SmallString name;
     ImportedTypeName typeName;
@@ -597,6 +934,21 @@ public:
         , aliasId{aliasId}
     {}
 
+    template<typename String>
+    friend void convertToString(String &string, const PropertyDeclarationView &propertyDeclaration)
+    {
+        using NanotraceHR::dictonary;
+        using NanotraceHR::keyValue;
+        auto dict = dictonary(keyValue("name", propertyDeclaration.name),
+                              keyValue("traits", propertyDeclaration.traits),
+                              keyValue("type id", propertyDeclaration.typeId),
+                              keyValue("type name id", propertyDeclaration.typeNameId),
+                              keyValue("id", propertyDeclaration.id),
+                              keyValue("alias id", propertyDeclaration.aliasId));
+
+        convertToString(string, dict);
+    }
+
 public:
     ::Utils::SmallStringView name;
     PropertyDeclarationTraits traits = {};
@@ -608,6 +960,22 @@ public:
 
 enum class ChangeLevel : char { Full, Minimal, ExcludeExportedTypes };
 
+template<typename String>
+void convertToString(String &string, const ChangeLevel &changeLevel)
+{
+    switch (changeLevel) {
+    case ChangeLevel::Full:
+        convertToString(string, "Full");
+        break;
+    case ChangeLevel::Minimal:
+        convertToString(string, "Minimal");
+        break;
+    case ChangeLevel::ExcludeExportedTypes:
+        convertToString(string, "ExcludeExportedTypes");
+        break;
+    }
+}
+
 class Type
 {
 public:
@@ -717,6 +1085,27 @@ public:
                && first.sourceId == second.sourceId;
     }
 
+    template<typename String>
+    friend void convertToString(String &string, const Type &type)
+    {
+        using NanotraceHR::dictonary;
+        using NanotraceHR::keyValue;
+        auto dict = dictonary(keyValue("type name", type.typeName),
+                              keyValue("prototype", type.prototype),
+                              keyValue("extension", type.extension),
+                              keyValue("exported types", type.exportedTypes),
+                              keyValue("property declarations", type.propertyDeclarations),
+                              keyValue("function declarations", type.functionDeclarations),
+                              keyValue("signal declarations", type.signalDeclarations),
+                              keyValue("enumeration declarations", type.enumerationDeclarations),
+                              keyValue("traits", type.traits),
+                              keyValue("source id", type.sourceId),
+                              keyValue("change level", type.changeLevel),
+                              keyValue("default property name", type.defaultPropertyName));
+
+        convertToString(string, dict);
+    }
+
 public:
     TypeNameString typeName;
     ::Utils::SmallString defaultPropertyName;
@@ -747,6 +1136,20 @@ public:
         , moduleId{moduleId}
     {}
 
+    template<typename String>
+    friend void convertToString(String &string, const PropertyEditorQmlPath &propertyEditorQmlPath)
+    {
+        using NanotraceHR::dictonary;
+        using NanotraceHR::keyValue;
+        auto dict = dictonary(keyValue("type name", propertyEditorQmlPath.typeName),
+                              keyValue("type id", propertyEditorQmlPath.typeId),
+                              keyValue("path id", propertyEditorQmlPath.pathId),
+                              keyValue("directory id", propertyEditorQmlPath.directoryId),
+                              keyValue("module id", propertyEditorQmlPath.moduleId));
+
+        convertToString(string, dict);
+    }
+
 public:
     TypeNameString typeName;
     TypeId typeId;
@@ -774,6 +1177,19 @@ public:
                && first.fileType == second.fileType;
     }
 
+    template<typename String>
+    friend void convertToString(String &string, const ProjectData &projectData)
+    {
+        using NanotraceHR::dictonary;
+        using NanotraceHR::keyValue;
+        auto dict = dictonary(keyValue("project source id", projectData.projectSourceId),
+                              keyValue("source id", projectData.sourceId),
+                              keyValue("module id", projectData.moduleId),
+                              keyValue("file type", projectData.fileType));
+
+        convertToString(string, dict);
+    }
+
 public:
     SourceId projectSourceId;
     SourceId sourceId;
@@ -786,10 +1202,13 @@ using ProjectDatas = std::vector<ProjectData>;
 class TypeAnnotation
 {
 public:
-    TypeAnnotation(SourceId sourceId)
+    TypeAnnotation(SourceId sourceId, SourceId directorySourceId)
         : sourceId{sourceId}
+        , directorySourceId{directorySourceId}
     {}
+
     TypeAnnotation(SourceId sourceId,
+                   SourceId directorySourceId,
                    Utils::SmallStringView typeName,
                    ModuleId moduleId,
                    Utils::SmallStringView iconPath,
@@ -803,8 +1222,26 @@ public:
         , sourceId{sourceId}
         , moduleId{moduleId}
         , traits{traits}
+        , directorySourceId{directorySourceId}
     {}
 
+    template<typename String>
+    friend void convertToString(String &string, const TypeAnnotation &typeAnnotation)
+    {
+        using NanotraceHR::dictonary;
+        using NanotraceHR::keyValue;
+        auto dict = dictonary(keyValue("type name", typeAnnotation.typeName),
+                              keyValue("icon path", typeAnnotation.iconPath),
+                              keyValue("item library json", typeAnnotation.itemLibraryJson),
+                              keyValue("hints json", typeAnnotation.hintsJson),
+                              keyValue("type id", typeAnnotation.typeId),
+                              keyValue("source id", typeAnnotation.sourceId),
+                              keyValue("module id", typeAnnotation.moduleId),
+                              keyValue("traits", typeAnnotation.traits));
+
+        convertToString(string, dict);
+    }
+
 public:
     TypeNameString typeName;
     Utils::PathString iconPath;
@@ -814,6 +1251,7 @@ public:
     SourceId sourceId;
     ModuleId moduleId;
     TypeTraits traits;
+    SourceId directorySourceId;
 };
 
 using TypeAnnotations = std::vector<TypeAnnotation>;
diff --git a/src/plugins/qmldesigner/designercore/projectstorage/projectstorageupdater.cpp b/src/plugins/qmldesigner/designercore/projectstorage/projectstorageupdater.cpp
index 62fcf310f6..761d6371ef 100644
--- a/src/plugins/qmldesigner/designercore/projectstorage/projectstorageupdater.cpp
+++ b/src/plugins/qmldesigner/designercore/projectstorage/projectstorageupdater.cpp
@@ -11,6 +11,9 @@
 #include "qmltypesparserinterface.h"
 #include "sourcepath.h"
 #include "sourcepathcache.h"
+#include "typeannotationreader.h"
+
+#include <tracing/qmldesignertracing.h>
 
 #include <sqlitedatabase.h>
 
@@ -21,6 +24,26 @@
 #include <functional>
 
 namespace QmlDesigner {
+constexpr auto category = ProjectStorageTracing::projectStorageUpdaterCategory;
+using NanotraceHR::keyValue;
+using Tracer = ProjectStorageTracing::Category::TracerType;
+
+template<typename String>
+void convertToString(String &string, const ProjectStorageUpdater::FileState &state)
+{
+    switch (state) {
+    case ProjectStorageUpdater::FileState::Changed:
+        convertToString(string, "Changed");
+        break;
+    case ProjectStorageUpdater::FileState::NotChanged:
+        convertToString(string, "NotChanged");
+        break;
+    case ProjectStorageUpdater::FileState::NotExists:
+        convertToString(string, "NotExists");
+        break;
+    }
+}
+
 namespace {
 
 QStringList filterMultipleEntries(QStringList qmlTypes)
@@ -110,10 +133,15 @@ SourceIds filterNotUpdatedSourceIds(SourceIds updatedSourceIds, SourceIds notUpd
     return filteredUpdatedSourceIds;
 }
 
-void addSourceIds(SourceIds &sourceIds, const Storage::Synchronization::ProjectDatas &projectDatas)
+void addSourceIds(SourceIds &sourceIds,
+                  const Storage::Synchronization::ProjectDatas &projectDatas,
+                  TracerLiteral message,
+                  Tracer &tracer)
 {
-    for (const auto &projectData : projectDatas)
+    for (const auto &projectData : projectDatas) {
+        tracer.tick(message, keyValue("source id", projectData.sourceId));
         sourceIds.push_back(projectData.sourceId);
+    }
 }
 
 Storage::Version convertVersion(LanguageUtils::ComponentVersion version)
@@ -131,34 +159,71 @@ Storage::Synchronization::IsAutoVersion convertToIsAutoVersion(QmlDirParser::Imp
 void addDependencies(Storage::Imports &dependencies,
                      SourceId sourceId,
                      const QList<QmlDirParser::Import> &qmldirDependencies,
-                     ProjectStorageInterface &projectStorage)
+                     ProjectStorageInterface &projectStorage,
+                     TracerLiteral message,
+                     Tracer &tracer)
 {
     for (const QmlDirParser::Import &qmldirDependency : qmldirDependencies) {
         ModuleId moduleId = projectStorage.moduleId(Utils::PathString{qmldirDependency.module}
                                                     + "-cppnative");
-        dependencies.emplace_back(moduleId, Storage::Version{}, sourceId);
+        auto &import = dependencies.emplace_back(moduleId, Storage::Version{}, sourceId);
+        tracer.tick(message, keyValue("import", import));
     }
 }
 
+void addModuleExportedImport(Storage::Synchronization::ModuleExportedImports &imports,
+                             ModuleId moduleId,
+                             ModuleId exportedModuleId,
+                             Storage::Version version,
+                             Storage::Synchronization::IsAutoVersion isAutoVersion,
+                             std::string_view moduleName,
+                             std::string_view exportedModuleName)
+{
+    NanotraceHR::Tracer tracer{"add module exported imports"_t,
+                               category(),
+                               keyValue("module id", moduleId),
+                               keyValue("exported module id", exportedModuleId),
+                               keyValue("version", version),
+                               keyValue("is auto version", isAutoVersion),
+                               keyValue("module name", moduleName),
+                               keyValue("exported module name", exportedModuleName)};
+
+    imports.emplace_back(moduleId, exportedModuleId, version, isAutoVersion);
+}
+
 void addModuleExportedImports(Storage::Synchronization::ModuleExportedImports &imports,
                               ModuleId moduleId,
                               ModuleId cppModuleId,
+                              std::string_view moduleName,
+                              std::string_view cppModuleName,
                               const QList<QmlDirParser::Import> &qmldirImports,
                               ProjectStorageInterface &projectStorage)
 {
-    for (const QmlDirParser::Import &qmldirImport : qmldirImports) {
-        ModuleId exportedModuleId = projectStorage.moduleId(Utils::PathString{qmldirImport.module});
-        imports.emplace_back(moduleId,
-                             exportedModuleId,
-                             convertVersion(qmldirImport.version),
-                             convertToIsAutoVersion(qmldirImport.flags));
+    NanotraceHR::Tracer tracer{"add module exported imports"_t,
+                               category(),
+                               keyValue("cpp module id", cppModuleId),
+                               keyValue("module id", moduleId)};
 
-        ModuleId exportedCppModuleId = projectStorage.moduleId(
-            Utils::PathString{qmldirImport.module} + "-cppnative");
-        imports.emplace_back(cppModuleId,
-                             exportedCppModuleId,
-                             Storage::Version{},
-                             Storage::Synchronization::IsAutoVersion::No);
+    for (const QmlDirParser::Import &qmldirImport : qmldirImports) {
+        Utils::PathString exportedModuleName{qmldirImport.module};
+        ModuleId exportedModuleId = projectStorage.moduleId(exportedModuleName);
+        addModuleExportedImport(imports,
+                                moduleId,
+                                exportedModuleId,
+                                convertVersion(qmldirImport.version),
+                                convertToIsAutoVersion(qmldirImport.flags),
+                                moduleName,
+                                exportedModuleName);
+
+        exportedModuleName += "-cppnative";
+        ModuleId exportedCppModuleId = projectStorage.moduleId(exportedModuleName);
+        addModuleExportedImport(imports,
+                                cppModuleId,
+                                exportedCppModuleId,
+                                Storage::Version{},
+                                Storage::Synchronization::IsAutoVersion::No,
+                                cppModuleName,
+                                exportedModuleName);
     }
 }
 
@@ -182,8 +247,14 @@ std::vector<IdPaths> createIdPaths(ProjectStorageUpdater::WatchedSourceIdsIds wa
 
 void ProjectStorageUpdater::update(QStringList directories,
                                    QStringList qmlTypesPaths,
-                                   const QString &propertyEditorResourcesPath)
+                                   const QString &propertyEditorResourcesPath,
+                                   const QStringList &typeAnnotationPaths)
 {
+    NanotraceHR::Tracer tracer{"update"_t,
+                               category(),
+                               keyValue("directories", directories),
+                               keyValue("qml types paths", qmlTypesPaths)};
+
     Storage::Synchronization::SynchronizationPackage package;
     WatchedSourceIdsIds watchedSourceIds{Utils::span{directories}.size()};
     NotUpdatedSourceIds notUpdatedSourceIds{Utils::span{directories}.size()};
@@ -191,6 +262,7 @@ void ProjectStorageUpdater::update(QStringList directories,
     updateDirectories(directories, package, notUpdatedSourceIds, watchedSourceIds);
     updateQmlTypes(qmlTypesPaths, package, notUpdatedSourceIds, watchedSourceIds);
     updatePropertyEditorPaths(propertyEditorResourcesPath, package, notUpdatedSourceIds);
+    updateTypeAnnotations(typeAnnotationPaths, package, notUpdatedSourceIds);
 
     package.updatedSourceIds = filterNotUpdatedSourceIds(std::move(package.updatedSourceIds),
                                                          std::move(notUpdatedSourceIds.sourceIds));
@@ -198,7 +270,11 @@ void ProjectStorageUpdater::update(QStringList directories,
         std::move(package.updatedFileStatusSourceIds),
         std::move(notUpdatedSourceIds.fileStatusSourceIds));
 
-    m_projectStorage.synchronize(std::move(package));
+    try {
+        m_projectStorage.synchronize(std::move(package));
+    } catch (...) {
+        qWarning() << "Project storage could not been updated!";
+    }
 
     m_pathWatcher.updateIdPaths(createIdPaths(watchedSourceIds, m_projectPartId));
 }
@@ -211,11 +287,16 @@ void ProjectStorageUpdater::updateQmlTypes(const QStringList &qmlTypesPaths,
     if (qmlTypesPaths.empty())
         return;
 
+    NanotraceHR::Tracer tracer{"update qmltypes file"_t, category()};
+
     ModuleId moduleId = m_projectStorage.moduleId("QML-cppnative");
 
     for (const QString &qmlTypesPath : qmlTypesPaths) {
         SourceId sourceId = m_pathCache.sourceId(SourcePath{qmlTypesPath});
         watchedSourceIdsIds.qmltypesSourceIds.push_back(sourceId);
+        tracer.tick("append watched qml types source id"_t,
+                    keyValue("source id", sourceId),
+                    keyValue("qml types path", qmlTypesPath));
 
         Storage::Synchronization::ProjectData projectData{sourceId,
                                                           sourceId,
@@ -228,7 +309,9 @@ void ProjectStorageUpdater::updateQmlTypes(const QStringList &qmlTypesPaths,
                                         notUpdatedSourceIds);
 
         if (state == FileState::Changed) {
+            tracer.tick("append project data"_t, keyValue("project data", projectData));
             package.projectDatas.push_back(std::move(projectData));
+            tracer.tick("append updated project source ids"_t, keyValue("source id", sourceId));
             package.updatedProjectSourceIds.push_back(sourceId);
         }
     }
@@ -246,13 +329,86 @@ ProjectStorageUpdater::FileState combineState(FileStates... fileStates)
 
     return ProjectStorageUpdater::FileState::NotExists;
 }
+
 } // namespace
 
+void ProjectStorageUpdater::updateDirectoryChanged(std::string_view directoryPath,
+                                                   FileState qmldirState,
+                                                   SourcePath qmldirSourcePath,
+                                                   SourceId qmldirSourceId,
+                                                   SourceId directorySourceId,
+                                                   SourceContextId directoryId,
+                                                   Storage::Synchronization::SynchronizationPackage &package,
+                                                   NotUpdatedSourceIds &notUpdatedSourceIds,
+                                                   WatchedSourceIdsIds &watchedSourceIdsIds,
+                                                   Tracer &tracer)
+{
+    QmlDirParser parser;
+    if (qmldirState != FileState::NotExists)
+        parser.parse(m_fileSystem.contentAsQString(QString{qmldirSourcePath}));
+
+    if (qmldirState != FileState::NotChanged) {
+        tracer.tick("append updated source id"_t, keyValue("module id", qmldirSourceId));
+        package.updatedSourceIds.push_back(qmldirSourceId);
+    }
+
+    Utils::PathString moduleName{parser.typeNamespace()};
+    ModuleId moduleId = m_projectStorage.moduleId(moduleName);
+    Utils::PathString cppModuleName = moduleName + "-cppnative";
+    ModuleId cppModuleId = m_projectStorage.moduleId(cppModuleName);
+    ModuleId pathModuleId = m_projectStorage.moduleId(directoryPath);
+
+    auto imports = filterMultipleEntries(parser.imports());
+
+    addModuleExportedImports(package.moduleExportedImports,
+                             moduleId,
+                             cppModuleId,
+                             moduleName,
+                             cppModuleName,
+                             imports,
+                             m_projectStorage);
+    tracer.tick("append updated module id"_t, keyValue("module id", moduleId));
+    package.updatedModuleIds.push_back(moduleId);
+
+    const auto qmlProjectDatas = m_projectStorage.fetchProjectDatas(directorySourceId);
+    addSourceIds(package.updatedSourceIds, qmlProjectDatas, "append updated source id"_t, tracer);
+    addSourceIds(package.updatedFileStatusSourceIds,
+                 qmlProjectDatas,
+                 "append updated file status source id"_t,
+                 tracer);
+
+    auto qmlTypes = filterMultipleEntries(parser.typeInfos());
+
+    if (!qmlTypes.isEmpty()) {
+        parseTypeInfos(qmlTypes,
+                       filterMultipleEntries(parser.dependencies()),
+                       imports,
+                       directorySourceId,
+                       directoryPath,
+                       cppModuleId,
+                       package,
+                       notUpdatedSourceIds,
+                       watchedSourceIdsIds);
+    }
+    parseQmlComponents(
+        createComponents(parser.components(), moduleId, pathModuleId, m_fileSystem, directoryPath),
+        directorySourceId,
+        directoryId,
+        package,
+        notUpdatedSourceIds,
+        watchedSourceIdsIds,
+        qmldirState);
+    tracer.tick("append updated project source id"_t, keyValue("module id", moduleId));
+    package.updatedProjectSourceIds.push_back(directorySourceId);
+}
+
 void ProjectStorageUpdater::updateDirectories(const QStringList &directories,
                                               Storage::Synchronization::SynchronizationPackage &package,
                                               NotUpdatedSourceIds &notUpdatedSourceIds,
                                               WatchedSourceIdsIds &watchedSourceIdsIds)
 {
+    NanotraceHR::Tracer tracer{"update directories"_t, category()};
+
     for (const QString &directory : directories)
         updateDirectory({directory}, package, notUpdatedSourceIds, watchedSourceIdsIds);
 }
@@ -262,8 +418,10 @@ void ProjectStorageUpdater::updateDirectory(const Utils::PathString &directoryPa
                                             NotUpdatedSourceIds &notUpdatedSourceIds,
                                             WatchedSourceIdsIds &watchedSourceIdsIds)
 {
+    NanotraceHR::Tracer tracer{"update directory"_t, category(), keyValue("directory", directoryPath)};
+
     SourcePath qmldirSourcePath{directoryPath + "/qmldir"};
-    auto [directoryId, qmlDirSourceId] = m_pathCache.sourceContextAndSourceId(qmldirSourcePath);
+    auto [directoryId, qmldirSourceId] = m_pathCache.sourceContextAndSourceId(qmldirSourcePath);
 
     SourcePath directorySourcePath{directoryPath + "/."};
     auto directorySourceId = m_pathCache.sourceId(directorySourcePath);
@@ -271,62 +429,28 @@ void ProjectStorageUpdater::updateDirectory(const Utils::PathString &directoryPa
     if (directoryState != FileState::NotExists)
         watchedSourceIdsIds.directorySourceIds.push_back(directorySourceId);
 
-    auto qmldirState = fileState(qmlDirSourceId, package, notUpdatedSourceIds);
+    auto qmldirState = fileState(qmldirSourceId, package, notUpdatedSourceIds);
     if (qmldirState != FileState::NotExists)
-        watchedSourceIdsIds.qmldirSourceIds.push_back(qmlDirSourceId);
+        watchedSourceIdsIds.qmldirSourceIds.push_back(qmldirSourceId);
 
     switch (combineState(directoryState, qmldirState)) {
     case FileState::Changed: {
-        QmlDirParser parser;
-        if (qmldirState != FileState::NotExists)
-            parser.parse(m_fileSystem.contentAsQString(QString{qmldirSourcePath}));
-
-        if (qmldirState != FileState::NotChanged)
-            package.updatedSourceIds.push_back(qmlDirSourceId);
-
-        Utils::PathString moduleName{parser.typeNamespace()};
-        ModuleId moduleId = m_projectStorage.moduleId(moduleName);
-        ModuleId cppModuleId = m_projectStorage.moduleId(moduleName + "-cppnative");
-        ModuleId pathModuleId = m_projectStorage.moduleId(directoryPath);
-
-        auto imports = filterMultipleEntries(parser.imports());
-
-        addModuleExportedImports(package.moduleExportedImports,
-                                 moduleId,
-                                 cppModuleId,
-                                 imports,
-                                 m_projectStorage);
-        package.updatedModuleIds.push_back(moduleId);
-
-        const auto qmlProjectDatas = m_projectStorage.fetchProjectDatas(directorySourceId);
-        addSourceIds(package.updatedSourceIds, qmlProjectDatas);
-        addSourceIds(package.updatedFileStatusSourceIds, qmlProjectDatas);
-
-        auto qmlTypes = filterMultipleEntries(parser.typeInfos());
-
-        if (!qmlTypes.isEmpty()) {
-            parseTypeInfos(qmlTypes,
-                           filterMultipleEntries(parser.dependencies()),
-                           imports,
-                           directorySourceId,
-                           directoryPath,
-                           cppModuleId,
-                           package,
-                           notUpdatedSourceIds,
-                           watchedSourceIdsIds);
-        }
-        parseQmlComponents(
-            createComponents(parser.components(), moduleId, pathModuleId, m_fileSystem, directoryPath),
-            directorySourceId,
-            directoryId,
-            package,
-            notUpdatedSourceIds,
-            watchedSourceIdsIds,
-            qmldirState);
-        package.updatedProjectSourceIds.push_back(directorySourceId);
+        tracer.tick("update directory changed"_t);
+        updateDirectoryChanged(directoryPath,
+                               qmldirState,
+                               qmldirSourcePath,
+                               qmldirSourceId,
+                               directorySourceId,
+                               directoryId,
+                               package,
+                               notUpdatedSourceIds,
+                               watchedSourceIdsIds,
+                               tracer);
         break;
     }
     case FileState::NotChanged: {
+        tracer.tick("update directory not changed"_t);
+
         parseProjectDatas(m_projectStorage.fetchProjectDatas(directorySourceId),
                           package,
                           notUpdatedSourceIds,
@@ -334,19 +458,32 @@ void ProjectStorageUpdater::updateDirectory(const Utils::PathString &directoryPa
         break;
     }
     case FileState::NotExists: {
+        tracer.tick("update directory don't exits"_t);
+
         package.updatedFileStatusSourceIds.push_back(directorySourceId);
-        package.updatedFileStatusSourceIds.push_back(qmlDirSourceId);
+        package.updatedFileStatusSourceIds.push_back(qmldirSourceId);
         package.updatedProjectSourceIds.push_back(directorySourceId);
-        package.updatedSourceIds.push_back(qmlDirSourceId);
+        package.updatedSourceIds.push_back(qmldirSourceId);
         auto qmlProjectDatas = m_projectStorage.fetchProjectDatas(directorySourceId);
         for (const Storage::Synchronization::ProjectData &projectData : qmlProjectDatas) {
+            tracer.tick("append updated source id"_t, keyValue("source id", projectData.sourceId));
             package.updatedSourceIds.push_back(projectData.sourceId);
+            tracer.tick("append updated file status source id"_t,
+                        keyValue("source id", projectData.sourceId));
             package.updatedFileStatusSourceIds.push_back(projectData.sourceId);
         }
 
         break;
     }
     }
+
+    tracer.end(keyValue("qmldir source path", qmldirSourcePath),
+               keyValue("directory source path", directorySourcePath),
+               keyValue("directory id", directoryId),
+               keyValue("qmldir source id", qmldirSourceId),
+               keyValue("directory source source id", directorySourceId),
+               keyValue("qmldir state", qmldirState),
+               keyValue("directory state", directoryState));
 }
 
 void ProjectStorageUpdater::updatePropertyEditorPaths(
@@ -354,6 +491,10 @@ void ProjectStorageUpdater::updatePropertyEditorPaths(
     Storage::Synchronization::SynchronizationPackage &package,
     NotUpdatedSourceIds &notUpdatedSourceIds)
 {
+    NanotraceHR::Tracer tracer{"update property editor paths"_t,
+                               category(),
+                               keyValue("property editor resources path", propertyEditorResourcesPath)};
+
     if (propertyEditorResourcesPath.isEmpty())
         return;
 
@@ -373,12 +514,134 @@ void ProjectStorageUpdater::updatePropertyEditorPaths(
     }
 }
 
+namespace {
+
+template<typename SourceIds1, typename SourceIds2>
+SmallSourceIds<16> mergedSourceIds(const SourceIds1 &sourceIds1, const SourceIds2 &sourceIds2)
+{
+    SmallSourceIds<16> mergedSourceIds;
+
+    std::set_union(sourceIds1.begin(),
+                   sourceIds1.end(),
+                   sourceIds2.begin(),
+                   sourceIds2.end(),
+                   std::back_inserter(mergedSourceIds));
+
+    return mergedSourceIds;
+}
+} // namespace
+
+void ProjectStorageUpdater::updateTypeAnnotations(const QStringList &directoryPaths,
+                                                  Storage::Synchronization::SynchronizationPackage &package,
+                                                  NotUpdatedSourceIds &notUpdatedSourceIds)
+{
+    NanotraceHR::Tracer tracer("update type annotations"_t, category());
+
+    std::map<SourceId, SmallSourceIds<16>> updatedSourceIdsDictonary;
+
+    for (SourceId directoryId : m_projectStorage.typeAnnotationDirectorySourceIds())
+        updatedSourceIdsDictonary[directoryId] = {};
+
+    for (const auto &directoryPath : directoryPaths)
+        updateTypeAnnotations(directoryPath, package, notUpdatedSourceIds, updatedSourceIdsDictonary);
+
+    updateTypeAnnotationDirectories(package, notUpdatedSourceIds, updatedSourceIdsDictonary);
+}
+
 void ProjectStorageUpdater::updateTypeAnnotations(
-    const QString & /*propertyEditorResourcesPath*/,
-    Storage::Synchronization::SynchronizationPackage & /*package*/,
-    NotUpdatedSourceIds & /*notUpdatedSourceIds*/)
+    const QString &rootDirectoryPath,
+    Storage::Synchronization::SynchronizationPackage &package,
+    NotUpdatedSourceIds &notUpdatedSourceIds,
+    std::map<SourceId, SmallSourceIds<16>> &updatedSourceIdsDictonary)
+{
+    NanotraceHR::Tracer tracer("update type annotation directory"_t,
+                               category(),
+                               keyValue("path", rootDirectoryPath));
+
+    if (rootDirectoryPath.isEmpty())
+        return;
+
+    QDirIterator directoryIterator{rootDirectoryPath,
+                                   {"*.metainfo"},
+                                   QDir::NoDotAndDotDot | QDir::Files,
+                                   QDirIterator::Subdirectories};
+
+    while (directoryIterator.hasNext()) {
+        auto fileInfo = directoryIterator.nextFileInfo();
+        auto filePath = fileInfo.filePath();
+        SourceId sourceId = m_pathCache.sourceId(SourcePath{filePath});
+
+        auto directoryPath = fileInfo.canonicalPath();
+
+        SourceId directorySourceId = m_pathCache.sourceId(SourcePath{directoryPath + "/."});
+
+        auto state = fileState(sourceId, package, notUpdatedSourceIds);
+        if (state == FileState::Changed)
+            updateTypeAnnotation(directoryPath, fileInfo.filePath(), sourceId, directorySourceId, package);
+
+        if (state != FileState::NotChanged)
+            updatedSourceIdsDictonary[directorySourceId].push_back(sourceId);
+    }
+}
+
+void ProjectStorageUpdater::updateTypeAnnotationDirectories(
+    Storage::Synchronization::SynchronizationPackage &package,
+    NotUpdatedSourceIds &notUpdatedSourceIds,
+    std::map<SourceId, SmallSourceIds<16>> &updatedSourceIdsDictonary)
+{
+    for (auto &[directorySourceId, updatedSourceIds] : updatedSourceIdsDictonary) {
+        auto directoryState = fileState(directorySourceId, package, notUpdatedSourceIds);
+
+        if (directoryState != FileState::NotChanged) {
+            auto existingTypeAnnotationSourceIds = m_projectStorage.typeAnnotationSourceIds(
+                directorySourceId);
+
+            std::sort(updatedSourceIds.begin(), updatedSourceIds.end());
+
+            auto changedSourceIds = mergedSourceIds(existingTypeAnnotationSourceIds, updatedSourceIds);
+            package.updatedTypeAnnotationSourceIds.insert(package.updatedTypeAnnotationSourceIds.end(),
+                                                          changedSourceIds.begin(),
+                                                          changedSourceIds.end());
+        } else {
+            package.updatedTypeAnnotationSourceIds.insert(package.updatedTypeAnnotationSourceIds.end(),
+                                                          updatedSourceIds.begin(),
+                                                          updatedSourceIds.end());
+        }
+    }
+}
+
+namespace {
+QString contentFromFile(const QString &path)
+{
+    QFile file{path};
+    if (file.open(QIODevice::ReadOnly))
+        return QString::fromUtf8(file.readAll());
+
+    return {};
+}
+} // namespace
+
+void ProjectStorageUpdater::updateTypeAnnotation(const QString &directoryPath,
+                                                 const QString &filePath,
+                                                 SourceId sourceId,
+                                                 SourceId directorySourceId,
+                                                 Storage::Synchronization::SynchronizationPackage &package)
 {
-    //    const auto typeAnnotations = dir.entryInfoList({"*.metainfo"}, QDir::Files);
+    NanotraceHR::Tracer tracer{"update type annotation path"_t,
+                               category(),
+                               keyValue("path", filePath),
+                               keyValue("directory path", directoryPath)};
+
+    Storage::TypeAnnotationReader reader{m_projectStorage};
+
+    auto annotations = reader.parseTypeAnnotation(contentFromFile(filePath),
+                                                  directoryPath,
+                                                  sourceId,
+                                                  directorySourceId);
+    auto &typeAnnotations = package.typeAnnotations;
+    package.typeAnnotations.insert(typeAnnotations.end(),
+                                   std::make_move_iterator(annotations.begin()),
+                                   std::make_move_iterator(annotations.end()));
 }
 
 void ProjectStorageUpdater::updatePropertyEditorPath(
@@ -386,6 +649,13 @@ void ProjectStorageUpdater::updatePropertyEditorPath(
     Storage::Synchronization::SynchronizationPackage &package,
     SourceId directorySourceId)
 {
+    NanotraceHR::Tracer tracer{"update property editor path"_t,
+                               category(),
+                               keyValue("directory path", directoryPath),
+                               keyValue("directory source id", directorySourceId)};
+
+    tracer.tick("append updated property editor qml path source id"_t,
+                keyValue("source id", directorySourceId));
     package.updatedPropertyEditorQmlPathSourceIds.push_back(directorySourceId);
     auto dir = QDir{directoryPath};
     const auto fileInfos = dir.entryInfoList({"*Pane.qml", "*Specifics.qml"}, QDir::Files);
@@ -398,6 +668,11 @@ void ProjectStorageUpdater::updatePropertyEditorFilePath(
     Storage::Synchronization::SynchronizationPackage &package,
     SourceId directorySourceId)
 {
+    NanotraceHR::Tracer tracer{"update property editor file path"_t,
+                               category(),
+                               keyValue("directory path", path),
+                               keyValue("directory source id", directorySourceId)};
+
     QRegularExpression regex{R"xo(.+\/(\w+)\/(\w+)(Specifics|Pane).qml)xo"};
     auto match = regex.match(path);
     QString oldModuleName;
@@ -410,7 +685,12 @@ void ProjectStorageUpdater::updatePropertyEditorFilePath(
         }
         Storage::TypeNameString typeName{match.capturedView(2)};
         SourceId pathId = m_pathCache.sourceId(SourcePath{path});
-        package.propertyEditorQmlPaths.emplace_back(moduleId, typeName, pathId, directorySourceId);
+        const auto &paths = package.propertyEditorQmlPaths.emplace_back(moduleId,
+                                                                        typeName,
+                                                                        pathId,
+                                                                        directorySourceId);
+        tracer.tick("append property editor qml paths"_t,
+                    keyValue("property editor qml paths", paths));
     }
 }
 
@@ -447,6 +727,10 @@ bool contains(const Container &container, Id id)
 
 void ProjectStorageUpdater::pathsWithIdsChanged(const std::vector<IdPaths> &changedIdPaths)
 {
+    NanotraceHR::Tracer tracer{"paths with ids changed"_t,
+                               category(),
+                               keyValue("id paths", changedIdPaths)};
+
     m_changedIdPaths.insert(m_changedIdPaths.end(), changedIdPaths.begin(), changedIdPaths.end());
 
     Storage::Synchronization::SynchronizationPackage package;
@@ -539,21 +823,35 @@ void ProjectStorageUpdater::parseTypeInfos(const QStringList &typeInfos,
                                            NotUpdatedSourceIds &notUpdatedSourceIds,
                                            WatchedSourceIdsIds &watchedSourceIds)
 {
+    NanotraceHR::Tracer tracer{"parse type infos"_t,
+                               category(),
+                               keyValue("directory source id", directorySourceId),
+                               keyValue("directory path", directoryPath),
+                               keyValue("module id", moduleId)};
+
     for (const QString &typeInfo : typeInfos) {
+        NanotraceHR::Tracer tracer{"parse type info"_t, category(), keyValue("type info", typeInfo)};
+
         Utils::PathString qmltypesPath = Utils::PathString::join(
             {directoryPath, "/", Utils::SmallString{typeInfo}});
         SourceId sourceId = m_pathCache.sourceId(SourcePathView{qmltypesPath});
 
+        tracer.tick("append qmltypes source id"_t, keyValue("source id", sourceId));
         watchedSourceIds.qmltypesSourceIds.push_back(sourceId);
 
         addDependencies(package.moduleDependencies,
                         sourceId,
                         joinImports(qmldirDependencies, qmldirImports),
-                        m_projectStorage);
+                        m_projectStorage,
+                        "append module dependency"_t,
+                        tracer);
+
+        tracer.tick("append module dependenct source source id"_t, keyValue("source id", sourceId));
         package.updatedModuleDependencySourceIds.push_back(sourceId);
 
         auto projectData = package.projectDatas.emplace_back(
             directorySourceId, sourceId, moduleId, Storage::Synchronization::FileType::QmlTypes);
+        tracer.tick("append project data"_t, keyValue("source id", sourceId));
 
         parseTypeInfo(projectData, qmltypesPath, package, notUpdatedSourceIds);
     }
@@ -564,6 +862,8 @@ void ProjectStorageUpdater::parseProjectDatas(const Storage::Synchronization::Pr
                                               NotUpdatedSourceIds &notUpdatedSourceIds,
                                               WatchedSourceIdsIds &watchedSourceIds)
 {
+    NanotraceHR::Tracer tracer{"parse project datas"_t, category()};
+
     for (const Storage::Synchronization::ProjectData &projectData : projectDatas) {
         switch (projectData.fileType) {
         case Storage::Synchronization::FileType::QmlTypes: {
@@ -577,6 +877,7 @@ void ProjectStorageUpdater::parseProjectDatas(const Storage::Synchronization::Pr
             watchedSourceIds.qmlSourceIds.push_back(projectData.sourceId);
 
             parseQmlComponent(projectData.sourceId, package, notUpdatedSourceIds);
+            break;
         }
         }
     }
@@ -587,9 +888,14 @@ auto ProjectStorageUpdater::parseTypeInfo(const Storage::Synchronization::Projec
                                           Storage::Synchronization::SynchronizationPackage &package,
                                           NotUpdatedSourceIds &notUpdatedSourceIds) -> FileState
 {
+    NanotraceHR::Tracer tracer{"parse type info"_t,
+                               category(),
+                               keyValue("qmltypes path", qmltypesPath)};
+
     auto state = fileState(projectData.sourceId, package, notUpdatedSourceIds);
     switch (state) {
     case FileState::Changed: {
+        tracer.tick("append updated source ids"_t, keyValue("source id", projectData.sourceId));
         package.updatedSourceIds.push_back(projectData.sourceId);
 
         const auto content = m_fileSystem.contentAsQString(QString{qmltypesPath});
@@ -597,14 +903,16 @@ auto ProjectStorageUpdater::parseTypeInfo(const Storage::Synchronization::Projec
         break;
     }
     case FileState::NotChanged: {
+        tracer.tick("append not updated source ids"_t, keyValue("source id", projectData.sourceId));
         notUpdatedSourceIds.sourceIds.push_back(projectData.sourceId);
         break;
     }
     case FileState::NotExists:
         throw CannotParseQmlTypesFile{};
-        break;
     }
 
+    tracer.end(keyValue("state", state));
+
     return state;
 }
 
@@ -617,6 +925,14 @@ void ProjectStorageUpdater::parseQmlComponent(Utils::SmallStringView relativeFil
                                               WatchedSourceIdsIds &watchedSourceIds,
                                               FileState qmldirState)
 {
+    NanotraceHR::Tracer tracer{"parse qml component"_t,
+                               category(),
+                               keyValue("relative file path", relativeFilePath),
+                               keyValue("directory path", directoryPath),
+                               keyValue("exported types", exportedTypes),
+                               keyValue("directory source id", directorySourceId),
+                               keyValue("qmldir state", qmldirState)};
+
     if (std::find(relativeFilePath.begin(), relativeFilePath.end(), '+') != relativeFilePath.end())
         return;
 
@@ -626,16 +942,18 @@ void ProjectStorageUpdater::parseQmlComponent(Utils::SmallStringView relativeFil
     Storage::Synchronization::Type type;
     auto state = fileState(sourceId, package, notUpdatedSourceIds);
 
+    tracer.tick("append watched qml source id"_t, keyValue("source id", sourceId));
     watchedSourceIds.qmlSourceIds.push_back(sourceId);
 
     switch (state) {
     case FileState::NotChanged:
         if (qmldirState == FileState::NotExists) {
+            tracer.tick("append not updated source id"_t, keyValue("source id", sourceId));
             notUpdatedSourceIds.sourceIds.emplace_back(sourceId);
-            package.projectDatas.emplace_back(directorySourceId,
-                                              sourceId,
-                                              ModuleId{},
-                                              Storage::Synchronization::FileType::QmlDocument);
+
+            const auto &projectData = package.projectDatas.emplace_back(
+                directorySourceId, sourceId, ModuleId{}, Storage::Synchronization::FileType::QmlDocument);
+            tracer.tick("append project data"_t, keyValue("project data", projectData));
 
             return;
         }
@@ -649,11 +967,11 @@ void ProjectStorageUpdater::parseQmlComponent(Utils::SmallStringView relativeFil
         break;
     }
 
-    package.projectDatas.emplace_back(directorySourceId,
-                                      sourceId,
-                                      ModuleId{},
-                                      Storage::Synchronization::FileType::QmlDocument);
+    const auto &projectData = package.projectDatas.emplace_back(
+        directorySourceId, sourceId, ModuleId{}, Storage::Synchronization::FileType::QmlDocument);
+    tracer.tick("append project data"_t, keyValue("project data", projectData));
 
+    tracer.tick("append updated source id"_t, keyValue("source id", sourceId));
     package.updatedSourceIds.push_back(sourceId);
 
     type.typeName = SourcePath{qmlFilePath}.name();
@@ -661,6 +979,8 @@ void ProjectStorageUpdater::parseQmlComponent(Utils::SmallStringView relativeFil
     type.sourceId = sourceId;
     type.exportedTypes = std::move(exportedTypes);
 
+    tracer.end(keyValue("type", type));
+
     package.types.push_back(std::move(type));
 }
 
@@ -668,10 +988,13 @@ void ProjectStorageUpdater::parseQmlComponent(SourceId sourceId,
                                               Storage::Synchronization::SynchronizationPackage &package,
                                               NotUpdatedSourceIds &notUpdatedSourceIds)
 {
+    NanotraceHR::Tracer tracer{"parse qml component"_t, category(), keyValue("source id", sourceId)};
+
     auto state = fileState(sourceId, package, notUpdatedSourceIds);
     if (state == FileState::NotChanged)
         return;
 
+    tracer.tick("append updated source id"_t, keyValue("source id", sourceId));
     package.updatedSourceIds.push_back(sourceId);
 
     if (state == FileState::NotExists)
@@ -687,6 +1010,8 @@ void ProjectStorageUpdater::parseQmlComponent(SourceId sourceId,
     type.sourceId = sourceId;
     type.changeLevel = Storage::Synchronization::ChangeLevel::ExcludeExportedTypes;
 
+    tracer.end(keyValue("type", type));
+
     package.types.push_back(std::move(type));
 }
 
@@ -733,6 +1058,12 @@ void ProjectStorageUpdater::parseQmlComponents(Components components,
                                                WatchedSourceIdsIds &watchedSourceIdsIds,
                                                FileState qmldirState)
 {
+    NanotraceHR::Tracer tracer{"parse qml components"_t,
+                               category(),
+                               keyValue("directory source id", directorySourceId),
+                               keyValue("directory id", directoryId),
+                               keyValue("qmldir state", qmldirState)};
+
     std::sort(components.begin(), components.end(), [](auto &&first, auto &&second) {
         return first.fileName < second.fileName;
     });
@@ -760,22 +1091,37 @@ ProjectStorageUpdater::FileState ProjectStorageUpdater::fileState(
     Storage::Synchronization::SynchronizationPackage &package,
     NotUpdatedSourceIds &notUpdatedSourceIds) const
 {
+    NanotraceHR::Tracer tracer{"update property editor paths"_t,
+                               category(),
+                               keyValue("source id", sourceId)};
+
     auto currentFileStatus = m_fileStatusCache.find(sourceId);
 
     if (!currentFileStatus.isValid()) {
+        tracer.tick("append updated file status source id"_t, keyValue("source id", sourceId));
         package.updatedFileStatusSourceIds.push_back(sourceId);
+
+        tracer.end(keyValue("state", FileState::NotExists));
         return FileState::NotExists;
     }
 
     auto projectStorageFileStatus = m_projectStorage.fetchFileStatus(sourceId);
 
     if (!projectStorageFileStatus.isValid() || projectStorageFileStatus != currentFileStatus) {
+        tracer.tick("append file status"_t, keyValue("file status", sourceId));
         package.fileStatuses.push_back(currentFileStatus);
+
+        tracer.tick("append updated file status source id"_t, keyValue("source id", sourceId));
         package.updatedFileStatusSourceIds.push_back(sourceId);
+
+        tracer.end(keyValue("state", FileState::Changed));
         return FileState::Changed;
     }
 
+    tracer.tick("append not updated file status source id"_t, keyValue("source id", sourceId));
     notUpdatedSourceIds.fileStatusSourceIds.push_back(sourceId);
+
+    tracer.end(keyValue("state", FileState::NotChanged));
     return FileState::NotChanged;
 }
 
diff --git a/src/plugins/qmldesigner/designercore/projectstorage/projectstorageupdater.h b/src/plugins/qmldesigner/designercore/projectstorage/projectstorageupdater.h
index 187a2219d0..640969fe99 100644
--- a/src/plugins/qmldesigner/designercore/projectstorage/projectstorageupdater.h
+++ b/src/plugins/qmldesigner/designercore/projectstorage/projectstorageupdater.h
@@ -11,10 +11,15 @@
 #include "projectstoragetypes.h"
 #include "sourcepath.h"
 
+#include <modelfwd.h>
+
+#include <tracing/qmldesignertracing.h>
+
 #include <qmljs/parser/qmldirparser_p.h>
 
 #include <QStringList>
 
+#include <map>
 #include <vector>
 
 namespace Sqlite {
@@ -27,7 +32,6 @@ class ProjectStorageInterface;
 template<typename ProjectStorage, typename Mutex>
 class SourcePathCache;
 class FileStatusCache;
-template<typename Database>
 class ProjectStorage;
 class QmlDocumentParserInterface;
 class QmlTypesParserInterface;
@@ -35,10 +39,10 @@ class QmlTypesParserInterface;
 class ProjectStorageUpdater final : public ProjectStoragePathWatcherNotifierInterface
 {
 public:
-    using PathCache = SourcePathCache<ProjectStorage<Sqlite::Database>, NonLockingMutex>;
+    using PathCache = SourcePathCache<ProjectStorage, NonLockingMutex>;
 
     ProjectStorageUpdater(FileSystemInterface &fileSystem,
-                          ProjectStorageInterface &projectStorage,
+                          ProjectStorageType &projectStorage,
                           FileStatusCache &fileStatusCache,
                           PathCache &pathCache,
                           QmlDocumentParserInterface &qmlDocumentParser,
@@ -57,7 +61,8 @@ public:
 
     void update(QStringList directories,
                 QStringList qmlTypesPaths,
-                const QString &propertyEditorResourcesPath);
+                const QString &propertyEditorResourcesPath,
+                const QStringList &typeAnnotationPaths);
     void pathsWithIdsChanged(const std::vector<IdPaths> &idPaths) override;
     void pathsChanged(const SourceIds &filePathIds) override;
 
@@ -141,13 +146,35 @@ private:
                          Storage::Synchronization::SynchronizationPackage &package,
                          NotUpdatedSourceIds &notUpdatedSourceIds,
                          WatchedSourceIdsIds &watchedSourceIdsIds);
+    void updateDirectoryChanged(std::string_view directoryPath,
+                                FileState qmldirState,
+                                SourcePath qmldirSourcePath,
+                                SourceId qmldirSourceId,
+                                SourceId directorySourceId,
+                                SourceContextId directoryId,
+                                Storage::Synchronization::SynchronizationPackage &package,
+                                NotUpdatedSourceIds &notUpdatedSourceIds,
+                                WatchedSourceIdsIds &watchedSourceIdsIds,
+                                ProjectStorageTracing::Category::TracerType &tracer);
 
     void updatePropertyEditorPaths(const QString &propertyEditorResourcesPath,
                                    Storage::Synchronization::SynchronizationPackage &package,
                                    NotUpdatedSourceIds &notUpdatedSourceIds);
-    void updateTypeAnnotations(const QString &propertyEditorResourcesPath,
+    void updateTypeAnnotations(const QString &directoryPath,
+                               Storage::Synchronization::SynchronizationPackage &package,
+                               NotUpdatedSourceIds &notUpdatedSourceIds,
+                               std::map<SourceId, SmallSourceIds<16>> &updatedSourceIdsDictonary);
+    void updateTypeAnnotationDirectories(Storage::Synchronization::SynchronizationPackage &package,
+                                         NotUpdatedSourceIds &notUpdatedSourceIds,
+                                         std::map<SourceId, SmallSourceIds<16>> &updatedSourceIdsDictonary);
+    void updateTypeAnnotations(const QStringList &directoryPath,
                                Storage::Synchronization::SynchronizationPackage &package,
                                NotUpdatedSourceIds &notUpdatedSourceIds);
+    void updateTypeAnnotation(const QString &directoryPath,
+                              const QString &filePath,
+                              SourceId sourceId,
+                              SourceId directorySourceId,
+                              Storage::Synchronization::SynchronizationPackage &package);
     void updatePropertyEditorPath(const QString &path,
                                   Storage::Synchronization::SynchronizationPackage &package,
                                   SourceId directorySourceId);
@@ -197,7 +224,7 @@ private:
 private:
     std::vector<IdPaths> m_changedIdPaths;
     FileSystemInterface &m_fileSystem;
-    ProjectStorageInterface &m_projectStorage;
+    ProjectStorageType &m_projectStorage;
     FileStatusCache &m_fileStatusCache;
     PathCache &m_pathCache;
     QmlDocumentParserInterface &m_qmlDocumentParser;
diff --git a/src/plugins/qmldesigner/designercore/projectstorage/qmldocumentparser.cpp b/src/plugins/qmldesigner/designercore/projectstorage/qmldocumentparser.cpp
index f9eb8080f7..27efa8d530 100644
--- a/src/plugins/qmldesigner/designercore/projectstorage/qmldocumentparser.cpp
+++ b/src/plugins/qmldesigner/designercore/projectstorage/qmldocumentparser.cpp
@@ -10,6 +10,8 @@
 
 #include <sqlitedatabase.h>
 
+#include <tracing/qmldesignertracing.h>
+
 #ifdef QDS_BUILD_QMLPARSER
 #include <private/qqmldomtop_p.h>
 #endif
@@ -21,6 +23,10 @@ namespace QmlDesigner {
 
 #ifdef QDS_BUILD_QMLPARSER
 
+constexpr auto category = ProjectStorageTracing::projectStorageUpdaterCategory;
+using NanotraceHR::keyValue;
+using Tracer = ProjectStorageTracing::Category::TracerType;
+
 namespace QmlDom = QQmlJS::Dom;
 namespace Synchronization = Storage::Synchronization;
 
@@ -84,6 +90,11 @@ QualifiedImports createQualifiedImports(const QList<QmlDom::Import> &qmlImports,
                                         Utils::SmallStringView directoryPath,
                                         QmlDocumentParser::ProjectStorage &storage)
 {
+    NanotraceHR::Tracer tracer{"create qualified imports"_t,
+                               category(),
+                               keyValue("sourceId", sourceId),
+                               keyValue("directoryPath", directoryPath)};
+
     QualifiedImports qualifiedImports;
 
     for (const QmlDom::Import &qmlImport : qmlImports) {
@@ -92,6 +103,8 @@ QualifiedImports createQualifiedImports(const QList<QmlDom::Import> &qmlImports,
                                          createImport(qmlImport, sourceId, directoryPath, storage));
     }
 
+    tracer.end(keyValue("qualified imports", qualifiedImports));
+
     return qualifiedImports;
 }
 
@@ -280,6 +293,11 @@ Storage::Synchronization::Type QmlDocumentParser::parse(const QString &sourceCon
                                                         SourceId sourceId,
                                                         Utils::SmallStringView directoryPath)
 {
+    NanotraceHR::Tracer tracer{"qml document parser parse"_t,
+                               category(),
+                               keyValue("sourceId", sourceId),
+                               keyValue("directoryPath", directoryPath)};
+
     Storage::Synchronization::Type type;
 
     using Option = QmlDom::DomEnvironment::Option;
@@ -335,7 +353,7 @@ Storage::Synchronization::Type QmlDocumentParser::parse(const QString &sourceCon
                                                          m_storage);
 
     type.prototype = createImportedTypeName(qmlObject.name(), qualifiedImports);
-
+    type.defaultPropertyName = qmlObject.localDefaultPropertyName();
     addImports(imports, qmlFile->imports(), sourceId, directoryPath, m_storage);
 
     addPropertyDeclarations(type, qmlObject, qualifiedImports, file);
diff --git a/src/plugins/qmldesigner/designercore/projectstorage/qmldocumentparser.h b/src/plugins/qmldesigner/designercore/projectstorage/qmldocumentparser.h
index b8ab4ec4b1..1b494a2f69 100644
--- a/src/plugins/qmldesigner/designercore/projectstorage/qmldocumentparser.h
+++ b/src/plugins/qmldesigner/designercore/projectstorage/qmldocumentparser.h
@@ -15,7 +15,7 @@ class SourcePathCache;
 class QmlDocumentParser final : public QmlDocumentParserInterface
 {
 public:
-    using ProjectStorage = QmlDesigner::ProjectStorage<Sqlite::Database>;
+    using ProjectStorage = QmlDesigner::ProjectStorage;
     using PathCache = QmlDesigner::SourcePathCache<ProjectStorage, NonLockingMutex>;
 
 #ifdef QDS_BUILD_QMLPARSER
diff --git a/src/plugins/qmldesigner/designercore/projectstorage/qmltypesparser.cpp b/src/plugins/qmldesigner/designercore/projectstorage/qmltypesparser.cpp
index 3768535299..104338e514 100644
--- a/src/plugins/qmldesigner/designercore/projectstorage/qmltypesparser.cpp
+++ b/src/plugins/qmldesigner/designercore/projectstorage/qmltypesparser.cpp
@@ -5,8 +5,12 @@
 
 #include "projectstorage.h"
 
+#include <tracing/qmldesignertracing.h>
+
 #include <sqlitedatabase.h>
 
+#include <utils/span.h>
+
 #ifdef QDS_BUILD_QMLPARSER
 #include <private/qqmldomtop_p.h>
 #include <private/qqmljstypedescriptionreader_p.h>
@@ -21,6 +25,10 @@ namespace QmlDesigner {
 
 #ifdef QDS_BUILD_QMLPARSER
 
+constexpr auto category = ProjectStorageTracing::projectStorageUpdaterCategory;
+using NanotraceHR::keyValue;
+using Tracer = ProjectStorageTracing::Category::TracerType;
+
 namespace QmlDom = QQmlJS::Dom;
 
 namespace {
@@ -31,6 +39,8 @@ using Storage::TypeNameString;
 
 ComponentWithoutNamespaces createComponentNameWithoutNamespaces(const QList<QQmlJSExportedScope> &objects)
 {
+    NanotraceHR::Tracer tracer{"parse qmltypes file"_t, category()};
+
     ComponentWithoutNamespaces componentWithoutNamespaces;
 
     for (const auto &object : objects) {
@@ -46,13 +56,15 @@ ComponentWithoutNamespaces createComponentNameWithoutNamespaces(const QList<QQml
                                           name);
     }
 
+    tracer.end(keyValue("components without namespace", componentWithoutNamespaces));
+
     return componentWithoutNamespaces;
 }
 
-void appendImports(Storage::Imports &imports,
-                   const QString &dependency,
-                   SourceId sourceId,
-                   QmlTypesParser::ProjectStorage &storage)
+const Storage::Import &appendImports(Storage::Imports &imports,
+                                     const QString &dependency,
+                                     SourceId sourceId,
+                                     QmlTypesParser::ProjectStorage &storage)
 {
     auto spaceFound = std::find_if(dependency.begin(), dependency.end(), [](QChar c) {
         return c.isSpace();
@@ -62,7 +74,7 @@ void appendImports(Storage::Imports &imports,
     moduleName.append("-cppnative");
     ModuleId cppModuleId = storage.moduleId(moduleName);
 
-    imports.emplace_back(cppModuleId, Storage::Version{}, sourceId);
+    return imports.emplace_back(cppModuleId, Storage::Version{}, sourceId);
 }
 
 void addImports(Storage::Imports &imports,
@@ -71,13 +83,25 @@ void addImports(Storage::Imports &imports,
                 QmlTypesParser::ProjectStorage &storage,
                 ModuleId cppModuleId)
 {
-    for (const QString &dependency : dependencies)
-        appendImports(imports, dependency, sourceId, storage);
+    NanotraceHR::Tracer tracer{
+        "add imports"_t,
+        category(),
+        keyValue("source id", sourceId),
+        keyValue("module id", cppModuleId),
+    };
+
+    for (const QString &dependency : dependencies) {
+        const auto &import = appendImports(imports, dependency, sourceId, storage);
+        tracer.tick("append import"_t, keyValue("import", import), keyValue("dependency", dependency));
+    }
 
-    imports.emplace_back(cppModuleId, Storage::Version{}, sourceId);
+    const auto &import = imports.emplace_back(cppModuleId, Storage::Version{}, sourceId);
+    tracer.tick("append import"_t, keyValue("import", import));
 
-    if (ModuleId qmlCppModuleId = storage.moduleId("QML-cppnative"); cppModuleId != qmlCppModuleId)
-        imports.emplace_back(qmlCppModuleId, Storage::Version{}, sourceId);
+    if (ModuleId qmlCppModuleId = storage.moduleId("QML-cppnative"); cppModuleId != qmlCppModuleId) {
+        const auto &import = imports.emplace_back(qmlCppModuleId, Storage::Version{}, sourceId);
+        tracer.tick("append import"_t, keyValue("import", import));
+    }
 }
 
 Storage::TypeTraits createAccessTypeTraits(QQmlJSScope::AccessSemantics accessSematics)
@@ -412,6 +436,11 @@ void addType(Storage::Synchronization::Types &types,
              QmlTypesParser::ProjectStorage &storage,
              const ComponentWithoutNamespaces &componentNameWithoutNamespace)
 {
+    NanotraceHR::Tracer tracer{"add type"_t,
+                               category(),
+                               keyValue("source id", sourceId),
+                               keyValue("module id", cppModuleId)};
+
     const auto &component = *exportScope.scope;
 
     auto [functionsDeclarations, signalDeclarations] = createFunctionAndSignals(
@@ -421,7 +450,7 @@ void addType(Storage::Synchronization::Types &types,
     auto exports = exportScope.exports;
 
     auto enumerationTypes = addEnumerationTypes(types, typeName, sourceId, cppModuleId, enumerations);
-    types.emplace_back(
+    const auto &type = types.emplace_back(
         Utils::SmallStringView{typeName},
         Storage::Synchronization::ImportedType{TypeNameString{component.baseTypeName()}},
         Storage::Synchronization::ImportedType{TypeNameString{component.extensionTypeName()}},
@@ -431,7 +460,37 @@ void addType(Storage::Synchronization::Types &types,
         createProperties(component.ownProperties(), enumerationTypes, componentNameWithoutNamespace),
         std::move(functionsDeclarations),
         std::move(signalDeclarations),
-        createEnumeration(enumerations));
+        createEnumeration(enumerations),
+        Storage::Synchronization::ChangeLevel::Full,
+        Utils::SmallString{component.ownDefaultPropertyName()});
+    tracer.end(keyValue("type", type));
+}
+
+using namespace Qt::StringLiterals;
+
+constexpr auto skipLists = std::make_tuple(
+    std::pair{"QtQuick.Templates-cppnative"sv, std::array{"QQuickItem"_L1}});
+
+Utils::span<const QLatin1StringView> getSkipList(std::string_view moduleName)
+{
+    static constexpr Utils::span<const QLatin1StringView> emptySkipList;
+    auto currentSkipList = emptySkipList;
+
+    std::apply(
+        [&](const auto &entry) {
+            if (entry.first == moduleName)
+                currentSkipList = entry.second;
+        },
+        skipLists);
+
+    return currentSkipList;
+}
+
+bool skipType(const QQmlJSExportedScope &object, Utils::span<const QLatin1StringView> skipList)
+{
+    return std::any_of(skipList.begin(), skipList.end(), [&](const QLatin1StringView skip) {
+        return object.scope->internalName() == skip;
+    });
 }
 
 void addTypes(Storage::Synchronization::Types &types,
@@ -440,15 +499,22 @@ void addTypes(Storage::Synchronization::Types &types,
               QmlTypesParser::ProjectStorage &storage,
               const ComponentWithoutNamespaces &componentNameWithoutNamespaces)
 {
+    NanotraceHR::Tracer tracer{"add types"_t, category()};
     types.reserve(Utils::usize(objects) + types.size());
 
-    for (const auto &object : objects)
+    const auto skipList = getSkipList(storage.moduleName(projectData.moduleId));
+
+    for (const auto &object : objects) {
+        if (skipType(object, skipList))
+            continue;
+
         addType(types,
                 projectData.sourceId,
                 projectData.moduleId,
                 object,
                 storage,
                 componentNameWithoutNamespaces);
+    }
 }
 
 } // namespace
@@ -458,6 +524,8 @@ void QmlTypesParser::parse(const QString &sourceContent,
                            Storage::Synchronization::Types &types,
                            const Storage::Synchronization::ProjectData &projectData)
 {
+    NanotraceHR::Tracer tracer{"qmltypes parser parse"_t, category()};
+
     QQmlJSTypeDescriptionReader reader({}, sourceContent);
     QList<QQmlJSExportedScope> components;
     QStringList dependencies;
diff --git a/src/plugins/qmldesigner/designercore/projectstorage/qmltypesparser.h b/src/plugins/qmldesigner/designercore/projectstorage/qmltypesparser.h
index 7c41925f30..4a6427501b 100644
--- a/src/plugins/qmldesigner/designercore/projectstorage/qmltypesparser.h
+++ b/src/plugins/qmldesigner/designercore/projectstorage/qmltypesparser.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include "nonlockingmutex.h"
+#include "projectstoragefwd.h"
 #include "qmltypesparserinterface.h"
 
 namespace Sqlite {
@@ -12,17 +13,13 @@ class Database;
 
 namespace QmlDesigner {
 
-template<typename Database>
-class ProjectStorage;
-
 template<typename ProjectStorage, typename Mutex>
 class SourcePathCache;
 
 class QmlTypesParser final : public QmlTypesParserInterface
 {
 public:
-    using ProjectStorage = QmlDesigner::ProjectStorage<Sqlite::Database>;
-
+    using ProjectStorage = QmlDesigner::ProjectStorage;
 #ifdef QDS_BUILD_QMLPARSER
     QmlTypesParser(ProjectStorage &storage)
         : m_storage{storage}
diff --git a/src/plugins/qmldesigner/designercore/projectstorage/sourcepath.h b/src/plugins/qmldesigner/designercore/projectstorage/sourcepath.h
index 837e58d48a..b655c5cc34 100644
--- a/src/plugins/qmldesigner/designercore/projectstorage/sourcepath.h
+++ b/src/plugins/qmldesigner/designercore/projectstorage/sourcepath.h
@@ -117,6 +117,12 @@ public:
 
     std::ptrdiff_t slashIndex() const { return m_slashIndex; }
 
+    template<typename String>
+    friend void convertToString(String &string, const SourcePath &path)
+    {
+        convertToString(string, path.toStringView());
+    }
+
 private:
     std::ptrdiff_t m_slashIndex = -1;
 };
diff --git a/src/plugins/qmldesigner/designercore/projectstorage/sourcepathcachetypes.h b/src/plugins/qmldesigner/designercore/projectstorage/sourcepathcachetypes.h
index 5feaf30d00..1ef8ba7f21 100644
--- a/src/plugins/qmldesigner/designercore/projectstorage/sourcepathcachetypes.h
+++ b/src/plugins/qmldesigner/designercore/projectstorage/sourcepathcachetypes.h
@@ -125,4 +125,6 @@ public:
     SourceContextId sourceContextId;
 };
 
+using SourceNameAndSourceContextIds = std::vector<SourceNameAndSourceContextId>;
+
 } // namespace QmlDesigner::Cache
diff --git a/src/plugins/qmldesigner/designercore/projectstorage/typeannotationreader.cpp b/src/plugins/qmldesigner/designercore/projectstorage/typeannotationreader.cpp
index b829e9db36..67a63542bc 100644
--- a/src/plugins/qmldesigner/designercore/projectstorage/typeannotationreader.cpp
+++ b/src/plugins/qmldesigner/designercore/projectstorage/typeannotationreader.cpp
@@ -27,11 +27,11 @@ constexpr auto propertyElementName = "Property"_L1;
 constexpr auto extraFileElementName = "ExtraFile"_L1;
 } // namespace
 
-Synchronization::TypeAnnotations TypeAnnotationReader::parseTypeAnnotation(const QString &content,
-                                                                           const QString &directoryPath,
-                                                                           SourceId sourceId)
+Synchronization::TypeAnnotations TypeAnnotationReader::parseTypeAnnotation(
+    const QString &content, const QString &directoryPath, SourceId sourceId, SourceId directorySourceId)
 {
     m_sourceId = sourceId;
+    m_directorySourceId = directorySourceId;
     m_directoryPath = directoryPath;
     m_parserState = ParsingDocument;
     if (!SimpleAbstractStreamReader::readFromSource(content)) {
@@ -178,7 +178,7 @@ TypeAnnotationReader::ParserSate TypeAnnotationReader::readDocument(const QStrin
 TypeAnnotationReader::ParserSate TypeAnnotationReader::readMetaInfoRootElement(const QString &name)
 {
     if (name == typeElementName) {
-        m_typeAnnotations.emplace_back(m_sourceId);
+        m_typeAnnotations.emplace_back(m_sourceId, m_directorySourceId);
         m_itemLibraryEntries = json::array();
         return ParsingType;
     } else {
@@ -277,7 +277,7 @@ void TypeAnnotationReader::readItemLibraryEntryProperty(QStringView name, const
     } else if (name == "category"_L1) {
         m_itemLibraryEntries.back()["category"] = value;
     } else if (name == "libraryIcon"_L1) {
-        m_itemLibraryEntries.back()["iconPath"] = value;
+        m_itemLibraryEntries.back()["iconPath"] = absoluteFilePathForDocument(variant.toString());
     } else if (name == "version"_L1) {
         //   setVersion(value.toString());
     } else if (name == "requiredImport"_L1) {
@@ -427,8 +427,8 @@ void TypeAnnotationReader::setVersion(const QString &versionNumber)
     int minor = 0;
 
     if (!versionNumber.isEmpty()) {
-        int val;
-        bool ok;
+        int val = -1;
+        bool ok = false;
         if (versionNumber.contains('.'_L1)) {
             val = versionNumber.split('.'_L1).constFirst().toInt(&ok);
             major = ok ? val : major;
diff --git a/src/plugins/qmldesigner/designercore/projectstorage/typeannotationreader.h b/src/plugins/qmldesigner/designercore/projectstorage/typeannotationreader.h
index 9332d5bed9..a320493ee2 100644
--- a/src/plugins/qmldesigner/designercore/projectstorage/typeannotationreader.h
+++ b/src/plugins/qmldesigner/designercore/projectstorage/typeannotationreader.h
@@ -49,7 +49,8 @@ public:
 
     Synchronization::TypeAnnotations parseTypeAnnotation(const QString &content,
                                                          const QString &directoryPath,
-                                                         SourceId sourceId);
+                                                         SourceId sourceId,
+                                                         SourceId directorySourceId);
 
     QStringList errors();
 
@@ -124,6 +125,7 @@ private:
     json m_itemLibraryEntries;
     Property m_currentProperty;
     SourceId m_sourceId;
+    SourceId m_directorySourceId;
 };
 
 } // namespace QmlDesigner::Storage
diff --git a/src/plugins/qmldesigner/designercore/tracing/qmldesignertracing.cpp b/src/plugins/qmldesigner/designercore/tracing/qmldesignertracing.cpp
index d49c6156a6..b5798b713d 100644
--- a/src/plugins/qmldesigner/designercore/tracing/qmldesignertracing.cpp
+++ b/src/plugins/qmldesigner/designercore/tracing/qmldesignertracing.cpp
@@ -3,40 +3,48 @@
 
 #include "qmldesignertracing.h"
 
+#include <sqlitebasestatement.h>
+
 namespace QmlDesigner {
+
+using namespace NanotraceHR::Literals;
+
 namespace Tracing {
 
 namespace {
 
 using TraceFile = NanotraceHR::TraceFile<tracingStatus()>;
 
-TraceFile &traceFile()
+auto &traceFile()
 {
-    static TraceFile traceFile{"qml_designer.json"};
-    return traceFile;
+    if constexpr (std::is_same_v<Sqlite::TraceFile, TraceFile>) {
+        return Sqlite::traceFile();
+    } else {
+        static TraceFile traceFile{"tracing.json"};
+        return traceFile;
+    }
 }
 } // namespace
 
 EventQueue &eventQueue()
 {
-    thread_local NanotraceHR::EventQueueData<NanotraceHR::StringViewTraceEvent, 10000, tracingStatus()>
-        stringViewEventQueueData(traceFile());
+    thread_local NanotraceHR::EventQueue<NanotraceHR::StringViewTraceEvent, tracingStatus()>
+        stringViewEventQueue(traceFile());
 
-    return stringViewEventQueueData;
+    return stringViewEventQueue;
 }
 
 EventQueueWithStringArguments &eventQueueWithStringArguments()
 {
-    thread_local NanotraceHR::
-        EventQueueData<NanotraceHR::StringViewWithStringArgumentsTraceEvent, 1000, tracingStatus()>
-            stringViewWithStringArgumentsEventQueueData(traceFile());
+    thread_local NanotraceHR::EventQueue<NanotraceHR::StringViewWithStringArgumentsTraceEvent, tracingStatus()>
+        stringViewWithStringArgumentsEventQueue(traceFile());
 
-    return stringViewWithStringArgumentsEventQueueData;
+    return stringViewWithStringArgumentsEventQueue;
 }
 
 StringEventQueue &stringEventQueue()
 {
-    thread_local NanotraceHR::EventQueueData<NanotraceHR::StringTraceEvent, 1000, tracingStatus()> eventQueue(
+    thread_local NanotraceHR::EventQueue<NanotraceHR::StringTraceEvent, tracingStatus()> eventQueue(
         traceFile());
 
     return eventQueue;
@@ -46,7 +54,6 @@ StringEventQueue &stringEventQueue()
 
 namespace ModelTracing {
 namespace {
-using namespace NanotraceHR::Literals;
 
 thread_local Category category_{"model"_t, Tracing::stringEventQueue(), category};
 
@@ -58,4 +65,27 @@ Category &category()
 }
 
 } // namespace ModelTracing
+
+namespace ProjectStorageTracing {
+
+Category &projectStorageCategory()
+{
+    thread_local Category category{"project storage"_t,
+                                   Tracing::eventQueueWithStringArguments(),
+                                   projectStorageCategory};
+
+    return category;
+}
+
+Category &projectStorageUpdaterCategory()
+{
+    thread_local Category category{"project storage updater"_t,
+                                   Tracing::eventQueueWithStringArguments(),
+                                   projectStorageCategory};
+
+    return category;
+}
+
+} // namespace ProjectStorageTracing
+
 } // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/designercore/tracing/qmldesignertracing.h b/src/plugins/qmldesigner/designercore/tracing/qmldesignertracing.h
index 31058260d6..3a33834c70 100644
--- a/src/plugins/qmldesigner/designercore/tracing/qmldesignertracing.h
+++ b/src/plugins/qmldesigner/designercore/tracing/qmldesignertracing.h
@@ -44,4 +44,22 @@ using AsynchronousToken = Category::AsynchronousTokenType;
 [[gnu::pure]] QMLDESIGNERCORE_EXPORT Category &category();
 
 } // namespace ModelTracing
+
+namespace ProjectStorageTracing {
+constexpr NanotraceHR::Tracing projectStorageTracingStatus()
+{
+#ifdef ENABLE_PROJECT_STORAGE_TRACING
+    return NanotraceHR::Tracing::IsEnabled;
+#else
+    return NanotraceHR::Tracing::IsDisabled;
+#endif
+}
+
+using Category = NanotraceHR::StringViewWithStringArgumentsCategory<projectStorageTracingStatus()>;
+
+[[gnu::pure]] Category &projectStorageCategory();
+
+[[gnu::pure]] Category &projectStorageUpdaterCategory();
+
+} // namespace ProjectStorageTracing
 } // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/documentmanager.cpp b/src/plugins/qmldesigner/documentmanager.cpp
index fcaac762ba..92d80680a9 100644
--- a/src/plugins/qmldesigner/documentmanager.cpp
+++ b/src/plugins/qmldesigner/documentmanager.cpp
@@ -130,7 +130,7 @@ static void openComponentSourcePropertyOfLoader(const ModelNode &modelNode)
     }
 
     Core::EditorManager::openEditor(FilePath::fromString(
-                                        componentModelNode.metaInfo().componentFileName()),
+                                        ModelUtils::componentFilePath(componentModelNode)),
                                     Utils::Id(),
                                     Core::EditorManager::DoNotMakeVisible);
 }
@@ -230,7 +230,9 @@ void DocumentManager::setCurrentDesignDocument(Core::IEditor *editor)
         auto found = m_designDocuments.find(editor);
         if (found == m_designDocuments.end()) {
             auto &inserted = m_designDocuments[editor] = std::make_unique<DesignDocument>(
-                m_projectManager.projectStorageDependencies(), m_externalDependencies);
+                editor->document()->filePath().toString(),
+                m_projectManager.projectStorageDependencies(),
+                m_externalDependencies);
             m_currentDesignDocument = inserted.get();
             m_currentDesignDocument->setEditor(editor);
         } else {
@@ -266,6 +268,11 @@ void DocumentManager::resetPossibleImports()
     }
 }
 
+const GeneratedComponentUtils &DocumentManager::generatedComponentUtils() const
+{
+   return m_generatedComponentUtils;
+}
+
 bool DocumentManager::goIntoComponent(const ModelNode &modelNode)
 {
     QImage image = QmlDesignerPlugin::instance()->viewManager().takeFormEditorScreenshot();
@@ -537,6 +544,13 @@ Utils::FilePath DocumentManager::currentResourcePath()
     if (contentFilePath.exists())
         return contentFilePath;
 
+    const auto project = ProjectManager::startupProject();
+    const QString baseName = project->rootProjectDirectory().baseName() + "Content";
+
+    contentFilePath = resourcePath.pathAppended(baseName);
+    if (contentFilePath.exists())
+        return contentFilePath;
+
     return resourcePath;
 }
 
diff --git a/src/plugins/qmldesigner/documentmanager.h b/src/plugins/qmldesigner/documentmanager.h
index 090630e5fe..6447694339 100644
--- a/src/plugins/qmldesigner/documentmanager.h
+++ b/src/plugins/qmldesigner/documentmanager.h
@@ -5,6 +5,8 @@
 
 #include "qmldesigner_global.h"
 
+#include <generatedcomponentutils.h>
+
 #include <QObject>
 #include <QList>
 #include <QLoggingCategory>
@@ -31,6 +33,7 @@ public:
                     ExternalDependenciesInterface &externalDependencies)
         : m_projectManager{projectManager}
         , m_externalDependencies{externalDependencies}
+        , m_generatedComponentUtils(externalDependencies)
     {}
 
     void setCurrentDesignDocument(Core::IEditor *editor);
@@ -41,6 +44,8 @@ public:
 
     void resetPossibleImports();
 
+    const GeneratedComponentUtils &generatedComponentUtils() const;
+
     static bool goIntoComponent(const ModelNode &modelNode);
     static void goIntoComponent(const QString &fileName);
 
@@ -64,6 +69,7 @@ private:
     QPointer<DesignDocument> m_currentDesignDocument;
     QmlDesignerProjectManager &m_projectManager;
     ExternalDependenciesInterface &m_externalDependencies;
+    GeneratedComponentUtils m_generatedComponentUtils;
 };
 
 } // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/documentwarningwidget.cpp b/src/plugins/qmldesigner/documentwarningwidget.cpp
index 9fb2b87635..e1b8346a66 100644
--- a/src/plugins/qmldesigner/documentwarningwidget.cpp
+++ b/src/plugins/qmldesigner/documentwarningwidget.cpp
@@ -39,8 +39,7 @@ DocumentWarningWidget::DocumentWarningWidget(QWidget *parent)
     m_messageLabel->setWordWrap(true);
     m_messageLabel->setTextInteractionFlags(Qt::TextSelectableByMouse);
 
-    m_ignoreWarningsCheckBox->setText(tr("Always ignore these warnings about features "
-                                         "not supported by Qt Quick Designer."));
+    m_ignoreWarningsCheckBox->setText(tr("Turn off warnings about unsupported Qt Design Studio features."));
 
     connect(m_navigateLabel, &QLabel::linkActivated, this, [this](const QString &link) {
         if (link == QLatin1String("goToCode")) {
@@ -93,7 +92,7 @@ void DocumentWarningWidget::refreshContent()
         m_ignoreWarningsCheckBox->hide();
         m_continueButton->setText(tr("OK"));
     } else {
-        m_headerLabel->setText(tr("This QML file contains features which are not supported by Qt Quick Designer at:"));
+        m_headerLabel->setText(tr("This QML file contains features which are not supported by Qt Design Studio at:"));
         {
             QSignalBlocker blocker(m_ignoreWarningsCheckBox);
             m_ignoreWarningsCheckBox->setChecked(!warningsEnabled());
diff --git a/src/plugins/qmldesigner/puppetenvironmentbuilder.cpp b/src/plugins/qmldesigner/puppetenvironmentbuilder.cpp
index 6e8a2b6024..7819c6b49d 100644
--- a/src/plugins/qmldesigner/puppetenvironmentbuilder.cpp
+++ b/src/plugins/qmldesigner/puppetenvironmentbuilder.cpp
@@ -126,7 +126,7 @@ void PuppetEnvironmentBuilder::addRendering() const
 {
     m_environment.set("QML_BAD_GUI_RENDER_LOOP", "true");
     m_environment.set("QML_PUPPET_MODE", "true");
-    m_environment.set("QML_DISABLE_DISK_CACHE", "true");
+    //m_environment.set("QML_DISABLE_DISK_CACHE", "true");
     m_environment.set("QMLPUPPET_RENDER_EFFECTS", "true");
     if (!m_environment.hasKey("QT_SCREEN_SCALE_FACTORS") && !m_environment.hasKey("QT_SCALE_FACTOR"))
         m_environment.set("QT_AUTO_SCREEN_SCALE_FACTOR", "1");
diff --git a/src/plugins/qmldesigner/qmldesignerconstants.h b/src/plugins/qmldesigner/qmldesignerconstants.h
index db63d894fe..fb691097f7 100644
--- a/src/plugins/qmldesigner/qmldesignerconstants.h
+++ b/src/plugins/qmldesigner/qmldesignerconstants.h
@@ -78,15 +78,19 @@ inline constexpr char EDIT3D_SNAP_CONFIG[] = "QmlDesigner.Editor3D.SnapConfig";
 inline constexpr char EDIT3D_CAMERA_SPEED_CONFIG[] = "QmlDesigner.Editor3D.CameraSpeedConfig";
 
 inline constexpr char QML_DESIGNER_SUBFOLDER[] = "/designer/";
-inline constexpr char COMPONENT_BUNDLES_FOLDER[] = "/ComponentBundles";
+inline constexpr char COMPONENT_BUNDLES_TYPE[] = "ComponentBundles";
+inline constexpr char GENERATED_COMPONENTS_FOLDER[] = "GeneratedComponents";
 inline constexpr char COMPONENT_BUNDLES_ASSET_REF_FILE[] = "_asset_ref.json";
-inline constexpr char QUICK_3D_ASSETS_FOLDER[] = "/Quick3DAssets";
+inline constexpr char OLD_QUICK_3D_ASSETS_FOLDER[] = "Quick3DAssets";
+inline constexpr char QUICK_3D_COMPONENTS_FOLDER[] = "QtQuick3D";
 inline constexpr char QUICK_3D_ASSET_LIBRARY_ICON_SUFFIX[] = "_libicon";
 inline constexpr char QUICK_3D_ASSET_IMPORT_DATA_NAME[] = "_importdata.json";
 inline constexpr char QUICK_3D_ASSET_IMPORT_DATA_OPTIONS_KEY[] = "import_options";
 inline constexpr char QUICK_3D_ASSET_IMPORT_DATA_SOURCE_KEY[] = "source_scene";
-inline constexpr char DEFAULT_ASSET_IMPORT_FOLDER[] = "/asset_imports";
-inline constexpr char DEFAULT_EFFECTS_IMPORT_FOLDER[] = "/asset_imports/Effects";
+inline constexpr char OLD_ASSET_IMPORT_FOLDER[] = "asset_imports";
+inline constexpr char OLD_EFFECTS_IMPORT_FOLDER[] = "/asset_imports/Effects";
+inline constexpr char OLD_EFFECTS_FOLDER[] = "Effects";
+inline constexpr char COMPOSED_EFFECTS_TYPE[] = "ComposedEffects";
 inline constexpr char MATERIAL_LIB_ID[] = "__materialLibrary__";
 
 inline constexpr char MIME_TYPE_ITEM_LIBRARY_INFO[]
diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp
index 601cf96681..f1b8ecdfa7 100644
--- a/src/plugins/qmldesigner/qmldesignerplugin.cpp
+++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp
@@ -625,12 +625,14 @@ void QmlDesignerPlugin::enforceDelayedInitialize()
         return;
 
     // adding default path to item library plugins
-    const QString postfix = Utils::HostOsInfo::isMacHost() ? QString("/QmlDesigner")
-                                                           : QString("/qmldesigner");
-    const QStringList pluginPaths = Utils::transform(ExtensionSystem::PluginManager::pluginPaths(),
-                                                     [postfix](const QString &p) {
-                                                         return QString(p + postfix);
-                                                     });
+    const QString postfix = Utils::HostOsInfo::isMacHost()
+                                ? QString("QmlDesigner")
+                                : QString("qmldesigner");
+    const QStringList pluginPaths =
+        Utils::transform(ExtensionSystem::PluginManager::pluginPaths(),
+                         [postfix](const Utils::FilePath &p) {
+                           return (p / postfix).toFSPathString();
+                         });
 
 #ifndef QDS_USE_PROJECTSTORAGE
     MetaInfo::initializeGlobal(pluginPaths, d->externalDependencies);
diff --git a/src/plugins/qmldesigner/qmldesignerprojectmanager.cpp b/src/plugins/qmldesigner/qmldesignerprojectmanager.cpp
index 7e28849fbb..9602bf050f 100644
--- a/src/plugins/qmldesigner/qmldesignerprojectmanager.cpp
+++ b/src/plugins/qmldesigner/qmldesignerprojectmanager.cpp
@@ -41,6 +41,7 @@
 
 #include <QDirIterator>
 #include <QFileSystemWatcher>
+#include <QLibraryInfo>
 #include <QQmlEngine>
 
 using namespace std::chrono;
@@ -180,7 +181,7 @@ public:
               pathCache.sourceId(SourcePath{project->projectDirectory().toString() + "/."}).internalId())}
     {}
     Sqlite::Database database;
-    ProjectStorage<Sqlite::Database> storage{database, database.isInitialized()};
+    ProjectStorage storage{database, database.isInitialized()};
     PathCacheType pathCache{storage};
     FileSystem fileSystem{pathCache};
     FileStatusCache fileStatusCache{fileSystem};
@@ -281,7 +282,7 @@ AsynchronousImageCache &QmlDesignerProjectManager::asynchronousImageCache()
 }
 
 namespace {
-[[maybe_unused]] ProjectStorage<Sqlite::Database> *dummyProjectStorage()
+[[maybe_unused]] ProjectStorage *dummyProjectStorage()
 {
     return nullptr;
 }
@@ -374,6 +375,10 @@ void collectQmldirPaths(const QString &path, QStringList &qmldirPaths)
 {
     QDirIterator dirIterator{path, QDir::Dirs | QDir::NoDotAndDotDot, QDirIterator::Subdirectories};
 
+    QString rootQmldirPath = path + "/qmldir";
+    if (!skipPath(path) && QFileInfo::exists(rootQmldirPath))
+        qmldirPaths.push_back(path);
+
     while (dirIterator.hasNext()) {
         auto directoryPath = dirIterator.next();
 
@@ -401,17 +406,16 @@ void collectQmldirPaths(const QString &path, QStringList &qmldirPaths)
         collectQmldirPaths(qmlPath(target).toString(), qmldirPaths);
 }
 
-[[maybe_unused]] void qtQmldirPathsForLiteDesigner(::ProjectExplorer::Target *target,
-                                                   QStringList &qmldirPaths)
+[[maybe_unused]] void qtQmldirPathsForLiteDesigner(QStringList &qmldirPaths)
 {
     if constexpr (useProjectStorage()) {
-        auto qmlRootPath = qmlPath(target).toString();
+        auto qmlRootPath = QLibraryInfo::path(QLibraryInfo::QmlImportsPath);
         collectQmldirPaths(qmlRootPath + "/QtQml", qmldirPaths);
         collectQmldirPaths(qmlRootPath + "/QtQuick", qmldirPaths);
     }
 }
 
-QStringList directories(::ProjectExplorer::Target *target)
+[[maybe_unused]] QStringList directories(::ProjectExplorer::Target *target)
 {
     if (!target)
         return {};
@@ -419,12 +423,8 @@ QStringList directories(::ProjectExplorer::Target *target)
     QStringList qmldirPaths;
     qmldirPaths.reserve(100);
 
-    if constexpr (isUsingQmlDesignerLite()) {
-        qtQmldirPathsForLiteDesigner(target, qmldirPaths);
-    } else {
-        qtQmldirPaths(target, qmldirPaths);
-        projectQmldirPaths(target, qmldirPaths);
-    }
+    qtQmldirPaths(target, qmldirPaths);
+    projectQmldirPaths(target, qmldirPaths);
 
     std::sort(qmldirPaths.begin(), qmldirPaths.end());
     qmldirPaths.erase(std::unique(qmldirPaths.begin(), qmldirPaths.end()), qmldirPaths.end());
@@ -432,7 +432,20 @@ QStringList directories(::ProjectExplorer::Target *target)
     return qmldirPaths;
 }
 
-QStringList qmlTypes(::ProjectExplorer::Target *target)
+[[maybe_unused]] QStringList directoriesForLiteDesigner()
+{
+    QStringList qmldirPaths;
+    qmldirPaths.reserve(100);
+
+    qtQmldirPathsForLiteDesigner(qmldirPaths);
+
+    std::sort(qmldirPaths.begin(), qmldirPaths.end());
+    qmldirPaths.erase(std::unique(qmldirPaths.begin(), qmldirPaths.end()), qmldirPaths.end());
+
+    return qmldirPaths;
+}
+
+[[maybe_unused]] QStringList qmlTypes(::ProjectExplorer::Target *target)
 {
     if (!target)
         return {};
@@ -440,10 +453,26 @@ QStringList qmlTypes(::ProjectExplorer::Target *target)
     QStringList qmldirPaths;
     qmldirPaths.reserve(2);
 
-    const QString installDirectory = qmlPath(target).toString();
+    const QString qmlRootPath = qmlPath(target).toString();
 
-    qmldirPaths.append(installDirectory + "/builtins.qmltypes");
-    qmldirPaths.append(installDirectory + "/jsroot.qmltypes");
+    qmldirPaths.append(qmlRootPath + "/builtins.qmltypes");
+    qmldirPaths.append(qmlRootPath + "/jsroot.qmltypes");
+
+    qmldirPaths.append(
+        Core::ICore::resourcePath("qmldesigner/projectstorage/fake.qmltypes").toString());
+
+    return qmldirPaths;
+}
+
+[[maybe_unused]] QStringList qmlTypesForLiteDesigner()
+{
+    QStringList qmldirPaths;
+    qmldirPaths.reserve(2);
+
+    const auto qmlRootPath = QLibraryInfo::path(QLibraryInfo::QmlImportsPath);
+
+    qmldirPaths.append(qmlRootPath + "/builtins.qmltypes");
+    qmldirPaths.append(qmlRootPath + "/jsroot.qmltypes");
 
     qmldirPaths.append(
         Core::ICore::resourcePath("qmldesigner/projectstorage/fake.qmltypes").toString());
@@ -461,6 +490,11 @@ QString propertyEditorResourcesPath()
     return Core::ICore::resourcePath("qmldesigner/propertyEditorQmlSources").toString();
 }
 
+QString qtCreatorItemLibraryPath()
+{
+    return Core::ICore::resourcePath("qmldesigner/itemLibrary").toString();
+}
+
 } // namespace
 
 void QmlDesignerProjectManager::projectAdded(::ProjectExplorer::Project *project)
@@ -594,9 +628,17 @@ void QmlDesignerProjectManager::update()
     if (!m_projectData || !m_projectData->projectStorageData)
         return;
 
-    m_projectData->projectStorageData->updater.update(directories(m_projectData->activeTarget),
-                                                      qmlTypes(m_projectData->activeTarget),
-                                                      propertyEditorResourcesPath());
+    if constexpr (isUsingQmlDesignerLite()) {
+        m_projectData->projectStorageData->updater.update(directoriesForLiteDesigner(),
+                                                          qmlTypesForLiteDesigner(),
+                                                          propertyEditorResourcesPath(),
+                                                          {qtCreatorItemLibraryPath()});
+    } else {
+        m_projectData->projectStorageData->updater.update(directories(m_projectData->activeTarget),
+                                                          qmlTypes(m_projectData->activeTarget),
+                                                          propertyEditorResourcesPath(),
+                                                          {qtCreatorItemLibraryPath()});
+    }
 }
 
 } // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/qtquickplugin/quick.metainfo b/src/plugins/qmldesigner/qtquickplugin/quick.metainfo
index 3f3cdb7910..46cb42b60d 100644
--- a/src/plugins/qmldesigner/qtquickplugin/quick.metainfo
+++ b/src/plugins/qmldesigner/qtquickplugin/quick.metainfo
@@ -374,7 +374,6 @@ MetaInfo {
             name: "Keyframe"
             category: "none"
             version: "1.0"
-            requiredImport: "none"
         }
     }
 
@@ -386,7 +385,6 @@ MetaInfo {
             name: "KeyframeGroup"
             category: "none"
             version: "1.0"
-            requiredImport: "none"
         }
     }
 
diff --git a/src/plugins/qmldesigner/settingspage.cpp b/src/plugins/qmldesigner/settingspage.cpp
index 344e2700d9..17c75a0285 100644
--- a/src/plugins/qmldesigner/settingspage.cpp
+++ b/src/plugins/qmldesigner/settingspage.cpp
@@ -135,7 +135,7 @@ SettingsPageWidget::SettingsPageWidget(ExternalDependencies &externalDependencie
 
     m_useDefaultPuppetRadioButton = new QRadioButton(tr("Use fallback QML emulation layer"));
     m_useDefaultPuppetRadioButton->setToolTip(
-        tr("If you select this radio button, Qt Quick Designer always uses the "
+        tr("If you select this radio button, Qt Design Studio always uses the "
            "QML emulation layer (QML Puppet) located at the following path."));
     m_useDefaultPuppetRadioButton->setChecked(true);
 
@@ -167,7 +167,7 @@ SettingsPageWidget::SettingsPageWidget(ExternalDependencies &externalDependencie
     m_designerWarningsCheckBox = new QCheckBox(
         tr("Warn about unsupported features in .ui.qml files"));
     m_designerWarningsCheckBox->setToolTip(
-        tr("Warns about QML features that are not properly supported by the Qt Quick Designer."));
+        tr("Warns about QML features that are not properly supported by the Qt Design Studio."));
 
     m_designerWarningsUiQmlfiles = new QCheckBox(
         tr("Warn about using .qml files instead of .ui.qml files"));
diff --git a/src/plugins/qmldesigner/shortcutmanager.cpp b/src/plugins/qmldesigner/shortcutmanager.cpp
index 961aa1c952..833466a2aa 100644
--- a/src/plugins/qmldesigner/shortcutmanager.cpp
+++ b/src/plugins/qmldesigner/shortcutmanager.cpp
@@ -144,7 +144,8 @@ void ShortCutManager::registerActions(const Core::Context &qmlDesignerMainContex
     Core::ActionContainer *exportMenu = Core::ActionManager::actionContainer(
         QmlProjectManager::Constants::EXPORT_MENU);
 
-    exportMenu->addAction(command, QmlProjectManager::Constants::G_EXPORT_CONVERT);
+    if (exportMenu)
+        exportMenu->addAction(command, QmlProjectManager::Constants::G_EXPORT_CONVERT);
 
     //Close Editor
     Core::ActionManager::registerAction(&m_closeCurrentEditorAction, Core::Constants::CLOSE, qmlDesignerMainContext);
diff --git a/src/plugins/qmldesigner/utils/asset.cpp b/src/plugins/qmldesigner/utils/asset.cpp
index 2984a4d890..ec1e4312e4 100644
--- a/src/plugins/qmldesigner/utils/asset.cpp
+++ b/src/plugins/qmldesigner/utils/asset.cpp
@@ -1,15 +1,19 @@
 // Copyright (C) 2022 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#include <QImageReader>
-
 #include "asset.h"
 
+#include "hdrimage.h"
+
+#include <QImageReader>
+#include <QPixmap>
+
 namespace QmlDesigner {
 
 Asset::Asset(const QString &filePath)
     : m_filePath(filePath)
 {
+    m_fileName = filePath.split('/').last();
     const QStringList split = filePath.split('.');
     if (split.size() > 1)
         m_suffix = "*." + split.last().toLower();
@@ -105,6 +109,19 @@ bool Asset::isSupported(const QString &path)
     return supportedSuffixes().contains(path);
 }
 
+QPixmap Asset::pixmap(const QSize &size) const
+{
+    if (!isImage() && !isHdrFile())
+        return {};
+
+    QPixmap icon = isHdrFile() ? HdrImage{m_filePath}.toPixmap() : QPixmap{m_filePath};
+
+    if (size.isValid())
+        icon = icon.scaled(size, Qt::KeepAspectRatio);
+
+    return icon;
+}
+
 Asset::Type Asset::type() const
 {
     return m_type;
@@ -175,6 +192,11 @@ const QString Asset::id() const
     return m_filePath;
 }
 
+const QString Asset::fileName() const
+{
+    return m_fileName;
+}
+
 bool Asset::isSupported() const
 {
     return m_type != Asset::Type::Unknown;
diff --git a/src/plugins/qmldesigner/utils/asset.h b/src/plugins/qmldesigner/utils/asset.h
index cb09f3a5ee..a5c5899f34 100644
--- a/src/plugins/qmldesigner/utils/asset.h
+++ b/src/plugins/qmldesigner/utils/asset.h
@@ -3,8 +3,11 @@
 
 #pragma once
 
+#include <QSize>
 #include <QString>
 
+QT_FORWARD_DECLARE_CLASS(QPixmap)
+
 namespace QmlDesigner {
 
 class Asset
@@ -37,7 +40,9 @@ public:
 
     const QString suffix() const;
     const QString id() const;
+    const QString fileName() const;
     bool hasSuffix() const;
+    QPixmap pixmap(const QSize &size = {}) const;
 
     Type type() const;
     bool isImage() const;
@@ -58,6 +63,7 @@ private:
     void resolveType();
 
     QString m_filePath;
+    QString m_fileName;
     QString m_suffix;
     Type m_type = Unknown;
 };
diff --git a/src/plugins/qmldesigner/utils/imageutils.cpp b/src/plugins/qmldesigner/utils/imageutils.cpp
index 8fa3131cd3..42df6184b9 100644
--- a/src/plugins/qmldesigner/utils/imageutils.cpp
+++ b/src/plugins/qmldesigner/utils/imageutils.cpp
@@ -11,7 +11,7 @@
 
 namespace QmlDesigner {
 
-QString ImageUtils::imageInfo(const QSize &dimensions, qint64 sizeInBytes)
+QString ImageUtils::imageInfoString(const QSize &dimensions, qint64 sizeInBytes)
 {
     return QLatin1String("%1 x %2\n%3")
             .arg(QString::number(dimensions.width()),
@@ -20,7 +20,7 @@ QString ImageUtils::imageInfo(const QSize &dimensions, qint64 sizeInBytes)
                      sizeInBytes, 2, QLocale::DataSizeTraditionalFormat));
 }
 
-QString QmlDesigner::ImageUtils::imageInfo(const QString &path)
+QPair<QSize, qint64> QmlDesigner::ImageUtils::imageInfo(const QString &path)
 {
     QFileInfo info(path);
     if (!info.exists())
@@ -52,7 +52,13 @@ QString QmlDesigner::ImageUtils::imageInfo(const QString &path)
     if (width <= 0 || height <= 0)
         return {};
 
-    return imageInfo(QSize(width, height), info.size());
+    return {QSize(width, height), info.size()};
+}
+
+QString ImageUtils::imageInfoString(const QString &path)
+{
+    QPair<QSize, qint64> info = imageInfo(path);
+    return imageInfoString(info.first, info.second);
 }
 
 } // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/utils/imageutils.h b/src/plugins/qmldesigner/utils/imageutils.h
index a4036614a3..dae64423bb 100644
--- a/src/plugins/qmldesigner/utils/imageutils.h
+++ b/src/plugins/qmldesigner/utils/imageutils.h
@@ -12,8 +12,9 @@ class ImageUtils
 public:
     ImageUtils();
 
-    static QString imageInfo(const QSize &dimensions, qint64 sizeInBytes);
-    static QString imageInfo(const QString &path);
+    static QPair<QSize, qint64> imageInfo(const QString &path);
+    static QString imageInfoString(const QString &path);
+    static QString imageInfoString(const QSize &dimensions, qint64 sizeInBytes);
 };
 
 } // namespace QmlDesigner
diff --git a/src/plugins/qmldesignerbase/utils/designerpaths.cpp b/src/plugins/qmldesignerbase/utils/designerpaths.cpp
index da4ce8ce08..f938c58e04 100644
--- a/src/plugins/qmldesignerbase/utils/designerpaths.cpp
+++ b/src/plugins/qmldesignerbase/utils/designerpaths.cpp
@@ -20,9 +20,7 @@ Utils::FilePath defaultExamplesPath()
 
 Utils::FilePath defaultBundlesPath()
 {
-    QStandardPaths::StandardLocation location = Utils::HostOsInfo::isMacHost()
-                                                    ? QStandardPaths::HomeLocation
-                                                    : QStandardPaths::DocumentsLocation;
+    QStandardPaths::StandardLocation location = QStandardPaths::DocumentsLocation;
 
     return Utils::FilePath::fromString(QStandardPaths::writableLocation(location))
         .pathAppended("QtDesignStudio/bundles");
diff --git a/src/plugins/qmldesignerlite/CMakeLists.txt b/src/plugins/qmldesignerlite/CMakeLists.txt
index 95c1035b09..67e007ae65 100644
--- a/src/plugins/qmldesignerlite/CMakeLists.txt
+++ b/src/plugins/qmldesignerlite/CMakeLists.txt
@@ -10,6 +10,7 @@ add_feature_info("Treat warnings as errors in QmlDesigner" ${ENABLE_COMPILE_WARN
 
 add_qtc_plugin(QmlDesignerLite
   PLUGIN_DEPENDS QmlDesigner
+  CONDITION TARGET QmlDesigner
   SOURCES
     qmldesignerliteplugin.cpp qmldesignerliteplugin.h
 )
diff --git a/src/plugins/qmljseditor/qmljseditingsettingspage.cpp b/src/plugins/qmljseditor/qmljseditingsettingspage.cpp
index 11c7985fd1..f12d1ea57a 100644
--- a/src/plugins/qmljseditor/qmljseditingsettingspage.cpp
+++ b/src/plugins/qmljseditor/qmljseditingsettingspage.cpp
@@ -35,6 +35,7 @@ const char FOLD_AUX_DATA[] = "QmlJSEditor.FoldAuxData";
 const char USE_QMLLS[] = "QmlJSEditor.UseQmlls";
 const char USE_LATEST_QMLLS[] = "QmlJSEditor.UseLatestQmlls";
 const char DISABLE_BUILTIN_CODEMODEL[] = "QmlJSEditor.DisableBuiltinCodemodel";
+const char GENERATE_QMLLS_INI_FILES[] = "QmlJSEditor.GenerateQmllsIniFiles";
 const char UIQML_OPEN_MODE[] = "QmlJSEditor.openUiQmlMode";
 const char FORMAT_COMMAND[] = "QmlJSEditor.formatCommand";
 const char FORMAT_COMMAND_OPTIONS[] = "QmlJSEditor.formatCommandOptions";
@@ -107,6 +108,8 @@ void QmlJsEditingSettings::fromSettings(QtcSettings *settings)
     m_qmllsSettings.useLatestQmlls = settings->value(USE_LATEST_QMLLS, QVariant(false)).toBool();
     m_qmllsSettings.disableBuiltinCodemodel
         = settings->value(DISABLE_BUILTIN_CODEMODEL, QVariant(false)).toBool();
+    m_qmllsSettings.generateQmllsIniFiles
+        = settings->value(GENERATE_QMLLS_INI_FILES, QVariant(false)).toBool();
     m_formatCommand = settings->value(FORMAT_COMMAND, {}).toString();
     m_formatCommandOptions = settings->value(FORMAT_COMMAND_OPTIONS, {}).toString();
     m_useCustomFormatCommand = settings->value(CUSTOM_COMMAND, QVariant(false)).toBool();
@@ -135,6 +138,7 @@ void QmlJsEditingSettings::toSettings(QtcSettings *settings) const
     settings->setValue(USE_QMLLS, m_qmllsSettings.useQmlls);
     settings->setValue(USE_LATEST_QMLLS, m_qmllsSettings.useLatestQmlls);
     settings->setValue(DISABLE_BUILTIN_CODEMODEL, m_qmllsSettings.disableBuiltinCodemodel);
+    settings->setValue(GENERATE_QMLLS_INI_FILES, m_qmllsSettings.generateQmllsIniFiles);
     settings->setValueWithDefault(FORMAT_COMMAND, m_formatCommand, {});
     settings->setValueWithDefault(FORMAT_COMMAND_OPTIONS, m_formatCommandOptions, {});
     settings->setValueWithDefault(CUSTOM_COMMAND, m_useCustomFormatCommand, false);
@@ -402,9 +406,14 @@ public:
         useLatestQmlls = new QCheckBox(Tr::tr("Use QML Language Server from latest Qt version"));
         useLatestQmlls->setChecked(s.qmllsSettings().useLatestQmlls);
         useLatestQmlls->setEnabled(s.qmllsSettings().useQmlls);
+        generateQmllsIniFiles = new QCheckBox(
+            Tr::tr("Generate QML Language Server .qmlls.ini configurations for new projects."));
+        generateQmllsIniFiles->setChecked(s.qmllsSettings().generateQmllsIniFiles);
+        generateQmllsIniFiles->setEnabled(s.qmllsSettings().useQmlls);
         QObject::connect(useQmlls, &QCheckBox::stateChanged, this, [this](int checked) {
             useLatestQmlls->setEnabled(checked != Qt::Unchecked);
             disableBuiltInCodemodel->setEnabled(checked != Qt::Unchecked);
+            generateQmllsIniFiles->setEnabled(checked != Qt::Unchecked);
         });
 
         useCustomAnalyzer = new QCheckBox(Tr::tr("Use customized static analyzer"));
@@ -457,7 +466,7 @@ public:
             },
             Group{
                 title(Tr::tr("QML Language Server")),
-                Column{useQmlls, disableBuiltInCodemodel , useLatestQmlls},
+                Column{useQmlls, disableBuiltInCodemodel , useLatestQmlls, generateQmllsIniFiles},
             },
             Group {
                 title(Tr::tr("Static Analyzer")),
@@ -503,6 +512,7 @@ public:
         s.qmllsSettings().useQmlls = useQmlls->isChecked();
         s.qmllsSettings().disableBuiltinCodemodel = disableBuiltInCodemodel->isChecked();
         s.qmllsSettings().useLatestQmlls = useLatestQmlls->isChecked();
+        s.qmllsSettings().generateQmllsIniFiles = generateQmllsIniFiles->isChecked();
         s.setUseCustomAnalyzer(useCustomAnalyzer->isChecked());
         QSet<int> disabled;
         QSet<int> disabledForNonQuickUi;
@@ -561,6 +571,7 @@ private:
     QCheckBox *useQmlls;
     QCheckBox *useLatestQmlls;
     QCheckBox *disableBuiltInCodemodel;
+    QCheckBox *generateQmllsIniFiles;
     QComboBox *uiQmlOpenComboBox;
     QCheckBox *useCustomAnalyzer;
     QTreeView *analyzerMessagesView;
diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp
index 79d24891c7..540e5559de 100644
--- a/src/plugins/qmljseditor/qmljseditor.cpp
+++ b/src/plugins/qmljseditor/qmljseditor.cpp
@@ -52,7 +52,6 @@
 #include <texteditor/codeassist/genericproposalmodel.h>
 #include <texteditor/colorpreviewhoverhandler.h>
 #include <texteditor/snippets/snippetprovider.h>
-#include <texteditor/texteditoractionhandler.h>
 #include <texteditor/textmark.h>
 
 #include <utils/algorithm.h>
@@ -1169,12 +1168,12 @@ QmlJSEditorFactory::QmlJSEditorFactory(Utils::Id _id)
     addHoverHandler(new ColorPreviewHoverHandler);
     setCompletionAssistProvider(new QmlJSCompletionAssistProvider);
 
-    setEditorActionHandlers(TextEditorActionHandler::Format
-                            | TextEditorActionHandler::UnCommentSelection
-                            | TextEditorActionHandler::UnCollapseAll
-                            | TextEditorActionHandler::FollowSymbolUnderCursor
-                            | TextEditorActionHandler::RenameSymbol
-                            | TextEditorActionHandler::FindUsage);
+    setOptionalActionMask(OptionalActions::Format
+                            | OptionalActions::UnCommentSelection
+                            | OptionalActions::UnCollapseAll
+                            | OptionalActions::FollowSymbolUnderCursor
+                            | OptionalActions::RenameSymbol
+                            | OptionalActions::FindUsage);
 }
 
 static void decorateEditor(TextEditorWidget *editor)
diff --git a/src/plugins/qmljseditor/qmljseditordocument.cpp b/src/plugins/qmljseditor/qmljseditordocument.cpp
index 18a9c4d0f2..cef1aefcd2 100644
--- a/src/plugins/qmljseditor/qmljseditordocument.cpp
+++ b/src/plugins/qmljseditor/qmljseditordocument.cpp
@@ -750,6 +750,9 @@ static Utils::FilePath qmllsForFile(const Utils::FilePath &file,
 
 void QmlJSEditorDocumentPrivate::settingsChanged()
 {
+    if (q->isTemporary())
+        return;
+
     Utils::FilePath newQmlls = qmllsForFile(q->filePath(), ModelManagerInterface::instance());
     if (m_qmllsStatus.qmllsPath == newQmlls)
         return;
diff --git a/src/plugins/qmljseditor/qmljsfindreferences.cpp b/src/plugins/qmljseditor/qmljsfindreferences.cpp
index 3f5d53d60f..8934865783 100644
--- a/src/plugins/qmljseditor/qmljsfindreferences.cpp
+++ b/src/plugins/qmljseditor/qmljsfindreferences.cpp
@@ -599,6 +599,17 @@ protected:
         return true;
     }
 
+    bool visit(UiEnumDeclaration *node) override
+    {
+        if (containsOffset(node->identifierToken)) {
+            _name = node->name.toString();
+            _scope = _doc->bind()->findQmlObject(_objectNode);
+            _targetValue = _scopeChain->context()->lookupType(_doc.data(), QStringList(_name));
+            return false;
+        }
+        return true;
+    }
+
     bool visit(FunctionDeclaration *node) override
     {
         return visit(static_cast<FunctionExpression *>(node));
diff --git a/src/plugins/qmljseditor/qmljshighlighter.cpp b/src/plugins/qmljseditor/qmljshighlighter.cpp
index 4fd1da274e..8000baf57f 100644
--- a/src/plugins/qmljseditor/qmljshighlighter.cpp
+++ b/src/plugins/qmljseditor/qmljshighlighter.cpp
@@ -108,10 +108,6 @@ void QmlJSHighlighter::highlightBlock(const QString &text)
                             break;
                         }
                     }
-                    if (QStringView(text).mid(token.offset, token.length) == QLatin1String("enum")) {
-                        setFormat(token.offset, token.length, formatForCategory(C_KEYWORD));
-                        break;
-                    }
                 } else if (index > 0 && maybeQmlBuiltinType(spell)) {
                     const Token &previousToken = tokens.at(index - 1);
                     if (previousToken.is(Token::Identifier)
diff --git a/src/plugins/qmljseditor/qmljshoverhandler.cpp b/src/plugins/qmljseditor/qmljshoverhandler.cpp
index 9dcc220e25..650592ff48 100644
--- a/src/plugins/qmljseditor/qmljshoverhandler.cpp
+++ b/src/plugins/qmljseditor/qmljshoverhandler.cpp
@@ -294,7 +294,9 @@ bool QmlJSHoverHandler::matchColorItem(const ScopeChain &scopeChain,
     if (auto binding = AST::cast<const AST::UiScriptBinding *>(member)) {
         if (binding->qualifiedId && posIsInSource(pos, binding->statement)) {
             value = scopeChain.evaluate(binding->qualifiedId);
-            if (value && value->asColorValue()) {
+            if (value && (value->asColorValue()
+                          || (value->asCppComponentValue()
+                              && value->asCppComponentValue()->className() == "color"))) {
                 color = textAt(qmlDocument,
                                binding->statement->firstSourceLocation(),
                                binding->statement->lastSourceLocation());
diff --git a/src/plugins/qmljseditor/qmljssemantichighlighter.cpp b/src/plugins/qmljseditor/qmljssemantichighlighter.cpp
index 67e14dfbcd..3157499713 100644
--- a/src/plugins/qmljseditor/qmljssemantichighlighter.cpp
+++ b/src/plugins/qmljseditor/qmljssemantichighlighter.cpp
@@ -348,6 +348,13 @@ protected:
         return visit(static_cast<FunctionExpression *>(ast));
     }
 
+    bool visit(UiEnumMemberList *ast) override
+    {
+        for (auto it = ast; it; it = it->next)
+            addUse(it->memberToken, SemanticHighlighter::FieldType);
+        return true;
+    }
+
     bool visit(PatternElement *ast) override
     {
         if (ast->isVariableDeclaration())
@@ -361,6 +368,47 @@ protected:
         return false;
     }
 
+    bool visit(FieldMemberExpression *ast) override
+    {
+        if (ast->name.isEmpty() || ast->name.first().isLower())
+            return true;
+        // we only support IdentifierExpression.FieldMemberExpression (enum)
+        const FieldMemberExpression *right = ast;
+        if (const IdentifierExpression *idExp = cast<IdentifierExpression *>(ast->base)) {
+            const ObjectValue *scope = nullptr;
+            const Value *value = m_scopeChain.lookup(idExp->name.toString(), &scope);
+            if (auto aov = value->asAstObjectValue()) {
+                const ObjectValue *inObject = nullptr;
+                const Value *enumValue = aov->lookupMember(right->name.toString(),
+                                                           m_scopeChain.context(), &inObject);
+                if (enumValue && enumValue->asNumberValue()) // can we do better?
+                    addUse(right->identifierToken, SemanticHighlighter::FieldType);
+            }
+            return true;
+        }
+        // or IdentifierExpression.FieldMemberExpression.FieldMemberExpression (enum)
+        const FieldMemberExpression *it = cast<FieldMemberExpression *>(ast->base);
+        if (!it)
+            return true;
+        const IdentifierExpression *idExp = cast<IdentifierExpression *>(it->base);
+        if (!idExp)
+            return true;
+        const ObjectValue *scope = nullptr;
+        const Value *value = m_scopeChain.lookup(idExp->name.toString(), &scope);
+        const ASTObjectValue *aoValue= value->asAstObjectValue();
+        if (!aoValue)
+            return true;
+        if (auto maybeEnum = aoValue->lookupMember(it->name.toString(), m_scopeChain.context())) {
+            if (const UiEnumValue *enumObject = maybeEnum->asUiEnumValue()) {
+                addUse(it->identifierToken, SemanticHighlighter::QmlTypeType);
+                if (enumObject->keys().contains(right->name))
+                    addUse(right->identifierToken, SemanticHighlighter::FieldType);
+            }
+        }
+
+        return true;
+    }
+
     bool visit(StringLiteral *ast) override
     {
         if (ast->value.isEmpty())
diff --git a/src/plugins/qmljseditor/qmllssettings.h b/src/plugins/qmljseditor/qmllssettings.h
index 32890d3762..90d8ff6ca8 100644
--- a/src/plugins/qmljseditor/qmllssettings.h
+++ b/src/plugins/qmljseditor/qmllssettings.h
@@ -16,11 +16,13 @@ struct QmllsSettings
     bool useQmlls = true;
     bool useLatestQmlls = false;
     bool disableBuiltinCodemodel = false;
+    bool generateQmllsIniFiles = false;
 
     friend bool operator==(const QmllsSettings &s1, const QmllsSettings &s2)
     {
         return s1.useQmlls == s2.useQmlls && s1.useLatestQmlls == s2.useLatestQmlls
-               && s1.disableBuiltinCodemodel == s2.disableBuiltinCodemodel;
+               && s1.disableBuiltinCodemodel == s2.disableBuiltinCodemodel
+               && s1.generateQmllsIniFiles == s2.generateQmllsIniFiles;
     }
     friend bool operator!=(const QmllsSettings &s1, const QmllsSettings &s2) { return !(s1 == s2); }
 };
diff --git a/src/plugins/qmljseditor/qmloutlinemodel.cpp b/src/plugins/qmljseditor/qmloutlinemodel.cpp
index 015e8a41eb..456789f645 100644
--- a/src/plugins/qmljseditor/qmloutlinemodel.cpp
+++ b/src/plugins/qmljseditor/qmloutlinemodel.cpp
@@ -233,6 +233,19 @@ private:
         m_model->leavePublicMember();
     }
 
+    bool visit(AST::UiEnumDeclaration *enumDecl) override
+    {
+        QModelIndex index = m_model->enterEnumDeclaration(enumDecl);
+        m_nodeToIndex.insert(enumDecl, index);
+
+        return true;
+    }
+
+    void endVisit(AST::UiEnumDeclaration *) override
+    {
+        m_model->leavePublicMember();
+    }
+
     bool visit(AST::FunctionDeclaration *functionDeclaration) override
     {
         QModelIndex index = m_model->enterFunctionDeclaration(functionDeclaration);
@@ -576,6 +589,33 @@ void QmlOutlineModel::leavePublicMember()
     leaveNode();
 }
 
+QModelIndex QmlOutlineModel::enterEnumDeclaration(AST::UiEnumDeclaration *enumDecl)
+{
+    QMap<int, QVariant> objectData;
+    if (!enumDecl->name.isEmpty())
+        objectData.insert(Qt::DisplayRole, enumDecl->name.toString());
+    objectData.insert(ItemTypeRole, ElementBindingType);
+
+    QmlOutlineItem *item = enterNode(objectData, enumDecl, nullptr, Icons::enumMemberIcon());
+
+    for (auto member = enumDecl->members; member; member = member->next) {
+        QMap<int, QVariant> memberData;
+        if (!member->member.isEmpty())
+            memberData.insert(Qt::DisplayRole, member->member.toString());
+        memberData.insert(ItemTypeRole, ElementBindingType);
+        memberData.insert(AnnotationRole, QString::number(member->value));
+        enterNode(memberData, member, nullptr, Icons::publicMemberIcon());
+        leaveNode();
+    }
+
+    return item->index();
+}
+
+void QmlOutlineModel::leaveEnumDeclaration()
+{
+    leaveNode();
+}
+
 static QString functionDisplayName(QStringView name, AST::FormalParameterList *formals)
 {
     QString display;
diff --git a/src/plugins/qmljseditor/qmloutlinemodel.h b/src/plugins/qmljseditor/qmloutlinemodel.h
index 886d1986e5..bacb041714 100644
--- a/src/plugins/qmljseditor/qmloutlinemodel.h
+++ b/src/plugins/qmljseditor/qmloutlinemodel.h
@@ -91,6 +91,9 @@ private:
     QModelIndex enterPublicMember(QmlJS::AST::UiPublicMember *publicMember);
     void leavePublicMember();
 
+    QModelIndex enterEnumDeclaration(QmlJS::AST::UiEnumDeclaration *enumDecl);
+    void leaveEnumDeclaration();
+
     QModelIndex enterFunctionDeclaration(QmlJS::AST::FunctionDeclaration *functionDeclaration);
     void leaveFunctionDeclaration();
 
diff --git a/src/plugins/qmlpreview/CMakeLists.txt b/src/plugins/qmlpreview/CMakeLists.txt
index 4c1889143a..440b407b70 100644
--- a/src/plugins/qmlpreview/CMakeLists.txt
+++ b/src/plugins/qmlpreview/CMakeLists.txt
@@ -4,7 +4,7 @@ add_qtc_plugin(QmlPreview
   DEPENDS QmlJS Qt::QmlPrivate
   PLUGIN_DEPENDS
     Core ProjectExplorer QmlJSTools QtSupport
-    ResourceEditor QmlProjectManager
+    ResourceEditor QmlProjectManager TextEditor
   SOURCES
     qmlpreviewclient.cpp qmlpreviewclient.h
     qmlpreviewconnectionmanager.cpp qmlpreviewconnectionmanager.h
diff --git a/src/plugins/qmlpreview/qmlpreviewplugin.cpp b/src/plugins/qmlpreview/qmlpreviewplugin.cpp
index 31638f7662..70f905448e 100644
--- a/src/plugins/qmlpreview/qmlpreviewplugin.cpp
+++ b/src/plugins/qmlpreview/qmlpreviewplugin.cpp
@@ -166,12 +166,8 @@ QmlPreviewPluginPrivate::QmlPreviewPluginPrivate(QmlPreviewPlugin *parent)
     runPreviewAction->setEnabled(ProjectManager::startupProject() != nullptr);
     connect(ProjectManager::instance(), &ProjectManager::startupProjectChanged, runPreviewAction,
             &QAction::setEnabled);
-    connect(runPreviewAction, &QAction::triggered, this, [runPreviewAction, this] {
+    connect(runPreviewAction, &QAction::triggered, this, [&, runPreviewAction] {
         runPreviewAction->setEnabled(false);
-        attachToEditorManager();
-        setDirty();
-        onEditorChanged(Core::EditorManager::currentEditor());
-
         if (auto multiLanguageAspect = QmlProjectManager::QmlMultiLanguageAspect::current())
             m_localeIsoCode = multiLanguageAspect->currentLocale();
         bool skipDeploy = false;
@@ -425,7 +421,7 @@ void QmlPreviewPluginPrivate::onEditorAboutToClose(Core::IEditor *editor)
 void QmlPreviewPluginPrivate::setDirty()
 {
     m_dirty = true;
-    QTimer::singleShot(1000, this, [this](){
+    QTimer::singleShot(1000, this, [&](){
         if (m_dirty && m_lastEditor) {
             m_dirty = false;
             checkEditor();
@@ -435,6 +431,10 @@ void QmlPreviewPluginPrivate::setDirty()
 
 void QmlPreviewPlugin::addPreview(RunControl *preview)
 {
+    d->attachToEditorManager();
+    d->setDirty();
+    d->onEditorChanged(Core::EditorManager::currentEditor());
+
     d->m_runningPreviews.append(preview);
     emit runningPreviewsChanged(d->m_runningPreviews);
 }
diff --git a/src/plugins/qmlprojectmanager/CMakeLists.txt b/src/plugins/qmlprojectmanager/CMakeLists.txt
index ab96a5f7df..68bb545011 100644
--- a/src/plugins/qmlprojectmanager/CMakeLists.txt
+++ b/src/plugins/qmlprojectmanager/CMakeLists.txt
@@ -42,14 +42,10 @@ extend_qtc_plugin(QmlProjectManager
   PUBLIC_INCLUDES ${CMAKE_CURRENT_LIST_DIR}/cmakegen
   SOURCES_PREFIX ${CMAKE_CURRENT_LIST_DIR}/cmakegen
   SOURCES
-      checkablefiletreeitem.cpp checkablefiletreeitem.h
-      cmakegeneratordialog.cpp cmakegeneratordialog.h
-      cmakegeneratordialogtreemodel.cpp cmakegeneratordialogtreemodel.h
-      cmakeprojectconverter.cpp cmakeprojectconverter.h
-      cmakeprojectconverterdialog.cpp cmakeprojectconverterdialog.h
-      generatecmakelists.cpp generatecmakelists.h
-      generatecmakelistsconstants.h
       cmakegenerator.cpp cmakegenerator.h
+      cmakewriter.cpp cmakewriter.h
+      cmakewriterv0.cpp cmakewriterv0.h
+      cmakewriterv1.cpp cmakewriterv1.h
       boilerplate.qrc
 )
 
diff --git a/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp b/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp
index a0b8263900..00e501d6f8 100644
--- a/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp
+++ b/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp
@@ -93,6 +93,7 @@ QmlBuildSystem::QmlBuildSystem(Target *target)
     connect(target->project(), &Project::projectFileIsDirty, this, [this] {
         refresh(RefreshOptions::Project);
         m_cmakeGen->initialize(qmlProject());
+        m_cmakeGen->updateMenuAction();
         updateMcuBuildStep(project()->activeTarget(), qtForMCUs());
     });
 
@@ -501,6 +502,17 @@ void QmlBuildSystem::setPrimaryLanguage(QString language)
         m_projectItem->setPrimaryLanguage(language);
 }
 
+bool QmlBuildSystem::enableCMakeGeneration() const
+{
+    return m_projectItem->enableCMakeGeneration();
+}
+
+void QmlBuildSystem::setEnableCMakeGeneration(bool enable)
+{
+    if (enable != enableCMakeGeneration())
+        m_projectItem->setEnableCMakeGeneration(enable);
+}
+
 void QmlBuildSystem::refreshFiles(const QSet<QString> & /*added*/, const QSet<QString> &removed)
 {
     if (m_blockFilesUpdate) {
diff --git a/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.h b/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.h
index 524af5cd1b..e3f9b99adb 100644
--- a/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.h
+++ b/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.h
@@ -83,6 +83,9 @@ public:
     QString primaryLanguage() const;
     void setPrimaryLanguage(QString language);
 
+    bool enableCMakeGeneration() const;
+    void setEnableCMakeGeneration(bool enable);
+
     bool forceFreeType() const;
     bool widgetApp() const;
 
diff --git a/src/plugins/qmlprojectmanager/cmakegen/boilerplate.qrc b/src/plugins/qmlprojectmanager/cmakegen/boilerplate.qrc
index 10fab59838..4960324ab7 100644
--- a/src/plugins/qmlprojectmanager/cmakegen/boilerplate.qrc
+++ b/src/plugins/qmlprojectmanager/cmakegen/boilerplate.qrc
@@ -1,15 +1,15 @@
 <RCC>
-    <qresource prefix="/boilerplatetemplates">
-        <file>gencmakeroot.tpl</file>
-        <file>gencmakemodule.tpl</file>
-        <file>gencmakeheadercomponents.tpl</file>
-        <file>qmlprojectmaincpp.tpl</file>
-        <file>qmlprojectmaincppheader.tpl</file>
-        <file>qmlprojectenvheader.tpl</file>
-        <file>qmlprojectmodules.tpl</file>
-        <file>qmlprojectmaincmakelists.tpl</file>
-        <file>qmlprojectmodulecmakelists.tpl</file>
-        <file>qmlprojectmainqml.tpl</file>
-        <file>qmlprojectappmainqml.tpl</file>
+    <qresource prefix="/templates">
+        <file alias="cmakeroot_v0">templates/cmakeroot_v0.tpl</file>
+        <file alias="cmakeroot_v1">templates/cmakeroot_v1.tpl</file>
+        <file alias="main_cpp_v0">templates/main_cpp_v0.tpl</file>
+        <file alias="main_cpp_v1">templates/main_cpp_v1.tpl</file>
+        <file alias="cmakemodule_v1">templates/cmakemodule_v1.tpl</file>
+        <file alias="insight">templates/insight.tpl</file>
+        <file alias="qmlcomponents">templates/qmlcomponents.tpl</file>
+        <file alias="environment_h">templates/environment_h.tpl</file>
+        <file alias="import_qml_components_h">templates/import_qml_components_h.tpl</file>
+        <file alias="qtquickcontrols_conf">templates/qtquickcontrols2_conf.tpl</file>
+        <file alias="cmake_shared">templates/cmakelists_txt_shared.tpl</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/qmlprojectmanager/cmakegen/checkablefiletreeitem.cpp b/src/plugins/qmlprojectmanager/cmakegen/checkablefiletreeitem.cpp
deleted file mode 100644
index 9eb45d9150..0000000000
--- a/src/plugins/qmlprojectmanager/cmakegen/checkablefiletreeitem.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright (C) 2021 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#include "checkablefiletreeitem.h"
-
-using namespace Utils;
-
-namespace QmlProjectManager {
-
-CheckableFileTreeItem::CheckableFileTreeItem(const FilePath &filePath)
-    :QStandardItem(filePath.toString())
-{
-    Qt::ItemFlags itemFlags = flags();
-    if (!isDir())
-        itemFlags |= Qt::ItemIsUserCheckable;
-    itemFlags &= ~(Qt::ItemIsEditable | Qt::ItemIsSelectable);
-    setFlags(itemFlags);
-}
-
-const FilePath CheckableFileTreeItem::toFilePath() const
-{
-    return FilePath::fromString(text());
-}
-
-bool CheckableFileTreeItem::isFile() const
-{
-    return FilePath::fromString(text()).isFile();
-}
-
-bool CheckableFileTreeItem::isDir() const
-{
-    return FilePath::fromString(text()).isDir();
-}
-
-void CheckableFileTreeItem::setChecked(bool checked)
-{
-    this->checked = checked;
-}
-
-bool CheckableFileTreeItem::isChecked() const
-{
-    return this->checked;
-}
-
-} //QmlProjectManager
diff --git a/src/plugins/qmlprojectmanager/cmakegen/checkablefiletreeitem.h b/src/plugins/qmlprojectmanager/cmakegen/checkablefiletreeitem.h
deleted file mode 100644
index c3c5145301..0000000000
--- a/src/plugins/qmlprojectmanager/cmakegen/checkablefiletreeitem.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (C) 2021 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#ifndef CHECKABLEFILETREEITEM_H
-#define CHECKABLEFILETREEITEM_H
-
-#include <utils/fileutils.h>
-
-#include <QStandardItem>
-
-namespace QmlProjectManager {
-
-class CheckableFileTreeItem : public QStandardItem
-{
-public:
-    explicit CheckableFileTreeItem(const Utils::FilePath &text = Utils::FilePath());
-
-    const Utils::FilePath toFilePath() const;
-    bool isFile() const;
-    bool isDir() const;
-
-    bool isChecked() const;
-    void setChecked(bool checked);
-
-private:
-    bool checked;
-};
-
-} //QmlProjectManager
-
-#endif // CHECKABLEFILETREEITEM_H
diff --git a/src/plugins/qmlprojectmanager/cmakegen/cmakegenerator.cpp b/src/plugins/qmlprojectmanager/cmakegen/cmakegenerator.cpp
index 736ac04ec6..659c544ebd 100644
--- a/src/plugins/qmlprojectmanager/cmakegen/cmakegenerator.cpp
+++ b/src/plugins/qmlprojectmanager/cmakegen/cmakegenerator.cpp
@@ -2,13 +2,23 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "cmakegenerator.h"
-#include "generatecmakelistsconstants.h"
+
+#include "qmlprojectmanager/qmlproject.h"
+#include "qmlprojectmanager/qmlprojectconstants.h"
+#include "qmlprojectmanager/qmlprojectmanagertr.h"
 
 #include "projectexplorer/projectmanager.h"
 #include "projectexplorer/projectnodes.h"
-#include "qmlprojectmanager/qmlproject.h"
+#include "projectexplorer/taskhub.h"
 
+#include "utils/filenamevalidatinglineedit.h"
+
+#include "coreplugin/actionmanager/actionmanager.h"
+#include "coreplugin/actionmanager/actioncontainer.h"
+
+#include <QDirIterator>
 #include <QRegularExpression>
+#include <QMenu>
 
 #include <set>
 
@@ -16,30 +26,64 @@ namespace QmlProjectManager {
 
 namespace GenerateCmake {
 
-const char TEMPLATE_CMAKELISTS_ROOT[] = ":/boilerplatetemplates/gencmakeroot.tpl";
-const char TEMPLATE_CMAKELISTS_MODULE[] = ":/boilerplatetemplates/gencmakemodule.tpl";
+void CMakeGenerator::createMenuAction(QObject *parent)
+{
+    Core::ActionContainer *fileMenu = Core::ActionManager::actionContainer(
+        Core::Constants::M_FILE);
+    Core::ActionContainer *exportMenu = Core::ActionManager::createMenu(
+        QmlProjectManager::Constants::EXPORT_MENU);
+
+    exportMenu->menu()->setTitle(Tr::tr("Export Project"));
+    exportMenu->appendGroup(QmlProjectManager::Constants::G_EXPORT_GENERATE);
+    fileMenu->addMenu(exportMenu, Core::Constants::G_FILE_EXPORT);
+
+    auto action = new QAction(Tr::tr("Enable Automatic CMake Generation"), parent);
+    action->setEnabled(false);
+    action->setCheckable(true);
+
+    Core::Command *cmd = Core::ActionManager::registerAction(action, "QmlProject.EnableCMakeGeneration");
+    exportMenu->addAction(cmd, QmlProjectManager::Constants::G_EXPORT_GENERATE);
+
+    QObject::connect(
+        ProjectExplorer::ProjectManager::instance(),
+        &ProjectExplorer::ProjectManager::startupProjectChanged,
+        [action]() {
+            if (auto buildSystem = QmlBuildSystem::getStartupBuildSystem()) {
+                action->setEnabled(!buildSystem->qtForMCUs());
+                action->setChecked(buildSystem->enableCMakeGeneration());
+            }
+        }
+    );
+
+    QObject::connect(action, &QAction::toggled, [](bool checked) {
+        if (auto buildSystem = QmlBuildSystem::getStartupBuildSystem())
+            buildSystem->setEnableCMakeGeneration(checked);
+    });
+}
+
+void CMakeGenerator::logIssue(ProjectExplorer::Task::TaskType type, const QString &text, const Utils::FilePath &file)
+{
+    ProjectExplorer::BuildSystemTask task(type, text, file);
+    ProjectExplorer::TaskHub::addTask(task);
+    ProjectExplorer::TaskHub::requestPopup();
+}
 
-const char TEMPLATE_SOURCE_MAIN[] = ":/boilerplatetemplates/qmlprojectmaincpp.tpl";
-const char TEMPLATE_HEADER_IMPORT_COMPS[] = ":/boilerplatetemplates/gencmakeheadercomponents.tpl";
-const char TEMPLATE_HEADER_IMPORT_PLUGINS[] = ":/boilerplatetemplates/qmlprojectmaincppheader.tpl";
-const char TEMPLATE_HEADER_ENVIRONMENT[] = ":/boilerplatetemplates/qmlprojectenvheader.tpl";
+void CMakeGenerator::updateMenuAction()
+{
+    QTC_ASSERT(buildSystem(), return);
 
-const char DO_NOT_EDIT_FILE_COMMENT[]
-    = "### This file is automatically generated by Qt Design Studio.\n"
-      "### Do not change\n\n";
+    Core::Command *cmd = Core::ActionManager::command("QmlProject.EnableCMakeGeneration");
+    if (!cmd)
+        return;
 
-const char TEMPLATE_BIG_RESOURCES[] = R"(
-qt6_add_resources(%1 %2
-    BIG_RESOURCES
-    PREFIX "%3"
-    VERSION 1.0
-    FILES %4
-))";
+    QAction *action = cmd->action();
+    if (!action)
+        return;
 
-const char TEMPLATE_LINK_LIBRARIES[] = R"(
-target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE
-%3
-))";
+    bool enabled = buildSystem()->enableCMakeGeneration();
+    if (enabled != action->isChecked())
+        action->setChecked(enabled);
+}
 
 CMakeGenerator::CMakeGenerator(QmlBuildSystem *bs, QObject *parent)
     : QObject(parent)
@@ -47,6 +91,44 @@ CMakeGenerator::CMakeGenerator(QmlBuildSystem *bs, QObject *parent)
     , m_buildSystem(bs)
 {}
 
+const QmlProject *CMakeGenerator::qmlProject() const
+{
+    if (m_buildSystem)
+        return m_buildSystem->qmlProject();
+    return nullptr;
+}
+
+const QmlBuildSystem *CMakeGenerator::buildSystem() const
+{
+    return m_buildSystem;
+}
+
+bool CMakeGenerator::findFile(const Utils::FilePath& file) const
+{
+    return findFile(m_root, file);
+}
+
+bool CMakeGenerator::isRootNode(const NodePtr &node) const
+{
+    return node->name == "Main";
+}
+
+bool CMakeGenerator::hasChildModule(const NodePtr &node) const
+{
+    for (const NodePtr &child : node->subdirs) {
+        if (child->type == Node::Type::Module)
+            return true;
+        if (hasChildModule(child))
+            return true;
+    }
+    return false;
+}
+
+QString CMakeGenerator::projectName() const
+{
+    return m_projectName;
+}
+
 void CMakeGenerator::setEnabled(bool enabled)
 {
     m_enabled = enabled;
@@ -57,11 +139,11 @@ void CMakeGenerator::initialize(QmlProject *project)
     if (!m_enabled)
         return;
 
-    m_srcs.clear();
     m_moduleNames.clear();
+    m_writer = CMakeWriter::create(this);
 
     m_root = std::make_shared<Node>();
-    m_root->module = true;
+    m_root->type = Node::Type::App;
     m_root->uri = QString("Main");
     m_root->name = QString("Main");
     m_root->dir = project->rootProjectDirectory();
@@ -73,7 +155,9 @@ void CMakeGenerator::initialize(QmlProject *project)
     parseSourceTree();
 
     createCMakeFiles(m_root);
-    createEntryPoints(m_root);
+    createSourceFiles();
+
+    compareWithFileSystem(m_root);
 }
 
 void CMakeGenerator::update(const QSet<QString> &added, const QSet<QString> &removed)
@@ -81,304 +165,96 @@ void CMakeGenerator::update(const QSet<QString> &added, const QSet<QString> &rem
     if (!m_enabled)
         return;
 
+    QTC_ASSERT(m_writer, return);
+
     std::set<NodePtr> dirtyModules;
     for (const QString &add : added) {
         const Utils::FilePath path = Utils::FilePath::fromString(add);
-        if (auto node = findOrCreateNode(m_root, path)) {
+        if (auto node = findOrCreateNode(m_root, path.parentDir())) {
             insertFile(node, path);
             if (auto module = findModuleFor(node))
                 dirtyModules.insert(module);
         } else {
-            qDebug() << "CmakeGen: Failed to find Folder node " << path;
+            QString text("Failed to find Folder for file");
+            logIssue(ProjectExplorer::Task::Error, text, path);
         }
     }
 
     for (const QString &remove : removed) {
         const Utils::FilePath path = Utils::FilePath::fromString(remove);
-        if (auto node = findNode(m_root, path)) {
+        if (auto node = findNode(m_root, path.parentDir())) {
             removeFile(node, path);
             if (auto module = findModuleFor(node))
                 dirtyModules.insert(module);
         }
     }
 
-    for (auto module : dirtyModules)
-        createModuleCMakeFile(module);
-}
-
-std::vector<Utils::FilePath> CMakeGenerator::files(const NodePtr &node,
-                                                   const FileGetter &getter) const
-{
-    std::vector<Utils::FilePath> out = getter(node);
-    for (const CMakeGenerator::NodePtr &child : node->subdirs) {
-        if (child->module)
-            continue;
-
-        auto childFiles = files(child, getter);
-        out.insert(out.end(), childFiles.begin(), childFiles.end());
-    }
-    return out;
-}
-
-std::vector<Utils::FilePath> CMakeGenerator::qmlFiles(const NodePtr &node) const
-{
-    return files(node, [](const NodePtr &n) { return n->files; });
+    createCMakeFiles(m_root);
+    createSourceFiles();
 }
 
-std::vector<Utils::FilePath> CMakeGenerator::singletons(const NodePtr &node) const
+bool CMakeGenerator::isQml(const Utils::FilePath &path) const
 {
-    return files(node, [](const NodePtr &n) { return n->singletons; });
+    const QString suffix = path.suffix();
+    return suffix == "qml" || suffix == "ui.qml";
 }
 
-std::vector<Utils::FilePath> CMakeGenerator::resources(const NodePtr &node) const
+bool CMakeGenerator::isResource(const Utils::FilePath &path) const
 {
-    return files(node, [](const NodePtr &n) { return n->resources; });
+    static const QStringList suffixes = {
+        "json", "mesh", "dae", "qad", "hints", "png", "hdr", "ttf", "jpg",
+        "jpeg", "js", "qsb", "frag", "frag.qsb", "vert", "vert.qsb", "svg",
+        "ktx", "bmp", "gif", "webp", "tiff"};
+    return suffixes.contains(path.suffix(), Qt::CaseInsensitive);
 }
 
-std::vector<Utils::FilePath> CMakeGenerator::sources(const NodePtr &node) const
+bool CMakeGenerator::ignoreFile(const Utils::FilePath &path) const
 {
-    return files(node, [](const NodePtr &n) { return n->sources; });
+    static const QStringList suffixes = { "hints" };
+    return suffixes.contains(path.suffix(), Qt::CaseInsensitive);
 }
 
 void CMakeGenerator::createCMakeFiles(const NodePtr &node) const
 {
+    QTC_ASSERT(m_writer, return);
+
     if (isRootNode(node))
-        createMainCMakeFile(node);
+        m_writer->writeRootCMakeFile(node);
 
-    if (node->module || hasChildModule(node))
-        createModuleCMakeFile(node);
+    if (node->type == Node::Type::Module || (hasChildModule(node)))
+        m_writer->writeModuleCMakeFile(node, m_root);
 
     for (const NodePtr &n : node->subdirs)
         createCMakeFiles(n);
 }
 
-void CMakeGenerator::createMainCMakeFile(const NodePtr &node) const
-{
-    const QString appName = m_projectName + "App";
-
-    const QString qtcontrolsConfFile = makeEnvironmentVariable(Constants::ENV_VARIABLE_CONTROLCONF);
-
-    QString fileSection = "";
-    if (!qtcontrolsConfFile.isEmpty())
-        fileSection = QString("    FILES\n        %1").arg(qtcontrolsConfFile);
-
-    const QString fileTemplate = readTemplate(TEMPLATE_CMAKELISTS_ROOT);
-    const QString fileContent = fileTemplate.arg(appName, m_srcs.join(" "), fileSection);
-
-    const Utils::FilePath file = node->dir.pathAppended("CMakeLists.txt");
-    writeFile(file, fileContent);
-}
-
-void CMakeGenerator::createModuleCMakeFile(const NodePtr &node) const
+void CMakeGenerator::createSourceFiles() const
 {
-    Utils::FilePath writeToFile = node->dir.pathAppended("CMakeLists.txt");
+    QTC_ASSERT(m_writer, return);
 
-    if (!node->module && hasChildModule(node)) {
-        QString content(DO_NOT_EDIT_FILE_COMMENT);
-        content.append(makeSubdirectoriesBlock(node));
-        writeFile(writeToFile, content);
-        return;
-    }
-
-    QString templatePrefix;
-    templatePrefix.append(makeSubdirectoriesBlock(node));
-    templatePrefix.append(makeSingletonBlock(node));
-
-    auto [resources, bigResources] = makeResourcesBlocks(node);
-    QString moduleContent;
-    moduleContent.append(makeQmlFilesBlock(node));
-    moduleContent.append(resources);
-
-    QString templatePostfix;
-    templatePostfix.append(bigResources);
-
-    if (isRootNode(node)) {
-        writeToFile = node->dir.pathAppended("qmlModules");
-        QString pluginNames;
-        for (const QString &moduleName : m_moduleNames)
-            pluginNames.append("    " + moduleName + "plugin\n");
-
-        templatePostfix += QString::fromUtf8(TEMPLATE_LINK_LIBRARIES, -1).arg(pluginNames);
+    NodePtr sourceNode = {};
+    for (const NodePtr &child : m_root->subdirs) {
+        if (child->name == m_writer->sourceDirName())
+            sourceNode = child;
     }
 
-    const QString fileTemplate = readTemplate(TEMPLATE_CMAKELISTS_MODULE);
-    const QString fileContent
-        = fileTemplate.arg(node->name, node->uri, templatePrefix, moduleContent, templatePostfix);
-
-    writeFile(writeToFile, fileContent);
-}
-
-void CMakeGenerator::createEntryPoints(const NodePtr &node) const
-{
-    createMainCppFile(node);
-}
-
-void CMakeGenerator::createMainCppFile(const NodePtr &node) const
-{
-    const Utils::FilePath srcDir = node->dir.pathAppended(Constants::DIRNAME_CPP);
-    if (!srcDir.exists()) {
-        srcDir.createDir();
-
-        const Utils::FilePath componentsHeaderPath = srcDir.pathAppended(
-            "import_qml_components_plugins.h");
-
-        const QString componentsHeaderContent = readTemplate(TEMPLATE_HEADER_IMPORT_COMPS);
-        writeFile(componentsHeaderPath, componentsHeaderContent);
-
-        const Utils::FilePath cppFilePath = srcDir.pathAppended("main.cpp");
-        const QString cppContent = readTemplate(TEMPLATE_SOURCE_MAIN);
-        writeFile(cppFilePath, cppContent);
-
-        const Utils::FilePath envHeaderPath = srcDir.pathAppended("app_environment.h");
-        if (m_buildSystem) {
-            QString environment;
-            const QString qtcontrolsConfFile = makeEnvironmentVariable(
-                Constants::ENV_VARIABLE_CONTROLCONF);
-            for (Utils::EnvironmentItem &envItem : m_buildSystem->environment()) {
-                QString key = envItem.name;
-                QString value = envItem.value;
-                if (value == qtcontrolsConfFile)
-                    value.prepend(":/");
-                environment.append(QString("    qputenv(\"%1\", \"%2\");\n").arg(key).arg(value));
-            }
-            const QString envHeaderContent
-                = readTemplate(TEMPLATE_HEADER_ENVIRONMENT).arg(environment);
-            writeFile(envHeaderPath, envHeaderContent);
-        }
-    }
-
-    QString moduleContent;
-    for (const QString &module : m_moduleNames)
-        moduleContent.append(QString("Q_IMPORT_QML_PLUGIN(%1)\n").arg(module + "Plugin"));
-
-    const QString headerContent = readTemplate(TEMPLATE_HEADER_IMPORT_PLUGINS).arg(moduleContent);
-    const Utils::FilePath headerFilePath = srcDir.pathAppended("import_qml_plugins.h");
-    writeFile(headerFilePath, headerContent);
-}
-
-void CMakeGenerator::writeFile(const Utils::FilePath &path, const QString &content) const
-{
-    QFile fileHandle(path.toString());
-    fileHandle.open(QIODevice::WriteOnly);
-    QTextStream stream(&fileHandle);
-    stream << content;
-    fileHandle.close();
-}
-
-QString CMakeGenerator::makeRelative(const NodePtr &node, const Utils::FilePath &path) const
-{
-    const QString dir = node->dir.toString();
-    return "\"" + Utils::FilePath::calcRelativePath(path.toString(), dir) + "\"";
-}
-
-QString CMakeGenerator::makeEnvironmentVariable(const QString &key) const
-{
-    QString value;
-    if (m_buildSystem) {
-        auto envItems = m_buildSystem->environment();
-        auto confEnv = std::find_if(envItems.begin(),
-                                    envItems.end(),
-                                    [key](Utils::EnvironmentItem &item) { return item.name == key; });
-        if (confEnv != envItems.end())
-            value = confEnv->value;
-    }
-    return value;
-}
-
-QString CMakeGenerator::makeSingletonBlock(const NodePtr &node) const
-{
-    const QString setProperties(
-        "set_source_files_properties(%1\n    PROPERTIES\n        %2 %3\n)\n\n");
-
-    QString str;
-    for (const Utils::FilePath &path : node->singletons)
-        str.append(setProperties.arg(path.fileName()).arg("QT_QML_SINGLETON_TYPE").arg("true"));
-    return str;
-}
-
-QString CMakeGenerator::makeSubdirectoriesBlock(const NodePtr &node) const
-{
-    QString str;
-    for (const NodePtr &n : node->subdirs) {
-        if (n->module || hasChildModule(n))
-            str.append(QString("add_subdirectory(%1)\n").arg(n->dir.fileName()));
-    }
-    return str;
-}
-
-QString CMakeGenerator::makeQmlFilesBlock(const NodePtr &node) const
-{
-    QString qmlFileContent;
-    for (const Utils::FilePath &path : qmlFiles(node))
-        qmlFileContent.append(QString("        %1\n").arg(makeRelative(node, path)));
-
-    if (isRootNode(node) && qmlFileContent.isEmpty())
-        qmlFileContent.append(QString("        %1\n").arg("\"main.qml\""));
-
-    QString str;
-    if (!qmlFileContent.isEmpty())
-        str.append(QString("    QML_FILES\n%1").arg(qmlFileContent));
-
-    return str;
-}
-
-std::tuple<QString, QString> CMakeGenerator::makeResourcesBlocks(const NodePtr &node) const
-{
-    QString resourcesOut;
-    QString bigResourcesOut;
-
-    QString resourceFiles;
-    std::vector<QString> bigResources;
-    for (const Utils::FilePath &path : resources(node)) {
-        if (path.fileSize() > 5000000) {
-            bigResources.push_back(makeRelative(node, path));
-            continue;
-        }
-        resourceFiles.append(QString("        %1\n").arg(makeRelative(node, path)));
-    }
-
-    if (!resourceFiles.isEmpty())
-        resourcesOut.append(QString("    RESOURCES\n%1").arg(resourceFiles));
-
-    QString templatePostfix;
-    if (!bigResources.empty()) {
-        QString resourceContent;
-        for (const QString &res : bigResources)
-            resourceContent.append(QString("\n    %1").arg(res));
-
-        const QString prefixPath = QString(node->uri).replace('.', '/');
-        const QString prefix = "/qt/qml/" + prefixPath;
-        const QString resourceName = node->name + "BigResource";
-
-        bigResourcesOut = QString::fromUtf8(TEMPLATE_BIG_RESOURCES, -1)
-                              .arg(node->name, resourceName, prefix, resourceContent);
-    }
-
-    return {resourcesOut, bigResourcesOut};
-}
-
-QString CMakeGenerator::readTemplate(const QString &templatePath) const
-{
-    QFile templatefile(templatePath);
-    templatefile.open(QIODevice::ReadOnly);
-    QTextStream stream(&templatefile);
-    QString content = stream.readAll();
-    templatefile.close();
-    return content;
+    if (sourceNode)
+        m_writer->writeSourceFiles(sourceNode, m_root);
 }
 
 void CMakeGenerator::readQmlDir(const Utils::FilePath &filePath, NodePtr &node) const
 {
-    node->module = true;
+    node->type = Node::Type::Module;
 
     QFile f(filePath.toString());
     f.open(QIODevice::ReadOnly);
     QTextStream stream(&f);
 
     Utils::FilePath dir = filePath.parentDir();
+    static const QRegularExpression whitespaceRegex("\\s+");
     while (!stream.atEnd()) {
         const QString line = stream.readLine();
-        const QStringList tokenizedLine = line.split(QRegularExpression("\\s+"));
+        const QStringList tokenizedLine = line.split(whitespaceRegex);
         const QString maybeFileName = tokenizedLine.last();
         if (tokenizedLine.first().compare("module", Qt::CaseInsensitive) == 0) {
             node->uri = tokenizedLine.last();
@@ -392,11 +268,11 @@ void CMakeGenerator::readQmlDir(const Utils::FilePath &filePath, NodePtr &node)
     f.close();
 }
 
-CMakeGenerator::NodePtr CMakeGenerator::findModuleFor(const NodePtr &node) const
+NodePtr CMakeGenerator::findModuleFor(const NodePtr &node) const
 {
     NodePtr current = node;
     while (current->parent) {
-        if (current->module)
+        if (current->type == Node::Type::Module)
             return current;
 
         current = current->parent;
@@ -404,11 +280,10 @@ CMakeGenerator::NodePtr CMakeGenerator::findModuleFor(const NodePtr &node) const
     return nullptr;
 }
 
-CMakeGenerator::NodePtr CMakeGenerator::findNode(NodePtr &node, const Utils::FilePath &path) const
+NodePtr CMakeGenerator::findNode(NodePtr &node, const Utils::FilePath &path) const
 {
-    const Utils::FilePath parentDir = path.parentDir();
     for (NodePtr &child : node->subdirs) {
-        if (child->dir == parentDir)
+        if (child->dir == path)
             return child;
         if (path.isChildOf(child->dir))
             return findNode(child, path);
@@ -416,8 +291,7 @@ CMakeGenerator::NodePtr CMakeGenerator::findNode(NodePtr &node, const Utils::Fil
     return nullptr;
 }
 
-CMakeGenerator::NodePtr CMakeGenerator::findOrCreateNode(NodePtr &node,
-                                                         const Utils::FilePath &path) const
+NodePtr CMakeGenerator::findOrCreateNode(NodePtr &node, const Utils::FilePath &path) const
 {
     if (auto found = findNode(node, path))
         return found;
@@ -425,31 +299,74 @@ CMakeGenerator::NodePtr CMakeGenerator::findOrCreateNode(NodePtr &node,
     if (!path.isChildOf(node->dir))
         return nullptr;
 
-    const Utils::FilePath parentDir = path.parentDir();
-    const Utils::FilePath relative = parentDir.relativeChildPath(node->dir);
+    auto findSubDir = [](NodePtr &node, const Utils::FilePath &path) -> NodePtr {
+        for (NodePtr child : node->subdirs) {
+            if (child->dir == path)
+                return child;
+        }
+        return nullptr;
+    };
+
+    const Utils::FilePath relative = path.relativeChildPath(node->dir);
     const QChar separator = relative.pathComponentSeparator();
     const QList<QStringView> components = relative.pathView().split(separator);
 
-    NodePtr last = node;
+    NodePtr lastNode = node;
     for (const auto &comp : components) {
+
+        Utils::FilePath subPath = lastNode->dir.pathAppended(comp.toString());
+        if (NodePtr sub = findSubDir(lastNode, subPath)) {
+            lastNode = sub;
+            continue;
+        }
         NodePtr newNode = std::make_shared<Node>();
-        newNode->parent = last;
+        newNode->parent = lastNode;
         newNode->name = comp.toString();
-        newNode->dir = last->dir.pathAppended(comp.toString());
-        last->subdirs.push_back(newNode);
-        last = newNode;
+        newNode->dir = subPath;
+        lastNode->subdirs.push_back(newNode);
+        lastNode = newNode;
     }
-    return last;
+    return lastNode;
+}
+
+bool findFileWithGetter(const Utils::FilePath &file, const NodePtr &node, const FileGetter &getter)
+{
+    for (const auto &f : getter(node)) {
+        if (f == file)
+            return true;
+    }
+    for (const auto &subdir : node->subdirs) {
+        if (findFileWithGetter(file, subdir, getter))
+            return true;
+    }
+    return false;
+}
+
+bool CMakeGenerator::findFile(const NodePtr &node, const Utils::FilePath &file) const
+{
+    if (isResource(file)) {
+        return findFileWithGetter(file, node, [](const NodePtr &n) { return n->resources; });
+    } else if (isQml(file)) {
+        if (findFileWithGetter(file, node, [](const NodePtr &n) { return n->files; }))
+            return true;
+        else if (findFileWithGetter(file, node, [](const NodePtr &n) { return n->singletons; }))
+            return true;
+    }
+    return false;
 }
 
 void CMakeGenerator::insertFile(NodePtr &node, const Utils::FilePath &path) const
 {
+    QString error;
+    if (!Utils::FileNameValidatingLineEdit::validateFileName(path.fileName(), false, &error))
+        logIssue(ProjectExplorer::Task::Error, error, path);
+
     if (path.fileName() == "qmldir") {
         readQmlDir(path, node);
-    } else if (path.suffix() == "qml" || path.suffix() == "ui.qml") {
-        node->files.push_back(path);
     } else if (path.suffix() == "cpp") {
         node->sources.push_back(path);
+    } else if (isQml(path)) {
+        node->files.push_back(path);
     } else if (isResource(path)) {
         node->resources.push_back(path);
     }
@@ -458,12 +375,12 @@ void CMakeGenerator::insertFile(NodePtr &node, const Utils::FilePath &path) cons
 void CMakeGenerator::removeFile(NodePtr &node, const Utils::FilePath &path) const
 {
     if (path.fileName() == "qmldir") {
-        node->module = false;
+        node->type = Node::Type::Folder;
         node->singletons.clear();
         node->uri = "";
         node->name = path.parentDir().fileName();
 
-    } else if (path.suffix() == "qml") {
+    } else if (isQml(path)) {
         auto iter = std::find(node->files.begin(), node->files.end(), path);
         if (iter != node->files.end())
             node->files.erase(iter);
@@ -474,33 +391,9 @@ void CMakeGenerator::removeFile(NodePtr &node, const Utils::FilePath &path) cons
     }
 }
 
-bool CMakeGenerator::isRootNode(const NodePtr &node) const
-{
-    return node->name == "Main";
-}
-
-bool CMakeGenerator::hasChildModule(const NodePtr &node) const
-{
-    for (const NodePtr &child : node->subdirs) {
-        if (child->module)
-            return true;
-        if (hasChildModule(child))
-            return true;
-    }
-    return false;
-}
-
-bool CMakeGenerator::isResource(const Utils::FilePath &path) const
-{
-    static const QStringList suffixes = {
-        "json", "mesh", "dae", "qad", "hints", "png", "hdr", "ttf", "jpg", "JPG",
-        "js", "qsb", "frag", "frag.qsb", "vert", "vert.qsb", "svg", "ktx"};
-    return suffixes.contains(path.suffix());
-}
-
 void CMakeGenerator::printModules(const NodePtr &node) const
 {
-    if (node->module)
+    if (node->type == Node::Type::Module)
         qDebug() << "Module: " << node->name;
 
     for (const auto &child : node->subdirs)
@@ -516,7 +409,27 @@ void CMakeGenerator::printNodeTree(const NodePtr &generatorNode, size_t indent)
         return str;
     };
 
+    QString typeString;
+    switch (generatorNode->type)
+    {
+    case Node::Type::App:
+        typeString = "Node::Type::App";
+        break;
+    case Node::Type::Folder:
+        typeString = "Node::Type::Folder";
+        break;
+    case Node::Type::Module:
+        typeString = "Node::Type::Module";
+        break;
+    case Node::Type::Library:
+        typeString = "Node::Type::Library";
+        break;
+    default:
+        typeString = "Node::Type::Undefined";
+    }
+
     qDebug() << addIndent(indent) << "GeneratorNode: " << generatorNode->name;
+    qDebug() << addIndent(indent) << "type: " << typeString;
     qDebug() << addIndent(indent) << "directory: " << generatorNode->dir;
     qDebug() << addIndent(indent) << "files: " << generatorNode->files;
     qDebug() << addIndent(indent) << "singletons: " << generatorNode->singletons;
@@ -532,7 +445,7 @@ void CMakeGenerator::parseNodeTree(NodePtr &generatorNode,
 {
     for (const auto *childNode : folderNode->nodes()) {
         if (const auto *subFolderNode = childNode->asFolderNode()) {
-            CMakeGenerator::NodePtr childGeneratorNode = std::make_shared<Node>();
+            NodePtr childGeneratorNode = std::make_shared<Node>();
             childGeneratorNode->parent = generatorNode;
             childGeneratorNode->dir = subFolderNode->filePath();
             childGeneratorNode->name = subFolderNode->displayName();
@@ -544,25 +457,55 @@ void CMakeGenerator::parseNodeTree(NodePtr &generatorNode,
         }
     }
 
-    if (generatorNode->name == "content")
-        generatorNode->module = true;
+    if (m_writer)
+        m_writer->transformNode(generatorNode);
 
-    if (generatorNode->module)
+    if (generatorNode->type == Node::Type::Module)
         m_moduleNames.push_back(generatorNode->name);
 }
 
 void CMakeGenerator::parseSourceTree()
 {
-    m_srcs.clear();
-    const QString srcDir = m_root->dir.pathAppended(Constants::DIRNAME_CPP).path();
-    QDirIterator it(srcDir, QStringList({"*.cpp"}), QDir::Files, QDirIterator::Subdirectories);
+    QTC_ASSERT(m_writer, return);
+
+    const Utils::FilePath srcDir = m_root->dir.pathAppended(m_writer->sourceDirName());
+    QDirIterator it(srcDir.path(), {"*.cpp"}, QDir::Files, QDirIterator::Subdirectories);
+
+    NodePtr srcNode = std::make_shared<Node>();
+    srcNode->parent = m_root;
+    srcNode->type = Node::Type::App;
+    srcNode->dir = srcDir;
+    srcNode->uri = srcDir.baseName();
+    srcNode->name = srcNode->uri;
+
     while (it.hasNext()) {
-        QString relative = Utils::FilePath::calcRelativePath(it.next(), m_root->dir.path());
-        m_srcs.push_back(relative);
+        auto next = it.next();
+        srcNode->sources.push_back(Utils::FilePath::fromString(next));
+    }
+
+    if (srcNode->sources.empty())
+        srcNode->sources.push_back(srcDir.pathAppended("main.cpp"));
+
+    if (m_writer)
+        m_writer->transformNode(srcNode);
+
+    m_root->subdirs.push_back(srcNode);
+}
+
+void CMakeGenerator::compareWithFileSystem(const NodePtr &node) const
+{
+    std::vector<Utils::FilePath> files;
+    QDirIterator iter(node->dir.path(), QDir::Files, QDirIterator::Subdirectories);
+
+    while (iter.hasNext()) {
+        auto next = Utils::FilePath::fromString(iter.next());
+        if (isResource(next) && !findFile(next) && !ignoreFile(next))
+            files.push_back(next);
     }
 
-    if (m_srcs.empty())
-        m_srcs.push_back("src/main.cpp");
+    const QString text("File is not part of the project");
+    for (const auto &file : files)
+        logIssue(ProjectExplorer::Task::Warning, text, file);
 }
 
 } // namespace GenerateCmake
diff --git a/src/plugins/qmlprojectmanager/cmakegen/cmakegenerator.h b/src/plugins/qmlprojectmanager/cmakegen/cmakegenerator.h
index f89257ac5d..6077166d5b 100644
--- a/src/plugins/qmlprojectmanager/cmakegen/cmakegenerator.h
+++ b/src/plugins/qmlprojectmanager/cmakegen/cmakegenerator.h
@@ -2,7 +2,10 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 #pragma once
 
+#include "cmakewriter.h"
+
 #include "utils/filepath.h"
+#include "projectexplorer/task.h"
 
 #include <QObject>
 
@@ -22,80 +25,56 @@ class CMakeGenerator : public QObject
     Q_OBJECT
 
 public:
+    static void createMenuAction(QObject *parent);
+    static void logIssue(ProjectExplorer::Task::TaskType type, const QString &text, const Utils::FilePath &file);
+
     CMakeGenerator(QmlBuildSystem *bs, QObject *parent = nullptr);
 
-    void setEnabled(bool enabled);
+    QString projectName() const;
 
-    void initialize(QmlProject *project);
+    const QmlProject *qmlProject() const;
+    const QmlBuildSystem *buildSystem() const;
+
+    bool findFile(const Utils::FilePath &file) const;
+    bool isRootNode(const NodePtr &node) const;
+    bool hasChildModule(const NodePtr &node) const;
 
+    void setEnabled(bool enabled);
+    void initialize(QmlProject *project);
     void update(const QSet<QString> &added, const QSet<QString> &removed);
+    void updateMenuAction();
 
 private:
-    struct Node
-    {
-        std::shared_ptr<Node> parent = nullptr;
-        bool module = false;
-
-        QString uri;
-        QString name;
-        Utils::FilePath dir;
-
-        std::vector<std::shared_ptr<Node>> subdirs;
-        std::vector<Utils::FilePath> files;
-        std::vector<Utils::FilePath> singletons;
-        std::vector<Utils::FilePath> resources;
-        std::vector<Utils::FilePath> sources;
-    };
-
-    using NodePtr = std::shared_ptr<Node>;
-    using FileGetter = std::function<std::vector<Utils::FilePath>(const NodePtr &)>;
-
-    std::vector<Utils::FilePath> files(const NodePtr &node, const FileGetter &getter) const;
-    std::vector<Utils::FilePath> qmlFiles(const NodePtr &node) const;
-    std::vector<Utils::FilePath> singletons(const NodePtr &node) const;
-    std::vector<Utils::FilePath> resources(const NodePtr &node) const;
-    std::vector<Utils::FilePath> sources(const NodePtr &node) const;
+    bool isQml(const Utils::FilePath &path) const;
+    bool isResource(const Utils::FilePath &path) const;
+    bool ignoreFile(const Utils::FilePath &path) const;
 
     void createCMakeFiles(const NodePtr &node) const;
-    void createMainCMakeFile(const NodePtr &node) const;
-    void createModuleCMakeFile(const NodePtr &node) const;
+    void createSourceFiles() const;
 
-    void createEntryPoints(const NodePtr &node) const;
-    void createMainCppFile(const NodePtr &node) const;
-    void writeFile(const Utils::FilePath &path, const QString &content) const;
-
-    QString makeRelative(const NodePtr &node, const Utils::FilePath &path) const;
-    QString makeEnvironmentVariable(const QString &key) const;
-    QString makeSingletonBlock(const NodePtr &node) const;
-    QString makeSubdirectoriesBlock(const NodePtr &node) const;
-    QString makeQmlFilesBlock(const NodePtr &node) const;
-    std::tuple<QString, QString> makeResourcesBlocks(const NodePtr &node) const;
-
-    QString readTemplate(const QString &templatePath) const;
     void readQmlDir(const Utils::FilePath &filePath, NodePtr &node) const;
-
     NodePtr findModuleFor(const NodePtr &node) const;
     NodePtr findNode(NodePtr &node, const Utils::FilePath &path) const;
     NodePtr findOrCreateNode(NodePtr &node, const Utils::FilePath &path) const;
 
+    bool findFile(const NodePtr &node, const Utils::FilePath &file) const;
     void insertFile(NodePtr &node, const Utils::FilePath &path) const;
     void removeFile(NodePtr &node, const Utils::FilePath &path) const;
 
-    bool isRootNode(const NodePtr &node) const;
-    bool hasChildModule(const NodePtr &node) const;
-    bool isResource(const Utils::FilePath &path) const;
-
     void printModules(const NodePtr &generatorNode) const;
     void printNodeTree(const NodePtr &generatorNode, size_t indent = 0) const;
 
     void parseNodeTree(NodePtr &generatorNode, const ProjectExplorer::FolderNode *folderNode);
     void parseSourceTree();
 
+    void compareWithFileSystem(const NodePtr &node) const;
+
     bool m_enabled = false;
+    CMakeWriter::Ptr m_writer = {};
+
     QString m_projectName = {};
     NodePtr m_root = {};
-    QStringList m_srcs = {};
-    std::vector<QString> m_moduleNames = {};
+    QStringList m_moduleNames = {};
     QmlBuildSystem *m_buildSystem = nullptr;
 };
 
diff --git a/src/plugins/qmlprojectmanager/cmakegen/cmakegeneratordialog.cpp b/src/plugins/qmlprojectmanager/cmakegen/cmakegeneratordialog.cpp
deleted file mode 100644
index aa733b68af..0000000000
--- a/src/plugins/qmlprojectmanager/cmakegen/cmakegeneratordialog.cpp
+++ /dev/null
@@ -1,168 +0,0 @@
-// Copyright (C) 2021 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#include "cmakegeneratordialog.h"
-#include "../qmlprojectmanagertr.h"
-#include "cmakegeneratordialogtreemodel.h"
-
-#include <utils/utilsicons.h>
-#include <utils/detailswidget.h>
-
-#include <QDialogButtonBox>
-#include <QPushButton>
-#include <QLayout>
-#include <QLabel>
-
-#include <QSplitter>
-
-using namespace Utils;
-
-namespace QmlProjectManager {
-namespace GenerateCmake {
-
-CmakeGeneratorDialog::CmakeGeneratorDialog(const FilePath &rootDir,
-                                           const FilePaths &files,
-                                           const FilePaths invalidFiles)
-    : QDialog(), m_rootDir(rootDir), m_files(files), m_invalidFiles(invalidFiles)
-{
-    setWindowTitle(Tr::tr("Select Files to Generate"));
-
-    QLabel *mainLabel = new QLabel(Tr::tr("Start CMakeFiles.txt generation"), this);
-    mainLabel->setMargin(30);
-
-    QVBoxLayout *dialogLayout = new QVBoxLayout(this);
-    dialogLayout->addWidget(mainLabel);
-    dialogLayout->addWidget(createDetailsWidget());
-    dialogLayout->addWidget(createButtons());
-    setLayout(dialogLayout);
-
-    setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-    setMaximumHeight(layout()->totalSizeHint().height());
-
-    refreshNotificationText();
-}
-
-QTreeView* CmakeGeneratorDialog::createFileTree()
-{
-    m_model = new CMakeGeneratorDialogTreeModel(m_rootDir, m_files, this);
-
-    QTreeView *tree = new QTreeView(this);
-    tree->setModel(m_model);
-    tree->expandAll();
-    tree->setHeaderHidden(true);
-
-    return tree;
-}
-
-QWidget* CmakeGeneratorDialog::createDetailsWidget()
-{
-    QTreeView* tree = createFileTree();
-
-    m_notifications = new QTextEdit(this);
-    m_warningIcon = Utils::Icons::WARNING.pixmap();
-
-    QSplitter *advancedInnerWidget = new QSplitter(this);
-    advancedInnerWidget->addWidget(tree);
-    advancedInnerWidget->addWidget(m_notifications);
-    advancedInnerWidget->setStretchFactor(0, 2);
-    advancedInnerWidget->setStretchFactor(1, 1);
-    advancedInnerWidget->setOrientation(Qt::Vertical);
-    advancedInnerWidget->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::MinimumExpanding);
-
-    DetailsWidget *advancedWidget = new DetailsWidget(this);
-    advancedWidget->setMinimumWidth(600);
-    advancedWidget->setWidget(advancedInnerWidget);
-    advancedWidget->setSummaryText(Tr::tr("Advanced Options"));
-    connect(advancedWidget, &DetailsWidget::expanded, this, &CmakeGeneratorDialog::advancedVisibilityChanged);
-
-    return advancedWidget;
-}
-
-QWidget* CmakeGeneratorDialog::createButtons()
-{
-    QDialogButtonBox *buttons = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel);
-    auto *okButton = buttons->button(QDialogButtonBox::Ok);
-    okButton->setDefault(true);
-
-    connect(buttons, &QDialogButtonBox::accepted, this, &QDialog::accept);
-    connect(buttons, &QDialogButtonBox::rejected, this, &QDialog::reject);
-    connect(m_model, &CMakeGeneratorDialogTreeModel::checkedStateChanged, this, &CmakeGeneratorDialog::refreshNotificationText);
-
-    return buttons;
-}
-
-FilePaths CmakeGeneratorDialog::getFilePaths()
-{
-    FilePaths paths;
-
-    QList<CheckableFileTreeItem*> items = m_model->checkedItems();
-    for (CheckableFileTreeItem *item: items) {
-        paths.append(FilePath::fromString(item->text()));
-    }
-
-    return paths;
-}
-
-const QString FILE_CREATE_NOTIFICATION = Tr::tr("File %1 will be created.\n");
-const QString FILE_OVERWRITE_NOTIFICATION = Tr::tr("File %1 will be overwritten.\n");
-const QString FILE_INVALID_NOTIFICATION = Tr::tr(
-    "File %1 contains invalid characters and will be skipped.\n");
-
-void CmakeGeneratorDialog::refreshNotificationText()
-{
-    QTextDocument *document = m_notifications->document();
-    document->clear();
-    document->addResource(QTextDocument::ImageResource, QUrl("cmakegendialog://warningicon"), m_warningIcon);
-
-    QTextCursor cursor = m_notifications->textCursor();
-    QTextImageFormat iformat;
-    iformat.setName("cmakegendialog://warningicon");
-
-    QList<CheckableFileTreeItem*> nodes = m_model->items();
-
-    for (const auto &file : m_invalidFiles) {
-        cursor.insertImage(iformat);
-        cursor.insertText(QString(FILE_INVALID_NOTIFICATION).arg(file.displayName()));
-    }
-
-    for (CheckableFileTreeItem *node : nodes) {
-        if (!m_files.contains(node->toFilePath()))
-            continue;
-
-        if (!node->toFilePath().exists() && node->isChecked()) {
-            QString relativePath = QString(node->toFilePath().toString()).remove(m_rootDir.toString()+'/');
-            cursor.insertText(QString(FILE_CREATE_NOTIFICATION).arg(relativePath));
-        }
-    }
-
-    if (!document->toPlainText().isEmpty())
-        cursor.insertBlock();
-
-    for (CheckableFileTreeItem *node : nodes) {
-        if (!m_files.contains(node->toFilePath()))
-            continue;
-
-        if (node->toFilePath().exists() && node->isChecked()) {
-            QString relativePath = node->toFilePath().relativePathFrom(m_rootDir).toString();
-            cursor.insertImage(iformat);
-            cursor.insertText(QString(FILE_OVERWRITE_NOTIFICATION).arg(relativePath));
-        }
-    }
-}
-
-void CmakeGeneratorDialog::advancedVisibilityChanged(bool visible)
-{
-    if (visible) {
-        setMaximumHeight(QWIDGETSIZE_MAX);
-        setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-    }
-    else {
-        setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-        int height = layout()->totalSizeHint().height();
-        setMaximumHeight(height);
-        resize(width(), height);
-    }
-}
-
-} //GenerateCmake
-} //QmlProjectManager
diff --git a/src/plugins/qmlprojectmanager/cmakegen/cmakegeneratordialog.h b/src/plugins/qmlprojectmanager/cmakegen/cmakegeneratordialog.h
deleted file mode 100644
index fb15ec4de7..0000000000
--- a/src/plugins/qmlprojectmanager/cmakegen/cmakegeneratordialog.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (C) 2021 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-
-#ifndef CMAKEGENERATORDIALOG_H
-#define CMAKEGENERATORDIALOG_H
-
-#include "cmakegeneratordialogtreemodel.h"
-
-#include <utils/fileutils.h>
-
-#include <QDialog>
-#include <QTextEdit>
-#include <QTreeView>
-#include <QLabel>
-
-namespace QmlProjectManager {
-namespace GenerateCmake {
-
-class CmakeGeneratorDialog : public QDialog
-{
-    Q_OBJECT
-
-public:
-    CmakeGeneratorDialog(const Utils::FilePath &rootDir,
-                         const Utils::FilePaths &files,
-                         const Utils::FilePaths invalidFiles);
-    Utils::FilePaths getFilePaths();
-
-public slots:
-    void refreshNotificationText();
-    void advancedVisibilityChanged(bool visible);
-
-private:
-    QTreeView* createFileTree();
-    QWidget* createDetailsWidget();
-    QWidget* createButtons();
-
-private:
-    CMakeGeneratorDialogTreeModel *m_model;
-    QTextEdit *m_notifications;
-    QVariant m_warningIcon;
-    Utils::FilePath m_rootDir;
-    Utils::FilePaths m_files;
-    Utils::FilePaths m_invalidFiles;
-};
-
-} //GenerateCmake
-} //QmlProjectManager
-
-#endif // CMAKEGENERATORDIALOG_H
diff --git a/src/plugins/qmlprojectmanager/cmakegen/cmakegeneratordialogtreemodel.cpp b/src/plugins/qmlprojectmanager/cmakegen/cmakegeneratordialogtreemodel.cpp
deleted file mode 100644
index 525230bdfd..0000000000
--- a/src/plugins/qmlprojectmanager/cmakegen/cmakegeneratordialogtreemodel.cpp
+++ /dev/null
@@ -1,174 +0,0 @@
-// Copyright (C) 2021 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#include "cmakegeneratordialogtreemodel.h"
-#include "generatecmakelistsconstants.h"
-#include "checkablefiletreeitem.h"
-#include "../qmlprojectmanagertr.h"
-
-#include <utils/utilsicons.h>
-
-using namespace Utils;
-
-namespace QmlProjectManager {
-namespace GenerateCmake {
-
-CMakeGeneratorDialogTreeModel::CMakeGeneratorDialogTreeModel(const FilePath &rootDir,
-                                                             const FilePaths &files, QObject *parent)
-    :QStandardItemModel(parent),
-      rootDir(rootDir),
-      m_icons(new QFileIconProvider())
-{
-    createNodes(files, invisibleRootItem());
-}
-
-CMakeGeneratorDialogTreeModel::~CMakeGeneratorDialogTreeModel()
-{
-    delete m_icons;
-}
-
-QVariant CMakeGeneratorDialogTreeModel::data(const QModelIndex &index, int role) const
-{
-    if (index.isValid()) {
-        const CheckableFileTreeItem *node = constNodeForIndex(index);
-        if (role == Qt::CheckStateRole) {
-            if (!node->isDir())
-                return node->isChecked() ? Qt::Checked : Qt::Unchecked;
-            return {};
-        }
-        else if (role == Qt::DisplayRole) {
-            FilePath fullPath = node->toFilePath();
-            return QVariant(fullPath.fileName());
-        }
-        else if (role == Qt::DecorationRole) {
-            if (node->isFile())
-                return Utils::Icons::WARNING.icon();
-            if (node->isDir())
-                return m_icons->icon(QFileIconProvider::Folder);
-            else
-                return Utils::Icons::NEWFILE.icon();
-        }
-        else if (role == Qt::ToolTipRole) {
-            if (node->isFile())
-                return Tr::tr("This file already exists and will be overwritten.");
-            if (!node->toFilePath().exists())
-                return Tr::tr("This file or folder will be created.");
-        }
-    }
-
-    return QStandardItemModel::data(index, role);
-}
-
-bool CMakeGeneratorDialogTreeModel::setData(const QModelIndex &index, const QVariant &value, int role)
-{
-    if (index.isValid()) {
-        CheckableFileTreeItem *node = nodeForIndex(index);
-        if (role == Qt::CheckStateRole) {
-            node->setChecked(value.value<bool>());
-            emit checkedStateChanged(node);
-            return true;
-        }
-    }
-
-    return QStandardItemModel::setData(index, value, role);;
-}
-
-const QList<CheckableFileTreeItem*> CMakeGeneratorDialogTreeModel::items() const
-{
-    QList<QStandardItem*> standardItems = findItems(".*", Qt::MatchRegularExpression | Qt::MatchRecursive);
-    QList<CheckableFileTreeItem*> checkableItems;
-    for (QStandardItem *item : standardItems)
-        checkableItems.append(static_cast<CheckableFileTreeItem*>(item));
-
-    return checkableItems;
-}
-
-const QList<CheckableFileTreeItem*> CMakeGeneratorDialogTreeModel::checkedItems() const
-{
-    QList<CheckableFileTreeItem*> allItems = items();
-
-    QList<CheckableFileTreeItem*> checkedItems;
-    for (CheckableFileTreeItem *item : allItems) {
-        if (item->isChecked())
-            checkedItems.append(item);
-    }
-
-    return checkedItems;
-}
-
-bool CMakeGeneratorDialogTreeModel::checkedByDefault(const Utils::FilePath &file) const
-{
-    if (file.exists()) {
-        QString relativePath = file.relativeChildPath(rootDir).toString();
-        if (relativePath.compare(QmlProjectManager::GenerateCmake::Constants::FILENAME_CMAKELISTS) == 0)
-            return false;
-        if (relativePath.endsWith(QmlProjectManager::GenerateCmake::Constants::FILENAME_CMAKELISTS)
-            && relativePath.length() > QString(QmlProjectManager::GenerateCmake::Constants::FILENAME_CMAKELISTS).length())
-            return true;
-        if (relativePath.compare(QmlProjectManager::GenerateCmake::Constants::FILENAME_MODULES) == 0)
-            return true;
-        if (relativePath.compare(
-                FilePath::fromString(QmlProjectManager::GenerateCmake::Constants::DIRNAME_CPP)
-                .pathAppended(QmlProjectManager::GenerateCmake::Constants::FILENAME_MAINCPP_HEADER)
-                .toString())
-                == 0)
-            return true;
-    }
-
-    return !file.exists();
-}
-
-void CMakeGeneratorDialogTreeModel::createNodes(const FilePaths &candidates, QStandardItem *parent)
-{
-    if (!parent)
-        return;
-
-    CheckableFileTreeItem *checkParent = dynamic_cast<CheckableFileTreeItem*>(parent);
-    FilePath thisDir = (parent == invisibleRootItem()) ? rootDir : checkParent->toFilePath();
-
-    for (const FilePath &file : candidates) {
-        if (file.parentDir() == thisDir) {
-            CheckableFileTreeItem *fileNode = new CheckableFileTreeItem(file);
-            fileNode->setChecked(checkedByDefault(file));
-            if (!file.exists())
-                fileNode->setChecked(true);
-            parent->appendRow(fileNode);
-        }
-    }
-
-    FilePaths directSubDirs;
-    for (const FilePath &file : candidates) {
-        FilePath dir = file.parentDir();
-        if (dir.parentDir() == thisDir && !directSubDirs.contains(dir))
-            directSubDirs.append(dir);
-    }
-
-    for (const FilePath &subDir : directSubDirs) {
-        CheckableFileTreeItem *dirNode = new CheckableFileTreeItem(subDir);
-        parent->appendRow(dirNode);
-
-        FilePaths subDirCandidates;
-        for (const FilePath &file : candidates)
-            if (file.isChildOf(subDir))
-                subDirCandidates.append(file);
-
-        createNodes(subDirCandidates, dirNode);
-    }
-}
-
-const CheckableFileTreeItem* CMakeGeneratorDialogTreeModel::constNodeForIndex(const QModelIndex &index) const
-{
-    const QStandardItem *parent = static_cast<const QStandardItem*>(index.internalPointer());
-    const QStandardItem *item = parent->child(index.row(), index.column());
-    return static_cast<const CheckableFileTreeItem*>(item);
-}
-
-CheckableFileTreeItem* CMakeGeneratorDialogTreeModel::nodeForIndex(const QModelIndex &index)
-{
-    QStandardItem *parent = static_cast<QStandardItem*>(index.internalPointer());
-    QStandardItem *item = parent->child(index.row(), index.column());
-    return static_cast<CheckableFileTreeItem*>(item);
-}
-
-} //GenerateCmake
-} //QmlProjectManager
diff --git a/src/plugins/qmlprojectmanager/cmakegen/cmakegeneratordialogtreemodel.h b/src/plugins/qmlprojectmanager/cmakegen/cmakegeneratordialogtreemodel.h
deleted file mode 100644
index 3fb79c2b96..0000000000
--- a/src/plugins/qmlprojectmanager/cmakegen/cmakegeneratordialogtreemodel.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (C) 2021 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#ifndef CMAKEGENERATORDIALOGTREEMODEL_H
-#define CMAKEGENERATORDIALOGTREEMODEL_H
-
-#include "checkablefiletreeitem.h"
-
-#include <QFileIconProvider>
-#include <QStandardItemModel>
-
-#include <utils/fileutils.h>
-
-namespace QmlProjectManager {
-namespace GenerateCmake {
-
-class CMakeGeneratorDialogTreeModel : public QStandardItemModel
-{
-    Q_OBJECT
-
-public:
-    CMakeGeneratorDialogTreeModel(const Utils::FilePath &rootDir,
-                                  const Utils::FilePaths &files, QObject *parent = nullptr);
-    ~CMakeGeneratorDialogTreeModel();
-
-    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
-    bool setData(const QModelIndex &index, const QVariant &value, int role);
-
-    const QList<CheckableFileTreeItem*> items() const;
-    const QList<CheckableFileTreeItem*> checkedItems() const;
-    const CheckableFileTreeItem* constNodeForIndex(const QModelIndex &index) const;
-    CheckableFileTreeItem* nodeForIndex(const QModelIndex &index);
-
-signals:
-    void checkedStateChanged(CheckableFileTreeItem *item);
-
-protected:
-    bool checkedByDefault(const Utils::FilePath &file) const;
-    Utils::FilePath rootDir;
-
-private:
-    void createNodes(const Utils::FilePaths &candidates, QStandardItem *parent);
-
-    QFileIconProvider* m_icons;
-};
-
-} //GenerateCmake
-} //QmlProjectManager
-
-
-#endif // CMAKEGENERATORDIALOGTREEMODEL_H
diff --git a/src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverter.cpp b/src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverter.cpp
deleted file mode 100644
index f6bf1a4975..0000000000
--- a/src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverter.cpp
+++ /dev/null
@@ -1,422 +0,0 @@
-// Copyright (C) 2022 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#include "cmakeprojectconverter.h"
-#include "cmakeprojectconverterdialog.h"
-#include "generatecmakelists.h"
-#include "generatecmakelistsconstants.h"
-#include "../qmlprojectmanagertr.h"
-
-#include <coreplugin/actionmanager/actionmanager.h>
-#include <coreplugin/actionmanager/actioncontainer.h>
-#include <coreplugin/icore.h>
-
-#include <projectexplorer/projectexplorer.h>
-#include <projectexplorer/projectmanager.h>
-#include <projectexplorer/target.h>
-
-#include <qmlprojectmanager/qmlprojectconstants.h>
-
-#include <QAction>
-#include <QMessageBox>
-#include <QRegularExpression>
-
-using namespace Utils;
-using namespace QmlProjectManager::GenerateCmake::Constants;
-
-namespace QmlProjectManager {
-namespace GenerateCmake {
-
-const QString MENU_ITEM_CONVERT = Tr::tr("Export as Latest Project Format...");
-const QString ERROR_TITLE = Tr::tr("Creating Project");
-const QString SUCCESS_TITLE = Tr::tr("Creating Project");
-const QString ERROR_TEXT = Tr::tr("Creating project failed.\n%1");
-const QString SUCCESS_TEXT = Tr::tr("Creating project succeeded.");
-
-void CmakeProjectConverter::generateMenuEntry(QObject *parent)
-{
-    Core::ActionContainer *exportMenu = Core::ActionManager::actionContainer(
-        QmlProjectManager::Constants::EXPORT_MENU);
-    auto action = new QAction(MENU_ITEM_CONVERT, parent);
-    QObject::connect(action, &QAction::triggered, CmakeProjectConverter::onConvertProject);
-    Core::Command *cmd = Core::ActionManager::registerAction(action, "QmlProject.ConvertToCmakeProject");
-    exportMenu->addAction(cmd, QmlProjectManager::Constants::G_EXPORT_CONVERT);
-
-    action->setEnabled(isProjectConvertable(ProjectExplorer::ProjectManager::startupProject()));
-    QObject::connect(ProjectExplorer::ProjectManager::instance(),
-                     &ProjectExplorer::ProjectManager::startupProjectChanged,
-                     [action]() {
-                         auto currentBuildSystem = QmlBuildSystem::getStartupBuildSystem();
-                         bool isMCU = currentBuildSystem ? currentBuildSystem->qtForMCUs() : false;
-
-                         action->setEnabled(isMCU
-                                            && isProjectConvertable(
-                                                ProjectExplorer::ProjectManager::startupProject()));
-                     });
-}
-
-bool CmakeProjectConverter::isProjectConvertable(const ProjectExplorer::Project *project)
-{
-    if (!project)
-        return false;
-
-    return !isProjectCurrentFormat(project);
-}
-
-const QStringList sanityCheckFiles({FILENAME_CMAKELISTS,
-                                    FILENAME_MODULES,
-                                    FILENAME_MAINQML,
-                                    QString(DIRNAME_CONTENT)+'/'+FILENAME_CMAKELISTS,
-                                    QString(DIRNAME_IMPORT)+'/'+FILENAME_CMAKELISTS,
-                                    QString(DIRNAME_CPP)+'/'+FILENAME_MAINCPP,
-                                    QString(DIRNAME_CPP)+'/'+FILENAME_ENV_HEADER,
-                                    QString(DIRNAME_CPP)+'/'+FILENAME_MAINCPP_HEADER
-                                   });
-
-bool CmakeProjectConverter::isProjectCurrentFormat(const ProjectExplorer::Project *project)
-{
-    const QmlProjectManager::QmlProject *qmlprj = qobject_cast<const QmlProjectManager::QmlProject*>(project);
-
-    if (!qmlprj)
-        return false;
-
-    FilePath rootDir = qmlprj->rootProjectDirectory();
-    for (const QString &file : sanityCheckFiles)
-        if (!rootDir.pathAppended(file).exists())
-            return false;
-
-    return true;
-}
-
-void CmakeProjectConverter::onConvertProject()
-{
-    ProjectExplorer::Project *project = ProjectExplorer::ProjectManager::startupProject();
-    const QmlProjectManager::QmlProject *qmlProject =
-            qobject_cast<const QmlProjectManager::QmlProject*>(project);
-    if (qmlProject) {
-        CmakeProjectConverterDialog dialog(qmlProject);
-        if (dialog.exec()) {
-            FilePath newProjectPath = dialog.newPath();
-            CmakeProjectConverter converter;
-            converter.convertProject(qmlProject, newProjectPath);
-        }
-    }
-}
-
-bool CmakeProjectConverter::convertProject(const QmlProjectManager::QmlProject *project,
-                                           const FilePath &targetDir)
-{
-    m_converterObjects.clear();
-    m_projectDir = project->projectDirectory();
-    m_newProjectDir = targetDir;
-    m_project = project;
-
-    m_rootDirFiles = QStringList(FILENAME_FILTER_QMLPROJECT);
-    const QString confFile = GenerateCmake::projectEnvironmentVariable(ENV_VARIABLE_CONTROLCONF);
-    if (!confFile.isEmpty())
-        m_rootDirFiles.append(confFile);
-
-    bool retVal = prepareAndExecute();
-
-    if (retVal) {
-        QMessageBox::information(Core::ICore::dialogParent(), SUCCESS_TITLE, SUCCESS_TEXT);
-        ProjectExplorer::OpenProjectResult result
-                = ProjectExplorer::ProjectExplorerPlugin::openProject(newProjectFile());
-        if (!result)
-            ProjectExplorer::ProjectExplorerPlugin::showOpenProjectError(result);
-    }
-    else {
-        QMessageBox::critical(Core::ICore::dialogParent(), ERROR_TITLE, ERROR_TEXT.arg(m_errorText));
-    }
-
-    return retVal;
-}
-
-bool CmakeProjectConverter::prepareAndExecute()
-{
-    GenerateCmake::CmakeFileGenerator cmakeGenerator;
-
-    if (!performSanityCheck())
-        return false;
-    if (!prepareBaseDirectoryStructure())
-        return false;
-    if (!prepareCopy())
-        return false;
-    if (!createPreparedProject())
-        return false;
-    if (!cmakeGenerator.prepare(m_newProjectDir, false))
-        return false;
-    if (!cmakeGenerator.execute())
-        return false;
-    if (!modifyNewFiles())
-        return false;
-
-    return true;
-}
-
-bool CmakeProjectConverter::isFileBlacklisted(const Utils::FilePath &file) const
-{
-    if (!file.fileName().compare(FILENAME_CMAKELISTS))
-        return true;
-    if (!file.suffix().compare(FILENAME_SUFFIX_QMLPROJECT))
-        return true;
-    if (!file.suffix().compare(FILENAME_SUFFIX_USER))
-        return true;
-    if (m_rootDirFiles.contains(file.fileName()))
-        return true;
-
-    return false;
-}
-
-bool CmakeProjectConverter::isDirBlacklisted(const Utils::FilePath &dir) const
-{
-    if (!dir.isDir())
-        return true;
-
-    return false;
-}
-
-const QString ERROR_CANNOT_WRITE_DIR = Tr::tr("Unable to write to directory\n%1.");
-
-bool CmakeProjectConverter::performSanityCheck()
-{
-    if (!m_newProjectDir.parentDir().isWritableDir()) {
-        m_errorText = ERROR_CANNOT_WRITE_DIR.arg(m_newProjectDir.parentDir().toString());
-        return false;
-    }
-
-    return true;
-}
-
-bool CmakeProjectConverter::prepareBaseDirectoryStructure()
-{
-    addDirectory(m_newProjectDir);
-    addDirectory(contentDir());
-    addDirectory(sourceDir());
-    addDirectory(importDir());
-    addDirectory(assetDir());
-    addDirectory(assetImportDir());
-    addFile(contentDir().pathAppended(FILENAME_APPMAINQML));
-
-    return true;
-}
-
-bool CmakeProjectConverter::prepareCopy()
-{
-    FilePaths rootFiles = m_projectDir.dirEntries({m_rootDirFiles, QDir::Files});
-    for (const FilePath &file : rootFiles) {
-        addFile(file, m_newProjectDir.pathAppended(file.fileName()));
-    }
-
-    prepareCopyDirFiles(m_projectDir, contentDir());
-
-    FilePaths subDirs = m_projectDir.dirEntries(QDir::Dirs|QDir::NoDotAndDotDot);
-    for (FilePath &subDir : subDirs) {
-        if (subDir.fileName() == DIRNAME_IMPORT) {
-            prepareCopyDirTree(subDir, importDir());
-        }
-        else if (subDir.fileName() == DIRNAME_CPP) {
-            prepareCopyDirTree(subDir, sourceDir());
-        }
-        else if (subDir.fileName() == DIRNAME_ASSET) {
-            prepareCopyDirTree(subDir, assetDir());
-        }
-        else if (subDir.fileName() == DIRNAME_ASSETIMPORT) {
-            prepareCopyDirTree(subDir, assetImportDir());
-        }
-        else {
-            prepareCopyDirTree(subDir, contentDir().pathAppended(subDir.fileName()));
-        }
-    }
-
-    return true;
-}
-
-bool CmakeProjectConverter::prepareCopyDirFiles(const FilePath &dir, const FilePath &targetDir)
-{
-    FilePaths dirFiles = dir.dirEntries(QDir::Files);
-    for (FilePath file : dirFiles) {
-        if (!isFileBlacklisted(file))
-            addFile(file, targetDir.pathAppended(file.fileName()));
-    }
-
-    return true;
-}
-
-bool CmakeProjectConverter::prepareCopyDirTree(const FilePath &dir, const FilePath &targetDir)
-{
-    prepareCopyDirFiles(dir, targetDir);
-    FilePaths subDirs = dir.dirEntries(QDir::Dirs|QDir::NoDotAndDotDot);
-    for (FilePath &subDir : subDirs) {
-        if (isDirBlacklisted(subDir))
-            continue;
-        addDirectory(targetDir.pathAppended(subDir.fileName()));
-        prepareCopyDirFiles(subDir, targetDir.pathAppended(subDir.fileName()));
-        prepareCopyDirTree(subDir, targetDir.pathAppended(subDir.fileName()));
-    }
-
-    return true;
-}
-
-bool CmakeProjectConverter::addDirectory(const Utils::FilePath &target)
-{
-    return addObject(ProjectConverterObjectType::Directory, FilePath(), target);
-}
-
-bool CmakeProjectConverter::addFile(const Utils::FilePath &target)
-{
-    return addFile(FilePath(), target);
-}
-
-bool CmakeProjectConverter::addFile(const Utils::FilePath &original, const Utils::FilePath &target)
-{
-    addDirectory(target.parentDir());
-    return addObject(ProjectConverterObjectType::File, original, target);
-}
-
-bool CmakeProjectConverter::addObject(ProjectConverterObjectType type,
-                                      const Utils::FilePath &original, const Utils::FilePath &target)
-{
-    if (target.isChildOf(m_projectDir))
-        return false;
-
-    if (!target.isChildOf(m_newProjectDir) &&
-            ((type == ProjectConverterObjectType::Directory) && (target != m_newProjectDir))) {
-        return false;
-    }
-
-    for (ProjectConverterObject &o : m_converterObjects) {
-        if (o.target == target)
-            return false;
-    }
-
-    ProjectConverterObject object;
-    object.type = type;
-    object.target = target;
-    object.original = original;
-
-    m_converterObjects.append(object);
-
-    return true;
-}
-
-bool CmakeProjectConverter::createPreparedProject()
-{
-    for (ProjectConverterObject &pco : m_converterObjects) {
-        if (pco.type == ProjectConverterObjectType::Directory) {
-            pco.target.createDir();
-        }
-        else if (pco.type == ProjectConverterObjectType::File) {
-            if (pco.original.isEmpty()) {
-                QFile newFile(pco.target.toString());
-                newFile.open(QIODevice::WriteOnly);
-                newFile.close();
-            }
-            else {
-                pco.original.copyFile(pco.target);
-            }
-        }
-    }
-
-    return true;
-}
-
-const FilePath CmakeProjectConverter::contentDir() const
-{
-    return m_newProjectDir.pathAppended(DIRNAME_CONTENT);
-}
-
-const FilePath CmakeProjectConverter::sourceDir() const
-{
-    return m_newProjectDir.pathAppended(DIRNAME_CPP);
-}
-
-const FilePath CmakeProjectConverter::importDir() const
-{
-    return m_newProjectDir.pathAppended(DIRNAME_IMPORT);
-}
-
-const FilePath CmakeProjectConverter::assetDir() const
-{
-    return contentDir().pathAppended(DIRNAME_ASSET);
-}
-
-const FilePath CmakeProjectConverter::assetImportDir() const
-{
-    return m_newProjectDir.pathAppended(DIRNAME_ASSETIMPORT);
-}
-
-const FilePath CmakeProjectConverter::newProjectFile() const
-{
-    return m_newProjectDir.pathAppended(m_project->projectFilePath().fileName());
-}
-
-const FilePath CmakeProjectConverter::projectMainFile() const
-{
-    auto *target = m_project->activeTarget();
-    if (target && target->buildSystem()) {
-        auto buildSystem = qobject_cast<QmlProjectManager::QmlBuildSystem *>(target->buildSystem());
-        if (buildSystem) {
-            return buildSystem->mainFilePath();
-        }
-    }
-    return {};
-}
-
-const QString CmakeProjectConverter::projectMainClass() const
-{
-    return projectMainFile().baseName();
-}
-
-bool CmakeProjectConverter::modifyNewFiles()
-{
-    return modifyAppMainQml() && modifyProjectFile();
-}
-
-const char APPMAIN_QMLFILE_TEMPLATE_PATH[] = ":/boilerplatetemplates/qmlprojectappmainqml.tpl";
-
-bool CmakeProjectConverter::modifyAppMainQml()
-{
-    QString appMainQmlPath = contentDir().pathAppended(FILENAME_APPMAINQML).toString();
-    QFile appMainQml(appMainQmlPath);
-    appMainQml.open(QIODevice::ReadWrite);
-    if (!appMainQml.isOpen())
-        return false;
-
-    QString templateContent = GenerateCmake::readTemplate(APPMAIN_QMLFILE_TEMPLATE_PATH);
-    QString appMainQmlContent = templateContent.arg(projectMainClass());
-
-    appMainQml.reset();
-    appMainQml.write(appMainQmlContent.toUtf8());
-    appMainQml.close();
-
-    return true;
-}
-
-bool CmakeProjectConverter::modifyProjectFile()
-{
-    QString projectFileName = m_project->projectFilePath().fileName();
-    FilePath projectFilePath = m_newProjectDir.pathAppended(projectFileName);
-    QFile projectFile(projectFilePath.toString());
-    projectFile.open(QIODevice::ReadOnly);
-    if (!projectFile.isOpen())
-        return false;
-    QString projectFileContent = QString::fromUtf8(projectFile.readAll());
-    projectFile.close();
-
-    const QRegularExpression mainFilePattern("^\\s*mainFile:\\s*\".*\"", QRegularExpression::MultilineOption);
-    const QString mainFileString("    mainFile: \"content/App.qml\"");
-
-    projectFileContent.replace(mainFilePattern, mainFileString);
-
-    projectFile.open(QIODevice::WriteOnly|QIODevice::Truncate);
-    if (!projectFile.isOpen())
-        return false;
-    projectFile.write(projectFileContent.toUtf8());
-    projectFile.close();
-
-    return true;
-}
-
-} //GenerateCmake
-} //QmlProjectManager
diff --git a/src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverter.h b/src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverter.h
deleted file mode 100644
index 415123db70..0000000000
--- a/src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverter.h
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright (C) 2022 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#ifndef CMAKEPROJECTCONVERTER_H
-#define CMAKEPROJECTCONVERTER_H
-
-#include <utils/fileutils.h>
-#include <qmlprojectmanager/qmlproject.h>
-
-namespace QmlProjectManager {
-
-namespace GenerateCmake {
-
-enum ProjectConverterObjectType {
-    File,
-    Directory
-};
-
-struct ProjectConverterObject {
-    ProjectConverterObjectType type;
-    Utils::FilePath target;
-    Utils::FilePath original;
-};
-
-class CmakeProjectConverter {
-
-public:
-    bool convertProject(const QmlProjectManager::QmlProject *project,
-                        const Utils::FilePath &targetDir);
-    static void generateMenuEntry(QObject *parent);
-    static void onConvertProject();
-    static bool isProjectConvertable(const ProjectExplorer::Project *project);
-    static bool isProjectCurrentFormat(const ProjectExplorer::Project *project);
-
-private:
-    bool prepareAndExecute();
-    bool isFileBlacklisted(const Utils::FilePath &file) const;
-    bool isDirBlacklisted(const Utils::FilePath &dir) const;
-    bool performSanityCheck();
-    bool prepareBaseDirectoryStructure();
-    bool prepareCopyDirFiles(const Utils::FilePath &dir, const Utils::FilePath &targetDir);
-    bool prepareCopyDirTree(const Utils::FilePath &dir, const Utils::FilePath &targetDir);
-    bool prepareCopy();
-    bool addDirectory(const Utils::FilePath &target);
-    bool addFile(const Utils::FilePath &target);
-    bool addFile(const Utils::FilePath &original, const Utils::FilePath &target);
-    bool addObject(ProjectConverterObjectType type,
-                       const Utils::FilePath &original, const Utils::FilePath &target);
-    bool createPreparedProject();
-
-    const Utils::FilePath contentDir() const;
-    const Utils::FilePath sourceDir() const;
-    const Utils::FilePath importDir() const;
-    const Utils::FilePath assetDir() const;
-    const Utils::FilePath assetImportDir() const;
-    const Utils::FilePath newProjectFile() const;
-
-    const QString environmentVariable(const QString &key) const;
-    const Utils::FilePath projectMainFile() const;
-    const QString projectMainClass() const;
-    bool modifyNewFiles();
-    bool modifyAppMainQml();
-    bool modifyProjectFile();
-
-private:
-    QList<ProjectConverterObject> m_converterObjects;
-    QStringList m_rootDirFiles;
-    Utils::FilePath m_projectDir;
-    Utils::FilePath m_newProjectDir;
-    const QmlProjectManager::QmlProject *m_project;
-    QString m_errorText;
-};
-
-} //GenerateCmake
-} //QmlProjectManager
-
-#endif // CMAKEPROJECTCONVERTER_H
diff --git a/src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverterdialog.cpp b/src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverterdialog.cpp
deleted file mode 100644
index 1d67a92b39..0000000000
--- a/src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverterdialog.cpp
+++ /dev/null
@@ -1,180 +0,0 @@
-// Copyright (C) 2022 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#include "cmakeprojectconverterdialog.h"
-#include "../qmlprojectmanagertr.h"
-
-#include <coreplugin/documentmanager.h>
-
-#include <QDialog>
-#include <QDialogButtonBox>
-#include <QFormLayout>
-#include <QGroupBox>
-#include <QLabel>
-#include <QPushButton>
-#include <QRegularExpression>
-
-using namespace Utils;
-
-namespace QmlProjectManager {
-namespace GenerateCmake {
-
-const QRegularExpression projectNameRegexp("^(?!(import))(?!(QtQml))(?!(QtQuick))(?:[A-Z][a-zA-Z0-9-_]*)$");
-
-static bool projectNameValidationFunction(FancyLineEdit *editor, QString *)
-{
-    return editor->text().count(projectNameRegexp);
-}
-
-static bool dirValidationFunction(FancyLineEdit *editor, QString *)
-{
-    return FilePath::fromString(editor->text()).isWritableDir();
-}
-
-const QString EXPLANATION_TEXT = Tr::tr("This process creates a copy of the existing project. The new project's folder structure is adjusted for CMake build process and necessary related new files are generated.\n\nThe new project can be opened in Qt Creator using the main CMakeLists.txt file.");
-const QString PROJECT_NAME_LABEL = Tr::tr("Name:");
-const QString PARENT_DIR_LABEL = Tr::tr("Create in:");
-
-CmakeProjectConverterDialog::CmakeProjectConverterDialog(const QmlProjectManager::QmlProject *oldProject)
-    : QDialog()
-{
-    const FilePath defaultDir = Core::DocumentManager::projectsDirectory();
-    const QString defaultName = uniqueProjectName(defaultDir, oldProject->displayName());
-
-    QLabel *mainLabel = new QLabel(EXPLANATION_TEXT, this);
-    mainLabel->setWordWrap(true);
-
-    mainLabel->setMargin(20);
-    mainLabel->setMinimumWidth(600);
-
-    m_errorLabel = new InfoLabel();
-    m_errorLabel->setType(InfoLabel::InfoType::None);
-
-    m_nameEditor = new FancyLineEdit();
-    m_nameEditor->setValidationFunction(projectNameValidationFunction);
-    m_nameEditor->setText(defaultName);
-
-    m_dirSelector = new PathChooser();
-    m_dirSelector->setExpectedKind(PathChooser::Directory);
-    m_dirSelector->setValidationFunction(dirValidationFunction);
-    m_dirSelector->setFilePath(defaultDir);
-
-    QDialogButtonBox *buttons = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel);
-    m_okButton = buttons->button(QDialogButtonBox::Ok);
-    m_okButton->setDefault(true);
-
-    connect(buttons, &QDialogButtonBox::accepted, this, &QDialog::accept);
-    connect(buttons, &QDialogButtonBox::rejected, this, &QDialog::reject);
-    connect(m_nameEditor, &FancyLineEdit::textChanged, this, &CmakeProjectConverterDialog::pathValidChanged);
-    connect(m_dirSelector->lineEdit(), &FancyLineEdit::textChanged, this, &CmakeProjectConverterDialog::pathValidChanged);
-
-    QGroupBox *form = new QGroupBox();
-    QFormLayout *formLayout = new QFormLayout(form);
-    formLayout->addRow(PROJECT_NAME_LABEL, m_nameEditor);
-    formLayout->addRow(PARENT_DIR_LABEL, m_dirSelector);
-
-    QVBoxLayout *dialogLayout = new QVBoxLayout(this);
-    dialogLayout->addWidget(mainLabel);
-    dialogLayout->addWidget(form);
-    dialogLayout->addWidget(m_errorLabel);
-    dialogLayout->addWidget(buttons);
-
-    pathValidChanged();
-}
-
-void CmakeProjectConverterDialog::pathValidChanged()
-{
-    bool valid = isValid();
-
-    if (valid)
-        m_newProjectDir = m_dirSelector->filePath().pathAppended(m_nameEditor->text());
-    else
-        m_newProjectDir = FilePath();
-
-    const QString error = errorText();
-    m_errorLabel->setType(error.isEmpty() ? InfoLabel::None : InfoLabel::Warning);
-    m_errorLabel->setText(error);
-    m_okButton->setEnabled(valid);
-}
-
-const FilePath CmakeProjectConverterDialog::newPath() const
-{
-    return m_newProjectDir;
-}
-
-const QStringList blackListedStarts = {"import","QtQml","QtQuick"};
-
-const QString CmakeProjectConverterDialog::startsWithBlacklisted(const QString &text) const
-{
-    for (const QString &badWord : blackListedStarts) {
-        if (text.startsWith(badWord))
-            return badWord;
-    }
-
-    return {};
-}
-
-const QString ERROR_TEXT_NAME_EMPTY = Tr::tr("Name is empty.");
-const QString ERROR_TEXT_NAME_BAD_START = Tr::tr("Name must not start with \"%1\".");
-const QString ERROR_TEXT_NAME_LOWERCASE_START = Tr::tr("Name must begin with a capital letter");
-const QString ERROR_TEXT_NAME_BAD_CHARACTERS = Tr::tr("Name must contain only letters, numbers or characters - _.");
-
-const QString ERROR_DIR_NOT_DIR = Tr::tr("Target is not a directory.");
-const QString ERROR_DIR_NOT_WRITABLE = Tr::tr("Cannot write to target directory.");
-const QString ERROR_DIR_EXISTS = Tr::tr("Project directory already exists.");
-
-const QString CmakeProjectConverterDialog::errorText() const
-{
-    QString text;
-
-    if (!m_nameEditor->isValid()) {
-        QString name = m_nameEditor->text();
-
-        if (name.isEmpty())
-            return ERROR_TEXT_NAME_EMPTY;
-
-        const QString badStart = startsWithBlacklisted(text);
-        if (!badStart.isEmpty())
-            return ERROR_TEXT_NAME_BAD_START.arg(badStart);
-
-        if (name[0].isLower())
-            return ERROR_TEXT_NAME_LOWERCASE_START;
-
-        return ERROR_TEXT_NAME_BAD_CHARACTERS;
-
-    }
-
-    if (!m_dirSelector->isValid()) {
-        FilePath path = m_dirSelector->filePath();
-        if (!path.isDir())
-            return ERROR_DIR_NOT_DIR;
-        if (!path.isWritableDir())
-            return ERROR_DIR_NOT_WRITABLE;
-    }
-
-    if (m_dirSelector->filePath().pathAppended(m_nameEditor->text()).exists())
-        return ERROR_DIR_EXISTS;
-
-    return text;
-}
-
-const QString CmakeProjectConverterDialog::uniqueProjectName(const FilePath &dir, const QString &oldName) const
-{
-    for (unsigned i = 0; ; ++i) {
-        QString name = oldName;
-        if (i)
-            name += QString::number(i);
-        if (!dir.pathAppended(name).exists())
-            return name;
-    }
-    return oldName;
-}
-
-bool CmakeProjectConverterDialog::isValid()
-{
-    FilePath newPath = m_dirSelector->filePath().pathAppended(m_nameEditor->text());
-    return m_dirSelector->isValid() && m_nameEditor->isValid() && !newPath.exists();
-}
-
-} //GenerateCmake
-} //QmlProjectManager
diff --git a/src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverterdialog.h b/src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverterdialog.h
deleted file mode 100644
index 071eec481a..0000000000
--- a/src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverterdialog.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (C) 2022 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-
-#ifndef CMAKEPROJECTCONVERTERDIALOG_H
-#define CMAKEPROJECTCONVERTERDIALOG_H
-
-#include <qmlprojectmanager/qmlproject.h>
-#include <utils/fancylineedit.h>
-#include <utils/filepath.h>
-#include <utils/infolabel.h>
-#include <utils/pathchooser.h>
-
-#include <QDialog>
-
-namespace QmlProjectManager {
-namespace GenerateCmake {
-
-class CmakeProjectConverterDialog : public QDialog
-{
-    Q_OBJECT
-
-public:
-    CmakeProjectConverterDialog(const QmlProjectManager::QmlProject *oldProject);
-    const Utils::FilePath newPath() const;
-
-public slots:
-    void pathValidChanged();
-
-private:
-    const QString startsWithBlacklisted(const QString &text) const;
-    const QString errorText() const;
-    const QString uniqueProjectName(const Utils::FilePath &dir, const QString &oldName) const;
-    bool isValid();
-
-private:
-    Utils::FilePath m_newProjectDir;
-    Utils::FancyLineEdit *m_nameEditor;
-    Utils::PathChooser *m_dirSelector;
-    Utils::InfoLabel *m_errorLabel;
-    QPushButton *m_okButton;
-};
-
-} //GenerateCmake
-} //QmlProjectManager
-
-#endif // CMAKEPROJECTCONVERTERDIALOG_H
diff --git a/src/plugins/qmlprojectmanager/cmakegen/cmakewriter.cpp b/src/plugins/qmlprojectmanager/cmakegen/cmakewriter.cpp
new file mode 100644
index 0000000000..0b1d0c4c60
--- /dev/null
+++ b/src/plugins/qmlprojectmanager/cmakegen/cmakewriter.cpp
@@ -0,0 +1,258 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+#include "cmakewriter.h"
+#include "cmakegenerator.h"
+#include "cmakewriterv0.h"
+#include "cmakewriterv1.h"
+
+#include "qmlprojectmanager/qmlproject.h"
+#include "qmlprojectmanager/buildsystem/qmlbuildsystem.h"
+
+#include "utils/namevalueitem.h"
+
+#include <QFile>
+#include <QTextStream>
+
+namespace QmlProjectManager {
+
+namespace GenerateCmake {
+
+const char TEMPLATE_BIG_RESOURCES[] = R"(
+qt6_add_resources(%1 %2
+    BIG_RESOURCES
+    PREFIX "%3"
+    VERSION 1.0
+    FILES %4
+))";
+
+CMakeWriter::Ptr CMakeWriter::create(CMakeGenerator *parent)
+{
+    const QmlProject *project = parent->qmlProject();
+    QTC_ASSERT(project, return {});
+
+    const QmlBuildSystem *buildSystem = parent->buildSystem();
+    QTC_ASSERT(buildSystem, return {});
+
+    const QString versionString = buildSystem->versionDesignStudio();
+    bool ok = false;
+    if (float version = versionString.toFloat(&ok); ok && version > 4.4)
+        return std::make_unique<CMakeWriterV1>(parent);
+
+    return std::make_unique<CMakeWriterV0>(parent);
+}
+
+QString CMakeWriter::readTemplate(const QString &templatePath)
+{
+    QFile templatefile(templatePath);
+    templatefile.open(QIODevice::ReadOnly);
+    QTextStream stream(&templatefile);
+    QString content = stream.readAll();
+    templatefile.close();
+    return content;
+}
+
+CMakeWriter::CMakeWriter(CMakeGenerator *parent)
+    : m_parent(parent)
+{}
+
+const CMakeGenerator *CMakeWriter::parent() const
+{
+    return m_parent;
+}
+
+bool CMakeWriter::isPlugin(const NodePtr &node) const
+{
+    if (node->type == Node::Type::Module)
+        return true;
+    return false;
+}
+
+QString CMakeWriter::sourceDirName() const
+{
+    return "src";
+}
+
+void CMakeWriter::transformNode(NodePtr &) const
+{}
+
+std::vector<Utils::FilePath> CMakeWriter::files(const NodePtr &node, const FileGetter &getter) const
+{
+    std::vector<Utils::FilePath> out = getter(node);
+    for (const NodePtr &child : node->subdirs) {
+        if (child->type == Node::Type::Module)
+            continue;
+
+        auto childFiles = files(child, getter);
+        out.insert(out.end(), childFiles.begin(), childFiles.end());
+    }
+    return out;
+}
+
+std::vector<Utils::FilePath> CMakeWriter::qmlFiles(const NodePtr &node) const
+{
+    return files(node, [](const NodePtr &n) { return n->files; });
+}
+
+std::vector<Utils::FilePath> CMakeWriter::singletons(const NodePtr &node) const
+{
+    return files(node, [](const NodePtr &n) { return n->singletons; });
+}
+
+std::vector<Utils::FilePath> CMakeWriter::resources(const NodePtr &node) const
+{
+    return files(node, [](const NodePtr &n) { return n->resources; });
+}
+
+std::vector<Utils::FilePath> CMakeWriter::sources(const NodePtr &node) const
+{
+    return files(node, [](const NodePtr &n) { return n->sources; });
+}
+
+std::vector<QString> CMakeWriter::plugins(const NodePtr &node) const
+{
+    QTC_ASSERT(parent(), return {});
+    std::vector<QString> out;
+    collectPlugins(node, out);
+    return out;
+}
+
+QString CMakeWriter::getEnvironmentVariable(const QString &key) const
+{
+    QTC_ASSERT(parent(), return {});
+
+    QString value;
+    if (m_parent->buildSystem()) {
+        auto envItems = m_parent->buildSystem()->environment();
+        auto confEnv = std::find_if(
+            envItems.begin(), envItems.end(), [key](const Utils::EnvironmentItem &item) {
+                return item.name == key;
+            });
+        if (confEnv != envItems.end())
+            value = confEnv->value;
+    }
+    return value;
+}
+
+QString CMakeWriter::makeRelative(const NodePtr &node, const Utils::FilePath &path) const
+{
+    const QString dir = node->dir.toString();
+    return "\"" + Utils::FilePath::calcRelativePath(path.toString(), dir) + "\"";
+}
+
+QString CMakeWriter::makeQmlFilesBlock(const NodePtr &node) const
+{
+    QTC_ASSERT(parent(), return {});
+
+    QString qmlFileContent;
+    for (const Utils::FilePath &path : qmlFiles(node))
+        qmlFileContent.append(QString("\t\t%1\n").arg(makeRelative(node, path)));
+
+    QString str;
+    if (!qmlFileContent.isEmpty())
+        str.append(QString("\tQML_FILES\n%1").arg(qmlFileContent));
+
+    return str;
+}
+
+QString CMakeWriter::makeSingletonBlock(const NodePtr &node) const
+{
+    QString str;
+    const QString setProperties("set_source_files_properties(%1\n\tPROPERTIES\n\t\t%2 %3\n)\n\n");
+    for (const Utils::FilePath &path : node->singletons)
+        str.append(setProperties.arg(path.fileName()).arg("QT_QML_SINGLETON_TYPE").arg("true"));
+    return str;
+}
+
+QString CMakeWriter::makeSubdirectoriesBlock(const NodePtr &node) const
+{
+    QTC_ASSERT(parent(), return {});
+
+    QString str;
+    for (const NodePtr &n : node->subdirs) {
+        if (n->type == Node::Type::Module || n->type == Node::Type::Library
+            || n->type == Node::Type::App || parent()->hasChildModule(n))
+            str.append(QString("add_subdirectory(%1)\n").arg(n->dir.fileName()));
+    }
+    return str;
+}
+
+QString CMakeWriter::makeSetEnvironmentFn() const
+{
+    QTC_ASSERT(parent(), return {});
+    QTC_ASSERT(parent()->buildSystem(), return {});
+
+    const QmlBuildSystem *buildSystem = parent()->buildSystem();
+    const QString configFile = getEnvironmentVariable(ENV_VARIABLE_CONTROLCONF);
+
+    QString out("inline void set_qt_environment() {\n");
+    for (Utils::EnvironmentItem &envItem : buildSystem->environment()) {
+        QString key = envItem.name;
+        QString value = envItem.value;
+        if (value == configFile)
+            value.prepend(":/");
+        out.append(QString("\tqputenv(\"%1\", \"%2\");\n").arg(key).arg(value));
+    }
+    out.append("}");
+
+    return out;
+}
+
+std::tuple<QString, QString> CMakeWriter::makeResourcesBlocks(const NodePtr &node) const
+{
+    QString resourcesOut;
+    QString bigResourcesOut;
+
+    QString resourceFiles;
+    std::vector<QString> bigResources;
+    for (const Utils::FilePath &path : resources(node)) {
+        if (path.fileSize() > 5000000) {
+            bigResources.push_back(makeRelative(node, path));
+            continue;
+        }
+        resourceFiles.append(QString("\t\t%1\n").arg(makeRelative(node, path)));
+    }
+
+    if (!resourceFiles.isEmpty())
+        resourcesOut.append(QString("\tRESOURCES\n%1").arg(resourceFiles));
+
+    QString templatePostfix;
+    if (!bigResources.empty()) {
+        QString resourceContent;
+        for (const QString &res : bigResources)
+            resourceContent.append(QString("\n    %1").arg(res));
+
+        const QString prefixPath = QString(node->uri).replace('.', '/');
+        const QString prefix = "/qt/qml/" + prefixPath;
+        const QString resourceName = node->name + "BigResource";
+
+        bigResourcesOut = QString::fromUtf8(TEMPLATE_BIG_RESOURCES, -1)
+                              .arg(node->name, resourceName, prefix, resourceContent);
+    }
+
+    return {resourcesOut, bigResourcesOut};
+}
+
+void CMakeWriter::writeFile(const Utils::FilePath &path, const QString &content) const
+{
+    QFile fileHandle(path.toString());
+    if (fileHandle.open(QIODevice::WriteOnly)) {
+        QTextStream stream(&fileHandle);
+        stream << content;
+    } else {
+        QString text("Failed to write");
+        CMakeGenerator::logIssue(ProjectExplorer::Task::Error, text, path);
+    }
+    fileHandle.close();
+}
+
+void CMakeWriter::collectPlugins(const NodePtr &node, std::vector<QString> &out) const
+{
+    if (isPlugin(node))
+        out.push_back(node->name);
+    for (const auto &child : node->subdirs)
+        collectPlugins(child, out);
+}
+
+} // End namespace GenerateCmake.
+
+} // End namespace QmlProjectManager.
diff --git a/src/plugins/qmlprojectmanager/cmakegen/cmakewriter.h b/src/plugins/qmlprojectmanager/cmakegen/cmakewriter.h
new file mode 100644
index 0000000000..8766df0dcd
--- /dev/null
+++ b/src/plugins/qmlprojectmanager/cmakegen/cmakewriter.h
@@ -0,0 +1,101 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+#pragma once
+
+#include "utils/filepath.h"
+
+#include <QString>
+
+namespace QmlProjectManager {
+
+class QmlProject;
+class QmlBuildSystem;
+
+namespace GenerateCmake {
+
+struct Node
+{
+    enum class Type {
+        App,
+        Module,
+        Library,
+        Folder,
+    };
+
+    std::shared_ptr<Node> parent = nullptr;
+    Type type = Type::Folder;
+
+    QString uri;
+    QString name;
+    Utils::FilePath dir;
+
+    std::vector<std::shared_ptr<Node>> subdirs;
+    std::vector<Utils::FilePath> files;
+    std::vector<Utils::FilePath> singletons;
+    std::vector<Utils::FilePath> resources;
+    std::vector<Utils::FilePath> sources;
+};
+
+using NodePtr = std::shared_ptr<Node>;
+using FileGetter = std::function<std::vector<Utils::FilePath>(const NodePtr &)>;
+
+class CMakeGenerator;
+
+const char ENV_VARIABLE_CONTROLCONF[] =
+    "QT_QUICK_CONTROLS_CONF";
+
+const char DO_NOT_EDIT_FILE[] =
+    "### This file is automatically generated by Qt Design Studio.\n"
+    "### Do not change\n\n";
+
+const char TEMPLATE_LINK_LIBRARIES[] =
+    "target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE\n"
+    "%3"
+    ")";
+
+class CMakeWriter
+{
+public:
+    using Ptr = std::shared_ptr<CMakeWriter>;
+
+    static Ptr create(CMakeGenerator *parent);
+    static QString readTemplate(const QString &templatePath);
+
+    CMakeWriter(CMakeGenerator *parent);
+    const CMakeGenerator *parent() const;
+
+    virtual bool isPlugin(const NodePtr &node) const;
+    virtual QString sourceDirName() const;
+    virtual void transformNode(NodePtr &) const;
+
+    virtual void writeRootCMakeFile(const NodePtr &node) const = 0;
+    virtual void writeModuleCMakeFile(const NodePtr &node, const NodePtr &root) const = 0;
+    virtual void writeSourceFiles(const NodePtr &node, const NodePtr &root) const = 0;
+
+protected:
+    std::vector<Utils::FilePath> files(const NodePtr &node, const FileGetter &getter) const;
+    std::vector<Utils::FilePath> qmlFiles(const NodePtr &node) const;
+    std::vector<Utils::FilePath> singletons(const NodePtr &node) const;
+    std::vector<Utils::FilePath> resources(const NodePtr &node) const;
+    std::vector<Utils::FilePath> sources(const NodePtr &node) const;
+    std::vector<QString> plugins(const NodePtr &node) const;
+
+    QString getEnvironmentVariable(const QString &key) const;
+
+    QString makeRelative(const NodePtr &node, const Utils::FilePath &path) const;
+    QString makeQmlFilesBlock(const NodePtr &node) const;
+    QString makeSingletonBlock(const NodePtr &node) const;
+    QString makeSubdirectoriesBlock(const NodePtr &node) const;
+    QString makeSetEnvironmentFn() const;
+    std::tuple<QString, QString> makeResourcesBlocks(const NodePtr &node) const;
+
+    void writeFile(const Utils::FilePath &path, const QString &content) const;
+
+private:
+    void collectPlugins(const NodePtr &node, std::vector<QString> &out) const;
+    const CMakeGenerator *m_parent = nullptr;
+};
+
+} // End namespace GenerateCmake.
+
+} // End namespace QmlProjectManager.
diff --git a/src/plugins/qmlprojectmanager/cmakegen/cmakewriterv0.cpp b/src/plugins/qmlprojectmanager/cmakegen/cmakewriterv0.cpp
new file mode 100644
index 0000000000..5cb17d1e1b
--- /dev/null
+++ b/src/plugins/qmlprojectmanager/cmakegen/cmakewriterv0.cpp
@@ -0,0 +1,180 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+#include "cmakewriterv0.h"
+#include "cmakegenerator.h"
+
+namespace QmlProjectManager {
+
+namespace GenerateCmake {
+
+const char TEMPLATE_ADD_QML_MODULE[] = R"(
+qt6_add_qml_module(%1
+    URI "%2"
+    VERSION 1.0
+    RESOURCE_PREFIX "/qt/qml"
+%3))";
+
+CMakeWriterV0::CMakeWriterV0(CMakeGenerator *parent)
+    : CMakeWriter(parent)
+{}
+
+bool CMakeWriterV0::isPlugin(const NodePtr &node) const
+{
+    if (node->type == Node::Type::App)
+        return !node->files.empty() || !node->singletons.empty() || !node->resources.empty();
+
+    return CMakeWriter::isPlugin(node);
+}
+
+void CMakeWriterV0::transformNode(NodePtr &node) const
+{
+    QTC_ASSERT(parent(), return);
+
+    if (node->name == "src") {
+        node->type = Node::Type::Folder;
+    } else if (node->name == "content") {
+        node->type = Node::Type::Module;
+    } else if (node->type == Node::Type::App) {
+        Utils::FilePath path = node->dir.pathAppended("main.qml");
+        if (!path.exists()) {
+            QString text("Expected File not found.");
+            CMakeGenerator::logIssue(ProjectExplorer::Task::Error, text, path);
+            return;
+        }
+        if (!parent()->findFile(path))
+            node->files.push_back(path);
+    }
+}
+
+void CMakeWriterV0::writeRootCMakeFile(const NodePtr &node) const
+{
+    QTC_ASSERT(parent(), return);
+
+    const Utils::FilePath quickControlsPath = node->dir.pathAppended("qtquickcontrols2.conf");
+    if (!quickControlsPath.exists()) {
+        const QString quickControlsTemplate = readTemplate(":/templates/qtquickcontrols_conf");
+        writeFile(quickControlsPath, quickControlsTemplate);
+    }
+
+    const Utils::FilePath insightPath = node->dir.pathAppended("insight");
+    if (!insightPath.exists()) {
+        const QString insightTemplate = readTemplate(":/templates/insight");
+        writeFile(insightPath, insightTemplate);
+    }
+
+    const Utils::FilePath componentPath = node->dir.pathAppended("qmlcomponents");
+    if (!componentPath.exists()) {
+        const QString compTemplate = readTemplate(":/templates/qmlcomponents");
+        writeFile(componentPath, compTemplate);
+    }
+
+    const QString appName = parent()->projectName() + "App";
+    const QString qtcontrolsConfFile = getEnvironmentVariable(ENV_VARIABLE_CONTROLCONF);
+
+    QString fileSection = "";
+    if (!qtcontrolsConfFile.isEmpty())
+        fileSection = QString("\tFILES\n\t\t%1").arg(qtcontrolsConfFile);
+
+    QStringList srcs;
+    for (const Utils::FilePath &path : sources(node))
+        srcs.push_back(makeRelative(node, path));
+
+    const QString fileTemplate = readTemplate(":/templates/cmakeroot_v0");
+    const QString fileContent = fileTemplate.arg(appName, srcs.join(" "), fileSection);
+
+    const Utils::FilePath cmakeFile = node->dir.pathAppended("CMakeLists.txt");
+    writeFile(cmakeFile, fileContent);
+}
+
+void CMakeWriterV0::writeModuleCMakeFile(const NodePtr &node, const NodePtr &root) const
+{
+    QTC_ASSERT(parent(), return);
+
+    Utils::FilePath writeToFile = node->dir.pathAppended("CMakeLists.txt");
+
+    QString content(DO_NOT_EDIT_FILE);
+    if (node->type == Node::Type::Folder && parent()->hasChildModule(node)) {
+        content.append(makeSubdirectoriesBlock(node));
+        writeFile(writeToFile, content);
+        return;
+    }
+
+    content.append(makeSubdirectoriesBlock(node));
+    content.append("\n");
+    content.append(makeSingletonBlock(node));
+
+    QString qmlModulesContent;
+    qmlModulesContent.append(makeQmlFilesBlock(node));
+
+    auto [resources, bigResources] = makeResourcesBlocks(node);
+    qmlModulesContent.append(resources);
+
+    if (!qmlModulesContent.isEmpty()) {
+        const QString addLibraryTemplate("qt_add_library(%1 STATIC)");
+        const QString addModuleTemplate(TEMPLATE_ADD_QML_MODULE);
+
+        content.append(addLibraryTemplate.arg(node->name));
+        content.append(addModuleTemplate.arg(node->name, node->uri, qmlModulesContent));
+        content.append("\n\n");
+    }
+
+    content.append(bigResources);
+
+    if (node->type == Node::Type::App) {
+        writeToFile = node->dir.pathAppended("qmlModules");
+        QString pluginNames;
+        for (const QString &moduleName : plugins(root))
+            pluginNames.append("\t" + moduleName + "plugin\n");
+
+        if (!pluginNames.isEmpty())
+            content += QString::fromUtf8(TEMPLATE_LINK_LIBRARIES, -1).arg(pluginNames);
+    }
+
+    writeFile(writeToFile, content);
+}
+
+void CMakeWriterV0::writeSourceFiles(const NodePtr &node, const NodePtr &root) const
+{
+    QTC_ASSERT(parent(), return);
+
+    const Utils::FilePath srcDir = node->dir;
+    if (!srcDir.exists()) {
+        srcDir.createDir();
+
+        const Utils::FilePath componentsHeaderPath = srcDir.pathAppended(
+            "import_qml_components_plugins.h");
+        const QString componentsHeaderContent = readTemplate(
+            ":/templates/import_qml_components_h");
+        writeFile(componentsHeaderPath, componentsHeaderContent);
+
+        const Utils::FilePath cppFilePath = srcDir.pathAppended("main.cpp");
+        const QString cppContent = readTemplate(":/templates/main_cpp_v0");
+        writeFile(cppFilePath, cppContent);
+    }
+
+    QString fileHeader(
+        "/*\n"
+        " * This file is automatically generated by Qt Design Studio.\n"
+        " * Do not change\n"
+        "*/\n\n");
+
+    const Utils::FilePath envHeaderPath = srcDir.pathAppended("app_environment.h");
+    QString envHeaderContent(fileHeader);
+    envHeaderContent.append("#include <QGuiApplication>\n\n");
+    envHeaderContent.append(makeSetEnvironmentFn());
+    writeFile(envHeaderPath, envHeaderContent);
+
+    QString importPluginsContent;
+    for (const QString &module : plugins(root))
+        importPluginsContent.append(QString("Q_IMPORT_QML_PLUGIN(%1)\n").arg(module + "Plugin"));
+
+    QString importPluginsHeader(fileHeader);
+    importPluginsHeader.append("#include <QtQml/qqmlextensionplugin.h>\n\n");
+    importPluginsHeader.append(importPluginsContent);
+
+    const Utils::FilePath headerFilePath = srcDir.pathAppended("import_qml_plugins.h");
+    writeFile(headerFilePath, importPluginsHeader);
+}
+
+} // namespace GenerateCmake
+} // namespace QmlProjectManager
diff --git a/src/plugins/qmlprojectmanager/cmakegen/cmakewriterv0.h b/src/plugins/qmlprojectmanager/cmakegen/cmakewriterv0.h
new file mode 100644
index 0000000000..a1cd16d0fc
--- /dev/null
+++ b/src/plugins/qmlprojectmanager/cmakegen/cmakewriterv0.h
@@ -0,0 +1,25 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+#pragma once
+
+#include "cmakewriter.h"
+
+namespace QmlProjectManager {
+
+namespace GenerateCmake {
+
+class CMakeWriterV0 final : public CMakeWriter
+{
+public:
+    CMakeWriterV0(CMakeGenerator *parent);
+
+    bool isPlugin(const NodePtr &node) const override;
+    void transformNode(NodePtr &node) const override;
+
+    void writeRootCMakeFile(const NodePtr &node) const override;
+    void writeModuleCMakeFile(const NodePtr &node, const NodePtr &root) const override;
+    void writeSourceFiles(const NodePtr &node, const NodePtr &root) const override;
+};
+
+} // namespace GenerateCmake
+} // namespace QmlProjectManager
diff --git a/src/plugins/qmlprojectmanager/cmakegen/cmakewriterv1.cpp b/src/plugins/qmlprojectmanager/cmakegen/cmakewriterv1.cpp
new file mode 100644
index 0000000000..6d2d93a76b
--- /dev/null
+++ b/src/plugins/qmlprojectmanager/cmakegen/cmakewriterv1.cpp
@@ -0,0 +1,185 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+#include "cmakewriterv1.h"
+#include "cmakegenerator.h"
+
+#include "qmlprojectmanager/buildsystem/qmlbuildsystem.h"
+
+namespace QmlProjectManager {
+
+namespace GenerateCmake {
+
+const char TEMPLATE_SRC_CMAKELISTS[] = R"(
+target_sources(${CMAKE_PROJECT_NAME} PUBLIC
+%2)
+
+target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE
+    Qt${QT_VERSION_MAJOR}::Core
+    Qt${QT_VERSION_MAJOR}::Gui
+    Qt${QT_VERSION_MAJOR}::Quick
+    Qt${QT_VERSION_MAJOR}::Qml))";
+
+CMakeWriterV1::CMakeWriterV1(CMakeGenerator *parent)
+    : CMakeWriter(parent)
+{}
+
+QString CMakeWriterV1::sourceDirName() const
+{
+    return "App";
+}
+
+void CMakeWriterV1::transformNode(NodePtr &node) const
+{
+    QTC_ASSERT(parent(), return);
+
+    QString contentDir = parent()->projectName() + "Content";
+    if (node->name == contentDir)
+        node->type = Node::Type::Module;
+}
+
+void CMakeWriterV1::writeRootCMakeFile(const NodePtr &node) const
+{
+    QTC_ASSERT(parent(), return);
+
+    const Utils::FilePath cmakeFolderPath = node->dir.pathAppended("cmake");
+    if (!cmakeFolderPath.exists())
+        cmakeFolderPath.createDir();
+
+    const Utils::FilePath insightPath = cmakeFolderPath.pathAppended("insight.cmake");
+    if (!insightPath.exists()) {
+        const QString insightTemplate = readTemplate(":/templates/insight");
+        writeFile(insightPath, insightTemplate);
+    }
+
+    const Utils::FilePath componentPath = cmakeFolderPath.pathAppended("qmlcomponents.cmake");
+    if (!componentPath.exists()) {
+        const QString compTemplate = readTemplate(":/templates/qmlcomponents");
+        writeFile(componentPath, compTemplate);
+    }
+
+    const Utils::FilePath sharedFile = node->dir.pathAppended("CMakeLists.txt.shared");
+    if (!sharedFile.exists()) {
+        const QString sharedTemplate = readTemplate(":/templates/cmake_shared");
+        writeFile(sharedFile, sharedTemplate);
+    }
+
+    const Utils::FilePath file = node->dir.pathAppended("CMakeLists.txt");
+    if (!file.exists()) {
+        const QString appName = parent()->projectName() + "App";
+
+        QString fileSection = "";
+        const QString configFile = getEnvironmentVariable(ENV_VARIABLE_CONTROLCONF);
+        if (!configFile.isEmpty())
+            fileSection = QString("\t\t%1").arg(configFile);
+
+        const QString fileTemplate = readTemplate(":/templates/cmakeroot_v1");
+        const QString fileContent = fileTemplate.arg(appName, fileSection);
+        writeFile(file, fileContent);
+    }
+}
+
+void CMakeWriterV1::writeModuleCMakeFile(const NodePtr &node, const NodePtr &) const
+{
+    QTC_ASSERT(parent(), return);
+
+    if (node->type == Node::Type::App) {
+        const Utils::FilePath userFile = node->dir.pathAppended("qds.cmake");
+        QString userFileContent(DO_NOT_EDIT_FILE);
+        userFileContent.append(makeSubdirectoriesBlock(node));
+        userFileContent.append("\n");
+
+        QString pluginNames;
+        std::vector<QString> plugs = plugins(node);
+        for (size_t i = 0; i < plugs.size(); ++i) {
+            pluginNames.append("\t" + plugs[i] + "plugin");
+            if (i != plugs.size() - 1)
+                pluginNames.append("\n");
+        }
+
+        QString linkLibrariesTemplate(
+            "target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE\n"
+            "%1)");
+
+        userFileContent.append(linkLibrariesTemplate.arg(pluginNames));
+        writeFile(userFile, userFileContent);
+        return;
+    }
+
+    Utils::FilePath writeToFile = node->dir.pathAppended("CMakeLists.txt");
+    if (node->type == Node::Type::Folder && parent()->hasChildModule(node)) {
+        QString content(DO_NOT_EDIT_FILE);
+        content.append(makeSubdirectoriesBlock(node));
+        writeFile(writeToFile, content);
+        return;
+    }
+
+    QString prefix;
+    prefix.append(makeSubdirectoriesBlock(node));
+    prefix.append(makeSingletonBlock(node));
+
+    auto [resources, bigResources] = makeResourcesBlocks(node);
+    QString moduleContent;
+    moduleContent.append(makeQmlFilesBlock(node));
+    moduleContent.append(resources);
+
+    QString postfix;
+    postfix.append(bigResources);
+
+    const QString fileTemplate = readTemplate(":/templates/cmakemodule_v1");
+    const QString fileContent = fileTemplate
+        .arg(node->name, node->uri, prefix, moduleContent, postfix);
+    writeFile(writeToFile, fileContent);
+}
+
+void CMakeWriterV1::writeSourceFiles(const NodePtr &node, const NodePtr &root) const
+{
+    QTC_ASSERT(parent(), return);
+    QTC_ASSERT(parent()->buildSystem(), return);
+
+    const QmlBuildSystem *buildSystem = parent()->buildSystem();
+
+    const Utils::FilePath srcDir = node->dir;
+    if (!srcDir.exists())
+        srcDir.createDir();
+
+    const Utils::FilePath autogenDir = srcDir.pathAppended("autogen");
+    if (!autogenDir.exists())
+        autogenDir.createDir();
+
+    const Utils::FilePath mainCppPath = srcDir.pathAppended("main.cpp");
+    if (!mainCppPath.exists()) {
+        const QString cppContent = readTemplate(":/templates/main_cpp_v1");
+        writeFile(mainCppPath, cppContent);
+    }
+
+    const Utils::FilePath cmakePath = srcDir.pathAppended("CMakeLists.txt");
+    if (!cmakePath.exists()) {
+        std::vector<Utils::FilePath> sourcePaths = sources(node);
+        if (sourcePaths.empty())
+            sourcePaths.push_back(mainCppPath);
+
+        QString srcs = {};
+        for (const Utils::FilePath &src : sourcePaths)
+            srcs.append("\t" + makeRelative(node, src) + "\n");
+
+        QString fileTemplate = QString::fromUtf8(TEMPLATE_SRC_CMAKELISTS, -1).arg(srcs);
+        writeFile(cmakePath, fileTemplate);
+    }
+
+    const Utils::FilePath headerPath = autogenDir.pathAppended("environment.h");
+
+    QString environmentPrefix;
+    for (const QString &module : plugins(root))
+        environmentPrefix.append(QString("Q_IMPORT_QML_PLUGIN(%1)\n").arg(module + "Plugin"));
+
+    const QString mainFile("const char mainQmlFile[] = \"qrc:/qt/qml/%1\";");
+    environmentPrefix.append("\n");
+    environmentPrefix.append(mainFile.arg(buildSystem->mainFile()));
+
+    const QString environmentPostfix = makeSetEnvironmentFn();
+    const QString headerTemplate = readTemplate(":/templates/environment_h");
+    writeFile(headerPath, headerTemplate.arg(environmentPrefix, environmentPostfix));
+}
+
+} // namespace GenerateCmake
+} // namespace QmlProjectManager
diff --git a/src/plugins/qmlprojectmanager/cmakegen/cmakewriterv1.h b/src/plugins/qmlprojectmanager/cmakegen/cmakewriterv1.h
new file mode 100644
index 0000000000..2a6a05b07b
--- /dev/null
+++ b/src/plugins/qmlprojectmanager/cmakegen/cmakewriterv1.h
@@ -0,0 +1,25 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+#pragma once
+
+#include "cmakewriter.h"
+
+namespace QmlProjectManager {
+
+namespace GenerateCmake {
+
+class CMakeWriterV1 final : public CMakeWriter
+{
+public:
+    CMakeWriterV1(CMakeGenerator *parent);
+
+    QString sourceDirName() const override;
+    void transformNode(NodePtr &node) const override;
+
+    void writeRootCMakeFile(const NodePtr &node) const override;
+    void writeModuleCMakeFile(const NodePtr &node, const NodePtr &root) const override;
+    void writeSourceFiles(const NodePtr &node, const NodePtr &root) const override;
+};
+
+} // namespace GenerateCmake
+} // namespace QmlProjectManager
diff --git a/src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp b/src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp
deleted file mode 100644
index f46b508c8c..0000000000
--- a/src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp
+++ /dev/null
@@ -1,668 +0,0 @@
-// Copyright (C) 2021 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#include "generatecmakelists.h"
-
-#include "generatecmakelistsconstants.h"
-#include "cmakegeneratordialog.h"
-#include "../qmlprojectmanagertr.h"
-
-#include <coreplugin/actionmanager/actionmanager.h>
-#include <coreplugin/actionmanager/actioncontainer.h>
-
-#include <projectexplorer/buildsystem.h>
-#include <projectexplorer/project.h>
-#include <projectexplorer/projectexplorerconstants.h>
-#include <projectexplorer/projectmanager.h>
-#include <projectexplorer/target.h>
-
-#include <qmlprojectmanager/buildsystem/qmlbuildsystem.h>
-#include <qmlprojectmanager/qmlmainfileaspect.h>
-#include <qmlprojectmanager/qmlproject.h>
-#include <qmlprojectmanager/qmlprojectconstants.h>
-
-#include <extensionsystem/iplugin.h>
-#include <extensionsystem/pluginmanager.h>
-#include <extensionsystem/pluginspec.h>
-
-#include <utils/fileutils.h>
-
-#include <QAction>
-#include <QMenu>
-#include <QMessageBox>
-#include <QRegularExpression>
-#include <QStringList>
-#include <QTextStream>
-#include <QtConcurrent>
-
-using namespace Utils;
-using namespace QmlProjectManager::GenerateCmake::Constants;
-
-namespace QmlProjectManager {
-
-namespace GenerateCmake {
-
-static bool isQmlDesigner(const ExtensionSystem::PluginSpec *spec)
-{
-    if (!spec)
-        return false;
-
-    return spec->name().contains("QmlDesigner");
-}
-
-static void trackUsage(const QString &id)
-{
-    const auto plugins = ExtensionSystem::PluginManager::plugins();
-    const auto it = std::find_if(plugins.begin(), plugins.end(), &isQmlDesigner);
-    if (it != plugins.end()) {
-        QObject *qmlDesignerPlugin = (*it)->plugin();
-        QMetaObject::invokeMethod(qmlDesignerPlugin,
-                                  "usageStatisticsNotifier",
-                                  Qt::DirectConnection,
-                                  Q_ARG(QString, id));
-    }
-}
-
-bool operator==(const GeneratableFile &left, const GeneratableFile &right)
-{
-    return (left.filePath == right.filePath && left.content == right.content);
-}
-
-enum ProjectDirectoryError {
-    NoError = 0,
-    MissingContentDir = 1<<1,
-    MissingImportDir = 1<<2,
-    MissingAssetDir = 1<<3,
-    MissingAssetImportDir = 1<<4,
-    MissingCppDir = 1<<5,
-    MissingMainCMake = 1<<6,
-    MissingMainQml = 1<<7,
-    MissingAppMainQml = 1<<8,
-    MissingQmlModules = 1<<9,
-    MissingMainCpp = 1<<10,
-    MissingMainCppHeader = 1<<11,
-    MissingEnvHeader = 1<<12
-};
-
-const QString MENU_ITEM_GENERATE = Tr::tr("Generate CMake Build Files...");
-
-void generateMenuEntry(QObject *parent)
-{
-    Core::ActionContainer *menu = Core::ActionManager::actionContainer(Core::Constants::M_FILE);
-
-    Core::ActionContainer *exportMenu = Core::ActionManager::createMenu(
-        QmlProjectManager::Constants::EXPORT_MENU);
-
-    exportMenu->menu()->setTitle(Tr::tr("Export Project"));
-    menu->addMenu(exportMenu, Core::Constants::G_FILE_EXPORT);
-
-    exportMenu->appendGroup(QmlProjectManager::Constants::G_EXPORT_GENERATE);
-    exportMenu->appendGroup(QmlProjectManager::Constants::G_EXPORT_CONVERT);
-    exportMenu->addSeparator(QmlProjectManager::Constants::G_EXPORT_CONVERT);
-
-    auto action = new QAction(MENU_ITEM_GENERATE, parent);
-    QObject::connect(action, &QAction::triggered, GenerateCmake::onGenerateCmakeLists);
-    Core::Command *cmd = Core::ActionManager::registerAction(action, "QmlProject.CreateCMakeLists");
-    exportMenu->addAction(cmd, QmlProjectManager::Constants::G_EXPORT_GENERATE);
-
-    action->setEnabled(false);
-    QObject::connect(ProjectExplorer::ProjectManager::instance(),
-                     &ProjectExplorer::ProjectManager::startupProjectChanged,
-                     [action]() {
-                         if (auto buildSystem = QmlBuildSystem::getStartupBuildSystem())
-                             action->setEnabled(!buildSystem->qtForMCUs());
-                     });
-}
-
-void onGenerateCmakeLists()
-{
-    trackUsage("generateCMakeProjectDialogOpened");
-    FilePath rootDir = ProjectExplorer::ProjectManager::startupProject()->projectDirectory();
-
-    int projectDirErrors = isProjectCorrectlyFormed(rootDir);
-    if (projectDirErrors != NoError) {
-        showProjectDirErrorDialog(projectDirErrors);
-        if (isErrorFatal(projectDirErrors))
-            return;
-    }
-
-    CmakeFileGenerator cmakeGen;
-    cmakeGen.prepare(rootDir);
-
-    FilePaths allFiles;
-    for (const GeneratableFile &file: cmakeGen.fileQueue().queuedFiles())
-        allFiles.append(file.filePath);
-
-    CmakeGeneratorDialog dialog(rootDir, allFiles, cmakeGen.invalidFileNames());
-    if (dialog.exec()) {
-        FilePaths confirmedFiles = dialog.getFilePaths();
-        cmakeGen.filterFileQueue(confirmedFiles);
-        cmakeGen.execute();
-    }
-
-    trackUsage("generateCMakeProjectExecuted");
-}
-
-bool isErrorFatal(int error)
-{
-    if (error & MissingContentDir ||
-        error & MissingImportDir ||
-        error & MissingCppDir ||
-        error & MissingAppMainQml)
-        return true;
-
-    return false;
-}
-
-int isProjectCorrectlyFormed(const FilePath &rootDir)
-{
-    int errors = NoError;
-
-    if (!rootDir.pathAppended(DIRNAME_CONTENT).exists())
-        errors |= MissingContentDir;
-    if (!rootDir.pathAppended(DIRNAME_CONTENT).pathAppended(FILENAME_APPMAINQML).exists())
-        errors |= MissingAppMainQml;
-
-    if (!rootDir.pathAppended(DIRNAME_IMPORT).exists())
-        errors |= MissingImportDir;
-    if (!rootDir.pathAppended(DIRNAME_ASSETIMPORT).exists())
-        errors |= MissingAssetImportDir;
-
-    if (!rootDir.pathAppended(DIRNAME_CPP).exists())
-        errors |= MissingCppDir;
-    if (!rootDir.pathAppended(DIRNAME_CPP).pathAppended(FILENAME_MAINCPP).exists())
-        errors |= MissingMainCpp;
-    if (!rootDir.pathAppended(DIRNAME_CPP).pathAppended(FILENAME_MAINCPP_HEADER).exists())
-        errors |= MissingMainCppHeader;
-    if (!rootDir.pathAppended(DIRNAME_CPP).pathAppended(FILENAME_ENV_HEADER).exists())
-        errors |= MissingEnvHeader;
-
-    if (!rootDir.pathAppended(FILENAME_CMAKELISTS).exists())
-        errors |= MissingMainCMake;
-    if (!rootDir.pathAppended(FILENAME_MODULES).exists())
-        errors |= MissingQmlModules;
-    if (!rootDir.pathAppended(FILENAME_MAINQML).exists())
-        errors |= MissingMainQml;
-
-    return errors;
-}
-
-const QString WARNING_MISSING_STRUCTURE_FATAL = Tr::tr("The project is not properly structured for automatically generating CMake files.\n\nAborting process.\n\nThe following files or directories are missing:\n\n%1");
-//const QString WARNING_MISSING_STRUCTURE_NONFATAL = Tr::tr("The project is not properly structured for automatically generating CMake files.\n\nThe following files or directories are missing and may be created:\n\n%1");
-const QString WARNING_TITLE_FATAL = Tr::tr("Cannot Generate CMake Files");
-//const QString WARNING_TITLE_NONFATAL = Tr::tr("Problems with Generating CMake Files");
-
-void showProjectDirErrorDialog(int error)
-{
-    bool isFatal = isErrorFatal(error);
-
-    if (isFatal) {
-        QString fatalList;
-
-        if (error & MissingContentDir)
-            fatalList.append(QString(DIRNAME_CONTENT) + "\n");
-        if (error & MissingAppMainQml)
-            fatalList.append(QString(DIRNAME_CONTENT)
-                             + QDir::separator()
-                             + QString(FILENAME_APPMAINQML)
-                             + "\n");
-        if (error & MissingCppDir)
-            fatalList.append(QString(DIRNAME_CPP) + "\n");
-        if (error & MissingImportDir)
-            fatalList.append(QString(DIRNAME_IMPORT) + "\n");
-
-        QMessageBox::critical(nullptr,
-                              WARNING_TITLE_FATAL,
-                              WARNING_MISSING_STRUCTURE_FATAL.arg(fatalList));
-    }
-}
-
-bool FileQueue::queueFile(const FilePath &filePath, const QString &fileContent)
-{
-    GeneratableFile file;
-    file.filePath = filePath;
-    file.content = fileContent;
-    file.fileExists = filePath.exists();
-    m_queuedFiles.append(file);
-
-    return true;
-}
-
-const QVector<GeneratableFile> FileQueue::queuedFiles() const
-{
-    return m_queuedFiles;
-}
-
-bool FileQueue::writeQueuedFiles()
-{
-    for (GeneratableFile &file: m_queuedFiles)
-        if (!writeFile(file))
-            return false;
-
-    return true;
-}
-
-bool FileQueue::writeFile(const GeneratableFile &file)
-{
-    QFile fileHandle(file.filePath.toString());
-    fileHandle.open(QIODevice::WriteOnly);
-    QTextStream stream(&fileHandle);
-    stream << file.content;
-    fileHandle.close();
-
-    return true;
-}
-
-void FileQueue::filterFiles(const Utils::FilePaths keepFiles)
-{
-    QtConcurrent::blockingFilter(m_queuedFiles, [keepFiles](const GeneratableFile &qf) {
-        return keepFiles.contains(qf.filePath);
-    });
-}
-
-QString readTemplate(const QString &templatePath)
-{
-    QFile templatefile(templatePath);
-    templatefile.open(QIODevice::ReadOnly);
-    QTextStream stream(&templatefile);
-    QString content = stream.readAll();
-    templatefile.close();
-
-    return content;
-}
-
-const QString projectEnvironmentVariable(const QString &key)
-{
-    QString value = {};
-
-    if (auto buildSystem = QmlBuildSystem::getStartupBuildSystem()) {
-        auto envItems = buildSystem->environment();
-        auto confEnv = std::find_if(envItems.begin(), envItems.end(), [key](EnvironmentItem &item) {
-            return item.name == key;
-        });
-        if (confEnv != envItems.end())
-            value = confEnv->value;
-    }
-
-    return value;
-}
-
-const QDir::Filters FILES_ONLY = QDir::Files;
-const QDir::Filters DIRS_ONLY = QDir::Dirs|QDir::Readable|QDir::NoDotAndDotDot;
-
-const char MAIN_CMAKEFILE_TEMPLATE_PATH[] = ":/boilerplatetemplates/qmlprojectmaincmakelists.tpl";
-const char QMLMODULES_FILE_TEMPLATE_PATH[] = ":/boilerplatetemplates/qmlprojectmodules.tpl";
-
-bool CmakeFileGenerator::prepare(const FilePath &rootDir, bool checkFileBelongs)
-{
-    m_checkFileIsInProject = checkFileBelongs;
-
-    FilePath contentDir = rootDir.pathAppended(DIRNAME_CONTENT);
-    FilePath importDir = rootDir.pathAppended(DIRNAME_IMPORT);
-    FilePath assetImportDir = rootDir.pathAppended(DIRNAME_ASSETIMPORT);
-
-    generateModuleCmake(contentDir);
-    generateImportCmake(importDir);
-    generateImportCmake(assetImportDir);
-    generateMainCmake(rootDir);
-    generateEntryPointFiles(rootDir);
-
-    return true;
-}
-
-const FileQueue CmakeFileGenerator::fileQueue() const
-{
-    return m_fileQueue;
-}
-
-void CmakeFileGenerator::filterFileQueue(const Utils::FilePaths &keepFiles)
-{
-    m_fileQueue.filterFiles(keepFiles);
-}
-
-bool CmakeFileGenerator::execute()
-{
-    return m_fileQueue.writeQueuedFiles();
-}
-
-FilePaths CmakeFileGenerator::invalidFileNames() const
-{
-    return m_invalidFileNames;
-}
-
-const char DO_NOT_EDIT_FILE_COMMENT[] = "### This file is automatically generated by Qt Design Studio.\n### Do not change\n\n";
-const char ADD_SUBDIR[] = "add_subdirectory(%1)\n";
-
-void CmakeFileGenerator::generateMainCmake(const FilePath &rootDir)
-{
-    //TODO startupProject() may be a terrible way to try to get "current project". It's not necessarily the same thing at all.
-    QString projectName = ProjectExplorer::ProjectManager::startupProject()->displayName();
-    QString appName = projectName + "App";
-
-    QString fileSection = "";
-    const QString qtcontrolsConfFile = GenerateCmake::projectEnvironmentVariable(ENV_VARIABLE_CONTROLCONF);
-    if (!qtcontrolsConfFile.isEmpty())
-        fileSection = QString("    FILES\n        %1").arg(qtcontrolsConfFile);
-
-    QString cmakeFileContent = GenerateCmake::readTemplate(MAIN_CMAKEFILE_TEMPLATE_PATH)
-            .arg(appName)
-            .arg(fileSection);
-
-    queueCmakeFile(rootDir, cmakeFileContent);
-
-    QString subdirIncludes;
-    subdirIncludes.append(QString(ADD_SUBDIR).arg(DIRNAME_CONTENT));
-    subdirIncludes.append(QString(ADD_SUBDIR).arg(DIRNAME_IMPORT));
-    if (rootDir.pathAppended(DIRNAME_ASSETIMPORT).exists())
-        subdirIncludes.append(QString(ADD_SUBDIR).arg(DIRNAME_ASSETIMPORT));
-
-    QString modulesAsPlugins;
-    for (const QString &moduleName : m_moduleNames)
-        modulesAsPlugins.append("    " + moduleName + "plugin\n");
-
-    QString moduleFileContent = GenerateCmake::readTemplate(QMLMODULES_FILE_TEMPLATE_PATH)
-                                                        .arg(appName)
-                                                        .arg(subdirIncludes)
-                                                        .arg(modulesAsPlugins);
-
-    m_fileQueue.queueFile(rootDir.pathAppended(FILENAME_MODULES), moduleFileContent);
-}
-
-void CmakeFileGenerator::generateImportCmake(const FilePath &dir, const QString &modulePrefix)
-{
-    if (!dir.exists())
-        return;
-
-    QString fileContent;
-
-    fileContent.append(DO_NOT_EDIT_FILE_COMMENT);
-    FilePaths subDirs = dir.dirEntries(DIRS_ONLY);
-    for (FilePath &subDir : subDirs) {
-        if (isDirBlacklisted(subDir))
-            continue;
-        if (getDirectoryTreeQmls(subDir).isEmpty() && getDirectoryTreeResources(subDir).isEmpty())
-            continue;
-        fileContent.append(QString(ADD_SUBDIR).arg(subDir.fileName()));
-        QString prefix = modulePrefix.isEmpty() ?
-                QString(modulePrefix % subDir.fileName()) :
-                QString(QString(modulePrefix + '.') + subDir.fileName());
-        if (getDirectoryQmls(subDir).isEmpty()) {
-            generateImportCmake(subDir, prefix);
-        } else {
-            generateModuleCmake(subDir, prefix);
-        }
-    }
-
-    queueCmakeFile(dir, fileContent);
-}
-
-const char MODULEFILE_PROPERTY_SINGLETON[] = "QT_QML_SINGLETON_TYPE";
-const char MODULEFILE_PROPERTY_SET[] = "set_source_files_properties(%1\n    PROPERTIES\n        %2 %3\n)\n\n";
-const char MODULEFILE_TEMPLATE_PATH[] = ":/boilerplatetemplates/qmlprojectmodulecmakelists.tpl";
-
-void CmakeFileGenerator::generateModuleCmake(const FilePath &dir, const QString &uri)
-{
-    QString fileTemplate = GenerateCmake::readTemplate(MODULEFILE_TEMPLATE_PATH);
-
-    QString singletonContent;
-    FilePaths qmldirFileList = dir.dirEntries({QStringList(FILENAME_QMLDIR), FILES_ONLY});
-    if (!qmldirFileList.isEmpty()) {
-        QStringList singletons = getSingletonsFromQmldirFile(qmldirFileList.first());
-        for (QString &singleton : singletons) {
-            singletonContent.append(QString(MODULEFILE_PROPERTY_SET).arg(singleton).arg(MODULEFILE_PROPERTY_SINGLETON).arg("true"));
-        }
-    }
-
-    QStringList qmlFileList = getDirectoryTreeQmls(dir);
-    QString qmlFiles;
-    for (QString &qmlFile : qmlFileList)
-        qmlFiles.append(QString("        %1\n").arg(qmlFile));
-
-    QStringList resourceFileList = getDirectoryTreeResources(dir);
-    QString resourceFiles;
-    for (QString &resourceFile : resourceFileList)
-        resourceFiles.append(QString("        %1\n").arg(resourceFile));
-
-    QString moduleContent;
-    if (!qmlFiles.isEmpty()) {
-        moduleContent.append(QString("    QML_FILES\n%1").arg(qmlFiles));
-    }
-    if (!resourceFiles.isEmpty()) {
-        moduleContent.append(QString("    RESOURCES\n%1").arg(resourceFiles));
-    }
-
-    QString moduleUri = uri.isEmpty() ?
-                dir.fileName() :
-                uri;
-
-    QString moduleName = QString(moduleUri).replace('.', '_');
-    m_moduleNames.append(moduleName);
-
-    QString fileContent;
-    fileContent.append(fileTemplate.arg(singletonContent, moduleName, moduleUri, moduleContent));
-    queueCmakeFile(dir, fileContent);
-}
-
-QStringList CmakeFileGenerator::getSingletonsFromQmldirFile(const FilePath &filePath)
-{
-    QStringList singletons;
-    QFile f(filePath.toString());
-    f.open(QIODevice::ReadOnly);
-    QTextStream stream(&f);
-
-    while (!stream.atEnd()) {
-        QString line = stream.readLine();
-        if (line.startsWith("singleton", Qt::CaseInsensitive)) {
-            QStringList tokenizedLine = line.split(QRegularExpression("\\s+"));
-            QString fileName = tokenizedLine.last();
-            if (fileName.endsWith(".qml", Qt::CaseInsensitive)) {
-                singletons.append(fileName);
-            }
-        }
-    }
-
-    f.close();
-
-    return singletons;
-}
-
-QStringList CmakeFileGenerator::getDirectoryQmls(const FilePath &dir)
-{
-    QStringList moduleFiles;
-
-    const QStringList qmlFilesOnly(FILENAME_FILTER_QML);
-    FilePaths allFiles = dir.dirEntries({qmlFilesOnly, FILES_ONLY});
-    for (FilePath &file : allFiles) {
-        if (includeFile(file)) {
-            moduleFiles.append(file.fileName());
-        }
-    }
-
-    return moduleFiles;
-}
-
-QStringList CmakeFileGenerator::getDirectoryResources(const FilePath &dir)
-{
-    QStringList moduleFiles;
-
-    FilePaths allFiles = dir.dirEntries(FILES_ONLY);
-    for (FilePath &file : allFiles) {
-        if (!file.fileName().endsWith(".qml", Qt::CaseInsensitive) && includeFile(file)) {
-            moduleFiles.append(file.fileName());
-        }
-    }
-
-    return moduleFiles;
-}
-
-QStringList CmakeFileGenerator::getDirectoryTreeQmls(const FilePath &dir)
-{
-    QStringList qmlFileList;
-
-    qmlFileList.append(getDirectoryQmls(dir));
-
-    FilePaths subDirsList = dir.dirEntries(DIRS_ONLY);
-    for (FilePath &subDir : subDirsList) {
-        if (isDirBlacklisted(subDir))
-            continue;
-        QStringList subDirQmlFiles = getDirectoryTreeQmls(subDir);
-        for (QString &qmlFile : subDirQmlFiles) {
-            qmlFileList.append(subDir.fileName().append('/').append(qmlFile));
-        }
-    }
-
-    return qmlFileList;
-}
-
-static void appendWidthQuotes(QStringList &list, const QString &string)
-{
-    if (string.contains(' '))
-        list.append("\"" + string + "\"");
-    else
-        list.append(string);
-}
-
-QStringList CmakeFileGenerator::getDirectoryTreeResources(const FilePath &dir)
-{
-    QStringList resourceFileList;
-
-    //for (const auto &string : getDirectoryResources(dir))
-    //    appendWidthQuotes(resourceFileList, string);
-    resourceFileList.append(getDirectoryResources(dir));
-
-    FilePaths subDirsList = dir.dirEntries(DIRS_ONLY);
-    for (FilePath &subDir : subDirsList) {
-        if (isDirBlacklisted(subDir))
-            continue;
-        QStringList subDirResources = getDirectoryTreeResources(subDir);
-        for (QString &resource : subDirResources) {
-            appendWidthQuotes(resourceFileList, subDir.fileName().append('/').append(resource));
-        }
-    }
-
-    return resourceFileList;
-}
-
-void CmakeFileGenerator::queueCmakeFile(const FilePath &dir, const QString &content)
-{
-    FilePath filePath = dir.pathAppended(FILENAME_CMAKELISTS);
-    m_fileQueue.queueFile(filePath, content);
-}
-
-bool CmakeFileGenerator::isFileBlacklisted(const QString &fileName)
-{
-    return (!fileName.compare(FILENAME_QMLDIR) ||
-            !fileName.compare(FILENAME_CMAKELISTS));
-}
-
-bool CmakeFileGenerator::isDirBlacklisted(const FilePath &dir)
-{
-    return (!dir.fileName().compare(DIRNAME_DESIGNER));
-}
-
-bool CmakeFileGenerator::validFileName(const Utils::FilePath &filePath)
-{
-    QStringList invalidChars = {"!", "\"", "£", "$", "%", "!", "^", "&", "*", "(", ")", "=", "+",
-                                "'", ",",  ";", ":", "#", "~", "{", "{", "[", "]", "<", ">", "?"};
-    const QString baseName = filePath.baseName();
-    for (const auto &c : invalidChars) {
-        if (baseName.contains(c))
-            return false;
-    }
-    return true;
-}
-
-bool CmakeFileGenerator::includeFile(const FilePath &filePath)
-{
-    if (m_checkFileIsInProject) {
-        ProjectExplorer::Project *project = ProjectExplorer::ProjectManager::startupProject();
-        if (!project->isKnownFile(filePath))
-            return false;
-    }
-
-    if (validFileName(filePath))
-        return !isFileBlacklisted(filePath.fileName());
-    else
-        m_invalidFileNames.append(filePath);
-
-    return false;
-}
-
-bool CmakeFileGenerator::generateEntryPointFiles(const FilePath &dir)
-{
-    const QString qtcontrolsConf = GenerateCmake::projectEnvironmentVariable(ENV_VARIABLE_CONTROLCONF);
-    if (!qtcontrolsConf.isEmpty())
-        m_resourceFileLocations.append(qtcontrolsConf);
-
-    bool cppOk = generateMainCpp(dir);
-    bool qmlOk = generateMainQml(dir);
-
-    return cppOk && qmlOk;
-}
-
-const char MAIN_CPPFILE_TEMPLATE_PATH[] = ":/boilerplatetemplates/qmlprojectmaincpp.tpl";
-const char MAIN_CPPFILE_HEADER_TEMPLATE_PATH[] = ":/boilerplatetemplates/qmlprojectmaincppheader.tpl";
-const char MAIN_CPPFILE_HEADER_PLUGIN_LINE[] = "Q_IMPORT_QML_PLUGIN(%1)\n";
-const char ENV_HEADER_TEMPLATE_PATH[] = ":/boilerplatetemplates/qmlprojectenvheader.tpl";
-const char ENV_HEADER_VARIABLE_LINE[] = "    qputenv(\"%1\", \"%2\");\n";
-
-bool CmakeFileGenerator::generateMainCpp(const FilePath &dir)
-{
-    FilePath srcDir = dir.pathAppended(DIRNAME_CPP);
-
-    QString cppContent = GenerateCmake::readTemplate(MAIN_CPPFILE_TEMPLATE_PATH);
-    FilePath cppFilePath = srcDir.pathAppended(FILENAME_MAINCPP);
-    bool cppOk = m_fileQueue.queueFile(cppFilePath, cppContent);
-
-    QString modulesAsPlugins;
-    for (const QString &moduleName : m_moduleNames)
-        modulesAsPlugins.append(
-                    QString(MAIN_CPPFILE_HEADER_PLUGIN_LINE).arg(moduleName + "Plugin"));
-
-    QString headerContent = GenerateCmake::readTemplate(MAIN_CPPFILE_HEADER_TEMPLATE_PATH)
-            .arg(modulesAsPlugins);
-    FilePath headerFilePath = srcDir.pathAppended(FILENAME_MAINCPP_HEADER);
-    bool pluginHeaderOk = m_fileQueue.queueFile(headerFilePath, headerContent);
-
-    bool envHeaderOk = true;
-    QString environment;
-
-    if (auto buildSystem = QmlBuildSystem::getStartupBuildSystem()) {
-        for (EnvironmentItem &envItem : buildSystem->environment()) {
-            QString key = envItem.name;
-            QString value = envItem.value;
-            if (isFileResource(value))
-                value.prepend(":/");
-            environment.append(QString(ENV_HEADER_VARIABLE_LINE).arg(key).arg(value));
-        }
-        QString envHeaderContent = GenerateCmake::readTemplate(ENV_HEADER_TEMPLATE_PATH)
-                                       .arg(environment);
-        FilePath envHeaderPath = srcDir.pathAppended(FILENAME_ENV_HEADER);
-        envHeaderOk = m_fileQueue.queueFile(envHeaderPath, envHeaderContent);
-    }
-
-    return cppOk && pluginHeaderOk && envHeaderOk;
-}
-
-const char MAIN_QMLFILE_TEMPLATE_PATH[] = ":/boilerplatetemplates/qmlprojectmainqml.tpl";
-
-bool CmakeFileGenerator::generateMainQml(const FilePath &dir)
-{
-    QString content = GenerateCmake::readTemplate(MAIN_QMLFILE_TEMPLATE_PATH);
-    FilePath filePath = dir.pathAppended(FILENAME_MAINQML);
-    return m_fileQueue.queueFile(filePath, content);
-}
-
-bool CmakeFileGenerator::isFileResource(const QString &relativeFilePath)
-{
-    if (m_resourceFileLocations.contains(relativeFilePath))
-        return true;
-
-    return false;
-}
-
-
-
-} //GenerateCmake
-} //QmlProjectManager
-
diff --git a/src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.h b/src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.h
deleted file mode 100644
index db025daa27..0000000000
--- a/src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.h
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright (C) 2021 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#pragma once
-
-#include <projectexplorer/project.h>
-
-#include <utils/fileutils.h>
-
-namespace QmlProjectManager {
-namespace GenerateCmake {
-struct GeneratableFile {
-    Utils::FilePath filePath;
-    QString content;
-    bool fileExists;
-};
-
-bool operator==(const GeneratableFile &left, const GeneratableFile &right);
-
-void generateMenuEntry(QObject *parent);
-void onGenerateCmakeLists();
-bool isErrorFatal(int error);
-int isProjectCorrectlyFormed(const Utils::FilePath &rootDir);
-void showProjectDirErrorDialog(int error);
-QString readTemplate(const QString &templatePath);
-const QString projectEnvironmentVariable(const QString &key);
-
-class FileQueue {
-public:
-    bool queueFile(const Utils::FilePath &filePath, const QString &fileContent);
-    const QVector<GeneratableFile> queuedFiles() const;
-    bool writeQueuedFiles();
-    void filterFiles(const Utils::FilePaths keepFiles);
-
-private:
-    bool writeFile(const GeneratableFile &file);
-
-private:
-    QVector<GeneratableFile> m_queuedFiles;
-};
-
-class CmakeFileGenerator {
-public:
-    bool prepare(const Utils::FilePath &rootDir, bool check = true);
-    const FileQueue fileQueue() const;
-    void filterFileQueue(const Utils::FilePaths &keepFiles);
-    bool execute();
-    Utils::FilePaths invalidFileNames() const;
-
-private:
-    void generateMainCmake(const Utils::FilePath &rootDir);
-    void generateImportCmake(const Utils::FilePath &dir, const QString &modulePrefix = QString());
-    void generateModuleCmake(const Utils::FilePath &dir, const QString &moduleUri = QString());
-    bool generateEntryPointFiles(const Utils::FilePath &dir);
-    bool generateMainCpp(const Utils::FilePath &dir);
-    bool generateMainQml(const Utils::FilePath &dir);
-    QStringList getDirectoryQmls(const Utils::FilePath &dir);
-    QStringList getDirectoryResources(const Utils::FilePath &dir);
-    QStringList getSingletonsFromQmldirFile(const Utils::FilePath &filePath);
-    QStringList getDirectoryTreeQmls(const Utils::FilePath &dir);
-    QStringList getDirectoryTreeResources(const Utils::FilePath &dir);
-    void queueCmakeFile(const Utils::FilePath &filePath, const QString &content);
-    bool isFileResource(const QString &relativeFilePath);
-    bool isFileBlacklisted(const QString &fileName);
-    bool isDirBlacklisted(const Utils::FilePath &dir);
-    bool includeFile(const Utils::FilePath &filePath);
-    bool validFileName(const Utils::FilePath &filePath);
-
-private:
-    FileQueue m_fileQueue;
-    QStringList m_resourceFileLocations;
-    QStringList m_moduleNames;
-    bool m_checkFileIsInProject;
-
-    Utils::FilePaths m_invalidFileNames;
-};
-
-} //GenerateCmake
-
-} //QmlProjectManager
diff --git a/src/plugins/qmlprojectmanager/cmakegen/generatecmakelistsconstants.h b/src/plugins/qmlprojectmanager/cmakegen/generatecmakelistsconstants.h
deleted file mode 100644
index b983ce7fec..0000000000
--- a/src/plugins/qmlprojectmanager/cmakegen/generatecmakelistsconstants.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (C) 2021 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#ifndef GENERATECMAKELISTSCONSTANTS_H
-#define GENERATECMAKELISTSCONSTANTS_H
-
-#pragma once
-
-namespace QmlProjectManager {
-namespace GenerateCmake {
-namespace Constants {
-
-const char DIRNAME_CONTENT[] = "content";
-const char DIRNAME_IMPORT[] = "imports";
-const char DIRNAME_ASSET[] = "assets";
-const char DIRNAME_ASSETIMPORT[] = "asset_imports";
-const char DIRNAME_CPP[] = "src";
-const char DIRNAME_DESIGNER[] = "designer";
-
-const char FILENAME_CMAKELISTS[] = "CMakeLists.txt";
-const char FILENAME_APPMAINQML[] = "App.qml";
-const char FILENAME_MAINQML[] = "main.qml";
-const char FILENAME_MAINCPP[] = "main.cpp";
-const char FILENAME_MAINCPP_HEADER[] = "import_qml_plugins.h";
-const char FILENAME_MODULES[] = "qmlmodules";
-const char FILENAME_QMLDIR[] = "qmldir";
-const char FILENAME_ENV_HEADER[] = "app_environment.h";
-
-const char FILENAME_SUFFIX_QMLPROJECT[] = "qmlproject";
-const char FILENAME_SUFFIX_QML[] = "qml";
-const char FILENAME_SUFFIX_USER[] = "user";
-
-const char FILENAME_FILTER_QMLPROJECT[] = "*.qmlproject";
-const char FILENAME_FILTER_QML[] = "*.qml";
-
-const char ENV_VARIABLE_CONTROLCONF[] = "QT_QUICK_CONTROLS_CONF";
-
-} //Constants
-} //GenerateCmake
-} //QmlProjectManager
-
-#endif // GENERATECMAKELISTSCONSTANTS_H
diff --git a/src/plugins/qmlprojectmanager/cmakegen/qmlprojectappmainqml.tpl b/src/plugins/qmlprojectmanager/cmakegen/qmlprojectappmainqml.tpl
deleted file mode 100644
index 35f8218dc6..0000000000
--- a/src/plugins/qmlprojectmanager/cmakegen/qmlprojectappmainqml.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-import QtQuick
-import QtQuick.Window
-
-Window {
-    visible: true
-    title: "%1"
-    width: mainScreen.width
-    height: mainScreen.height
-
-    %1 {
-        id: mainScreen
-    }
-
-}
diff --git a/src/plugins/qmlprojectmanager/cmakegen/qmlprojectenvheader.tpl b/src/plugins/qmlprojectmanager/cmakegen/qmlprojectenvheader.tpl
deleted file mode 100644
index bf60adb4ac..0000000000
--- a/src/plugins/qmlprojectmanager/cmakegen/qmlprojectenvheader.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * This file is automatically generated by Qt Design Studio.
- * Do not change.
-*/
-
-#include <QGuiApplication>
-
-void set_qt_environment()
-{
-%1
-}
diff --git a/src/plugins/qmlprojectmanager/cmakegen/qmlprojectmaincppheader.tpl b/src/plugins/qmlprojectmanager/cmakegen/qmlprojectmaincppheader.tpl
deleted file mode 100644
index 60cef09a82..0000000000
--- a/src/plugins/qmlprojectmanager/cmakegen/qmlprojectmaincppheader.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * This file is automatically generated by Qt Design Studio.
- * Do not change.
-*/
-
-#include <QtQml/qqmlextensionplugin.h>
-
-%1
diff --git a/src/plugins/qmlprojectmanager/cmakegen/qmlprojectmainqml.tpl b/src/plugins/qmlprojectmanager/cmakegen/qmlprojectmainqml.tpl
deleted file mode 100644
index fa8f6d1cc1..0000000000
--- a/src/plugins/qmlprojectmanager/cmakegen/qmlprojectmainqml.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick
-import content
-
-App {
-}
-
diff --git a/src/plugins/qmlprojectmanager/cmakegen/qmlprojectmodulecmakelists.tpl b/src/plugins/qmlprojectmanager/cmakegen/qmlprojectmodulecmakelists.tpl
deleted file mode 100644
index 93573a1ed7..0000000000
--- a/src/plugins/qmlprojectmanager/cmakegen/qmlprojectmodulecmakelists.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-### This file is automatically generated by Qt Design Studio.
-### Do not change
-
-%1
-
-qt_add_library(%2 STATIC)
-qt6_add_qml_module(%2
-    URI "%3"
-    VERSION 1.0
-    RESOURCE_PREFIX "/qt/qml"
-%4
-)
diff --git a/src/plugins/qmlprojectmanager/cmakegen/qmlprojectmodules.tpl b/src/plugins/qmlprojectmanager/cmakegen/qmlprojectmodules.tpl
deleted file mode 100644
index 2b74c49af3..0000000000
--- a/src/plugins/qmlprojectmanager/cmakegen/qmlprojectmodules.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-### This file is automatically generated by Qt Design Studio.
-### Do not change
-
-qt6_add_qml_module(%1
-    URI "Main"
-    VERSION 1.0
-    RESOURCE_PREFIX "/qt/qml"
-    NO_PLUGIN
-    QML_FILES main.qml
-)
-
-%2
-
-target_link_libraries(%1 PRIVATE
-%3
-)
diff --git a/src/plugins/qmlprojectmanager/cmakegen/templates/cmakelists_txt_shared.tpl b/src/plugins/qmlprojectmanager/cmakegen/templates/cmakelists_txt_shared.tpl
new file mode 100644
index 0000000000..3db7152bff
--- /dev/null
+++ b/src/plugins/qmlprojectmanager/cmakegen/templates/cmakelists_txt_shared.tpl
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE QtCreatorProject>
+<qtcreator>
+  <data>
+  <variable>ProjectExplorer.Project.PluginSettings</variable>
+  <valuemap type="QVariantMap">
+   <valuelist type="QVariantList" key="ProjectExplorer.Project.Environment">
+    <value type="QString">QTC_DEFAULT_BUILD_DIRECTORY_TEMPLATE=../%{Asciify:%{Project:Name}-%{BuildConfig:Name}}</value>
+   </valuelist>
+  </valuemap>
+</data>
+<data>
+  <variable>Version</variable>
+  <value type="int">22</value>
+</data>
+</qtcreator>
diff --git a/src/plugins/qmlprojectmanager/cmakegen/gencmakemodule.tpl b/src/plugins/qmlprojectmanager/cmakegen/templates/cmakemodule_v1.tpl
index b81d253c90..25d894b347 100644
--- a/src/plugins/qmlprojectmanager/cmakegen/gencmakemodule.tpl
+++ b/src/plugins/qmlprojectmanager/cmakegen/templates/cmakemodule_v1.tpl
@@ -8,7 +8,6 @@ qt6_add_qml_module(%1
     URI "%2"
     VERSION 1.0
     RESOURCE_PREFIX "/qt/qml"
-%4
-)
+%4)
 
 %5
diff --git a/src/plugins/qmlprojectmanager/cmakegen/gencmakeroot.tpl b/src/plugins/qmlprojectmanager/cmakegen/templates/cmakeroot_v0.tpl
index a23a311c1a..a23a311c1a 100644
--- a/src/plugins/qmlprojectmanager/cmakegen/gencmakeroot.tpl
+++ b/src/plugins/qmlprojectmanager/cmakegen/templates/cmakeroot_v0.tpl
diff --git a/src/plugins/qmlprojectmanager/cmakegen/qmlprojectmaincmakelists.tpl b/src/plugins/qmlprojectmanager/cmakegen/templates/cmakeroot_v1.tpl
index 9ca0ace63b..a5d5e2bd02 100644
--- a/src/plugins/qmlprojectmanager/cmakegen/qmlprojectmaincmakelists.tpl
+++ b/src/plugins/qmlprojectmanager/cmakegen/templates/cmakeroot_v1.tpl
@@ -1,3 +1,4 @@
+
 cmake_minimum_required(VERSION 3.21.1)
 
 option(LINK_INSIGHT "Link Qt Insight Tracker library" ON)
@@ -5,6 +6,8 @@ option(BUILD_QDS_COMPONENTS "Build design studio components" ON)
 
 project(%1 LANGUAGES CXX)
 
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(QT_QML_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/qml)
@@ -19,34 +22,25 @@ if (Qt6_VERSION VERSION_GREATER_EQUAL 6.3)
     qt_standard_project_setup()
 endif()
 
-qt_add_executable(%1 src/main.cpp)
-
-qt_add_resources(%1 "configuration"
+qt_add_executable(${CMAKE_PROJECT_NAME})
+qt_add_resources(${CMAKE_PROJECT_NAME} "configuration"
     PREFIX "/"
-%2
-)
+    FILES
+%2)
 
-target_link_libraries(%1 PRIVATE
-    Qt${QT_VERSION_MAJOR}::Core
-    Qt${QT_VERSION_MAJOR}::Gui
-    Qt${QT_VERSION_MAJOR}::Quick
-    Qt${QT_VERSION_MAJOR}::Qml
-)
+include(qds)
 
 if (BUILD_QDS_COMPONENTS)
-    include(${CMAKE_CURRENT_SOURCE_DIR}/qmlcomponents)
+    include(qmlcomponents OPTIONAL)
 endif()
 
-include(${CMAKE_CURRENT_SOURCE_DIR}/qmlmodules)
-
 if (LINK_INSIGHT)
-    include(${CMAKE_CURRENT_SOURCE_DIR}/insight)
+    include(insight OPTIONAL)
 endif ()
 
 include(GNUInstallDirs)
-install(TARGETS %1
+install(TARGETS ${CMAKE_PROJECT_NAME}
   BUNDLE DESTINATION .
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 )
-
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/common/import_qml_components_plugins.h.tpl b/src/plugins/qmlprojectmanager/cmakegen/templates/environment_h.tpl
index 167481d7c7..d835c942f6 100644
--- a/share/qtcreator/qmldesigner/studio_templates/projects/common/import_qml_components_plugins.h.tpl
+++ b/src/plugins/qmlprojectmanager/cmakegen/templates/environment_h.tpl
@@ -3,8 +3,11 @@
  * Do not change.
 */
 
+#include <QGuiApplication>
 #include "qqmlextensionplugin.h"
 
+%1
+
 #ifdef BUILD_QDS_COMPONENTS
 
 Q_IMPORT_QML_PLUGIN(QtQuick_Studio_ComponentsPlugin)
@@ -17,3 +20,5 @@ Q_IMPORT_QML_PLUGIN(QtQuick_Studio_EventSimulatorPlugin)
 Q_IMPORT_QML_PLUGIN(QtQuick_Studio_EventSystemPlugin)
 
 #endif
+
+%2
diff --git a/src/plugins/qmlprojectmanager/cmakegen/gencmakeheadercomponents.tpl b/src/plugins/qmlprojectmanager/cmakegen/templates/import_qml_components_h.tpl
index 167481d7c7..84d3c1c777 100644
--- a/src/plugins/qmlprojectmanager/cmakegen/gencmakeheadercomponents.tpl
+++ b/src/plugins/qmlprojectmanager/cmakegen/templates/import_qml_components_h.tpl
@@ -17,3 +17,4 @@ Q_IMPORT_QML_PLUGIN(QtQuick_Studio_EventSimulatorPlugin)
 Q_IMPORT_QML_PLUGIN(QtQuick_Studio_EventSystemPlugin)
 
 #endif
+
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/common/insight.tpl b/src/plugins/qmlprojectmanager/cmakegen/templates/insight.tpl
index 8245e31f0d..8245e31f0d 100644
--- a/share/qtcreator/qmldesigner/studio_templates/projects/common/insight.tpl
+++ b/src/plugins/qmlprojectmanager/cmakegen/templates/insight.tpl
diff --git a/src/plugins/qmlprojectmanager/cmakegen/qmlprojectmaincpp.tpl b/src/plugins/qmlprojectmanager/cmakegen/templates/main_cpp_v0.tpl
index 0ff9201d91..0ff9201d91 100644
--- a/src/plugins/qmlprojectmanager/cmakegen/qmlprojectmaincpp.tpl
+++ b/src/plugins/qmlprojectmanager/cmakegen/templates/main_cpp_v0.tpl
diff --git a/src/plugins/qmlprojectmanager/cmakegen/templates/main_cpp_v1.tpl b/src/plugins/qmlprojectmanager/cmakegen/templates/main_cpp_v1.tpl
new file mode 100644
index 0000000000..4d2a526d76
--- /dev/null
+++ b/src/plugins/qmlprojectmanager/cmakegen/templates/main_cpp_v1.tpl
@@ -0,0 +1,31 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+
+#include <QGuiApplication>
+#include <QQmlApplicationEngine>
+
+#include "autogen/environment.h"
+
+int main(int argc, char *argv[])
+{
+    set_qt_environment();
+    QGuiApplication app(argc, argv);
+
+    QQmlApplicationEngine engine;
+    const QUrl url(mainQmlFile);
+    QObject::connect(
+                &engine, &QQmlApplicationEngine::objectCreated, &app,
+                [url](QObject *obj, const QUrl &objUrl) {
+        if (!obj && url == objUrl)
+            QCoreApplication::exit(-1);
+    }, Qt::QueuedConnection);
+
+    engine.addImportPath(QCoreApplication::applicationDirPath() + "/qml");
+    engine.addImportPath(":/");
+    engine.load(url);
+
+    if (engine.rootObjects().isEmpty())
+        return -1;
+
+    return app.exec();
+}
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/common/qmlcomponents.tpl b/src/plugins/qmlprojectmanager/cmakegen/templates/qmlcomponents.tpl
index 2e940be032..a9f20243a6 100644
--- a/share/qtcreator/qmldesigner/studio_templates/projects/common/qmlcomponents.tpl
+++ b/src/plugins/qmlprojectmanager/cmakegen/templates/qmlcomponents.tpl
@@ -8,7 +8,7 @@ set(QT_QML_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/qml")
 include(FetchContent)
 FetchContent_Declare(
     ds
-    GIT_TAG qds-4.4
+    GIT_TAG qds-4.5
     GIT_REPOSITORY https://code.qt.io/qt-labs/qtquickdesigner-components.git
 )
 
diff --git a/src/plugins/qmlprojectmanager/cmakegen/templates/qtquickcontrols2_conf.tpl b/src/plugins/qmlprojectmanager/cmakegen/templates/qtquickcontrols2_conf.tpl
new file mode 100644
index 0000000000..eb1f825a38
--- /dev/null
+++ b/src/plugins/qmlprojectmanager/cmakegen/templates/qtquickcontrols2_conf.tpl
@@ -0,0 +1,7 @@
+; This file can be edited to change the style of the application
+; Read "Qt Quick Controls 2 Configuration File" for details:
+; http://doc.qt.io/qt-5/qtquickcontrols2-configuration.html
+
+[Controls]
+Style=Basic
+
diff --git a/src/plugins/qmlprojectmanager/qmlprojectgen/qmlprojectgenerator.cpp b/src/plugins/qmlprojectmanager/qmlprojectgen/qmlprojectgenerator.cpp
index 32506183fa..0270a290fd 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectgen/qmlprojectgenerator.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectgen/qmlprojectgenerator.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "qmlprojectgenerator.h"
-#include "../cmakegen/generatecmakelists.h"
+#include "../cmakegen/cmakewriter.h"
 #include "../qmlprojectmanagertr.h"
 
 #include <coreplugin/documentmanager.h>
@@ -61,7 +61,7 @@ bool QmlProjectFileGenerator::execute()
     importDirs.removeAll("content");
     const QString importPaths = createDirArrayEntry("importPaths", importDirs);
 
-    const QString fileContent = GenerateCmake::readTemplate(QMLPROJECT_FILE_TEMPLATE_PATH)
+    const QString fileContent = GenerateCmake::CMakeWriter::readTemplate(QMLPROJECT_FILE_TEMPLATE_PATH)
             .arg(contentEntry, imageEntry, jsEntry, assetEntry, importPaths);
 
     QFile file(m_targetFile.toString());
diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs b/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
index 76fcd70157..0fa49b5102 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
+++ b/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
@@ -47,14 +47,10 @@ QtcPlugin {
         name: "CMake Generator"
         prefix: "cmakegen/"
         files: [
-            "generatecmakelists.cpp", "generatecmakelists.h",
-            "generatecmakelistsconstants.h",
-            "checkablefiletreeitem.cpp", "checkablefiletreeitem.h",
             "cmakegenerator.cpp", "cmakegenerator.h",
-            "cmakegeneratordialogtreemodel.cpp", "cmakegeneratordialogtreemodel.h",
-            "cmakegeneratordialog.cpp", "cmakegeneratordialog.h",
-            "cmakeprojectconverter.cpp", "cmakeprojectconverter.h",
-            "cmakeprojectconverterdialog.cpp", "cmakeprojectconverterdialog.h",
+            "cmakewriter.cpp", "cmakewriter.h",
+            "cmakewriterv0.cpp", "cmakewriterv0.h",
+            "cmakewriterv1.cpp", "cmakewriterv1.h"
         ]
     }
 
diff --git a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
index 62abce5fe9..1bc61c3b82 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
@@ -9,8 +9,7 @@
 #include "qmlprojectmanagertr.h"
 #include "qmlprojectrunconfiguration.h"
 #include "projectfilecontenttools.h"
-#include "cmakegen/cmakeprojectconverter.h"
-#include "cmakegen/generatecmakelists.h"
+#include "cmakegen/cmakegenerator.h"
 
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/actionmanager.h>
@@ -101,11 +100,6 @@ static void clearAlwaysOpenWithMode()
     ICore::settings()->remove(QmlProjectManager::Constants::ALWAYS_OPEN_UI_MODE);
 }
 
-class QmlProjectPluginPrivate
-{
-public:
-};
-
 void openQDS(const FilePath &fileName)
 {
     const FilePath qdsPath = qdsInstallationEntry();
@@ -230,6 +224,26 @@ static QmlBuildSystem *qmlBuildSystemforFileNode(const FileNode *fileNode)
     return nullptr;
 }
 
+class ExternalDesignStudioFactory : public Core::IEditorFactory
+{
+public:
+    ExternalDesignStudioFactory()
+    {
+        setId("Qt.QtDesignStudio");
+        setDisplayName(Tr::tr("Qt Design Studio"));
+        setMimeTypes({Utils::Constants::QMLUI_MIMETYPE});
+        setEditorStarter([](const FilePath &filePath, [[maybe_unused]] QString *errorMessage) {
+            openInQDSWithProject(filePath);
+            return true;
+        });
+    }
+};
+
+void setupExternalDesignStudio()
+{
+    static ExternalDesignStudioFactory theExternalDesignStudioFactory;
+}
+
 class QmlProjectPlugin final : public ExtensionSystem::IPlugin
 {
     Q_OBJECT
@@ -275,6 +289,7 @@ private:
 void QmlProjectPlugin::initialize()
 {
     setupQmlProjectRunConfiguration();
+    setupExternalDesignStudio();
 
     if (!qmlDesignerEnabled()) {
         m_landingPage = new QdsLandingPage();
@@ -386,11 +401,9 @@ void QmlProjectPlugin::initialize()
                         mainUifileAction->setEnabled(buildSystem->mainUiFilePath()
                                                      != fileNode->filePath());
                 });
-    }
 
-    GenerateCmake::generateMenuEntry(this);
-    if (ICore::isQtDesignStudio())
-        GenerateCmake::CmakeProjectConverter::generateMenuEntry(this);
+        GenerateCmake::CMakeGenerator::createMenuAction(this);
+    }
 }
 
 void QmlProjectPlugin::displayQmlLandingPage()
diff --git a/src/plugins/qtapplicationmanager/appmanagerplugin.cpp b/src/plugins/qtapplicationmanager/appmanagerplugin.cpp
index f100f53b34..3afd7705b4 100644
--- a/src/plugins/qtapplicationmanager/appmanagerplugin.cpp
+++ b/src/plugins/qtapplicationmanager/appmanagerplugin.cpp
@@ -36,6 +36,7 @@ class AppManagerPlugin final : public ExtensionSystem::IPlugin
         setupAppManagerRunWorker();
         setupAppManagerDebugWorker();
         setupAppManagerQmlToolingWorker();
+        setupAppManagerPerfProfilerWorker();
     }
 };
 
diff --git a/src/plugins/qtapplicationmanager/appmanagerruncontrol.cpp b/src/plugins/qtapplicationmanager/appmanagerruncontrol.cpp
index bfcda6e287..ac4b0c26c1 100644
--- a/src/plugins/qtapplicationmanager/appmanagerruncontrol.cpp
+++ b/src/plugins/qtapplicationmanager/appmanagerruncontrol.cpp
@@ -15,6 +15,8 @@
 #include <debugger/debuggerruncontrol.h>
 #include <debugger/debuggerkitaspect.h>
 
+#include <perfprofiler/perfprofilerconstants.h>
+
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/buildsystem.h>
 #include <projectexplorer/buildtargetinfo.h>
@@ -99,15 +101,10 @@ public:
         setId(AppManager::Constants::DEBUG_LAUNCHER_ID);
         setEssential(true);
 
-        connect(&m_launcher, &Process::started, this, &RunWorker::reportStarted);
-        connect(&m_launcher, &Process::done, this, &RunWorker::reportStopped);
-
-        connect(&m_launcher, &Process::readyReadStandardOutput, this, [this] {
-            appendMessage(m_launcher.readAllStandardOutput(), StdOutFormat);
-        });
-        connect(&m_launcher, &Process::readyReadStandardError, this, [this] {
-            appendMessage(m_launcher.readAllStandardError(), StdErrFormat);
-        });
+        if (usePerf) {
+            suppressDefaultStdOutHandling();
+            runControl->setProperty("PerfProcess", QVariant::fromValue(process()));
+        }
 
         m_portsGatherer = new Debugger::DebugServerPortsGatherer(runControl);
         m_portsGatherer->setUseGdbServer(useGdbServer || usePerf);
@@ -123,7 +120,6 @@ public:
             if (auto envAspect = runControl->aspectData<EnvironmentAspect>())
                 envVars = envAspect->environment.toStringList();
 
-//            const int perfPort = m_portsGatherer->gdbServer().port();
             const int gdbServerPort = m_portsGatherer->gdbServer().port();
             const int qmlServerPort = m_portsGatherer->qmlServer().port();
 
@@ -147,14 +143,10 @@ public:
                 }
                 cmd.addArg(debugArgs.join(' '));
             }
-            //FIXME UNTESTED CODE
             if (m_usePerf) {
-                Store settingsData = runControl->settingsData("Analyzer.Perf.Settings");
-                QVariant perfRecordArgs = settingsData.value("Analyzer.Perf.RecordArguments");
-                QString args =  Utils::transform(perfRecordArgs.toStringList(), [](QString arg) {
-                                   return arg.replace(',', ",,");
-                               }).join(',');
-                cmd.addArg(QString("perf record %1 -o - --").arg(args));
+                const Store perfArgs = runControl->settingsData(PerfProfiler::Constants::PerfSettingsId);
+                const QString recordArgs = perfArgs[PerfProfiler::Constants::PerfRecordArgsId].toString();
+                cmd.addArg(QString("perf record %1 -o - --").arg(recordArgs));
             }
 
             cmd.addArg("-eio");
@@ -185,7 +177,6 @@ private:
     bool m_useGdbServer;
     bool m_useQmlServer;
     QmlDebug::QmlDebugServicesPreset m_qmlServices;
-    Process m_launcher;
 };
 
 
@@ -300,6 +291,25 @@ private:
     RunWorker *m_worker = nullptr;
 };
 
+// AppManagerDevicePerfProfilerSupport
+
+class AppManagerPerfProfilerSupport final : public RunWorker
+{
+public:
+    explicit AppManagerPerfProfilerSupport(RunControl *runControl)
+        : RunWorker(runControl)
+    {
+        setId("AppManagerPerfProfilerSupport");
+
+        m_profilee = new AppManInferiorRunner(runControl, true, false, false,
+                                              QmlDebug::NoQmlDebugServices);
+        addStartDependency(m_profilee);
+        addStopDependency(m_profilee);
+    }
+
+private:
+    AppManInferiorRunner *m_profilee = nullptr;
+};
 
 // Factories
 
@@ -338,6 +348,17 @@ public:
     }
 };
 
+class AppManagerPerfProfilerWorkerFactory final : public RunWorkerFactory
+{
+public:
+    AppManagerPerfProfilerWorkerFactory()
+    {
+        setProduct<AppManagerPerfProfilerSupport>();
+        addSupportedRunMode("PerfRecorder");
+        addSupportedRunConfig(Constants::RUNANDDEBUGCONFIGURATION_ID);
+    }
+};
+
 void setupAppManagerRunWorker()
 {
     static AppManagerRunWorkerFactory theAppManagerRunWorkerFactory;
@@ -353,4 +374,9 @@ void setupAppManagerQmlToolingWorker()
     static AppManagerQmlToolingWorkerFactory theAppManagerQmlToolingWorkerFactory;
 }
 
+void setupAppManagerPerfProfilerWorker()
+{
+    static AppManagerPerfProfilerWorkerFactory theAppManagerPerfProfilerWorkerFactory;
+}
+
 } // AppManager::Internal
diff --git a/src/plugins/qtapplicationmanager/appmanagerruncontrol.h b/src/plugins/qtapplicationmanager/appmanagerruncontrol.h
index b98f462c29..3530d4d10b 100644
--- a/src/plugins/qtapplicationmanager/appmanagerruncontrol.h
+++ b/src/plugins/qtapplicationmanager/appmanagerruncontrol.h
@@ -10,5 +10,6 @@ namespace AppManager::Internal {
 void setupAppManagerRunWorker();
 void setupAppManagerDebugWorker();
 void setupAppManagerQmlToolingWorker();
+void setupAppManagerPerfProfilerWorker();
 
 } // AppManager::Internal
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp
index f94ff8ccf2..a8d940c6ef 100644
--- a/src/plugins/qtsupport/baseqtversion.cpp
+++ b/src/plugins/qtsupport/baseqtversion.cpp
@@ -11,6 +11,8 @@
 #include "qtversionfactory.h"
 #include "qtversionmanager.h"
 
+#include <android/androidconstants.h>
+
 #include <coreplugin/icore.h>
 #include <coreplugin/progressmanager/progressmanager.h>
 
@@ -837,8 +839,11 @@ bool QtVersion::hasQtAbisSet() const
 
 Abis QtVersion::qtAbis() const
 {
-    if (!d->m_data.qtAbis)
+    if (!d->m_data.qtAbis
+        // QTCREATORBUG-30568 give AndroidQtVersion a "second chance" to detect Qt Abis
+        || (d->m_type == Android::Constants::ANDROID_QT_TYPE && d->m_data.qtAbis->isEmpty())) {
         d->m_data.qtAbis = detectQtAbis();
+    }
 
     return *d->m_data.qtAbis;
 }
diff --git a/src/plugins/qtsupport/examplesparser.cpp b/src/plugins/qtsupport/examplesparser.cpp
index 678a3a3139..a335773b3e 100644
--- a/src/plugins/qtsupport/examplesparser.cpp
+++ b/src/plugins/qtsupport/examplesparser.cpp
@@ -373,9 +373,9 @@ QList<std::pair<Core::Section, QList<ExampleItem *>>> getCategories(const QList<
             // order "known" categories as wanted, others come afterwards
             const int defaultIndex = defaultOrder.indexOf(it->first);
             const int priority = defaultIndex >= 0 ? defaultIndex : (index + defaultOrderSize);
-            const std::optional<int> maxRows = restrictRows
-                                                   ? std::make_optional<int>(index == 0 ? 2 : 1)
-                                                   : std::nullopt;
+            const std::optional<int> maxRows = restrictRows ? std::make_optional<int>(
+                                                   defaultIndex == 0 ? 2 : 1)
+                                                            : std::nullopt;
             categories.append({{it->first, priority, maxRows}, it->second});
             ++index;
         }
diff --git a/src/plugins/remotelinux/genericdeploystep.cpp b/src/plugins/remotelinux/genericdeploystep.cpp
index 3d1f0e5e3a..0002e69f5f 100644
--- a/src/plugins/remotelinux/genericdeploystep.cpp
+++ b/src/plugins/remotelinux/genericdeploystep.cpp
@@ -101,7 +101,7 @@ GroupItem GenericDeployStep::mkdirTask(const Storage<FilesToTransfer> &storage)
         const int numResults = async.future().resultCount();
         if (numResults == 0) {
             addErrorMessage(
-                Tr::tr("Unknown error occurred while trying to create remote directories") + '\n');
+                Tr::tr("Unknown error occurred while trying to create remote directories.") + '\n');
             return;
         }
 
diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp
index 8afafabded..f89767de0a 100644
--- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp
+++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp
@@ -105,6 +105,13 @@ GenericLinuxDeviceConfigurationWidget::GenericLinuxDeviceConfigurationWidget(
     auto sshPortLabel = new QLabel(Tr::tr("&SSH port:"));
     sshPortLabel->setBuddy(m_sshPortSpinBox);
 
+    m_useSshPortForwardingForDebugging = new QCheckBox;
+    m_useSshPortForwardingForDebugging->setText(Tr::tr("Use SSH port forwarding for debugging"));
+    m_useSshPortForwardingForDebugging
+        ->setToolTip(Tr::tr("Enable debugging on remote targes which cannot expose gdbserver ports.\n"
+                            "The ssh tunneling is used to map the remote gdbserver port to localhost.\n"
+                            "The local and remote ports are determined automatically."));
+
     using namespace Layouting;
 
     Form {
@@ -117,7 +124,8 @@ GenericLinuxDeviceConfigurationWidget::GenericLinuxDeviceConfigurationWidget(
         Tr::tr("GDB server executable:"), m_gdbServerLineEdit, br,
         Tr::tr("QML runtime executable:"), m_qmlRuntimeLineEdit, br,
         QString(), m_sourceProfileCheckBox, br,
-        Tr::tr("Access via:"), m_linkDeviceComboBox
+        QString(), m_useSshPortForwardingForDebugging, br,
+        Tr::tr("Access via:"), m_linkDeviceComboBox, br,
     }.attachTo(this);
 
     connect(m_hostLineEdit, &QLineEdit::editingFinished,
@@ -152,6 +160,8 @@ GenericLinuxDeviceConfigurationWidget::GenericLinuxDeviceConfigurationWidget(
             this, &GenericLinuxDeviceConfigurationWidget::sourceProfileCheckingChanged);
     connect(m_linkDeviceComboBox, &QComboBox::currentIndexChanged,
             this, &GenericLinuxDeviceConfigurationWidget::linkDeviceChanged);
+    connect(m_useSshPortForwardingForDebugging, &QCheckBox::toggled,
+            this, &GenericLinuxDeviceConfigurationWidget::sshPortForwardingForDebugging);
 
     initGui();
 }
@@ -253,6 +263,11 @@ void GenericLinuxDeviceConfigurationWidget::linkDeviceChanged(int index)
     device()->setExtraData(Constants::LinkDevice, deviceId);
 }
 
+void GenericLinuxDeviceConfigurationWidget::sshPortForwardingForDebugging(bool on)
+{
+    device()->setExtraData(Constants::SshForwardDebugServerPort, on);
+}
+
 void GenericLinuxDeviceConfigurationWidget::updateDeviceFromUi()
 {
     hostNameEditingFinished();
@@ -266,6 +281,7 @@ void GenericLinuxDeviceConfigurationWidget::updateDeviceFromUi()
     timeoutEditingFinished();
     sourceProfileCheckingChanged(m_sourceProfileCheckBox->isChecked());
     linkDeviceChanged(m_linkDeviceComboBox->currentIndex());
+    sshPortForwardingForDebugging(m_useSshPortForwardingForDebugging->isChecked());
     qmlRuntimeEditingFinished();
 }
 
@@ -331,6 +347,7 @@ void GenericLinuxDeviceConfigurationWidget::initGui()
         sshParams.authenticationType == SshParameters::AuthenticationTypeSpecificKey);
     m_gdbServerLineEdit->setFilePath(device()->debugServerPath());
     m_qmlRuntimeLineEdit->setFilePath(device()->qmlRunCommand());
+    m_useSshPortForwardingForDebugging->setChecked(device()->extraData(Constants::SshForwardDebugServerPort).toBool());
 
     updatePortsWarningLabel();
 }
diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.h b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.h
index aba251b969..cc007ec6ef 100644
--- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.h
+++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.h
@@ -45,6 +45,7 @@ private:
     void hostKeyCheckingChanged(bool doCheck);
     void sourceProfileCheckingChanged(bool doCheck);
     void linkDeviceChanged(int index);
+    void sshPortForwardingForDebugging(bool on);
 
     void updateDeviceFromUi() override;
     void updatePortsWarningLabel();
@@ -66,6 +67,7 @@ private:
     Utils::PathChooser *m_qmlRuntimeLineEdit;
     QCheckBox *m_sourceProfileCheckBox;
     QComboBox *m_linkDeviceComboBox;
+    QCheckBox *m_useSshPortForwardingForDebugging;
 };
 
 } // RemoteLinux::Internal
diff --git a/src/plugins/remotelinux/linuxdevice.cpp b/src/plugins/remotelinux/linuxdevice.cpp
index 31195e8cfa..8d3b46eb1b 100644
--- a/src/plugins/remotelinux/linuxdevice.cpp
+++ b/src/plugins/remotelinux/linuxdevice.cpp
@@ -15,6 +15,8 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/messagemanager.h>
 
+#include <extensionsystem/pluginmanager.h>
+
 #include <projectexplorer/devicesupport/devicemanager.h>
 #include <projectexplorer/devicesupport/filetransfer.h>
 #include <projectexplorer/devicesupport/filetransferinterface.h>
@@ -23,7 +25,10 @@
 #include <projectexplorer/devicesupport/sshsettings.h>
 #include <projectexplorer/projectexplorerconstants.h>
 
+#include <solutions/tasking/tasktreerunner.h>
+
 #include <utils/algorithm.h>
+#include <utils/async.h>
 #include <utils/devicefileaccess.h>
 #include <utils/deviceshell.h>
 #include <utils/environment.h>
@@ -31,11 +36,12 @@
 #include <utils/infobar.h>
 #include <utils/port.h>
 #include <utils/portlist.h>
-#include <utils/qtcprocess.h>
 #include <utils/processinfo.h>
 #include <utils/qtcassert.h>
+#include <utils/qtcprocess.h>
 #include <utils/stringutils.h>
 #include <utils/temporaryfile.h>
+#include <utils/threadutils.h>
 
 #include <QApplication>
 #include <QDateTime>
@@ -666,6 +672,12 @@ void SshProcessInterfacePrivate::start()
             cmd.addCommandLineAsSingleArg(inner);
         }
 
+        const auto forwardPort = q->m_setup.m_extraData.value(Constants::SshForwardPort).toString();
+        if (!forwardPort.isEmpty()) {
+            cmd.addArg("-L");
+            cmd.addArg(QString("%1:localhost:%1").arg(forwardPort));
+        }
+
         m_process.setProcessImpl(q->m_setup.m_processImpl);
         m_process.setProcessMode(q->m_setup.m_processMode);
         m_process.setTerminalMode(q->m_setup.m_terminalMode);
@@ -680,11 +692,12 @@ void SshProcessInterfacePrivate::start()
         return;
     }
 
-    m_useConnectionSharing = SshSettings::connectionSharingEnabled();
+    m_useConnectionSharing = SshSettings::connectionSharingEnabled() && !q->m_setup.m_extraData.value(Constants::DisableSharing).toBool();
 
     // TODO: Do we really need it for master process?
     m_sshParameters.x11DisplayName
             = q->m_setup.m_extraData.value("Ssh.X11ForwardToDisplay").toString();
+
     if (m_useConnectionSharing) {
         m_connecting = true;
         m_connectionHandle.reset(new SshConnectionHandle(m_device));
@@ -769,6 +782,12 @@ CommandLine SshProcessInterfacePrivate::fullLocalCommandLine() const
 
     cmd.addArg("-q");
 
+    const auto forwardPort = q->m_setup.m_extraData.value(Constants::SshForwardPort).toString();
+    if (!forwardPort.isEmpty()) {
+        cmd.addArg("-L");
+        cmd.addArg(QString("%1:localhost:%1").arg(forwardPort));
+    }
+
     cmd.addArgs(m_sshParameters.connectionOptions(sshBinary));
     if (!m_socketFilePath.isEmpty())
         cmd.addArgs({"-o", "ControlPath=" + m_socketFilePath});
@@ -1561,8 +1580,28 @@ private:
     QHash<FilePath, FilesToTransfer> m_batches;
 };
 
+static void createDir(QPromise<expected_str<void>> &promise, const FilePath &pathToCreate)
+{
+    const expected_str<void> result = pathToCreate.ensureWritableDir();
+    promise.addResult(result);
+
+    if (!result)
+        promise.future().cancel();
+};
+
+static void copyFile(QPromise<expected_str<void>> &promise, const FileToTransfer &file)
+{
+    const expected_str<void> result = file.m_source.copyFile(file.m_target);
+    promise.addResult(result);
+
+    if (!result)
+        promise.future().cancel();
+};
+
 class GenericTransferImpl : public FileTransferInterface
 {
+    Tasking::TaskTreeRunner m_taskTree;
+
 public:
     GenericTransferImpl(const FileTransferSetupData &setup)
         : FileTransferInterface(setup)
@@ -1571,56 +1610,80 @@ public:
 private:
     void start() final
     {
-        m_fileCount = m_setup.m_files.size();
-        m_currentIndex = 0;
-        m_checkedDirectories.clear();
-        nextFile();
-    }
-
-    void nextFile()
-    {
-        ProcessResultData result;
-        if (m_currentIndex >= m_fileCount) {
-            emit done(result);
-            return;
-        }
-
-        const FileToTransfer &file = m_setup.m_files.at(m_currentIndex);
-        const FilePath &source = file.m_source;
-        const FilePath &target = file.m_target;
-        ++m_currentIndex;
-
-        const FilePath targetDir = target.parentDir();
-        if (!m_checkedDirectories.contains(targetDir)) {
-            emit progress(Tr::tr("Creating directory: %1\n").arg(targetDir.toUserOutput()));
-            if (!targetDir.ensureWritableDir()) {
-                result.m_errorString = Tr::tr("Failed.");
-                result.m_exitCode = -1; // Random pick
-                emit done(result);
-                return;
+        using namespace Tasking;
+
+        const QSet<FilePath> allParentDirs
+            = Utils::transform<QSet>(m_setup.m_files, [](const FileToTransfer &f) {
+                  return f.m_target.parentDir();
+              });
+
+        const LoopList iteratorParentDirs(QList(allParentDirs.cbegin(), allParentDirs.cend()));
+
+        const auto onCreateDirSetup = [iteratorParentDirs](Async<expected_str<void>> &async) {
+            async.setConcurrentCallData(createDir, *iteratorParentDirs);
+            if (Utils::isMainThread())
+                async.setFutureSynchronizer(ExtensionSystem::PluginManager::futureSynchronizer());
+        };
+
+        const auto onCreateDirDone = [this,
+                                      iteratorParentDirs](const Async<expected_str<void>> &async) {
+            const expected_str<void> result = async.result();
+            if (result)
+                emit progress(
+                    Tr::tr("Created directory: %1\n").arg(iteratorParentDirs->toUserOutput()));
+            else
+                emit progress(result.error());
+        };
+
+        const LoopList iterator(m_setup.m_files);
+        const Storage<int> counterStorage;
+
+        const auto onCopySetup = [iterator](Async<expected_str<void>> &async) {
+            async.setConcurrentCallData(copyFile, *iterator);
+            if (Utils::isMainThread())
+                async.setFutureSynchronizer(ExtensionSystem::PluginManager::futureSynchronizer());
+        };
+
+        const auto onCopyDone = [this, iterator, counterStorage](
+                                    const Async<expected_str<void>> &async) {
+            const expected_str<void> result = async.result();
+            int &counter = *counterStorage;
+            ++counter;
+
+            if (result) {
+                emit progress(Tr::tr("Copied %1/%2: %3 -> %4\n")
+                                  .arg(counter)
+                                  .arg(m_setup.m_files.size())
+                                  .arg(iterator->m_source.toUserOutput())
+                                  .arg(iterator->m_target.toUserOutput()));
+            } else {
+                emit progress(result.error() + "\n");
             }
-            m_checkedDirectories.insert(targetDir);
-        }
-
-        emit progress(Tr::tr("Copying %1/%2: %3 -> %4\n")
-                          .arg(m_currentIndex)
-                          .arg(m_fileCount)
-                          .arg(source.toUserOutput(), target.toUserOutput()));
-        expected_str<void> copyResult = source.copyFile(target);
-        if (!copyResult) {
-            result.m_errorString = Tr::tr("Failed: %1").arg(copyResult.error());
-            result.m_exitCode = -1; // Random pick
-            emit done(result);
-            return;
-        }
-
-        // FIXME: Use asyncCopyFile instead
-        nextFile();
+        };
+
+        const Group group{
+            Group{
+                parallelIdealThreadCountLimit,
+                iteratorParentDirs,
+                AsyncTask<expected_str<void>>(onCreateDirSetup, onCreateDirDone),
+            },
+            Group{
+                parallelLimit(2),
+                iterator,
+                counterStorage,
+                AsyncTask<expected_str<void>>(onCopySetup, onCopyDone),
+            },
+        };
+
+        m_taskTree.start(group, {}, [this](DoneWith result) {
+            ProcessResultData resultData;
+            if (result != DoneWith::Success) {
+                resultData.m_exitCode = -1;
+                resultData.m_errorString = Tr::tr("Failed to deploy files.");
+            }
+            emit done(resultData);
+        });
     }
-
-    int m_currentIndex = 0;
-    int m_fileCount = 0;
-    QSet<FilePath> m_checkedDirectories;
 };
 
 FileTransferInterface *LinuxDevice::createFileTransferInterface(
diff --git a/src/plugins/remotelinux/linuxdevicetester.cpp b/src/plugins/remotelinux/linuxdevicetester.cpp
index 2f0e43dfb5..d6ab3a9745 100644
--- a/src/plugins/remotelinux/linuxdevicetester.cpp
+++ b/src/plugins/remotelinux/linuxdevicetester.cpp
@@ -5,6 +5,7 @@
 
 #include "linuxdevice.h"
 #include "remotelinuxtr.h"
+#include "utils/async.h"
 
 #include <extensionsystem/pluginmanager.h>
 
@@ -107,7 +108,7 @@ GroupItem GenericLinuxDeviceTesterPrivate::connectionTask() const
         const bool success = task.isResultAvailable() && task.result();
         if (success) {
             // TODO: For master: move the '\n' outside of Tr().
-            emit q->progressMessage(Tr::tr("Connected. Now doing extended checks.\n"));
+            emit q->progressMessage(Tr::tr("Connected. Now doing extended checks.") + "\n");
         } else {
             emit q->errorMessage(
                 Tr::tr("Basic connectivity test failed, device is considered unusable.") + '\n');
diff --git a/src/plugins/remotelinux/remotelinux_constants.h b/src/plugins/remotelinux/remotelinux_constants.h
index 90e3482646..a562164dfd 100644
--- a/src/plugins/remotelinux/remotelinux_constants.h
+++ b/src/plugins/remotelinux/remotelinux_constants.h
@@ -21,6 +21,9 @@ const char KillAppStepId[] = "RemoteLinux.KillAppStep";
 
 const char SourceProfile[] = "RemoteLinux.SourceProfile";
 const char LinkDevice[] = "RemoteLinux.LinkDevice";
+const char SshForwardDebugServerPort[] = "RemoteLinux.SshForwardDebugServerPort";
+const char SshForwardPort[] = "RemoteLinux.SshForwardPort";
+const char DisableSharing[] = "RemoteLinux.DisableSharing";
 
 const char RunConfigId[] = "RemoteLinuxRunConfiguration:";
 const char CustomRunConfigId[] = "RemoteLinux.CustomRunConfig";
diff --git a/src/plugins/saferenderer/SafeRenderer.json.in b/src/plugins/saferenderer/SafeRenderer.json.in
index ae60bb3f02..0f569e539c 100644
--- a/src/plugins/saferenderer/SafeRenderer.json.in
+++ b/src/plugins/saferenderer/SafeRenderer.json.in
@@ -16,5 +16,7 @@
     "Category" : "Device Support",
     "Description" : "Helper plugin for Qt Safe Renderer projects.",
     "Url" : "https://www.qt.io",
-    ${IDE_PLUGIN_DEPENDENCIES}
+    ${IDE_PLUGIN_DEPENDENCIES},
+
+    "JsonWizardPaths" : [":/saferenderer/wizards/"]
 }
diff --git a/src/plugins/saferenderer/saferenderer.cpp b/src/plugins/saferenderer/saferenderer.cpp
index 115b7c8728..d87ba118e1 100644
--- a/src/plugins/saferenderer/saferenderer.cpp
+++ b/src/plugins/saferenderer/saferenderer.cpp
@@ -20,9 +20,6 @@ bool SafeRendererPlugin::initialize(const QStringList &arguments, QString *error
     Q_UNUSED(arguments)
     Q_UNUSED(errorString)
 
-    // Add Qt Creator project wizard path
-    ProjectExplorer::JsonWizardFactory::addWizardPath(":/saferenderer/wizards/");
-
     return true;
 }
 
diff --git a/src/plugins/saferenderer/wizards/qsrapp2_1/main.qml.tpl b/src/plugins/saferenderer/wizards/qsrapp2_1/main.qml.tpl
index 94fccebcb2..9f3130bbf0 100644
--- a/src/plugins/saferenderer/wizards/qsrapp2_1/main.qml.tpl
+++ b/src/plugins/saferenderer/wizards/qsrapp2_1/main.qml.tpl
@@ -1,5 +1,5 @@
-import Qt.SafeRenderer 2.0
-import QtQuick.Window 2.15
+import Qt.SafeRenderer
+import QtQuick.Window
 
 Window {
     id: window
@@ -14,13 +14,12 @@ Window {
         x: 206
         y: 208
         width: 340
-        height: 34
+        height: 40
         color: "#8ae234"
         fillColor: "black"
         text: "Hello Qt Safe Renderer!"
         font.family: "Lato"
         horizontalAlignment: Text.AlignLeft
         font.pixelSize: 32
-        runtimeEditable: true
     }
 }
diff --git a/src/plugins/scxmleditor/plugin_interface/tagtextitem.cpp b/src/plugins/scxmleditor/plugin_interface/tagtextitem.cpp
index 1613d59927..791a704db1 100644
--- a/src/plugins/scxmleditor/plugin_interface/tagtextitem.cpp
+++ b/src/plugins/scxmleditor/plugin_interface/tagtextitem.cpp
@@ -7,6 +7,7 @@
 #include <QGraphicsSceneHoverEvent>
 #include <QLabel>
 #include <QPainter>
+#include <QTextDocument>
 
 using namespace ScxmlEditor::PluginInterface;
 
@@ -17,7 +18,10 @@ TagTextItem::TagTextItem(QGraphicsItem *parent)
     setFlag(ItemIsFocusable, true);
     setFlag(ItemIsSelectable, true);
     m_textItem = new TextItem(this);
-    connect(m_textItem, &TextItem::textChanged, this, [this] { emit textChanged(); });
+    connect(m_textItem, &TextItem::textChanged, this, [this] {
+        m_textItem->setTextWidth(m_maxWidth);
+        emit textChanged();
+    });
     connect(m_textItem, &TextItem::textReady,
             this, [this](const QString &text) { emit textReady(text); });
     connect(m_textItem, &TextItem::selected, this, [this](bool sel) { emit selected(sel); });
@@ -115,3 +119,12 @@ QPointF TagTextItem::movePoint() const
 {
     return m_movePoint;
 }
+
+void TagTextItem::setTextMaxWidth(qreal width)
+{
+    m_maxWidth = width;
+    QTextOption opt = m_textItem->document()->defaultTextOption();
+    opt.setWrapMode(QTextOption::WordWrap);
+    m_textItem->document()->setDefaultTextOption(opt);
+    m_textItem->setTextWidth(m_maxWidth);
+}
diff --git a/src/plugins/scxmleditor/plugin_interface/tagtextitem.h b/src/plugins/scxmleditor/plugin_interface/tagtextitem.h
index 3c0a13b935..4ffcdbb942 100644
--- a/src/plugins/scxmleditor/plugin_interface/tagtextitem.h
+++ b/src/plugins/scxmleditor/plugin_interface/tagtextitem.h
@@ -34,6 +34,7 @@ public:
 
     void resetMovePoint(const QPointF &p = QPointF(0, 0));
     QPointF movePoint() const;
+    void setTextMaxWidth(qreal width);
 
 protected:
     void hoverEnterEvent(QGraphicsSceneHoverEvent *e) override;
@@ -54,6 +55,7 @@ private:
     QPointF m_movePoint;
     QPointF m_startPos;
     TextItem *m_textItem;
+    qreal m_maxWidth;
 };
 
 } // namespace PluginInterface
diff --git a/src/plugins/scxmleditor/plugin_interface/transitionitem.cpp b/src/plugins/scxmleditor/plugin_interface/transitionitem.cpp
index 63f35a1fd2..20c4ff6e20 100644
--- a/src/plugins/scxmleditor/plugin_interface/transitionitem.cpp
+++ b/src/plugins/scxmleditor/plugin_interface/transitionitem.cpp
@@ -28,6 +28,26 @@ using namespace ScxmlEditor::PluginInterface;
 
 const qreal SELECTION_DISTANCE = 10;
 
+static QString wrapText(const QString &text)
+{
+    QString wrappedText = "[" + text.trimmed() + "]";
+    return wrappedText;
+
+}
+
+static QString unwrapText(const QString &text)
+{
+    QString unwrappedText = text.trimmed();
+
+    if (unwrappedText.startsWith("["))
+        unwrappedText = unwrappedText.mid(1);
+
+    if (unwrappedText.endsWith("]"))
+        unwrappedText.chop(1);
+
+    return unwrappedText;
+}
+
 TransitionItem::TransitionItem(BaseItem *parent)
     : BaseItem(parent)
     , m_startTargetFactor(0.5, 0.5)
@@ -53,6 +73,15 @@ TransitionItem::TransitionItem(BaseItem *parent)
     connect(m_eventTagItem, &TagTextItem::textReady, this, &TransitionItem::textHasChanged);
     connect(m_eventTagItem, &TagTextItem::movePointChanged, this, &TransitionItem::textItemPositionChanged);
 
+    m_condTagItem = new TagTextItem(this);
+    connect(m_condTagItem, &TagTextItem::selected, this, [this](bool sel) { setItemSelected(sel); });
+    connect(m_condTagItem, &TagTextItem::textReady, this, [this](const QString &text) {
+        setTagValue("cond", unwrapText(text));
+        updateEventName();
+    });
+    connect(m_condTagItem, &TagTextItem::movePointChanged,
+            this, &TransitionItem::textItemPositionChanged);
+
     checkWarningItems();
 }
 
@@ -80,8 +109,10 @@ void TransitionItem::setTag(ScxmlTag *tag)
 {
     BaseItem::setTag(tag);
     if (tag) {
-        if (tag->tagType() == InitialTransition)
+        if (tag->tagType() == InitialTransition) {
             m_eventTagItem->setVisible(false);
+            m_condTagItem->setVisible(false);
+        }
     }
 }
 
@@ -96,12 +127,22 @@ void TransitionItem::textItemPositionChanged()
     }
     setEditorInfo(Constants::C_SCXML_EDITORINFO_MOVEPOINT, data);
 
+    QPointF p2 = m_condTagItem->movePoint();
+    QString data2;
+    if (p2.toPoint() != QPoint(0, 0)) {
+        Serializer s;
+        s.append(p2);
+        data2 = s.data();
+    }
+    setEditorInfo(Constants::C_SCXML_EDITORINFO_MOVEPOINT_COND, data2);
+
     updateComponents();
 }
 
 void TransitionItem::textHasChanged(const QString &text)
 {
     setTagValue("event", text);
+    updateComponents();
 }
 
 void TransitionItem::createGrabbers()
@@ -876,13 +917,18 @@ void TransitionItem::updateComponents()
     QLineF nameLine(m_cornerPoints[ind], m_cornerPoints[ind + 1]);
     if (m_targetType <= InternalNoTarget) {
         m_eventTagItem->setPos(m_cornerPoints[1].x() + 6, m_cornerPoints[1].y() - m_eventTagItem->boundingRect().height() / 3);
+        m_condTagItem->setPos(m_cornerPoints[1].x() + 6, m_cornerPoints[1].y() + m_condTagItem->boundingRect().height() / 3);
     } else {
-        const qreal w2 = m_eventTagItem->boundingRect().width() / 2;
-        QPointF startPos = nameLine.pointAt(0.5);
-        QLineF targetLine(startPos, startPos + QPointF(SELECTION_DISTANCE, SELECTION_DISTANCE));
-        targetLine.setAngle(nameLine.angle() + 90);
+        const qreal widthEventItem = m_eventTagItem->boundingRect().width() / 2;
+        m_eventTagItem->setPos(
+            nameLine.pointAt(0.5)
+            + QPointF(-widthEventItem, -m_eventTagItem->boundingRect().height() / 1.5));
+
+        const qreal width = qMax(nameLine.length(), m_eventTagItem->boundingRect().width());
+        m_condTagItem->setTextMaxWidth(width);
+        const qreal widthCondItem = m_condTagItem->boundingRect().width() / 2;
+        m_condTagItem->setPos(nameLine.pointAt(0.5) + QPointF(-widthCondItem, 2));
 
-        m_eventTagItem->setPos(targetLine.p2() + m_eventTagItem->movePoint() - QPointF(w2, m_eventTagItem->boundingRect().height() / 2));
     }
 
     if (m_warningItem)
@@ -944,6 +990,7 @@ void TransitionItem::updateEditorInfo(bool allChilds)
 
     const QColor fontColor = editorInfo(Constants::C_SCXML_EDITORINFO_FONTCOLOR);
     m_eventTagItem->setDefaultTextColor(fontColor.isValid() ? fontColor : Qt::black);
+    m_condTagItem->setDefaultTextColor(fontColor.isValid() ? fontColor : Qt::black);
 
     const QColor stateColor = editorInfo(Constants::C_SCXML_EDITORINFO_STATECOLOR);
     m_pen.setColor(stateColor.isValid() ? stateColor : qRgb(0x12, 0x12, 0x12));
@@ -1026,6 +1073,7 @@ void TransitionItem::readUISpecifiedProperties(const ScxmlTag *tag)
             }
 
             m_eventTagItem->resetMovePoint(loadPoint(Constants::C_SCXML_EDITORINFO_MOVEPOINT));
+            m_condTagItem->resetMovePoint(loadPoint(Constants::C_SCXML_EDITORINFO_MOVEPOINT_COND));
 
             if (m_lineSelected)
                 createGrabbers();
@@ -1048,6 +1096,7 @@ void TransitionItem::finalizeCreation()
 void TransitionItem::checkVisibility(double scaleFactor)
 {
     m_eventTagItem->setVisible(scaleFactor > 0.5);
+    m_condTagItem->setVisible(scaleFactor > 0.5);
 }
 
 bool TransitionItem::containsScenePoint(const QPointF &p) const
@@ -1092,6 +1141,8 @@ void TransitionItem::findEndItem()
 void TransitionItem::updateEventName()
 {
     m_eventTagItem->setText(tagValue("event"));
+    m_condTagItem->setText(wrapText(tagValue("cond")));
+    updateComponents();
 }
 
 void TransitionItem::storeGeometry(bool block)
@@ -1123,6 +1174,11 @@ void TransitionItem::storeMovePoint(bool block)
         setEditorInfo(Constants::C_SCXML_EDITORINFO_MOVEPOINT, QString(), block);
     else
         savePoint(m_eventTagItem->movePoint(), Constants::C_SCXML_EDITORINFO_MOVEPOINT);
+
+    if (m_condTagItem->movePoint().toPoint() == QPoint(0, 0))
+        setEditorInfo(Constants::C_SCXML_EDITORINFO_MOVEPOINT_COND, QString(), block);
+    else
+        savePoint(m_condTagItem->movePoint(), Constants::C_SCXML_EDITORINFO_MOVEPOINT_COND);
 }
 
 void TransitionItem::storeTargetFactors(bool block)
@@ -1176,6 +1232,7 @@ void TransitionItem::updateTargetType()
 
     if (type <= InternalNoTarget) {
         m_eventTagItem->resetMovePoint();
+        m_condTagItem->resetMovePoint();
         m_arrowSize = 6;
         // Remove extra points
         while (m_cornerPoints.count() > 2)
@@ -1187,8 +1244,10 @@ void TransitionItem::updateTargetType()
         setEditorInfo(Constants::C_SCXML_EDITORINFO_GEOMETRY, QString(), true);
         setEditorInfo(Constants::C_SCXML_EDITORINFO_LOCALGEOMETRY, QString(), true);
         setEditorInfo(Constants::C_SCXML_EDITORINFO_MOVEPOINT, QString(), true);
+        setEditorInfo(Constants::C_SCXML_EDITORINFO_MOVEPOINT_COND, QString(), true);
         setEditorInfo(Constants::C_SCXML_EDITORINFO_STARTTARGETFACTORS, QString(), true);
         setEditorInfo(Constants::C_SCXML_EDITORINFO_ENDTARGETFACTORS, QString(), true);
+        updateComponents();
     } else {
         m_arrowSize = 10;
     }
@@ -1244,10 +1303,10 @@ void TransitionItem::updateZValue()
 
 qreal TransitionItem::textWidth() const
 {
-    return m_eventTagItem->boundingRect().width();
+    return m_eventTagItem->boundingRect().width() + m_condTagItem->boundingRect().width();
 }
 
 QRectF TransitionItem::wholeBoundingRect() const
 {
-    return boundingRect().united(m_eventTagItem->sceneBoundingRect());
+    return boundingRect().united(m_eventTagItem->sceneBoundingRect().united(m_condTagItem->sceneBoundingRect()));
 }
diff --git a/src/plugins/scxmleditor/plugin_interface/transitionitem.h b/src/plugins/scxmleditor/plugin_interface/transitionitem.h
index 6eb256d6d8..13a3a3cf2d 100644
--- a/src/plugins/scxmleditor/plugin_interface/transitionitem.h
+++ b/src/plugins/scxmleditor/plugin_interface/transitionitem.h
@@ -143,6 +143,7 @@ private:
     bool m_lineSelected = false;
 
     TagTextItem *m_eventTagItem;
+    TagTextItem *m_condTagItem;
     TransitionWarningItem *m_warningItem = nullptr;
     TransitionTargetType m_targetType = ExternalTarget;
     bool m_movingFirstPoint = false;
diff --git a/src/plugins/scxmleditor/scxmleditorconstants.h b/src/plugins/scxmleditor/scxmleditorconstants.h
index 13b9fe2fc5..5fd6e53f07 100644
--- a/src/plugins/scxmleditor/scxmleditorconstants.h
+++ b/src/plugins/scxmleditor/scxmleditorconstants.h
@@ -28,6 +28,7 @@ const char C_SCXML_EDITORINFO_GEOMETRY[] = "geometry";
 const char C_SCXML_EDITORINFO_SCENEGEOMETRY[] = "scenegeometry";
 const char C_SCXML_EDITORINFO_LOCALGEOMETRY[] = "localGeometry";
 const char C_SCXML_EDITORINFO_MOVEPOINT[] = "movePoint";
+const char C_SCXML_EDITORINFO_MOVEPOINT_COND[] = "movePointCond";
 const char C_SCXML_EDITORINFO_STARTTARGETFACTORS[] = "startTargetFactors";
 const char C_SCXML_EDITORINFO_ENDTARGETFACTORS[] = "endTargetFactors";
 const char C_SCXML_EDITORINFO_FONTCOLOR[] = "fontColor";
diff --git a/src/plugins/squish/Squish.json.in b/src/plugins/squish/Squish.json.in
index 64e4397aeb..faa56b6837 100644
--- a/src/plugins/squish/Squish.json.in
+++ b/src/plugins/squish/Squish.json.in
@@ -26,5 +26,6 @@ ${IDE_PLUGIN_DEPENDENCIES},
     "        <glob pattern='objects.map'/>",
     "    </mime-type>",
     "</mime-info>"
-]
+],
+"JsonWizardPaths" : [":/squish/wizard/"]
 }
diff --git a/src/plugins/squish/squishplugin.cpp b/src/plugins/squish/squishplugin.cpp
index 6608625c0b..4cc72fde73 100644
--- a/src/plugins/squish/squishplugin.cpp
+++ b/src/plugins/squish/squishplugin.cpp
@@ -68,8 +68,6 @@ private:
                 SquishServerSettingsDialog dialog;
                 dialog.exec();
             });
-
-        ProjectExplorer::JsonWizardFactory::addWizardPath(":/squish/wizard/");
     }
 
     bool initializeGlobalScripts()
diff --git a/src/plugins/studiowelcome/studiowelcomeplugin.cpp b/src/plugins/studiowelcome/studiowelcomeplugin.cpp
index ac6a17de87..d526a9c436 100644
--- a/src/plugins/studiowelcome/studiowelcomeplugin.cpp
+++ b/src/plugins/studiowelcome/studiowelcomeplugin.cpp
@@ -333,6 +333,37 @@ public:
         Core::EditorManager::openEditor(qmlFile);
     }
 
+    Q_INVOKABLE bool exampleVersionOk(const QString &exampleVersion)
+    {
+        if (exampleVersion.isEmpty())
+            return true;
+
+        const QStringList exampleVersionParts = exampleVersion.split('.');
+        const QStringList qdsVersionParts = QCoreApplication::applicationVersion().split('.');
+
+        QList<int> exampleVerInts;
+        QList<int> qdsVerInts;
+        for (const QString &part : exampleVersionParts)
+            exampleVerInts.append(part.toInt());
+
+        for (const QString &part : qdsVersionParts)
+            qdsVerInts.append(part.toInt());
+
+        // pad zeros so both lists are same size
+        while (qdsVerInts.size() < exampleVerInts.size())
+            qdsVerInts.append(0);
+
+        while (exampleVerInts.size() < qdsVerInts.size())
+            exampleVerInts.append(0);
+
+        for (int i = 0; i < qdsVerInts.size(); ++i) {
+            if (exampleVerInts[i] < qdsVerInts[i])
+                return false;
+        }
+
+        return true;
+    }
+
 public slots:
     void resetProjects();
     void delayedResetProjects();
@@ -455,20 +486,20 @@ QVariant ProjectModel::data(const QModelIndex &index, int role) const
             ProjectExplorer::ProjectExplorerPlugin::recentProjects().at(index.row());
     switch (role) {
     case Qt::DisplayRole:
-        return data.second;
+        return data.displayName;
         break;
     case FilePathRole:
-        return data.first.toVariant();
+        return data.filePath.toVariant();
     case PrettyFilePathRole:
-        return data.first.absolutePath().withTildeHomePath();
+        return data.filePath.absolutePath().withTildeHomePath();
     case PreviewUrl:
-        return QVariant(QStringLiteral("image://project_preview/") +
-                        QmlProjectManager::ProjectFileContentTools::appQmlFile(
-                            data.first));
+        return QVariant(
+            QStringLiteral("image://project_preview/")
+            + QmlProjectManager::ProjectFileContentTools::appQmlFile(data.filePath));
     case TagData:
-        return tags(data.first);
+        return tags(data.filePath);
     case Description:
-        return description(data.first);
+        return description(data.filePath);
     default:
         return QVariant();
     }
diff --git a/src/plugins/tellajoke/CMakeLists.txt b/src/plugins/tellajoke/CMakeLists.txt
new file mode 100644
index 0000000000..c9dfcf23d2
--- /dev/null
+++ b/src/plugins/tellajoke/CMakeLists.txt
@@ -0,0 +1 @@
+add_qtc_lua_plugin(tellajoke SOURCES tellajoke/tellajoke.lua)
diff --git a/src/plugins/tellajoke/tellajoke/tellajoke.lua b/src/plugins/tellajoke/tellajoke/tellajoke.lua
new file mode 100644
index 0000000000..680e0420d2
--- /dev/null
+++ b/src/plugins/tellajoke/tellajoke/tellajoke.lua
@@ -0,0 +1,56 @@
+--- Copyright (C) 2024 The Qt Company Ltd.
+--- SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+local function fetchJoke()
+    print("Fetching ...")
+
+    local a = require("async")
+    local fetch = require("Fetch").fetch
+    local utils = require("Utils")
+    local mm = require("MessageManager")
+
+    local r = a.wait(fetch({ url = "https://official-joke-api.appspot.com/random_joke", convertToTable = true }))
+    if (type(r) == "table") then
+        mm.writeDisrupting(r.setup)
+        a.wait(utils.waitms(1000))
+        mm.writeSilently(".")
+        a.wait(utils.waitms(1000))
+        mm.writeSilently(".")
+        a.wait(utils.waitms(1000))
+        mm.writeSilently(".")
+        a.wait(utils.waitms(1000))
+        mm.writeDisrupting(r.punchline)
+    else
+        print("echo Error fetching: " .. r)
+    end
+end
+
+local function fetchJokeSafe()
+    local ok, err = pcall(fetchJoke)
+    if not ok then
+        print("echo Error fetching: " .. err)
+    end
+end
+
+local function setup()
+    local a = require("async")
+    Action = require("Action")
+    Action.create("Simple.joke", {
+        text = "Tell a joke",
+        onTrigger = function() a.sync(fetchJokeSafe)() end,
+        defaultKeySequences = { "Meta+Ctrl+Shift+J", "Ctrl+Shift+Alt+J" },
+    })
+end
+
+return {
+    Name = "Tell A Joke",
+    Version = "1.0.0",
+    CompatVersion = "1.0.0",
+    Vendor = "The Qt Company",
+    Category = "Fun",
+    Description = "This plugin adds an action that tells a joke.",
+    Dependencies = {
+        { Name = "Lua", Version = "13.0.82", Required = true },
+    },
+    setup = setup,
+} --[[@as QtcPlugin]]
diff --git a/src/plugins/terminal/terminalwidget.cpp b/src/plugins/terminal/terminalwidget.cpp
index 756f1a11be..a314d0babe 100644
--- a/src/plugins/terminal/terminalwidget.cpp
+++ b/src/plugins/terminal/terminalwidget.cpp
@@ -119,8 +119,12 @@ void TerminalWidget::setupPty()
     Environment env = m_openParameters.environment.value_or(Environment{})
                           .appliedToEnvironment(shellCommand.executable().deviceEnvironment());
 
+    // Some OS/Distros set a default value for TERM such as "dumb", which then breaks
+    // command line tools such as "clear" which try to figure out what terminal they are
+    // running in. Therefore we have to force-set our own TERM value here.
+    env.set("TERM", "xterm-256color");
+
     // Set some useful defaults
-    env.setFallback("TERM", "xterm-256color");
     env.setFallback("TERM_PROGRAM", QCoreApplication::applicationName());
     env.setFallback("COLORTERM", "truecolor");
     env.setFallback("COMMAND_MODE", "unix2003");
@@ -156,7 +160,7 @@ void TerminalWidget::setupPty()
         const int exitCode = QTC_GUARD(m_process) ? m_process->exitCode() : -1;
         if (m_process) {
             if (exitCode != 0) {
-                errorMessage = Tr::tr("Terminal process exited with code %1").arg(exitCode);
+                errorMessage = Tr::tr("Terminal process exited with code %1.").arg(exitCode);
 
                 if (!m_process->errorString().isEmpty())
                     errorMessage += QString(" (%1)").arg(m_process->errorString());
@@ -183,7 +187,7 @@ void TerminalWidget::setupPty()
 
                 writeToTerminal(msg, true);
             } else {
-                QString exitMsg = Tr::tr("Process exited with code: %1").arg(exitCode);
+                QString exitMsg = Tr::tr("Process exited with code: %1.").arg(exitCode);
                 QByteArray msg = QString("\r\n%1").arg(exitMsg).toUtf8();
                 writeToTerminal(msg, true);
             }
diff --git a/src/plugins/texteditor/CMakeLists.txt b/src/plugins/texteditor/CMakeLists.txt
index e766ec06a1..978d0de86a 100644
--- a/src/plugins/texteditor/CMakeLists.txt
+++ b/src/plugins/texteditor/CMakeLists.txt
@@ -104,7 +104,6 @@ add_qtc_plugin(TextEditor
     texteditor.qrc
     texteditor_global.h
     texteditortr.h
-    texteditoractionhandler.cpp texteditoractionhandler.h
     texteditorconstants.cpp texteditorconstants.h
     texteditoroverlay.cpp texteditoroverlay.h
     texteditorplugin.cpp
diff --git a/src/plugins/texteditor/TextEditor.json.in b/src/plugins/texteditor/TextEditor.json.in
index 447d9c91c6..f2b6fbbcf5 100644
--- a/src/plugins/texteditor/TextEditor.json.in
+++ b/src/plugins/texteditor/TextEditor.json.in
@@ -24,6 +24,21 @@
         "        <sub-class-of type='text/plain'/>",
         "        <glob pattern='*.dts' weight='80'/>",
         "    </mime-type>",
+        "    <mime-type type='text/x-yacc'>",
+        "        <comment>Yacc/Bison source files</comment>",
+        "        <sub-class-of type='text/plain'/>",
+        "        <glob pattern='*.y'/>",
+        "        <glob pattern='*.yy'/>",
+        "        <glob pattern='*.ypp'/>",
+        "        <glob pattern='*.y++'/>",
+        "    </mime-type>",
+        "    <mime-type type='text/x-lex'>",
+        "        <comment>Lex/Flex source files</comment>",
+        "        <sub-class-of type='text/plain'/>",
+        "        <glob pattern='*.l'/>",
+        "        <glob pattern='*.lex'/>",
+        "        <glob pattern='*.flex'/>",
+        "    </mime-type>",
         "</mime-info>"
     ]
 }
diff --git a/src/plugins/texteditor/codestyleselectorwidget.cpp b/src/plugins/texteditor/codestyleselectorwidget.cpp
index ddeea0a74e..5eb373f00f 100644
--- a/src/plugins/texteditor/codestyleselectorwidget.cpp
+++ b/src/plugins/texteditor/codestyleselectorwidget.cpp
@@ -216,9 +216,11 @@ void CodeStyleSelectorWidget::slotImportClicked()
 void CodeStyleSelectorWidget::slotExportClicked()
 {
     ICodeStylePreferences *currentPreferences = m_codeStyle->currentPreferences();
-    const FilePath filePath = FileUtils::getSaveFilePath(this, Tr::tr("Export Code Style"),
-                             FilePath::fromString(QString::fromUtf8(currentPreferences->id() + ".xml")),
-                             Tr::tr("Code styles (*.xml);;All files (*)"));
+    const FilePath filePath = FileUtils::getSaveFilePath(
+        this,
+        Tr::tr("Export Code Style"),
+        FileUtils::homePath().pathAppended(QString::fromUtf8(currentPreferences->id() + ".xml")),
+        Tr::tr("Code styles (*.xml);;All files (*)"));
     if (!filePath.isEmpty()) {
         CodeStylePool *codeStylePool = m_codeStyle->delegatingPool();
         codeStylePool->exportCodeStyle(filePath, currentPreferences);
diff --git a/src/plugins/texteditor/commentssettings.cpp b/src/plugins/texteditor/commentssettings.cpp
index bc6f76cb4b..d3171a94d6 100644
--- a/src/plugins/texteditor/commentssettings.cpp
+++ b/src/plugins/texteditor/commentssettings.cpp
@@ -106,7 +106,7 @@ CommentsSettingsWidget::CommentsSettingsWidget(const CommentsSettings::Data &set
     const auto commandPrefixLabel = new QLabel(Tr::tr("Doxygen command prefix:"));
     const QString commandPrefixToolTip = Tr::tr(R"(Doxygen allows "@" and "\" to start commands.
 By default, "@" is used if the surrounding comment starts with "/**" or "///", and "\" is used
-if the comment starts with "/*!" or "//!)");
+if the comment starts with "/*!" or "//!".)");
     commandPrefixLabel->setToolTip(commandPrefixToolTip);
     d->m_commandPrefixComboBox.setToolTip(commandPrefixToolTip);
     d->m_commandPrefixComboBox.addItem(Tr::tr("Automatic"));
diff --git a/src/plugins/texteditor/findinfiles.cpp b/src/plugins/texteditor/findinfiles.cpp
index 955316954b..7348c600e2 100644
--- a/src/plugins/texteditor/findinfiles.cpp
+++ b/src/plugins/texteditor/findinfiles.cpp
@@ -198,7 +198,7 @@ void FindInFiles::writeSettings(QtcSettings *settings)
 void FindInFiles::readSettings(QtcSettings *settings)
 {
     settings->beginGroup("FindInFiles");
-    readCommonSettings(settings, "*.cpp,*.h", "*/.git/*,*/.cvs/*,*/.svn/*,*.autosave");
+    readCommonSettings(settings, "*.cpp,*.h", "*/.git/*,*/.cvs/*,*/.svn/*,*.autosave,*/build/*");
     settings->endGroup();
 }
 
diff --git a/src/plugins/texteditor/jsoneditor.cpp b/src/plugins/texteditor/jsoneditor.cpp
index d06f215c68..7081394f9b 100644
--- a/src/plugins/texteditor/jsoneditor.cpp
+++ b/src/plugins/texteditor/jsoneditor.cpp
@@ -6,7 +6,6 @@
 #include "autocompleter.h"
 #include "textdocument.h"
 #include "texteditor.h"
-#include "texteditoractionhandler.h"
 #include "texteditortr.h"
 #include "textindenter.h"
 
@@ -164,7 +163,7 @@ public:
         setDocumentCreator([] { return new TextDocument(JSON_EDITOR_ID); });
         setAutoCompleterCreator([] { return new JsonAutoCompleter; });
         setIndenterCreator([](QTextDocument *doc) { return new JsonIndenter(doc); });
-        setEditorActionHandlers(TextEditorActionHandler::Format);
+        setOptionalActionMask(OptionalActions::Format);
         setUseGenericHighlighter(true);
     }
 };
diff --git a/src/plugins/texteditor/markdowneditor.cpp b/src/plugins/texteditor/markdowneditor.cpp
index dbfdcda2b4..c08fedeb10 100644
--- a/src/plugins/texteditor/markdowneditor.cpp
+++ b/src/plugins/texteditor/markdowneditor.cpp
@@ -16,8 +16,6 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/minisplitter.h>
 
-#include <texteditor/texteditoractionhandler.h>
-
 #include <utils/action.h>
 #include <utils/ranges.h>
 #include <utils/qtcsettings.h>
@@ -73,7 +71,7 @@ class MarkdownEditor : public IEditor
 {
     Q_OBJECT
 public:
-    MarkdownEditor(const TextEditor::TextEditorActionHandler *actionHandler)
+    MarkdownEditor()
         : m_document(new TextDocument(MARKDOWNVIEWER_ID))
     {
         m_document->setMimeType(MARKDOWNVIEWER_MIME_TYPE);
@@ -108,7 +106,7 @@ public:
 
         // editor
         m_textEditorWidget = new MarkdownEditorWidget;
-        m_textEditorWidget->setOptionalActions(actionHandler->optionalActions());
+        m_textEditorWidget->setOptionalActions(OptionalActions::FollowSymbolUnderCursor);
         m_textEditorWidget->setTextDocument(m_document);
         m_textEditorWidget->setupGenericHighlighter();
         m_textEditorWidget->setMarksVisible(false);
@@ -501,7 +499,6 @@ public:
     MarkdownEditorFactory();
 
 private:
-    TextEditorActionHandler m_actionHandler;
     Action m_emphasisAction;
     Action m_strongAction;
     Action m_inlineCodeAction;
@@ -512,17 +509,11 @@ private:
 };
 
 MarkdownEditorFactory::MarkdownEditorFactory()
-    : m_actionHandler(MARKDOWNVIEWER_ID,
-                      MARKDOWNVIEWER_TEXT_CONTEXT,
-                      TextEditor::TextEditorActionHandler::FollowSymbolUnderCursor,
-                      [](IEditor *editor) {
-                          return static_cast<MarkdownEditor *>(editor)->textEditorWidget();
-                      })
 {
     setId(MARKDOWNVIEWER_ID);
     setDisplayName(::Core::Tr::tr("Markdown Editor"));
     addMimeType(MARKDOWNVIEWER_MIME_TYPE);
-    setEditorCreator([this] { return new MarkdownEditor{&m_actionHandler}; });
+    setEditorCreator([] { return new MarkdownEditor; });
 
     const auto textContext = Context(MARKDOWNVIEWER_TEXT_CONTEXT);
     const auto context = Context(MARKDOWNVIEWER_ID);
diff --git a/src/plugins/texteditor/plaintexteditorfactory.cpp b/src/plugins/texteditor/plaintexteditorfactory.cpp
index fbaf430284..ef989ee621 100644
--- a/src/plugins/texteditor/plaintexteditorfactory.cpp
+++ b/src/plugins/texteditor/plaintexteditorfactory.cpp
@@ -5,7 +5,6 @@
 #include "basehoverhandler.h"
 #include "textdocument.h"
 #include "texteditor.h"
-#include "texteditoractionhandler.h"
 #include "texteditorconstants.h"
 
 #include <coreplugin/coreconstants.h>
@@ -40,9 +39,9 @@ public:
         setEditorWidgetCreator([]() { return new PlainTextEditorWidget; });
         setUseGenericHighlighter(true);
 
-        setEditorActionHandlers(TextEditorActionHandler::Format |
-                                TextEditorActionHandler::UnCommentSelection |
-                                TextEditorActionHandler::UnCollapseAll);
+        setOptionalActionMask(
+                    OptionalActions::Format | OptionalActions::UnCommentSelection
+                    | OptionalActions::UnCollapseAll);
     }
 };
 
diff --git a/src/plugins/texteditor/syntaxhighlighter.h b/src/plugins/texteditor/syntaxhighlighter.h
index f550637426..39bb084465 100644
--- a/src/plugins/texteditor/syntaxhighlighter.h
+++ b/src/plugins/texteditor/syntaxhighlighter.h
@@ -8,8 +8,6 @@
 #include <texteditor/texteditorconstants.h>
 #include <texteditor/textdocumentlayout.h>
 
-#include <KSyntaxHighlighting/Definition>
-
 #include <QObject>
 #include <QTextLayout>
 
diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp
index 85bd4732ba..92636e63cd 100644
--- a/src/plugins/texteditor/texteditor.cpp
+++ b/src/plugins/texteditor/texteditor.cpp
@@ -21,6 +21,7 @@
 #include "highlighterhelper.h"
 #include "highlightersettings.h"
 #include "icodestylepreferences.h"
+#include "linenumberfilter.h"
 #include "marginsettings.h"
 #include "refactoroverlay.h"
 #include "snippets/snippetoverlay.h"
@@ -28,11 +29,11 @@
 #include "tabsettings.h"
 #include "textdocument.h"
 #include "textdocumentlayout.h"
-#include "texteditoractionhandler.h"
 #include "texteditorconstants.h"
 #include "texteditoroverlay.h"
 #include "texteditorsettings.h"
 #include "texteditortr.h"
+#include "typehierarchy.h"
 #include "typingsettings.h"
 
 #include <aggregation/aggregate.h>
@@ -45,7 +46,9 @@
 #include <coreplugin/find/basetextfind.h>
 #include <coreplugin/find/highlightscrollbarcontroller.h>
 #include <coreplugin/icore.h>
+#include <coreplugin/locator/locatormanager.h>
 #include <coreplugin/manhattanstyle.h>
+#include <coreplugin/navigationwidget.h>
 
 #include <utils/algorithm.h>
 #include <utils/async.h>
@@ -738,6 +741,14 @@ public:
     void openTypeUnderCursor(bool openInNextSplit);
     qreal charWidth() const;
 
+    // actions
+    void registerActions();
+    void updateActions();
+    void updateOptionalActions();
+    void updateRedoAction();
+    void updateUndoAction();
+    void updateCopyAction(bool on);
+
 public:
     TextEditorWidget *q;
     QWidget *m_toolBarWidget = nullptr;
@@ -753,7 +764,7 @@ public:
     QToolButton *m_fileLineEnding = nullptr;
     QAction *m_fileLineEndingAction = nullptr;
 
-    uint m_optionalActionMask = TextEditorActionHandler::None;
+    uint m_optionalActionMask = OptionalActions::None;
     bool m_contentsChanged = false;
     bool m_lastCursorChangeWasInteresting = false;
     std::shared_ptr<void> m_suggestionBlocker;
@@ -927,6 +938,30 @@ public:
     void updateSuggestion();
     void clearCurrentSuggestion();
     QTextBlock m_suggestionBlock;
+
+    Context m_editorContext;
+    QAction *m_undoAction = nullptr;
+    QAction *m_redoAction = nullptr;
+    QAction *m_copyAction = nullptr;
+    QAction *m_copyHtmlAction = nullptr;
+    QAction *m_cutAction = nullptr;
+    QAction *m_autoIndentAction = nullptr;
+    QAction *m_autoFormatAction = nullptr;
+    QAction *m_visualizeWhitespaceAction = nullptr;
+    QAction *m_textWrappingAction = nullptr;
+    QAction *m_unCommentSelectionAction = nullptr;
+    QAction *m_unfoldAllAction = nullptr;
+    QAction *m_followSymbolAction = nullptr;
+    QAction *m_followSymbolInNextSplitAction = nullptr;
+    QAction *m_followToTypeAction = nullptr;
+    QAction *m_followToTypeInNextSplitAction = nullptr;
+    QAction *m_findUsageAction = nullptr;
+    QAction *m_openCallHierarchyAction = nullptr;
+    QAction *m_openTypeHierarchyAction = nullptr;
+    QAction *m_renameSymbolAction = nullptr;
+    QAction *m_jumpToFileAction = nullptr;
+    QAction *m_jumpToFileInNextSplitAction = nullptr;
+    QList<QAction *> m_modifyingActions;
 };
 
 class TextEditorWidgetFind : public BaseTextFind
@@ -1031,6 +1066,7 @@ TextEditorWidgetPrivate::TextEditorWidgetPrivate(TextEditorWidget *parent)
     , m_codeAssistant(parent)
     , m_hoverHandlerRunner(parent, m_hoverHandlers)
     , m_autoCompleter(new AutoCompleter)
+    , m_editorContext(Id::fromString(QUuid::createUuid().toString()))
 {
     m_selectionHighlightOverlay->show();
     auto aggregate = new Aggregation::Aggregate;
@@ -1095,6 +1131,15 @@ TextEditorWidgetPrivate::TextEditorWidgetPrivate(TextEditorWidget *parent)
     connect(q, &QPlainTextEdit::selectionChanged,
             this, &TextEditorWidgetPrivate::slotSelectionChanged);
 
+    connect(q, &QPlainTextEdit::undoAvailable,
+            this, &TextEditorWidgetPrivate::updateUndoAction);
+
+    connect(q, &QPlainTextEdit::redoAvailable,
+            this, &TextEditorWidgetPrivate::updateRedoAction);
+
+    connect(q, &QPlainTextEdit::copyAvailable,
+            this, &TextEditorWidgetPrivate::updateCopyAction);
+
     m_parenthesesMatchingTimer.setSingleShot(true);
     m_parenthesesMatchingTimer.setInterval(50);
     connect(&m_parenthesesMatchingTimer, &QTimer::timeout,
@@ -1141,6 +1186,14 @@ TextEditorWidgetPrivate::TextEditorWidgetPrivate(TextEditorWidget *parent)
             q, &TextEditorWidget::setCompletionSettings);
     connect(settings, &TextEditorSettings::extraEncodingSettingsChanged,
             q, &TextEditorWidget::setExtraEncodingSettings);
+
+    auto context = new Core::IContext(this);
+    context->setWidget(q);
+    context->setContext(m_editorContext);
+    Core::ICore::addContextObject(context);
+
+    registerActions();
+    updateActions();
 }
 
 TextEditorWidgetPrivate::~TextEditorWidgetPrivate()
@@ -1883,6 +1936,12 @@ void TextEditorWidget::setVisualIndentOffset(int offset)
     d->m_visualIndentOffset = qMax(0, offset);
 }
 
+void TextEditorWidget::updateUndoRedoActions()
+{
+    d->updateUndoAction();
+    d->updateRedoAction();
+}
+
 void TextEditorWidgetPrivate::updateCannotDecodeInfo()
 {
     q->setReadOnly(m_document->hasDecodingError());
@@ -2534,6 +2593,16 @@ void TextEditorWidget::redo()
     QPlainTextEdit::redo();
 }
 
+bool TextEditorWidget::isUndoAvailable() const
+{
+    return document()->isUndoAvailable();
+}
+
+bool TextEditorWidget::isRedoAvailable() const
+{
+    return document()->isRedoAvailable();
+}
+
 void TextEditorWidget::openLinkUnderCursor()
 {
     d->openLinkUnderCursor(alwaysOpenLinksInNextSplit());
@@ -3810,6 +3879,531 @@ qreal TextEditorWidgetPrivate::charWidth() const
     return QFontMetricsF(q->font()).horizontalAdvance(QLatin1Char('x'));
 }
 
+void TextEditorWidgetPrivate::registerActions()
+{
+    using namespace Core::Constants;
+    using namespace TextEditor::Constants;
+
+    ActionBuilder(this, Constants::COMPLETE_THIS)
+        .setContext(m_editorContext)
+        .addOnTriggered(this, [this] { q->invokeAssist(Completion); });
+
+    ActionBuilder(this, Constants::FUNCTION_HINT)
+        .setContext(m_editorContext)
+        .addOnTriggered(this, [this] { q->invokeAssist(FunctionHint); });
+
+    ActionBuilder(this, Constants::QUICKFIX_THIS)
+        .setContext(m_editorContext)
+        .addOnTriggered(this, [this] { q->invokeAssist(QuickFix); });
+
+    ActionBuilder(this, Constants::SHOWCONTEXTMENU)
+        .setContext(m_editorContext)
+        .addOnTriggered(this, [this] { q->showContextMenu(); });
+
+    m_undoAction = ActionBuilder(this, UNDO)
+                       .setContext(m_editorContext)
+                       .addOnTriggered([this] { q->undo(); })
+                       .setScriptable(true)
+                       .contextAction();
+    m_redoAction = ActionBuilder(this, REDO)
+                       .setContext(m_editorContext)
+                       .addOnTriggered([this] { q->redo(); })
+                       .setScriptable(true)
+                       .contextAction();
+    m_copyAction = ActionBuilder(this, COPY)
+                       .setContext(m_editorContext)
+                       .addOnTriggered([this] { q->copy(); })
+                       .setScriptable(true)
+                       .contextAction();
+    m_cutAction = ActionBuilder(this, CUT)
+                      .setContext(m_editorContext)
+                      .addOnTriggered([this] { q->cut(); })
+                      .setScriptable(true)
+                      .contextAction();
+    m_modifyingActions << ActionBuilder(this, PASTE)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->paste(); })
+                              .setScriptable(true)
+                              .contextAction();
+    ActionBuilder(this, SELECTALL)
+        .setContext(m_editorContext)
+        .setScriptable(true)
+        .addOnTriggered([this] { q->selectAll(); });
+    ActionBuilder(this, GOTO).setContext(m_editorContext).addOnTriggered([] {
+        LocatorManager::showFilter(lineNumberFilter());
+    });
+    ActionBuilder(this, PRINT)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->print(ICore::printer()); })
+        .contextAction();
+    m_modifyingActions << ActionBuilder(this, DELETE_LINE)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->deleteLine(); })
+                              .setScriptable(true)
+                              .contextAction();
+    m_modifyingActions << ActionBuilder(this, DELETE_END_OF_LINE)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->deleteEndOfLine(); })
+                              .setScriptable(true)
+                              .contextAction();
+    m_modifyingActions << ActionBuilder(this, DELETE_END_OF_WORD)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->deleteEndOfWord(); })
+                              .setScriptable(true)
+                              .contextAction();
+    m_modifyingActions << ActionBuilder(this, DELETE_END_OF_WORD_CAMEL_CASE)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->deleteEndOfWordCamelCase(); })
+                              .setScriptable(true)
+                              .contextAction();
+    m_modifyingActions << ActionBuilder(this, DELETE_START_OF_LINE)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->deleteStartOfLine(); })
+                              .setScriptable(true)
+                              .contextAction();
+    m_modifyingActions << ActionBuilder(this, DELETE_START_OF_WORD)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->deleteStartOfWord(); })
+                              .setScriptable(true)
+                              .contextAction();
+    m_modifyingActions << ActionBuilder(this, DELETE_START_OF_WORD_CAMEL_CASE)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->deleteStartOfWordCamelCase(); })
+                              .setScriptable(true)
+                              .contextAction();
+    ActionBuilder(this, GOTO_BLOCK_START_WITH_SELECTION)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoBlockStartWithSelection(); })
+        .setScriptable(true);
+    ActionBuilder(this, GOTO_BLOCK_END_WITH_SELECTION)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoBlockEndWithSelection(); })
+        .setScriptable(true);
+    m_modifyingActions << ActionBuilder(this, MOVE_LINE_UP)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->moveLineUp(); })
+                              .setScriptable(true)
+                              .contextAction();
+    m_modifyingActions << ActionBuilder(this, MOVE_LINE_DOWN)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->moveLineDown(); })
+                              .setScriptable(true)
+                              .contextAction();
+    m_modifyingActions << ActionBuilder(this, COPY_LINE_UP)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->copyLineUp(); })
+                              .setScriptable(true)
+                              .contextAction();
+    m_modifyingActions << ActionBuilder(this, COPY_LINE_DOWN)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->copyLineDown(); })
+                              .setScriptable(true)
+                              .contextAction();
+    m_modifyingActions << ActionBuilder(this, JOIN_LINES)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->joinLines(); })
+                              .setScriptable(true)
+                              .contextAction();
+    m_modifyingActions << ActionBuilder(this, INSERT_LINE_ABOVE)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->insertLineAbove(); })
+                              .setScriptable(true)
+                              .contextAction();
+    m_modifyingActions << ActionBuilder(this, INSERT_LINE_BELOW)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->insertLineBelow(); })
+                              .setScriptable(true)
+                              .contextAction();
+    m_modifyingActions << ActionBuilder(this, SWITCH_UTF8BOM)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->switchUtf8bom(); })
+                              .contextAction();
+    m_modifyingActions << ActionBuilder(this, INDENT)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->indent(); })
+                              .setScriptable(true)
+                              .contextAction();
+    m_modifyingActions << ActionBuilder(this, UNINDENT)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->unindent(); })
+                              .setScriptable(true)
+                              .contextAction();
+    m_followSymbolAction = ActionBuilder(this, FOLLOW_SYMBOL_UNDER_CURSOR)
+                               .setContext(m_editorContext)
+                               .addOnTriggered([this] { q->openLinkUnderCursor(); })
+                               .contextAction();
+    m_followSymbolInNextSplitAction = ActionBuilder(this, FOLLOW_SYMBOL_UNDER_CURSOR_IN_NEXT_SPLIT)
+                                          .setContext(m_editorContext)
+                                          .addOnTriggered(
+                                              [this] { q->openLinkUnderCursorInNextSplit(); })
+                                          .contextAction();
+    m_followToTypeAction = ActionBuilder(this, FOLLOW_SYMBOL_TO_TYPE)
+                               .setContext(m_editorContext)
+                               .addOnTriggered([this] { q->openTypeUnderCursor(); })
+                               .contextAction();
+    m_followToTypeInNextSplitAction = ActionBuilder(this, FOLLOW_SYMBOL_TO_TYPE_IN_NEXT_SPLIT)
+                                          .setContext(m_editorContext)
+                                          .addOnTriggered(
+                                              [this] { q->openTypeUnderCursorInNextSplit(); })
+                                          .contextAction();
+    m_findUsageAction = ActionBuilder(this, FIND_USAGES)
+                            .setContext(m_editorContext)
+                            .addOnTriggered([this] { q->findUsages(); })
+                            .contextAction();
+    m_renameSymbolAction = ActionBuilder(this, RENAME_SYMBOL)
+                               .setContext(m_editorContext)
+                               .addOnTriggered([this] { q->renameSymbolUnderCursor(); })
+                               .contextAction();
+    m_jumpToFileAction = ActionBuilder(this, JUMP_TO_FILE_UNDER_CURSOR)
+                             .setContext(m_editorContext)
+                             .addOnTriggered([this] { q->openLinkUnderCursor(); })
+                             .contextAction();
+    m_jumpToFileInNextSplitAction = ActionBuilder(this, JUMP_TO_FILE_UNDER_CURSOR_IN_NEXT_SPLIT)
+                                        .setContext(m_editorContext)
+                                        .addOnTriggered(
+                                            [this] { q->openLinkUnderCursorInNextSplit(); })
+                                        .contextAction();
+    m_openCallHierarchyAction = ActionBuilder(this, OPEN_CALL_HIERARCHY)
+                                    .setContext(m_editorContext)
+                                    .addOnTriggered([this] { q->openCallHierarchy(); })
+                                    .setScriptable(true)
+                                    .contextAction();
+    m_openTypeHierarchyAction = ActionBuilder(this, OPEN_TYPE_HIERARCHY)
+                                    .setContext(m_editorContext)
+                                    .addOnTriggered([] {
+                                        updateTypeHierarchy(NavigationWidget::activateSubWidget(
+                                            Constants::TYPE_HIERARCHY_FACTORY_ID, Side::Left));
+                                    })
+                                    .setScriptable(true)
+                                    .contextAction();
+    ActionBuilder(this, VIEW_PAGE_UP)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->viewPageUp(); })
+        .setScriptable(true);
+    ActionBuilder(this, VIEW_PAGE_DOWN)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->viewPageDown(); })
+        .setScriptable(true);
+    ActionBuilder(this, VIEW_LINE_UP)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->viewLineUp(); })
+        .setScriptable(true);
+    ActionBuilder(this, VIEW_LINE_DOWN)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->viewLineDown(); })
+        .setScriptable(true);
+
+    ActionBuilder(this, SELECT_ENCODING).setContext(m_editorContext).addOnTriggered([this] {
+        q->selectEncoding();
+    });
+    m_modifyingActions << ActionBuilder(this, CIRCULAR_PASTE)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->circularPaste(); })
+                              .contextAction();
+    m_modifyingActions << ActionBuilder(this, NO_FORMAT_PASTE)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->pasteWithoutFormat(); })
+                              .setScriptable(true)
+                              .contextAction();
+
+    m_autoIndentAction = ActionBuilder(this, AUTO_INDENT_SELECTION)
+                             .setContext(m_editorContext)
+                             .addOnTriggered([this] { q->autoIndent(); })
+                             .setScriptable(true)
+                             .contextAction();
+    m_autoFormatAction = ActionBuilder(this, AUTO_FORMAT_SELECTION)
+                             .setContext(m_editorContext)
+                             .addOnTriggered([this] { q->autoFormat(); })
+                             .setScriptable(true)
+                             .contextAction();
+    m_modifyingActions << ActionBuilder(this, REWRAP_PARAGRAPH)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->rewrapParagraph(); })
+                              .setScriptable(true)
+                              .contextAction();
+    m_visualizeWhitespaceAction = ActionBuilder(this, VISUALIZE_WHITESPACE)
+                                      .setContext(m_editorContext)
+                                      .addOnToggled(
+                                          this,
+                                          [this](bool checked) {
+                                              DisplaySettings ds = q->displaySettings();
+                                              ds.m_visualizeWhitespace = checked;
+                                              q->setDisplaySettings(ds);
+                                          })
+                                      .contextAction();
+    m_modifyingActions << ActionBuilder(this, CLEAN_WHITESPACE)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->cleanWhitespace(); })
+                              .setScriptable(true)
+                              .contextAction();
+    m_textWrappingAction = ActionBuilder(this, TEXT_WRAPPING)
+                               .setContext(m_editorContext)
+                               .addOnToggled(
+                                   this,
+                                   [this](bool checked) {
+                                       DisplaySettings ds = q->displaySettings();
+                                       ds.m_textWrapping = checked;
+                                       q->setDisplaySettings(ds);
+                                   })
+                               .contextAction();
+    m_unCommentSelectionAction = ActionBuilder(this, UN_COMMENT_SELECTION)
+                                     .setContext(m_editorContext)
+                                     .addOnTriggered([this] { q->unCommentSelection(); })
+                                     .setScriptable(true)
+                                     .contextAction();
+    m_modifyingActions << ActionBuilder(this, CUT_LINE)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->cutLine(); })
+                              .setScriptable(true)
+                              .contextAction();
+    ActionBuilder(this, COPY_LINE)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->copyLine(); })
+        .setScriptable(true);
+    m_copyHtmlAction = ActionBuilder(this, COPY_WITH_HTML)
+                           .setContext(m_editorContext)
+                           .addOnTriggered([this] { q->copyWithHtml(); })
+                           .setScriptable(true)
+                           .contextAction();
+    ActionBuilder(this, ADD_CURSORS_TO_LINE_ENDS)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->addCursorsToLineEnds(); })
+        .setScriptable(true);
+    ActionBuilder(this, ADD_SELECT_NEXT_FIND_MATCH)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->addSelectionNextFindMatch(); })
+        .setScriptable(true);
+    m_modifyingActions << ActionBuilder(this, DUPLICATE_SELECTION)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->duplicateSelection(); })
+                              .setScriptable(true)
+                              .contextAction();
+    m_modifyingActions << ActionBuilder(this, DUPLICATE_SELECTION_AND_COMMENT)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->duplicateSelectionAndComment(); })
+                              .setScriptable(true)
+                              .contextAction();
+    m_modifyingActions << ActionBuilder(this, UPPERCASE_SELECTION)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->uppercaseSelection(); })
+                              .setScriptable(true)
+                              .contextAction();
+    m_modifyingActions << ActionBuilder(this, LOWERCASE_SELECTION)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->lowercaseSelection(); })
+                              .setScriptable(true)
+                              .contextAction();
+    m_modifyingActions << ActionBuilder(this, SORT_LINES)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->sortLines(); })
+                              .setScriptable(true)
+                              .contextAction();
+    ActionBuilder(this, FOLD)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->foldCurrentBlock(); })
+        .setScriptable(true);
+    ActionBuilder(this, UNFOLD)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->unfoldCurrentBlock(); })
+        .setScriptable(true);
+    m_unfoldAllAction = ActionBuilder(this, UNFOLD_ALL)
+                            .setContext(m_editorContext)
+                            .addOnTriggered([this] { q->unfoldAll(); })
+                            .setScriptable(true)
+                            .contextAction();
+    ActionBuilder(this, INCREASE_FONT_SIZE).setContext(m_editorContext).addOnTriggered([this] {
+        q->increaseFontZoom();
+    });
+    ActionBuilder(this, DECREASE_FONT_SIZE).setContext(m_editorContext).addOnTriggered([this] {
+        q->decreaseFontZoom();
+    });
+    ActionBuilder(this, RESET_FONT_SIZE).setContext(m_editorContext).addOnTriggered([this] {
+        q->zoomReset();
+    });
+    ActionBuilder(this, GOTO_BLOCK_START)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoBlockStart(); })
+        .setScriptable(true);
+    ActionBuilder(this, GOTO_BLOCK_END)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoBlockEnd(); })
+        .setScriptable(true);
+    ActionBuilder(this, SELECT_BLOCK_UP)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->selectBlockUp(); })
+        .setScriptable(true);
+    ActionBuilder(this, SELECT_BLOCK_DOWN)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->selectBlockDown(); })
+        .setScriptable(true);
+    ActionBuilder(this, SELECT_WORD_UNDER_CURSOR)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->selectWordUnderCursor(); })
+        .setScriptable(true);
+
+    ActionBuilder(this, GOTO_DOCUMENT_START)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoDocumentStart(); })
+        .setScriptable(true);
+    ActionBuilder(this, GOTO_DOCUMENT_END)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoDocumentEnd(); })
+        .setScriptable(true);
+    ActionBuilder(this, GOTO_LINE_START)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoLineStart(); })
+        .setScriptable(true);
+    ActionBuilder(this, GOTO_LINE_END)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoLineEnd(); })
+        .setScriptable(true);
+    ActionBuilder(this, GOTO_NEXT_LINE)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoNextLine(); })
+        .setScriptable(true);
+    ActionBuilder(this, GOTO_PREVIOUS_LINE)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoPreviousLine(); })
+        .setScriptable(true);
+    ActionBuilder(this, GOTO_PREVIOUS_CHARACTER)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoPreviousCharacter(); })
+        .setScriptable(true);
+    ActionBuilder(this, GOTO_NEXT_CHARACTER)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoNextCharacter(); })
+        .setScriptable(true);
+    ActionBuilder(this, GOTO_PREVIOUS_WORD)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoPreviousWord(); })
+        .setScriptable(true);
+    ActionBuilder(this, GOTO_NEXT_WORD)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoNextWord(); })
+        .setScriptable(true);
+    ActionBuilder(this, GOTO_PREVIOUS_WORD_CAMEL_CASE)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoPreviousWordCamelCase(); })
+        .setScriptable(true);
+    ActionBuilder(this, GOTO_NEXT_WORD_CAMEL_CASE)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoNextWordCamelCase(); })
+        .setScriptable(true);
+
+    ActionBuilder(this, GOTO_LINE_START_WITH_SELECTION)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoLineStartWithSelection(); })
+        .setScriptable(true);
+    ActionBuilder(this, GOTO_LINE_END_WITH_SELECTION)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoLineEndWithSelection(); })
+        .setScriptable(true);
+    ActionBuilder(this, GOTO_NEXT_LINE_WITH_SELECTION)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoNextLineWithSelection(); })
+        .setScriptable(true);
+    ActionBuilder(this, GOTO_PREVIOUS_LINE_WITH_SELECTION)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoPreviousLineWithSelection(); })
+        .setScriptable(true);
+    ActionBuilder(this, GOTO_PREVIOUS_CHARACTER_WITH_SELECTION)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoPreviousCharacterWithSelection(); })
+        .setScriptable(true);
+    ActionBuilder(this, GOTO_NEXT_CHARACTER_WITH_SELECTION)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoNextCharacterWithSelection(); })
+        .setScriptable(true);
+    ActionBuilder(this, GOTO_PREVIOUS_WORD_WITH_SELECTION)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoPreviousWordWithSelection(); })
+        .setScriptable(true);
+    ActionBuilder(this, GOTO_NEXT_WORD_WITH_SELECTION)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoNextWordWithSelection(); })
+        .setScriptable(true);
+    ActionBuilder(this, GOTO_PREVIOUS_WORD_CAMEL_CASE_WITH_SELECTION)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoPreviousWordCamelCaseWithSelection(); })
+        .setScriptable(true);
+    ActionBuilder(this, GOTO_NEXT_WORD_CAMEL_CASE_WITH_SELECTION)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoNextWordCamelCaseWithSelection(); })
+        .setScriptable(true);
+
+    // Collect additional modifying actions so we can check for them inside a readonly file
+    // and disable them
+    m_modifyingActions << m_autoIndentAction;
+    m_modifyingActions << m_autoFormatAction;
+    m_modifyingActions << m_unCommentSelectionAction;
+
+    updateOptionalActions();
+}
+
+void TextEditorWidgetPrivate::updateActions()
+{
+    bool isWritable = !q->isReadOnly();
+    for (QAction *a : std::as_const(m_modifyingActions))
+        a->setEnabled(isWritable);
+    m_unCommentSelectionAction->setEnabled((m_optionalActionMask & OptionalActions::UnCommentSelection) && isWritable);
+    m_visualizeWhitespaceAction->setEnabled(q);
+    if (TextEditorSettings::fontSettings().relativeLineSpacing() == 100) {
+        m_textWrappingAction->setEnabled(q);
+    } else {
+        m_textWrappingAction->setEnabled(false);
+        m_textWrappingAction->setChecked(false);
+    }
+    m_visualizeWhitespaceAction->setChecked(m_displaySettings.m_visualizeWhitespace);
+    m_textWrappingAction->setChecked(m_displaySettings.m_textWrapping);
+
+    updateRedoAction();
+    updateUndoAction();
+    updateCopyAction(q->textCursor().hasSelection());
+
+    updateOptionalActions();
+}
+
+void TextEditorWidgetPrivate::updateOptionalActions()
+{
+    using namespace OptionalActions;
+    m_followSymbolAction->setEnabled(m_optionalActionMask & FollowSymbolUnderCursor);
+    m_followSymbolInNextSplitAction->setEnabled(m_optionalActionMask & FollowSymbolUnderCursor);
+    m_followToTypeAction->setEnabled(m_optionalActionMask & FollowTypeUnderCursor);
+    m_followToTypeInNextSplitAction->setEnabled(m_optionalActionMask & FollowTypeUnderCursor);
+    m_findUsageAction->setEnabled(m_optionalActionMask & FindUsage);
+    m_jumpToFileAction->setEnabled(m_optionalActionMask & JumpToFileUnderCursor);
+    m_jumpToFileInNextSplitAction->setEnabled(m_optionalActionMask & JumpToFileUnderCursor);
+    m_unfoldAllAction->setEnabled(m_optionalActionMask & UnCollapseAll);
+    m_renameSymbolAction->setEnabled(m_optionalActionMask & RenameSymbol);
+    m_openCallHierarchyAction->setEnabled(m_optionalActionMask & CallHierarchy);
+    m_openTypeHierarchyAction->setEnabled(m_optionalActionMask & TypeHierarchy);
+
+    bool formatEnabled = (m_optionalActionMask & OptionalActions::Format)
+                         && !q->isReadOnly();
+    m_autoIndentAction->setEnabled(formatEnabled);
+    m_autoFormatAction->setEnabled(formatEnabled);
+}
+
+void TextEditorWidgetPrivate::updateRedoAction()
+{
+    m_redoAction->setEnabled(q->isRedoAvailable());
+}
+
+void TextEditorWidgetPrivate::updateUndoAction()
+{
+    m_undoAction->setEnabled(q->isUndoAvailable());
+}
+
+void TextEditorWidgetPrivate::updateCopyAction(bool hasCopyableText)
+{
+    if (m_cutAction)
+        m_cutAction->setEnabled(hasCopyableText && !q->isReadOnly());
+    if (m_copyAction)
+        m_copyAction->setEnabled(hasCopyableText);
+    if (m_copyHtmlAction)
+        m_copyHtmlAction->setEnabled(hasCopyableText);
+}
+
 bool TextEditorWidget::codeFoldingVisible() const
 {
     return d->m_codeFoldingVisible;
@@ -4381,7 +4975,7 @@ static QColor calcBlendColor(const QColor &baseColor, int level, int count)
     if (level == count - 1)
         return color90;
 
-    const int blendFactor = level * (256 / (count - 2));
+    const int blendFactor = level * (256 / (count - 1));
 
     return blendColors(color80, color90, blendFactor);
 }
@@ -6877,8 +7471,8 @@ void TextEditorWidgetPrivate::handleBackspaceKey()
                 }
             }
         } else if (typingSettings.m_smartBackspaceBehavior == TypingSettings::BackspaceUnindents) {
-            const QChar previousChar = q->document()->characterAt(pos - 1);
-            if (!(previousChar == QLatin1Char(' ') || previousChar == QLatin1Char('\t'))) {
+            if (c.positionInBlock() == 0
+                || c.positionInBlock() > TabSettings::firstNonSpace(c.block().text())) {
                 if (cursorWithinSnippet)
                     c.beginEditBlock();
                 c.deletePreviousChar();
@@ -8103,6 +8697,7 @@ void TextEditorWidgetPrivate::applyFontSettingsDelayed()
     m_fontSettingsNeedsApply = true;
     if (q->isVisible())
         q->triggerPendingUpdates();
+    updateActions();
 }
 
 void TextEditorWidgetPrivate::markRemoved(TextMark *mark)
@@ -8338,6 +8933,7 @@ void TextEditorWidget::setReadOnly(bool b)
     emit readOnlyChanged();
     if (b)
         setTextInteractionFlags(textInteractionFlags() | Qt::TextSelectableByKeyboard);
+    d->updateActions();
 }
 
 void TextEditorWidget::cut()
@@ -8735,32 +9331,32 @@ void TextEditorWidget::setupFallBackEditor(Id id)
 
 void TextEditorWidget::appendStandardContextMenuActions(QMenu *menu)
 {
-    if (optionalActions() & TextEditorActionHandler::FollowSymbolUnderCursor) {
+    if (optionalActions() & OptionalActions::FollowSymbolUnderCursor) {
         const auto action = ActionManager::command(Constants::FOLLOW_SYMBOL_UNDER_CURSOR)->action();
         if (!menu->actions().contains(action))
             menu->addAction(action);
     }
-    if (optionalActions() & TextEditorActionHandler::FollowTypeUnderCursor) {
+    if (optionalActions() & OptionalActions::FollowTypeUnderCursor) {
         const auto action = ActionManager::command(Constants::FOLLOW_SYMBOL_TO_TYPE)->action();
         if (!menu->actions().contains(action))
             menu->addAction(action);
     }
-    if (optionalActions() & TextEditorActionHandler::FindUsage) {
+    if (optionalActions() & OptionalActions::FindUsage) {
         const auto action = ActionManager::command(Constants::FIND_USAGES)->action();
         if (!menu->actions().contains(action))
             menu->addAction(action);
     }
-    if (optionalActions() & TextEditorActionHandler::RenameSymbol) {
+    if (optionalActions() & OptionalActions::RenameSymbol) {
         const auto action = ActionManager::command(Constants::RENAME_SYMBOL)->action();
         if (!menu->actions().contains(action))
             menu->addAction(action);
     }
-    if (optionalActions() & TextEditorActionHandler::CallHierarchy) {
+    if (optionalActions() & OptionalActions::CallHierarchy) {
         const auto action = ActionManager::command(Constants::OPEN_CALL_HIERARCHY)->action();
         if (!menu->actions().contains(action))
             menu->addAction(action);
     }
-    if (optionalActions() & TextEditorActionHandler::TypeHierarchy) {
+    if (optionalActions() & OptionalActions::TypeHierarchy) {
         const auto action = ActionManager::command(Constants::OPEN_TYPE_HIERARCHY)->action();
         if (!menu->actions().contains(action))
             menu->addAction(action);
@@ -8792,7 +9388,7 @@ void TextEditorWidget::setOptionalActions(uint optionalActionMask)
     if (d->m_optionalActionMask == optionalActionMask)
         return;
     d->m_optionalActionMask = optionalActionMask;
-    emit optionalActionMaskChanged();
+    d->updateOptionalActions();
 }
 
 void TextEditorWidget::addOptionalActions( uint optionalActionMask)
@@ -9492,7 +10088,7 @@ public:
     CommentDefinition m_commentDefinition;
     QList<BaseHoverHandler *> m_hoverHandlers; // owned
     std::unique_ptr<CompletionAssistProvider> m_completionAssistProvider; // owned
-    std::unique_ptr<TextEditorActionHandler> m_textEditorActionHandler;
+    int m_optionalActionMask = 0;
     bool m_useGenericHighlighter = false;
     bool m_duplicatedSupported = true;
     bool m_codeFoldingSupported = false;
@@ -9565,9 +10161,9 @@ void TextEditorFactory::setAutoCompleterCreator(const AutoCompleterCreator &crea
     d->m_autoCompleterCreator = creator;
 }
 
-void TextEditorFactory::setEditorActionHandlers(uint optionalActions)
+void TextEditorFactory::setOptionalActionMask(int optionalActions)
 {
-    d->m_textEditorActionHandler.reset(new TextEditorActionHandler(id(), id(), optionalActions));
+    d->m_optionalActionMask = optionalActions;
 }
 
 void TextEditorFactory::addHoverHandler(BaseHoverHandler *handler)
@@ -9613,8 +10209,7 @@ BaseTextEditor *TextEditorFactoryPrivate::createEditorHelper(const TextDocumentP
     textEditorWidget->setMarksVisible(m_marksVisible);
     textEditorWidget->setParenthesesMatchingEnabled(m_paranthesesMatchinEnabled);
     textEditorWidget->setCodeFoldingSupported(m_codeFoldingSupported);
-    if (m_textEditorActionHandler)
-        textEditorWidget->setOptionalActions(m_textEditorActionHandler->optionalActions());
+    textEditorWidget->setOptionalActions(m_optionalActionMask);
 
     BaseTextEditor *editor = m_editorCreator();
     editor->setDuplicateSupported(m_duplicatedSupported);
diff --git a/src/plugins/texteditor/texteditor.h b/src/plugins/texteditor/texteditor.h
index 85344a8dbd..78dc0e0b82 100644
--- a/src/plugins/texteditor/texteditor.h
+++ b/src/plugins/texteditor/texteditor.h
@@ -85,6 +85,22 @@ enum TextMarkRequestKind
     TaskMarkRequest
 };
 
+namespace OptionalActions {
+enum Mask {
+    None = 0,
+    Format = 1,
+    UnCommentSelection = 2,
+    UnCollapseAll = 4,
+    FollowSymbolUnderCursor = 8,
+    FollowTypeUnderCursor = 16,
+    JumpToFileUnderCursor = 32,
+    RenameSymbol = 64,
+    FindUsage = 128,
+    CallHierarchy = 256,
+    TypeHierarchy = 512,
+};
+} // namespace OptionalActions
+
 class TEXTEDITOR_EXPORT BaseTextEditor : public Core::IEditor
 {
     Q_OBJECT
@@ -441,6 +457,9 @@ public:
     virtual void undo();
     virtual void redo();
 
+    virtual bool isUndoAvailable() const;
+    virtual bool isRedoAvailable() const;
+
     void openLinkUnderCursor();
     void openLinkUnderCursorInNextSplit();
     void openTypeUnderCursor();
@@ -511,7 +530,6 @@ signals:
     void requestUsages(const QTextCursor &cursor);
     void requestRename(const QTextCursor &cursor);
     void requestCallHierarchy(const QTextCursor &cursor);
-    void optionalActionMaskChanged();
     void toolbarOutlineChanged(QWidget *newOutline);
 
 protected:
@@ -569,6 +587,8 @@ protected:
 
     void setVisualIndentOffset(int offset);
 
+    void updateUndoRedoActions();
+
 public:
     QString selectedText() const;
 
@@ -689,7 +709,7 @@ public:
     void setSyntaxHighlighterCreator(const SyntaxHighLighterCreator &creator);
     void setUseGenericHighlighter(bool enabled);
     void setAutoCompleterCreator(const AutoCompleterCreator &creator);
-    void setEditorActionHandlers(uint optionalActions);
+    void setOptionalActionMask(int optionalActions);
 
     void addHoverHandler(BaseHoverHandler *handler);
     void setCompletionAssistProvider(CompletionAssistProvider *provider);
diff --git a/src/plugins/texteditor/texteditor.qbs b/src/plugins/texteditor/texteditor.qbs
index 30a4712b73..7c0ee12093 100644
--- a/src/plugins/texteditor/texteditor.qbs
+++ b/src/plugins/texteditor/texteditor.qbs
@@ -137,8 +137,6 @@ QtcPlugin {
         "texteditor.qrc",
         "texteditor_global.h",
         "texteditortr.h",
-        "texteditoractionhandler.cpp",
-        "texteditoractionhandler.h",
         "texteditorconstants.cpp",
         "texteditorconstants.h",
         "texteditoroverlay.cpp",
diff --git a/src/plugins/texteditor/texteditoractionhandler.cpp b/src/plugins/texteditor/texteditoractionhandler.cpp
deleted file mode 100644
index 2cf553689c..0000000000
--- a/src/plugins/texteditor/texteditoractionhandler.cpp
+++ /dev/null
@@ -1,671 +0,0 @@
-// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#include "texteditoractionhandler.h"
-
-#include "texteditor.h"
-#include "displaysettings.h"
-#include "fontsettings.h"
-#include "linenumberfilter.h"
-#include "texteditortr.h"
-#include "texteditorsettings.h"
-#include "typehierarchy.h"
-
-#include <aggregation/aggregate.h>
-
-#include <coreplugin/locator/locatormanager.h>
-#include <coreplugin/icore.h>
-#include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/coreconstants.h>
-#include <coreplugin/navigationwidget.h>
-#include <coreplugin/actionmanager/actionmanager.h>
-#include <coreplugin/actionmanager/actioncontainer.h>
-#include <coreplugin/actionmanager/command.h>
-
-#include <utils/hostosinfo.h>
-#include <utils/qtcassert.h>
-
-#include <QDebug>
-#include <QAction>
-
-#include <functional>
-
-using namespace Core;
-
-namespace TextEditor {
-namespace Internal {
-
-class TextEditorActionHandlerPrivate : public QObject
-{
-public:
-    TextEditorActionHandlerPrivate(Utils::Id editorId, Utils::Id contextId, uint optionalActions);
-
-    QAction *registerActionHelper(Utils::Id id,
-                                  bool scriptable,
-                                  const QString &title,
-                                  const QKeySequence &keySequence,
-                                  Utils::Id menueGroup,
-                                  ActionContainer *container,
-                                  std::function<void(bool)> slot)
-    {
-        auto result = new QAction(title, this);
-        Command *command
-            = ActionManager::registerAction(result, id, Context(m_contextId), scriptable);
-        if (!keySequence.isEmpty())
-            command->setDefaultKeySequence(keySequence);
-
-        if (container && menueGroup.isValid())
-            container->addAction(command, menueGroup);
-
-        connect(result, &QAction::triggered, slot);
-        return result;
-    }
-
-    QAction *registerAction(Utils::Id id,
-                            std::function<void(TextEditorWidget *)> slot,
-                            bool scriptable = false,
-                            const QString &title = QString(),
-                            const QKeySequence &keySequence = QKeySequence(),
-                            Utils::Id menueGroup = Utils::Id(),
-                            ActionContainer *container = nullptr)
-    {
-        return registerActionHelper(id,
-                                    scriptable,
-                                    title,
-                                    keySequence,
-                                    menueGroup,
-                                    container,
-                                    [this, slot, id](bool) {
-                                        if (m_currentEditorWidget)
-                                            slot(m_currentEditorWidget);
-                                        else if (m_unhandledCallback)
-                                            m_unhandledCallback(id, m_currentEditor);
-                                    });
-    }
-
-    QAction *registerBoolAction(Utils::Id id,
-                                std::function<void(TextEditorWidget *, bool)> slot,
-                                bool scriptable = false,
-                                const QString &title = QString(),
-                                const QKeySequence &keySequence = QKeySequence(),
-                                Utils::Id menueGroup = Utils::Id(),
-                                ActionContainer *container = nullptr)
-    {
-        return registerActionHelper(id, scriptable, title, keySequence, menueGroup, container,
-            [this, slot](bool on) { if (m_currentEditorWidget) slot(m_currentEditorWidget, on); });
-    }
-
-    QAction *registerIntAction(Utils::Id id,
-                               std::function<void(TextEditorWidget *, int)> slot,
-                               bool scriptable = false,
-                               const QString &title = QString(),
-                               const QKeySequence &keySequence = QKeySequence(),
-                               Utils::Id menueGroup = Utils::Id(),
-                               ActionContainer *container = nullptr)
-    {
-        return registerActionHelper(id, scriptable, title, keySequence, menueGroup, container,
-            [this, slot](bool on) { if (m_currentEditorWidget) slot(m_currentEditorWidget, on); });
-    }
-
-    void createActions();
-
-    void updateActions();
-    void updateOptionalActions();
-    void updateRedoAction(bool on);
-    void updateUndoAction(bool on);
-    void updateCopyAction(bool on);
-
-    void updateCurrentEditor(IEditor *editor);
-
-    void setCanUndoCallback(const TextEditorActionHandler::Predicate &callback);
-    void setCanRedoCallback(const TextEditorActionHandler::Predicate &callback);
-
-public:
-    TextEditorActionHandler::TextEditorWidgetResolver m_findTextWidget;
-    QAction *m_undoAction = nullptr;
-    QAction *m_redoAction = nullptr;
-    QAction *m_copyAction = nullptr;
-    QAction *m_copyHtmlAction = nullptr;
-    QAction *m_cutAction = nullptr;
-    QAction *m_autoIndentAction = nullptr;
-    QAction *m_autoFormatAction = nullptr;
-    QAction *m_visualizeWhitespaceAction = nullptr;
-    QAction *m_textWrappingAction = nullptr;
-    QAction *m_unCommentSelectionAction = nullptr;
-    QAction *m_unfoldAllAction = nullptr;
-    QAction *m_followSymbolAction = nullptr;
-    QAction *m_followSymbolInNextSplitAction = nullptr;
-    QAction *m_followToTypeAction = nullptr;
-    QAction *m_followToTypeInNextSplitAction = nullptr;
-    QAction *m_findUsageAction = nullptr;
-    QAction *m_openCallHierarchyAction = nullptr;
-    QAction *m_openTypeHierarchyAction = nullptr;
-    QAction *m_renameSymbolAction = nullptr;
-    QAction *m_jumpToFileAction = nullptr;
-    QAction *m_jumpToFileInNextSplitAction = nullptr;
-    QList<QAction *> m_modifyingActions;
-
-    uint m_optionalActions = TextEditorActionHandler::None;
-    QPointer<TextEditorWidget> m_currentEditorWidget;
-    QPointer<IEditor> m_currentEditor;
-    Utils::Id m_editorId;
-    Utils::Id m_contextId;
-
-    TextEditorActionHandler::Predicate m_canUndoCallback;
-    TextEditorActionHandler::Predicate m_canRedoCallback;
-
-    TextEditorActionHandler::UnhandledCallback m_unhandledCallback;
-};
-
-TextEditorActionHandlerPrivate::TextEditorActionHandlerPrivate
-    (Utils::Id editorId, Utils::Id contextId, uint optionalActions)
-  : m_optionalActions(optionalActions)
-  , m_editorId(editorId)
-  , m_contextId(contextId)
-{
-    createActions();
-    connect(EditorManager::instance(),
-            &EditorManager::currentEditorChanged,
-            this,
-            &TextEditorActionHandlerPrivate::updateCurrentEditor);
-    connect(TextEditorSettings::instance(), &TextEditorSettings::fontSettingsChanged,
-        this, &TextEditorActionHandlerPrivate::updateActions);
-}
-
-void TextEditorActionHandlerPrivate::createActions()
-{
-    using namespace Core::Constants;
-    using namespace TextEditor::Constants;
-
-    m_undoAction = registerAction(UNDO,
-            [] (TextEditorWidget *w) { w->undo(); }, true, Tr::tr("&Undo"));
-    m_redoAction = registerAction(REDO,
-            [] (TextEditorWidget *w) { w->redo(); }, true, Tr::tr("&Redo"));
-    m_copyAction = registerAction(COPY,
-            [] (TextEditorWidget *w) { w->copy(); }, true);
-    m_cutAction = registerAction(CUT,
-            [] (TextEditorWidget *w) { w->cut(); }, true);
-    m_modifyingActions << registerAction(PASTE,
-            [] (TextEditorWidget *w) { w->paste(); }, true);
-    registerAction(SELECTALL,
-            [] (TextEditorWidget *w) { w->selectAll(); }, true);
-    registerAction(GOTO, [](TextEditorWidget *) {
-        LocatorManager::showFilter(lineNumberFilter());
-    });
-    m_modifyingActions << registerAction(PRINT, [](TextEditorWidget *widget) {
-        widget->print(ICore::printer());
-    });
-    m_modifyingActions << registerAction(DELETE_LINE,
-            [] (TextEditorWidget *w) { w->deleteLine(); }, true, Tr::tr("Delete &Line"));
-    m_modifyingActions << registerAction(DELETE_END_OF_LINE,
-            [] (TextEditorWidget *w) { w->deleteEndOfLine(); }, true, Tr::tr("Delete Line from Cursor On"));
-    m_modifyingActions << registerAction(DELETE_END_OF_WORD,
-            [] (TextEditorWidget *w) { w->deleteEndOfWord(); }, true, Tr::tr("Delete Word from Cursor On"));
-    m_modifyingActions << registerAction(DELETE_END_OF_WORD_CAMEL_CASE,
-            [] (TextEditorWidget *w) { w->deleteEndOfWordCamelCase(); }, true, Tr::tr("Delete Word Camel Case from Cursor On"));
-    m_modifyingActions << registerAction(
-        DELETE_START_OF_LINE,
-        [](TextEditorWidget *w) { w->deleteStartOfLine(); },
-        true,
-        Tr::tr("Delete Line up to Cursor"),
-        Core::useMacShortcuts ? QKeySequence(Tr::tr("Ctrl+Backspace")) : QKeySequence());
-    m_modifyingActions << registerAction(DELETE_START_OF_WORD,
-            [] (TextEditorWidget *w) { w->deleteStartOfWord(); }, true, Tr::tr("Delete Word up to Cursor"));
-    m_modifyingActions << registerAction(DELETE_START_OF_WORD_CAMEL_CASE,
-            [] (TextEditorWidget *w) { w->deleteStartOfWordCamelCase(); }, true, Tr::tr("Delete Word Camel Case up to Cursor"));
-    registerAction(GOTO_BLOCK_START_WITH_SELECTION,
-            [] (TextEditorWidget *w) { w->gotoBlockStartWithSelection(); }, true, Tr::tr("Go to Block Start with Selection"),
-            QKeySequence(Tr::tr("Ctrl+{")));
-    registerAction(GOTO_BLOCK_END_WITH_SELECTION,
-            [] (TextEditorWidget *w) { w->gotoBlockEndWithSelection(); }, true, Tr::tr("Go to Block End with Selection"),
-            QKeySequence(Tr::tr("Ctrl+}")));
-    m_modifyingActions << registerAction(MOVE_LINE_UP,
-            [] (TextEditorWidget *w) { w->moveLineUp(); }, true, Tr::tr("Move Line Up"),
-            QKeySequence(Tr::tr("Ctrl+Shift+Up")));
-    m_modifyingActions << registerAction(MOVE_LINE_DOWN,
-            [] (TextEditorWidget *w) { w->moveLineDown(); }, true, Tr::tr("Move Line Down"),
-            QKeySequence(Tr::tr("Ctrl+Shift+Down")));
-    m_modifyingActions << registerAction(COPY_LINE_UP,
-            [] (TextEditorWidget *w) { w->copyLineUp(); }, true, Tr::tr("Copy Line Up"),
-            QKeySequence(Tr::tr("Ctrl+Alt+Up")));
-    m_modifyingActions << registerAction(COPY_LINE_DOWN,
-            [] (TextEditorWidget *w) { w->copyLineDown(); }, true, Tr::tr("Copy Line Down"),
-            QKeySequence(Tr::tr("Ctrl+Alt+Down")));
-    m_modifyingActions << registerAction(JOIN_LINES,
-            [] (TextEditorWidget *w) { w->joinLines(); }, true, Tr::tr("Join Lines"),
-            QKeySequence(Tr::tr("Ctrl+J")));
-    m_modifyingActions << registerAction(INSERT_LINE_ABOVE,
-            [] (TextEditorWidget *w) { w->insertLineAbove(); }, true, Tr::tr("Insert Line Above Current Line"),
-            QKeySequence(Tr::tr("Ctrl+Shift+Return")));
-    m_modifyingActions << registerAction(INSERT_LINE_BELOW,
-            [] (TextEditorWidget *w) { w->insertLineBelow(); }, true, Tr::tr("Insert Line Below Current Line"),
-            QKeySequence(Tr::tr("Ctrl+Return")));
-    m_modifyingActions << registerAction(SWITCH_UTF8BOM,
-            [] (TextEditorWidget *w) { w->switchUtf8bom(); }, true, Tr::tr("Toggle UTF-8 BOM"));
-    m_modifyingActions << registerAction(INDENT,
-            [] (TextEditorWidget *w) { w->indent(); }, true, Tr::tr("Indent"));
-    m_modifyingActions << registerAction(UNINDENT,
-            [] (TextEditorWidget *w) { w->unindent(); }, true, Tr::tr("Unindent"));
-    m_followSymbolAction = registerAction(FOLLOW_SYMBOL_UNDER_CURSOR,
-            [] (TextEditorWidget *w) { w->openLinkUnderCursor(); }, true, Tr::tr("Follow Symbol Under Cursor"),
-            QKeySequence(Qt::Key_F2));
-    m_followSymbolInNextSplitAction = registerAction(FOLLOW_SYMBOL_UNDER_CURSOR_IN_NEXT_SPLIT,
-            [] (TextEditorWidget *w) { w->openLinkUnderCursorInNextSplit(); }, true, Tr::tr("Follow Symbol Under Cursor in Next Split"),
-            QKeySequence(Utils::HostOsInfo::isMacHost() ? Tr::tr("Meta+E, F2") : Tr::tr("Ctrl+E, F2")));
-    m_followToTypeAction = registerAction(FOLLOW_SYMBOL_TO_TYPE,
-            [] (TextEditorWidget *w) { w->openTypeUnderCursor(); }, true, Tr::tr("Follow Type Under Cursor"),
-            QKeySequence(Tr::tr("Ctrl+Shift+F2")));
-    m_followToTypeInNextSplitAction = registerAction(FOLLOW_SYMBOL_TO_TYPE_IN_NEXT_SPLIT,
-            [] (TextEditorWidget *w) { w->openTypeUnderCursorInNextSplit(); }, true, Tr::tr("Follow Type Under Cursor in Next Split"),
-            QKeySequence(Utils::HostOsInfo::isMacHost() ? Tr::tr("Meta+E, Shift+F2") : Tr::tr("Ctrl+E, Ctrl+Shift+F2")));
-    m_findUsageAction = registerAction(FIND_USAGES,
-            [] (TextEditorWidget *w) { w->findUsages(); }, true, Tr::tr("Find References to Symbol Under Cursor"),
-            QKeySequence(Tr::tr("Ctrl+Shift+U")));
-    m_renameSymbolAction = registerAction(RENAME_SYMBOL,
-            [] (TextEditorWidget *w) { w->renameSymbolUnderCursor(); }, true, Tr::tr("Rename Symbol Under Cursor"),
-            QKeySequence(Tr::tr("Ctrl+Shift+R")));
-    m_jumpToFileAction = registerAction(JUMP_TO_FILE_UNDER_CURSOR,
-            [] (TextEditorWidget *w) { w->openLinkUnderCursor(); }, true, Tr::tr("Jump to File Under Cursor"),
-            QKeySequence(Qt::Key_F2));
-    m_jumpToFileInNextSplitAction = registerAction(JUMP_TO_FILE_UNDER_CURSOR_IN_NEXT_SPLIT,
-            [] (TextEditorWidget *w) { w->openLinkUnderCursorInNextSplit(); }, true, Tr::tr("Jump to File Under Cursor in Next Split"),
-            QKeySequence(Utils::HostOsInfo::isMacHost() ? Tr::tr("Meta+E, F2") : Tr::tr("Ctrl+E, F2")).toString());
-    m_openCallHierarchyAction = registerAction(OPEN_CALL_HIERARCHY,
-            [] (TextEditorWidget *w) { w->openCallHierarchy(); }, true, Tr::tr("Open Call Hierarchy"));
-    m_openTypeHierarchyAction = registerAction(
-        OPEN_TYPE_HIERARCHY,
-        [](TextEditorWidget *) {
-            updateTypeHierarchy(
-                NavigationWidget::activateSubWidget(Constants::TYPE_HIERARCHY_FACTORY_ID,
-                                                    Side::Left));
-        },
-        true,
-        Tr::tr("Open Type Hierarchy"),
-        QKeySequence(Utils::HostOsInfo::isMacHost() ? Tr::tr("Meta+Shift+T")
-                                                    : Tr::tr("Ctrl+Shift+T")));
-    registerAction(VIEW_PAGE_UP,
-            [] (TextEditorWidget *w) { w->viewPageUp(); }, true, Tr::tr("Move the View a Page Up and Keep the Cursor Position"),
-            QKeySequence(Tr::tr("Ctrl+PgUp")));
-    registerAction(VIEW_PAGE_DOWN,
-            [] (TextEditorWidget *w) { w->viewPageDown(); }, true, Tr::tr("Move the View a Page Down and Keep the Cursor Position"),
-            QKeySequence(Tr::tr("Ctrl+PgDown")));
-    registerAction(VIEW_LINE_UP,
-            [] (TextEditorWidget *w) { w->viewLineUp(); }, true, Tr::tr("Move the View a Line Up and Keep the Cursor Position"),
-            QKeySequence(Tr::tr("Ctrl+Up")));
-    registerAction(VIEW_LINE_DOWN,
-            [] (TextEditorWidget *w) { w->viewLineDown(); }, true, Tr::tr("Move the View a Line Down and Keep the Cursor Position"),
-            QKeySequence(Tr::tr("Ctrl+Down")));
-
-    // register "Edit" Menu Actions
-    ActionContainer *editMenu = ActionManager::actionContainer(M_EDIT);
-    registerAction(SELECT_ENCODING,
-            [] (TextEditorWidget *w) { w->selectEncoding(); }, false, Tr::tr("Select Encoding..."),
-            QKeySequence(), G_EDIT_OTHER, editMenu);
-    m_modifyingActions << registerAction(CIRCULAR_PASTE,
-        [] (TextEditorWidget *w) { w->circularPaste(); }, false, Tr::tr("Paste from Clipboard History"),
-        QKeySequence(Tr::tr("Ctrl+Shift+V")), G_EDIT_COPYPASTE, editMenu);
-    m_modifyingActions << registerAction(NO_FORMAT_PASTE,
-        [] (TextEditorWidget *w) { w->pasteWithoutFormat(); }, false, Tr::tr("Paste Without Formatting"),
-        QKeySequence(Core::useMacShortcuts ? Tr::tr("Ctrl+Alt+Shift+V") : QString()), G_EDIT_COPYPASTE, editMenu);
-
-    // register "Edit -> Advanced" Menu Actions
-    ActionContainer *advancedEditMenu = ActionManager::actionContainer(M_EDIT_ADVANCED);
-    m_autoIndentAction = registerAction(AUTO_INDENT_SELECTION,
-            [] (TextEditorWidget *w) { w->autoIndent(); }, true, Tr::tr("Auto-&indent Selection"),
-            QKeySequence(Tr::tr("Ctrl+I")),
-            G_EDIT_FORMAT, advancedEditMenu);
-    m_autoFormatAction = registerAction(AUTO_FORMAT_SELECTION,
-            [] (TextEditorWidget *w) { w->autoFormat(); }, true, Tr::tr("Auto-&format Selection"),
-            QKeySequence(Tr::tr("Ctrl+;")),
-            G_EDIT_FORMAT, advancedEditMenu);
-    m_modifyingActions << registerAction(REWRAP_PARAGRAPH,
-            [] (TextEditorWidget *w) { w->rewrapParagraph(); }, true, Tr::tr("&Rewrap Paragraph"),
-            QKeySequence(Core::useMacShortcuts ? Tr::tr("Meta+E, R") : Tr::tr("Ctrl+E, R")),
-            G_EDIT_FORMAT, advancedEditMenu);
-    m_visualizeWhitespaceAction = registerBoolAction(VISUALIZE_WHITESPACE,
-            [] (TextEditorWidget *widget, bool checked) {
-                if (widget) {
-                     DisplaySettings ds = widget->displaySettings();
-                     ds.m_visualizeWhitespace = checked;
-                     widget->setDisplaySettings(ds);
-                }
-            },
-            false, Tr::tr("&Visualize Whitespace"),
-            QKeySequence(Core::useMacShortcuts ? Tr::tr("Meta+E, Meta+V") : Tr::tr("Ctrl+E, Ctrl+V")),
-            G_EDIT_FORMAT, advancedEditMenu);
-    m_visualizeWhitespaceAction->setCheckable(true);
-    m_modifyingActions << registerAction(CLEAN_WHITESPACE,
-            [] (TextEditorWidget *w) { w->cleanWhitespace(); }, true, Tr::tr("Clean Whitespace"),
-            QKeySequence(),
-            G_EDIT_FORMAT, advancedEditMenu);
-    m_textWrappingAction = registerBoolAction(TEXT_WRAPPING,
-            [] (TextEditorWidget *widget, bool checked) {
-                if (widget) {
-                    DisplaySettings ds = widget->displaySettings();
-                    ds.m_textWrapping = checked;
-                    widget->setDisplaySettings(ds);
-                }
-            },
-            false, Tr::tr("Enable Text &Wrapping"),
-            QKeySequence(Core::useMacShortcuts ? Tr::tr("Meta+E, Meta+W") : Tr::tr("Ctrl+E, Ctrl+W")),
-            G_EDIT_FORMAT, advancedEditMenu);
-    m_textWrappingAction->setCheckable(true);
-    m_unCommentSelectionAction = registerAction(UN_COMMENT_SELECTION,
-            [] (TextEditorWidget *w) { w->unCommentSelection(); }, true, Tr::tr("Toggle Comment &Selection"),
-            QKeySequence(Tr::tr("Ctrl+/")),
-            G_EDIT_FORMAT, advancedEditMenu);
-    m_modifyingActions << registerAction(CUT_LINE,
-            [] (TextEditorWidget *w) { w->cutLine(); }, true, Tr::tr("Cut &Line"),
-            QKeySequence(Tr::tr("Shift+Del")),
-            G_EDIT_TEXT, advancedEditMenu);
-    registerAction(COPY_LINE,
-            [] (TextEditorWidget *w) { w->copyLine(); }, false, Tr::tr("Copy &Line"),
-            QKeySequence(Tr::tr("Ctrl+Ins")),
-            G_EDIT_TEXT, advancedEditMenu);
-    m_copyHtmlAction = registerAction(COPY_WITH_HTML,
-            [] (TextEditorWidget *w) { w->copyWithHtml(); }, true, Tr::tr("Copy With Highlighting"),
-            QKeySequence(), G_EDIT_TEXT, advancedEditMenu);
-
-    registerAction(ADD_CURSORS_TO_LINE_ENDS,
-            [] (TextEditorWidget *w) { w->addCursorsToLineEnds(); }, false, Tr::tr("Create Cursors at Selected Line Ends"),
-            QKeySequence(Tr::tr("Alt+Shift+I")),
-            G_EDIT_TEXT, advancedEditMenu);
-    registerAction(ADD_SELECT_NEXT_FIND_MATCH,
-            [] (TextEditorWidget *w) { w->addSelectionNextFindMatch(); }, false, Tr::tr("Add Next Occurrence to Selection"),
-            QKeySequence(Tr::tr("Ctrl+D")),
-            G_EDIT_TEXT, advancedEditMenu);
-    m_modifyingActions << registerAction(DUPLICATE_SELECTION,
-            [] (TextEditorWidget *w) { w->duplicateSelection(); }, false, Tr::tr("&Duplicate Selection"),
-            QKeySequence(),
-            G_EDIT_TEXT, advancedEditMenu);
-    m_modifyingActions << registerAction(DUPLICATE_SELECTION_AND_COMMENT,
-            [] (TextEditorWidget *w) { w->duplicateSelectionAndComment(); }, false, Tr::tr("&Duplicate Selection and Comment"),
-            QKeySequence(),
-            G_EDIT_TEXT, advancedEditMenu);
-    m_modifyingActions << registerAction(UPPERCASE_SELECTION,
-            [] (TextEditorWidget *w) { w->uppercaseSelection(); }, true, Tr::tr("Uppercase Selection"),
-            QKeySequence(Core::useMacShortcuts ? Tr::tr("Meta+Shift+U") : Tr::tr("Alt+Shift+U")),
-            G_EDIT_TEXT, advancedEditMenu);
-    m_modifyingActions << registerAction(LOWERCASE_SELECTION,
-            [] (TextEditorWidget *w) { w->lowercaseSelection(); }, true, Tr::tr("Lowercase Selection"),
-            QKeySequence(Core::useMacShortcuts ? Tr::tr("Meta+U") : Tr::tr("Alt+U")),
-            G_EDIT_TEXT, advancedEditMenu);
-    m_modifyingActions << registerAction(SORT_LINES,
-        [] (TextEditorWidget *w) { w->sortLines(); }, false, Tr::tr("&Sort Lines"),
-            QKeySequence(Core::useMacShortcuts ? Tr::tr("Meta+Shift+S") : Tr::tr("Alt+Shift+S")),
-            G_EDIT_TEXT, advancedEditMenu);
-    registerAction(FOLD,
-            [] (TextEditorWidget *w) { w->foldCurrentBlock(); }, true, Tr::tr("Fold"),
-            QKeySequence(Tr::tr("Ctrl+<")),
-            G_EDIT_COLLAPSING, advancedEditMenu);
-    registerAction(UNFOLD,
-            [] (TextEditorWidget *w) { w->unfoldCurrentBlock(); }, true, Tr::tr("Unfold"),
-            QKeySequence(Tr::tr("Ctrl+>")),
-            G_EDIT_COLLAPSING, advancedEditMenu);
-    m_unfoldAllAction = registerAction(UNFOLD_ALL,
-            [] (TextEditorWidget *w) { w->unfoldAll(); }, true, Tr::tr("Toggle &Fold All"),
-            QKeySequence(),
-            G_EDIT_COLLAPSING, advancedEditMenu);
-    registerAction(INCREASE_FONT_SIZE,
-            [] (TextEditorWidget *w) { w->increaseFontZoom(); }, false, Tr::tr("Increase Font Size"),
-            QKeySequence(Tr::tr("Ctrl++")),
-            G_EDIT_FONT, advancedEditMenu);
-    registerAction(DECREASE_FONT_SIZE,
-            [] (TextEditorWidget *w) { w->decreaseFontZoom(); }, false, Tr::tr("Decrease Font Size"),
-            QKeySequence(Tr::tr("Ctrl+-")),
-            G_EDIT_FONT, advancedEditMenu);
-    registerAction(RESET_FONT_SIZE,
-            [] (TextEditorWidget *w) { w->zoomReset(); }, false, Tr::tr("Reset Font Size"),
-            QKeySequence(Core::useMacShortcuts ? Tr::tr("Meta+0") : Tr::tr("Ctrl+0")),
-            G_EDIT_FONT, advancedEditMenu);
-    registerAction(GOTO_BLOCK_START,
-            [] (TextEditorWidget *w) { w->gotoBlockStart(); }, true, Tr::tr("Go to Block Start"),
-            QKeySequence(Tr::tr("Ctrl+[")),
-            G_EDIT_BLOCKS, advancedEditMenu);
-    registerAction(GOTO_BLOCK_END,
-            [] (TextEditorWidget *w) { w->gotoBlockEnd(); }, true, Tr::tr("Go to Block End"),
-            QKeySequence(Tr::tr("Ctrl+]")),
-            G_EDIT_BLOCKS, advancedEditMenu);
-    registerAction(SELECT_BLOCK_UP,
-            [] (TextEditorWidget *w) { w->selectBlockUp(); }, true, Tr::tr("Select Block Up"),
-            QKeySequence(Tr::tr("Ctrl+U")),
-            G_EDIT_BLOCKS, advancedEditMenu);
-    registerAction(SELECT_BLOCK_DOWN,
-            [] (TextEditorWidget *w) { w->selectBlockDown(); }, true, Tr::tr("Select Block Down"),
-            QKeySequence(Tr::tr("Ctrl+Shift+Alt+U")),
-            G_EDIT_BLOCKS, advancedEditMenu);
-    registerAction(SELECT_WORD_UNDER_CURSOR,
-            [] (TextEditorWidget *w) { w->selectWordUnderCursor(); }, true,
-            Tr::tr("Select Word Under Cursor"));
-
-    // register GOTO Actions
-    registerAction(GOTO_DOCUMENT_START,
-            [] (TextEditorWidget *w) { w->gotoDocumentStart(); }, true, Tr::tr("Go to Document Start"));
-    registerAction(GOTO_DOCUMENT_END,
-            [] (TextEditorWidget *w) { w->gotoDocumentEnd(); }, true, Tr::tr("Go to Document End"));
-    registerAction(GOTO_LINE_START,
-            [] (TextEditorWidget *w) { w->gotoLineStart(); }, true, Tr::tr("Go to Line Start"));
-    registerAction(GOTO_LINE_END,
-            [] (TextEditorWidget *w) { w->gotoLineEnd(); }, true, Tr::tr("Go to Line End"));
-    registerAction(GOTO_NEXT_LINE,
-            [] (TextEditorWidget *w) { w->gotoNextLine(); }, true, Tr::tr("Go to Next Line"));
-    registerAction(GOTO_PREVIOUS_LINE,
-            [] (TextEditorWidget *w) { w->gotoPreviousLine(); }, true, Tr::tr("Go to Previous Line"));
-    registerAction(GOTO_PREVIOUS_CHARACTER,
-            [] (TextEditorWidget *w) { w->gotoPreviousCharacter(); }, true, Tr::tr("Go to Previous Character"));
-    registerAction(GOTO_NEXT_CHARACTER,
-            [] (TextEditorWidget *w) { w->gotoNextCharacter(); }, true, Tr::tr("Go to Next Character"));
-    registerAction(GOTO_PREVIOUS_WORD,
-            [] (TextEditorWidget *w) { w->gotoPreviousWord(); }, true, Tr::tr("Go to Previous Word"));
-    registerAction(GOTO_NEXT_WORD,
-            [] (TextEditorWidget *w) { w->gotoNextWord(); }, true, Tr::tr("Go to Next Word"));
-    registerAction(GOTO_PREVIOUS_WORD_CAMEL_CASE,
-            [] (TextEditorWidget *w) { w->gotoPreviousWordCamelCase(); }, false, Tr::tr("Go to Previous Word Camel Case"));
-    registerAction(GOTO_NEXT_WORD_CAMEL_CASE,
-            [] (TextEditorWidget *w) { w->gotoNextWordCamelCase(); }, false, Tr::tr("Go to Next Word Camel Case"));
-
-    // register GOTO actions with selection
-    registerAction(GOTO_LINE_START_WITH_SELECTION,
-            [] (TextEditorWidget *w) { w->gotoLineStartWithSelection(); }, true, Tr::tr("Go to Line Start with Selection"));
-    registerAction(GOTO_LINE_END_WITH_SELECTION,
-            [] (TextEditorWidget *w) { w->gotoLineEndWithSelection(); }, true, Tr::tr("Go to Line End with Selection"));
-    registerAction(GOTO_NEXT_LINE_WITH_SELECTION,
-            [] (TextEditorWidget *w) { w->gotoNextLineWithSelection(); }, true, Tr::tr("Go to Next Line with Selection"));
-    registerAction(GOTO_PREVIOUS_LINE_WITH_SELECTION,
-            [] (TextEditorWidget *w) { w->gotoPreviousLineWithSelection(); }, true, Tr::tr("Go to Previous Line with Selection"));
-    registerAction(GOTO_PREVIOUS_CHARACTER_WITH_SELECTION,
-            [] (TextEditorWidget *w) { w->gotoPreviousCharacterWithSelection(); }, true, Tr::tr("Go to Previous Character with Selection"));
-    registerAction(GOTO_NEXT_CHARACTER_WITH_SELECTION,
-            [] (TextEditorWidget *w) { w->gotoNextCharacterWithSelection(); }, true, Tr::tr("Go to Next Character with Selection"));
-    registerAction(GOTO_PREVIOUS_WORD_WITH_SELECTION,
-            [] (TextEditorWidget *w) { w->gotoPreviousWordWithSelection(); }, true, Tr::tr("Go to Previous Word with Selection"));
-    registerAction(GOTO_NEXT_WORD_WITH_SELECTION,
-            [] (TextEditorWidget *w) { w->gotoNextWordWithSelection(); }, true, Tr::tr("Go to Next Word with Selection"));
-    registerAction(GOTO_PREVIOUS_WORD_CAMEL_CASE_WITH_SELECTION,
-            [] (TextEditorWidget *w) { w->gotoPreviousWordCamelCaseWithSelection(); }, false, Tr::tr("Go to Previous Word Camel Case with Selection"));
-    registerAction(GOTO_NEXT_WORD_CAMEL_CASE_WITH_SELECTION,
-            [] (TextEditorWidget *w) { w->gotoNextWordCamelCaseWithSelection(); }, false, Tr::tr("Go to Next Word Camel Case with Selection"));
-
-    // Collect additional modifying actions so we can check for them inside a readonly file
-    // and disable them
-    m_modifyingActions << m_autoIndentAction;
-    m_modifyingActions << m_autoFormatAction;
-    m_modifyingActions << m_unCommentSelectionAction;
-
-    updateOptionalActions();
-}
-
-void TextEditorActionHandlerPrivate::updateActions()
-{
-    bool isWritable = m_currentEditorWidget && !m_currentEditorWidget->isReadOnly();
-    for (QAction *a : std::as_const(m_modifyingActions))
-        a->setEnabled(isWritable);
-    m_unCommentSelectionAction->setEnabled((m_optionalActions & TextEditorActionHandler::UnCommentSelection) && isWritable);
-    m_visualizeWhitespaceAction->setEnabled(m_currentEditorWidget);
-    if (TextEditorSettings::fontSettings().relativeLineSpacing() == 100) {
-        m_textWrappingAction->setEnabled(m_currentEditorWidget);
-    } else {
-        m_textWrappingAction->setEnabled(false);
-        m_textWrappingAction->setChecked(false);
-    }
-    if (m_currentEditorWidget) {
-        m_visualizeWhitespaceAction->setChecked(
-                    m_currentEditorWidget->displaySettings().m_visualizeWhitespace);
-        m_textWrappingAction->setChecked(m_currentEditorWidget->displaySettings().m_textWrapping);
-    }
-
-    bool canRedo = false;
-    bool canUndo = false;
-    bool canCopy = false;
-
-    if (m_currentEditor && m_currentEditor->document()
-        && m_currentEditor->document()->id() == m_editorId) {
-        canRedo = m_canRedoCallback ? m_canRedoCallback(m_currentEditor) : false;
-        canUndo = m_canUndoCallback ? m_canUndoCallback(m_currentEditor) : false;
-
-        if (m_currentEditorWidget) {
-            canRedo = m_canRedoCallback ? canRedo
-                                        : m_currentEditorWidget->document()->isRedoAvailable();
-            canUndo = m_canUndoCallback ? canUndo
-                                        : m_currentEditorWidget->document()->isUndoAvailable();
-            canCopy = m_currentEditorWidget->textCursor().hasSelection();
-        }
-    }
-
-    updateRedoAction(canRedo);
-    updateUndoAction(canUndo);
-    updateCopyAction(canCopy);
-
-    updateOptionalActions();
-}
-
-void TextEditorActionHandlerPrivate::updateOptionalActions()
-{
-    const uint optionalActions = m_currentEditorWidget ? m_currentEditorWidget->optionalActions()
-                                                       : m_optionalActions;
-    m_followSymbolAction->setEnabled(
-        optionalActions & TextEditorActionHandler::FollowSymbolUnderCursor);
-    m_followSymbolInNextSplitAction->setEnabled(
-        optionalActions & TextEditorActionHandler::FollowSymbolUnderCursor);
-    m_followToTypeAction->setEnabled(
-        optionalActions & TextEditorActionHandler::FollowTypeUnderCursor);
-    m_followToTypeInNextSplitAction->setEnabled(
-        optionalActions & TextEditorActionHandler::FollowTypeUnderCursor);
-    m_findUsageAction->setEnabled(
-        optionalActions & TextEditorActionHandler::FindUsage);
-    m_jumpToFileAction->setEnabled(
-        optionalActions & TextEditorActionHandler::JumpToFileUnderCursor);
-    m_jumpToFileInNextSplitAction->setEnabled(
-        optionalActions & TextEditorActionHandler::JumpToFileUnderCursor);
-    m_unfoldAllAction->setEnabled(
-        optionalActions & TextEditorActionHandler::UnCollapseAll);
-    m_renameSymbolAction->setEnabled(
-        optionalActions & TextEditorActionHandler::RenameSymbol);
-    m_openCallHierarchyAction->setEnabled(
-        optionalActions & TextEditorActionHandler::CallHierarchy);
-    m_openTypeHierarchyAction->setEnabled(
-        optionalActions & TextEditorActionHandler::TypeHierarchy);
-
-    bool formatEnabled = (optionalActions & TextEditorActionHandler::Format)
-                         && m_currentEditorWidget && !m_currentEditorWidget->isReadOnly();
-    m_autoIndentAction->setEnabled(formatEnabled);
-    m_autoFormatAction->setEnabled(formatEnabled);
-}
-
-void TextEditorActionHandlerPrivate::updateRedoAction(bool on)
-{
-    m_redoAction->setEnabled(on);
-}
-
-void TextEditorActionHandlerPrivate::updateUndoAction(bool on)
-{
-    m_undoAction->setEnabled(on);
-}
-
-void TextEditorActionHandlerPrivate::updateCopyAction(bool hasCopyableText)
-{
-    if (m_cutAction)
-        m_cutAction->setEnabled(hasCopyableText && m_currentEditorWidget
-                                && !m_currentEditorWidget->isReadOnly());
-    if (m_copyAction)
-        m_copyAction->setEnabled(hasCopyableText);
-    if (m_copyHtmlAction)
-        m_copyHtmlAction->setEnabled(hasCopyableText);
-}
-
-void TextEditorActionHandlerPrivate::updateCurrentEditor(IEditor *editor)
-{
-    if (m_currentEditorWidget)
-        m_currentEditorWidget->disconnect(this);
-    m_currentEditorWidget = nullptr;
-
-    m_currentEditor = editor;
-
-    if (editor && editor->document()->id() == m_editorId) {
-        m_currentEditorWidget = m_findTextWidget(editor);
-        if (m_currentEditorWidget) {
-            connect(m_currentEditorWidget, &QPlainTextEdit::undoAvailable,
-                    this, &TextEditorActionHandlerPrivate::updateUndoAction);
-            connect(m_currentEditorWidget, &QPlainTextEdit::redoAvailable,
-                    this, &TextEditorActionHandlerPrivate::updateRedoAction);
-            connect(m_currentEditorWidget, &QPlainTextEdit::copyAvailable,
-                    this, &TextEditorActionHandlerPrivate::updateCopyAction);
-            connect(m_currentEditorWidget, &TextEditorWidget::readOnlyChanged,
-                    this, &TextEditorActionHandlerPrivate::updateActions);
-            connect(m_currentEditorWidget, &TextEditorWidget::optionalActionMaskChanged,
-                    this, &TextEditorActionHandlerPrivate::updateOptionalActions);
-        }
-    }
-    updateActions();
-}
-
-} // namespace Internal
-
-TextEditorActionHandler::TextEditorActionHandler(Utils::Id editorId,
-                                                 Utils::Id contextId,
-                                                 uint optionalActions,
-                                                 const TextEditorWidgetResolver &resolver)
-    : d(new Internal::TextEditorActionHandlerPrivate(editorId, contextId, optionalActions))
-{
-    if (resolver)
-        d->m_findTextWidget = resolver;
-    else
-        d->m_findTextWidget = TextEditorWidget::fromEditor;
-}
-
-uint TextEditorActionHandler::optionalActions() const
-{
-    return d->m_optionalActions;
-}
-
-TextEditorActionHandler::~TextEditorActionHandler()
-{
-    delete d;
-}
-
-void TextEditorActionHandler::updateCurrentEditor()
-{
-    d->updateCurrentEditor(EditorManager::currentEditor());
-}
-
-void TextEditorActionHandler::updateActions()
-{
-    d->updateActions();
-}
-
-void TextEditorActionHandler::setCanUndoCallback(const Predicate &callback)
-{
-    d->m_canUndoCallback = callback;
-}
-
-void TextEditorActionHandler::setCanRedoCallback(const Predicate &callback)
-{
-    d->m_canRedoCallback = callback;
-}
-
-void TextEditorActionHandler::setUnhandledCallback(const UnhandledCallback &callback)
-{
-    d->m_unhandledCallback = callback;
-}
-
-} // namespace TextEditor
diff --git a/src/plugins/texteditor/texteditoractionhandler.h b/src/plugins/texteditor/texteditoractionhandler.h
deleted file mode 100644
index ce969b7b6f..0000000000
--- a/src/plugins/texteditor/texteditoractionhandler.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#pragma once
-
-#include "texteditor_global.h"
-
-#include <utils/id.h>
-
-#include <QObject>
-
-#include <functional>
-
-namespace Core {
-class IEditor;
-}
-
-namespace TextEditor {
-class TextEditorWidget;
-
-namespace Internal { class TextEditorActionHandlerPrivate; }
-
-// Redirects slots from global actions to the respective editor.
-
-class TEXTEDITOR_EXPORT TextEditorActionHandler final
-{
-    TextEditorActionHandler(const TextEditorActionHandler &) = delete;
-    TextEditorActionHandler &operator=(const TextEditorActionHandler &) = delete;
-
-public:
-    enum OptionalActionsMask {
-        None = 0,
-        Format = 1,
-        UnCommentSelection = 2,
-        UnCollapseAll = 4,
-        FollowSymbolUnderCursor = 8,
-        FollowTypeUnderCursor = 16,
-        JumpToFileUnderCursor = 32,
-        RenameSymbol = 64,
-        FindUsage = 128,
-        CallHierarchy = 256,
-        TypeHierarchy = 512,
-    };
-    using TextEditorWidgetResolver = std::function<TextEditorWidget *(Core::IEditor *)>;
-
-    TextEditorActionHandler(Utils::Id editorId,
-                            Utils::Id contextId,
-                            uint optionalActions = None,
-                            const TextEditorWidgetResolver &resolver = {});
-
-    uint optionalActions() const;
-    ~TextEditorActionHandler();
-
-    void updateCurrentEditor();
-    void updateActions();
-
-    using Predicate = std::function<bool(Core::IEditor *editor)>;
-
-    void setCanUndoCallback(const Predicate &callback);
-    void setCanRedoCallback(const Predicate &callback);
-
-    using UnhandledCallback = std::function<void(Utils::Id commandId, Core::IEditor *editor)>;
-    void setUnhandledCallback(const UnhandledCallback &callback);
-
-private:
-    Internal::TextEditorActionHandlerPrivate *d;
-};
-
-} // namespace TextEditor
diff --git a/src/plugins/texteditor/texteditorplugin.cpp b/src/plugins/texteditor/texteditorplugin.cpp
index d279b6254f..5db6a17e0d 100644
--- a/src/plugins/texteditor/texteditorplugin.cpp
+++ b/src/plugins/texteditor/texteditorplugin.cpp
@@ -85,6 +85,7 @@ public:
     void updateCurrentSelection(const QString &text);
 
     void createStandardContextMenu();
+    void createEditorCommands();
 };
 
 void TextEditorPlugin::initialize()
@@ -122,58 +123,12 @@ void TextEditorPlugin::initialize()
     setupMarkdownEditor();
     setupJsonEditor();
 
-    Context context(TextEditor::Constants::C_TEXTEDITOR);
-
-    // Add shortcut for invoking automatic completion
-    Command *command = nullptr;
-    ActionBuilder(this, Constants::COMPLETE_THIS)
-        .setText(Tr::tr("Trigger Completion"))
-        .setContext(context)
-        .bindCommand(&command)
-        .setDefaultKeySequence(Tr::tr("Meta+Space"), Tr::tr("Ctrl+Space"))
-        .addOnTriggered(this, [] {
-            if (BaseTextEditor *editor = BaseTextEditor::currentTextEditor())
-                editor->editorWidget()->invokeAssist(Completion);
-        });
-
-    connect(command, &Command::keySequenceChanged, [command] {
-        FancyLineEdit::setCompletionShortcut(command->keySequence());
-    });
-    FancyLineEdit::setCompletionShortcut(command->keySequence());
-
-    // Add shortcut for invoking function hint completion
-    ActionBuilder(this, Constants::FUNCTION_HINT)
-        .setText(Tr::tr("Display Function Hint"))
-        .setContext(context)
-        .setDefaultKeySequence(Tr::tr("Meta+Shift+D"), Tr::tr("Ctrl+Shift+D"))
-        .addOnTriggered(this, [] {
-            if (BaseTextEditor *editor = BaseTextEditor::currentTextEditor())
-                editor->editorWidget()->invokeAssist(FunctionHint);
-        });
-
-    // Add shortcut for invoking quick fix options
-    ActionBuilder(this, Constants::QUICKFIX_THIS)
-        .setText(Tr::tr("Trigger Refactoring Action"))
-        .setContext(context)
-        .setDefaultKeySequence(Tr::tr("Alt+Return"))
-        .addOnTriggered(this, [] {
-            if (BaseTextEditor *editor = BaseTextEditor::currentTextEditor())
-                editor->editorWidget()->invokeAssist(QuickFix);
-        });
-
-    ActionBuilder(this, Constants::SHOWCONTEXTMENU)
-        .setText(Tr::tr("Show Context Menu"))
-        .setContext(context)
-        .addOnTriggered(this, [] {
-            if (BaseTextEditor *editor = BaseTextEditor::currentTextEditor())
-                editor->editorWidget()->showContextMenu();
-        });
-
     // Add text snippet provider.
     SnippetProvider::registerGroup(Constants::TEXT_SNIPPET_GROUP_ID,
                                     Tr::tr("Text", "SnippetProvider"));
 
     createStandardContextMenu();
+    createEditorCommands();
 
 #ifdef WITH_TESTS
     addTestCreator(createCodeAssistTests);
@@ -349,6 +304,272 @@ void TextEditorPlugin::createStandardContextMenu()
     add(Constants::SWITCH_UTF8BOM, Constants::G_BOM);
 }
 
+void TextEditorPlugin::createEditorCommands()
+{
+    using namespace Core::Constants;
+    // Add shortcut for invoking automatic completion
+    Command *command = nullptr;
+    ActionBuilder(this, Constants::COMPLETE_THIS)
+        .setText(Tr::tr("Trigger Completion"))
+        .bindCommand(&command)
+        .setDefaultKeySequence(Tr::tr("Meta+Space"), Tr::tr("Ctrl+Space"));
+
+    connect(command, &Command::keySequenceChanged, [command] {
+        FancyLineEdit::setCompletionShortcut(command->keySequence());
+    });
+    FancyLineEdit::setCompletionShortcut(command->keySequence());
+
+    // Add shortcut for invoking function hint completion
+    ActionBuilder(this, Constants::FUNCTION_HINT)
+        .setText(Tr::tr("Display Function Hint"))
+        .setDefaultKeySequence(Tr::tr("Meta+Shift+D"), Tr::tr("Ctrl+Shift+D"));
+
+    // Add shortcut for invoking quick fix options
+    ActionBuilder(this, Constants::QUICKFIX_THIS)
+        .setText(Tr::tr("Trigger Refactoring Action"))
+        .setDefaultKeySequence(Tr::tr("Alt+Return"));
+
+    ActionBuilder(this, Constants::SHOWCONTEXTMENU)
+        .setText(Tr::tr("Show Context Menu"));
+
+    ActionBuilder(this, DELETE_LINE).setText(Tr::tr("Delete &Line"));
+    ActionBuilder(this, DELETE_END_OF_LINE).setText(Tr::tr("Delete Line from Cursor On"));
+    ActionBuilder(this, DELETE_END_OF_WORD).setText(Tr::tr("Delete Word from Cursor On"));
+    ActionBuilder(this, DELETE_END_OF_WORD_CAMEL_CASE)
+        .setText(Tr::tr("Delete Word Camel Case from Cursor On"));
+    ActionBuilder(this, DELETE_START_OF_LINE)
+        .setText(Tr::tr("Delete Line up to Cursor"))
+        .setDefaultKeySequence(Tr::tr("Ctrl+Backspace"), {});
+    ActionBuilder(this, DELETE_START_OF_WORD).setText(Tr::tr("Delete Word up to Cursor"));
+    ActionBuilder(this, DELETE_START_OF_WORD_CAMEL_CASE)
+        .setText(Tr::tr("Delete Word Camel Case up to Cursor"));
+    ActionBuilder(this, GOTO_BLOCK_START_WITH_SELECTION)
+        .setText(Tr::tr("Go to Block Start with Selection"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+{")));
+    ActionBuilder(this, GOTO_BLOCK_END_WITH_SELECTION)
+        .setText(Tr::tr("Go to Block End with Selection"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+}")));
+    ActionBuilder(this, MOVE_LINE_UP)
+        .setText(Tr::tr("Move Line Up"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+Shift+Up")));
+    ActionBuilder(this, MOVE_LINE_DOWN)
+        .setText(Tr::tr("Move Line Down"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+Shift+Down")));
+    ActionBuilder(this, COPY_LINE_UP)
+        .setText(Tr::tr("Copy Line Up"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+Alt+Up")));
+    ActionBuilder(this, COPY_LINE_DOWN)
+        .setText(Tr::tr("Copy Line Down"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+Alt+Down")));
+    ActionBuilder(this, JOIN_LINES)
+        .setText(Tr::tr("Join Lines"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+J")));
+    ActionBuilder(this, INSERT_LINE_ABOVE)
+        .setText(Tr::tr("Insert Line Above Current Line"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+Shift+Return")));
+    ActionBuilder(this, INSERT_LINE_BELOW)
+        .setText(Tr::tr("Insert Line Below Current Line"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+Return")));
+    ActionBuilder(this, SWITCH_UTF8BOM).setText(Tr::tr("Toggle UTF-8 BOM"));
+    ActionBuilder(this, INDENT).setText(Tr::tr("Indent"));
+    ActionBuilder(this, UNINDENT).setText(Tr::tr("Unindent"));
+    ActionBuilder(this, FOLLOW_SYMBOL_UNDER_CURSOR)
+        .setText(Tr::tr("Follow Symbol Under Cursor"))
+        .setDefaultKeySequence(QKeySequence(Qt::Key_F2));
+    ActionBuilder(this, FOLLOW_SYMBOL_UNDER_CURSOR_IN_NEXT_SPLIT)
+        .setText(Tr::tr("Follow Symbol Under Cursor in Next Split"))
+        .setDefaultKeySequence(Tr::tr("Meta+E, F2"), Tr::tr("Ctrl+E, F2"));
+    ActionBuilder(this, FOLLOW_SYMBOL_TO_TYPE)
+        .setText(Tr::tr("Follow Type Under Cursor"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+Shift+F2")));
+    ActionBuilder(this, FOLLOW_SYMBOL_TO_TYPE_IN_NEXT_SPLIT)
+        .setText(Tr::tr("Follow Type Under Cursor in Next Split"))
+        .setDefaultKeySequence(Tr::tr("Meta+E, Shift+F2"), Tr::tr("Ctrl+E, Ctrl+Shift+F2"));
+    ActionBuilder(this, FIND_USAGES)
+        .setText(Tr::tr("Find References to Symbol Under Cursor"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+Shift+U")));
+    ActionBuilder(this, RENAME_SYMBOL)
+        .setText(Tr::tr("Rename Symbol Under Cursor"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+Shift+R")));
+    ActionBuilder(this, JUMP_TO_FILE_UNDER_CURSOR)
+        .setText(Tr::tr("Jump to File Under Cursor"))
+        .setDefaultKeySequence(QKeySequence(Qt::Key_F2));
+    ActionBuilder(this, JUMP_TO_FILE_UNDER_CURSOR_IN_NEXT_SPLIT)
+        .setText(Tr::tr("Jump to File Under Cursor in Next Split"))
+        .setDefaultKeySequence(Tr::tr("Meta+E, F2"), Tr::tr("Ctrl+E, F2"));
+    ActionBuilder(this, OPEN_CALL_HIERARCHY).setText(Tr::tr("Open Call Hierarchy"));
+    ActionBuilder(this, OPEN_TYPE_HIERARCHY)
+        .setText(Tr::tr("Open Type Hierarchy"))
+        .setDefaultKeySequence(Tr::tr("Meta+Shift+T"), Tr::tr("Ctrl+Shift+T"));
+    ActionBuilder(this, VIEW_PAGE_UP)
+        .setText(Tr::tr("Move the View a Page Up and Keep the Cursor Position"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+PgUp")));
+    ActionBuilder(this, VIEW_PAGE_DOWN)
+        .setText(Tr::tr("Move the View a Page Down and Keep the Cursor Position"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+PgDown")));
+    ActionBuilder(this, VIEW_LINE_UP)
+        .setText(Tr::tr("Move the View a Line Up and Keep the Cursor Position"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+Up")));
+    ActionBuilder(this, VIEW_LINE_DOWN)
+        .setText(Tr::tr("Move the View a Line Down and Keep the Cursor Position"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+Down")));
+
+    ActionManager::actionContainer(M_EDIT);
+    ActionBuilder(this, SELECT_ENCODING)
+        .setText(Tr::tr("Select Encoding..."))
+        .addToContainer(M_EDIT, G_EDIT_OTHER);
+    ActionBuilder(this, CIRCULAR_PASTE)
+        .setText(Tr::tr("Paste from Clipboard History"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+Shift+V")))
+        .addToContainer(M_EDIT, G_EDIT_COPYPASTE);
+    ActionBuilder(this, NO_FORMAT_PASTE)
+        .setText(Tr::tr("Paste Without Formatting"))
+        .setDefaultKeySequence(Tr::tr("Ctrl+Alt+Shift+V"), QString())
+        .addToContainer(M_EDIT, G_EDIT_COPYPASTE);
+
+    ActionManager::actionContainer(M_EDIT_ADVANCED);
+    ActionBuilder(this, AUTO_INDENT_SELECTION)
+        .setText(Tr::tr("Auto-&indent Selection"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+I")))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_FORMAT);
+    ActionBuilder(this, AUTO_FORMAT_SELECTION)
+        .setText(Tr::tr("Auto-&format Selection"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+;")))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_FORMAT);
+    ActionBuilder(this, REWRAP_PARAGRAPH)
+        .setText(Tr::tr("&Rewrap Paragraph"))
+        .setDefaultKeySequence(Tr::tr("Meta+E, R"), Tr::tr("Ctrl+E, R"))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_FORMAT);
+    ActionBuilder(this, VISUALIZE_WHITESPACE)
+        .setText(Tr::tr("&Visualize Whitespace"))
+        .setDefaultKeySequence(Tr::tr("Meta+E, Meta+V"), Tr::tr("Ctrl+E, Ctrl+V"))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_FORMAT);
+    ActionBuilder(this, CLEAN_WHITESPACE)
+        .setText(Tr::tr("Clean Whitespace"))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_FORMAT);
+    ActionBuilder(this, TEXT_WRAPPING)
+        .setText(Tr::tr("Enable Text &Wrapping"))
+        .setDefaultKeySequence(Tr::tr("Meta+E, Meta+W"), Tr::tr("Ctrl+E, Ctrl+W"))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_FORMAT)
+        .setCheckable(true);
+    ActionBuilder(this, UN_COMMENT_SELECTION)
+        .setText(Tr::tr("Toggle Comment &Selection"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+/")))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_FORMAT);
+    ActionBuilder(this, CUT_LINE)
+        .setText(Tr::tr("Cut &Line"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Shift+Del")))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_TEXT);
+    ActionBuilder(this, COPY_LINE)
+        .setText(Tr::tr("Copy &Line"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+Ins")))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_TEXT);
+    ActionBuilder(this, COPY_WITH_HTML)
+        .setText(Tr::tr("Copy With Highlighting"))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_TEXT);
+    ActionBuilder(this, ADD_CURSORS_TO_LINE_ENDS)
+        .setText(Tr::tr("Create Cursors at Selected Line Ends"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Alt+Shift+I")))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_TEXT);
+    ActionBuilder(this, ADD_SELECT_NEXT_FIND_MATCH)
+        .setText(Tr::tr("Add Next Occurrence to Selection"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+D")))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_TEXT);
+    ActionBuilder(this, DUPLICATE_SELECTION)
+        .setText(Tr::tr("&Duplicate Selection"))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_TEXT);
+    ActionBuilder(this, DUPLICATE_SELECTION_AND_COMMENT)
+        .setText(Tr::tr("&Duplicate Selection and Comment"))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_TEXT);
+    ActionBuilder(this, UPPERCASE_SELECTION)
+        .setText(Tr::tr("Uppercase Selection"))
+        .setDefaultKeySequence(Tr::tr("Meta+Shift+U"), Tr::tr("Alt+Shift+U"))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_TEXT);
+    ActionBuilder(this, LOWERCASE_SELECTION)
+        .setText(Tr::tr("Lowercase Selection"))
+        .setDefaultKeySequence(Tr::tr("Meta+U"), Tr::tr("Alt+U"))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_TEXT);
+    ActionBuilder(this, SORT_LINES)
+        .setText(Tr::tr("Sort Lines"))
+        .setDefaultKeySequence(Tr::tr("Meta+Shift+S"), Tr::tr("Alt+Shift+S"))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_TEXT);
+    ActionBuilder(this, FOLD)
+        .setText(Tr::tr("Fold"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+<")))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_COLLAPSING);
+    ActionBuilder(this, UNFOLD)
+        .setText(Tr::tr("Unfold"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+>")))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_COLLAPSING);
+    ActionBuilder(this, UNFOLD_ALL)
+        .setText(Tr::tr("Toggle &Fold All"))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_COLLAPSING);
+    ActionBuilder(this, INCREASE_FONT_SIZE)
+        .setText(Tr::tr("Increase Font Size"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl++")))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_FONT);
+    ActionBuilder(this, DECREASE_FONT_SIZE)
+        .setText(Tr::tr("Decrease Font Size"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+-")))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_FONT);
+    ActionBuilder(this, RESET_FONT_SIZE)
+        .setText(Tr::tr("Reset Font Size"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+0")))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_FONT);
+    ActionBuilder(this, GOTO_BLOCK_START)
+        .setText(Tr::tr("Go to Block Start"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+[")))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_BLOCKS);
+    ActionBuilder(this, GOTO_BLOCK_END)
+        .setText(Tr::tr("Go to Block End"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+]")))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_BLOCKS);
+    ActionBuilder(this, SELECT_BLOCK_UP)
+        .setText(Tr::tr("Select Block Up"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+U")))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_BLOCKS);
+    ActionBuilder(this, SELECT_BLOCK_DOWN)
+        .setText(Tr::tr("Select Block Down"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+Shift+Alt+U")))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_BLOCKS);
+    ActionBuilder(this, SELECT_WORD_UNDER_CURSOR).setText(Tr::tr("Select Word Under Cursor"));
+
+    ActionBuilder(this, GOTO_DOCUMENT_START).setText(Tr::tr("Go to Document Start"));
+    ActionBuilder(this, GOTO_DOCUMENT_END).setText(Tr::tr("Go to Document End"));
+    ActionBuilder(this, GOTO_LINE_START).setText(Tr::tr("Go to Line Start"));
+    ActionBuilder(this, GOTO_LINE_END).setText(Tr::tr("Go to Line End"));
+    ActionBuilder(this, GOTO_NEXT_LINE).setText(Tr::tr("Go to Next Line"));
+    ActionBuilder(this, GOTO_PREVIOUS_LINE).setText(Tr::tr("Go to Previous Line"));
+    ActionBuilder(this, GOTO_PREVIOUS_CHARACTER).setText(Tr::tr("Go to Previous Character"));
+    ActionBuilder(this, GOTO_NEXT_CHARACTER).setText(Tr::tr("Go to Next Character"));
+    ActionBuilder(this, GOTO_PREVIOUS_WORD).setText(Tr::tr("Go to Previous Word"));
+    ActionBuilder(this, GOTO_NEXT_WORD).setText(Tr::tr("Go to Next Word"));
+    ActionBuilder(this, GOTO_PREVIOUS_WORD_CAMEL_CASE)
+        .setText(Tr::tr("Go to Previous Word (Camel Case)"));
+    ActionBuilder(this, GOTO_NEXT_WORD_CAMEL_CASE).setText(Tr::tr("Go to Next Word (Camel Case)"));
+
+    ActionBuilder(this, GOTO_LINE_START_WITH_SELECTION)
+        .setText(Tr::tr("Go to Line Start with Selection"));
+    ActionBuilder(this, GOTO_LINE_END_WITH_SELECTION)
+        .setText(Tr::tr("Go to Line End with Selection"));
+    ActionBuilder(this, GOTO_NEXT_LINE_WITH_SELECTION)
+        .setText(Tr::tr("Go to Next Line with Selection"));
+    ActionBuilder(this, GOTO_PREVIOUS_LINE_WITH_SELECTION)
+        .setText(Tr::tr("Go to Previous Line with Selection"));
+    ActionBuilder(this, GOTO_PREVIOUS_CHARACTER_WITH_SELECTION)
+        .setText(Tr::tr("Go to Previous Character with Selection"));
+    ActionBuilder(this, GOTO_NEXT_CHARACTER_WITH_SELECTION)
+        .setText(Tr::tr("Go to Next Character with Selection"));
+    ActionBuilder(this, GOTO_PREVIOUS_WORD_WITH_SELECTION)
+        .setText(Tr::tr("Go to Previous Word with Selection"));
+    ActionBuilder(this, GOTO_NEXT_WORD_WITH_SELECTION)
+        .setText(Tr::tr("Go to Next Word with Selection"));
+    ActionBuilder(this, GOTO_PREVIOUS_WORD_CAMEL_CASE_WITH_SELECTION)
+        .setText(Tr::tr("Go to Previous Word (Camel Case) with Selection"));
+    ActionBuilder(this, GOTO_NEXT_WORD_CAMEL_CASE_WITH_SELECTION)
+        .setText(Tr::tr("Go to Next Word (Camel Case) with Selection"));
+}
+
 } // namespace TextEditor::Internal
 
 #include "texteditorplugin.moc"
diff --git a/src/plugins/texteditor/texteditorsettings.cpp b/src/plugins/texteditor/texteditorsettings.cpp
index 811852b8a8..356ae76fcd 100644
--- a/src/plugins/texteditor/texteditorsettings.cpp
+++ b/src/plugins/texteditor/texteditorsettings.cpp
@@ -431,11 +431,13 @@ TextEditorSettings::TextEditorSettings()
     connect(this, &TextEditorSettings::fontSettingsChanged,
             this, updateGeneralMessagesFontSettings);
     updateGeneralMessagesFontSettings();
-    connect(this, &TextEditorSettings::behaviorSettingsChanged,
-            this, [](const BehaviorSettings &bs) {
+    auto updateBehaviorSettings = [](const BehaviorSettings &bs) {
         Core::MessageManager::setWheelZoomEnabled(bs.m_scrollWheelZooming);
         FancyLineEdit::setCamelCaseNavigationEnabled(bs.m_camelCaseNavigation);
-    });
+    };
+    connect(this, &TextEditorSettings::behaviorSettingsChanged,
+            this, updateBehaviorSettings);
+    updateBehaviorSettings(globalBehaviorSettings());
 }
 
 TextEditorSettings::~TextEditorSettings()
diff --git a/src/plugins/vcpkg/Vcpkg.json.in b/src/plugins/vcpkg/Vcpkg.json.in
index 09fcaf06a7..a24d835d91 100644
--- a/src/plugins/vcpkg/Vcpkg.json.in
+++ b/src/plugins/vcpkg/Vcpkg.json.in
@@ -27,5 +27,6 @@
         "        <glob pattern='vcpkg.json' weight='71'/>",
         "    </mime-type>",
         "</mime-info>"
-    ]
+    ],
+    "JsonWizardPaths" : [":/vcpkg/wizards/"]
 }
diff --git a/src/plugins/vcpkg/vcpkgplugin.cpp b/src/plugins/vcpkg/vcpkgplugin.cpp
index cc3abc097d..a849802653 100644
--- a/src/plugins/vcpkg/vcpkgplugin.cpp
+++ b/src/plugins/vcpkg/vcpkgplugin.cpp
@@ -21,8 +21,6 @@ class VcpkgPlugin final : public ExtensionSystem::IPlugin
 public:
     void initialize() final
     {
-        ProjectExplorer::JsonWizardFactory::addWizardPath(":/vcpkg/wizards/");
-
         setupVcpkgManifestEditor();
 
 #ifdef WITH_TESTS
diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp
index 13338584bf..462412df06 100644
--- a/src/plugins/vcsbase/vcsbaseeditor.cpp
+++ b/src/plugins/vcsbase/vcsbaseeditor.cpp
@@ -27,7 +27,6 @@
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectmanager.h>
 
-#include <texteditor/texteditoractionhandler.h>
 #include <texteditor/textdocument.h>
 #include <texteditor/textdocumentlayout.h>
 #include <texteditor/syntaxhighlighter.h>
@@ -1661,7 +1660,7 @@ VcsEditorFactory::VcsEditorFactory(const VcsBaseEditorParameters &parameters)
     if (parameters.mimeType != DiffEditor::Constants::DIFF_EDITOR_MIMETYPE)
         addMimeType(parameters.mimeType);
 
-    setEditorActionHandlers(TextEditorActionHandler::None);
+    setOptionalActionMask(OptionalActions::None);
     setDuplicatedSupported(false);
 
     setDocumentCreator([parameters] {
diff --git a/src/shared/qbs b/src/shared/qbs
-Subproject 5c88b6b11b762cf5861c9d1570df4f1f050c826
+Subproject 488fbe40e86602d06e568a1749277387fd4a565
diff --git a/src/tools/cplusplus-ast2png/cplusplus-ast2png.cpp b/src/tools/cplusplus-ast2png/cplusplus-ast2png.cpp
index e38889f5ea..8f7d256d0a 100644
--- a/src/tools/cplusplus-ast2png/cplusplus-ast2png.cpp
+++ b/src/tools/cplusplus-ast2png/cplusplus-ast2png.cpp
@@ -426,7 +426,7 @@ static Document::Ptr parse(const QString &fileName, const QByteArray &source,
         if (verbose)
             std::cout << "Parsing as " << qPrintable(parseModeToString(parseMode)) << "...";
 
-        Document::Ptr doc = Document::create(Utils::FilePath::fromString(fileName));
+        Document::Ptr doc = Document::create(Utils::FilePath::fromUserInput(fileName));
         doc->control()->setDiagnosticClient(errorHandler);
         doc->setUtf8Source(source);
         const bool parsed = doc->parse(parseMode);
diff --git a/src/tools/qml2puppet/editor3d_qt6.qrc b/src/tools/qml2puppet/editor3d_qt6.qrc
index 2913fbe15e..d76b1941b9 100644
--- a/src/tools/qml2puppet/editor3d_qt6.qrc
+++ b/src/tools/qml2puppet/editor3d_qt6.qrc
@@ -8,6 +8,8 @@
         <file>mockfiles/images/editor_camera@2x.png</file>
         <file>mockfiles/images/editor_particlesystem.png</file>
         <file>mockfiles/images/editor_particlesystem@2x.png</file>
+        <file>mockfiles/images/crosshair.png</file>
+        <file>mockfiles/images/crosshair@2x.png</file>
         <file>mockfiles/images/directional.png</file>
         <file>mockfiles/images/directional@2x.png</file>
         <file>mockfiles/images/point.png</file>
diff --git a/src/tools/qml2puppet/mockfiles/images/crosshair.png b/src/tools/qml2puppet/mockfiles/images/crosshair.png
new file mode 100644
index 0000000000..6c30263513
--- /dev/null
+++ b/src/tools/qml2puppet/mockfiles/images/crosshair.png
diff --git a/src/tools/qml2puppet/mockfiles/images/crosshair@2x.png b/src/tools/qml2puppet/mockfiles/images/crosshair@2x.png
new file mode 100644
index 0000000000..5340bf0846
--- /dev/null
+++ b/src/tools/qml2puppet/mockfiles/images/crosshair@2x.png
diff --git a/src/tools/qml2puppet/mockfiles/qt6/EditCameraController.qml b/src/tools/qml2puppet/mockfiles/qt6/EditCameraController.qml
index 446d575683..255d93e529 100644
--- a/src/tools/qml2puppet/mockfiles/qt6/EditCameraController.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/EditCameraController.qml
@@ -102,6 +102,23 @@ Item {
         storeCameraState(0);
     }
 
+    function approachObject()
+    {
+        if (!camera)
+            return;
+
+        var pickResult = _generalHelper.pickViewAt(view3d, width / 2, height / 2);
+        var resolvedResult = _generalHelper.resolvePick(pickResult.objectHit);
+
+        if (resolvedResult) {
+            var newLookAtAndZoom = _generalHelper.approachNode(camera, _defaultCameraLookAtDistance,
+                                                               resolvedResult, view3D);
+            _lookAtPoint = newLookAtAndZoom.toVector3d();
+            _zoomFactor = newLookAtAndZoom.w;
+            storeCameraState(0);
+        }
+    }
+
     function jumpToRotation(rotation)
     {
         let distance = camera.scenePosition.minus(_lookAtPoint).length()
@@ -138,7 +155,10 @@ Item {
         else
             nodes = targetNodes
 
-        _lookAtPoint = _generalHelper.alignView(camera, nodes, _lookAtPoint);
+        var newLookAtAndZoom = _generalHelper.alignView(camera, nodes, _lookAtPoint,
+                                                        _defaultCameraLookAtDistance);
+        _lookAtPoint = newLookAtAndZoom.toVector3d();
+        _zoomFactor = newLookAtAndZoom.w;
         storeCameraState(0);
     }
 
@@ -158,8 +178,7 @@ Item {
 
     function moveCamera(moveVec)
     {
-        cameraCtrl._lookAtPoint = _generalHelper.moveCamera(camera, _lookAtPoint,  _zoomFactor,
-                                                            moveVec);
+        cameraCtrl._lookAtPoint = _generalHelper.moveCamera(camera, _lookAtPoint, moveVec);
     }
 
     function getMoveVectorForKey(key) {
@@ -238,6 +257,13 @@ Item {
         }
     }
 
+    Image {
+        anchors.centerIn: parent
+        source: "qrc:///qtquickplugin/mockfiles/images/crosshair.png"
+        visible: cameraCtrl.flyMode && viewRoot.activeSplit === cameraCtrl.splitId
+        opacity: 0.7
+    }
+
     MouseArea {
         id: mouseHandler
         acceptedButtons: Qt.LeftButton | Qt.RightButton | Qt.MiddleButton
@@ -302,7 +328,10 @@ Item {
 
     Keys.onPressed: (event) => {
         event.accepted = true;
-        _generalHelper.startCameraMove(cameraCtrl.camera, cameraCtrl.getMoveVectorForKey(event.key));
+        if (cameraCtrl.flyMode && event.key === Qt.Key_Space)
+            approachObject();
+        else
+            _generalHelper.startCameraMove(cameraCtrl.camera, cameraCtrl.getMoveVectorForKey(event.key));
     }
 
     Keys.onReleased: (event) => {
diff --git a/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.cpp b/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.cpp
index 6886f7e41c..dadd817633 100644
--- a/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.cpp
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.cpp
@@ -157,7 +157,7 @@ QVector3D GeneralHelper::panCamera(QQuick3DCamera *camera, const QMatrix4x4 star
 
 // Moves camera in 3D space and returns new look-at point
 QVector3D GeneralHelper::moveCamera(QQuick3DCamera *camera, const QVector3D &startLookAt,
-                                    float zoomFactor, const QVector3D &moveVector)
+                                    const QVector3D &moveVector)
 {
 
     if (moveVector.length() < 0.001f)
@@ -171,7 +171,8 @@ QVector3D GeneralHelper::moveCamera(QQuick3DCamera *camera, const QVector3D &sta
     const QVector3D xDelta = xAxis * moveVector.x();
     const QVector3D yDelta = yAxis * moveVector.y();
     const QVector3D zDelta = zAxis * moveVector.z();
-    const QVector3D delta = (yDelta - xDelta - zDelta) * zoomFactor;
+    // Delta multiplier for nice default speed in default scene
+    const QVector3D delta = (yDelta - xDelta - zDelta) * .5f;
 
     camera->setPosition(camera->position() + delta);
 
@@ -187,8 +188,14 @@ QVector3D GeneralHelper::rotateCamera(QQuick3DCamera *camera, const QPointF &ang
     if (qAbs(angles.y()) > 0.001f)
         camera->rotate(angles.y(), QVector3D(1.f, 0.f, 0.f), QQuick3DNode::LocalSpace);
     // Rotation around Y-axis is done in scene space to keep horizon level
-    if (qAbs(angles.x()) > 0.001f)
-        camera->rotate(angles.x(), QVector3D(0.f, 1.f, 0.f), QQuick3DNode::SceneSpace);
+    if (qAbs(angles.x()) > 0.001f) {
+        // Since we are rotating in scene space, adjust direction according to camera up-vector
+        float angle = angles.x();
+        if (camera->up().y() <= 0)
+            angle = -angle;
+
+        camera->rotate(angle, QVector3D(0.f, 1.f, 0.f), QQuick3DNode::SceneSpace);
+    }
 
     QMatrix4x4 m = camera->sceneTransform();
     const float *dataPtr(m.data());
@@ -391,6 +398,55 @@ QVector4D GeneralHelper::focusNodesToCamera(QQuick3DCamera *camera, float defaul
     return QVector4D(lookAt, cameraZoomFactor);
 }
 
+// Approaches the specified node without changing camera orientation
+QVector4D GeneralHelper::approachNode(
+    QQuick3DCamera *camera, float defaultLookAtDistance, QObject *node,
+    QQuick3DViewport *viewPort)
+{
+    auto node3d = qobject_cast<QQuick3DNode *>(node);
+    if (!camera || !node3d)
+        return QVector4D(0.f, 0.f, 0.f, 1.f);
+
+    QVector3D minBounds = maxVec;
+    QVector3D maxBounds = minVec;
+
+    getBounds(viewPort, node3d, minBounds, maxBounds); // Bounds are in node3d local coordinates
+
+    QVector3D extents = maxBounds - minBounds;
+    QVector3D focusLookAt = minBounds + (extents / 2.f);
+
+    if (node3d->parentNode()) {
+        QMatrix4x4 m = node3d->parentNode()->sceneTransform();
+        focusLookAt = m.map(focusLookAt);
+    }
+
+    float maxExtent = qSqrt(qreal(extents.x()) * qreal(extents.x())
+                            + qreal(extents.y()) * qreal(extents.y())
+                            + qreal(extents.z()) * qreal(extents.z()));
+
+    // Reset camera position to default zoom
+    QMatrix4x4 m = camera->sceneTransform();
+    const float *dataPtr(m.data());
+    QVector3D newLookVector(dataPtr[8], dataPtr[9], dataPtr[10]);
+    newLookVector.normalize();
+
+    // We don't want to change camera orientation, so calculate projection point on current
+    // camera look vector
+    QVector3D focusLookAtVector = focusLookAt - camera->position();
+    float dot = QVector3D::dotProduct(newLookVector, focusLookAtVector);
+    QVector3D newLookAt = camera->position() + dot * newLookVector;
+
+    newLookVector *= defaultLookAtDistance;
+    camera->setPosition(newLookAt + newLookVector);
+
+    float divisor = 1050.f;
+    float newZoomFactor = qBound(.01f, maxExtent / divisor, 100.f);
+    float cameraZoomFactor = zoomCamera(viewPort, camera, 0, defaultLookAtDistance, newLookAt,
+                                        newZoomFactor, false);
+
+    return QVector4D(newLookAt, cameraZoomFactor);
+}
+
 // This function can be used to synchronously focus camera on a node, which doesn't have to be
 // a selection box for bound calculations to work. This is used to focus the view for
 // various preview image generations, where doing things asynchronously is not good
@@ -487,12 +543,10 @@ void GeneralHelper::alignCameras(QQuick3DCamera *camera, const QVariant &nodes)
 // Aligns the camera to the first camera in nodes list.
 // Aligning means taking the position and XY rotation from the source camera. Rest of the properties
 // remain the same, as this is used to align edit cameras, which have fixed Z-rot, fov, and clips.
-// The new lookAt is set at same distance away as it was previously and scale isn't adjusted, so
-// the zoom factor of the edit camera stays the same.
-QVector3D GeneralHelper::alignView(QQuick3DCamera *camera, const QVariant &nodes,
-                                   const QVector3D &lookAtPoint)
+// The camera zoom is reset to default.
+QVector4D GeneralHelper::alignView(QQuick3DCamera *camera, const QVariant &nodes,
+                                   const QVector3D &lookAtPoint, float defaultLookAtDistance)
 {
-    float lastDistance = (lookAtPoint - camera->position()).length();
     const QVariantList varNodes = nodes.value<QVariantList>();
     QQuick3DCamera *cameraNode = nullptr;
     for (const auto &varNode : varNodes) {
@@ -502,15 +556,24 @@ QVector3D GeneralHelper::alignView(QQuick3DCamera *camera, const QVariant &nodes
     }
 
     if (cameraNode) {
+        if (auto orthoCamera = qobject_cast<QQuick3DOrthographicCamera *>(camera)) {
+            orthoCamera->setHorizontalMagnification(1.f);
+            orthoCamera->setVerticalMagnification(1.f);
+            // Force update on transform just in case position and rotation didn't change
+            float x = orthoCamera->x();
+            orthoCamera->setX(x + 1.f);
+            orthoCamera->setX(x);
+        }
         camera->setPosition(cameraNode->scenePosition());
         QVector3D newRotation = cameraNode->sceneRotation().toEulerAngles();
         newRotation.setZ(0.f);
         camera->setEulerRotation(newRotation);
+
     }
 
-    QVector3D lookAt = camera->position() + camera->forward() * lastDistance;
+    QVector3D lookAt = camera->position() + camera->forward() * defaultLookAtDistance;
 
-    return lookAt;
+    return QVector4D(lookAt, 1.f);
 }
 
 bool GeneralHelper::fuzzyCompare(double a, double b)
diff --git a/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.h b/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.h
index 3ba6f8b1d9..62a95d86a6 100644
--- a/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.h
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.h
@@ -55,7 +55,7 @@ public:
                                     const QVector3D &pressPos, const QVector3D &currentPos,
                                     float zoomFactor);
     Q_INVOKABLE QVector3D moveCamera(QQuick3DCamera *camera,const QVector3D &startLookAt,
-                                     float zoomFactor, const QVector3D &moveVector);
+                                     const QVector3D &moveVector);
     Q_INVOKABLE QVector3D rotateCamera(QQuick3DCamera *camera, const QPointF &angles,
                                        const QVector3D &lookAtPoint);
 
@@ -70,12 +70,14 @@ public:
                                              const QVariant &nodes, QQuick3DViewport *viewPort,
                                              float oldZoom, bool updateZoom = true,
                                              bool closeUp = false);
+    Q_INVOKABLE QVector4D approachNode(QQuick3DCamera *camera, float defaultLookAtDistance,
+                                       QObject *node, QQuick3DViewport *viewPort);
     Q_INVOKABLE void calculateNodeBoundsAndFocusCamera(QQuick3DCamera *camera, QQuick3DNode *node,
                                                        QQuick3DViewport *viewPort,
                                                        float defaultLookAtDistance, bool closeUp);
     Q_INVOKABLE void alignCameras(QQuick3DCamera *camera, const QVariant &nodes);
-    Q_INVOKABLE QVector3D alignView(QQuick3DCamera *camera, const QVariant &nodes,
-                                    const QVector3D &lookAtPoint);
+    Q_INVOKABLE QVector4D alignView(QQuick3DCamera *camera, const QVariant &nodes,
+                                    const QVector3D &lookAtPoint, float defaultLookAtDistance);
     Q_INVOKABLE bool fuzzyCompare(double a, double b);
     Q_INVOKABLE void delayedPropertySet(QObject *obj, int delay, const QString &property,
                                         const QVariant& value);
diff --git a/src/tools/qml2puppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp b/src/tools/qml2puppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
index c7cab45ed4..6cd39a5a85 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
@@ -490,9 +490,9 @@ void Qt5InformationNodeInstanceServer::getNodeAtMainScenePos(
     auto viewObj = qobject_cast<QQuick3DViewport *>(view.internalObject());
 
     if (viewObj) {
-        // Render the main view to make sure everything is up to date
+        // Render the target View3D to make sure everything is up to date
         updateNodesRecursive(viewObj);
-        renderWindow();
+        grabItem(viewObj);
 
         QPointF viewPos = viewObj->mapFromScene(pos);
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceserver.cpp b/src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceserver.cpp
index fca884e94b..765b52321b 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceserver.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceserver.cpp
@@ -436,10 +436,18 @@ QQuickItem *Qt5NodeInstanceServer::parentEffectItem(QQuickItem *item)
     return nullptr;
 }
 
-static bool isEffectItem(QQuickItem *item, QQuickShaderEffectSource *sourceItem)
+static bool isEffectItem(QQuickItem *item, QQuickShaderEffectSource *sourceItem, QQuickItem *target)
 {
     QQuickItemPrivate *pItem = QQuickItemPrivate::get(sourceItem);
 
+    if (item) {
+         QQmlProperty prop(item, "__effect");
+         if (prop.read().toBool()) {
+             prop = QQmlProperty(item, "source");
+             return prop.read().value<QQuickItem *>() == target;
+         }
+    }
+
     if (!pItem || !pItem->layer())
         return false;
 
@@ -477,7 +485,7 @@ QImage Qt5NodeInstanceServer::grabItem([[maybe_unused]] QQuickItem *item)
             if (auto parent = item->parentItem()) {
                 const auto siblings = parent->childItems();
                 for (auto sibling : siblings) {
-                    if (isEffectItem(sibling, pItem->layer()->effectSource()))
+                    if (isEffectItem(sibling, pItem->layer()->effectSource(), item))
                         return grabItem(sibling);
                 }
             }
diff --git a/src/tools/qml2puppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp b/src/tools/qml2puppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp
index f9191950fd..53af00ab09 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp
@@ -146,7 +146,9 @@ void Qt5RenderNodeInstanceServer::collectItemChangesAndSendChangeCommands()
             && !changedPropertyList().isEmpty()
             && nodeInstanceClient()->bytesToWrite() < 10000) {
 
-            Internal::QuickItemNodeInstance::updateDirtyNode(rootNodeInstance().contentItem());
+            QQuickItem *rootItem = rootNodeInstance().contentItem();
+            QQuickDesignerSupport::addDirty(rootItem, QQuickDesignerSupport::Content);
+            QQuickDesignerSupport::updateDirtyNode(rootItem);
             nodeInstanceClient()->pixmapChanged(createPixmapChangedCommand({rootNodeInstance()}));
         }
 
@@ -239,6 +241,24 @@ void Qt5RenderNodeInstanceServer::changePropertyValues(const ChangeValuesCommand
 
             if (instance.hasParent() && instance.propertyNames().contains("_isEffectItem"))
                 makeDirtyRecursive(instance.parent());
+        } else if (container.isDynamic() && hasInstanceForId(container.instanceId())) {
+            // Changes to dynamic properties are not always noticed by normal signal spy mechanism
+            addChangedProperty(InstancePropertyPair(instanceForId(container.instanceId()),
+                                                    container.name()));
+        }
+    }
+}
+
+void Qt5RenderNodeInstanceServer::changePropertyBindings(const ChangeBindingsCommand &command)
+{
+    Qt5NodeInstanceServer::changePropertyBindings(command);
+
+    const QVector<PropertyBindingContainer> changes = command.bindingChanges;
+    for (const PropertyBindingContainer &container : changes) {
+        if (container.isDynamic() && hasInstanceForId(container.instanceId())) {
+            // Changes to dynamic properties are not always noticed by normal signal spy mechanism
+            addChangedProperty(InstancePropertyPair(instanceForId(container.instanceId()),
+                                                    container.name()));
         }
     }
 }
diff --git a/src/tools/qml2puppet/qml2puppet/instances/qt5rendernodeinstanceserver.h b/src/tools/qml2puppet/qml2puppet/instances/qt5rendernodeinstanceserver.h
index 738aa47b18..1e0f885da1 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/qt5rendernodeinstanceserver.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/qt5rendernodeinstanceserver.h
@@ -18,6 +18,7 @@ public:
     void completeComponent(const CompleteComponentCommand &command) override;
     void removeSharedMemory(const RemoveSharedMemoryCommand &command) override;
     void changePropertyValues(const ChangeValuesCommand &command) override;
+    void changePropertyBindings(const ChangeBindingsCommand &command) override;
 
 protected:
     void collectItemChangesAndSendChangeCommands() override;
diff --git a/src/tools/qml2puppet/qml2puppet/instances/quickitemnodeinstance.cpp b/src/tools/qml2puppet/qml2puppet/instances/quickitemnodeinstance.cpp
index 9d432fe047..a9c49b9661 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/quickitemnodeinstance.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/quickitemnodeinstance.cpp
@@ -277,13 +277,27 @@ static bool layerEnabledAndEffect(QQuickItem *item)
     return false;
 }
 
+static QRectF getBoundingRectForEffect(QQuickItem *item)
+{
+    const auto siblings = item->parentItem()->childItems();
+    for (auto sibling : siblings) {
+        QQmlProperty prop(sibling, "__effect");
+        if (prop.read().toBool()) {
+            prop = QQmlProperty(sibling, "source");
+            if (prop.read().value<QQuickItem *>() == item)
+                return ServerNodeInstance::effectAdjustedBoundingRect(sibling);
+        }
+    }
+    return ServerNodeInstance::effectAdjustedBoundingRect(item);
+}
+
 QRectF QuickItemNodeInstance::boundingRect() const
 {
     if (quickItem()) {
-        if (quickItem()->clip()) {
+        if (layerEnabledAndEffect(quickItem()) && quickItem()->parentItem()) {
+            return getBoundingRectForEffect(quickItem());
+        } else if (quickItem()->clip()) {
             return quickItem()->boundingRect();
-        } else if (layerEnabledAndEffect(quickItem())) {
-            return ServerNodeInstance::effectAdjustedBoundingRect(quickItem());
         } else {
             QSize maximumSize(4000, 4000);
             auto isValidSize = [maximumSize] (const QRectF& rect) {
diff --git a/src/tools/qml2puppet/qml2puppet/instances/servernodeinstance.cpp b/src/tools/qml2puppet/qml2puppet/instances/servernodeinstance.cpp
index 758e18df35..aa91b8ffaa 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/servernodeinstance.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/servernodeinstance.cpp
@@ -26,6 +26,8 @@
 
 #include <qmlprivategate.h>
 
+#include <QtQuick/private/qquickitem_p.h>
+
 #include <QHash>
 #include <QSet>
 #include <QDebug>
@@ -116,8 +118,23 @@ bool ServerNodeInstance::isSubclassOf(QObject *object, const QByteArray &superTy
 
 QRectF ServerNodeInstance::effectAdjustedBoundingRect(QQuickItem *item)
 {
-    if (item)
-        return item->boundingRect().adjusted(-40, -40, 40, 40);
+    if (item) {
+        QQuickItemPrivate *pItem = QQuickItemPrivate::get(item);
+
+        QQmlProperty prop(item, "__effect");
+
+        if (pItem && pItem->layer() && pItem->layer()->sourceRect().isValid()) {
+            return pItem->layer()->sourceRect();
+        } else if (prop.read().toBool()) {
+            prop = QQmlProperty(item, "effectBoundingBox");
+            QRectF rect = prop.read().toRectF().adjusted(-40, -40, 40, 40);
+            if (rect.isValid())
+                return rect;
+            return item->boundingRect();
+        } else {
+            return item->boundingRect();
+        }
+    }
     return {};
 }
 
diff --git a/src/tools/qml2puppet/qmlprivategate/qmlprivategate.cpp b/src/tools/qml2puppet/qmlprivategate/qmlprivategate.cpp
index 123d4aee2d..096ac36244 100644
--- a/src/tools/qml2puppet/qmlprivategate/qmlprivategate.cpp
+++ b/src/tools/qml2puppet/qmlprivategate/qmlprivategate.cpp
@@ -10,6 +10,7 @@
 #include <QQmlComponent>
 #include <QFileInfo>
 #include <QProcessEnvironment>
+#include <QJsonValue>
 
 #include <private/qabstractfileengine_p.h>
 #include <private/qfsfileengine_p.h>
@@ -35,16 +36,484 @@
 #include <private/qquickanimation_p.h>
 #include <private/qqmlmetatype_p.h>
 #include <private/qqmltimer_p.h>
+#include <private/qqmlanybinding_p.h>
 
 #ifdef QUICK3D_MODULE
 #include <private/qquick3dobject_p.h>
 #include <private/qquick3drepeater_p.h>
 #endif
 
+
+
 namespace QmlDesigner {
 
 namespace Internal {
 
+static void addToPropertyNameListIfNotBlackListed(QQuickDesignerSupport::PropertyNameList *propertyNameList,
+                                                  const QQuickDesignerSupport::PropertyName &propertyName)
+{
+    if (!QQuickDesignerSupportProperties::isPropertyBlackListed(propertyName))
+        propertyNameList->append(propertyName);
+}
+
+static QQuickDesignerSupport::PropertyNameList propertyNameListForWritablePropertiesInternal(QObject *object,
+                                                       const QQuickDesignerSupport::PropertyName &baseName,
+                                                       QObjectList *inspectedObjects,
+                                                       int depth = 0)
+{
+    QQuickDesignerSupport::PropertyNameList propertyNameList;
+
+    if (depth > 2)
+        return propertyNameList;
+
+    if (!inspectedObjects->contains(object))
+        inspectedObjects->append(object);
+
+    const QMetaObject *metaObject = object->metaObject();
+    for (int index = 0; index < metaObject->propertyCount(); ++index) {
+        QMetaProperty metaProperty = metaObject->property(index);
+        QQmlProperty declarativeProperty(object, QString::fromUtf8(metaProperty.name()));
+        if (declarativeProperty.isValid() && !declarativeProperty.isWritable() && declarativeProperty.propertyTypeCategory() == QQmlProperty::Object) {
+            if (declarativeProperty.name() != QLatin1String("parent")) {
+                QObject *childObject = QQmlMetaType::toQObject(declarativeProperty.read());
+                if (childObject)
+                    propertyNameList.append(propertyNameListForWritablePropertiesInternal(childObject,
+                                                                                  baseName +  QQuickDesignerSupport::PropertyName(metaProperty.name())
+                                                                                  + '.', inspectedObjects,
+                                                                                  depth + 1));
+            }
+        } else if (QQmlGadgetPtrWrapper *valueType
+                   = QQmlGadgetPtrWrapper::instance(qmlEngine(object), metaProperty.metaType())) {
+
+
+            const QVariant value = metaProperty.read(object);
+            QMetaType jsType = QMetaType::fromType<QJSValue>();
+            int userType = value.userType();
+
+            //qDebug() << jsType << jsType.id();
+            //qDebug() << "tp" << value.typeName();
+            //qDebug() << "ut" << userType;
+
+            if (userType == jsType.id()) {
+                qDebug() << "js value found";
+                //QJSValue jsValue = value.value<QJSValue>(); //crashes
+                //qDebug() << jsValue.isObject();
+                //qDebug() << jsValue.isQObject();
+            } else {
+
+
+
+                valueType->setValue(value);
+                propertyNameList.append(propertyNameListForWritablePropertiesInternal(valueType,
+                                                                                      baseName +  QQuickDesignerSupport::PropertyName(metaProperty.name())
+                                                                                      + '.', inspectedObjects,
+                                                                                      depth + 1));
+            }
+
+        }
+
+        if (metaProperty.isReadable() && metaProperty.isWritable()) {
+            addToPropertyNameListIfNotBlackListed(&propertyNameList,
+                                                  baseName + QQuickDesignerSupport::PropertyName(metaProperty.name()));
+        }
+    }
+
+    return propertyNameList;
+}
+
+static QQuickDesignerSupport::PropertyNameList propertyNameListForWritablePropertiesFork(QObject *object)
+{
+    QObjectList localObjectList;
+    return propertyNameListForWritablePropertiesInternal(object, {}, &localObjectList);
+}
+
+static QQuickDesignerSupport::PropertyNameList allPropertyNamesFork(QObject *object,
+                                  const QQuickDesignerSupport::PropertyName &baseName = QQuickDesignerSupport::PropertyName(),
+                                  QObjectList *inspectedObjects = nullptr,
+                                  int depth = 0)
+{
+    QQuickDesignerSupport::PropertyNameList propertyNameList;
+
+    QObjectList localObjectList;
+
+    if (inspectedObjects == nullptr)
+        inspectedObjects = &localObjectList;
+
+    if (depth > 2)
+        return propertyNameList;
+
+    if (!inspectedObjects->contains(object))
+        inspectedObjects->append(object);
+
+    const QMetaObject *metaObject = object->metaObject();
+
+    QStringList deferredPropertyNames;
+    const int namesIndex = metaObject->indexOfClassInfo("DeferredPropertyNames");
+    if (namesIndex != -1) {
+        QMetaClassInfo classInfo = metaObject->classInfo(namesIndex);
+        deferredPropertyNames = QString::fromUtf8(classInfo.value()).split(QLatin1Char(','));
+    }
+
+    for (int index = 0; index < metaObject->propertyCount(); ++index) {
+        QMetaProperty metaProperty = metaObject->property(index);
+        QQmlProperty declarativeProperty(object, QString::fromUtf8(metaProperty.name()));
+        if (declarativeProperty.isValid() && declarativeProperty.propertyTypeCategory() == QQmlProperty::Object) {
+            if (declarativeProperty.name() != QLatin1String("parent")
+                    && !deferredPropertyNames.contains(declarativeProperty.name())) {
+                QObject *childObject = QQmlMetaType::toQObject(declarativeProperty.read());
+                if (childObject)
+                    propertyNameList.append(allPropertyNamesFork(childObject,
+                                                             baseName
+                                                             + QQuickDesignerSupport::PropertyName(metaProperty.name())
+                                                             + '.', inspectedObjects,
+                                                             depth + 1));
+            }
+        } else if (QQmlGadgetPtrWrapper *valueType
+                   = QQmlGadgetPtrWrapper::instance(qmlEngine(object), metaProperty.metaType())) {
+
+            const QVariant value = metaProperty.read(object);
+            propertyNameList.append(baseName + QQuickDesignerSupport::PropertyName(metaProperty.name()));
+            const QJsonValue jsonValue = value.toJsonValue();
+
+            if (!jsonValue.isNull()) {
+                qDebug() << "llokhere";
+                qDebug() << "name" << metaProperty.name();
+                qDebug() << "value" << value;
+                qDebug() << jsonValue;
+            }
+
+            if (value.isValid() && jsonValue.isNull()) {
+                //qDebug() << "llokhere crash";
+                //qDebug() << "name" << metaProperty.name();
+                //qDebug() << "value" << value;
+                //qDebug() << jsonValue;
+
+
+                QMetaType jsType = QMetaType::fromType<QJSValue>();
+
+                int userType = value.userType();
+
+                //qDebug() << jsType << jsType.id();
+                //qDebug() << "tp" << value.typeName();
+                //qDebug() << "ut" << userType;
+
+                if (userType == jsType.id()) {
+                    qDebug() << "js value found";
+                    //QJSValue jsValue = value.value<QJSValue>(); //crashes
+                    //qDebug() << jsValue.isObject();
+                    //qDebug() << jsValue.isQObject();
+                } else {
+
+
+                    valueType->setValue(value);
+                    propertyNameList.append(allPropertyNamesFork(valueType,
+                                                                 baseName
+                                                                 + QQuickDesignerSupport::PropertyName(metaProperty.name())
+                                                                 + '.', inspectedObjects,
+                                                                 depth + 1));
+                }
+
+
+            }
+        } else  {
+            addToPropertyNameListIfNotBlackListed(&propertyNameList,
+                                                  baseName + QQuickDesignerSupport::PropertyName(metaProperty.name()));
+        }
+    }
+
+    return propertyNameList;
+}
+
+class DesignerCustomObjectDataFork
+{
+public:
+    static void registerData(QObject *object);
+    static DesignerCustomObjectDataFork *get(QObject *object);
+    static QVariant getResetValue(QObject *object, const QQuickDesignerSupport::PropertyName &propertyName);
+    static void doResetProperty(QObject *object, QQmlContext *context, const QQuickDesignerSupport::PropertyName &propertyName);
+    static bool hasValidResetBinding(QObject *object, const QQuickDesignerSupport::PropertyName &propertyName);
+    static bool hasBindingForProperty(QObject *object,
+                                      QQmlContext *context,
+                                      const QQuickDesignerSupport::PropertyName &propertyName,
+                                      bool *hasChanged);
+    static void setPropertyBinding(QObject *object,
+                                   QQmlContext *context,
+                                   const QQuickDesignerSupport::PropertyName &propertyName,
+                                   const QString &expression);
+    static void keepBindingFromGettingDeleted(QObject *object,
+                                              QQmlContext *context,
+                                              const QQuickDesignerSupport::PropertyName &propertyName);
+    void handleDestroyed();
+
+private:
+    DesignerCustomObjectDataFork(QObject *object);
+    void populateResetHashes();
+    QObject *object() const;
+    QVariant getResetValue(const QQuickDesignerSupport::PropertyName &propertyName) const;
+    void doResetProperty(QQmlContext *context, const QQuickDesignerSupport::PropertyName &propertyName);
+    bool hasValidResetBinding(const QQuickDesignerSupport::PropertyName &propertyName) const;
+    QQmlAnyBinding getResetBinding(const QQuickDesignerSupport::PropertyName &propertyName) const;
+    bool hasBindingForProperty(QQmlContext *context, const QQuickDesignerSupport::PropertyName &propertyName, bool *hasChanged) const;
+    void setPropertyBinding(QQmlContext *context, const QQuickDesignerSupport::PropertyName &propertyName, const QString &expression);
+    void keepBindingFromGettingDeleted(QQmlContext *context, const QQuickDesignerSupport::PropertyName &propertyName);
+
+    QObject *m_object;
+    QHash<QQuickDesignerSupport::PropertyName, QVariant> m_resetValueHash;
+    QHash<QQuickDesignerSupport::PropertyName, QQmlAnyBinding> m_resetBindingHash;
+    mutable QHash<QQuickDesignerSupport::PropertyName, bool> m_hasBindingHash;
+};
+
+typedef QHash<QObject*, DesignerCustomObjectDataFork*> CustomObjectDataHash;
+Q_GLOBAL_STATIC(CustomObjectDataHash, s_designerObjectToDataHash)
+
+struct HandleDestroyedFunctor {
+  DesignerCustomObjectDataFork *data;
+  void operator()() { data->handleDestroyed(); }
+};
+
+using namespace Qt::StringLiterals;
+
+DesignerCustomObjectDataFork::DesignerCustomObjectDataFork(QObject *object)
+    : m_object(object)
+{
+    if (object) {
+        populateResetHashes();
+        s_designerObjectToDataHash()->insert(object, this);
+
+        HandleDestroyedFunctor functor;
+        functor.data = this;
+        QObject::connect(object, &QObject::destroyed, functor);
+    }
+}
+
+void DesignerCustomObjectDataFork::registerData(QObject *object)
+{
+    new DesignerCustomObjectDataFork(object);
+}
+
+DesignerCustomObjectDataFork *DesignerCustomObjectDataFork::get(QObject *object)
+{
+    return s_designerObjectToDataHash()->value(object);
+}
+
+QVariant DesignerCustomObjectDataFork::getResetValue(QObject *object, const QQuickDesignerSupport::PropertyName &propertyName)
+{
+    DesignerCustomObjectDataFork* data = get(object);
+
+    if (data)
+        return data->getResetValue(propertyName);
+
+    return QVariant();
+}
+
+void DesignerCustomObjectDataFork::doResetProperty(QObject *object, QQmlContext *context, const QQuickDesignerSupport::PropertyName &propertyName)
+{
+    DesignerCustomObjectDataFork* data = get(object);
+
+    if (data)
+        data->doResetProperty(context, propertyName);
+}
+
+bool DesignerCustomObjectDataFork::hasValidResetBinding(QObject *object, const QQuickDesignerSupport::PropertyName &propertyName)
+{
+    DesignerCustomObjectDataFork* data = get(object);
+
+    if (data)
+        return data->hasValidResetBinding(propertyName);
+
+    return false;
+}
+
+bool DesignerCustomObjectDataFork::hasBindingForProperty(QObject *object,
+                                                     QQmlContext *context,
+                                                     const QQuickDesignerSupport::PropertyName &propertyName,
+                                                     bool *hasChanged)
+{
+    DesignerCustomObjectDataFork* data = get(object);
+
+    if (data)
+        return data->hasBindingForProperty(context, propertyName, hasChanged);
+
+    return false;
+}
+
+void DesignerCustomObjectDataFork::setPropertyBinding(QObject *object,
+                                                  QQmlContext *context,
+                                                  const QQuickDesignerSupport::PropertyName &propertyName,
+                                                  const QString &expression)
+{
+    DesignerCustomObjectDataFork* data = get(object);
+
+    if (data)
+        data->setPropertyBinding(context, propertyName, expression);
+}
+
+void DesignerCustomObjectDataFork::keepBindingFromGettingDeleted(QObject *object,
+                                                             QQmlContext *context,
+                                                             const QQuickDesignerSupport::PropertyName &propertyName)
+{
+    DesignerCustomObjectDataFork* data = get(object);
+
+    if (data)
+        data->keepBindingFromGettingDeleted(context, propertyName);
+}
+
+void DesignerCustomObjectDataFork::populateResetHashes()
+{
+    const QQuickDesignerSupport::PropertyNameList propertyNameList =
+            propertyNameListForWritablePropertiesFork(object());
+
+    const QMetaObject *mo = object()->metaObject();
+    QByteArrayList deferredPropertyNames;
+    const int namesIndex = mo->indexOfClassInfo("DeferredPropertyNames");
+    if (namesIndex != -1) {
+        QMetaClassInfo classInfo = mo->classInfo(namesIndex);
+        deferredPropertyNames = QByteArray(classInfo.value()).split(',');
+    }
+
+    for (const QQuickDesignerSupport::PropertyName &propertyName : propertyNameList) {
+
+        if (deferredPropertyNames.contains(propertyName))
+            continue;
+
+        QQmlProperty property(object(), QString::fromUtf8(propertyName), QQmlEngine::contextForObject(object()));
+
+        auto binding = QQmlAnyBinding::ofProperty(property);
+
+        if (binding) {
+            m_resetBindingHash.insert(propertyName, binding);
+        } else if (property.isWritable()) {
+            m_resetValueHash.insert(propertyName, property.read());
+        }
+    }
+}
+
+QObject *DesignerCustomObjectDataFork::object() const
+{
+    return m_object;
+}
+
+QVariant DesignerCustomObjectDataFork::getResetValue(const QQuickDesignerSupport::PropertyName &propertyName) const
+{
+    return m_resetValueHash.value(propertyName);
+}
+
+void DesignerCustomObjectDataFork::doResetProperty(QQmlContext *context, const QQuickDesignerSupport::PropertyName &propertyName)
+{
+    QQmlProperty property(object(), QString::fromUtf8(propertyName), context);
+
+    if (!property.isValid())
+        return;
+
+    // remove existing binding
+    QQmlAnyBinding::takeFrom(property);
+
+
+    if (hasValidResetBinding(propertyName)) {
+        QQmlAnyBinding binding = getResetBinding(propertyName);
+        binding.installOn(property);
+
+        if (binding.isAbstractPropertyBinding()) {
+            // for new style properties, we will evaluate during setBinding anyway
+            static_cast<QQmlBinding *>(binding.asAbstractBinding())->update();
+        }
+
+    } else if (property.isResettable()) {
+        property.reset();
+    } else if (property.propertyTypeCategory() == QQmlProperty::List) {
+        QQmlListReference list = qvariant_cast<QQmlListReference>(property.read());
+
+        if (!QQuickDesignerSupportProperties::hasFullImplementedListInterface(list)) {
+            qWarning() << "Property list interface not fully implemented for Class " << property.property().typeName() << " in property " << property.name() << "!";
+            return;
+        }
+
+        list.clear();
+    } else if (property.isWritable()) {
+        if (property.read() == getResetValue(propertyName))
+            return;
+
+        property.write(getResetValue(propertyName));
+    }
+}
+
+bool DesignerCustomObjectDataFork::hasValidResetBinding(const QQuickDesignerSupport::PropertyName &propertyName) const
+{
+    return m_resetBindingHash.contains(propertyName) &&  m_resetBindingHash.value(propertyName);
+}
+
+QQmlAnyBinding DesignerCustomObjectDataFork::getResetBinding(const QQuickDesignerSupport::PropertyName &propertyName) const
+{
+    return m_resetBindingHash.value(propertyName);
+}
+
+bool DesignerCustomObjectDataFork::hasBindingForProperty(QQmlContext *context,
+                                                     const QQuickDesignerSupport::PropertyName &propertyName,
+                                                     bool *hasChanged) const
+{
+    if (QQuickDesignerSupportProperties::isPropertyBlackListed(propertyName))
+        return false;
+
+    QQmlProperty property(object(), QString::fromUtf8(propertyName), context);
+
+    bool hasBinding = QQmlAnyBinding::ofProperty(property);
+
+    if (hasChanged) {
+        *hasChanged = hasBinding != m_hasBindingHash.value(propertyName, false);
+        if (*hasChanged)
+            m_hasBindingHash.insert(propertyName, hasBinding);
+    }
+
+    return hasBinding;
+}
+
+void DesignerCustomObjectDataFork::setPropertyBinding(QQmlContext *context,
+                                                  const QQuickDesignerSupport::PropertyName &propertyName,
+                                                  const QString &expression)
+{
+    QQmlProperty property(object(), QString::fromUtf8(propertyName), context);
+
+    if (!property.isValid())
+        return;
+
+    if (property.isProperty()) {
+        QString url = u"@designer"_s;
+        int lineNumber = 0;
+        QQmlAnyBinding binding = QQmlAnyBinding::createFromCodeString(property,
+                                                                      expression, object(), QQmlContextData::get(context), url, lineNumber);
+
+        binding.installOn(property);
+        if (binding.isAbstractPropertyBinding()) {
+            // for new style properties, we will evaluate during setBinding anyway
+            static_cast<QQmlBinding *>(binding.asAbstractBinding())->update();
+        }
+
+        if (binding.hasError()) {
+            if (property.property().userType() == QMetaType::QString)
+                property.write(QVariant(QLatin1Char('#') + expression + QLatin1Char('#')));
+        }
+
+    } else {
+        qWarning() << Q_FUNC_INFO << ": Cannot set binding for property" << propertyName << ": property is unknown for type";
+    }
+}
+
+void DesignerCustomObjectDataFork::keepBindingFromGettingDeleted(QQmlContext *context,
+                                                             const QQuickDesignerSupport::PropertyName &propertyName)
+{
+    //Refcounting is taking care
+    Q_UNUSED(context);
+    Q_UNUSED(propertyName);
+}
+
+void DesignerCustomObjectDataFork::handleDestroyed()
+{
+    s_designerObjectToDataHash()->remove(m_object);
+    delete this;
+}
+
+
+
 namespace QmlPrivateGate {
 
 bool isPropertyBlackListed(const QmlDesigner::PropertyName &propertyName)
@@ -54,12 +523,14 @@ bool isPropertyBlackListed(const QmlDesigner::PropertyName &propertyName)
 
 PropertyNameList allPropertyNames(QObject *object)
 {
-    return QQuickDesignerSupportProperties::allPropertyNames(object);
+    return allPropertyNamesFork(object);
+    //return QQuickDesignerSupportProperties::allPropertyNames(object);
 }
 
 PropertyNameList propertyNameListForWritableProperties(QObject *object)
 {
-    return QQuickDesignerSupportProperties::propertyNameListForWritableProperties(object);
+    return propertyNameListForWritablePropertiesFork(object);
+    //return QQuickDesignerSupportProperties::propertyNameListForWritableProperties(object);
 }
 
 void tweakObjects(QObject *object)
@@ -69,7 +540,9 @@ void tweakObjects(QObject *object)
 
 void createNewDynamicProperty(QObject *object,  QQmlEngine *engine, const QString &name)
 {
-    QQuickDesignerSupportProperties::createNewDynamicProperty(object, engine, name);
+    QQmlProperty qmlProp(object, name, engine->contextForObject(object));
+    if (!qmlProp.isValid())
+        QQuickDesignerSupportProperties::createNewDynamicProperty(object, engine, name);
 }
 
 void registerNodeInstanceMetaObject(QObject *object, QQmlEngine *engine)
@@ -187,7 +660,8 @@ bool hasFullImplementedListInterface(const QQmlListReference &list)
 
 void registerCustomData(QObject *object)
 {
-    QQuickDesignerSupportProperties::registerCustomData(object);
+     DesignerCustomObjectDataFork::registerData(object);
+    //QQuickDesignerSupportProperties::registerCustomData(object);
 }
 
 QVariant getResetValue(QObject *object, const PropertyName &propertyName)
@@ -201,7 +675,8 @@ QVariant getResetValue(QObject *object, const PropertyName &propertyName)
     else if (propertyName == "Layout.fillWidth")
         return false;
     else
-        return QQuickDesignerSupportProperties::getResetValue(object, propertyName);
+         return DesignerCustomObjectDataFork::getResetValue(object, propertyName);
+        //return QQuickDesignerSupportProperties::getResetValue(object, propertyName);
 }
 
 static void setProperty(QObject *object, QQmlContext *context, const PropertyName &propertyName, const QVariant &value)
@@ -221,7 +696,9 @@ void doResetProperty(QObject *object, QQmlContext *context, const PropertyName &
     else if (propertyName == "Layout.fillWidth")
         setProperty(object, context, propertyName, getResetValue(object, propertyName));
     else
-        QQuickDesignerSupportProperties::doResetProperty(object, context, propertyName);
+        DesignerCustomObjectDataFork::doResetProperty(object, context, propertyName);
+
+       //QQuickDesignerSupportProperties::doResetProperty(object, context, propertyName);
 }
 
 bool hasValidResetBinding(QObject *object, const PropertyName &propertyName)
@@ -234,17 +711,22 @@ bool hasValidResetBinding(QObject *object, const PropertyName &propertyName)
         return true;
     else if (propertyName == "Layout.fillWidth")
         return true;
-    return QQuickDesignerSupportProperties::hasValidResetBinding(object, propertyName);
+    return
+            DesignerCustomObjectDataFork::hasValidResetBinding(object, propertyName);
+            //QQuickDesignerSupportProperties::hasValidResetBinding(object, propertyName);
 }
 
 bool hasBindingForProperty(QObject *object, QQmlContext *context, const PropertyName &propertyName, bool *hasChanged)
 {
-    return QQuickDesignerSupportProperties::hasBindingForProperty(object, context, propertyName, hasChanged);
+    return DesignerCustomObjectDataFork::hasBindingForProperty(object, context, propertyName, hasChanged);
+    //return QQuickDesignerSupportProperties::hasBindingForProperty(object, context, propertyName, hasChanged);
 }
 
 void setPropertyBinding(QObject *object, QQmlContext *context, const PropertyName &propertyName, const QString &expression)
 {
-    QQuickDesignerSupportProperties::setPropertyBinding(object, context, propertyName, expression);
+    DesignerCustomObjectDataFork::setPropertyBinding(object, context, propertyName, expression);
+
+    //QQuickDesignerSupportProperties::setPropertyBinding(object, context, propertyName, expression);
 }
 
 void emitComponentComplete(QObject *item)
@@ -317,7 +799,8 @@ void doComponentCompleteRecursive(QObject *object, NodeInstanceServer *nodeInsta
 
 void keepBindingFromGettingDeleted(QObject *object, QQmlContext *context, const PropertyName &propertyName)
 {
-    QQuickDesignerSupportProperties::keepBindingFromGettingDeleted(object, context, propertyName);
+    DesignerCustomObjectDataFork::keepBindingFromGettingDeleted(object, context, propertyName);
+    //QQuickDesignerSupportProperties::keepBindingFromGettingDeleted(object, context, propertyName);
 }
 
 bool objectWasDeleted(QObject *object)
diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp
index 55ae944ef6..e5763e847e 100644
--- a/tests/auto/debugger/tst_dumpers.cpp
+++ b/tests/auto/debugger/tst_dumpers.cpp
@@ -1171,6 +1171,7 @@ private:
     bool m_isQnxGdb = false;
     bool m_useGLibCxxDebug = false;
     int m_totalDumpTime = 0;
+    int m_totalInnerTime = 0;
 };
 
 void tst_Dumpers::initTestCase()
@@ -1343,7 +1344,9 @@ void tst_Dumpers::cleanup()
 
 void tst_Dumpers::cleanupTestCase()
 {
-    qCDebug(lcDumpers) << "Dumpers total: " << QTime::fromMSecsSinceStartOfDay(m_totalDumpTime);
+    qCDebug(lcDumpers) << QTime::fromMSecsSinceStartOfDay(m_totalDumpTime);
+    qCDebug(lcDumpers, "TotalOuter: %5d", m_totalDumpTime);
+    qCDebug(lcDumpers, "TotalInner: %5d", m_totalInnerTime);
 }
 
 void tst_Dumpers::dumper()
@@ -1859,7 +1862,10 @@ void tst_Dumpers::dumper()
     dumperTimer.start();
     debugger.write(cmds.toLocal8Bit());
     QVERIFY(debugger.waitForFinished());
-    m_totalDumpTime += dumperTimer.elapsed();
+    const int elapsed = dumperTimer.elapsed();
+    //< QTime::fromMSecsSinceStartOfDay(elapsed);
+    qCDebug(lcDumpers, "CaseOuter: %5d", elapsed);
+    m_totalDumpTime += elapsed;
     output = debugger.readAllStandardOutput();
     QByteArray fullOutput = output;
     //qCDebug(lcDumpers) << "stdout: " << output;
@@ -1890,6 +1896,9 @@ void tst_Dumpers::dumper()
 
         actual.fromStringMultiple(QString::fromLocal8Bit(contents));
         context.nameSpace = actual["qtnamespace"].data();
+        int runtime = actual["runtime"].data().toFloat() * 1000;
+        qCDebug(lcDumpers, "CaseInner: %5d", runtime);
+        m_totalInnerTime += runtime;
         actual = actual["data"];
         //qCDebug(lcDumpers) << "FOUND NS: " << context.nameSpace;
 
@@ -1913,7 +1922,13 @@ void tst_Dumpers::dumper()
         if (context.nameSpace == "::")
             context.nameSpace.clear();
         contents.replace("\\\"", "\"");
-        actual.fromString(QString::fromLocal8Bit(contents));
+        actual.fromStringMultiple(QString::fromLocal8Bit(contents));
+        int runtime = actual["runtime"].data().toFloat() * 1000;
+        qCDebug(lcDumpers, "CaseInner: %5d", runtime);
+        m_totalInnerTime += runtime;
+        actual = actual["data"];
+        //qCDebug(lcDumpers).noquote() << "\nACTUAL: " << actual.toString() << "\nXYYY";
+
     } else {
         QByteArray localsAnswerStart("<qtcreatorcdbext>|R|42|");
         QByteArray locals("|script|");
@@ -1967,8 +1982,8 @@ void tst_Dumpers::dumper()
 
     auto test = [&](const Check &check, bool *removeIt, bool single) {
         if (!check.matches(m_debuggerEngine, m_debuggerVersion, context)) {
-            if (single)
-                qCDebug(lcDumpers) << "SKIPPING NON-MATCHING TEST " << check;
+            //if (single)
+            //    qCDebug(lcDumpers) << "SKIPPING NON-MATCHING TEST " << check;
             return true; // we have not failed
         }
 
@@ -2071,22 +2086,24 @@ void tst_Dumpers::dumper()
         }
     }
 
+    int pos1 = 0;
+    int pos2 = -1;
+    while (true) {
+        pos1 = fullOutput.indexOf("bridgemessage={msg=", pos2 + 1);
+        if (pos1 == -1)
+            break;
+        pos1 += 20;
+        pos2 = fullOutput.indexOf("\"}", pos1 + 1);
+        if (pos2 == -1)
+            break;
+        qCDebug(lcDumpers) << "MSG: " << fullOutput.mid(pos1, pos2 - pos1);
+    }
+
     if (ok) {
         m_keepTemp = false;
     } else {
         local.forAllChildren([](WatchItem *item) { qCDebug(lcDumpers) << item->internalName(); });
 
-        int pos1 = 0, pos2 = -1;
-        while (true) {
-            pos1 = fullOutput.indexOf("bridgemessage={msg=", pos2 + 1);
-            if (pos1 == -1)
-                break;
-            pos1 += 20;
-            pos2 = fullOutput.indexOf("\"}", pos1 + 1);
-            if (pos2 == -1)
-                break;
-            qCDebug(lcDumpers) << "MSG: " << fullOutput.mid(pos1, pos2 - pos1 - 1);
-        }
         qCDebug(lcDumpers).noquote() << "CONTENTS     : " << contents;
         qCDebug(lcDumpers).noquote() << "FULL OUTPUT  : " << fullOutput.data();
         qCDebug(lcDumpers) << "Qt VERSION   : " << QString::number(context.qtVersion, 16);
@@ -4374,7 +4391,7 @@ void tst_Dumpers::dumper_data()
                + NetworkProfile()
 
                + Check("ha", ValuePattern(".*127.0.0.1.*"), "@QHostAddress")
-               + Check("ha.a", "2130706433", TypeDef("unsigned int", "@quint32"))
+               + Check("ha.a", "2130706433", "@quint32")
                + Check("ha.ipString", ValuePattern(".*127.0.0.1.*"), "@QString")
                     % QtVersion(0, 0x50800)
                //+ Check("ha.protocol", "@QAbstractSocket::IPv4Protocol (0)",
@@ -4383,7 +4400,7 @@ void tst_Dumpers::dumper_data()
                //        "@QAbstractSocket::NetworkLayerProtocol") % LldbEngine
                + Check("ha.scopeId", "\"\"", "@QString")
                + Check("ha1", ValuePattern(".*127.0.0.1.*"), "@QHostAddress")
-               + Check("ha1.a", "2130706433", TypeDef("unsigned int", "@quint32"))
+               + Check("ha1.a", "2130706433", "@quint32")
                + Check("ha1.ipString", "\"127.0.0.1\"", "@QString")
                     % QtVersion(0, 0x50800)
                //+ Check("ha1.protocol", "@QAbstractSocket::IPv4Protocol (0)",
@@ -6226,15 +6243,19 @@ void tst_Dumpers::dumper_data()
     QTest::newRow("Bitfields")
             << Data("",
 
-                    "enum E { V1, V2 };"
+                    "typedef int gint;\n"
+                    "typedef unsigned int guint;\n"
+                    "enum E { V1, V2 };\n"
                     "struct S\n"
                     "{\n"
-                    "    S() : front(13), x(2), y(3), z(39), e(V2), c(1), b(0), f(5),"
+                    "    S() : front(13), x(2), y(3), z(39), t1(1), t2(1), e(V2), c(1), b(0), f(5),"
                     "          g(46), h(47), d(6), i(7) {}\n"
                     "    unsigned int front;\n"
                     "    unsigned int x : 3;\n"
                     "    unsigned int y : 4;\n"
                     "    unsigned int z : 18;\n"
+                    "    gint t1 : 2;\n"
+                    "    guint t2 : 2;\n"
                     "    E e : 3;\n"
                     "    bool c : 1;\n"
                     "    bool b;\n"
@@ -6257,7 +6278,7 @@ void tst_Dumpers::dumper_data()
                + Check("s.x", "2", "unsigned int : 3") % NoCdbEngine
                + Check("s.y", "3", "unsigned int : 4") % NoCdbEngine
                + Check("s.z", "39", "unsigned int : 18") % NoCdbEngine
-               + Check("s.e", "V2 (1)", "E : 3") % GdbEngine
+               // + Check("s.e", "V2 (1)", "E : 3") % GdbEngine    FIXME
                + Check("s.g", "46", "char : 7") % GdbEngine
                + Check("s.h", "47", "char") % GdbEngine
                + Check("s.x", "2", "unsigned int") % CdbEngine
@@ -6267,7 +6288,7 @@ void tst_Dumpers::dumper_data()
                + Check("s.e", "V2 (1)", TypePattern("main::[a-zA-Z0-9_]*::E")) % CdbEngine
 
                // checks for the "Expressions" view, GDB-only for now
-               + Watcher("watch.1", "s;s.b;s.c;s.f;s.d;s.i;s.x;s.y;s.z;s.e;s.g;s.h;s.front")
+               + Watcher("watch.1", "s;s.b;s.c;s.f;s.d;s.i;s.x;s.y;s.z;s.e;s.g;s.h;s.front;s.t1;s.t2")
                + Check("watch.1.0", "s", "", "S") % GdbEngine
                + Check("watch.1.1", "s.b", "0", "bool")  % GdbEngine
                + Check("watch.1.2", "s.c", "1", "bool") % GdbEngine
@@ -6280,7 +6301,9 @@ void tst_Dumpers::dumper_data()
                + Check("watch.1.9", "s.e", "V2 (1)", "E") % GdbEngine
                + Check("watch.1.10", "s.g", "46", "char") % GdbEngine
                + Check("watch.1.11", "s.h", "47", "char") % GdbEngine
-               + Check("watch.1.12", "s.front", "13", "unsigned int") % GdbEngine;
+               + Check("watch.1.12", "s.front", "13", "unsigned int") % GdbEngine
+               + Check("watch.1.13", "s.t1", "1", "gint") % GdbEngine
+               + Check("watch.1.14", "s.t2", "1", "guint") % GdbEngine;
 
 
     QTest::newRow("Bitfield2")
@@ -7348,11 +7371,21 @@ void tst_Dumpers::dumper_data()
                     "Base *b = &d;\n",
 
                     "&d, &b")
-
                + Check("b.@1.a", "a", "21", "int")
                + Check("b.b", "b", "42", "int");
 
 
+    // https://bugreports.qt.io/browse/QTCREATORBUG-18450
+    QTest::newRow("Bug18450")
+            << Data("using quint128 = __uint128_t;\n",
+
+                    "quint128 x = 42;\n",
+
+                    "&x")
+
+                + NoCdbEngine
+                + Check("x", "42", "quint128");
+
 
     // https://bugreports.qt.io/browse/QTCREATORBUG-17823
     QTest::newRow("Bug17823")
@@ -7615,8 +7648,7 @@ void tst_Dumpers::dumper_data()
 
                    "&d, &s, &ptrConst, &ref, &refConst, &ptrToPtr, &sharedPtr")
 
-               + GdbEngine
-               + GdbVersion(70500)
+               + NoCdbEngine
                + BoostProfile()
 
                + Check("d", "", "Derived")
@@ -8323,11 +8355,13 @@ void tst_Dumpers::dumper_data()
 
 
     QTest::newRow("Sql")
-            << Data("#include <QSqlField>\n"
+            << Data("#include <QCoreApplication>\n"
+                    "#include <QSqlField>\n"
                     "#include <QSqlDatabase>\n"
                     "#include <QSqlQuery>\n"
                     "#include <QSqlRecord>\n",
 
+                    "QCoreApplication app(argc, argv);\n"
                     "QSqlDatabase db = QSqlDatabase::addDatabase(\"QSQLITE\");\n"
                     "db.setDatabaseName(\":memory:\");\n"
                     "Q_ASSERT(db.open());\n"
diff --git a/tests/auto/extensionsystem/pluginmanager/tst_pluginmanager.cpp b/tests/auto/extensionsystem/pluginmanager/tst_pluginmanager.cpp
index e57e71c533..4a9b0210a0 100644
--- a/tests/auto/extensionsystem/pluginmanager/tst_pluginmanager.cpp
+++ b/tests/auto/extensionsystem/pluginmanager/tst_pluginmanager.cpp
@@ -47,9 +47,9 @@ class MyClass11 : public MyClass1
     Q_OBJECT
 };
 
-static QString pluginFolder(const QLatin1String &folder)
+static Utils::FilePath pluginFolder(const QLatin1String &folder)
 {
-    return QLatin1String(PLUGINMANAGER_TESTS_DIR) + QLatin1String("/") + folder;
+    return Utils::FilePath::fromUserInput(QLatin1String(PLUGINMANAGER_TESTS_DIR)) / folder;
 }
 
 void tst_PluginManager::init()
@@ -138,7 +138,7 @@ void tst_PluginManager::getObject()
 
 void tst_PluginManager::circularPlugins()
 {
-    PluginManager::setPluginPaths(QStringList() << pluginFolder(QLatin1String("circularplugins")));
+    PluginManager::setPluginPaths({pluginFolder(QLatin1String("circularplugins"))});
     PluginManager::loadPlugins();
     const QVector<PluginSpec *> plugins = PluginManager::plugins();
     QCOMPARE(plugins.count(), 3);
@@ -160,7 +160,7 @@ void tst_PluginManager::circularPlugins()
 
 void tst_PluginManager::correctPlugins1()
 {
-    PluginManager::setPluginPaths(QStringList() << pluginFolder(QLatin1String("correctplugins1")));
+    PluginManager::setPluginPaths({pluginFolder(QLatin1String("correctplugins1"))});
     PluginManager::loadPlugins();
     bool specError = false;
     bool runError = false;
diff --git a/tests/auto/extensionsystem/pluginspec/CMakeLists.txt b/tests/auto/extensionsystem/pluginspec/CMakeLists.txt
index ad91750f28..efb94786d0 100644
--- a/tests/auto/extensionsystem/pluginspec/CMakeLists.txt
+++ b/tests/auto/extensionsystem/pluginspec/CMakeLists.txt
@@ -5,7 +5,7 @@ add_qtc_test(tst_pluginspec
     PLUGIN_DIR="${CMAKE_CURRENT_BINARY_DIR}"
     PLUGINSPEC_DIR="${CMAKE_CURRENT_SOURCE_DIR}"
     DLL_INFIX="$<$<CONFIG:Debug>:d>"
-  DEPENDS ExtensionSystem
+  DEPENDS ExtensionSystem Utils
   SOURCES
     tst_pluginspec.cpp
 )
diff --git a/tests/auto/extensionsystem/pluginspec/test.qbs b/tests/auto/extensionsystem/pluginspec/test.qbs
index b8196f93e6..56748fde12 100644
--- a/tests/auto/extensionsystem/pluginspec/test.qbs
+++ b/tests/auto/extensionsystem/pluginspec/test.qbs
@@ -4,6 +4,8 @@ QtcAutotest {
     name: "ExtensionSystem pluginspec autotest"
     Depends { name: "Aggregation" }
     Depends { name: "ExtensionSystem" }
+    Depends { name: "Utils" }
+
     Group {
         name: "Sources"
         files: "tst_pluginspec.cpp"
diff --git a/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp b/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp
index f919ef4139..f52b0cf19a 100644
--- a/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp
+++ b/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp
@@ -14,6 +14,8 @@
 
 using namespace ExtensionSystem;
 
+static const Utils::FilePath PLUGIN_DIR_PATH = Utils::FilePath::fromUserInput(PLUGIN_DIR);
+
 static QJsonObject metaData(const QString &fileName)
 {
     QFile f(fileName);
@@ -84,7 +86,7 @@ void tst_PluginSpec::cleanupTestCase()
 
 void tst_PluginSpec::read()
 {
-    PluginSpecImpl spec;
+    CppPluginSpec spec;
     QCOMPARE(spec.state(), PluginSpec::Invalid);
     QVERIFY(spec.readMetaData(metaData("testspecs/spec1.json")));
     QVERIFY(!spec.hasError());
@@ -122,7 +124,7 @@ void tst_PluginSpec::read()
 
 void tst_PluginSpec::readError()
 {
-    PluginSpecImpl spec;
+    CppPluginSpec spec;
     QCOMPARE(spec.state(), PluginSpec::Invalid);
     QVERIFY(!spec.readMetaData(metaData("non-existing-file.json")));
     QCOMPARE(spec.state(), PluginSpec::Invalid);
@@ -185,7 +187,7 @@ void tst_PluginSpec::versionCompare()
 
 void tst_PluginSpec::provides()
 {
-    PluginSpecImpl spec;
+    CppPluginSpec spec;
     QVERIFY(spec.readMetaData(metaData("testspecs/simplespec.json")));
 
     QVERIFY(!spec.provides("SomeOtherPlugin", "2.2.3_9"));
@@ -211,7 +213,7 @@ void tst_PluginSpec::provides()
 
 void tst_PluginSpec::experimental()
 {
-    PluginSpecImpl spec;
+    CppPluginSpec spec;
     QVERIFY(spec.readMetaData(metaData("testspecs/simplespec_experimental.json")));
 
     QCOMPARE(spec.isExperimental(), true);
@@ -220,41 +222,38 @@ void tst_PluginSpec::experimental()
 
 void tst_PluginSpec::locationAndPath()
 {
-    Utils::expected_str<PluginSpec *> ps = PluginSpecImpl::read(
-        QLatin1String(PLUGIN_DIR) + QLatin1String("/testplugin/")
-        + libraryName(QLatin1String("test")));
+    Utils::expected_str<PluginSpec *> ps = readCppPluginSpec(
+        PLUGIN_DIR_PATH / "testplugin" / libraryName(QLatin1String("test")));
     QVERIFY(ps);
-    PluginSpecImpl *spec = static_cast<PluginSpecImpl *>(ps.value());
-    QCOMPARE(spec->location(), QString(QLatin1String(PLUGIN_DIR) + QLatin1String("/testplugin")));
-    QCOMPARE(spec->filePath(),
-             QString(QLatin1String(PLUGIN_DIR) + QLatin1String("/testplugin/")
-                     + libraryName(QLatin1String("test"))));
+    CppPluginSpec *spec = static_cast<CppPluginSpec *>(ps.value());
+    QCOMPARE(spec->location(), PLUGIN_DIR_PATH / "testplugin");
+    QCOMPARE(spec->filePath(), PLUGIN_DIR_PATH / "testplugin" / libraryName(QLatin1String("test")));
 }
 
 void tst_PluginSpec::resolveDependencies()
 {
     QVector<PluginSpec *> specs;
-    PluginSpec *spec1 = new PluginSpecImpl();
+    PluginSpec *spec1 = new CppPluginSpec();
     specs.append(spec1);
     spec1->readMetaData(metaData("testdependencies/spec1.json"));
     spec1->setState(PluginSpec::Read); // fake read state for plugin resolving
 
-    PluginSpec *spec2 = new PluginSpecImpl();
+    PluginSpec *spec2 = new CppPluginSpec();
     specs.append(spec2);
     spec2->readMetaData(metaData("testdependencies/spec2.json"));
     spec2->setState(PluginSpec::Read); // fake read state for plugin resolving
 
-    PluginSpec *spec3 = new PluginSpecImpl();
+    PluginSpec *spec3 = new CppPluginSpec();
     specs.append(spec3);
     spec3->readMetaData(metaData("testdependencies/spec3.json"));
     spec3->setState(PluginSpec::Read); // fake read state for plugin resolving
 
-    PluginSpec *spec4 = new PluginSpecImpl();
+    PluginSpec *spec4 = new CppPluginSpec();
     specs.append(spec4);
     spec4->readMetaData(metaData("testdependencies/spec4.json"));
     spec4->setState(PluginSpec::Read); // fake read state for plugin resolving
 
-    PluginSpec *spec5 = new PluginSpecImpl();
+    PluginSpec *spec5 = new CppPluginSpec();
     specs.append(spec5);
     spec5->readMetaData(metaData("testdependencies/spec5.json"));
     spec5->setState(PluginSpec::Read); // fake read state for plugin resolving
@@ -271,12 +270,11 @@ void tst_PluginSpec::resolveDependencies()
 
 void tst_PluginSpec::loadLibrary()
 {
-    Utils::expected_str<PluginSpec *> ps = PluginSpecImpl::read(
-        QLatin1String(PLUGIN_DIR) + QLatin1String("/testplugin/")
-        + libraryName(QLatin1String("test")));
+    Utils::expected_str<PluginSpec *> ps = readCppPluginSpec(
+        PLUGIN_DIR_PATH / "testplugin" / libraryName(QLatin1String("test")));
 
     QVERIFY(ps);
-    PluginSpecImpl *spec = static_cast<PluginSpecImpl *>(ps.value());
+    CppPluginSpec *spec = static_cast<CppPluginSpec *>(ps.value());
 
     QVERIFY(spec->resolveDependencies(QVector<PluginSpec *>()));
     QVERIFY2(spec->loadLibrary(), qPrintable(spec->errorString()));
@@ -291,11 +289,10 @@ void tst_PluginSpec::loadLibrary()
 
 void tst_PluginSpec::initializePlugin()
 {
-    Utils::expected_str<PluginSpec *> ps = PluginSpecImpl::read(
-        QLatin1String(PLUGIN_DIR) + QLatin1String("/testplugin/")
-        + libraryName(QLatin1String("test")));
+    Utils::expected_str<PluginSpec *> ps = readCppPluginSpec(
+        PLUGIN_DIR_PATH / "testplugin" / libraryName(QLatin1String("test")));
     QVERIFY(ps);
-    PluginSpecImpl *spec = static_cast<PluginSpecImpl *>(ps.value());
+    CppPluginSpec *spec = static_cast<CppPluginSpec *>(ps.value());
     QVERIFY(spec->resolveDependencies(QVector<PluginSpec *>()));
     QVERIFY2(spec->loadLibrary(), qPrintable(spec->errorString()));
     bool isInitialized;
@@ -316,11 +313,10 @@ void tst_PluginSpec::initializePlugin()
 
 void tst_PluginSpec::initializeExtensions()
 {
-    Utils::expected_str<PluginSpec *> ps = PluginSpecImpl::read(
-        QLatin1String(PLUGIN_DIR) + QLatin1String("/testplugin/")
-        + libraryName(QLatin1String("test")));
+    Utils::expected_str<PluginSpec *> ps = readCppPluginSpec(
+        PLUGIN_DIR_PATH / "testplugin" / libraryName(QLatin1String("test")));
     QVERIFY(ps);
-    PluginSpecImpl *spec = static_cast<PluginSpecImpl *>(ps.value());
+    CppPluginSpec *spec = static_cast<CppPluginSpec *>(ps.value());
     QVERIFY(spec->resolveDependencies(QVector<PluginSpec *>()));
     QVERIFY2(spec->loadLibrary(), qPrintable(spec->errorString()));
     bool isExtensionsInitialized;
diff --git a/tests/auto/solutions/tasking/tst_tasking.cpp b/tests/auto/solutions/tasking/tst_tasking.cpp
index ee1972c061..db293d4ebf 100644
--- a/tests/auto/solutions/tasking/tst_tasking.cpp
+++ b/tests/auto/solutions/tasking/tst_tasking.cpp
@@ -117,6 +117,7 @@ private slots:
     void storageIO();
     void storageOperators();
     void storageDestructor();
+    void storageZeroInitialization();
     void restart();
     void destructorOfTaskEmittingDone();
 };
@@ -3083,6 +3084,41 @@ void tst_Tasking::testTree_data()
                         logErrorLong, 1, DoneWith::Error, 1};
     }
 
+    {
+        // This tests ensures the task done handlers are invoked in a different order
+        // than the corresponding setup handlers.
+
+        const QList<milliseconds> tasks { 1000000ms, 0ms };
+        const LoopList iterator(tasks);
+
+        const auto onSetup = [storage, iterator](TaskObject &taskObject) {
+            taskObject = *iterator;
+            storage->m_log.append({iterator.iteration(), Handler::Setup});
+        };
+
+        const auto onDone = [storage, iterator](DoneWith result) {
+            const Handler handler = result == DoneWith::Cancel ? Handler::Canceled : Handler::Error;
+            storage->m_log.append({iterator.iteration(), handler});
+            return DoneResult::Error;
+        };
+
+        const Group root {
+            storage,
+            parallel,
+            iterator,
+            TestTask(onSetup, onDone)
+        };
+
+        const Log log {
+            {0, Handler::Setup},
+            {1, Handler::Setup},
+            {1, Handler::Error},
+            {0, Handler::Canceled}
+        };
+
+        QTest::newRow("ParallelDisorder") << TestData{storage, root, log, 2, DoneWith::Error, 1};
+    }
+
     // This test checks if storage shadowing works OK.
     QTest::newRow("StorageShadowing") << storageShadowingData();
 }
@@ -3380,7 +3416,7 @@ void tst_Tasking::storageDestructor()
     };
     QCOMPARE(CustomStorage::instanceCount(), 0);
     {
-        Storage<CustomStorage> storage;
+        const Storage<CustomStorage> storage;
         const auto setupSleepingTask = [](TaskObject &taskObject) {
             taskObject = 1000ms;
         };
@@ -3401,6 +3437,21 @@ void tst_Tasking::storageDestructor()
     QVERIFY(!doneCalled);
 }
 
+// This test ensures that the storage data is zero-initialized.
+void tst_Tasking::storageZeroInitialization()
+{
+    const Storage<int> storage;
+    std::optional<int> defaultValue;
+
+    const auto onSetup = [storage, &defaultValue] { defaultValue = *storage; };
+
+    TaskTree taskTree({ storage, onGroupSetup(onSetup) });
+    taskTree.runBlocking();
+
+    QVERIFY(defaultValue);
+    QCOMPARE(defaultValue, 0);
+}
+
 void tst_Tasking::restart()
 {
     TaskTree taskTree({TestTask([](TaskObject &taskObject) { taskObject = 1000ms; })});
diff --git a/tests/auto/utils/async/tst_async.cpp b/tests/auto/utils/async/tst_async.cpp
index e25a443cce..1c3f7a19f2 100644
--- a/tests/auto/utils/async/tst_async.cpp
+++ b/tests/auto/utils/async/tst_async.cpp
@@ -392,8 +392,7 @@ public:
 
 void tst_Async::onResultReady()
 {
-// TODO: Re-enable when QTBUG-119169 is fixed.
-#if 0
+#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
     { // lambda
         QObject context;
         QFuture<QString> f = Utils::asyncRun([](QPromise<QString> &fi) {
diff --git a/tests/cppmodelmanager/testdata_optionalindexing/lib1.cpp b/tests/cppmodelmanager/testdata_optionalindexing/lib1.cpp
new file mode 100644
index 0000000000..c6d43676a0
--- /dev/null
+++ b/tests/cppmodelmanager/testdata_optionalindexing/lib1.cpp
@@ -0,0 +1 @@
+void foo1() {}
diff --git a/tests/cppmodelmanager/testdata_optionalindexing/lib1.pro b/tests/cppmodelmanager/testdata_optionalindexing/lib1.pro
new file mode 100644
index 0000000000..93241765c5
--- /dev/null
+++ b/tests/cppmodelmanager/testdata_optionalindexing/lib1.pro
@@ -0,0 +1,3 @@
+TEMPLATE=lib
+
+SOURCES=lib1.cpp
diff --git a/tests/cppmodelmanager/testdata_optionalindexing/lib2.cpp b/tests/cppmodelmanager/testdata_optionalindexing/lib2.cpp
new file mode 100644
index 0000000000..a5b73164ec
--- /dev/null
+++ b/tests/cppmodelmanager/testdata_optionalindexing/lib2.cpp
@@ -0,0 +1 @@
+void foo2() {}
diff --git a/tests/cppmodelmanager/testdata_optionalindexing/lib2.pro b/tests/cppmodelmanager/testdata_optionalindexing/lib2.pro
new file mode 100644
index 0000000000..fc480dbf7c
--- /dev/null
+++ b/tests/cppmodelmanager/testdata_optionalindexing/lib2.pro
@@ -0,0 +1,3 @@
+TEMPLATE=lib
+
+SOURCES=lib2.cpp
diff --git a/tests/cppmodelmanager/testdata_renameheaders/header.h b/tests/cppmodelmanager/testdata_renameheaders/header.h
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/cppmodelmanager/testdata_renameheaders/header.h
diff --git a/tests/cppmodelmanager/testdata_renameheaders/main.cpp b/tests/cppmodelmanager/testdata_renameheaders/main.cpp
new file mode 100644
index 0000000000..629f20001f
--- /dev/null
+++ b/tests/cppmodelmanager/testdata_renameheaders/main.cpp
@@ -0,0 +1,5 @@
+#include "header.h"
+#include "subdir1/header1.h"
+#include <header2.h>
+
+int main() {}
diff --git a/tests/cppmodelmanager/testdata_renameheaders/subdir1/file1.cpp b/tests/cppmodelmanager/testdata_renameheaders/subdir1/file1.cpp
new file mode 100644
index 0000000000..e22ce8100c
--- /dev/null
+++ b/tests/cppmodelmanager/testdata_renameheaders/subdir1/file1.cpp
@@ -0,0 +1,3 @@
+#include "header1.h"
+#include "../header.h"
+#include "../subdir2/header2.h"
diff --git a/tests/cppmodelmanager/testdata_renameheaders/subdir1/header1.h b/tests/cppmodelmanager/testdata_renameheaders/subdir1/header1.h
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/cppmodelmanager/testdata_renameheaders/subdir1/header1.h
diff --git a/tests/cppmodelmanager/testdata_renameheaders/subdir2/file2.cpp b/tests/cppmodelmanager/testdata_renameheaders/subdir2/file2.cpp
new file mode 100644
index 0000000000..8c83d5ef03
--- /dev/null
+++ b/tests/cppmodelmanager/testdata_renameheaders/subdir2/file2.cpp
@@ -0,0 +1,3 @@
+#include "header2.h"
+#include "../header.h"
+#include "../subdir1/header1.h"
diff --git a/tests/cppmodelmanager/testdata_renameheaders/subdir2/header2.h b/tests/cppmodelmanager/testdata_renameheaders/subdir2/header2.h
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/cppmodelmanager/testdata_renameheaders/subdir2/header2.h
diff --git a/tests/cppmodelmanager/testdata_renameheaders/testdata_renameheaders.pro b/tests/cppmodelmanager/testdata_renameheaders/testdata_renameheaders.pro
new file mode 100644
index 0000000000..f5f09586ff
--- /dev/null
+++ b/tests/cppmodelmanager/testdata_renameheaders/testdata_renameheaders.pro
@@ -0,0 +1,7 @@
+TEMPLATE = app
+TARGET = testdata_renameheaders
+INCLUDEPATH += subdir2
+CONFIG += no_include_pwd
+
+HEADERS = header.h subdir1/header1.h subdir2/header2.h
+SOURCES = main.cpp subdir1/file1.cpp subdir2/file2.cpp
diff --git a/tests/manual/pluginview/plugindialog.cpp b/tests/manual/pluginview/plugindialog.cpp
index d1ed1d906d..24232540d9 100644
--- a/tests/manual/pluginview/plugindialog.cpp
+++ b/tests/manual/pluginview/plugindialog.cpp
@@ -114,7 +114,7 @@ int main(int argc, char *argv[])
     QObject::connect(&app, &QCoreApplication::aboutToQuit,
                      &manager, &ExtensionSystem::PluginManager::shutdown);
     PluginDialog dialog;
-    manager.setPluginPaths(QStringList() << app.applicationDirPath() + "/plugins");
+    manager.setPluginPaths({FilePath::fromUserInput(app.applicationDirPath()) / "plugins"});
     manager.loadPlugins();
     dialog.show();
     app.exec();
diff --git a/tests/manual/tasking/dataexchange/recipe.cpp b/tests/manual/tasking/dataexchange/recipe.cpp
index 445f246bba..cb472eafd4 100644
--- a/tests/manual/tasking/dataexchange/recipe.cpp
+++ b/tests/manual/tasking/dataexchange/recipe.cpp
@@ -76,7 +76,7 @@ Group recipe(const Storage<ExternalData> &externalStorage)
         ConcurrentCallTask<QImage>(onReadSetup, onReadDone),
         Group {
             repeater,
-            parallelLimit(QThread::idealThreadCount() - 1),
+            parallelIdealThreadCountLimit,
             ConcurrentCallTask<QImage>(onScaleSetup, onScaleDone)
         }
     };
diff --git a/tests/system/objects.map b/tests/system/objects.map
index 66681c6b05..6ad38f5831 100644
--- a/tests/system/objects.map
+++ b/tests/system/objects.map
@@ -12,7 +12,7 @@
 :*Qt Creator.findEdit_Utils::FilterLineEdit	{name='findEdit' type='Utils::FancyLineEdit' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :*Qt Creator_Core::Internal::FancyToolButton	{name='KitSelector.Button' type='Core::Internal::FancyToolButton' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :*Qt Creator_Utils::FilterLineEdit	{type='Utils::FancyLineEdit' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
-:*Qt Creator_Utils::IconButton	{occurrence='5' type='Utils::FancyIconButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
+:*Qt Creator_Utils::IconButton	{toolTip='Clear text' type='Utils::FancyIconButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :About Qt Creator_Core::Internal::VersionDialog	{type='Core::Internal::VersionDialog' unnamed='1' visible='1' windowTitle='About Qt Creator'}
 :Activate completion:_QComboBox	{buddy=':Behavior.Activate completion:_QLabel' type='QComboBox' unnamed='1' visible='1'}
 :Add Bookmark.ExpandBookmarksList_QToolButton	{text='+' type='QToolButton' unnamed='1' visible='1' window=':Add Bookmark_BookmarkDialog'}
@@ -92,7 +92,6 @@
 :JsonWizard_ProjectExplorer::JsonFieldPage	{type='ProjectExplorer::JsonFieldPage' unnamed='1' visible='1' window=':New_ProjectExplorer::JsonWizard'}
 :Kits_QtVersion_QComboBox	{container=':qt_tabwidget_stackedwidget_QWidget' leftWidget=':QtVersionLabel_KitPage' type='QComboBox' unnamed='1' visible='1'}
 :Locals and Expressions_Debugger::Internal::WatchTreeView	{container=':Debugger.Docks.LocalsAndWatchersDockWidget.Inspector_QFrame' name='WatchWindow' type='Debugger::Internal::WatchTreeView' visible='1'}
-:New Text File.Add to project:_QLabel	{name='projectLabel' text='Add to project:' type='QLabel' visible='1' window=':New_ProjectExplorer::JsonWizard'}
 :New Text File.nameLineEdit_Utils::FileNameValidatingLineEdit	{name='nameLineEdit' type='Utils::FileNameValidatingLineEdit' visible='1' window=':New_ProjectExplorer::JsonWizard'}
 :New.comboBox_QComboBox	{type='QComboBox' unnamed='1' visible='1' window=':New_Core::Internal::NewDialog'}
 :New.templateCategoryView_QTreeView	{name='templateCategoryView' type='QTreeView' visible='1' window=':New_Core::Internal::NewDialog'}
@@ -141,11 +140,11 @@
 :Qt Creator.WelcomeScreenStackedWidget	{name='WelcomeScreenStackedWidget' type='QStackedWidget' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :Qt Creator.replaceEdit_Utils::FilterLineEdit	{name='replaceEdit' type='Utils::FancyLineEdit' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :Qt Creator.splitter_QSplitter	{name='splitter' type='QSplitter' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
-:Qt Creator_AppOutput_Core::Internal::OutputPaneToggleButton	{occurrence='3' type='Core::Internal::OutputPaneToggleButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
+:Qt Creator_AppOutput_Core::Internal::OutputPaneToggleButton	{toolTip?='*Application Output*' type='Core::Internal::OutputPaneToggleButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :Qt Creator_BinEditor::BinEditorWidget	{type='BinEditor::Internal::BinEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :Qt Creator_Bookmarks_TreeView	{type='TreeView' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :Qt Creator_CloseButton	{type='CloseButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
-:Qt Creator_CompileOutput_Core::Internal::OutputPaneToggleButton	{occurrence='4' type='Core::Internal::OutputPaneToggleButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
+:Qt Creator_CompileOutput_Core::Internal::OutputPaneToggleButton	{toolTip?='*Compile Output*' type='Core::Internal::OutputPaneToggleButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :Qt Creator_Core::Internal::CommandComboBox	{type='Core::Internal::CommandComboBox' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :Qt Creator_Core::Internal::MainWindow	{type='Utils::AppMainWindow' visible='1' windowTitle?='*Qt Creator'}
 :Qt Creator_Core::Internal::NavComboBox	{type='Core::Internal::NavComboBox' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
@@ -153,17 +152,17 @@
 :Qt Creator_Core::OutputWindow	{type='Core::OutputWindow' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :Qt Creator_CppEditor::Internal::CPPEditorWidget	{type='CppEditor::CppEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :Qt Creator_DiffEditor::Internal::DescriptionEditorWidget	{type='DiffEditor::Internal::DescriptionEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
-:Qt Creator_DiffEditor::SideDiffEditorWidget	{type='DiffEditor::Internal::SideDiffEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
-:Qt Creator_DiffEditor::SideDiffEditorWidget2	{occurrence='2' type='DiffEditor::Internal::SideDiffEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
+:Qt Creator_DiffEditor::SideDiffEditorWidgetChanged	{type='DiffEditor::Internal::SideDiffEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow' x~='[1-9][0-9]*'}
+:Qt Creator_DiffEditor::SideDiffEditorWidgetOriginal	{type='DiffEditor::Internal::SideDiffEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow' x='0'}
 :Qt Creator_FilenameQComboBox	{leftWidget=':Qt Creator.DragDoc_QToolButton' type='QComboBox' unnamed='1' visible='1'}
 :Qt Creator_Find::Internal::SearchResultTreeView	{type='Core::Internal::SearchResultTreeView' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :Qt Creator_Git::Internal::GitEditor	{type='Git::Internal::GitEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :Qt Creator_HelpSelector_QComboBox	{occurrence='3' type='QComboBox' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
-:Qt Creator_Issues_Core::Internal::OutputPaneToggleButton	{occurrence='1' type='Core::Internal::OutputPaneToggleButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
+:Qt Creator_Issues_Core::Internal::OutputPaneToggleButton	{toolTip?='*Issues*' type='Core::Internal::OutputPaneToggleButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :Qt Creator_QHelpContentWidget	{name='helpContentWidget' type='QTreeView' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :Qt Creator_QmlJSEditor::Internal::QmlJSOutlineTreeView	{type='QmlJSEditor::Internal::QmlJSOutlineTreeView' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :Qt Creator_QmlJSEditor::QmlJSTextEditorWidget	{type='QmlJSEditor::QmlJSEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
-:Qt Creator_SearchResult_Core::Internal::OutputPaneToggleButton	{occurrence='2' type='Core::Internal::OutputPaneToggleButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
+:Qt Creator_SearchResult_Core::Internal::OutputPaneToggleButton	{toolTip?='*Search Results*' type='Core::Internal::OutputPaneToggleButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :Qt Creator_TextEditor::TextEditorWidget	{type='TextEditor::TextEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :Qt Creator_Utils::BuildDirectoryLineEdit	{name='LineEdit' type='Utils::FancyLineEdit' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :Qt Creator_Utils::NavigationTreeView	{name='projectTreeView' type='QTreeView' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
@@ -205,8 +204,7 @@
 :headerFileLineEdit_Utils::FileNameValidatingLineEdit	{name='HdrFileName' type='Utils::FancyLineEdit' visible='1' window=':New_ProjectExplorer::JsonWizard'}
 :popupFrame_Proposal_QListView	{container=':popupFrame_TextEditor::GenericProposalWidget' type='QListView' unnamed='1' visible='1'}
 :popupFrame_TextEditor::GenericProposalWidget	{name='m_popupFrame' type='TextEditor::GenericProposalWidget' visible='1'}
-:projectComboBox_QComboBox	{buddy=':New Text File.Add to project:_QLabel' name='projectComboBox' type='QComboBox' visible='1'}
-:projectComboBox_Utils::TreeViewComboBox	{buddy=':New Text File.Add to project:_QLabel' name='projectComboBox' type='QComboBox' visible='1'}
+:projectComboBox_QComboBox	{name='projectComboBox' type='QComboBox' visible='1'}
 :qdesigner_internal::WidgetBoxCategoryListView	{container=':Widget Box_qdesigner_internal::WidgetBoxTreeWidget' occurrence='3' type='qdesigner_internal::WidgetBoxCategoryListView' unnamed='1' visible='1'}
 :qt_tabwidget_stackedwidget.QtSupport__Internal__QtVersionManager_QtSupport::Internal::QtOptionsPageWidget	{container=':Options.qt_tabwidget_stackedwidget_QStackedWidget' type='QScrollArea' unnamed='1' visible='1'}
 :qt_tabwidget_stackedwidget_QScrollArea	{container=':Options.qt_tabwidget_stackedwidget_QStackedWidget' type='QScrollArea' unnamed='1' visible='1'}
diff --git a/tests/system/settings/windows/QtProject/qtcreator/debuggers.xml b/tests/system/settings/windows/QtProject/qtcreator/debuggers.xml
index b8d5b705e1..64016440ae 100644
--- a/tests/system/settings/windows/QtProject/qtcreator/debuggers.xml
+++ b/tests/system/settings/windows/QtProject/qtcreator/debuggers.xml
@@ -6,23 +6,6 @@
   <variable>DebuggerItem.0</variable>
   <valuemap type="QVariantMap">
    <valuelist type="QVariantList" key="Abis">
-    <value type="QString">x86-windows-msvc2015-pe-SQUISH_DEBUGGER_BITNESSbit</value>
-   </valuelist>
-   <value type="bool" key="AutoDetected">true</value>
-   <value type="QString" key="AutoDetectionSource"></value>
-   <value type="QString" key="Binary">C:/Program Files (x86)/Windows Kits/10/Debuggers/SQUISH_DEBUGGER_ARCHITECTURE/cdb.exe</value>
-   <value type="QString" key="DisplayName">Auto-detected CDB at C:\Program Files (x86)\Windows Kits\10\Debuggers\SQUISH_DEBUGGER_ARCHITECTURE\cdb.exe</value>
-   <value type="int" key="EngineType">4</value>
-   <value type="QString" key="Id">{1b25f20a-d584-4fb7-85b3-74dd15b82f6f}</value>
-   <value type="QDateTime" key="LastModified"></value>
-   <value type="QString" key="Version"></value>
-   <value type="QString" key="WorkingDirectory"></value>
-  </valuemap>
- </data>
- <data>
-  <variable>DebuggerItem.1</variable>
-  <valuemap type="QVariantMap">
-   <valuelist type="QVariantList" key="Abis">
     <value type="QString">x86-windows-msys-pe-unknown</value>
    </valuelist>
    <value type="bool" key="AutoDetected">false</value>
@@ -36,7 +19,7 @@
  </data>
  <data>
   <variable>DebuggerItem.Count</variable>
-  <value type="int">2</value>
+  <value type="int">1</value>
  </data>
  <data>
   <variable>Version</variable>
diff --git a/tests/system/settings/windows/QtProject/qtcreator/profiles.xml b/tests/system/settings/windows/QtProject/qtcreator/profiles.xml
index 1a46caa099..ecb22a0459 100644
--- a/tests/system/settings/windows/QtProject/qtcreator/profiles.xml
+++ b/tests/system/settings/windows/QtProject/qtcreator/profiles.xml
@@ -37,7 +37,6 @@
    <value type="QString" key="PE.Profile.AutoDetectionSource"></value>
    <valuemap type="QVariantMap" key="PE.Profile.Data">
     <value type="QString" key="Android.GdbServer.Information"></value>
-    <value type="QString" key="Debugger.Information">{1b25f20a-d584-4fb7-85b3-74dd15b82f6f}</value>
     <value type="QString" key="PE.Profile.Device">Desktop Device</value>
     <value type="QByteArray" key="PE.Profile.DeviceType">Desktop</value>
     <valuelist type="QVariantList" key="PE.Profile.Environment"/>
@@ -65,7 +64,6 @@
    <valuemap type="QVariantMap" key="PE.Profile.Data">
     <value type="QString"></value>
     <value type="QString" key="Android.GdbServer.Information"></value>
-    <value type="QString" key="Debugger.Information">{1b25f20a-d584-4fb7-85b3-74dd15b82f6f}</value>
     <value type="QString" key="PE.Profile.Device">Desktop Device</value>
     <value type="QByteArray" key="PE.Profile.DeviceType">Desktop</value>
     <valuelist type="QVariantList" key="PE.Profile.Environment">
@@ -94,7 +92,6 @@
    <value type="bool" key="PE.Profile.AutoDetected">false</value>
    <value type="QString" key="PE.Profile.AutoDetectionSource"></value>
    <valuemap type="QVariantMap" key="PE.Profile.Data">
-    <value type="QString" key="Debugger.Information">{1b25f20a-d584-4fb7-85b3-74dd15b82f6f}</value>
     <value type="QString" key="PE.Profile.Device">Desktop Device</value>
     <value type="QString" key="PE.Profile.DeviceType">Desktop</value>
     <valuemap type="QVariantMap" key="PE.Profile.ToolChainsV3">
diff --git a/tests/system/shared/classes.py b/tests/system/shared/classes.py
index dcc702295b..4611a0cefe 100644
--- a/tests/system/shared/classes.py
+++ b/tests/system/shared/classes.py
@@ -1,10 +1,7 @@
 # Copyright (C) 2016 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-try:
-    import __builtin__                  # Python 2
-except ImportError:
-    import builtins as __builtin__      # Python 3
+import builtins
 
 # for easier re-usage (because Python hasn't an enum type)
 class Targets:
@@ -128,7 +125,7 @@ class QtPath:
 
     @staticmethod
     def toVersionTuple(versionString):
-        return tuple(map(__builtin__.int, versionString.split(".")))
+        return tuple(map(builtins.int, versionString.split(".")))
 
     @staticmethod
     def getQtVersion(target):
diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py
index 00641e465b..cdf5290d89 100644
--- a/tests/system/shared/project.py
+++ b/tests/system/shared/project.py
@@ -524,7 +524,7 @@ def __getSupportedPlatforms__(text, templateName, getAsStrings=False, ignoreVali
         version = res.group("version")
     else:
         version = None
-    if templateName == "Qt Quick Application":
+    if templateName in ("Qt Quick 2 Extension Plugin", "Qt Quick Application"):
         result = set([Targets.DESKTOP_6_2_4])
     elif 'Supported Platforms' in text:
         supports = text[text.find('Supported Platforms'):].split(":")[1].strip().split("\n")
@@ -603,7 +603,7 @@ def __writeProjectTreeFile__(projectTree, filename):
 
 def __getTestData__(record):
     return [testData.field(record, "text"),
-            __builtin__.int(testData.field(record, "nestinglevel"))]
+            builtins.int(testData.field(record, "nestinglevel"))]
 
 def compareProjectTree(rootObject, dataset):
     root = waitForObject(rootObject)
@@ -662,7 +662,7 @@ def addCPlusPlusFile(name, template, projectName, forceOverwrite=False, addToVCS
             test.compare(str(waitForObject("{name='HdrFileName' type='QLineEdit' visible='1'}").text),
                          expectedHeaderName)
     clickButton(waitForObject(":Next_QPushButton"))
-    projectComboBox = waitForObjectExists(":projectComboBox_Utils::TreeViewComboBox")
+    projectComboBox = waitForObjectExists(":projectComboBox_QComboBox")
     test.compare(projectComboBox.enabled, projectName != None,
                  "Project combo box must be enabled when a project is open")
     projectNameToDisplay = "<None>"
diff --git a/tests/system/shared/qtcreator.py b/tests/system/shared/qtcreator.py
index e97c0b025f..12d6fc364b 100644
--- a/tests/system/shared/qtcreator.py
+++ b/tests/system/shared/qtcreator.py
@@ -12,11 +12,7 @@ import subprocess;
 import sys
 import errno;
 from datetime import datetime,timedelta;
-if sys.version_info.major > 2:
-    import builtins as __builtin__
-else:
-    import __builtin__
-
+import builtins
 
 srcPath = ''
 SettingsPath = []
@@ -205,31 +201,6 @@ def substituteDefaultCompiler(settingsDir):
         __substitute__(qtversion, "SQUISH_DEFAULT_COMPILER", compiler)
         test.log("Injected default compiler '%s' to qtversion.xml..." % compiler)
 
-def substituteCdb(settingsDir):
-    def canUse64bitCdb():
-        try:
-            serverIni = readFile(os.path.join(os.getenv("APPDATA"), "froglogic",
-                                              "Squish", "ver1", "server.ini"))
-            autLine = next(iter(filter(lambda line: "AUT/qtcreator" in line,
-                                       serverIni.splitlines())))
-            autPath = autLine.split("\"")[1]
-            return os.path.exists(os.path.join(autPath, "..", "lib", "qtcreatorcdbext64"))
-        except:
-            test.fatal("Something went wrong when determining debugger bitness",
-                       "Did Squish's file structure change? Guessing 32-bit cdb can be used...")
-            return True
-
-    if canUse64bitCdb():
-        architecture = "x64"
-        bitness = "64"
-    else:
-        architecture = "x86"
-        bitness = "32"
-    debuggers = os.path.join(settingsDir, "QtProject", 'qtcreator', 'debuggers.xml')
-    __substitute__(debuggers, "SQUISH_DEBUGGER_ARCHITECTURE", architecture)
-    __substitute__(debuggers, "SQUISH_DEBUGGER_BITNESS", bitness)
-    test.log("Injected architecture '%s' and bitness '%s' in cdb path..." % (architecture, bitness))
-
 
 def substituteMsvcPaths(settingsDir, version, targetBitness=64):
     if not version in ['2017', '2019']:
@@ -302,7 +273,6 @@ def copySettingsToTmpDir(destination=None, omitFiles=[]):
         substituteTildeWithinQtVersion(tmpSettingsDir)
         substituteDefaultCompiler(tmpSettingsDir)
     elif platform.system() in ('Windows', 'Microsoft'):
-        substituteCdb(tmpSettingsDir)
         substituteMsvcPaths(tmpSettingsDir, '2017', 64)
         substituteMsvcPaths(tmpSettingsDir, '2017', 32)
         substituteMsvcPaths(tmpSettingsDir, '2019', 64)
diff --git a/tests/system/shared/utils.py b/tests/system/shared/utils.py
index 2e4b5a1dae..cb2f6875f3 100644
--- a/tests/system/shared/utils.py
+++ b/tests/system/shared/utils.py
@@ -71,16 +71,24 @@ def verifyEnabled(objectSpec, expectedState = True):
 # param itemName is the item to be selected in the combo box
 # returns True if selection was changed or False if the wanted value was already selected
 def selectFromCombo(objectSpec, itemName):
-    object = verifyEnabled(objectSpec)
-    if itemName == str(object.currentText):
+    comboObject = verifyEnabled(objectSpec)
+    if itemName == str(comboObject.currentText):
         return False
     else:
-        mouseClick(object)
+        mouseClick(comboObject)
         snooze(1)
         # params required here
-        mouseClick(waitForObjectItem(object, itemName.replace(".", "\\.")), 5, 5, 0, Qt.LeftButton)
-        test.verify(waitFor("str(object.currentText)==itemName", 5000),
+        mouseClick(waitForObjectItem(comboObject, itemName.replace(".", "\\.")))
+        test.verify(waitFor("str(comboObject.currentText)==itemName", 5000),
                     "Switched combo item to '%s'" % itemName)
+        def __collapsed__():
+            try:
+                waitForObject("{container='%s' type='QModelIndex'}" % objectSpec, 100)
+                return False
+            except:
+                return True
+
+        waitFor(__collapsed__, 1000)
         return True
 
 def selectFromLocator(filter, itemName = None):
@@ -110,7 +118,7 @@ def textUnderCursor(window, fromPos, toPos):
     cursor.movePosition(toPos, QTextCursor.KeepAnchor)
     returnValue = cursor.selectedText()
     cursor.setPosition(oldposition)
-    return returnValue
+    return str(returnValue)
 
 def which(program):
     # Don't use spawn.find_executable because it can't find .bat or
@@ -588,15 +596,12 @@ def getHelpTitle():
 
 
 def isString(sth):
-    if sys.version_info.major > 2:
-        return isinstance(sth, str)
-    else:
-        return isinstance(sth, (str, unicode))
+    return isinstance(sth, str)
+
 
 # helper function to ensure we get str, converts bytes if necessary
 def stringify(obj):
-    stringTypes = (str, unicode) if sys.version_info.major == 2 else (str)
-    if isinstance(obj, stringTypes):
+    if isString(obj):
         return obj
     if isinstance(obj, bytes):
         if not platform.system() in ('Microsoft', 'Windows'):
diff --git a/tests/system/suite_HELP/tst_HELP02/test.py b/tests/system/suite_HELP/tst_HELP02/test.py
index 9c5104087e..b6246e4f05 100644
--- a/tests/system/suite_HELP/tst_HELP02/test.py
+++ b/tests/system/suite_HELP/tst_HELP02/test.py
@@ -4,11 +4,11 @@
 source("../../shared/qtcreator.py")
 
 if platform.system() == 'Darwin':
-    keysToType = '<Command+Alt+a>'
-    expectedKeys = 'Cmd+Opt+A'
+    keysToType = '<Command+Alt+v>'
+    expectedKeys = 'Cmd+Opt+V'
 else:
-    keysToType = '<Ctrl+Alt+a>'
-    expectedKeys = 'Ctrl+Alt+A'
+    keysToType = '<Ctrl+Alt+v>'
+    expectedKeys = 'Ctrl+Alt+V'
 
 
 # test Qt Creator version information from file and dialog
@@ -53,10 +53,6 @@ def checkQtCreatorHelpVersion(expectedVersion):
         test.fail("Missing Qt Creator Manual.")
 
 
-def _shortcutMatches_(shortcutEdit, expectedText):
-    return str(findObject(shortcutEdit).text) == expectedText
-
-
 def setKeyboardShortcutForAboutQtC():
     invokeMenuItem("Edit", "Preferences...")
     mouseClick(waitForObjectItem(":Options_QListView", "Environment"))
@@ -78,16 +74,16 @@ def setKeyboardShortcutForAboutQtC():
                 "placeholderText='Enter key sequence as text'}" % shortcutGB)
     clickButton(record)
     nativeType(keysToType)
-    waitFor("_shortcutMatches_(shortcut, expectedKeys)", 5000)
+    waitFor(lambda: str(findObject(shortcut).text) == expectedKeys, 5000)
     clickButton(record)
 
-    gotExpectedShortcut = _shortcutMatches_(shortcut, expectedKeys)
-    if not gotExpectedShortcut and platform.system() == 'Darwin':
+    foundShortcut = str(findObject(shortcut).text)
+    if foundShortcut != expectedKeys and platform.system() == 'Darwin':
         test.warning("Squish Issue: shortcut was set to %s - entering it manually now"
                      % waitForObject(shortcut).text)
         replaceEditorContent(shortcut, expectedKeys)
     else:
-        test.verify(gotExpectedShortcut, "Expected key sequence is displayed.")
+        test.compare(foundShortcut, expectedKeys, "Expected key sequence is displayed?")
     clickButton(waitForObject(":Options.OK_QPushButton"))
 
 def main():
diff --git a/tests/system/suite_HELP/tst_HELP06/test.py b/tests/system/suite_HELP/tst_HELP06/test.py
index 623498fc40..0cdcbb653a 100644
--- a/tests/system/suite_HELP/tst_HELP06/test.py
+++ b/tests/system/suite_HELP/tst_HELP06/test.py
@@ -34,8 +34,10 @@ def main():
     doubleClick(manualQMIObj, 5, 5, 0, Qt.LeftButton)
     if not waitFor("not manualQMIObj.collapsed", 2000):
         test.warning("It takes more than two seconds to expand the help content tree.")
-    gettingStartedQModelIndex = getQModelIndexStr("text='Getting Started'", manualQModelIndex)
-    doubleClick(gettingStartedQModelIndex, 5, 5, 0, Qt.LeftButton)
+    devQModelIndex = getQModelIndexStr("text='Developing with Qt Creator'", manualQModelIndex)
+    doubleClick(devQModelIndex)
+    gettingStartedQModelIndex = getQModelIndexStr("text='Getting Started'", devQModelIndex)
+    doubleClick(gettingStartedQModelIndex)
     pageTitle = "Configuring Qt Creator"
     mouseClick(waitForObject(getQModelIndexStr("text='%s'" % pageTitle,
                                                gettingStartedQModelIndex)))
diff --git a/tests/system/suite_debugger/tst_debug_empty_main/test.py b/tests/system/suite_debugger/tst_debug_empty_main/test.py
index 019b55e5f0..d62f76cdeb 100644
--- a/tests/system/suite_debugger/tst_debug_empty_main/test.py
+++ b/tests/system/suite_debugger/tst_debug_empty_main/test.py
@@ -14,8 +14,7 @@ def addFileToProject(projectPath, category, fileTemplate, fileName):
                         projectPath, "Verifying whether path is correct."):
         replaceEditorContent(pathLineEdit, projectPath)
     clickButton(waitForObject(":Next_QPushButton"))
-    projCombo = findObject("{buddy={name='projectLabel' text='Add to project:' type='QLabel' "
-                           "visible='1'} name='projectComboBox' type='QComboBox' visible='1'}")
+    projCombo = waitForObjectExists(":projectComboBox_QComboBox", 1000)
     proFileName = os.path.basename(projectPath) + ".pro"
     test.verify(not selectFromCombo(projCombo, proFileName), "Verifying project is selected.")
     __createProjectHandleLastPage__()
diff --git a/tests/system/suite_editors/tst_revert_changes/test.py b/tests/system/suite_editors/tst_revert_changes/test.py
index 6ad06b1124..7774faed4b 100644
--- a/tests/system/suite_editors/tst_revert_changes/test.py
+++ b/tests/system/suite_editors/tst_revert_changes/test.py
@@ -33,7 +33,7 @@ def main():
         __modifyFile__(fileName, modification)
     test.log("Reverting all files...")
     fileModifications = dict(zip(fileModifications.keys(),
-                                 (__builtin__.bool(v) for v in fileModifications.values())))
+                                 (builtins.bool(v) for v in fileModifications.values())))
     revertChanges(fileModifications)
     invokeMenuItem("File", "Exit")
 
diff --git a/tests/system/suite_general/tst_cmake_speedcrunch/test.py b/tests/system/suite_general/tst_cmake_speedcrunch/test.py
index 4f75d43eb9..4761daaed1 100644
--- a/tests/system/suite_general/tst_cmake_speedcrunch/test.py
+++ b/tests/system/suite_general/tst_cmake_speedcrunch/test.py
@@ -12,8 +12,8 @@ def cmakeSupported():
         versionLine = next(iter(versionLines))
         test.log("Using " + versionLine)
         matcher = re.match("cmake version (\d+)\.(\d+)\.\d+", versionLine)
-        major = __builtin__.int(matcher.group(1))
-        minor = __builtin__.int(matcher.group(2))
+        major = builtins.int(matcher.group(1))
+        minor = builtins.int(matcher.group(2))
     except:
         return False
 
diff --git a/tests/system/suite_general/tst_create_proj_wizard/test.py b/tests/system/suite_general/tst_create_proj_wizard/test.py
index 4da9d39d73..176b606b8b 100644
--- a/tests/system/suite_general/tst_create_proj_wizard/test.py
+++ b/tests/system/suite_general/tst_create_proj_wizard/test.py
@@ -41,9 +41,6 @@ def main():
         # needed because categoriesView and templatesView using same model
         for template in dumpItems(templatesView.model(), templatesView.rootIndex()):
             template = template.replace(".", "\\.")
-            # FIXME this needs Qt6.2+
-            if template == "Qt Quick 2 Extension Plugin":
-                continue
             # skip non-configurable
             if template not in ["Qt Quick UI Prototype", "Qt Creator Plugin"]:
                 availableProjectTypes.append({category:template})
@@ -116,9 +113,9 @@ def handleBuildSystemVerifyKits(category, template, kits, displayedPlatforms,
         return
 
     fixedBuildSystems = list(availableBuildSystems)
-    if template == 'Qt Quick Application':
-        fixedBuildSystems.remove('qmake')
-        test.log("Skipped qmake (not supported).")
+    if template == 'Qt Quick 2 Extension Plugin':
+        fixedBuildSystems.remove('Qbs')
+        test.log("Skipped Qbs (not supported).")
 
     for counter, buildSystem in enumerate(fixedBuildSystems):
         test.log("Using build system '%s'" % buildSystem)
@@ -126,7 +123,7 @@ def handleBuildSystemVerifyKits(category, template, kits, displayedPlatforms,
         clickButton(waitForObject(":Next_QPushButton"))
         if specialHandlingFunc:
             specialHandlingFunc(displayedPlatforms, *args)
-        if not ('Plain C' in template or template == 'Qt Quick Application'):
+        if not ('Plain C' in template):
             __createProjectHandleTranslationSelection__()
         verifyKitCheckboxes(kits, displayedPlatforms)
         safeClickButton("Cancel")
diff --git a/tests/system/suite_general/tst_default_settings/test.py b/tests/system/suite_general/tst_default_settings/test.py
index 0b2f1dea62..194a8ac4cc 100644
--- a/tests/system/suite_general/tst_default_settings/test.py
+++ b/tests/system/suite_general/tst_default_settings/test.py
@@ -41,6 +41,8 @@ def __checkKits__():
             internalClangExe += ".exe"
         internalClangExe = os.path.realpath(internalClangExe) # clean symlinks
         if os.path.exists(internalClangExe):
+            if platform.system() in ("Microsoft", "Windows"):
+                expectedCompilers.append({'^Default LLVM \d{2} bit based on MSVC\d{4}$' : ''})
             expectedCompilers.append(internalClangExe)
     foundCompilers = []
     foundCompilerNames = []
@@ -269,6 +271,13 @@ def __getExpectedDebuggers__():
     result = []
     if platform.system() in ('Microsoft', 'Windows'):
         result.extend(__getCDB__())
+        try:
+            qcBinPath = currentApplicationContext().commandLine.split('qtcreator.exe', 1)[0]
+            lldb = os.path.join(qcBinPath, 'clang', 'bin', 'lldb.exe')
+            if os.path.exists(lldb):
+                result.append(lldb)
+        except:
+            test.warning('Failed to handled internally provided lldb.')
         exeSuffix = ".exe"
     for debugger in ["gdb", "lldb"]:
         result.extend(findAllFilesInPATH(debugger + exeSuffix))
@@ -330,6 +339,11 @@ def __compareCompilers__(foundCompilers, expectedCompilers):
                         or currentFound.values() == currentExp.values()):
                         foundExp = True
                         break
+                if isWin and key.startswith('^Default LLVM'):
+                    if re.match(key, next(iter(currentFound.keys())), flags):
+                        # TODO we may want to check that it's configured with latest MSVC?
+                        foundExp = True
+                        break
             equal = foundExp
         else:
             if isWin:
diff --git a/tests/system/suite_general/tst_openqt_creator/test.py b/tests/system/suite_general/tst_openqt_creator/test.py
index c0cbc815a2..3c55342fc2 100644
--- a/tests/system/suite_general/tst_openqt_creator/test.py
+++ b/tests/system/suite_general/tst_openqt_creator/test.py
@@ -21,13 +21,13 @@ def main():
         openQmakeProject(os.path.join(pathSpeedcrunch, "src", "speedcrunch.pro"),
                          [Targets.DESKTOP_5_14_1_DEFAULT])
         # Wait for parsing to complete
-        waitFor("runButton.enabled", 30000)
+        waitFor(lambda: runButton.enabled, 30000)
         # Starting before opening, because this is where Creator froze (QTCREATORBUG-10733)
         startopening = datetime.utcnow()
         openQmakeProject(pathCreator, [Targets.DESKTOP_5_14_1_DEFAULT])
         # Wait for parsing to complete
         startreading = datetime.utcnow()
-        waitFor("runButton.enabled", 300000)
+        waitFor(lambda: runButton.enabled, 300000)
         secondsOpening = (datetime.utcnow() - startopening).seconds
         secondsReading = (datetime.utcnow() - startreading).seconds
         timeoutOpen = 45
diff --git a/tests/system/suite_general/tst_rename_file/test.py b/tests/system/suite_general/tst_rename_file/test.py
index 693303553a..d2abe87ea2 100644
--- a/tests/system/suite_general/tst_rename_file/test.py
+++ b/tests/system/suite_general/tst_rename_file/test.py
@@ -79,7 +79,12 @@ def renameFile(projectDir, proFile, branch, oldname, newname):
         menu = ":Qt Creator.Project.Menu.Folder_QMenu"
     else:
         menu = ":Qt Creator.Project.Menu.File_QMenu"
-    activateItem(waitForObjectItem(menu, "Rename..."))
+    try:
+        activateItem(waitForObjectItem(menu, "Rename...", 5000))
+    except:
+        # Try getting an enabled item by reopening the menu
+        openItemContextMenu(treeview, oldItemText, 5, 5, 0)
+        activateItem(waitForObjectItem(menu, "Rename...", 5000))
     replaceEdit = waitForObject(":Qt Creator_Utils::NavigationTreeView::QExpandingLineEdit")
     test.compare(replaceEdit.selectedText, oldname.rsplit(".", 1)[0],
                  "Only the filename without the extension is selected?")
diff --git a/tests/system/suite_qtquick/tst_qml_outline/test.py b/tests/system/suite_qtquick/tst_qml_outline/test.py
index fb3662b805..5eb9ab3e33 100644
--- a/tests/system/suite_qtquick/tst_qml_outline/test.py
+++ b/tests/system/suite_qtquick/tst_qml_outline/test.py
@@ -104,7 +104,7 @@ def __writeOutlineFile__(outlinePseudoTree, filename):
 
 def retrieveData(record):
     return (testData.field(record, "element"),
-            __builtin__.int(testData.field(record, "nestinglevel")),
+            builtins.int(testData.field(record, "nestinglevel")),
             testData.field(record, "value"))
 
 def verifyOutline(outlinePseudoTree, datasetFileName):
diff --git a/tests/system/suite_tools/tst_codepasting/test.py b/tests/system/suite_tools/tst_codepasting/test.py
index ec0d9ee226..2720b336df 100644
--- a/tests/system/suite_tools/tst_codepasting/test.py
+++ b/tests/system/suite_tools/tst_codepasting/test.py
@@ -243,7 +243,7 @@ def main():
     # QString QTextCursor::selectedText () const:
     # "Note: If the selection obtained from an editor spans a line break, the text will contain a
     # Unicode U+2029 paragraph separator character instead of a newline \n character."
-    newParagraph = chr(0x2029) if sys.version_info.major > 2 else unichr(0x2029)
+    newParagraph = chr(0x2029)
     selectedText = str(editor.textCursor().selectedText()).replace(newParagraph, "\n")
     invokeMenuItem("Tools", "Code Pasting", "Paste Snippet...")
     test.compare(waitForObject(":stackedWidget.plainTextEdit_QPlainTextEdit").plainText,
diff --git a/tests/system/suite_tools/tst_designer_autocomplete/test.py b/tests/system/suite_tools/tst_designer_autocomplete/test.py
index c72d86a4e2..b378407f81 100644
--- a/tests/system/suite_tools/tst_designer_autocomplete/test.py
+++ b/tests/system/suite_tools/tst_designer_autocomplete/test.py
@@ -25,7 +25,9 @@ def main():
             openContextMenu(waitForObject("{container=':*Qt Creator.FormEditorStack_Designer::Internal::FormEditorStack'"
                                           "text='PushButton' type='QPushButton' visible='1'}"), 5, 5, 1)
             activateItem(waitForObjectItem("{type='QMenu' unnamed='1' visible='1'}", "Change objectName..."))
-            typeLines(waitForObject(":FormEditorStack_qdesigner_internal::PropertyLineEdit"), buttonName)
+            buttonNameEdit = waitForObject(":FormEditorStack_qdesigner_internal::PropertyLineEdit")
+            replaceEditorContent(buttonNameEdit, buttonName)
+            type(buttonNameEdit, "<Return>")
         else:
             # Verify that everything works without ever changing the name
             buttonName = "pushButton"
diff --git a/tests/system/suite_tools/tst_git_first_commit/test.py b/tests/system/suite_tools/tst_git_first_commit/test.py
index 1ef7090602..0ee8f2505b 100644
--- a/tests/system/suite_tools/tst_git_first_commit/test.py
+++ b/tests/system/suite_tools/tst_git_first_commit/test.py
@@ -35,7 +35,7 @@ def main():
     test.verify(" files changed, 229938 insertions(+)" in commitDetails,
                 "Summary in details view?")
     clickButton(waitForObject(":Select a Git Commit.Show_QPushButton"))
-    changedEdit = waitForObject(":Qt Creator_DiffEditor::SideDiffEditorWidget")
+    changedEdit = waitForObject(":Qt Creator_DiffEditor::SideDiffEditorWidgetChanged")
     waitFor("len(str(changedEdit.plainText)) > 0 and "
             "str(changedEdit.plainText) != 'Waiting for data...'", 40000)
     diffPlainText = str(changedEdit.plainText)
diff --git a/tests/system/suite_tools/tst_git_local/test.py b/tests/system/suite_tools/tst_git_local/test.py
index aefdc07d9a..1c9cd01712 100644
--- a/tests/system/suite_tools/tst_git_local/test.py
+++ b/tests/system/suite_tools/tst_git_local/test.py
@@ -82,7 +82,8 @@ def __clickCommit__(count):
     test.verify(waitFor('str(fileName.currentText) == expected', 5000),
                 "Verifying editor switches to Git Show.")
     description = waitForObject(":Qt Creator_DiffEditor::Internal::DescriptionEditorWidget")
-    waitFor('len(str(description.plainText)) != 0', 5000)
+    waitFor('len(str(description.plainText)) != 0 '
+            'and str(description.plainText) != "Waiting for data..."', 5000)
     show = str(description.plainText)
     id = "Nobody <nobody@nowhere\.com>"
     time = "\w{3} \w{3} \d{1,2} \d{2}:\d{2}:\d{2} \d{4}.* seconds ago\)"
@@ -104,8 +105,8 @@ def verifyClickCommit():
     for i in range(1, 3):
         if not __clickCommit__(i):
             continue
-        changed = waitForObject(":Qt Creator_DiffEditor::SideDiffEditorWidget")
-        original = waitForObject(":Qt Creator_DiffEditor::SideDiffEditorWidget2")
+        changed = waitForObject(":Qt Creator_DiffEditor::SideDiffEditorWidgetChanged")
+        original = waitForObject(":Qt Creator_DiffEditor::SideDiffEditorWidgetOriginal")
         waitFor('str(changed.plainText) != "Waiting for data..." '
                 'and str(original.plainText) != "Waiting for data..."', 5000)
         # content of diff editors is merge of modified files
@@ -201,7 +202,7 @@ def main():
         type(gitEditor, "<Right>")
     rect = gitEditor.cursorRect(gitEditor.textCursor())
     mouseClick(gitEditor, rect.x+rect.width/2, rect.y+rect.height/2, 0, Qt.LeftButton)
-    changed = waitForObject(":Qt Creator_DiffEditor::SideDiffEditorWidget")
+    changed = waitForObject(":Qt Creator_DiffEditor::SideDiffEditorWidgetChanged")
     waitFor('str(changed.plainText) != "Waiting for data..."', 5000)
     test.compare(str(changed.plainText), "Retrieving data failed.",
                  "Showing an invalid commit can't succeed but Creator survived.")
diff --git a/tests/tools/qml-ast2dot/CMakeLists.txt b/tests/tools/qml-ast2dot/CMakeLists.txt
index ba4acfb9dc..69ecc371f9 100644
--- a/tests/tools/qml-ast2dot/CMakeLists.txt
+++ b/tests/tools/qml-ast2dot/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_qtc_executable(qml_ast2dot
   BUILD_DEFAULT OFF
-  DEPENDS Qt::Core Qt::Gui QmlJS
+  DEPENDS Qt::Core Qt::Gui QmlJS Utils
   SOURCES main.cpp
 )
 
diff --git a/tests/tools/qml-ast2dot/main.cpp b/tests/tools/qml-ast2dot/main.cpp
index eed9c8604a..8b3508e99e 100644
--- a/tests/tools/qml-ast2dot/main.cpp
+++ b/tests/tools/qml-ast2dot/main.cpp
@@ -7,6 +7,8 @@
 #include <qmljs/qmljsdocument.h>
 #include <qmljs/qmljsmodelmanagerinterface.h>
 
+#include <utils/filepath.h>
+
 #include <QFile>
 #include <QList>
 #include <QCoreApplication>
@@ -307,7 +309,8 @@ int main(int argc, char *argv[])
         const QByteArray source = file.readAll();
         file.close();
 
-        Document::MutablePtr doc = Document::create(fileName, ModelManagerInterface::guessLanguageOfFile(fileName));
+        const Utils::FilePath filePath = Utils::FilePath::fromUserInput(fileName);
+        Document::MutablePtr doc = Document::create(filePath, ModelManagerInterface::guessLanguageOfFile(filePath));
         doc->setSource(QString::fromUtf8(source));
         doc->parse();
 
diff --git a/tests/tools/qml-ast2dot/qml-ast2dot.qbs b/tests/tools/qml-ast2dot/qml-ast2dot.qbs
index 2fbf3676c9..1b067995ad 100644
--- a/tests/tools/qml-ast2dot/qml-ast2dot.qbs
+++ b/tests/tools/qml-ast2dot/qml-ast2dot.qbs
@@ -2,6 +2,7 @@ import qbs.FileInfo
 
 CppApplication {
     Depends { name: "QmlJS" }
+    Depends { name: "Utils" }
     Depends { name: "Qt.gui" }
 
     cpp.cxxLanguageVersion: "c++17"
diff --git a/tests/unit/.clang-format b/tests/unit/.clang-format
index d3695ac298..366f82f76f 100644
--- a/tests/unit/.clang-format
+++ b/tests/unit/.clang-format
@@ -2,6 +2,7 @@ Language:        Cpp
 AccessModifierOffset: -4
 AlignEscapedNewlines: DontAlign
 AllowShortFunctionsOnASingleLine: Inline
+AlwaysBreakTemplateDeclarations: true # use with clang 19
 BinPackArguments: false
 BinPackParameters: false
 BraceWrapping:
@@ -15,6 +16,7 @@ BreakBeforeBinaryOperators: All
 BreakBeforeBraces: Custom
 BreakConstructorInitializers: BeforeComma
 BreakInheritanceList: AfterComma
+# BreakTemplateDeclarations: Yes # use with clang 19
 ColumnLimit:    100
 IncludeCategories:
   - Regex:           'Q.*'
diff --git a/tests/unit/tests/matchers/projectstorage-matcher.h b/tests/unit/tests/matchers/projectstorage-matcher.h
index 5ce6512c14..02861d7eea 100644
--- a/tests/unit/tests/matchers/projectstorage-matcher.h
+++ b/tests/unit/tests/matchers/projectstorage-matcher.h
@@ -53,3 +53,24 @@ MATCHER_P3(IsItemLibraryProperty,
 
     return property.name == name && property.type == type && property.value == value;
 }
+
+template<typename IconPathMatcher, typename TypeTraitsMatcher, typename HintsJsonMatcher, typename ItemLibraryJsonMatcher>
+auto IsTypeAnnotation(QmlDesigner::SourceId sourceId,
+                      QmlDesigner::SourceId directorySourceId,
+                      Utils::SmallStringView typeName,
+                      QmlDesigner::ModuleId moduleId,
+                      IconPathMatcher iconPath,
+                      TypeTraitsMatcher traits,
+                      HintsJsonMatcher hintsJsonMatcher,
+                      ItemLibraryJsonMatcher itemLibraryJsonMatcher)
+{
+    using QmlDesigner::Storage::Synchronization::TypeAnnotation;
+    return AllOf(Field("sourceId", &TypeAnnotation::sourceId, sourceId),
+                 Field("sourceId", &TypeAnnotation::directorySourceId, directorySourceId),
+                 Field("typeName", &TypeAnnotation::typeName, typeName),
+                 Field("moduleId", &TypeAnnotation::moduleId, moduleId),
+                 Field("iconPath", &TypeAnnotation::iconPath, iconPath),
+                 Field("traits", &TypeAnnotation::traits, traits),
+                 Field("hintsJson", &TypeAnnotation::hintsJson, hintsJsonMatcher),
+                 Field("itemLibraryJson", &TypeAnnotation::itemLibraryJson, itemLibraryJsonMatcher));
+}
diff --git a/tests/unit/tests/matchers/unittest-matchers.h b/tests/unit/tests/matchers/unittest-matchers.h
index 7c52d973b8..faa99a48a2 100644
--- a/tests/unit/tests/matchers/unittest-matchers.h
+++ b/tests/unit/tests/matchers/unittest-matchers.h
@@ -95,6 +95,64 @@ private:
     const QString m_suffix;
 };
 
+template<typename StringType>
+class StartsWithMatcher
+{
+public:
+    explicit StartsWithMatcher(const StringType &prefix)
+        : m_prefix(prefix)
+    {}
+
+    template<typename CharType>
+    bool MatchAndExplain(CharType *s, testing::MatchResultListener *listener) const
+    {
+        return s != NULL && MatchAndExplain(StringType(s), listener);
+    }
+
+    template<typename MatcheeStringType>
+    bool MatchAndExplain(const MatcheeStringType &s, testing::MatchResultListener * /* listener */) const
+    {
+        return s.startsWith(m_prefix);
+    }
+
+    void DescribeTo(::std::ostream *os) const { *os << "ends with " << m_prefix; }
+
+    void DescribeNegationTo(::std::ostream *os) const { *os << "doesn't end with " << m_prefix; }
+
+    StartsWithMatcher(const StartsWithMatcher &) = default;
+    StartsWithMatcher &operator=(const StartsWithMatcher &) = delete;
+
+private:
+    const StringType m_prefix;
+};
+
+class QStringStartsWithMatcher
+{
+public:
+    explicit QStringStartsWithMatcher(const QString &prefix)
+        : m_prefix(prefix)
+    {}
+
+    template<typename MatcheeStringType>
+    bool MatchAndExplain(const MatcheeStringType &s, testing::MatchResultListener * /* listener */) const
+    {
+        return s.startsWith(m_prefix);
+    }
+
+    void DescribeTo(::std::ostream *os) const
+    {
+        *os << "ends with " << testing::PrintToString(m_prefix);
+    }
+
+    void DescribeNegationTo(::std::ostream *os) const
+    {
+        *os << "doesn't end with " << testing::PrintToString(m_prefix);
+    }
+
+private:
+    const QString m_prefix;
+};
+
 class IsEmptyMatcher
 {
 public:
@@ -157,6 +215,16 @@ inline auto EndsWith(const QStringView &suffix)
     return ::testing::PolymorphicMatcher(Internal::QStringEndsWithMatcher(suffix.toString()));
 }
 
+inline auto StartsWith(const Utils::SmallStringView &prefix)
+{
+    return ::testing::PolymorphicMatcher(Internal::StartsWithMatcher(prefix));
+}
+
+inline auto StartsWith(const QStringView &prefix)
+{
+    return ::testing::PolymorphicMatcher(Internal::QStringStartsWithMatcher(prefix.toString()));
+}
+
 inline auto IsEmpty()
 {
     return ::testing::PolymorphicMatcher(Internal::IsEmptyMatcher());
diff --git a/tests/unit/tests/mocks/mocksqlitestatement.h b/tests/unit/tests/mocks/mocksqlitestatement.h
index f34b13f6d0..1e55d4c74f 100644
--- a/tests/unit/tests/mocks/mocksqlitestatement.h
+++ b/tests/unit/tests/mocks/mocksqlitestatement.h
@@ -50,6 +50,8 @@ public:
 
     SqliteDatabaseMock &database() { return *m_databaseMock; }
 
+    MOCK_METHOD(std::uintptr_t, handle, (), (const));
+
 private:
     SqliteDatabaseMock *m_databaseMock = nullptr;
 };
diff --git a/tests/unit/tests/mocks/projectstoragemock.cpp b/tests/unit/tests/mocks/projectstoragemock.cpp
index 83ff85fe9a..6d5304879e 100644
--- a/tests/unit/tests/mocks/projectstoragemock.cpp
+++ b/tests/unit/tests/mocks/projectstoragemock.cpp
@@ -51,6 +51,7 @@ ModuleId ProjectStorageMock::createModule(Utils::SmallStringView moduleName)
     incrementBasicId(moduleId);
 
     ON_CALL(*this, moduleId(Eq(moduleName))).WillByDefault(Return(moduleId));
+    ON_CALL(*this, moduleName(Eq(moduleId))).WillByDefault(Return(moduleName));
     ON_CALL(*this, fetchModuleIdUnguarded(Eq(moduleName))).WillByDefault(Return(moduleId));
 
     return moduleId;
@@ -122,6 +123,14 @@ void ProjectStorageMock::addExportedTypeName(QmlDesigner::TypeId typeId,
     exportedTypeName[typeId].emplace_back(moduleId, typeName);
 }
 
+void ProjectStorageMock::addExportedTypeNameBySourceId(QmlDesigner::TypeId typeId,
+                                                       QmlDesigner::ModuleId moduleId,
+                                                       Utils::SmallStringView typeName,
+                                                       QmlDesigner::SourceId sourceId)
+{
+    exportedTypeNameBySourceId[{typeId, sourceId}].emplace_back(moduleId, typeName);
+}
+
 void ProjectStorageMock::removeExportedTypeName(QmlDesigner::TypeId typeId,
                                                 QmlDesigner::ModuleId moduleId,
                                                 Utils::SmallStringView typeName)
@@ -227,7 +236,9 @@ void ProjectStorageMock::setItemLibraryEntries(
 }
 
 namespace {
-void addBaseProperties(TypeId typeId, TypeIds baseTypeIds, ProjectStorageMock &storage)
+void addBaseProperties(TypeId typeId,
+                       const QmlDesigner::SmallTypeIds<16> &baseTypeIds,
+                       ProjectStorageMock &storage)
 {
     for (TypeId baseTypeId : baseTypeIds) {
         for (const auto &propertyId : storage.localPropertyDeclarationIds(baseTypeId)) {
@@ -254,7 +265,7 @@ TypeId ProjectStorageMock::createType(ModuleId moduleId,
                                       PropertyDeclarationTraits defaultPropertyTraits,
                                       TypeId defaultPropertyTypeId,
                                       Storage::TypeTraits typeTraits,
-                                      TypeIds baseTypeIds,
+                                      const QmlDesigner::SmallTypeIds<16> &baseTypeIds,
                                       SourceId sourceId)
 {
     if (auto id = typeId(moduleId, typeName)) {
@@ -282,18 +293,19 @@ TypeId ProjectStorageMock::createType(ModuleId moduleId,
                                                       defaultPropertyTypeId);
     }
 
-    ON_CALL(*this, type(Eq(typeId)))
-        .WillByDefault(Return(Storage::Info::Type{defaultPropertyDeclarationId, sourceId, typeTraits}));
+    ON_CALL(*this, type(Eq(typeId))).WillByDefault(Return(Storage::Info::Type{sourceId, typeTraits}));
+
+    ON_CALL(*this, defaultPropertyDeclarationId(Eq(typeId)))
+        .WillByDefault(Return(defaultPropertyDeclarationId));
 
     ON_CALL(*this, isBasedOn(Eq(typeId), Eq(typeId))).WillByDefault(Return(true));
 
     for (TypeId baseTypeId : baseTypeIds)
         ON_CALL(*this, isBasedOn(Eq(typeId), Eq(baseTypeId))).WillByDefault(Return(true));
 
-    TypeIds selfAndPrototypes;
-    selfAndPrototypes.reserve(baseTypeIds.size() + 1);
+    QmlDesigner::SmallTypeIds<16> selfAndPrototypes;
     selfAndPrototypes.push_back(typeId);
-    selfAndPrototypes.insert(selfAndPrototypes.end(), baseTypeIds.begin(), baseTypeIds.end());
+    std::copy(baseTypeIds.begin(), baseTypeIds.end(), std::back_inserter(selfAndPrototypes));
     ON_CALL(*this, prototypeAndSelfIds(Eq(typeId))).WillByDefault(Return(selfAndPrototypes));
     ON_CALL(*this, prototypeIds(Eq(typeId))).WillByDefault(Return(baseTypeIds));
 
@@ -314,7 +326,7 @@ void ProjectStorageMock::removeType(QmlDesigner::ModuleId moduleId, Utils::Small
 QmlDesigner::TypeId ProjectStorageMock::createType(QmlDesigner::ModuleId moduleId,
                                                    Utils::SmallStringView typeName,
                                                    QmlDesigner::Storage::TypeTraits typeTraits,
-                                                   QmlDesigner::TypeIds baseTypeIds,
+                                                   const QmlDesigner::SmallTypeIds<16> &baseTypeIds,
                                                    SourceId sourceId)
 {
     return createType(moduleId, typeName, {}, {}, TypeId{}, typeTraits, baseTypeIds, sourceId);
@@ -325,7 +337,7 @@ TypeId ProjectStorageMock::createObject(ModuleId moduleId,
                                         Utils::SmallStringView defaultPropertyName,
                                         PropertyDeclarationTraits defaultPropertyTraits,
                                         QmlDesigner::TypeId defaultPropertyTypeId,
-                                        TypeIds baseTypeIds,
+                                        const QmlDesigner::SmallTypeIds<16> &baseTypeIds,
                                         QmlDesigner::SourceId sourceId)
 {
     return createType(moduleId,
@@ -340,19 +352,20 @@ TypeId ProjectStorageMock::createObject(ModuleId moduleId,
 
 TypeId ProjectStorageMock::createObject(ModuleId moduleId,
                                         Utils::SmallStringView typeName,
-                                        TypeIds baseTypeIds)
+                                        const QmlDesigner::SmallTypeIds<16> &baseTypeIds)
 {
     return createType(moduleId, typeName, Storage::TypeTraitsKind::Reference, baseTypeIds);
 }
 
 QmlDesigner::TypeId ProjectStorageMock::createValue(QmlDesigner::ModuleId moduleId,
                                                     Utils::SmallStringView typeName,
-                                                    QmlDesigner::TypeIds baseTypeIds)
+                                                    const QmlDesigner::SmallTypeIds<16> &baseTypeIds)
 {
     return createType(moduleId, typeName, Storage::TypeTraitsKind::Value, baseTypeIds);
 }
 
-void ProjectStorageMock::setHeirs(QmlDesigner::TypeId typeId, QmlDesigner::TypeIds heirIds)
+void ProjectStorageMock::setHeirs(QmlDesigner::TypeId typeId,
+                                  const QmlDesigner::SmallTypeIds<64> &heirIds)
 {
     ON_CALL(*this, heirIds(typeId)).WillByDefault(Return(heirIds));
 }
@@ -362,6 +375,10 @@ ProjectStorageMock::ProjectStorageMock()
     ON_CALL(*this, exportedTypeNames(_)).WillByDefault([&](TypeId id) {
         return exportedTypeName[id];
     });
+
+    ON_CALL(*this, exportedTypeNames(_, _)).WillByDefault([&](TypeId typeId, SourceId sourceId) {
+        return exportedTypeNameBySourceId[{typeId, sourceId}];
+    });
 }
 
 void ProjectStorageMock::setupQtQuick()
diff --git a/tests/unit/tests/mocks/projectstoragemock.h b/tests/unit/tests/mocks/projectstoragemock.h
index 198e54b370..8aa5979ddb 100644
--- a/tests/unit/tests/mocks/projectstoragemock.h
+++ b/tests/unit/tests/mocks/projectstoragemock.h
@@ -46,6 +46,11 @@ public:
                              QmlDesigner::ModuleId moduleId,
                              Utils::SmallStringView typeName);
 
+    void addExportedTypeNameBySourceId(QmlDesigner::TypeId typeId,
+                                       QmlDesigner::ModuleId moduleId,
+                                       Utils::SmallStringView typeName,
+                                       QmlDesigner::SourceId sourceId);
+
     void removeExportedTypeName(QmlDesigner::TypeId typeId,
                                 QmlDesigner::ModuleId moduleId,
                                 Utils::SmallStringView typeName);
@@ -56,7 +61,7 @@ public:
                                    QmlDesigner::Storage::PropertyDeclarationTraits defaultPropertyTraits,
                                    QmlDesigner::TypeId defaultPropertyTypeId,
                                    QmlDesigner::Storage::TypeTraits typeTraits,
-                                   QmlDesigner::TypeIds baseTypeIds = {},
+                                   const QmlDesigner::SmallTypeIds<16> &baseTypeIds = {},
                                    QmlDesigner::SourceId sourceId = QmlDesigner::SourceId{});
 
     void removeType(QmlDesigner::ModuleId moduleId, Utils::SmallStringView typeName);
@@ -64,27 +69,26 @@ public:
     QmlDesigner::TypeId createType(QmlDesigner::ModuleId moduleId,
                                    Utils::SmallStringView typeName,
                                    QmlDesigner::Storage::TypeTraits typeTraits,
-                                   QmlDesigner::TypeIds baseTypeIds = {},
+                                   const QmlDesigner::SmallTypeIds<16> &baseTypeIds = {},
                                    QmlDesigner::SourceId sourceId = QmlDesigner::SourceId{});
 
-    QmlDesigner::TypeId createObject(
-        QmlDesigner::ModuleId moduleId,
-        Utils::SmallStringView typeName,
-        Utils::SmallStringView defaultPropertyName,
-        QmlDesigner::Storage::PropertyDeclarationTraits defaultPropertyTraits,
-        QmlDesigner::TypeId defaultPropertyTypeId,
-        QmlDesigner::TypeIds baseTypeIds = {},
-        QmlDesigner::SourceId sourceId = QmlDesigner::SourceId{});
+    QmlDesigner::TypeId createObject(QmlDesigner::ModuleId moduleId,
+                                     Utils::SmallStringView typeName,
+                                     Utils::SmallStringView defaultPropertyName,
+                                     QmlDesigner::Storage::PropertyDeclarationTraits defaultPropertyTraits,
+                                     QmlDesigner::TypeId defaultPropertyTypeId,
+                                     const QmlDesigner::SmallTypeIds<16> &baseTypeIds = {},
+                                     QmlDesigner::SourceId sourceId = QmlDesigner::SourceId{});
 
     QmlDesigner::TypeId createObject(QmlDesigner::ModuleId moduleId,
                                      Utils::SmallStringView typeName,
-                                     QmlDesigner::TypeIds baseTypeIds = {});
+                                     const QmlDesigner::SmallTypeIds<16> &baseTypeIds = {});
 
     QmlDesigner::TypeId createValue(QmlDesigner::ModuleId moduleId,
                                     Utils::SmallStringView typeName,
-                                    QmlDesigner::TypeIds baseTypeIds = {});
+                                    const QmlDesigner::SmallTypeIds<16> &baseTypeIds = {});
 
-    void setHeirs(QmlDesigner::TypeId typeId, QmlDesigner::TypeIds heirIds);
+    void setHeirs(QmlDesigner::TypeId typeId, const QmlDesigner::SmallTypeIds<64> &heirIds);
 
     QmlDesigner::PropertyDeclarationId createProperty(
         QmlDesigner::TypeId typeId,
@@ -123,6 +127,7 @@ public:
     MOCK_METHOD(void, removeObserver, (QmlDesigner::ProjectStorageObserver *), (override));
 
     MOCK_METHOD(QmlDesigner::ModuleId, moduleId, (::Utils::SmallStringView), (const, override));
+    MOCK_METHOD(Utils::SmallString, moduleName, (QmlDesigner::ModuleId), (const, override));
 
     MOCK_METHOD(std::optional<QmlDesigner::Storage::Info::PropertyDeclaration>,
                 propertyDeclaration,
@@ -182,10 +187,19 @@ public:
                 propertyDeclarationId,
                 (QmlDesigner::TypeId typeId, ::Utils::SmallStringView propertyName),
                 (const, override));
+    MOCK_METHOD(QmlDesigner::PropertyDeclarationId,
+                defaultPropertyDeclarationId,
+                (QmlDesigner::TypeId typeId),
+                (const, override));
     MOCK_METHOD(std::optional<QmlDesigner::Storage::Info::Type>,
                 type,
                 (QmlDesigner::TypeId typeId),
                 (const, override));
+    MOCK_METHOD(QmlDesigner::SmallSourceIds<4>,
+                typeAnnotationSourceIds,
+                (QmlDesigner::SourceId directoryId),
+                (const, override));
+    MOCK_METHOD(QmlDesigner::SmallSourceIds<64>, typeAnnotationDirectorySourceIds, (), (const, override));
     MOCK_METHOD(Utils::PathString, typeIconPath, (QmlDesigner::TypeId typeId), (const, override));
     MOCK_METHOD(QmlDesigner::Storage::Info::TypeHints,
                 typeHints,
@@ -215,9 +229,15 @@ public:
                 propertyName,
                 (QmlDesigner::PropertyDeclarationId propertyDeclarationId),
                 (const, override));
-    MOCK_METHOD(QmlDesigner::TypeIds, prototypeAndSelfIds, (QmlDesigner::TypeId type), (const, override));
-    MOCK_METHOD(QmlDesigner::TypeIds, prototypeIds, (QmlDesigner::TypeId type), (const, override));
-    MOCK_METHOD(QmlDesigner::TypeIds, heirIds, (QmlDesigner::TypeId type), (const, override));
+    MOCK_METHOD(QmlDesigner::SmallTypeIds<16>,
+                prototypeAndSelfIds,
+                (QmlDesigner::TypeId type),
+                (const, override));
+    MOCK_METHOD(QmlDesigner::SmallTypeIds<16>,
+                prototypeIds,
+                (QmlDesigner::TypeId type),
+                (const, override));
+    MOCK_METHOD(QmlDesigner::SmallTypeIds<64>, heirIds, (QmlDesigner::TypeId type), (const, override));
     MOCK_METHOD(bool, isBasedOn, (QmlDesigner::TypeId typeId, QmlDesigner::TypeId), (const, override));
     MOCK_METHOD(bool,
                 isBasedOn,
@@ -326,6 +346,8 @@ public:
 
     QmlDesigner::Storage::Info::CommonTypeCache<QmlDesigner::ProjectStorageInterface> typeCache{*this};
     std::map<QmlDesigner::TypeId, QmlDesigner::Storage::Info::ExportedTypeNames> exportedTypeName;
+    std::map<std::pair<QmlDesigner::TypeId, QmlDesigner::SourceId>, QmlDesigner::Storage::Info::ExportedTypeNames>
+        exportedTypeNameBySourceId;
 };
 
 class ProjectStorageMockWithQtQtuick : public ProjectStorageMock
diff --git a/tests/unit/tests/printers/gtest-creator-printing.cpp b/tests/unit/tests/printers/gtest-creator-printing.cpp
index 1bff6df492..6bc78e9936 100644
--- a/tests/unit/tests/printers/gtest-creator-printing.cpp
+++ b/tests/unit/tests/printers/gtest-creator-printing.cpp
@@ -675,7 +675,7 @@ std::ostream &operator<<(std::ostream &out, const PropertyDeclaration &propertyD
 
 std::ostream &operator<<(std::ostream &out, const Type &type)
 {
-    return out << "(" << type.defaultPropertyId << ")";
+    return out << "(" << type.sourceId << ")";
 }
 
 std::ostream &operator<<(std::ostream &out, const ExportedTypeName &name)
@@ -795,7 +795,10 @@ std::ostream &operator<<(std::ostream &out, const SynchronizationPackage &packag
                << ", projectDatas: " << package.projectDatas
                << ", propertyEditorQmlPaths: " << package.propertyEditorQmlPaths
                << ", updatedPropertyEditorQmlPathSourceIds: "
-               << package.updatedPropertyEditorQmlPathSourceIds << ")";
+               << package.updatedPropertyEditorQmlPathSourceIds
+               << ", typeAnnotations: " << package.typeAnnotations
+               << ", updatedTypeAnnotationSourceIds: " << package.updatedTypeAnnotationSourceIds
+               << ")";
 }
 
 std::ostream &operator<<(std::ostream &out, const ProjectData &data)
diff --git a/tests/unit/tests/stubs/qmldesigner/designercore/include/rewriterview.h b/tests/unit/tests/stubs/qmldesigner/designercore/include/rewriterview.h
index a10da0133c..4c59440b0f 100644
--- a/tests/unit/tests/stubs/qmldesigner/designercore/include/rewriterview.h
+++ b/tests/unit/tests/stubs/qmldesigner/designercore/include/rewriterview.h
@@ -128,8 +128,6 @@ public:
 
     void setCheckSemanticErrors(bool) {}
 
-    QString pathForImport(const Import &) { return {}; }
-
     QStringList importDirectories() const { return {}; }
 
     QSet<QPair<QString, QString>> qrcMapping() const { return {}; }
diff --git a/tests/unit/tests/unittests/componentcore/propertyeditorcomponentgenerator-test.cpp b/tests/unit/tests/unittests/componentcore/propertyeditorcomponentgenerator-test.cpp
index 3b9a8bbfe2..d2f2143a73 100644
--- a/tests/unit/tests/unittests/componentcore/propertyeditorcomponentgenerator-test.cpp
+++ b/tests/unit/tests/unittests/componentcore/propertyeditorcomponentgenerator-test.cpp
@@ -18,7 +18,7 @@ class PropertyEditorComponentGenerator : public ::testing::Test
 {
 protected:
     QmlDesigner::NodeMetaInfo createType(Utils::SmallStringView name,
-                                         QmlDesigner::TypeIds baseTypeIds = {})
+                                         const QmlDesigner::SmallTypeIds<16> &baseTypeIds = {})
     {
         auto typeId = projectStorageMock.createValue(qtQuickModuleId, name, baseTypeIds);
 
diff --git a/tests/unit/tests/unittests/imagecache/taskqueue-test.cpp b/tests/unit/tests/unittests/imagecache/taskqueue-test.cpp
index 537f4b3ea3..ea295c5733 100644
--- a/tests/unit/tests/unittests/imagecache/taskqueue-test.cpp
+++ b/tests/unit/tests/unittests/imagecache/taskqueue-test.cpp
@@ -100,4 +100,22 @@ TEST_F(TaskQueue, clean_task_in_queue)
     queue.clean();
 }
 
+TEST_F(TaskQueue, sleeping_queue_is_recovering)
+{
+    Queue queue{mockDispatchCallback.AsStdFunction(), mockCleanCallback.AsStdFunction()};
+    EXPECT_CALL(mockDispatchCallback, Call(IsTask(5))).WillRepeatedly([&](Task) {
+        notification.notify();
+    });
+    queue.addTask(5);
+    notification.wait();
+    queue.putThreadToSleep();
+
+    EXPECT_CALL(mockDispatchCallback, Call(IsTask(22))).WillRepeatedly([&](Task) {
+        notification.notify();
+    });
+
+    queue.addTask(22);
+    notification.wait();
+}
+
 } // namespace
diff --git a/tests/unit/tests/unittests/model/model-test.cpp b/tests/unit/tests/unittests/model/model-test.cpp
index bda942fec0..bd34a3a6b1 100644
--- a/tests/unit/tests/unittests/model/model-test.cpp
+++ b/tests/unit/tests/unittests/model/model-test.cpp
@@ -116,11 +116,11 @@ protected:
     NiceMock<SourcePathCacheMockWithPaths> pathCacheMock{"/path/foo.qml"};
     NiceMock<ProjectStorageMockWithQtQtuick> projectStorageMock{pathCacheMock.sourceId};
     NiceMock<ModelResourceManagementMock> resourceManagementMock;
+    QmlDesigner::Imports imports = {QmlDesigner::Import::createLibraryImport("QtQuick")};
     QmlDesigner::Model model{{projectStorageMock, pathCacheMock},
                              "Item",
-                             -1,
-                             -1,
-                             nullptr,
+                             imports,
+                             pathCacheMock.path.toQString(),
                              std::make_unique<ModelResourceManagementMockWrapper>(
                                  resourceManagementMock)};
     NiceMock<AbstractViewMock> viewMock;
@@ -541,7 +541,10 @@ TEST_F(Model, by_default_remove_properties_removes_property)
 TEST_F(Model, by_default_remove_model_node_in_factory_method_calls_removes_node)
 {
     model.detachView(&viewMock);
-    auto newModel = QmlDesigner::Model::create({projectStorageMock, pathCacheMock}, "QtQuick.Item");
+    auto newModel = QmlDesigner::Model::create({projectStorageMock, pathCacheMock},
+                                               "Item",
+                                               imports,
+                                               pathCacheMock.path.toQString());
     newModel->attachView(&viewMock);
     auto node = createNodeWithParent(viewMock.rootModelNode());
 
@@ -553,7 +556,10 @@ TEST_F(Model, by_default_remove_model_node_in_factory_method_calls_removes_node)
 TEST_F(Model, by_default_remove_properties_in_factory_method_calls_remove_property)
 {
     model.detachView(&viewMock);
-    auto newModel = QmlDesigner::Model::create({projectStorageMock, pathCacheMock}, "QtQuick.Item");
+    auto newModel = QmlDesigner::Model::create({projectStorageMock, pathCacheMock},
+                                               "Item",
+                                               imports,
+                                               pathCacheMock.path.toQString());
     newModel->attachView(&viewMock);
     rootNode = viewMock.rootModelNode();
     auto property = createProperty(rootNode, "yi");
diff --git a/tests/unit/tests/unittests/model/modelresourcemanagement-test.cpp b/tests/unit/tests/unittests/model/modelresourcemanagement-test.cpp
index 40b94f872d..fd3d3c70c3 100644
--- a/tests/unit/tests/unittests/model/modelresourcemanagement-test.cpp
+++ b/tests/unit/tests/unittests/model/modelresourcemanagement-test.cpp
@@ -280,7 +280,6 @@ INSTANTIATE_TEST_SUITE_P(
     ForTarget,
     testing::Values(TargetData{"QtQuick.Item", "QtQuick.PropertyChanges", "target"},
                     TargetData{"QtQuick.Item", "QtQuick.Timeline.KeyframeGroup", "target"},
-                    TargetData{"FlowView.FlowTransition", "FlowView.FlowActionArea", "target"},
                     TargetData{"QtQuick.Item", "QtQuick.PropertyAnimation", "target"},
                     TargetData{"FlowView.FlowItem", "FlowView.FlowTransition", "to"},
                     TargetData{"FlowView.FlowItem", "FlowView.FlowTransition", "from"}));
diff --git a/tests/unit/tests/unittests/model/modelutils-test.cpp b/tests/unit/tests/unittests/model/modelutils-test.cpp
index c7a70cfbdb..5a9e63b60d 100644
--- a/tests/unit/tests/unittests/model/modelutils-test.cpp
+++ b/tests/unit/tests/unittests/model/modelutils-test.cpp
@@ -141,7 +141,7 @@ TEST_F(ModelUtils, find_lowest_common_ancestor_when_one_of_the_nodes_is_parent)
     ASSERT_THAT(commonAncestor, parentNode);
 }
 
-TEST_F(ModelUtils, lowest_common_ancestor_for_uncle_and_nephew_should_return_the_grandFather)
+TEST_F(ModelUtils, lowest_common_ancestor_for_uncle_and_nephew_should_return_the_grandfather)
 {
     auto grandFatherNode = model.createModelNode("Item");
     auto fatherNode = model.createModelNode("Item");
diff --git a/tests/unit/tests/unittests/model/nodelistproperty-test.cpp b/tests/unit/tests/unittests/model/nodelistproperty-test.cpp
index 6783bde3e7..aac2e729a2 100644
--- a/tests/unit/tests/unittests/model/nodelistproperty-test.cpp
+++ b/tests/unit/tests/unittests/model/nodelistproperty-test.cpp
@@ -61,8 +61,8 @@ protected:
             ++defaultPropertyIdNumber);
 
         ON_CALL(projectStorageMock, typeId(Eq(moduleId), Eq(typeName), _)).WillByDefault(Return(typeId));
-        ON_CALL(projectStorageMock, type(Eq(typeId)))
-            .WillByDefault(Return(Info::Type{defaultPropertyId, QmlDesigner::SourceId{}, {}}));
+        ON_CALL(projectStorageMock, defaultPropertyDeclarationId(Eq(typeId)))
+            .WillByDefault(Return(defaultPropertyId));
         ON_CALL(projectStorageMock, propertyName(Eq(defaultPropertyId)))
             .WillByDefault(Return(defaultPeopertyName));
     }
diff --git a/tests/unit/tests/unittests/projectstorage/data/qml/QtQuick/Controls/designer/qtquickcontrols2.metainfo b/tests/unit/tests/unittests/projectstorage/data/qml/QtQuick/Controls/designer/qtquickcontrols2.metainfo
new file mode 100644
index 0000000000..0cd3959cf8
--- /dev/null
+++ b/tests/unit/tests/unittests/projectstorage/data/qml/QtQuick/Controls/designer/qtquickcontrols2.metainfo
@@ -0,0 +1,575 @@
+MetaInfo {
+    Type {
+        name: "QtQuick.Controls.BusyIndicator"
+        icon: "images/busyindicator-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Busy Indicator"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/busyindicator-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("Indicates activity while, for example, content is being loaded.")
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.Button"
+        icon: "images/button-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Button"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/button-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("A button with text.")
+
+            Property { name: "text"; type: "binding"; value: "qsTr(\"Button\")" }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.CheckBox"
+        icon: "images/checkbox-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Check Box"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/checkbox-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("A checkbox with a text label.")
+
+            Property { name: "text"; type: "binding"; value: "qsTr(\"Check Box\")" }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.CheckDelegate"
+        icon: "images/checkbox-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Check Delegate"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/checkbox-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("Presents items from a model as checkboxes.")
+
+            Property { name: "text"; type: "binding"; value: "qsTr(\"Check Delegate\")" }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.ComboBox"
+        icon: "images/combobox-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Combo Box"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/combobox-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("An editable drop-down list.")
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.Control"
+        icon: "images/control-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Control"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/control-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("An abstract base type for UI controls.")
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.DelayButton"
+        icon: "images/button-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Delay Button"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/delaybutton-icon.png"
+            version: "2.2"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("A button with a delay preventing accidental presses.")
+
+            Property { name: "text"; type: "binding"; value: "qsTr(\"Delay Button\")" }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.Dial"
+        icon: "images/dial-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Dial"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/dial-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+
+            toolTip: qsTr("A circular dial that is rotated to set a value.")
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.Frame"
+        icon: "images/frame-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Frame"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/frame-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("An untitled container for a group of controls.")
+
+            Property { name: "width"; type: "int"; value: 200 }
+            Property { name: "height"; type: "int"; value: 200 }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.GroupBox"
+        icon: "images/groupbox-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Group Box"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/groupbox-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("A titled container for a group of controls.")
+
+            Property { name: "width"; type: "int"; value: 200 }
+            Property { name: "height"; type: "int"; value: 200 }
+            Property { name: "title"; type: "binding"; value: "qsTr(\"Group Box\")" }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.ItemDelegate"
+        icon: "images/itemdelegate-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Item Delegate"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/itemdelegate-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("Presents a standard view item. It can be used as a delegate in various views and controls, such as ListView and ComboBox.")
+
+            Property { name: "text"; type: "binding"; value: "qsTr(\"Item Delegate\")" }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.Label"
+        icon: "images/label-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Label"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/label-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("A text label.")
+
+            Property { name: "text"; type: "binding"; value: "qsTr(\"Label\")" }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.Page"
+        icon: "images/page-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Page"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/page-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("A page with header and footer.")
+
+            Property { name: "width"; type: "int"; value: 200 }
+            Property { name: "height"; type: "int"; value: 200 }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.PageIndicator"
+        icon: "images/pageindicator-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Page Indicator"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/pageindicator-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("Indicates the currently active page.")
+
+            Property { name: "count"; type: "int"; value: 3 }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.Pane"
+        icon: "images/pane-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Pane"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/pane-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("Provides a background matching the application style and theme.")
+
+            Property { name: "width"; type: "int"; value: 200 }
+            Property { name: "height"; type: "int"; value: 200 }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.ProgressBar"
+        icon: "images/progressbar-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Progress Bar"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/progressbar-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("A bar indicating the progress of an operation.")
+
+            Property { name: "value"; type: "real"; value: 0.5 }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.RadioButton"
+        icon: "images/radiobutton-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Radio Button"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/radiobutton-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("An option button that you can toggle on or off.")
+
+            Property { name: "text"; type: "binding"; value: "qsTr(\"Radio Button\")" }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.RadioDelegate"
+        icon: "images/radiobutton-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Radio Delegate"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/radiobutton-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("Presents items from a model as radio buttons.")
+
+            Property { name: "text"; type: "binding"; value: "qsTr(\"Radio Delegate\")" }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.RangeSlider"
+        icon: "images/rangeslider-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Range Slider"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/rangeslider-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("A bar with adjustable start and end points.")
+
+            Property { name: "first.value"; type: "real"; value: 0.25 }
+            Property { name: "second.value"; type: "real"; value: 0.75 }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.RoundButton"
+        icon: "images/roundbutton-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Round Button"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/roundbutton-icon.png"
+            version: "2.1"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("A round button with text.")
+
+            Property { name: "text"; type: "string"; value: "+" }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.Slider"
+        icon: "images/slider-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Slider"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/slider-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("An adjustable slider.")
+
+            Property { name: "value"; type: "real"; value: 0.5 }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.SpinBox"
+        icon: "images/spinbox-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Spin Box"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/spinbox-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("A box with an adjustable number.")
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.ScrollView"
+        icon: "images/scrollview-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Scroll View"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/scrollview-icon.png"
+            version: "2.2"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("A scrollable area.")
+
+            Property { name: "width"; type: "int"; value: 200 }
+            Property { name: "height"; type: "int"; value: 200 }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.StackView"
+        icon: "images/stackview-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Stack View"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/stackview-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("Provides a stack-based navigation for a set of pages.")
+
+            Property { name: "width"; type: "int"; value: 200 }
+            Property { name: "height"; type: "int"; value: 200 }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.SwipeDelegate"
+        icon: "images/itemdelegate-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Swipe Delegate"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/itemdelegate-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("Presents items from a model as items that you can swipe to expose more options.")
+
+            Property { name: "text"; type: "binding"; value: "qsTr(\"Swipe Delegate\")" }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.SwipeView"
+        icon: "images/swipeview-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Swipe View"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/swipeview-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("Provides a view where you can navigate pages by swiping.")
+
+            Property { name: "width"; type: "int"; value: 200 }
+            Property { name: "height"; type: "int"; value: 200 }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.Switch"
+        icon: "images/switch-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Switch"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/switch-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("A button that you can toggle on and off.")
+
+            Property { name: "text"; type: "binding"; value: "qsTr(\"Switch\")" }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.SwitchDelegate"
+        icon: "images/switch-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Switch Delegate"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/switch-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("Presents items from a model as toggle switches.")
+
+            Property { name: "text"; type: "binding"; value: "qsTr(\"Switch Delegate\")" }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.TabBar"
+        icon: "images/toolbar-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Tab Bar"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/toolbar-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("A tab-based navigation model.")
+
+            Property { name: "width"; type: "int"; value: 240 }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.TabButton"
+        icon: "images/toolbutton-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Tab Button"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/toolbutton-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("A button suitable for a tab bar.")
+
+            Property { name: "text"; type: "binding"; value: "qsTr(\"Tab Button\")" }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.TextArea"
+        icon: "images/textarea-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Text Area"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/textarea-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("A multi-line text box.")
+
+            Property { name: "placeholderText"; type: "binding"; value: "qsTr(\"Text Area\")" }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.TextField"
+        icon: "images/textfield-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Text Field"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/textfield-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("A single-line text box.")
+
+            Property { name: "placeholderText"; type: "binding"; value: "qsTr(\"Text Field\")" }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.ToolBar"
+        icon: "images/toolbar-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Tool Bar"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/toolbar-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("A row that can hold actions and buttons.")
+
+            Property { name: "width"; type: "int"; value: 360 }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.ToolButton"
+        icon: "images/toolbutton-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Tool Button"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/toolbutton-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("A button suitable for a tool bar.")
+
+            Property { name: "text"; type: "binding"; value: "qsTr(\"Tool Button\")" }
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.ToolSeparator"
+        icon: "images/toolseparator-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Tool Separator"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/toolseparator-icon.png"
+            version: "2.1"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("A line to separate sections in a tool bar.")
+        }
+    }
+
+    Type {
+        name: "QtQuick.Controls.Tumbler"
+        icon: "images/tumbler-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Tumbler"
+            category: "Qt Quick - Controls 2"
+            libraryIcon: "images/tumbler-icon.png"
+            version: "2.0"
+            requiredImport: "QtQuick.Controls"
+            toolTip: qsTr("A spinnable wheel of selectable items.")
+
+            Property { name: "model"; type: "int"; value: "10" }
+        }
+    }
+}
diff --git a/tests/unit/tests/unittests/projectstorage/data/qml/QtQuick3D/AssetUtils/designer/assetutils.metainfo b/tests/unit/tests/unittests/projectstorage/data/qml/QtQuick3D/AssetUtils/designer/assetutils.metainfo
new file mode 100644
index 0000000000..47abeea7a3
--- /dev/null
+++ b/tests/unit/tests/unittests/projectstorage/data/qml/QtQuick3D/AssetUtils/designer/assetutils.metainfo
@@ -0,0 +1,21 @@
+MetaInfo {
+    Type {
+        name: "QtQuick3D.AssetUtils.RuntimeLoader"
+        icon: "images/runtimeloader16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+        }
+
+        ItemLibraryEntry {
+            name: "Runtime Loader"
+            category: "AssetUtils"
+            libraryIcon: "images/runtimeloader.png"
+            version: "6.2"
+            requiredImport: "QtQuick3D.AssetUtils"
+        }
+    }
+}
diff --git a/tests/unit/tests/unittests/projectstorage/data/qml/QtQuick3D/Effects/designer/effectlib.metainfo b/tests/unit/tests/unittests/projectstorage/data/qml/QtQuick3D/Effects/designer/effectlib.metainfo
new file mode 100644
index 0000000000..7ad3357894
--- /dev/null
+++ b/tests/unit/tests/unittests/projectstorage/data/qml/QtQuick3D/Effects/designer/effectlib.metainfo
@@ -0,0 +1,401 @@
+MetaInfo {
+    Type {
+        name: "QtQuick3D.Effects.AdditiveColorGradient"
+        icon: "images/effect16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: false
+        }
+
+        ItemLibraryEntry {
+            name: "Additive Color Gradient"
+            category: "Qt Quick 3D Effects"
+            libraryIcon: "images/effect.png"
+            version: "1.0"
+            requiredImport: "QtQuick3D.Effects"
+        }
+    }
+    Type {
+        name: "QtQuick3D.Effects.Blur"
+        icon: "images/effect16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: false
+        }
+
+        ItemLibraryEntry {
+            name: "Blur"
+            category: "Qt Quick 3D Effects"
+            libraryIcon: "images/effect.png"
+            version: "1.0"
+            requiredImport: "QtQuick3D.Effects"
+        }
+    }
+    Type {
+        name: "QtQuick3D.Effects.BrushStrokes"
+        icon: "images/effect16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: false
+        }
+
+        ItemLibraryEntry {
+            name: "Brush Strokes"
+            category: "Qt Quick 3D Effects"
+            libraryIcon: "images/effect.png"
+            version: "1.0"
+            requiredImport: "QtQuick3D.Effects"
+        }
+    }
+    Type {
+        name: "QtQuick3D.Effects.ChromaticAberration"
+        icon: "images/effect16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: false
+        }
+
+        ItemLibraryEntry {
+            name: "Chromatic Aberration"
+            category: "Qt Quick 3D Effects"
+            libraryIcon: "images/effect.png"
+            version: "1.0"
+            requiredImport: "QtQuick3D.Effects"
+        }
+    }
+    Type {
+        name: "QtQuick3D.Effects.ColorMaster"
+        icon: "images/effect16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: false
+        }
+
+        ItemLibraryEntry {
+            name: "Color Master"
+            category: "Qt Quick 3D Effects"
+            libraryIcon: "images/effect.png"
+            version: "1.0"
+            requiredImport: "QtQuick3D.Effects"
+        }
+    }
+    Type {
+        name: "QtQuick3D.Effects.DepthOfFieldHQBlur"
+        icon: "images/effect16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: false
+        }
+
+        ItemLibraryEntry {
+            name: "Depth of Field HQ Blur"
+            category: "Qt Quick 3D Effects"
+            libraryIcon: "images/effect.png"
+            version: "1.0"
+            requiredImport: "QtQuick3D.Effects"
+        }
+    }
+    Type {
+        name: "QtQuick3D.Effects.Desaturate"
+        icon: "images/effect16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: false
+        }
+
+        ItemLibraryEntry {
+            name: "Desaturate"
+            category: "Qt Quick 3D Effects"
+            libraryIcon: "images/effect.png"
+            version: "1.0"
+            requiredImport: "QtQuick3D.Effects"
+        }
+    }
+    Type {
+        name: "QtQuick3D.Effects.DistortionRipple"
+        icon: "images/effect16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: false
+        }
+
+        ItemLibraryEntry {
+            name: "Distortion Ripple"
+            category: "Qt Quick 3D Effects"
+            libraryIcon: "images/effect.png"
+            version: "1.0"
+            requiredImport: "QtQuick3D.Effects"
+        }
+    }
+    Type {
+        name: "QtQuick3D.Effects.DistortionSphere"
+        icon: "images/effect16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: false
+        }
+
+        ItemLibraryEntry {
+            name: "Distortion Sphere"
+            category: "Qt Quick 3D Effects"
+            libraryIcon: "images/effect.png"
+            version: "1.0"
+            requiredImport: "QtQuick3D.Effects"
+        }
+    }
+    Type {
+        name: "QtQuick3D.Effects.DistortionSpiral"
+        icon: "images/effect16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: false
+        }
+
+        ItemLibraryEntry {
+            name: "Distortion Spiral"
+            category: "Qt Quick 3D Effects"
+            libraryIcon: "images/effect.png"
+            version: "1.0"
+            requiredImport: "QtQuick3D.Effects"
+        }
+    }
+    Type {
+        name: "QtQuick3D.Effects.EdgeDetect"
+        icon: "images/effect16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: false
+        }
+
+        ItemLibraryEntry {
+            name: "Edge Detect"
+            category: "Qt Quick 3D Effects"
+            libraryIcon: "images/effect.png"
+            version: "1.0"
+            requiredImport: "QtQuick3D.Effects"
+        }
+    }
+    Type {
+        name: "QtQuick3D.Effects.Emboss"
+        icon: "images/effect16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: false
+        }
+
+        ItemLibraryEntry {
+            name: "Emboss"
+            category: "Qt Quick 3D Effects"
+            libraryIcon: "images/effect.png"
+            version: "1.0"
+            requiredImport: "QtQuick3D.Effects"
+        }
+    }
+    Type {
+        name: "QtQuick3D.Effects.Flip"
+        icon: "images/effect16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: false
+        }
+
+        ItemLibraryEntry {
+            name: "Flip"
+            category: "Qt Quick 3D Effects"
+            libraryIcon: "images/effect.png"
+            version: "1.0"
+            requiredImport: "QtQuick3D.Effects"
+        }
+    }
+    Type {
+        name: "QtQuick3D.Effects.Fxaa"
+        icon: "images/effect16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: false
+        }
+
+        ItemLibraryEntry {
+            name: "Fxaa"
+            category: "Qt Quick 3D Effects"
+            libraryIcon: "images/effect.png"
+            version: "1.0"
+            requiredImport: "QtQuick3D.Effects"
+        }
+    }
+    Type {
+        name: "QtQuick3D.Effects.GaussianBlur"
+        icon: "images/effect16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: false
+        }
+
+        ItemLibraryEntry {
+            name: "Gaussian Blur"
+            category: "Qt Quick 3D Effects"
+            libraryIcon: "images/effect.png"
+            version: "1.0"
+            requiredImport: "QtQuick3D.Effects"
+        }
+    }
+    Type {
+        name: "QtQuick3D.Effects.HDRBloomTonemap"
+        icon: "images/effect16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: false
+        }
+
+        ItemLibraryEntry {
+            name: "HDR Bloom Tonemap"
+            category: "Qt Quick 3D Effects"
+            libraryIcon: "images/effect.png"
+            version: "1.0"
+            requiredImport: "QtQuick3D.Effects"
+        }
+    }
+    Type {
+        name: "QtQuick3D.Effects.MotionBlur"
+        icon: "images/effect16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: false
+        }
+
+        ItemLibraryEntry {
+            name: "Motion Blur"
+            category: "Qt Quick 3D Effects"
+            libraryIcon: "images/effect.png"
+            version: "1.0"
+            requiredImport: "QtQuick3D.Effects"
+        }
+    }
+    Type {
+        name: "QtQuick3D.Effects.Scatter"
+        icon: "images/effect16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: false
+        }
+
+        ItemLibraryEntry {
+            name: "Scatter"
+            category: "Qt Quick 3D Effects"
+            libraryIcon: "images/effect.png"
+            version: "1.0"
+            requiredImport: "QtQuick3D.Effects"
+        }
+    }
+    Type {
+        name: "QtQuick3D.Effects.SCurveTonemap"
+        icon: "images/effect16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: false
+        }
+
+        ItemLibraryEntry {
+            name: "SCurve Tonemap"
+            category: "Qt Quick 3D Effects"
+            libraryIcon: "images/effect.png"
+            version: "1.0"
+            requiredImport: "QtQuick3D.Effects"
+        }
+    }
+    Type {
+        name: "QtQuick3D.Effects.TiltShift"
+        icon: "images/effect16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: false
+        }
+
+        ItemLibraryEntry {
+            name: "Tilt Shift"
+            category: "Qt Quick 3D Effects"
+            libraryIcon: "images/effect.png"
+            version: "1.0"
+            requiredImport: "QtQuick3D.Effects"
+        }
+    }
+    Type {
+        name: "QtQuick3D.Effects.Vignette"
+        icon: "images/effect16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: false
+        }
+
+        ItemLibraryEntry {
+            name: "Vignette"
+            category: "Qt Quick 3D Effects"
+            libraryIcon: "images/effect.png"
+            version: "1.0"
+            requiredImport: "QtQuick3D.Effects"
+        }
+    }
+}
diff --git a/tests/unit/tests/unittests/projectstorage/data/qml/QtQuick3D/Helpers/designer/helpers.metainfo b/tests/unit/tests/unittests/projectstorage/data/qml/QtQuick3D/Helpers/designer/helpers.metainfo
new file mode 100644
index 0000000000..83492e2c81
--- /dev/null
+++ b/tests/unit/tests/unittests/projectstorage/data/qml/QtQuick3D/Helpers/designer/helpers.metainfo
@@ -0,0 +1,261 @@
+MetaInfo {
+    Type {
+        name: "QtQuick3D.Helpers.LookAtNode"
+        icon: "images/lookatnode16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+        }
+
+        ItemLibraryEntry {
+            name: "Look-at Node"
+            category: "Helpers"
+            libraryIcon: "images/lookatnode.png"
+            version: "6.4"
+            requiredImport: "QtQuick3D.Helpers"
+        }
+    }
+
+    Type {
+        name: "QtQuick3D.Helpers.AxisHelper"
+        icon: "images/axishelper16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+        }
+
+        ItemLibraryEntry {
+            name: "Axis Helper"
+            category: "Helpers"
+            libraryIcon: "images/axishelper.png"
+            version: "6.0"
+            requiredImport: "QtQuick3D.Helpers"
+        }
+    }
+
+    Type {
+        name: "QtQuick3D.Helpers.DebugView"
+        icon: "images/debugview16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: true
+            canBeDroppedInView3D: false
+        }
+
+        ItemLibraryEntry {
+            name: "Debug View"
+            category: "Helpers"
+            libraryIcon: "images/debugview.png"
+            version: "6.0"
+            requiredImport: "QtQuick3D.Helpers"
+        }
+    }
+
+    Type {
+        name: "QtQuick3D.Helpers.GridGeometry"
+        icon: "images/gridgeometry16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+        }
+
+        ItemLibraryEntry {
+            name: "Grid Geometry"
+            category: "Helpers"
+            libraryIcon: "images/gridgeometry.png"
+            version: "6.0"
+            requiredImport: "QtQuick3D.Helpers"
+        }
+    }
+
+    Type {
+        name: "QtQuick3D.Helpers.HeightFieldGeometry"
+        icon: "images/heightfieldgeometry16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+        }
+
+        ItemLibraryEntry {
+            name: "Height Field Geometry"
+            category: "Helpers"
+            libraryIcon: "images/heightfieldgeometry.png"
+            version: "6.4"
+            requiredImport: "QtQuick3D.Helpers"
+        }
+    }
+
+    Type {
+        name: "QtQuick3D.Helpers.InstanceModel"
+        icon: "images/instancemodel16.png"
+
+        Hints {
+            visibleInNavigator: false
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: false
+        }
+
+        ItemLibraryEntry {
+            name: "Instance Model"
+            category: "Helpers"
+            libraryIcon: "images/instancemodel.png"
+            version: "6.4"
+            requiredImport: "QtQuick3D.Helpers"
+        }
+    }
+
+    Type {
+        name: "QtQuick3D.Helpers.InstanceRepeater"
+        icon: "images/instancerepeater16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+        }
+
+        ItemLibraryEntry {
+            name: "Instance Repeater"
+            category: "Helpers"
+            libraryIcon: "images/instancerepeater.png"
+            version: "6.4"
+            requiredImport: "QtQuick3D.Helpers"
+        }
+    }
+
+    Type {
+        name: "QtQuick3D.Helpers.WasdController"
+        icon: "images/wasdcontroller16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: true
+            canBeDroppedInView3D: false
+        }
+
+        ItemLibraryEntry {
+            name: "Wasd Controller"
+            category: "Helpers"
+            libraryIcon: "images/wasdcontroller.png"
+            version: "6.0"
+            requiredImport: "QtQuick3D.Helpers"
+        }
+    }
+
+    Type {
+        name: "QtQuick3D.Helpers.InfiniteGrid"
+        icon: "images/infinitegrid16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: false
+        }
+
+        ItemLibraryEntry {
+            name: "Infinite Grid"
+            category: "Helpers"
+            libraryIcon: "images/infinitegrid.png"
+            version: "6.5"
+            requiredImport: "QtQuick3D.Helpers"
+        }
+    }
+
+    Type {
+        name: "QtQuick3D.Helpers.OrbitCameraController"
+        icon: "images/orbitcameracontroller16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: true
+            canBeDroppedInView3D: false
+        }
+
+        ItemLibraryEntry {
+            name: "Orbit Camera Controller"
+            category: "Helpers"
+            libraryIcon: "images/orbitcameracontroller.png"
+            version: "6.4"
+            requiredImport: "QtQuick3D.Helpers"
+        }
+    }
+
+    Type {
+        name: "QtQuick3D.Helpers.ProceduralSkyTextureData"
+        icon: "images/proceduralskytexturedata16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: false
+        }
+
+        ItemLibraryEntry {
+            name: "Procedural Sky Texture Data"
+            category: "Helpers"
+            libraryIcon: "images/proceduralskytexturedata.png"
+            version: "6.4"
+            requiredImport: "QtQuick3D.Helpers"
+        }
+    }
+
+    Type {
+        name: "QtQuick3D.Helpers.ExtendedSceneEnvironment"
+        icon: "images/extendedsceneenvironment16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: false
+        }
+
+        ItemLibraryEntry {
+            name: "Extended Scene Environment"
+            category: "Helpers"
+            libraryIcon: "images/extendedsceneenvironment.png"
+            version: "6.5"
+            requiredImport: "QtQuick3D.Helpers"
+        }
+    }
+
+    Type {
+        name: "QtQuick3D.Helpers.LodManager"
+        icon: "images/lodmanager16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+        }
+
+        ItemLibraryEntry {
+            name: "Lod Manager"
+            category: "Helpers"
+            libraryIcon: "images/lodmanager.png"
+            version: "6.5"
+            requiredImport: "QtQuick3D.Helpers"
+        }
+    }
+}
diff --git a/tests/unit/tests/unittests/projectstorage/data/qml/QtQuick3D/ParticleEffects/designer/particleeffects.metainfo b/tests/unit/tests/unittests/projectstorage/data/qml/QtQuick3D/ParticleEffects/designer/particleeffects.metainfo
new file mode 100644
index 0000000000..d9bc305b4a
--- /dev/null
+++ b/tests/unit/tests/unittests/projectstorage/data/qml/QtQuick3D/ParticleEffects/designer/particleeffects.metainfo
@@ -0,0 +1,246 @@
+MetaInfo {
+    Type {
+        name: "QtQuick3D.Particle3D.ParticleSystem3D"
+        icon: "images/dummy16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+         }
+
+        ItemLibraryEntry {
+            name: "Clouds"
+            category: "Qt Quick 3D Particle Effects"
+            libraryIcon: "images/dummy.png"
+            version: "6.2"
+            requiredImport: "QtQuick3D.ParticleEffects"
+            QmlSource { source: "./source/particleeffect_clouds.qml" }
+            ExtraFile { source: "images/smoke_sprite2.png" }
+        }
+    }
+
+    Type {
+        name: "QtQuick3D.Particle3D.ParticleSystem3D"
+        icon: "images/dummy16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+         }
+
+        ItemLibraryEntry {
+            name: "Dust"
+            category: "Qt Quick 3D Particle Effects"
+            libraryIcon: "images/dummy.png"
+            version: "6.2"
+            requiredImport: "QtQuick3D.ParticleEffects"
+            QmlSource { source: "./source/particleeffect_dust.qml" }
+            ExtraFile { source: "images/sphere.png" }
+        }
+    }
+
+    Type {
+        name: "QtQuick3D.Particle3D.ParticleSystem3D"
+        icon: "images/dummy16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+         }
+
+        ItemLibraryEntry {
+            name: "Exhaust"
+            category: "Qt Quick 3D Particle Effects"
+            libraryIcon: "images/dummy.png"
+            version: "6.2"
+            requiredImport: "QtQuick3D.ParticleEffects"
+            QmlSource { source: "./source/particleeffect_exhaust.qml" }
+            ExtraFile { source: "images/smoke2.png" }
+        }
+    }
+
+    Type {
+        name: "QtQuick3D.Particle3D.ParticleSystem3D"
+        icon: "images/dummy16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+         }
+
+        ItemLibraryEntry {
+            name: "Fire"
+            category: "Qt Quick 3D Particle Effects"
+            libraryIcon: "images/dummy.png"
+            version: "6.2"
+            requiredImport: "QtQuick3D.ParticleEffects"
+            QmlSource { source: "./source/particleeffect_fire.qml" }
+            ExtraFile { source: "images/smoke_sprite.png" }
+            ExtraFile { source: "images/sphere.png" }
+            ExtraFile { source: "images/color_table.png" }
+            ExtraFile { source: "images/color_table2.png" }
+        }
+    }
+
+    Type {
+        name: "QtQuick3D.Particle3D.ParticleSystem3D"
+        icon: "images/dummy16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+         }
+
+        ItemLibraryEntry {
+            name: "Heavy Rain"
+            category: "Qt Quick 3D Particle Effects"
+            libraryIcon: "images/dummy.png"
+            version: "6.2"
+            requiredImport: "QtQuick3D.ParticleEffects"
+            QmlSource { source: "./source/particleeffect_heavyrain.qml" }
+            ExtraFile { source: "images/rain.png" }
+            ExtraFile { source: "images/sphere.png" }
+            ExtraFile { source: "images/ripple.png" }
+            ExtraFile { source: "images/splash7.png" }
+        }
+    }
+
+    Type {
+        name: "QtQuick3D.Particle3D.ParticleSystem3D"
+        icon: "images/dummy16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+         }
+
+        ItemLibraryEntry {
+            name: "Heavy Rain - Tire Spray"
+            category: "Qt Quick 3D Particle Effects"
+            libraryIcon: "images/dummy.png"
+            version: "6.2"
+            requiredImport: "QtQuick3D.ParticleEffects"
+            QmlSource { source: "./source/particleeffect_heavyrain_tirespray.qml" }
+            ExtraFile { source: "images/smoke2.png" }
+        }
+    }
+
+    Type {
+        name: "QtQuick3D.Particle3D.ParticleSystem3D"
+        icon: "images/dummy16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+         }
+
+        ItemLibraryEntry {
+            name: "Light Rain"
+            category: "Qt Quick 3D Particle Effects"
+            libraryIcon: "images/dummy.png"
+            version: "6.2"
+            requiredImport: "QtQuick3D.ParticleEffects"
+            QmlSource { source: "./source/particleeffect_lightrain.qml" }
+            ExtraFile { source: "images/rain.png" }
+            ExtraFile { source: "images/splash7.png" }
+        }
+    }
+    Type {
+        name: "QtQuick3D.Particle3D.ParticleSystem3D"
+        icon: "images/dummy16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+         }
+
+        ItemLibraryEntry {
+            name: "Light Rain - Tire Spray"
+            category: "Qt Quick 3D Particle Effects"
+            libraryIcon: "images/dummy.png"
+            version: "6.2"
+            requiredImport: "QtQuick3D.ParticleEffects"
+            QmlSource { source: "./source/particleeffect_lightrain_tirespray.qml" }
+            ExtraFile { source: "images/smoke2.png" }
+        }
+    }
+    Type {
+        name: "QtQuick3D.Particle3D.ParticleSystem3D"
+        icon: "images/dummy16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+         }
+
+        ItemLibraryEntry {
+            name: "Rain Mist"
+            category: "Qt Quick 3D Particle Effects"
+            libraryIcon: "images/dummy.png"
+            version: "6.2"
+            requiredImport: "QtQuick3D.ParticleEffects"
+            QmlSource { source: "./source/particleeffect_rainmist.qml" }
+            ExtraFile { source: "images/smoke2.png" }
+        }
+    }
+    Type {
+        name: "QtQuick3D.Particle3D.ParticleSystem3D"
+        icon: "images/dummy16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+         }
+
+        ItemLibraryEntry {
+            name: "Snow"
+            category: "Qt Quick 3D Particle Effects"
+            libraryIcon: "images/dummy.png"
+            version: "6.2"
+            requiredImport: "QtQuick3D.ParticleEffects"
+            QmlSource { source: "./source/particleeffect_snow.qml" }
+            ExtraFile { source: "images/snowflake.png" }
+        }
+    }
+    Type {
+        name: "QtQuick3D.Particle3D.ParticleSystem3D"
+        icon: "images/dummy16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+         }
+
+        ItemLibraryEntry {
+            name: "Steam"
+            category: "Qt Quick 3D Particle Effects"
+            libraryIcon: "images/dummy.png"
+            version: "6.2"
+            requiredImport: "QtQuick3D.ParticleEffects"
+            QmlSource { source: "./source/particleeffect_steam.qml" }
+            ExtraFile { source: "images/smoke2.png" }
+        }
+    }
+}
diff --git a/tests/unit/tests/unittests/projectstorage/data/qml/QtQuick3D/Particles3D/designer/particles3d.metainfo b/tests/unit/tests/unittests/projectstorage/data/qml/QtQuick3D/Particles3D/designer/particles3d.metainfo
new file mode 100644
index 0000000000..d2a2999c50
--- /dev/null
+++ b/tests/unit/tests/unittests/projectstorage/data/qml/QtQuick3D/Particles3D/designer/particles3d.metainfo
@@ -0,0 +1,562 @@
+MetaInfo {
+    Type {
+        name: "QtQuick3D.Particles3D.Attractor3D"
+        icon: "images/attractor-16px.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+         }
+
+        ItemLibraryEntry {
+            name: "Attractor"
+            category: "Qt Quick 3D Particles 3D"
+            libraryIcon: "images/attractor-24px.png"
+            version: "6.2"
+            requiredImport: "QtQuick3D.Particles3D"
+        }
+    }
+    Type {
+        name: "QtQuick3D.Particles3D.DynamicBurst3D"
+        icon: "images/emit-burst-16px.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+         }
+
+        ItemLibraryEntry {
+            name: "Dynamic Burst"
+            category: "Qt Quick 3D Particles 3D"
+            libraryIcon: "images/emit-burst-24px.png"
+            version: "6.3"
+            requiredImport: "QtQuick3D.Particles3D"
+        }
+    }
+    Type {
+        name: "QtQuick3D.Particles3D.EmitBurst3D"
+        icon: "images/emit-burst-16px.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+         }
+
+        ItemLibraryEntry {
+            name: "Emit Burst"
+            category: "Qt Quick 3D Particles 3D"
+            libraryIcon: "images/emit-burst-24px.png"
+            version: "6.2"
+            requiredImport: "QtQuick3D.Particles3D"
+        }
+    }
+    Type {
+        name: "QtQuick3D.Particles3D.ParticleEmitter3D"
+        icon: "images/emitter-16px.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+         }
+
+        ItemLibraryEntry {
+            name: "Emitter"
+            category: "Qt Quick 3D Particles 3D"
+            libraryIcon: "images/emitter-24px.png"
+            version: "6.2"
+            requiredImport: "QtQuick3D.Particles3D"
+        }
+    }
+    Type {
+        name: "QtQuick3D.Particles3D.Gravity3D"
+        icon: "images/gravity-16px.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+         }
+
+        ItemLibraryEntry {
+            name: "Gravity"
+            category: "Qt Quick 3D Particles 3D"
+            libraryIcon: "images/gravity-24px.png"
+            version: "6.2"
+            requiredImport: "QtQuick3D.Particles3D"
+        }
+    }
+    Type {
+        name: "QtQuick3D.Particles3D.ModelBlendParticle3D"
+        icon: "images/model-blend-particle-16px.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+         }
+
+        ItemLibraryEntry {
+            name: "Model Blend Particle"
+            category: "Qt Quick 3D Particles 3D"
+            libraryIcon: "images/model-blend-particle-24px.png"
+            version: "6.2"
+            requiredImport: "QtQuick3D.Particles3D"
+        }
+    }
+    Type {
+        name: "QtQuick3D.Particles3D.ModelParticle3D"
+        icon: "images/model-particle-16px.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+         }
+
+        ItemLibraryEntry {
+            name: "Model Particle"
+            category: "Qt Quick 3D Particles 3D"
+            libraryIcon: "images/model-particle-24px.png"
+            version: "6.2"
+            requiredImport: "QtQuick3D.Particles3D"
+        }
+    }
+    Type {
+        name: "QtQuick3D.Particles3D.ParticleCustomShape3D"
+        icon: "images/particle-custom-shape-16px.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+         }
+
+        ItemLibraryEntry {
+            name: "Custom Shape"
+            category: "Qt Quick 3D Particles 3D"
+            libraryIcon: "images/particle-custom-shape-24px.png"
+            version: "6.3"
+            requiredImport: "QtQuick3D.Particles3D"
+        }
+    }
+    Type {
+        name: "QtQuick3D.Particles3D.ParticleModelShape3D"
+        icon: "images/model-shape-16px.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+         }
+
+        ItemLibraryEntry {
+            name: "Model Shape"
+            category: "Qt Quick 3D Particles 3D"
+            libraryIcon: "images/model-shape-24px.png"
+            version: "6.2"
+            requiredImport: "QtQuick3D.Particles3D"
+        }
+    }
+    Type {
+        name: "QtQuick3D.Particles3D.PointRotator3D"
+        icon: "images/point-rotator-16px.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+         }
+
+        ItemLibraryEntry {
+            name: "Point Rotator"
+            category: "Qt Quick 3D Particles 3D"
+            libraryIcon: "images/point-rotator-24px.png"
+            version: "6.2"
+            requiredImport: "QtQuick3D.Particles3D"
+        }
+    }
+    Type {
+        name: "QtQuick3D.Particles3D.ParticleShape3D"
+        icon: "images/particle-shape-16px.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+         }
+
+        ItemLibraryEntry {
+            name: "Particle Shape"
+            category: "Qt Quick 3D Particles 3D"
+            libraryIcon: "images/particle-shape-24px.png"
+            version: "6.2"
+            requiredImport: "QtQuick3D.Particles3D"
+        }
+    }
+    Type {
+        name: "QtQuick3D.Particles3D.SpriteParticle3D"
+        icon: "images/sprite-particle-16px.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+         }
+
+        ItemLibraryEntry {
+            name: "Sprite Particle"
+            category: "Qt Quick 3D Particles 3D"
+            libraryIcon: "images/sprite-particle-24px.png"
+            version: "6.2"
+            requiredImport: "QtQuick3D.Particles3D"
+        }
+    }
+    Type {
+        name: "QtQuick3D.Particles3D.SpriteSequence3D"
+        icon: "images/sprite-sequence-16px.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+         }
+
+        ItemLibraryEntry {
+            name: "Sprite Sequence"
+            category: "Qt Quick 3D Particles 3D"
+            libraryIcon: "images/sprite-sequence-24px.png"
+            version: "6.2"
+            requiredImport: "QtQuick3D.Particles3D"
+        }
+    }
+    Type {
+        name: "QtQuick3D.Particles3D.ParticleSystem3D"
+        icon: "images/particle-system-16px.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+         }
+
+        ItemLibraryEntry {
+            name: "Particle System"
+            category: "Qt Quick 3D Particles 3D"
+            libraryIcon: "images/particle-system-24px.png"
+            version: "6.2"
+            requiredImport: "QtQuick3D.Particles3D"
+            QmlSource { source: "./source/particlesystem_template.qml" }
+        }
+    }
+    Type {
+        name: "QtQuick3D.Particles3D.TargetDirection3D"
+        icon: "images/target-direction-16px.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+         }
+
+        ItemLibraryEntry {
+            name: "Target Direction"
+            category: "Qt Quick 3D Particles 3D"
+            libraryIcon: "images/target-direction-24px.png"
+            version: "6.2"
+            requiredImport: "QtQuick3D.Particles3D"
+        }
+    }
+    Type {
+        name: "QtQuick3D.Particles3D.TrailEmitter3D"
+        icon: "images/trail-emitter-16px.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+         }
+
+        ItemLibraryEntry {
+            name: "Trail Emitter"
+            category: "Qt Quick 3D Particles 3D"
+            libraryIcon: "images/trail-emitter-24px.png"
+            version: "6.2"
+            requiredImport: "QtQuick3D.Particles3D"
+        }
+    }
+    Type {
+        name: "QtQuick3D.Particles3D.VectorDirection3D"
+        icon: "images/vector-direction-16px.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+         }
+
+        ItemLibraryEntry {
+            name: "Vector Direction"
+            category: "Qt Quick 3D Particles 3D"
+            libraryIcon: "images/vector-direction-24px.png"
+            version: "6.2"
+            requiredImport: "QtQuick3D.Particles3D"
+        }
+    }
+    Type {
+        name: "QtQuick3D.Particles3D.Wander3D"
+        icon: "images/wander-16px.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+         }
+
+        ItemLibraryEntry {
+            name: "Wander"
+            category: "Qt Quick 3D Particles 3D"
+            libraryIcon: "images/wander-24px.png"
+            version: "6.2"
+            requiredImport: "QtQuick3D.Particles3D"
+        }
+    }
+    Type {
+        name: "QtQuick3D.Particles3D.ParticleSystem3D"
+        icon: "images/particle-system-16px.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+         }
+
+        ItemLibraryEntry {
+            name: "Animated Sprite"
+            category: "Qt Quick 3D Particle System Templates"
+            libraryIcon: "images/particle-system-24px.png"
+            version: "6.2"
+            requiredImport: "QtQuick3D.Particles3D"
+            QmlSource { source: "./source/particlesystem_animatedsprite_template.qml" }
+        }
+    }
+    Type {
+        name: "QtQuick3D.Particles3D.ParticleSystem3D"
+        icon: "images/particle-system-16px.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+         }
+
+        ItemLibraryEntry {
+            name: "Attractor System"
+            category: "Qt Quick 3D Particle System Templates"
+            libraryIcon: "images/particle-system-24px.png"
+            version: "6.2"
+            requiredImport: "QtQuick3D.Particles3D"
+            QmlSource { source: "./source/particlesystem_attractor_template.qml" }
+        }
+    }
+    Type {
+        name: "QtQuick3D.Particles3D.ParticleSystem3D"
+        icon: "images/particle-system-16px.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+         }
+
+        ItemLibraryEntry {
+            name: "Burst"
+            category: "Qt Quick 3D Particle System Templates"
+            libraryIcon: "images/particle-system-24px.png"
+            version: "6.2"
+            requiredImport: "QtQuick3D.Particles3D"
+            QmlSource { source: "./source/particlesystem_burst_template.qml" }
+        }
+    }
+    Type {
+        name: "QtQuick3D.Particles3D.ParticleSystem3D"
+        icon: "images/particle-system-16px.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+         }
+
+        ItemLibraryEntry {
+            name: "Model Blend"
+            category: "Qt Quick 3D Particle System Templates"
+            libraryIcon: "images/particle-system-24px.png"
+            version: "6.2"
+            requiredImport: "QtQuick3D.Particles3D"
+            QmlSource { source: "./source/particlesystem_modelblend_template.qml" }
+        }
+    }
+    Type {
+        name: "QtQuick3D.Particles3D.ParticleSystem3D"
+        icon: "images/particle-system-16px.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+         }
+
+        ItemLibraryEntry {
+            name: "Model Shape"
+            category: "Qt Quick 3D Particle System Templates"
+            libraryIcon: "images/particle-system-24px.png"
+            version: "6.2"
+            requiredImport: "QtQuick3D.Particles3D"
+            QmlSource { source: "./source/particlesystem_modelshape_template.qml" }
+        }
+    }
+    Type {
+        name: "QtQuick3D.Particles3D.ParticleSystem3D"
+        icon: "images/particle-system-16px.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+         }
+
+        ItemLibraryEntry {
+            name: "Particle Trail"
+            category: "Qt Quick 3D Particle System Templates"
+            libraryIcon: "images/particle-system-24px.png"
+            version: "6.2"
+            requiredImport: "QtQuick3D.Particles3D"
+            QmlSource { source: "./source/particlesystem_particletrail_template.qml" }
+        }
+    }
+    Type {
+        name: "QtQuick3D.Particles3D.ParticleSystem3D"
+        icon: "images/particle-system-16px.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+         }
+
+        ItemLibraryEntry {
+            name: "Sprite"
+            category: "Qt Quick 3D Particle System Templates"
+            libraryIcon: "images/particle-system-24px.png"
+            version: "6.2"
+            requiredImport: "QtQuick3D.Particles3D"
+            QmlSource { source: "./source/particlesystem_sprite_template.qml" }
+        }
+    }
+    Type {
+        name: "QtQuick3D.Particles3D.ParticleSystem3D"
+        icon: "images/particle-system-16px.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+         }
+
+        ItemLibraryEntry {
+            name: "Wander"
+            category: "Qt Quick 3D Particle System Templates"
+            libraryIcon: "images/particle-system-24px.png"
+            version: "6.2"
+            requiredImport: "QtQuick3D.Particles3D"
+            QmlSource { source: "./source/particlesystem_wander_template.qml" }
+        }
+    }
+    Type {
+        name: "QtQuick3D.Particles3D.LineParticle3D"
+        icon: "images/line-particle-16px.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+         }
+
+        ItemLibraryEntry {
+            name: "Line Particle"
+            category: "Qt Quick 3D Particles 3D"
+            libraryIcon: "images/line-particle-24px.png"
+            version: "6.4"
+            requiredImport: "QtQuick3D.Particles3D"
+        }
+    }
+    Type {
+        name: "QtQuick3D.Particles3D.Repeller3D"
+        icon: "images/repeller-16px.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+         }
+
+        ItemLibraryEntry {
+            name: "Repeller"
+            category: "Qt Quick 3D Particles 3D"
+            libraryIcon: "images/repeller-24px.png"
+            version: "6.4"
+            requiredImport: "QtQuick3D.Particles3D"
+        }
+    }
+    Type {
+        name: "QtQuick3D.Particles3D.ScaleAffector3D"
+        icon: "images/scale-affector-16px.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+         }
+
+        ItemLibraryEntry {
+            name: "Scale Affector"
+            category: "Qt Quick 3D Particles 3D"
+            libraryIcon: "images/scale-affector-24px.png"
+            version: "6.4"
+            requiredImport: "QtQuick3D.Particles3D"
+        }
+    }
+}
diff --git a/tests/unit/tests/unittests/projectstorage/data/qml/QtQuick3D/Physics/designer/physics.metainfo b/tests/unit/tests/unittests/projectstorage/data/qml/QtQuick3D/Physics/designer/physics.metainfo
new file mode 100644
index 0000000000..874e209dc5
--- /dev/null
+++ b/tests/unit/tests/unittests/projectstorage/data/qml/QtQuick3D/Physics/designer/physics.metainfo
@@ -0,0 +1,261 @@
+MetaInfo {
+    Type {
+        name: "QtQuick3D.Physics.PhysicsWorld"
+        icon: "images/physicsworld16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: false
+        }
+
+        ItemLibraryEntry {
+            name: "Physics World"
+            category: "Components"
+            libraryIcon: "images/physicsworld.png"
+            version: "6.5"
+            requiredImport: "QtQuick3D.Physics"
+        }
+    }
+
+    Type {
+        name: "QtQuick3D.Physics.TriggerBody"
+        icon: "images/triggerbody16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+        }
+
+        ItemLibraryEntry {
+            name: "Trigger Body"
+            category: "Collision Bodies"
+            libraryIcon: "images/triggerbody.png"
+            version: "6.5"
+            requiredImport: "QtQuick3D.Physics"
+        }
+    }
+
+    Type {
+        name: "QtQuick3D.Physics.StaticRigidBody"
+        icon: "images/staticrigidbody16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+        }
+
+        ItemLibraryEntry {
+            name: "Static Rigid Body"
+            category: "Collision Bodies"
+            libraryIcon: "images/staticrigidbody.png"
+            version: "6.5"
+            requiredImport: "QtQuick3D.Physics"
+        }
+    }
+
+    Type {
+        name: "QtQuick3D.Physics.DynamicRigidBody"
+        icon: "images/dynamicrigidbody16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+        }
+
+        ItemLibraryEntry {
+            name: "Dynamic Rigid Body"
+            category: "Collision Bodies"
+            libraryIcon: "images/dynamicrigidbody.png"
+            version: "6.5"
+            requiredImport: "QtQuick3D.Physics"
+        }
+    }
+
+    Type {
+        name: "QtQuick3D.Physics.PhysicsMaterial"
+        icon: "images/physicsmaterial16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: false
+        }
+
+        ItemLibraryEntry {
+            name: "Physics Material"
+            category: "Components"
+            libraryIcon: "images/physicsmaterial.png"
+            version: "6.5"
+            requiredImport: "QtQuick3D.Physics"
+        }
+    }
+
+    Type {
+        name: "QtQuick3D.Physics.BoxShape"
+        icon: "images/boxshape16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+        }
+
+        ItemLibraryEntry {
+            name: "Box Shape"
+            category: "Collision Shapes"
+            libraryIcon: "images/boxshape.png"
+            version: "6.5"
+            requiredImport: "QtQuick3D.Physics"
+        }
+    }
+
+    Type {
+        name: "QtQuick3D.Physics.CapsuleShape"
+        icon: "images/capsuleshape16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+        }
+
+        ItemLibraryEntry {
+            name: "Capsule Shape"
+            category: "Collision Shapes"
+            libraryIcon: "images/capsuleshape.png"
+            version: "6.5"
+            requiredImport: "QtQuick3D.Physics"
+        }
+    }
+
+    Type {
+        name: "QtQuick3D.Physics.ConvexMeshShape"
+        icon: "images/convexmeshshape16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+        }
+
+        ItemLibraryEntry {
+            name: "Convex Mesh Shape"
+            category: "Collision Shapes"
+            libraryIcon: "images/convexmeshshape.png"
+            version: "6.5"
+            requiredImport: "QtQuick3D.Physics"
+        }
+    }
+
+    Type {
+        name: "QtQuick3D.Physics.HeightFieldShape"
+        icon: "images/heightfieldshape16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+        }
+
+        ItemLibraryEntry {
+            name: "Height Field Shape"
+            category: "Collision Shapes"
+            libraryIcon: "images/heightfieldshape.png"
+            version: "6.5"
+            requiredImport: "QtQuick3D.Physics"
+        }
+    }
+
+    Type {
+        name: "QtQuick3D.Physics.PlaneShape"
+        icon: "images/planeshape16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+        }
+
+        ItemLibraryEntry {
+            name: "Plane Shape"
+            category: "Collision Shapes"
+            libraryIcon: "images/planeshape.png"
+            version: "6.5"
+            requiredImport: "QtQuick3D.Physics"
+        }
+    }
+
+    Type {
+        name: "QtQuick3D.Physics.SphereShape"
+        icon: "images/sphereshape16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+        }
+
+        ItemLibraryEntry {
+            name: "Sphere Shape"
+            category: "Collision Shapes"
+            libraryIcon: "images/sphereshape.png"
+            version: "6.5"
+            requiredImport: "QtQuick3D.Physics"
+        }
+    }
+
+    Type {
+        name: "QtQuick3D.Physics.TriangleMeshShape"
+        icon: "images/trianglemeshshape16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+        }
+
+        ItemLibraryEntry {
+            name: "Triangle Mesh Shape"
+            category: "Collision Shapes"
+            libraryIcon: "images/trianglemeshshape.png"
+            version: "6.5"
+            requiredImport: "QtQuick3D.Physics"
+        }
+    }
+
+    Type {
+        name: "QtQuick3D.Physics.CharacterController"
+        icon: "images/charactercontroller16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+        }
+
+        ItemLibraryEntry {
+            name: "Character Controller"
+            category: "Collision Bodies"
+            libraryIcon: "images/charactercontroller.png"
+            version: "6.5"
+            requiredImport: "QtQuick3D.Physics"
+        }
+    }
+}
diff --git a/tests/unit/tests/unittests/projectstorage/data/qml/QtQuick3D/designer/quick3d.metainfo b/tests/unit/tests/unittests/projectstorage/data/qml/QtQuick3D/designer/quick3d.metainfo
new file mode 100644
index 0000000000..852f908129
--- /dev/null
+++ b/tests/unit/tests/unittests/projectstorage/data/qml/QtQuick3D/designer/quick3d.metainfo
@@ -0,0 +1,861 @@
+MetaInfo {
+    Type {
+        name: "QtQuick3D.PerspectiveCamera"
+        icon: "images/camera16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+        }
+
+        ItemLibraryEntry {
+            name: "Perspective Camera"
+            category: "Cameras"
+            libraryIcon: "images/camera.png"
+            version: "6.0"
+            requiredImport: "QtQuick3D"
+            Property { name: "z"; type: "int"; value: 500; }
+            toolTip: qsTr("A camera that uses perspective projection.")
+        }
+    }
+    Type {
+        name: "QtQuick3D.OrthographicCamera"
+        icon: "images/camera16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+        }
+
+        ItemLibraryEntry {
+            name: "Orthographic Camera"
+            category: "Cameras"
+            libraryIcon: "images/camera.png"
+            version: "6.0"
+            requiredImport: "QtQuick3D"
+            Property { name: "z"; type: "int"; value: 500; }
+            toolTip: qsTr("A parallel projection Camera, in which an object's perceived scale is unaffected by its distance from the Camera.")
+        }
+    }
+    Type {
+        name: "QtQuick3D.FrustumCamera"
+        icon: "images/camera16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+        }
+
+        ItemLibraryEntry {
+            name: "Frustum Camera"
+            category: "Cameras"
+            libraryIcon: "images/camera.png"
+            version: "6.0"
+            requiredImport: "QtQuick3D"
+            Property { name: "z"; type: "int"; value: 500; }
+            toolTip: qsTr("A perspective camera with a custom frustum.")
+        }
+    }
+    Type {
+        name: "QtQuick3D.CustomCamera"
+        icon: "images/camera16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+        }
+
+        ItemLibraryEntry {
+            name: "Custom Camera"
+            category: "Cameras"
+            libraryIcon: "images/camera.png"
+            version: "6.0"
+            requiredImport: "QtQuick3D"
+            Property { name: "z"; type: "int"; value: 500; }
+            toolTip: qsTr("A camera with a custom projection matrix.")
+        }
+    }
+    Type {
+        name: "QtQuick3D.CustomMaterial"
+        icon: "images/custommaterial16.png"
+
+        Hints {
+            visibleInNavigator: false
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+        }
+
+        ItemLibraryEntry {
+            name: "Custom Material"
+            category: "Materials"
+            libraryIcon: "images/custommaterial.png"
+            version: "6.0"
+            requiredImport: "QtQuick3D"
+            Property { name: "fragmentShader"; type: "QUrl"; value: "custom_material_default_shader.frag"; }
+            ExtraFile { source: "source/custom_material_default_shader.frag" }
+            toolTip: qsTr("A material with customizable vertex and fragment shaders.")
+        }
+    }
+    Type {
+        name: "QtQuick3D.DefaultMaterial"
+        icon: "images/material16.png"
+
+        Hints {
+            visibleInNavigator: false
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+        }
+
+        ItemLibraryEntry {
+            name: "Default Material"
+            category: "Materials"
+            libraryIcon: "images/material.png"
+            version: "6.0"
+            requiredImport: "QtQuick3D"
+            Property { name: "diffuseColor"; type: "color"; value: "#4aee45"; }
+            toolTip: qsTr("A material with a specular/glossiness properties.")
+        }
+    }
+    Type {
+        name: "QtQuick3D.PrincipledMaterial"
+        icon: "images/material16.png"
+
+        Hints {
+            visibleInNavigator: false
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+        }
+
+        ItemLibraryEntry {
+            name: "Principled Material"
+            category: "Materials"
+            libraryIcon: "images/material.png"
+            version: "6.0"
+            requiredImport: "QtQuick3D"
+            Property { name: "baseColor"; type: "color"; value: "#4aee45"; }
+            toolTip: qsTr("A material with a PBR metal/roughness properties.")
+        }
+    }
+    Type {
+        name: "QtQuick3D.SpecularGlossyMaterial"
+        icon: "images/material16.png"
+
+        Hints {
+            visibleInNavigator: false
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+        }
+
+        ItemLibraryEntry {
+            name: "Specular Glossy"
+            category: "Materials"
+            libraryIcon: "images/material.png"
+            version: "6.4"
+            requiredImport: "QtQuick3D"
+            Property { name: "albedoColor"; type: "color"; value: "#4aee45"; }
+            Property { name: "specularColor"; type: "color"; value: "#000000"; }
+            toolTip: qsTr("A material with a PBR specular/glossiness properties.")
+        }
+    }
+    Type {
+        name: "QtQuick3D.Texture"
+        icon: "images/texture16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeContainer: false
+        }
+
+        ItemLibraryEntry {
+            name: "Texture"
+            category: "Textures"
+            libraryIcon: "images/texture.png"
+            version: "6.0"
+            requiredImport: "QtQuick3D"
+            toolTip: qsTr("Defines a texture for 3D objects.")
+        }
+    }
+    Type {
+        name: "QtQuick3D.CubeMapTexture"
+        icon: "images/cubemaptexture16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeContainer: false
+        }
+
+        ItemLibraryEntry {
+            name: "Cube Map Texture"
+            category: "Textures"
+            libraryIcon: "images/cubemaptexture.png"
+            version: "6.4"
+            requiredImport: "QtQuick3D"
+            toolTip: qsTr("Defines a cube map texture for 3D objects.")
+        }
+    }
+    Type {
+        name: "QtQuick3D.DirectionalLight"
+        icon: "images/lightdirectional16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+        }
+
+        ItemLibraryEntry {
+            name: "Directional Light"
+            category: "Lights"
+            libraryIcon: "images/lightdirectional.png"
+            version: "6.0"
+            requiredImport: "QtQuick3D"
+            toolTip: qsTr("A light similar to sunlight. It emits light in one direction from an infinitely far away source.")
+        }
+    }
+    Type {
+        name: "QtQuick3D.PointLight"
+        icon: "images/lightpoint16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+        }
+
+        ItemLibraryEntry {
+            name: "Point Light"
+            category: "Lights"
+            libraryIcon: "images/lightpoint.png"
+            version: "6.0"
+            requiredImport: "QtQuick3D"
+            toolTip: qsTr("A light similar to a light bulb. It emits light equally in all directions from a central source.")
+        }
+    }
+    Type {
+        name: "QtQuick3D.SpotLight"
+        icon: "images/lightspot16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+        }
+
+        ItemLibraryEntry {
+            name: "Spotlight"
+            category: "Lights"
+            libraryIcon: "images/lightspot.png"
+            version: "6.0"
+            requiredImport: "QtQuick3D"
+            toolTip: qsTr("A spotlight emits light in one direction in a cone shape.")
+        }
+    }
+    Type {
+        name: "QtQuick3D.Model"
+        icon: "images/model16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+            visibleNonDefaultProperties: "materials"
+        }
+
+        ItemLibraryEntry {
+            name: "Model"
+            category: "Components"
+            libraryIcon: "images/group.png"
+            version: "6.0"
+            requiredImport: "QtQuick3D"
+            toolTip: qsTr("Allows you to load 3D mesh data.")
+        }
+    }
+    Type {
+        name: "QtQuick3D.Model"
+        icon: "images/model16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+            visibleNonDefaultProperties: "materials"
+        }
+
+        ItemLibraryEntry {
+            name: "Cube"
+            category: "Primitives"
+            libraryIcon: "images/cube.png"
+            version: "6.0"
+            requiredImport: "QtQuick3D"
+            Property { name: "source"; type: "QUrl"; value: "#Cube"; }
+            toolTip: qsTr("A cube model.")
+        }
+    }
+    Type {
+        name: "QtQuick3D.Model"
+        icon: "images/model16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+            visibleNonDefaultProperties: "materials"
+        }
+
+        ItemLibraryEntry {
+            name: "Sphere"
+            category: "Primitives"
+            libraryIcon: "images/sphere.png"
+            version: "6.0"
+            requiredImport: "QtQuick3D"
+            Property { name: "source"; type: "QUrl"; value: "#Sphere"; }
+            toolTip: qsTr("A sphere model.")
+        }
+    }
+    Type {
+        name: "QtQuick3D.Model"
+        icon: "images/model16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+            visibleNonDefaultProperties: "materials"
+        }
+
+        ItemLibraryEntry {
+            name: "Cylinder"
+            category: "Primitives"
+            libraryIcon: "images/cylinder.png"
+            version: "6.0"
+            requiredImport: "QtQuick3D"
+            Property { name: "source"; type: "QUrl"; value: "#Cylinder"; }
+            toolTip: qsTr("A cylinder model.")
+        }
+    }
+    Type {
+        name: "QtQuick3D.Model"
+        icon: "images/model16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+            visibleNonDefaultProperties: "materials"
+        }
+
+        ItemLibraryEntry {
+            name: "Plane"
+            category: "Primitives"
+            libraryIcon: "images/plane.png"
+            version: "6.0"
+            requiredImport: "QtQuick3D"
+            Property { name: "source"; type: "QUrl"; value: "#Rectangle"; }
+            toolTip: qsTr("A plane model.")
+        }
+    }
+    Type {
+        name: "QtQuick3D.Model"
+        icon: "images/model16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+            visibleNonDefaultProperties: "materials"
+        }
+
+        ItemLibraryEntry {
+            name: "Cone"
+            category: "Primitives"
+            libraryIcon: "images/cone.png"
+            version: "6.0"
+            requiredImport: "QtQuick3D"
+            Property { name: "source"; type: "QUrl"; value: "#Cone"; }
+            toolTip: qsTr("A cone model.")
+        }
+    }
+    Type {
+        name: "QtQuick3D.Node"
+        icon: "images/group16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+        }
+
+        ItemLibraryEntry {
+            name: "Group"
+            category: "Components"
+            libraryIcon: "images/group.png"
+            version: "6.0"
+            requiredImport: "QtQuick3D"
+            toolTip: qsTr("A container to keep several QtQuick3D components or scenes together.")
+        }
+    }
+    Type {
+        name: "QtQuick3D.SceneEnvironment"
+        icon: "images/scene16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+        }
+
+        ItemLibraryEntry {
+            name: "Scene Environment"
+            category: "Components"
+            libraryIcon: "images/scene.png"
+            version: "6.0"
+            requiredImport: "QtQuick3D"
+            toolTip: qsTr("Configures the render settings for a scene.")
+        }
+    }
+    Type {
+        name: "QtQuick3D.View3D"
+        icon: "images/view3D16.png"
+
+        ItemLibraryEntry {
+            name: "View3D"
+            category: "Items"
+            libraryIcon: "images/view3D.png"
+            version: "6.0"
+            requiredImport: "QtQuick3D"
+            QmlSource { source: "./source/view3D_template.qml" }
+            toolTip: qsTr("A 2D surface where a 3D scene can be rendered.")
+        }
+    }
+    Type {
+        name: "QtQuick3D.Shader"
+        icon: "images/shaderutil16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+        }
+
+        ItemLibraryEntry {
+            name: "Shader"
+            category: "Custom Shader Utils"
+            libraryIcon: "images/shaderutil.png"
+            version: "6.0"
+            requiredImport: "QtQuick3D"
+            toolTip: qsTr("A container for keeping the vertex or fragment shader codes to be used by post-processing effect.")
+        }
+    }
+    Type {
+        name: "QtQuick3D.TextureInput"
+        icon: "images/shaderutil16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+        }
+
+        ItemLibraryEntry {
+            name: "Texture Input"
+            category: "Custom Shader Utils"
+            libraryIcon: "images/shaderutil.png"
+            version: "6.0"
+            requiredImport: "QtQuick3D"
+            toolTip: qsTr("Specifies a texture that gets exposed to the shader.")
+        }
+    }
+    Type {
+        name: "QtQuick3D.Pass"
+        icon: "images/shaderutil16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+        }
+
+        ItemLibraryEntry {
+            name: "Pass"
+            category: "Custom Shader Utils"
+            libraryIcon: "images/shaderutil.png"
+            version: "6.0"
+            requiredImport: "QtQuick3D"
+            toolTip: qsTr("Holds a set of actions combining a list of executable render commands, an output buffer, and a list of shaders to use for rendering effects.")
+        }
+    }
+    Type {
+        name: "QtQuick3D.BufferInput"
+        icon: "images/shadercommand16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+        }
+
+        ItemLibraryEntry {
+            name: "Buffer Input"
+            category: "Custom Shader Utils"
+            libraryIcon: "images/shadercommand.png"
+            version: "6.0"
+            requiredImport: "QtQuick3D"
+            toolTip: qsTr("A command that gets added to the list of commands in the Pass of an Effect when executed.")
+        }
+    }
+    Type {
+        name: "QtQuick3D.Buffer"
+        icon: "images/shaderutil16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+        }
+
+        ItemLibraryEntry {
+            name: "Buffer"
+            category: "Custom Shader Utils"
+            libraryIcon: "images/shaderutil.png"
+            version: "6.0"
+            requiredImport: "QtQuick3D"
+            toolTip: qsTr("Creates or references a color buffer to be used for a pass of an Effect.")
+        }
+    }
+    Type {
+        name: "QtQuick3D.SetUniformValue"
+        icon: "images/shadercommand16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+        }
+
+        ItemLibraryEntry {
+            name: "Set Uniform Value"
+            category: "Custom Shader Utils"
+            libraryIcon: "images/shadercommand.png"
+            version: "6.0"
+            requiredImport: "QtQuick3D"
+            toolTip: qsTr("A value that would be set when a single pass actions takes place.")
+        }
+    }
+    Type {
+        name: "QtQuick3D.Effect"
+        icon: "images/effect16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+        }
+
+        ItemLibraryEntry {
+            name: "Effect"
+            category: "Components"
+            libraryIcon: "images/effect.png"
+            version: "6.0"
+            requiredImport: "QtQuick3D"
+            QmlSource { source: "./source/effect_template.qml" }
+            ExtraFile { source: "./source/effect_default_shader.frag" }
+            toolTip: qsTr("A method to allow the user to implement their post-processing effects on entire View3D.")
+        }
+    }
+    Type {
+        name: "QtQuick3D.Repeater3D"
+        icon: "images/repeater3d16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+        }
+
+        ItemLibraryEntry {
+            name: "3D Repeater"
+            category: "Components"
+            libraryIcon: "images/repeater3d.png"
+            version: "6.0"
+            requiredImport: "QtQuick3D"
+            toolTip: qsTr("Dynamically creates several copies of the same 3D object.")
+        }
+    }
+    Type {
+        name: "QtQuick3D.Loader3D"
+        icon: "images/loader3d16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+        }
+
+        ItemLibraryEntry {
+            name: "Loader3D"
+            category: "Components"
+            libraryIcon: "images/loader3d.png"
+            version: "6.0"
+            requiredImport: "QtQuick3D"
+            toolTip: qsTr("Allows you to load 3D components dynamically.")
+        }
+    }
+    Type {
+        name: "QtQuick3D.Skeleton"
+        icon: "images/skeleton16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+        }
+
+        ItemLibraryEntry {
+            name: "Skeleton"
+            category: "Components"
+            libraryIcon: "images/skeleton.png"
+            version: "6.0"
+            requiredImport: "QtQuick3D"
+            toolTip: qsTr("Defines a skeletal animation hierarchy.")
+        }
+    }
+    Type {
+        name: "QtQuick3D.MorphTarget"
+        icon: "images/morphtarget16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+        }
+
+        ItemLibraryEntry {
+            name: "Morph Target"
+            category: "Components"
+            libraryIcon: "images/morphtarget.png"
+            version: "6.0"
+            requiredImport: "QtQuick3D"
+            toolTip: qsTr("Defines the properties of a morph target.")
+        }
+    }
+    Type {
+        name: "QtQuick3D.InstanceListEntry"
+        icon: "images/instancelistentry16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+        }
+
+        ItemLibraryEntry {
+            name: "Instance List Entry"
+            category: "Components"
+            libraryIcon: "images/instancelistentry.png"
+            version: "6.2"
+            requiredImport: "QtQuick3D"
+            toolTip: qsTr("One instance in an Instance List. The instance includes a set of property specifications.")
+        }
+    }
+    Type {
+        name: "QtQuick3D.InstanceList"
+        icon: "images/instancelist16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+        }
+
+        ItemLibraryEntry {
+            name: "Instance List"
+            category: "Components"
+            libraryIcon: "images/instancelist.png"
+            version: "6.2"
+            requiredImport: "QtQuick3D"
+            toolTip: qsTr("Enables 3D model instancing, a lightweight 3D object replication method.")
+        }
+    }
+    Type {
+        name: "QtQuick3D.FileInstancing"
+        icon: "images/fileinstancing16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+        }
+
+        ItemLibraryEntry {
+            name: "File Instancing"
+            category: "Components"
+            libraryIcon: "images/fileinstancing.png"
+            version: "6.2"
+            requiredImport: "QtQuick3D"
+            toolTip: qsTr("A method that allows reading instance tables from XML or Qt-specific binary files.")
+        }
+    }
+    Type {
+        name: "QtQuick3D.Joint"
+        icon: "images/joint16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+        }
+
+        ItemLibraryEntry {
+            name: "Joint"
+            category: "Components"
+            libraryIcon: "images/joint.png"
+            version: "6.0"
+            requiredImport: "QtQuick3D"
+            toolTip: qsTr("A transformable node that connects different parts in a skeletal animation.")
+        }
+    }
+    Type {
+        name: "QtQuick3D.ReflectionProbe"
+        icon: "images/reflectionProbe16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: true
+        }
+
+        ItemLibraryEntry {
+            name: "Reflection Probe"
+            category: "Components"
+            libraryIcon: "images/reflectionProbe.png"
+            version: "6.3"
+            requiredImport: "QtQuick3D"
+            toolTip: qsTr("Reflects the current scene to the objects.")
+        }
+    }
+    Type {
+        name: "QtQuick3D.Fog"
+        icon: "images/fog16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: false
+        }
+
+        ItemLibraryEntry {
+            name: "Fog"
+            category: "Components"
+            libraryIcon: "images/fog.png"
+            version: "6.5"
+            requiredImport: "QtQuick3D"
+        }
+    }
+    Type {
+        name: "QtQuick3D.DebugSettings"
+        icon: "images/debugsettings16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: false
+        }
+
+        ItemLibraryEntry {
+            name: "Debug Settings"
+            category: "Components"
+            libraryIcon: "images/debugsettings.png"
+            version: "6.5"
+            requiredImport: "QtQuick3D"
+        }
+    }
+
+    Type {
+        name: "QtQuick3D.Lightmapper"
+        icon: "images/lightmapper16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: false
+        }
+
+        ItemLibraryEntry {
+            // Split the name to avoid ellipsis in UI
+            name: "Light Mapper"
+            category: "Components"
+            libraryIcon: "images/lightmapper.png"
+            version: "6.5"
+            requiredImport: "QtQuick3D"
+        }
+    }
+
+    Type {
+        name: "QtQuick3D.Skin"
+        icon: "images/skin16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: false
+        }
+
+        ItemLibraryEntry {
+            name: "Skin"
+            category: "Components"
+            libraryIcon: "images/skin.png"
+            version: "6.5"
+            requiredImport: "QtQuick3D"
+        }
+    }
+
+    Type {
+        name: "QtQuick3D.ResourceLoader"
+        icon: "images/resourceLoader16.png"
+
+        Hints {
+            visibleInNavigator: true
+            canBeDroppedInNavigator: true
+            canBeDroppedInFormEditor: false
+            canBeDroppedInView3D: false
+        }
+
+        ItemLibraryEntry {
+            name: "Resource Loader"
+            category: "Components"
+            libraryIcon: "images/resourceLoader.png"
+            version: "6.2"
+            requiredImport: "QtQuick3D"
+            toolTip: qsTr("Pre-load resources for 3D scene. It makes sure that large resources are available before rendering a frame.")
+        }
+    }
+}
diff --git a/tests/unit/tests/unittests/projectstorage/projectstorage-test.cpp b/tests/unit/tests/unittests/projectstorage/projectstorage-test.cpp
index 4b3f0a1869..4034ae58f9 100644
--- a/tests/unit/tests/unittests/projectstorage/projectstorage-test.cpp
+++ b/tests/unit/tests/unittests/projectstorage/projectstorage-test.cpp
@@ -202,7 +202,7 @@ class HasNameMatcher
 public:
     using is_gtest_matcher = void;
 
-    HasNameMatcher(const QmlDesigner::ProjectStorage<Sqlite::Database> &storage,
+    HasNameMatcher(const QmlDesigner::ProjectStorage &storage,
                    Utils::SmallStringView name)
         : storage{storage}
         , name{name}
@@ -231,7 +231,7 @@ public:
     void DescribeNegationTo(std::ostream *os) const { *os << "is not '" << name << "'"; }
 
 private:
-    const QmlDesigner::ProjectStorage<Sqlite::Database> &storage;
+    const QmlDesigner::ProjectStorage &storage;
     Utils::SmallStringView name;
 };
 
@@ -253,17 +253,15 @@ MATCHER(StringsAreSorted, std::string(negation ? "isn't sorted" : "is sorted"))
     });
 }
 
-MATCHER_P3(IsInfoType,
-           defaultPropertyId,
+MATCHER_P2(IsInfoType,
            sourceId,
            traits,
            std::string(negation ? "isn't " : "is ")
-               + PrintToString(Storage::Info::Type{defaultPropertyId, sourceId, traits}))
+               + PrintToString(Storage::Info::Type{sourceId, traits}))
 {
     const Storage::Info::Type &type = arg;
 
-    return type.defaultPropertyId == defaultPropertyId && type.sourceId == sourceId
-           && type.traits == traits;
+    return type.sourceId == sourceId && type.traits == traits;
 }
 
 class ProjectStorage : public testing::Test
@@ -273,7 +271,7 @@ protected:
     {
         static_database = std::make_unique<Sqlite::Database>(":memory:", Sqlite::JournalMode::Memory);
 
-        static_projectStorage = std::make_unique<QmlDesigner::ProjectStorage<Sqlite::Database>>(
+        static_projectStorage = std::make_unique<QmlDesigner::ProjectStorage>(
             *static_database, static_database->isInitialized());
     }
 
@@ -998,10 +996,10 @@ protected:
 
         package.updatedSourceIds = {sourceId1, sourceId2, sourceId3};
 
-        package.propertyEditorQmlPaths.emplace_back(qtQuickModuleId, "QtObject", sourceId1, sourceIdPath);
-        package.propertyEditorQmlPaths.emplace_back(qtQuickModuleId, "Item", sourceId2, sourceIdPath);
-        package.propertyEditorQmlPaths.emplace_back(qtQuickModuleId, "Item3D", sourceId3, sourceIdPath);
-        package.updatedPropertyEditorQmlPathSourceIds.emplace_back(sourceIdPath);
+        package.propertyEditorQmlPaths.emplace_back(qtQuickModuleId, "QtObject", sourceId1, sourceIdPath6);
+        package.propertyEditorQmlPaths.emplace_back(qtQuickModuleId, "Item", sourceId2, sourceIdPath6);
+        package.propertyEditorQmlPaths.emplace_back(qtQuickModuleId, "Item3D", sourceId3, sourceIdPath6);
+        package.updatedPropertyEditorQmlPathSourceIds.emplace_back(sourceIdPath6);
 
         return package;
     }
@@ -1015,6 +1013,7 @@ protected:
         traits.visibleInLibrary = FlagIs::True;
 
         annotations.emplace_back(sourceId4,
+                                 sourceIdPath6,
                                  "Object",
                                  qmlModuleId,
                                  "/path/to/icon.png",
@@ -1036,6 +1035,32 @@ protected:
                                         "properties":[["color", "color", "#blue"]]}])xy");
 
         annotations.emplace_back(sourceId5,
+                                 sourceIdPath6,
+                                 "Item",
+                                 qtQuickModuleId,
+                                 "/path/to/quick.png",
+                                 traits,
+                                 R"xy({"canBeContainer": "true", "forceClip": "false"})xy",
+                                 R"xy([{"name":"Item",
+                                        "iconPath":"/path/icon3",
+                                        "category":"Advanced Items",
+                                        "import":"QtQuick",
+                                        "toolTip":"Item is an Object",
+                                        "properties":[["x", "double", 1], ["y", "double", 2]]}])xy");
+
+        return annotations;
+    }
+
+    auto createExtendedTypeAnnotations() const
+    {
+        auto annotations = createTypeAnnotions();
+        annotations.pop_back();
+        TypeTraits traits{TypeTraitsKind::Reference};
+        traits.canBeContainer = FlagIs::True;
+        traits.visibleInLibrary = FlagIs::True;
+
+        annotations.emplace_back(sourceId5,
+                                 sourceIdPath1,
                                  "Item",
                                  qtQuickModuleId,
                                  "/path/to/quick.png",
@@ -1111,10 +1136,9 @@ protected:
 protected:
     inline static std::unique_ptr<Sqlite::Database> static_database;
     Sqlite::Database &database = *static_database;
-    //Sqlite::Database database{"/tmp/aaaaa.db", Sqlite::JournalMode::Wal};
-    inline static std::unique_ptr<QmlDesigner::ProjectStorage<Sqlite::Database>> static_projectStorage;
-    QmlDesigner::ProjectStorage<Sqlite::Database> &storage = *static_projectStorage;
-    QmlDesigner::SourcePathCache<QmlDesigner::ProjectStorage<Sqlite::Database>> sourcePathCache{
+    inline static std::unique_ptr<QmlDesigner::ProjectStorage> static_projectStorage;
+    QmlDesigner::ProjectStorage &storage = *static_projectStorage;
+    QmlDesigner::SourcePathCache<QmlDesigner::ProjectStorage> sourcePathCache{
         storage};
     QmlDesigner::SourcePathView path1{"/path1/to"};
     QmlDesigner::SourcePathView path2{"/path2/to"};
@@ -1122,14 +1146,16 @@ protected:
     QmlDesigner::SourcePathView path4{"/path4/to"};
     QmlDesigner::SourcePathView path5{"/path5/to"};
     QmlDesigner::SourcePathView path6{"/path6/to"};
-    QmlDesigner::SourcePathView pathPath{"/path6/."};
+    QmlDesigner::SourcePathView pathPath1{"/path1/."};
+    QmlDesigner::SourcePathView pathPath6{"/path6/."};
     SourceId sourceId1{sourcePathCache.sourceId(path1)};
     SourceId sourceId2{sourcePathCache.sourceId(path2)};
     SourceId sourceId3{sourcePathCache.sourceId(path3)};
     SourceId sourceId4{sourcePathCache.sourceId(path4)};
     SourceId sourceId5{sourcePathCache.sourceId(path5)};
     SourceId sourceId6{sourcePathCache.sourceId(path6)};
-    SourceId sourceIdPath{sourcePathCache.sourceId(path6)};
+    SourceId sourceIdPath1{sourcePathCache.sourceId(pathPath1)};
+    SourceId sourceIdPath6{sourcePathCache.sourceId(pathPath6)};
     SourceId qmlProjectSourceId{sourcePathCache.sourceId("/path1/qmldir")};
     SourceId qtQuickProjectSourceId{sourcePathCache.sourceId("/path2/qmldir")};
     ModuleId qmlModuleId{storage.moduleId("Qml")};
@@ -5076,7 +5102,7 @@ TEST_F(ProjectStorage, populate_module_cache)
 {
     auto id = storage.moduleId("Qml");
 
-    QmlDesigner::ProjectStorage<Sqlite::Database> newStorage{database, database.isInitialized()};
+    QmlDesigner::ProjectStorage newStorage{database, database.isInitialized()};
 
     ASSERT_THAT(newStorage.moduleName(id), Eq("Qml"));
 }
@@ -6683,12 +6709,10 @@ TEST_F(ProjectStorage, get_type)
     auto package{createSimpleSynchronizationPackage()};
     storage.synchronize(package);
     auto typeId = fetchTypeId(sourceId1, "QQuickItem");
-    auto defaultPropertyName = storage.fetchTypeByTypeId(typeId).defaultPropertyName;
-    auto defaultPropertyId = storage.propertyDeclarationId(typeId, defaultPropertyName);
 
     auto type = storage.type(typeId);
 
-    ASSERT_THAT(type, Optional(IsInfoType(defaultPropertyId, sourceId1, TypeTraitsKind::Reference)));
+    ASSERT_THAT(type, Optional(IsInfoType(sourceId1, TypeTraitsKind::Reference)));
 }
 
 TEST_F(ProjectStorage, dont_get_type_for_invalid_id)
@@ -6701,6 +6725,58 @@ TEST_F(ProjectStorage, dont_get_type_for_invalid_id)
     ASSERT_THAT(type, Eq(std::nullopt));
 }
 
+TEST_F(ProjectStorage, get_default_property_declarartion_id)
+{
+    auto package{createSimpleSynchronizationPackage()};
+    storage.synchronize(package);
+    auto typeId = fetchTypeId(sourceId1, "QQuickItem");
+    auto defaultPropertyName = storage.fetchTypeByTypeId(typeId).defaultPropertyName;
+    auto defaultPropertyId = storage.propertyDeclarationId(typeId, defaultPropertyName);
+
+    auto propertyId = storage.defaultPropertyDeclarationId(typeId);
+
+    ASSERT_THAT(propertyId, defaultPropertyId);
+}
+
+TEST_F(ProjectStorage, get_default_property_declarartion_id_in_base_type)
+{
+    auto package{createSynchronizationPackageWithAliases()};
+    storage.synchronize(package);
+    auto baseTypeId = fetchTypeId(sourceId1, "QQuickItem");
+    auto defaultPropertyName = storage.fetchTypeByTypeId(baseTypeId).defaultPropertyName;
+    auto defaultPropertyId = storage.propertyDeclarationId(baseTypeId, defaultPropertyName);
+    auto typeId = fetchTypeId(sourceId3, "QAliasItem");
+
+    auto propertyId = storage.defaultPropertyDeclarationId(typeId);
+
+    ASSERT_THAT(propertyId, defaultPropertyId);
+}
+
+TEST_F(ProjectStorage, do_not_get_default_property_declarartion_id_wrong_type_in_property_chain)
+{
+    auto package{createSynchronizationPackageWithAliases()};
+    package.types[1].defaultPropertyName = "objects";
+    storage.synchronize(package);
+    auto baseTypeId = fetchTypeId(sourceId1, "QQuickItem");
+    auto defaultPropertyName = storage.fetchTypeByTypeId(baseTypeId).defaultPropertyName;
+    auto defaultPropertyId = storage.propertyDeclarationId(baseTypeId, defaultPropertyName);
+    auto typeId = fetchTypeId(sourceId3, "QAliasItem");
+
+    auto propertyId = storage.defaultPropertyDeclarationId(typeId);
+
+    ASSERT_THAT(propertyId, defaultPropertyId);
+}
+
+TEST_F(ProjectStorage, get_invalid_default_property_declarartion_id_for_invalid_type)
+{
+    auto package{createSimpleSynchronizationPackage()};
+    storage.synchronize(package);
+
+    auto propertyId = storage.defaultPropertyDeclarationId(TypeId());
+
+    ASSERT_FALSE(propertyId);
+}
+
 TEST_F(ProjectStorage, get_common_type)
 {
     auto package{createSimpleSynchronizationPackage()};
@@ -7228,7 +7304,7 @@ TEST_F(ProjectStorage, synchronize_property_editor_adds_path)
     auto package{createPropertyEditorPathsSynchronizationPackage()};
     package.propertyEditorQmlPaths.pop_back();
     storage.synchronize(package);
-    package.propertyEditorQmlPaths.emplace_back(qtQuickModuleId, "Item3D", sourceId3, sourceIdPath);
+    package.propertyEditorQmlPaths.emplace_back(qtQuickModuleId, "Item3D", sourceId3, sourceIdPath6);
 
     storage.synchronize(package);
 
@@ -7240,7 +7316,7 @@ TEST_F(ProjectStorage, synchronize_property_editor_adds_path)
 TEST_F(ProjectStorage, synchronize_property_editor_with_non_existing_type_name)
 {
     auto package{createPropertyEditorPathsSynchronizationPackage()};
-    package.propertyEditorQmlPaths.emplace_back(qtQuickModuleId, "Item4D", sourceId4, sourceIdPath);
+    package.propertyEditorQmlPaths.emplace_back(qtQuickModuleId, "Item4D", sourceId4, sourceIdPath6);
 
     storage.synchronize(package);
 
@@ -7260,6 +7336,21 @@ TEST_F(ProjectStorage, call_remove_type_ids_in_observer_after_synchronization)
     storage.synchronize(package);
 }
 
+TEST_F(ProjectStorage, do_not_synchronize_type_annotations_without_type)
+{
+    SynchronizationPackage package;
+    package.typeAnnotations = createTypeAnnotions();
+    package.updatedTypeAnnotationSourceIds = createUpdatedTypeAnnotionSourceIds(
+        package.typeAnnotations);
+    TypeTraits traits{TypeTraitsKind::Reference};
+    traits.canBeContainer = FlagIs::True;
+    traits.visibleInLibrary = FlagIs::True;
+
+    storage.synchronize(package);
+
+    ASSERT_THAT(storage.allItemLibraryEntries(), IsEmpty());
+}
+
 TEST_F(ProjectStorage, synchronize_type_annotation_type_traits)
 {
     auto package{createSimpleSynchronizationPackage()};
@@ -7414,6 +7505,18 @@ TEST_F(ProjectStorage, synchronize_removes_type_hints)
 TEST_F(ProjectStorage, return_empty_type_hints_if_no_type_hints_exists)
 {
     auto package{createSimpleSynchronizationPackage()};
+    package.typeAnnotations = createTypeAnnotions();
+    package.typeAnnotations[0].hintsJson.clear();
+    storage.synchronize(package);
+
+    auto typeHints = storage.typeHints(fetchTypeId(sourceId2, "QObject"));
+
+    ASSERT_THAT(typeHints, IsEmpty());
+}
+
+TEST_F(ProjectStorage, return_empty_type_hints_if_no_type_annotaion_exists)
+{
+    auto package{createSimpleSynchronizationPackage()};
     storage.synchronize(package);
 
     auto typeHints = storage.typeHints(fetchTypeId(sourceId2, "QObject"));
@@ -7486,7 +7589,7 @@ TEST_F(ProjectStorage, synchronize_removes_item_library_entries)
     ASSERT_THAT(storage.allItemLibraryEntries(), IsEmpty());
 }
 
-TEST_F(ProjectStorage, synchronize_udpates_item_library_entries)
+TEST_F(ProjectStorage, synchronize_updates_item_library_entries)
 {
     auto package{createSimpleSynchronizationPackage()};
     package.typeAnnotations = createTypeAnnotions();
@@ -7512,6 +7615,59 @@ TEST_F(ProjectStorage, synchronize_udpates_item_library_entries)
                                        IsEmpty())));
 }
 
+TEST_F(ProjectStorage, synchronize_updates_item_library_entries_with_empty_entries)
+{
+    auto package{createSimpleSynchronizationPackage()};
+    package.typeAnnotations = createTypeAnnotions();
+    package.updatedTypeAnnotationSourceIds = createUpdatedTypeAnnotionSourceIds(
+        package.typeAnnotations);
+    storage.synchronize(package);
+    package.typeAnnotations[0].itemLibraryJson.clear();
+
+    storage.synchronize(package);
+
+    ASSERT_THAT(storage.itemLibraryEntries(fetchTypeId(sourceId2, "QObject")), IsEmpty());
+}
+
+TEST_F(ProjectStorage, synchronize_type_annotation_directory_source_id)
+{
+    auto package{createSimpleSynchronizationPackage()};
+    package.typeAnnotations = createTypeAnnotions();
+    package.updatedTypeAnnotationSourceIds = createUpdatedTypeAnnotionSourceIds(
+        package.typeAnnotations);
+
+    storage.synchronize(package);
+
+    ASSERT_THAT(storage.typeAnnotationSourceIds(sourceIdPath6),
+                UnorderedElementsAre(sourceId4, sourceId5));
+}
+
+TEST_F(ProjectStorage, get_type_annotation_source_ids)
+{
+    auto package{createSimpleSynchronizationPackage()};
+    package.typeAnnotations = createTypeAnnotions();
+    package.updatedTypeAnnotationSourceIds = createUpdatedTypeAnnotionSourceIds(
+        package.typeAnnotations);
+    storage.synchronize(package);
+
+    auto sourceIds = storage.typeAnnotationSourceIds(sourceIdPath6);
+
+    ASSERT_THAT(sourceIds, UnorderedElementsAre(sourceId4, sourceId5));
+}
+
+TEST_F(ProjectStorage, get_type_annotation_directory_source_ids)
+{
+    auto package{createSimpleSynchronizationPackage()};
+    package.typeAnnotations = createExtendedTypeAnnotations();
+    package.updatedTypeAnnotationSourceIds = createUpdatedTypeAnnotionSourceIds(
+        package.typeAnnotations);
+    storage.synchronize(package);
+
+    auto sourceIds = storage.typeAnnotationDirectorySourceIds();
+
+    ASSERT_THAT(sourceIds, ElementsAre(sourceIdPath1, sourceIdPath6));
+}
+
 TEST_F(ProjectStorage, get_all_item_library_entries)
 {
     auto package{createSimpleSynchronizationPackage()};
@@ -7557,6 +7713,31 @@ TEST_F(ProjectStorage, get_all_item_library_entries)
                                IsEmpty())));
 }
 
+TEST_F(ProjectStorage, get_all_item_library_entries_handles_no_entries)
+{
+    auto package{createSimpleSynchronizationPackage()};
+    package.typeAnnotations = createTypeAnnotions();
+    package.typeAnnotations[0].itemLibraryJson.clear();
+    package.updatedTypeAnnotationSourceIds = createUpdatedTypeAnnotionSourceIds(
+        package.typeAnnotations);
+    storage.synchronize(package);
+
+    auto entries = storage.allItemLibraryEntries();
+
+    ASSERT_THAT(entries,
+                UnorderedElementsAre(
+                    IsItemLibraryEntry(fetchTypeId(sourceId1, "QQuickItem"),
+                                       "Item",
+                                       "/path/icon3",
+                                       "Advanced Items",
+                                       "QtQuick",
+                                       "Item is an Object",
+                                       "",
+                                       UnorderedElementsAre(IsItemLibraryProperty("x", "double", 1),
+                                                            IsItemLibraryProperty("y", "double", 2)),
+                                       IsEmpty())));
+}
+
 TEST_F(ProjectStorage, get_item_library_entries_by_type_id)
 {
     auto package{createSimpleSynchronizationPackage()};
@@ -7606,6 +7787,21 @@ TEST_F(ProjectStorage, get_no_item_library_entries_if_type_id_is_invalid)
     ASSERT_THAT(entries, IsEmpty());
 }
 
+TEST_F(ProjectStorage, get_no_item_library_entries_by_type_id_for_no_entries)
+{
+    auto package{createSimpleSynchronizationPackage()};
+    package.typeAnnotations = createTypeAnnotions();
+    package.typeAnnotations[0].itemLibraryJson.clear();
+    package.updatedTypeAnnotationSourceIds = createUpdatedTypeAnnotionSourceIds(
+        package.typeAnnotations);
+    storage.synchronize(package);
+    auto typeId = fetchTypeId(sourceId2, "QObject");
+
+    auto entries = storage.itemLibraryEntries(typeId);
+
+    ASSERT_THAT(entries, IsEmpty());
+}
+
 TEST_F(ProjectStorage, get_item_library_entries_by_source_id)
 {
     auto package{createSimpleSynchronizationPackage()};
@@ -7641,6 +7837,20 @@ TEST_F(ProjectStorage, get_item_library_entries_by_source_id)
                                IsEmpty())));
 }
 
+TEST_F(ProjectStorage, get_no_item_library_entries_by_source_id_for_no_entries)
+{
+    auto package{createSimpleSynchronizationPackage()};
+    package.typeAnnotations = createTypeAnnotions();
+    package.typeAnnotations[0].itemLibraryJson.clear();
+    package.updatedTypeAnnotationSourceIds = createUpdatedTypeAnnotionSourceIds(
+        package.typeAnnotations);
+    storage.synchronize(package);
+
+    auto entries = storage.itemLibraryEntries(sourceId2);
+
+    ASSERT_THAT(entries, IsEmpty());
+}
+
 TEST_F(ProjectStorage, return_type_ids_for_module_id)
 {
     auto package{createBuiltinSynchronizationPackage()};
diff --git a/tests/unit/tests/unittests/projectstorage/projectstoragepathwatcher-test.cpp b/tests/unit/tests/unittests/projectstorage/projectstoragepathwatcher-test.cpp
index d6ed96d0cf..26d5af8af8 100644
--- a/tests/unit/tests/unittests/projectstorage/projectstoragepathwatcher-test.cpp
+++ b/tests/unit/tests/unittests/projectstorage/projectstoragepathwatcher-test.cpp
@@ -16,7 +16,7 @@
 #include <utils/smallstring.h>
 
 namespace {
-using SourcePathCache = QmlDesigner::SourcePathCache<QmlDesigner::ProjectStorage<Sqlite::Database>>;
+using SourcePathCache = QmlDesigner::SourcePathCache<QmlDesigner::ProjectStorage>;
 using Watcher = QmlDesigner::ProjectStoragePathWatcher<NiceMock<MockQFileSytemWatcher>,
                                                        NiceMock<MockTimer>,
                                                        SourcePathCache>;
@@ -43,7 +43,7 @@ protected:
     {
         static_database = std::make_unique<Sqlite::Database>(":memory:", Sqlite::JournalMode::Memory);
 
-        static_projectStorage = std::make_unique<QmlDesigner::ProjectStorage<Sqlite::Database>>(
+        static_projectStorage = std::make_unique<QmlDesigner::ProjectStorage>(
             *static_database, static_database->isInitialized());
     }
 
@@ -81,8 +81,8 @@ protected:
     NiceMock<FileSystemMock> mockFileSystem;
     inline static std::unique_ptr<Sqlite::Database> static_database;
     Sqlite::Database &database = *static_database;
-    inline static std::unique_ptr<QmlDesigner::ProjectStorage<Sqlite::Database>> static_projectStorage;
-    QmlDesigner::ProjectStorage<Sqlite::Database> &storage = *static_projectStorage;
+    inline static std::unique_ptr<QmlDesigner::ProjectStorage> static_projectStorage;
+    QmlDesigner::ProjectStorage &storage = *static_projectStorage;
     SourcePathCache pathCache{storage};
     Watcher watcher{pathCache, mockFileSystem, &notifier};
     NiceMock<MockQFileSytemWatcher> &mockQFileSytemWatcher = watcher.fileSystemWatcher();
diff --git a/tests/unit/tests/unittests/projectstorage/projectstorageupdater-test.cpp b/tests/unit/tests/unittests/projectstorage/projectstorageupdater-test.cpp
index d9578d2f1b..96909857b3 100644
--- a/tests/unit/tests/unittests/projectstorage/projectstorageupdater-test.cpp
+++ b/tests/unit/tests/unittests/projectstorage/projectstorageupdater-test.cpp
@@ -9,6 +9,8 @@
 #include "../mocks/qmldocumentparsermock.h"
 #include "../mocks/qmltypesparsermock.h"
 
+#include <projectstorage-matcher.h>
+
 #include <projectstorage/filestatuscache.h>
 #include <projectstorage/projectstorage.h>
 #include <projectstorage/projectstorageupdater.h>
@@ -120,7 +122,8 @@ MATCHER(PackageIsEmpty, std::string(negation ? "isn't empty" : "is empty"))
            && package.moduleDependencies.empty() && package.updatedModuleDependencySourceIds.empty()
            && package.moduleExportedImports.empty() && package.updatedModuleIds.empty()
            && package.propertyEditorQmlPaths.empty()
-           && package.updatedPropertyEditorQmlPathSourceIds.empty();
+           && package.updatedPropertyEditorQmlPathSourceIds.empty()
+           && package.typeAnnotations.empty() && package.updatedTypeAnnotationSourceIds.empty();
 }
 
 template<typename ModuleIdMatcher, typename TypeNameMatcher, typename SourceIdMatcher>
@@ -141,7 +144,7 @@ public:
     {
         static_database = std::make_unique<Sqlite::Database>(":memory:", Sqlite::JournalMode::Memory);
 
-        static_projectStorage = std::make_unique<QmlDesigner::ProjectStorage<Sqlite::Database>>(
+        static_projectStorage = std::make_unique<QmlDesigner::ProjectStorage>(
             *static_database, static_database->isInitialized());
     }
 
@@ -168,7 +171,8 @@ public:
                              secondSourceId,
                              thirdSourceId,
                              qmltypes1SourceId,
-                             qmltypes2SourceId});
+                             qmltypes2SourceId,
+                             itemLibraryPathSourceId});
 
         setFilesAdded({qmldir1SourceId, qmldir2SourceId, qmldir3SourceId});
 
@@ -298,6 +302,8 @@ public:
         EXPECT_CALL(fileSystemMock, contentAsQString(Eq(path))).WillRepeatedly(Return(content));
     }
 
+    auto moduleId(Utils::SmallStringView name) const { return storage.moduleId(name); }
+
 protected:
     NiceMock<FileSystemMock> fileSystemMock;
     NiceMock<ProjectStorageMock> projectStorageMock;
@@ -306,9 +312,9 @@ protected:
     QmlDesigner::FileStatusCache fileStatusCache{fileSystemMock};
     inline static std::unique_ptr<Sqlite::Database> static_database;
     Sqlite::Database &database = *static_database;
-    inline static std::unique_ptr<QmlDesigner::ProjectStorage<Sqlite::Database>> static_projectStorage;
-    QmlDesigner::ProjectStorage<Sqlite::Database> &storage = *static_projectStorage;
-    QmlDesigner::SourcePathCache<QmlDesigner::ProjectStorage<Sqlite::Database>> sourcePathCache{
+    inline static std::unique_ptr<QmlDesigner::ProjectStorage> static_projectStorage;
+    QmlDesigner::ProjectStorage &storage = *static_projectStorage;
+    QmlDesigner::SourcePathCache<QmlDesigner::ProjectStorage> sourcePathCache{
         storage};
     NiceMock<ProjectStoragePathWatcherMock> patchWatcherMock;
     QmlDesigner::ProjectPartId projectPartId = QmlDesigner::ProjectPartId::create(1);
@@ -328,6 +334,13 @@ protected:
     SourceId qmlDocumentSourceId1 = sourcePathCache.sourceId("/path/First.qml");
     SourceId qmlDocumentSourceId2 = sourcePathCache.sourceId("/path/First2.qml");
     SourceId qmlDocumentSourceId3 = sourcePathCache.sourceId("/path/Second.qml");
+    const QString itemLibraryPath = QDir::cleanPath(
+        UNITTEST_DIR "/../../../../share/qtcreator/qmldesigner/itemLibrary/");
+    const QString qmlImportsPath = QDir::cleanPath(UNITTEST_DIR "/projectstorage/data/qml");
+    SourceId itemLibraryPathSourceId = sourcePathCache.sourceId(
+        QmlDesigner::SourcePath{itemLibraryPath + "/."});
+    SourceId qmlImportsPathSourceId = sourcePathCache.sourceId(
+        QmlDesigner::SourcePath{qmlImportsPath + "/."});
     ModuleId qmlModuleId{storage.moduleId("Qml")};
     ModuleId qmlCppNativeModuleId{storage.moduleId("Qml-cppnative")};
     ModuleId exampleModuleId{storage.moduleId("Example")};
@@ -410,7 +423,7 @@ TEST_F(ProjectStorageUpdater, get_content_for_qml_dir_paths_if_file_status_is_di
     EXPECT_CALL(fileSystemMock, contentAsQString(Eq(QString("/path/one/qmldir"))));
     EXPECT_CALL(fileSystemMock, contentAsQString(Eq(QString("/path/two/qmldir"))));
 
-    updater.update(directories, {}, {});
+    updater.update(directories, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, request_file_status_from_file_system)
@@ -419,7 +432,7 @@ TEST_F(ProjectStorageUpdater, request_file_status_from_file_system)
 
     EXPECT_CALL(fileSystemMock, fileStatus(Eq(directoryPathSourceId)));
 
-    updater.update(directories, {}, {});
+    updater.update(directories, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, get_content_for_qml_types)
@@ -431,7 +444,7 @@ TEST_F(ProjectStorageUpdater, get_content_for_qml_types)
 
     EXPECT_CALL(fileSystemMock, contentAsQString(Eq(QString("/path/example.qmltypes"))));
 
-    updater.update(directories, {}, {});
+    updater.update(directories, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, get_content_for_qml_types_if_project_storage_file_status_is_invalid)
@@ -444,7 +457,7 @@ TEST_F(ProjectStorageUpdater, get_content_for_qml_types_if_project_storage_file_
 
     EXPECT_CALL(fileSystemMock, contentAsQString(Eq(QString("/path/example.qmltypes"))));
 
-    updater.update(directories, {}, {});
+    updater.update(directories, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, parse_qml_types)
@@ -463,7 +476,7 @@ TEST_F(ProjectStorageUpdater, parse_qml_types)
     EXPECT_CALL(qmlTypesParserMock,
                 parse(qmltypes2, _, _, Field(&ProjectData::moduleId, exampleCppNativeModuleId)));
 
-    updater.update(directories, {}, {});
+    updater.update(directories, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, synchronize_is_empty_for_no_change)
@@ -472,7 +485,7 @@ TEST_F(ProjectStorageUpdater, synchronize_is_empty_for_no_change)
 
     EXPECT_CALL(projectStorageMock, synchronize(PackageIsEmpty()));
 
-    updater.update(directories, {}, {});
+    updater.update(directories, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, synchronize_qml_types)
@@ -507,7 +520,7 @@ TEST_F(ProjectStorageUpdater, synchronize_qml_types)
                           Field(&SynchronizationPackage::updatedProjectSourceIds,
                                 UnorderedElementsAre(directoryPathSourceId)))));
 
-    updater.update(directories, {}, {});
+    updater.update(directories, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, synchronize_qml_types_throws_if_qmltpes_does_not_exists)
@@ -515,7 +528,7 @@ TEST_F(ProjectStorageUpdater, synchronize_qml_types_throws_if_qmltpes_does_not_e
     Storage::Import import{qmlModuleId, Storage::Version{2, 3}, qmltypesPathSourceId};
     setFilesDontExists({qmltypesPathSourceId});
 
-    ASSERT_THROW(updater.update(directories, {}, {}), QmlDesigner::CannotParseQmlTypesFile);
+    ASSERT_THROW(updater.update(directories, {}, {}, {}), QmlDesigner::CannotParseQmlTypesFile);
 }
 
 TEST_F(ProjectStorageUpdater, synchronize_qml_types_are_empty_if_file_does_not_changed)
@@ -528,7 +541,7 @@ TEST_F(ProjectStorageUpdater, synchronize_qml_types_are_empty_if_file_does_not_c
 
     EXPECT_CALL(projectStorageMock, synchronize(PackageIsEmpty()));
 
-    updater.update(directories, {}, {});
+    updater.update(directories, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, get_content_for_qml_documents)
@@ -549,7 +562,7 @@ TEST_F(ProjectStorageUpdater, get_content_for_qml_documents)
     EXPECT_CALL(fileSystemMock, contentAsQString(Eq(QString("/path/OldSecond.qml"))));
     EXPECT_CALL(fileSystemMock, contentAsQString(Eq(QString("/path/Second.qml"))));
 
-    updater.update(directories, {}, {});
+    updater.update(directories, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, parse_qml_documents)
@@ -570,7 +583,7 @@ TEST_F(ProjectStorageUpdater, parse_qml_documents)
     EXPECT_CALL(qmlDocumentParserMock, parse(qmlDocument2, _, _, _));
     EXPECT_CALL(qmlDocumentParserMock, parse(qmlDocument3, _, _, _));
 
-    updater.update(directories, {}, {});
+    updater.update(directories, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, parse_qml_documents_with_non_existing_qml_document_throws)
@@ -579,7 +592,7 @@ TEST_F(ProjectStorageUpdater, parse_qml_documents_with_non_existing_qml_document
                       NonexitingType 1.0 NonexitingType.qml)"};
     setContent(u"/path/qmldir", qmldir);
 
-    ASSERT_THROW(updater.update(directories, {}, {}), QmlDesigner::CannotParseQmlDocumentFile);
+    ASSERT_THROW(updater.update(directories, {}, {}, {}), QmlDesigner::CannotParseQmlDocumentFile);
 }
 
 TEST_F(ProjectStorageUpdater, synchronize_qml_documents)
@@ -652,7 +665,7 @@ TEST_F(ProjectStorageUpdater, synchronize_qml_documents)
                                                      ModuleId{},
                                                      FileType::QmlDocument))))));
 
-    updater.update(directories, {}, {});
+    updater.update(directories, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, synchronize_add_only_qml_document_in_directory)
@@ -708,7 +721,7 @@ TEST_F(ProjectStorageUpdater, synchronize_add_only_qml_document_in_directory)
                                                              ModuleId{},
                                                              FileType::QmlDocument))))));
 
-    updater.update(directories, {}, {});
+    updater.update(directories, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, synchronize_removes_qml_document)
@@ -771,7 +784,7 @@ TEST_F(ProjectStorageUpdater, synchronize_removes_qml_document)
                                                              ModuleId{},
                                                              FileType::QmlDocument))))));
 
-    updater.update(directories, {}, {});
+    updater.update(directories, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, synchronize_removes_qml_document_in_qmldir_only)
@@ -826,7 +839,7 @@ TEST_F(ProjectStorageUpdater, synchronize_removes_qml_document_in_qmldir_only)
                                                      ModuleId{},
                                                      FileType::QmlDocument))))));
 
-    updater.update(directories, {}, {});
+    updater.update(directories, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, synchronize_add_qml_document_to_qmldir)
@@ -884,7 +897,7 @@ TEST_F(ProjectStorageUpdater, synchronize_add_qml_document_to_qmldir)
                                                      ModuleId{},
                                                      FileType::QmlDocument))))));
 
-    updater.update(directories, {}, {});
+    updater.update(directories, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, synchronize_remove_qml_document_from_qmldir)
@@ -939,7 +952,7 @@ TEST_F(ProjectStorageUpdater, synchronize_remove_qml_document_from_qmldir)
                                                      ModuleId{},
                                                      FileType::QmlDocument))))));
 
-    updater.update(directories, {}, {});
+    updater.update(directories, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, synchronize_qml_documents_dont_update_if_up_to_date)
@@ -1009,7 +1022,7 @@ TEST_F(ProjectStorageUpdater, synchronize_qml_documents_dont_update_if_up_to_dat
                                                      ModuleId{},
                                                      FileType::QmlDocument))))));
 
-    updater.update(directories, {}, {});
+    updater.update(directories, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, synchroniz_if_qmldir_file_has_not_changed)
@@ -1060,7 +1073,7 @@ TEST_F(ProjectStorageUpdater, synchroniz_if_qmldir_file_has_not_changed)
                                        qmlDocumentSourceId2)),
             Field(&SynchronizationPackage::projectDatas, IsEmpty()))));
 
-    updater.update(directories, {}, {});
+    updater.update(directories, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, synchroniz_if_qmldir_file_has_not_changed_and_some_updated_files)
@@ -1095,7 +1108,7 @@ TEST_F(ProjectStorageUpdater, synchroniz_if_qmldir_file_has_not_changed_and_some
                         UnorderedElementsAre(qmltypesPathSourceId, qmlDocumentSourceId1)),
                   Field(&SynchronizationPackage::projectDatas, IsEmpty()))));
 
-    updater.update(directories, {}, {});
+    updater.update(directories, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, synchroniz_if_qmldir_file_not_changed_and_some_removed_files)
@@ -1110,7 +1123,7 @@ TEST_F(ProjectStorageUpdater, synchroniz_if_qmldir_file_not_changed_and_some_rem
     setFilesDontChanged({qmlDirPathSourceId, qmltypes2PathSourceId, qmlDocumentSourceId2});
     setFilesRemoved({qmltypesPathSourceId, qmlDocumentSourceId1});
 
-    ASSERT_THROW(updater.update(directories, {}, {}), QmlDesigner::CannotParseQmlTypesFile);
+    ASSERT_THROW(updater.update(directories, {}, {}, {}), QmlDesigner::CannotParseQmlTypesFile);
 }
 
 TEST_F(ProjectStorageUpdater, synchroniz_if_qmldir_file_has_changed_and_some_removed_files)
@@ -1162,7 +1175,7 @@ TEST_F(ProjectStorageUpdater, synchroniz_if_qmldir_file_has_changed_and_some_rem
                                                      exampleCppNativeModuleId,
                                                      FileType::QmlTypes))))));
 
-    updater.update(directories, {}, {});
+    updater.update(directories, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, update_qml_types_files_is_empty)
@@ -1177,7 +1190,7 @@ TEST_F(ProjectStorageUpdater, update_qml_types_files_is_empty)
                           Field(&SynchronizationPackage::projectDatas, IsEmpty()),
                           Field(&SynchronizationPackage::updatedProjectSourceIds, IsEmpty()))));
 
-    updater.update({}, {}, {});
+    updater.update({}, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, update_qml_types_files)
@@ -1205,7 +1218,7 @@ TEST_F(ProjectStorageUpdater, update_qml_types_files)
                     Field(&SynchronizationPackage::updatedProjectSourceIds,
                           UnorderedElementsAre(qmltypesPathSourceId, qmltypes2PathSourceId)))));
 
-    updater.update({}, {"/path/example.qmltypes", "/path/example2.qmltypes"}, {});
+    updater.update({}, {"/path/example.qmltypes", "/path/example2.qmltypes"}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, dont_update_qml_types_files_if_unchanged)
@@ -1230,7 +1243,7 @@ TEST_F(ProjectStorageUpdater, dont_update_qml_types_files_if_unchanged)
                           Field(&SynchronizationPackage::updatedProjectSourceIds,
                                 UnorderedElementsAre(qmltypesPathSourceId)))));
 
-    updater.update({}, {"/path/example.qmltypes", "/path/example2.qmltypes"}, {});
+    updater.update({}, {"/path/example.qmltypes", "/path/example2.qmltypes"}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, synchronize_qml_documents_with_different_version_but_same_type_name_and_file_name)
@@ -1273,7 +1286,7 @@ TEST_F(ProjectStorageUpdater, synchronize_qml_documents_with_different_version_b
                                                                    ModuleId{},
                                                                    FileType::QmlDocument))))));
 
-    updater.update(directories, {}, {});
+    updater.update(directories, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, synchronize_qml_documents_with_different_type_name_but_same_version_and_file_name)
@@ -1314,7 +1327,7 @@ TEST_F(ProjectStorageUpdater, synchronize_qml_documents_with_different_type_name
                                                                    ModuleId{},
                                                                    FileType::QmlDocument))))));
 
-    updater.update(directories, {}, {});
+    updater.update(directories, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, dont_synchronize_selectors)
@@ -1332,7 +1345,7 @@ TEST_F(ProjectStorageUpdater, dont_synchronize_selectors)
                     Contains(Field(&Storage::Synchronization::Type::exportedTypes,
                                    Contains(IsExportedType(exampleModuleId, "FirstType", 1, 0))))))));
 
-    updater.update(directories, {}, {});
+    updater.update(directories, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, synchronize_qmldir_dependencies)
@@ -1357,7 +1370,7 @@ TEST_F(ProjectStorageUpdater, synchronize_qmldir_dependencies)
             Field(&SynchronizationPackage::updatedModuleDependencySourceIds,
                   UnorderedElementsAre(qmltypesPathSourceId, qmltypes2PathSourceId)))));
 
-    updater.update(directories, {}, {});
+    updater.update(directories, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, synchronize_qmldir_dependencies_with_double_entries)
@@ -1383,7 +1396,7 @@ TEST_F(ProjectStorageUpdater, synchronize_qmldir_dependencies_with_double_entrie
             Field(&SynchronizationPackage::updatedModuleDependencySourceIds,
                   UnorderedElementsAre(qmltypesPathSourceId, qmltypes2PathSourceId)))));
 
-    updater.update(directories, {}, {});
+    updater.update(directories, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, synchronize_qmldir_dependencies_with_colliding_imports)
@@ -1409,7 +1422,7 @@ TEST_F(ProjectStorageUpdater, synchronize_qmldir_dependencies_with_colliding_imp
             Field(&SynchronizationPackage::updatedModuleDependencySourceIds,
                   UnorderedElementsAre(qmltypesPathSourceId, qmltypes2PathSourceId)))));
 
-    updater.update(directories, {}, {});
+    updater.update(directories, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, synchronize_qmldir_with_no_dependencies)
@@ -1426,7 +1439,7 @@ TEST_F(ProjectStorageUpdater, synchronize_qmldir_with_no_dependencies)
                           Field(&SynchronizationPackage::updatedModuleDependencySourceIds,
                                 UnorderedElementsAre(qmltypesPathSourceId, qmltypes2PathSourceId)))));
 
-    updater.update(directories, {}, {});
+    updater.update(directories, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, synchronize_qmldir_imports)
@@ -1468,7 +1481,7 @@ TEST_F(ProjectStorageUpdater, synchronize_qmldir_imports)
                           Field(&SynchronizationPackage::updatedModuleIds,
                                 ElementsAre(exampleModuleId)))));
 
-    updater.update(directories, {}, {});
+    updater.update(directories, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, synchronize_qmldir_with_no_imports)
@@ -1482,7 +1495,7 @@ TEST_F(ProjectStorageUpdater, synchronize_qmldir_with_no_imports)
                                   Field(&SynchronizationPackage::updatedModuleIds,
                                         ElementsAre(exampleModuleId)))));
 
-    updater.update(directories, {}, {});
+    updater.update(directories, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, synchronize_qmldir_imports_with_double_entries)
@@ -1525,7 +1538,7 @@ TEST_F(ProjectStorageUpdater, synchronize_qmldir_imports_with_double_entries)
                           Field(&SynchronizationPackage::updatedModuleIds,
                                 ElementsAre(exampleModuleId)))));
 
-    updater.update(directories, {}, {});
+    updater.update(directories, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, synchronize_qmldir_optional_imports)
@@ -1567,7 +1580,7 @@ TEST_F(ProjectStorageUpdater, synchronize_qmldir_optional_imports)
                           Field(&SynchronizationPackage::updatedModuleIds,
                                 ElementsAre(exampleModuleId)))));
 
-    updater.update(directories, {}, {});
+    updater.update(directories, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, update_path_watcher_directories)
@@ -1577,7 +1590,7 @@ TEST_F(ProjectStorageUpdater, update_path_watcher_directories)
                                                QmlDesigner::SourceType::Directory,
                                                {path1SourceId, path2SourceId, path3SourceId}})));
 
-    updater.update(directories3, {}, {});
+    updater.update(directories3, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, update_path_watcher_directory_does_not_exists)
@@ -1589,7 +1602,7 @@ TEST_F(ProjectStorageUpdater, update_path_watcher_directory_does_not_exists)
                                                QmlDesigner::SourceType::Directory,
                                                {path1SourceId, path3SourceId}})));
 
-    updater.update(directories3, {}, {});
+    updater.update(directories3, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, update_path_watcher_directory_does_not_changed)
@@ -1601,7 +1614,7 @@ TEST_F(ProjectStorageUpdater, update_path_watcher_directory_does_not_changed)
                                                QmlDesigner::SourceType::Directory,
                                                {path1SourceId, path2SourceId}})));
 
-    updater.update(directories2, {}, {});
+    updater.update(directories2, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, update_path_watcher_directory_removed)
@@ -1612,7 +1625,7 @@ TEST_F(ProjectStorageUpdater, update_path_watcher_directory_removed)
                 updateIdPaths(Contains(
                     IdPaths{projectPartId, QmlDesigner::SourceType::Directory, {path2SourceId}})));
 
-    updater.update(directories2, {}, {});
+    updater.update(directories2, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, update_path_watcher_qmldirs)
@@ -1622,7 +1635,7 @@ TEST_F(ProjectStorageUpdater, update_path_watcher_qmldirs)
                                                QmlDesigner::SourceType::QmlDir,
                                                {qmldir1SourceId, qmldir2SourceId, qmldir3SourceId}})));
 
-    updater.update(directories3, {}, {});
+    updater.update(directories3, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, update_path_watcher_qmldir_does_not_exists)
@@ -1634,7 +1647,7 @@ TEST_F(ProjectStorageUpdater, update_path_watcher_qmldir_does_not_exists)
                                                QmlDesigner::SourceType::QmlDir,
                                                {qmldir1SourceId, qmldir3SourceId}})));
 
-    updater.update(directories3, {}, {});
+    updater.update(directories3, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, update_path_watcher_qmldir_does_not_changed)
@@ -1646,7 +1659,7 @@ TEST_F(ProjectStorageUpdater, update_path_watcher_qmldir_does_not_changed)
                                                QmlDesigner::SourceType::QmlDir,
                                                {qmldir1SourceId, qmldir2SourceId}})));
 
-    updater.update(directories2, {}, {});
+    updater.update(directories2, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, update_path_watcher_qmldir_removed)
@@ -1657,7 +1670,7 @@ TEST_F(ProjectStorageUpdater, update_path_watcher_qmldir_removed)
                 updateIdPaths(Contains(
                     IdPaths{projectPartId, QmlDesigner::SourceType::QmlDir, {qmldir2SourceId}})));
 
-    updater.update(directories2, {}, {});
+    updater.update(directories2, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, update_path_watcher_qml_files)
@@ -1674,7 +1687,7 @@ TEST_F(ProjectStorageUpdater, update_path_watcher_qml_files)
                                                QmlDesigner::SourceType::Qml,
                                                {firstSourceId, secondSourceId, thirdSourceId}})));
 
-    updater.update(directories2, {}, {});
+    updater.update(directories2, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, update_path_watcher_only_qml_files_dont_changed)
@@ -1692,7 +1705,7 @@ TEST_F(ProjectStorageUpdater, update_path_watcher_only_qml_files_dont_changed)
                                                QmlDesigner::SourceType::Qml,
                                                {firstSourceId, secondSourceId, thirdSourceId}})));
 
-    updater.update(directories2, {}, {});
+    updater.update(directories2, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, update_path_watcher_only_qml_files_changed)
@@ -1710,7 +1723,7 @@ TEST_F(ProjectStorageUpdater, update_path_watcher_only_qml_files_changed)
                                                QmlDesigner::SourceType::Qml,
                                                {firstSourceId, secondSourceId, thirdSourceId}})));
 
-    updater.update(directories2, {}, {});
+    updater.update(directories2, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, update_path_watcher_qml_files_and_directories_dont_changed)
@@ -1733,7 +1746,7 @@ TEST_F(ProjectStorageUpdater, update_path_watcher_qml_files_and_directories_dont
                                                QmlDesigner::SourceType::Qml,
                                                {firstSourceId, secondSourceId, thirdSourceId}})));
 
-    updater.update(directories2, {}, {});
+    updater.update(directories2, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, update_path_watcher_qmltypes_files_in_qmldir)
@@ -1752,7 +1765,7 @@ TEST_F(ProjectStorageUpdater, update_path_watcher_qmltypes_files_in_qmldir)
                                                QmlDesigner::SourceType::QmlTypes,
                                                {qmltypes1SourceId, qmltypes2SourceId}})));
 
-    updater.update(directories2, {}, {});
+    updater.update(directories2, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, update_path_watcher_only_qmltypes_files_in_qmldir_dont_changed)
@@ -1770,7 +1783,7 @@ TEST_F(ProjectStorageUpdater, update_path_watcher_only_qmltypes_files_in_qmldir_
                                                QmlDesigner::SourceType::QmlTypes,
                                                {qmltypes1SourceId, qmltypes2SourceId}})));
 
-    updater.update(directories2, {}, {});
+    updater.update(directories2, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, update_path_watcher_only_qmltypes_files_changed)
@@ -1787,7 +1800,7 @@ TEST_F(ProjectStorageUpdater, update_path_watcher_only_qmltypes_files_changed)
                                                QmlDesigner::SourceType::QmlTypes,
                                                {qmltypes1SourceId, qmltypes2SourceId}})));
 
-    updater.update(directories2, {}, {});
+    updater.update(directories2, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, update_path_watcher_qmltypes_files_and_directories_dont_changed)
@@ -1808,7 +1821,7 @@ TEST_F(ProjectStorageUpdater, update_path_watcher_qmltypes_files_and_directories
                                                QmlDesigner::SourceType::QmlTypes,
                                                {qmltypes1SourceId, qmltypes2SourceId}})));
 
-    updater.update(directories2, {}, {});
+    updater.update(directories2, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, update_path_watcher_builtin_qmltypes_files)
@@ -1823,7 +1836,7 @@ TEST_F(ProjectStorageUpdater, update_path_watcher_builtin_qmltypes_files)
                                                QmlDesigner::SourceType::QmlTypes,
                                                {qmltypes1SourceId, qmltypes2SourceId}})));
 
-    updater.update({}, {builtinQmltyplesPath1, builtinQmltyplesPath2}, {});
+    updater.update({}, {builtinQmltyplesPath1, builtinQmltyplesPath2}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, synchronize_qml_documents_without_qmldir)
@@ -1890,7 +1903,7 @@ TEST_F(ProjectStorageUpdater, synchronize_qml_documents_without_qmldir)
                                                      ModuleId{},
                                                      FileType::QmlDocument))))));
 
-    updater.update(directories, {}, {});
+    updater.update(directories, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, synchronize_qml_documents_without_qmldir_throws_if_qml_document_does_not_exists)
@@ -1898,7 +1911,7 @@ TEST_F(ProjectStorageUpdater, synchronize_qml_documents_without_qmldir_throws_if
     setFilesDontExists({qmlDirPathSourceId, qmlDocumentSourceId1});
     setFilesAdded({directoryPathSourceId});
 
-    ASSERT_THROW(updater.update(directories, {}, {}), QmlDesigner::CannotParseQmlDocumentFile);
+    ASSERT_THROW(updater.update(directories, {}, {}, {}), QmlDesigner::CannotParseQmlDocumentFile);
 }
 
 TEST_F(ProjectStorageUpdater, synchronize_qml_documents_without_qmldir_throws_if_directory_does_not_exists)
@@ -1928,7 +1941,7 @@ TEST_F(ProjectStorageUpdater, synchronize_qml_documents_without_qmldir_throws_if
                                         UnorderedElementsAre(directoryPathSourceId)),
                                   Field(&SynchronizationPackage::projectDatas, IsEmpty()))));
 
-    updater.update(directories, {}, {});
+    updater.update(directories, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, synchronize_qml_documents_without_qmldir_add_qml_document)
@@ -1977,7 +1990,7 @@ TEST_F(ProjectStorageUpdater, synchronize_qml_documents_without_qmldir_add_qml_d
                                                      ModuleId{},
                                                      FileType::QmlDocument))))));
 
-    updater.update(directories, {}, {});
+    updater.update(directories, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, synchronize_qml_documents_without_qmldir_removes_qml_document)
@@ -2016,7 +2029,7 @@ TEST_F(ProjectStorageUpdater, synchronize_qml_documents_without_qmldir_removes_q
                                                                    ModuleId{},
                                                                    FileType::QmlDocument))))));
 
-    updater.update(directories, {}, {});
+    updater.update(directories, {}, {}, {});
 }
 
 TEST_F(ProjectStorageUpdater, watcher_updates_directories)
@@ -3210,7 +3223,8 @@ TEST_F(ProjectStorageUpdater, errors_for_watcher_updates_are_handled)
                       SecondType 2.2 Second.qml)"};
     setContent(u"/path/qmldir", qmldir);
 
-    ON_CALL(projectStorageMock, synchronize(_)).WillByDefault(Throw(QmlDesigner::ProjectStorageError{}));
+    ON_CALL(projectStorageMock, synchronize(_))
+        .WillByDefault(Throw(QmlDesigner::NoSourcePathForInvalidSourceId{}));
 
     ASSERT_NO_THROW(updater.pathsWithIdsChanged({{directoryProjectChunkId, {directoryPathSourceId}}}));
 }
@@ -3227,7 +3241,8 @@ TEST_F(ProjectStorageUpdater, input_is_reused_next_call_if_an_error_happens)
         {{directoryPathSourceId, qmltypesPathSourceId, exampleModuleId, FileType::QmlTypes},
          {directoryPathSourceId, qmltypes2PathSourceId, exampleModuleId, FileType::QmlTypes}});
     setFilesDontChanged({directoryPathSourceId, qmlDirPathSourceId});
-    ON_CALL(projectStorageMock, synchronize(_)).WillByDefault(Throw(QmlDesigner::ProjectStorageError{}));
+    ON_CALL(projectStorageMock, synchronize(_))
+        .WillByDefault(Throw(QmlDesigner::NoSourcePathForInvalidSourceId{}));
     updater.pathsWithIdsChanged(
         {{qmltypesProjectChunkId, {qmltypesPathSourceId, qmltypes2PathSourceId}}});
     ON_CALL(projectStorageMock, synchronize(_)).WillByDefault(Return());
@@ -3286,7 +3301,8 @@ TEST_F(ProjectStorageUpdater, input_is_reused_next_call_if_an_error_happens_and_
         {{directoryPathSourceId, qmltypesPathSourceId, exampleModuleId, FileType::QmlTypes},
          {directoryPathSourceId, qmltypes2PathSourceId, exampleModuleId, FileType::QmlTypes}});
     setFilesDontChanged({directoryPathSourceId, qmlDirPathSourceId});
-    ON_CALL(projectStorageMock, synchronize(_)).WillByDefault(Throw(QmlDesigner::ProjectStorageError{}));
+    ON_CALL(projectStorageMock, synchronize(_))
+        .WillByDefault(Throw(QmlDesigner::NoSourcePathForInvalidSourceId{}));
     updater.pathsWithIdsChanged(
         {{qmltypesProjectChunkId, {qmltypesPathSourceId, qmltypes2PathSourceId}}});
     ON_CALL(projectStorageMock, synchronize(_)).WillByDefault(Return());
@@ -3348,7 +3364,8 @@ TEST_F(ProjectStorageUpdater, input_is_reused_next_call_if_an_error_happens_and_
          {directoryPathSourceId, qmlDocumentSourceId1, QmlDesigner::ModuleId{}, FileType::QmlDocument},
          {directoryPathSourceId, qmlDocumentSourceId1, QmlDesigner::ModuleId{}, FileType::QmlDocument}});
     setFilesDontChanged({directoryPathSourceId, qmlDirPathSourceId});
-    ON_CALL(projectStorageMock, synchronize(_)).WillByDefault(Throw(QmlDesigner::ProjectStorageError{}));
+    ON_CALL(projectStorageMock, synchronize(_))
+        .WillByDefault(Throw(QmlDesigner::NoSourcePathForInvalidSourceId{}));
     updater.pathsWithIdsChanged(
         {{qmlDocumentProjectChunkId, {qmlDocumentSourceId1, qmlDocumentSourceId2}}});
     ON_CALL(projectStorageMock, synchronize(_)).WillByDefault(Return());
@@ -3471,7 +3488,7 @@ TEST_F(ProjectStorageUpdater, update_property_editor_panes)
                           Field(&SynchronizationPackage::updatedPropertyEditorQmlPathSourceIds,
                                 ElementsAre(directoryId)))));
 
-    updater.update({}, {}, propertyEditorQmlPath);
+    updater.update({}, {}, propertyEditorQmlPath, {});
 }
 
 TEST_F(ProjectStorageUpdater, update_property_editor_specifics)
@@ -3496,12 +3513,12 @@ TEST_F(ProjectStorageUpdater, update_property_editor_specifics)
                           Field(&SynchronizationPackage::updatedPropertyEditorQmlPathSourceIds,
                                 ElementsAre(directoryId)))));
 
-    updater.update({}, {}, propertyEditorQmlPath);
+    updater.update({}, {}, propertyEditorQmlPath, {});
 }
 
 TEST_F(ProjectStorageUpdater, update_property_editor_panes_is_empty_if_directory_has_not_changed)
 {
-    updater.update({}, {}, propertyEditorQmlPath);
+    updater.update({}, {}, propertyEditorQmlPath, {});
     ON_CALL(fileSystemMock, fileStatus(_)).WillByDefault([](SourceId sourceId) {
         return FileStatus{sourceId, 1, 21};
     });
@@ -3511,7 +3528,135 @@ TEST_F(ProjectStorageUpdater, update_property_editor_panes_is_empty_if_directory
 
     EXPECT_CALL(projectStorageMock, synchronize(PackageIsEmpty()));
 
-    updater.update({}, {}, propertyEditorQmlPath);
+    updater.update({}, {}, propertyEditorQmlPath, {});
+}
+
+TEST_F(ProjectStorageUpdater, update_type_annotations)
+{
+    auto itemSourceId = sourcePathCache.sourceId(
+        QmlDesigner::SourcePath{itemLibraryPath + "/quick.metainfo"});
+    auto buttonSourceId = sourcePathCache.sourceId(
+        QmlDesigner::SourcePath{itemLibraryPath + "/qtquickcontrols2.metainfo"});
+    setFilesChanged({itemLibraryPathSourceId, itemSourceId, buttonSourceId});
+    auto qtQuickModuleId = moduleId("QtQuick");
+    auto qtQuickControlsModuleId = moduleId("QtQuick.Controls.Basic");
+    QmlDesigner::Storage::TypeTraits itemTraits;
+    itemTraits.canBeContainer = QmlDesigner::FlagIs::True;
+
+    EXPECT_CALL(projectStorageMock,
+                synchronize(AllOf(Field(&SynchronizationPackage::typeAnnotations,
+                                        IsSupersetOf({IsTypeAnnotation(itemSourceId,
+                                                                       itemLibraryPathSourceId,
+                                                                       "Item",
+                                                                       qtQuickModuleId,
+                                                                       StartsWith(itemLibraryPath),
+                                                                       _,
+                                                                       _,
+                                                                       _),
+                                                      IsTypeAnnotation(buttonSourceId,
+                                                                       itemLibraryPathSourceId,
+                                                                       "Button",
+                                                                       qtQuickControlsModuleId,
+                                                                       StartsWith(itemLibraryPath),
+                                                                       _,
+                                                                       _,
+                                                                       _)})),
+                                  Field(&SynchronizationPackage::updatedTypeAnnotationSourceIds,
+                                        IsSupersetOf({itemSourceId, buttonSourceId})))));
+
+    updater.update({}, {}, {}, {itemLibraryPath});
+}
+
+TEST_F(ProjectStorageUpdater, update_changed_type_annotation)
+{
+    auto itemSourceId = sourcePathCache.sourceId(
+        QmlDesigner::SourcePath{itemLibraryPath + "/quick.metainfo"});
+    auto buttonSourceId = sourcePathCache.sourceId(
+        QmlDesigner::SourcePath{itemLibraryPath + "/qtquickcontrols2.metainfo"});
+    setFilesDontChanged({itemLibraryPathSourceId});
+    setFilesChanged({itemSourceId, buttonSourceId});
+    auto qtQuickModuleId = moduleId("QtQuick");
+    auto qtQuickControlsModuleId = moduleId("QtQuick.Controls.Basic");
+    QmlDesigner::Storage::TypeTraits itemTraits;
+    itemTraits.canBeContainer = QmlDesigner::FlagIs::True;
+
+    EXPECT_CALL(projectStorageMock,
+                synchronize(AllOf(Field(&SynchronizationPackage::typeAnnotations,
+                                        IsSupersetOf({IsTypeAnnotation(itemSourceId,
+                                                                       itemLibraryPathSourceId,
+                                                                       "Item",
+                                                                       qtQuickModuleId,
+                                                                       StartsWith(itemLibraryPath),
+                                                                       _,
+                                                                       _,
+                                                                       _),
+                                                      IsTypeAnnotation(buttonSourceId,
+                                                                       itemLibraryPathSourceId,
+                                                                       "Button",
+                                                                       qtQuickControlsModuleId,
+                                                                       StartsWith(itemLibraryPath),
+                                                                       _,
+                                                                       _,
+                                                                       _)})),
+                                  Field(&SynchronizationPackage::updatedTypeAnnotationSourceIds,
+                                        IsSupersetOf({itemSourceId, buttonSourceId})))));
+
+    updater.update({}, {}, {}, {itemLibraryPath});
+}
+
+TEST_F(ProjectStorageUpdater, update_type_annotations_removed_meta_info_file)
+{
+    ON_CALL(fileSystemMock, fileStatus(_)).WillByDefault([](SourceId sourceId) {
+        return FileStatus{sourceId, 1, 21};
+    });
+    ON_CALL(projectStorageMock, fetchFileStatus(_)).WillByDefault([](SourceId sourceId) {
+        return FileStatus{sourceId, 1, 21};
+    });
+    auto itemSourceId = sourcePathCache.sourceId(
+        QmlDesigner::SourcePath{itemLibraryPath + "/quick.metainfo"});
+    auto buttonSourceId = sourcePathCache.sourceId(
+        QmlDesigner::SourcePath{itemLibraryPath + "/qtquickcontrols2.metainfo"});
+    ON_CALL(projectStorageMock, typeAnnotationDirectorySourceIds())
+        .WillByDefault(Return(QmlDesigner::SmallSourceIds<64>{itemLibraryPathSourceId}));
+    ON_CALL(projectStorageMock, typeAnnotationSourceIds(itemLibraryPathSourceId))
+        .WillByDefault(Return(QmlDesigner::SmallSourceIds<4>{itemSourceId, buttonSourceId}));
+    setFilesChanged({itemLibraryPathSourceId});
+    setFilesDontChanged({itemSourceId, buttonSourceId});
+
+    EXPECT_CALL(projectStorageMock,
+                synchronize(AllOf(Field(&SynchronizationPackage::typeAnnotations, IsEmpty()),
+                                  Field(&SynchronizationPackage::updatedTypeAnnotationSourceIds,
+                                        IsSupersetOf({itemSourceId, buttonSourceId})))));
+
+    updater.update({}, {}, {}, {itemLibraryPath});
+}
+
+TEST_F(ProjectStorageUpdater, update_type_annotations_removed_directory)
+{
+    ON_CALL(fileSystemMock, fileStatus(_)).WillByDefault([](SourceId sourceId) {
+        return FileStatus{sourceId, 1, 21};
+    });
+    ON_CALL(projectStorageMock, fetchFileStatus(_)).WillByDefault([](SourceId sourceId) {
+        return FileStatus{sourceId, 1, 21};
+    });
+    auto itemSourceId = sourcePathCache.sourceId(
+        QmlDesigner::SourcePath{itemLibraryPath + "/quick.metainfo"});
+    auto buttonSourceId = sourcePathCache.sourceId(
+        QmlDesigner::SourcePath{itemLibraryPath + "/qtquickcontrols2.metainfo"});
+    ON_CALL(projectStorageMock, typeAnnotationDirectorySourceIds())
+        .WillByDefault(Return(QmlDesigner::SmallSourceIds<64>{
+            itemLibraryPathSourceId,
+        }));
+    ON_CALL(projectStorageMock, typeAnnotationSourceIds(itemLibraryPathSourceId))
+        .WillByDefault(Return(QmlDesigner::SmallSourceIds<4>{itemSourceId, buttonSourceId}));
+    setFilesDontExists({itemLibraryPathSourceId, buttonSourceId, itemSourceId});
+
+    EXPECT_CALL(projectStorageMock,
+                synchronize(AllOf(Field(&SynchronizationPackage::typeAnnotations, IsEmpty()),
+                                  Field(&SynchronizationPackage::updatedTypeAnnotationSourceIds,
+                                        IsSupersetOf({buttonSourceId, itemSourceId})))));
+
+    updater.update({}, {}, {}, {itemLibraryPath});
 }
 
 } // namespace
diff --git a/tests/unit/tests/unittests/projectstorage/qmldocumentparser-test.cpp b/tests/unit/tests/unittests/projectstorage/qmldocumentparser-test.cpp
index f39dec121c..513fbf2ec0 100644
--- a/tests/unit/tests/unittests/projectstorage/qmldocumentparser-test.cpp
+++ b/tests/unit/tests/unittests/projectstorage/qmldocumentparser-test.cpp
@@ -143,8 +143,8 @@ class QmlDocumentParser : public ::testing::Test
 public:
 protected:
     Sqlite::Database database{":memory:", Sqlite::JournalMode::Memory};
-    QmlDesigner::ProjectStorage<Sqlite::Database> storage{database, database.isInitialized()};
-    QmlDesigner::SourcePathCache<QmlDesigner::ProjectStorage<Sqlite::Database>> sourcePathCache{
+    QmlDesigner::ProjectStorage storage{database, database.isInitialized()};
+    QmlDesigner::SourcePathCache<QmlDesigner::ProjectStorage> sourcePathCache{
         storage};
     QmlDesigner::QmlDocumentParser parser{storage, sourcePathCache};
     Storage::Imports imports;
@@ -516,4 +516,16 @@ TEST_F(QmlDocumentParser, qualified_list_property)
                     Storage::PropertyDeclarationTraits::IsList)));
 }
 
+TEST_F(QmlDocumentParser, default_property)
+{
+    auto type = parser.parse(R"(import Example 2.1 as Example
+                                Item{
+                                    default property list<Example.Foo> foos
+                                })",
+                             imports,
+                             qmlFileSourceId,
+                             directoryPath);
+
+    ASSERT_THAT(type.defaultPropertyName, Eq("foos"));
+}
 } // namespace
diff --git a/tests/unit/tests/unittests/projectstorage/qmltypesparser-test.cpp b/tests/unit/tests/unittests/projectstorage/qmltypesparser-test.cpp
index 78f8f41d6c..64f3631a68 100644
--- a/tests/unit/tests/unittests/projectstorage/qmltypesparser-test.cpp
+++ b/tests/unit/tests/unittests/projectstorage/qmltypesparser-test.cpp
@@ -168,8 +168,8 @@ class QmlTypesParser : public ::testing::Test
 public:
 protected:
     Sqlite::Database database{":memory:", Sqlite::JournalMode::Memory};
-    QmlDesigner::ProjectStorage<Sqlite::Database> storage{database, database.isInitialized()};
-    QmlDesigner::SourcePathCache<QmlDesigner::ProjectStorage<Sqlite::Database>> sourcePathCache{
+    QmlDesigner::ProjectStorage storage{database, database.isInitialized()};
+    QmlDesigner::SourcePathCache<QmlDesigner::ProjectStorage> sourcePathCache{
         storage};
     QmlDesigner::QmlTypesParser parser{storage};
     Storage::Imports imports;
@@ -838,4 +838,39 @@ TEST_F(QmlTypesParser, uses_no_custom_parser)
     ASSERT_THAT(types, ElementsAre(IsTypeTrait(UsesCustomParser(false))));
 }
 
+TEST_F(QmlTypesParser, default_property)
+{
+    QString source{R"(import QtQuick.tooling 1.2
+                      Module{
+                        Component { name: "QObject"
+                                    defaultProperty: "children" }})"};
+
+    parser.parse(source, imports, types, projectData);
+
+    ASSERT_THAT(types,
+                ElementsAre(Field(&Synchronization::Type::defaultPropertyName, Eq("children"))));
+}
+
+TEST_F(QmlTypesParser, skip_template_item)
+{
+    ModuleId moduleId = storage.moduleId("QtQuick.Templates-cppnative");
+    Synchronization::ProjectData projectData{qmltypesFileSourceId,
+                                             qmltypesFileSourceId,
+                                             moduleId,
+                                             Synchronization::FileType::QmlTypes};
+    QString source{R"(import QtQuick.tooling 1.2
+                      Module{
+                        Component { name: "QQuickItem"}
+                        Component { name: "QQmlComponent"}})"};
+
+    parser.parse(source, imports, types, projectData);
+
+    ASSERT_THAT(types,
+                UnorderedElementsAre(IsType("QQmlComponent",
+                                            Synchronization::ImportedType{},
+                                            Synchronization::ImportedType{},
+                                            Storage::TypeTraitsKind::Reference,
+                                            qmltypesFileSourceId)));
+}
+
 } // namespace
diff --git a/tests/unit/tests/unittests/projectstorage/typeannotationreader-test.cpp b/tests/unit/tests/unittests/projectstorage/typeannotationreader-test.cpp
index ed5c1a0778..a614a5c7cf 100644
--- a/tests/unit/tests/unittests/projectstorage/typeannotationreader-test.cpp
+++ b/tests/unit/tests/unittests/projectstorage/typeannotationreader-test.cpp
@@ -3,6 +3,7 @@
 
 #include "../utils/googletest.h"
 
+#include <projectstorage-matcher.h>
 #include <strippedstring-matcher.h>
 
 #include <projectstorage/projectstorage.h>
@@ -11,24 +12,6 @@
 
 namespace {
 
-template<typename HintsJsonMatcher, typename ItemLibraryJsonMatcher>
-auto IsTypeAnnotation(QmlDesigner::SourceId sourceId,
-                      Utils::SmallStringView typeName,
-                      QmlDesigner::ModuleId moduleId,
-                      Utils::SmallStringView iconPath,
-                      QmlDesigner::Storage::TypeTraits traits,
-                      HintsJsonMatcher hintsJsonMatcher,
-                      ItemLibraryJsonMatcher itemLibraryJsonMatcher)
-{
-    using QmlDesigner::Storage::Synchronization::TypeAnnotation;
-    return AllOf(Field("sourceId", &TypeAnnotation::sourceId, sourceId),
-                 Field("typeName", &TypeAnnotation::typeName, typeName),
-                 Field("moduleId", &TypeAnnotation::moduleId, moduleId),
-                 Field("iconPath", &TypeAnnotation::iconPath, iconPath),
-                 Field("traits", &TypeAnnotation::traits, traits),
-                 Field("hintsJson", &TypeAnnotation::hintsJson, hintsJsonMatcher),
-                 Field("itemLibraryJson", &TypeAnnotation::itemLibraryJson, itemLibraryJsonMatcher));
-}
 
 class TypeAnnotationReader : public testing::Test
 {
@@ -37,7 +20,7 @@ protected:
     {
         static_database = std::make_unique<Sqlite::Database>(":memory:", Sqlite::JournalMode::Memory);
 
-        static_projectStorage = std::make_unique<QmlDesigner::ProjectStorage<Sqlite::Database>>(
+        static_projectStorage = std::make_unique<QmlDesigner::ProjectStorage>(
             *static_database, static_database->isInitialized());
     }
 
@@ -52,10 +35,11 @@ protected:
 protected:
     inline static std::unique_ptr<Sqlite::Database> static_database;
     Sqlite::Database &database = *static_database;
-    inline static std::unique_ptr<QmlDesigner::ProjectStorage<Sqlite::Database>> static_projectStorage;
-    QmlDesigner::ProjectStorage<Sqlite::Database> &storage = *static_projectStorage;
+    inline static std::unique_ptr<QmlDesigner::ProjectStorage> static_projectStorage;
+    QmlDesigner::ProjectStorage &storage = *static_projectStorage;
     QmlDesigner::Storage::TypeAnnotationReader reader{storage};
     QmlDesigner::SourceId sourceId = QmlDesigner::SourceId::create(33);
+    QmlDesigner::SourceId directorySourceId = QmlDesigner::SourceId::create(77);
 };
 
 TEST_F(TypeAnnotationReader, parse_type)
@@ -73,10 +57,11 @@ TEST_F(TypeAnnotationReader, parse_type)
     })xy"};
     QmlDesigner::Storage::TypeTraits traits;
 
-    auto annotations = reader.parseTypeAnnotation(content, "/path", sourceId);
+    auto annotations = reader.parseTypeAnnotation(content, "/path", sourceId, directorySourceId);
 
     ASSERT_THAT(annotations,
                 UnorderedElementsAre(IsTypeAnnotation(sourceId,
+                                                      directorySourceId,
                                                       "Frame",
                                                       moduleId("QtQuick.Controls"),
                                                       "/path/images/frame-icon16.png",
@@ -84,6 +69,7 @@ TEST_F(TypeAnnotationReader, parse_type)
                                                       IsEmpty(),
                                                       IsEmpty()),
                                      IsTypeAnnotation(sourceId,
+                                                      directorySourceId,
                                                       "Item",
                                                       moduleId("QtQuick"),
                                                       "/path/images/item-icon16.png",
@@ -109,10 +95,11 @@ TEST_F(TypeAnnotationReader, parse_true_canBeContainer)
     QmlDesigner::Storage::TypeTraits traits;
     traits.canBeContainer = FlagIs::True;
 
-    auto annotations = reader.parseTypeAnnotation(content, "/path", sourceId);
+    auto annotations = reader.parseTypeAnnotation(content, "/path", sourceId, directorySourceId);
 
     ASSERT_THAT(annotations,
                 ElementsAre(IsTypeAnnotation(sourceId,
+                                             directorySourceId,
                                              "Frame",
                                              moduleId("QtQuick.Controls"),
                                              "/path/images/frame-icon16.png",
@@ -138,10 +125,11 @@ TEST_F(TypeAnnotationReader, parse_true_forceClip)
     QmlDesigner::Storage::TypeTraits traits;
     traits.forceClip = FlagIs::True;
 
-    auto annotations = reader.parseTypeAnnotation(content, "/path", sourceId);
+    auto annotations = reader.parseTypeAnnotation(content, "/path", sourceId, directorySourceId);
 
     ASSERT_THAT(annotations,
                 ElementsAre(IsTypeAnnotation(sourceId,
+                                             directorySourceId,
                                              "Frame",
                                              moduleId("QtQuick.Controls"),
                                              "/path/images/frame-icon16.png",
@@ -167,10 +155,11 @@ TEST_F(TypeAnnotationReader, parse_true_doesLayoutChildren)
     QmlDesigner::Storage::TypeTraits traits;
     traits.doesLayoutChildren = FlagIs::True;
 
-    auto annotations = reader.parseTypeAnnotation(content, "/path", sourceId);
+    auto annotations = reader.parseTypeAnnotation(content, "/path", sourceId, directorySourceId);
 
     ASSERT_THAT(annotations,
                 ElementsAre(IsTypeAnnotation(sourceId,
+                                             directorySourceId,
                                              "Frame",
                                              moduleId("QtQuick.Controls"),
                                              "/path/images/frame-icon16.png",
@@ -196,10 +185,11 @@ TEST_F(TypeAnnotationReader, parse_true_canBeDroppedInFormEditor)
     QmlDesigner::Storage::TypeTraits traits;
     traits.canBeDroppedInFormEditor = FlagIs::True;
 
-    auto annotations = reader.parseTypeAnnotation(content, "/path", sourceId);
+    auto annotations = reader.parseTypeAnnotation(content, "/path", sourceId, directorySourceId);
 
     ASSERT_THAT(annotations,
                 ElementsAre(IsTypeAnnotation(sourceId,
+                                             directorySourceId,
                                              "Frame",
                                              moduleId("QtQuick.Controls"),
                                              "/path/images/frame-icon16.png",
@@ -225,10 +215,11 @@ TEST_F(TypeAnnotationReader, parse_true_canBeDroppedInNavigator)
     QmlDesigner::Storage::TypeTraits traits;
     traits.canBeDroppedInNavigator = FlagIs::True;
 
-    auto annotations = reader.parseTypeAnnotation(content, "/path", sourceId);
+    auto annotations = reader.parseTypeAnnotation(content, "/path", sourceId, directorySourceId);
 
     ASSERT_THAT(annotations,
                 ElementsAre(IsTypeAnnotation(sourceId,
+                                             directorySourceId,
                                              "Frame",
                                              moduleId("QtQuick.Controls"),
                                              "/path/images/frame-icon16.png",
@@ -254,10 +245,11 @@ TEST_F(TypeAnnotationReader, parse_true_canBeDroppedInView3D)
     QmlDesigner::Storage::TypeTraits traits;
     traits.canBeDroppedInView3D = FlagIs::True;
 
-    auto annotations = reader.parseTypeAnnotation(content, "/path", sourceId);
+    auto annotations = reader.parseTypeAnnotation(content, "/path", sourceId, directorySourceId);
 
     ASSERT_THAT(annotations,
                 ElementsAre(IsTypeAnnotation(sourceId,
+                                             directorySourceId,
                                              "Frame",
                                              moduleId("QtQuick.Controls"),
                                              "/path/images/frame-icon16.png",
@@ -283,10 +275,11 @@ TEST_F(TypeAnnotationReader, parse_true_isMovable)
     QmlDesigner::Storage::TypeTraits traits;
     traits.isMovable = FlagIs::True;
 
-    auto annotations = reader.parseTypeAnnotation(content, "/path", sourceId);
+    auto annotations = reader.parseTypeAnnotation(content, "/path", sourceId, directorySourceId);
 
     ASSERT_THAT(annotations,
                 ElementsAre(IsTypeAnnotation(sourceId,
+                                             directorySourceId,
                                              "Frame",
                                              moduleId("QtQuick.Controls"),
                                              "/path/images/frame-icon16.png",
@@ -312,10 +305,11 @@ TEST_F(TypeAnnotationReader, parse_true_isResizable)
     QmlDesigner::Storage::TypeTraits traits;
     traits.isResizable = FlagIs::True;
 
-    auto annotations = reader.parseTypeAnnotation(content, "/path", sourceId);
+    auto annotations = reader.parseTypeAnnotation(content, "/path", sourceId, directorySourceId);
 
     ASSERT_THAT(annotations,
                 ElementsAre(IsTypeAnnotation(sourceId,
+                                             directorySourceId,
                                              "Frame",
                                              moduleId("QtQuick.Controls"),
                                              "/path/images/frame-icon16.png",
@@ -341,10 +335,11 @@ TEST_F(TypeAnnotationReader, parse_true_hasFormEditorItem)
     QmlDesigner::Storage::TypeTraits traits;
     traits.hasFormEditorItem = FlagIs::True;
 
-    auto annotations = reader.parseTypeAnnotation(content, "/path", sourceId);
+    auto annotations = reader.parseTypeAnnotation(content, "/path", sourceId, directorySourceId);
 
     ASSERT_THAT(annotations,
                 ElementsAre(IsTypeAnnotation(sourceId,
+                                             directorySourceId,
                                              "Frame",
                                              moduleId("QtQuick.Controls"),
                                              "/path/images/frame-icon16.png",
@@ -370,10 +365,11 @@ TEST_F(TypeAnnotationReader, parse_true_isStackedContainer)
     QmlDesigner::Storage::TypeTraits traits;
     traits.isStackedContainer = FlagIs::True;
 
-    auto annotations = reader.parseTypeAnnotation(content, "/path", sourceId);
+    auto annotations = reader.parseTypeAnnotation(content, "/path", sourceId, directorySourceId);
 
     ASSERT_THAT(annotations,
                 ElementsAre(IsTypeAnnotation(sourceId,
+                                             directorySourceId,
                                              "Frame",
                                              moduleId("QtQuick.Controls"),
                                              "/path/images/frame-icon16.png",
@@ -399,10 +395,11 @@ TEST_F(TypeAnnotationReader, parse_true_takesOverRenderingOfChildren)
     QmlDesigner::Storage::TypeTraits traits;
     traits.takesOverRenderingOfChildren = FlagIs::True;
 
-    auto annotations = reader.parseTypeAnnotation(content, "/path", sourceId);
+    auto annotations = reader.parseTypeAnnotation(content, "/path", sourceId, directorySourceId);
 
     ASSERT_THAT(annotations,
                 ElementsAre(IsTypeAnnotation(sourceId,
+                                             directorySourceId,
                                              "Frame",
                                              moduleId("QtQuick.Controls"),
                                              "/path/images/frame-icon16.png",
@@ -428,10 +425,11 @@ TEST_F(TypeAnnotationReader, parse_true_visibleInNavigator)
     QmlDesigner::Storage::TypeTraits traits;
     traits.visibleInNavigator = FlagIs::True;
 
-    auto annotations = reader.parseTypeAnnotation(content, "/path", sourceId);
+    auto annotations = reader.parseTypeAnnotation(content, "/path", sourceId, directorySourceId);
 
     ASSERT_THAT(annotations,
                 ElementsAre(IsTypeAnnotation(sourceId,
+                                             directorySourceId,
                                              "Frame",
                                              moduleId("QtQuick.Controls"),
                                              "/path/images/frame-icon16.png",
@@ -457,10 +455,11 @@ TEST_F(TypeAnnotationReader, parse_true_visibleInLibrary)
     QmlDesigner::Storage::TypeTraits traits;
     traits.visibleInLibrary = FlagIs::True;
 
-    auto annotations = reader.parseTypeAnnotation(content, "/path", sourceId);
+    auto annotations = reader.parseTypeAnnotation(content, "/path", sourceId, directorySourceId);
 
     ASSERT_THAT(annotations,
                 ElementsAre(IsTypeAnnotation(sourceId,
+                                             directorySourceId,
                                              "Frame",
                                              moduleId("QtQuick.Controls"),
                                              "/path/images/frame-icon16.png",
@@ -485,10 +484,11 @@ TEST_F(TypeAnnotationReader, parse_false)
     })xy"};
     QmlDesigner::Storage::TypeTraits traits;
 
-    auto annotations = reader.parseTypeAnnotation(content, "/path", sourceId);
+    auto annotations = reader.parseTypeAnnotation(content, "/path", sourceId, directorySourceId);
 
     ASSERT_THAT(annotations,
                 ElementsAre(IsTypeAnnotation(sourceId,
+                                             directorySourceId,
                                              "Frame",
                                              moduleId("QtQuick.Controls"),
                                              "/path/images/frame-icon16.png",
@@ -526,10 +526,11 @@ TEST_F(TypeAnnotationReader, parse_complex_expression)
     QmlDesigner::Storage::TypeTraits itemTraits;
     itemTraits.canBeContainer = QmlDesigner::FlagIs::True;
 
-    auto annotations = reader.parseTypeAnnotation(content, "/path", sourceId);
+    auto annotations = reader.parseTypeAnnotation(content, "/path", sourceId, directorySourceId);
 
     ASSERT_THAT(annotations,
                 UnorderedElementsAre(IsTypeAnnotation(sourceId,
+                                                      directorySourceId,
                                                       "Frame",
                                                       moduleId("QtQuick.Controls"),
                                                       "/path/images/frame-icon16.png",
@@ -538,6 +539,7 @@ TEST_F(TypeAnnotationReader, parse_complex_expression)
                                                                              "visibleNonDefaultProperties":"layer.effect"})xy"),
                                                       IsEmpty()),
                                      IsTypeAnnotation(sourceId,
+                                                      directorySourceId,
                                                       "Item",
                                                       moduleId("QtQuick"),
                                                       "/path/images/item-icon16.png",
@@ -573,10 +575,11 @@ TEST_F(TypeAnnotationReader, parse_item_library_entry)
     })xy"};
     QmlDesigner::Storage::TypeTraits traits;
 
-    auto annotations = reader.parseTypeAnnotation(content, "/path", sourceId);
+    auto annotations = reader.parseTypeAnnotation(content, "/path", sourceId, directorySourceId);
 
     ASSERT_THAT(annotations,
                 ElementsAre(IsTypeAnnotation(sourceId,
+                                             directorySourceId,
                                              "Frame",
                                              moduleId("QtQuick.Controls"),
                                              "/path/images/frame-icon16.png",
@@ -584,12 +587,12 @@ TEST_F(TypeAnnotationReader, parse_item_library_entry)
                                              IsEmpty(),
                                              StrippedStringEq(R"xy([
                                                   {"category":"Qt Quick - Controls 2",
-                                                   "iconPath":"images/frame-icon.png",
+                                                   "iconPath":"/path/images/frame-icon.png",
                                                    "import":"QtQuick.Controls",
                                                    "name":"Frame",
                                                    "toolTip":"qsTr(\"An untitled container for a group of controls.\")"},
                                                   {"category":"Qt Quick - Controls 2",
-                                                   "iconPath":"images/frame-icon.png",
+                                                   "iconPath":"/path/images/frame-icon.png",
                                                    "import":"QtQuick.Controls",
                                                    "name":"Large Frame",
                                                    "toolTip":"qsTr(\"An large container for a group of controls.\")"}]
@@ -629,10 +632,11 @@ TEST_F(TypeAnnotationReader, parse_item_library_entry_with_properties)
     })xy"};
     QmlDesigner::Storage::TypeTraits traits;
 
-    auto annotations = reader.parseTypeAnnotation(content, "/path", sourceId);
+    auto annotations = reader.parseTypeAnnotation(content, "/path", sourceId, directorySourceId);
 
     ASSERT_THAT(annotations,
                 ElementsAre(IsTypeAnnotation(sourceId,
+                                             directorySourceId,
                                              "Frame",
                                              moduleId("QtQuick.Controls"),
                                              "/path/images/frame-icon16.png",
@@ -640,13 +644,13 @@ TEST_F(TypeAnnotationReader, parse_item_library_entry_with_properties)
                                              IsEmpty(),
                                              StrippedStringEq(R"xy([
                                                   {"category":"Qt Quick - Controls 2",
-                                                   "iconPath":"images/frame-icon.png",
+                                                   "iconPath":"/path/images/frame-icon.png",
                                                    "import":"QtQuick.Controls",
                                                    "name":"Frame",
                                                    "properties":[["width","int",200.0],["height","int",100.0]],
                                                    "toolTip":"qsTr(\"An untitled container for a group of controls.\")"},
                                                   {"category":"Qt Quick - Controls 2",
-                                                   "iconPath":"images/frame-icon.png",
+                                                   "iconPath":"/path/images/frame-icon.png",
                                                    "import":"QtQuick.Controls",
                                                    "name":"Large Frame",
                                                    "properties":[["width","int",2000.0],["height","int",1000.0]],
@@ -679,13 +683,14 @@ TEST_F(TypeAnnotationReader, parse_item_library_entry_template_path)
     })xy"};
     QmlDesigner::Storage::TypeTraits traits;
 
-    auto annotations = reader.parseTypeAnnotation(content, "/path", sourceId);
+    auto annotations = reader.parseTypeAnnotation(content, "/path", sourceId, directorySourceId);
 
     ASSERT_THAT(annotations,
                 ElementsAre(IsTypeAnnotation(sourceId,
+                                             directorySourceId,
                                              "Frame",
                                              moduleId("QtQuick.Controls"),
-                                             {},
+                                             Utils::SmallStringView{},
                                              traits,
                                              IsEmpty(),
                                              StrippedStringEq(R"xy([
@@ -693,9 +698,10 @@ TEST_F(TypeAnnotationReader, parse_item_library_entry_template_path)
                                                    "templatePath":"/path/templates/frame.qml"}]
                                              )xy")),
                             IsTypeAnnotation(sourceId,
+                                             directorySourceId,
                                              "Item",
                                              moduleId("QtQuick"),
-                                             {},
+                                             Utils::SmallStringView{},
                                              traits,
                                              IsEmpty(),
                                              StrippedStringEq(R"xy([
@@ -730,13 +736,14 @@ TEST_F(TypeAnnotationReader, parse_item_library_entry_extra_file_paths)
     })xy"};
     QmlDesigner::Storage::TypeTraits traits;
 
-    auto annotations = reader.parseTypeAnnotation(content, "/path", sourceId);
+    auto annotations = reader.parseTypeAnnotation(content, "/path", sourceId, directorySourceId);
 
     ASSERT_THAT(annotations,
                 ElementsAre(IsTypeAnnotation(sourceId,
+                                             directorySourceId,
                                              "Frame",
                                              moduleId("QtQuick.Controls"),
-                                             {},
+                                             Utils::SmallStringView{},
                                              traits,
                                              IsEmpty(),
                                              StrippedStringEq(R"xy([
@@ -744,9 +751,10 @@ TEST_F(TypeAnnotationReader, parse_item_library_entry_extra_file_paths)
                                                    "name":"Frame"}]
                                              )xy")),
                             IsTypeAnnotation(sourceId,
+                                             directorySourceId,
                                              "Item",
                                              moduleId("QtQuick"),
-                                             {},
+                                             Utils::SmallStringView{},
                                              traits,
                                              IsEmpty(),
                                              StrippedStringEq(R"xy([
diff --git a/tests/unit/tests/unittests/sqlite/sqliteindex-test.cpp b/tests/unit/tests/unittests/sqlite/sqliteindex-test.cpp
index 9d3fca88ff..b065c0ab9a 100644
--- a/tests/unit/tests/unittests/sqlite/sqliteindex-test.cpp
+++ b/tests/unit/tests/unittests/sqlite/sqliteindex-test.cpp
@@ -17,7 +17,9 @@ TEST(Index, one_column)
 
     auto sqlStatement = index.sqlStatement();
 
-    ASSERT_THAT(sqlStatement, Eq("CREATE INDEX IF NOT EXISTS index_tableName_column1 ON tableName(column1)"));
+    ASSERT_THAT(
+        sqlStatement,
+        Eq("CREATE INDEX IF NOT EXISTS index_normal_tableName_column1 ON tableName(column1)"));
 }
 
 TEST(Index, two_column)
@@ -26,7 +28,9 @@ TEST(Index, two_column)
 
     auto sqlStatement = index.sqlStatement();
 
-    ASSERT_THAT(sqlStatement, Eq("CREATE INDEX IF NOT EXISTS index_tableName_column1_column2 ON tableName(column1, column2)"));
+    ASSERT_THAT(sqlStatement,
+                Eq("CREATE INDEX IF NOT EXISTS index_normal_tableName_column1_column2 ON "
+                   "tableName(column1, column2)"));
 }
 
 TEST(Index, empty_table_name)
@@ -49,7 +53,8 @@ TEST(Index, unique_index)
 
     auto sqlStatement = index.sqlStatement();
 
-    ASSERT_THAT(sqlStatement, Eq("CREATE UNIQUE INDEX IF NOT EXISTS index_tableName_column1 ON tableName(column1)"));
+    ASSERT_THAT(
+        sqlStatement, Eq("CREATE UNIQUE INDEX IF NOT EXISTS index_unique_tableName_column1 ON tableName(column1)"));
 }
 
 TEST(Index, condition)
@@ -58,8 +63,20 @@ TEST(Index, condition)
 
     auto sqlStatement = index.sqlStatement();
 
+    ASSERT_THAT(
+        sqlStatement,
+        Eq("CREATE INDEX IF NOT EXISTS index_partial_tableName_column1 ON tableName(column1) WHERE "
+           "column1 IS NOT NULL"));
+}
+
+TEST(Index, unique_index_with_condition)
+{
+    Index index{"tableName", {"column1"}, IndexType::Unique, "column1 IS NOT NULL"};
+
+    auto sqlStatement = index.sqlStatement();
+
     ASSERT_THAT(sqlStatement,
-                Eq("CREATE INDEX IF NOT EXISTS index_tableName_column1 ON tableName(column1) WHERE "
-                   "column1 IS NOT NULL"));
+                Eq("CREATE UNIQUE INDEX IF NOT EXISTS index_unique_partial_tableName_column1 ON "
+                   "tableName(column1) WHERE column1 IS NOT NULL"));
 }
 }
diff --git a/tests/unit/tests/unittests/sqlite/sqlitetable-test.cpp b/tests/unit/tests/unittests/sqlite/sqlitetable-test.cpp
index 7b8189b51e..e1b0427f3c 100644
--- a/tests/unit/tests/unittests/sqlite/sqlitetable-test.cpp
+++ b/tests/unit/tests/unittests/sqlite/sqlitetable-test.cpp
@@ -60,9 +60,9 @@ TEST_F(SqliteTable, add_index)
 
     auto index = table.addIndex({column, column2});
 
-    ASSERT_THAT(
-        Utils::SmallStringView(index.sqlStatement()),
-        Eq("CREATE INDEX IF NOT EXISTS index_testTable_name_value ON testTable(name, value)"));
+    ASSERT_THAT(Utils::SmallStringView(index.sqlStatement()),
+                Eq("CREATE INDEX IF NOT EXISTS index_normal_testTable_name_value ON "
+                   "testTable(name, value)"));
 }
 
 TEST_F(SqliteTable, initialize_table)
@@ -92,10 +92,11 @@ TEST_F(SqliteTable, initialize_table_with_index)
 
     EXPECT_CALL(databaseMock, execute(Eq("CREATE TABLE testTable(name, value)")));
     EXPECT_CALL(databaseMock,
-                execute(Eq("CREATE INDEX IF NOT EXISTS index_testTable_name ON testTable(name)")));
+                execute(Eq(
+                    "CREATE INDEX IF NOT EXISTS index_normal_testTable_name ON testTable(name)")));
     EXPECT_CALL(databaseMock,
-                execute(Eq("CREATE INDEX IF NOT EXISTS index_testTable_value ON testTable(value) "
-                           "WHERE value IS NOT NULL")));
+                execute(Eq("CREATE INDEX IF NOT EXISTS index_partial_testTable_value ON "
+                           "testTable(value) WHERE value IS NOT NULL")));
 
     table.initialize(databaseMock);
 }
@@ -110,13 +111,13 @@ TEST_F(SqliteTable, initialize_table_with_unique_index)
     table.addUniqueIndex({column2}, "value IS NOT NULL");
 
     EXPECT_CALL(databaseMock, execute(Eq("CREATE TABLE testTable(name, value)")));
+    EXPECT_CALL(
+        databaseMock,
+        execute(Eq(
+            "CREATE UNIQUE INDEX IF NOT EXISTS index_unique_testTable_name ON testTable(name)")));
     EXPECT_CALL(databaseMock,
-                execute(Eq(
-                    "CREATE UNIQUE INDEX IF NOT EXISTS index_testTable_name ON testTable(name)")));
-    EXPECT_CALL(databaseMock,
-                execute(Eq(
-                    "CREATE UNIQUE INDEX IF NOT EXISTS index_testTable_value ON testTable(value) "
-                    "WHERE value IS NOT NULL")));
+                execute(Eq("CREATE UNIQUE INDEX IF NOT EXISTS index_unique_partial_testTable_value "
+                           "ON testTable(value) WHERE value IS NOT NULL")));
 
     table.initialize(databaseMock);
 }
@@ -351,8 +352,8 @@ TEST_F(StrictSqliteTable, add_index)
     auto index = table.addIndex({column, column2});
 
     ASSERT_THAT(Utils::SmallStringView(index.sqlStatement()),
-                Eq("CREATE INDEX IF NOT EXISTS index_testTable_name_value ON testTable(name, "
-                   "value)"));
+                Eq("CREATE INDEX IF NOT EXISTS index_normal_testTable_name_value ON "
+                   "testTable(name, value)"));
 }
 
 TEST_F(StrictSqliteTable, initialize_table)
@@ -382,10 +383,11 @@ TEST_F(StrictSqliteTable, initialize_table_with_index)
 
     EXPECT_CALL(databaseMock, execute(Eq("CREATE TABLE testTable(name ANY, value ANY) STRICT")));
     EXPECT_CALL(databaseMock,
-                execute(Eq("CREATE INDEX IF NOT EXISTS index_testTable_name ON testTable(name)")));
+                execute(Eq(
+                    "CREATE INDEX IF NOT EXISTS index_normal_testTable_name ON testTable(name)")));
     EXPECT_CALL(databaseMock,
-                execute(Eq("CREATE INDEX IF NOT EXISTS index_testTable_value ON testTable(value) "
-                           "WHERE value IS NOT NULL")));
+                execute(Eq("CREATE INDEX IF NOT EXISTS index_partial_testTable_value ON "
+                           "testTable(value) WHERE value IS NOT NULL")));
 
     table.initialize(databaseMock);
 }
@@ -400,13 +402,13 @@ TEST_F(StrictSqliteTable, initialize_table_with_unique_index)
     table.addUniqueIndex({column2}, "value IS NOT NULL");
 
     EXPECT_CALL(databaseMock, execute(Eq("CREATE TABLE testTable(name ANY, value ANY) STRICT")));
+    EXPECT_CALL(
+        databaseMock,
+        execute(Eq(
+            "CREATE UNIQUE INDEX IF NOT EXISTS index_unique_testTable_name ON testTable(name)")));
     EXPECT_CALL(databaseMock,
-                execute(Eq(
-                    "CREATE UNIQUE INDEX IF NOT EXISTS index_testTable_name ON testTable(name)")));
-    EXPECT_CALL(databaseMock,
-                execute(Eq(
-                    "CREATE UNIQUE INDEX IF NOT EXISTS index_testTable_value ON testTable(value) "
-                    "WHERE value IS NOT NULL")));
+                execute(Eq("CREATE UNIQUE INDEX IF NOT EXISTS index_unique_partial_testTable_value "
+                           "ON testTable(value) WHERE value IS NOT NULL")));
 
     table.initialize(databaseMock);
 }
diff --git a/tests/unit/tests/unittests/utils/smallstring-test.cpp b/tests/unit/tests/unittests/utils/smallstring-test.cpp
index bdcdb44019..71090f8760 100644
--- a/tests/unit/tests/unittests/utils/smallstring-test.cpp
+++ b/tests/unit/tests/unittests/utils/smallstring-test.cpp
@@ -941,6 +941,33 @@ TEST(SmallString, append_empty_initializer_list)
     ASSERT_THAT(text, Eq("some text"));
 }
 
+TEST(SmallString, append_int)
+{
+    SmallString text("some text");
+
+    text += 123;
+
+    ASSERT_THAT(text, Eq("some text123"));
+}
+
+TEST(SmallString, append_float)
+{
+    SmallString text("some text");
+
+    text += 123.456;
+
+    ASSERT_THAT(text, Eq("some text123.456"));
+}
+
+TEST(SmallString, append_character)
+{
+    SmallString text("some text");
+
+    text += 'x';
+
+    ASSERT_THAT(text, Eq("some textx"));
+}
+
 TEST(SmallString, to_byte_array)
 {
     SmallString text("some text");
@@ -1299,6 +1326,19 @@ TEST(SmallString, starts_with_string_view)
     ASSERT_FALSE(text.startsWith('@'));
 }
 
+TEST(SmallString, starts_with_qstringview)
+{
+    using namespace Qt::StringLiterals;
+    SmallString text("$column");
+
+    ASSERT_FALSE(text.startsWith(u"$columnxxx"_s));
+    ASSERT_TRUE(text.startsWith(u"$column"_s));
+    ASSERT_TRUE(text.startsWith(u"$col"_s));
+    ASSERT_FALSE(text.startsWith(u"col"_s));
+    ASSERT_TRUE(text.startsWith(u"$"_s));
+    ASSERT_FALSE(text.startsWith(u"@"_s));
+}
+
 TEST(SmallString, ends_with)
 {
     SmallString text("/my/path");
@@ -1839,6 +1879,8 @@ TEST(SmallString, number_to_string)
     ASSERT_THAT(SmallString::number(std::numeric_limits<long long int>::min()), "-9223372036854775808");
     ASSERT_THAT(SmallString::number(1.2), "1.2");
     ASSERT_THAT(SmallString::number(-1.2), "-1.2");
+    ASSERT_THAT(SmallString::number(1.2f), "1.2");
+    ASSERT_THAT(SmallString::number(-1.2f), "-1.2");
 }
 
 TEST(SmallString, string_view_plus_operator)